diff options
| -rwxr-xr-x | bin/update.sh | 2 | ||||
| -rwxr-xr-x | bin/updatedb.sh | 4 | ||||
| -rw-r--r-- | program/lib/Roundcube/bootstrap.php | 2 | ||||
| -rw-r--r-- | program/lib/Roundcube/rcube_plugin_api.php | 5 | ||||
| -rw-r--r-- | program/lib/Roundcube/rcube_utils.php | 2 |
5 files changed, 7 insertions, 8 deletions
diff --git a/bin/update.sh b/bin/update.sh index 91af6413d..f0c6d2f6c 100755 --- a/bin/update.sh +++ b/bin/update.sh @@ -157,7 +157,7 @@ if ($RCI->configured) { if ($RCI->config['db_dsnw']) { echo "Executing database schema update.\n"; system("php " . INSTALL_PATH . "bin/updatedb.sh --package=roundcube --version=" . $opts['version'] - . " --dir=" . INSTALL_PATH . DIRECTORY_SEPARATOR . "SQL", $res); + . " --dir=" . INSTALL_PATH . "SQL", $res); $success = !$res; } diff --git a/bin/updatedb.sh b/bin/updatedb.sh index daee6e835..964bc184c 100755 --- a/bin/updatedb.sh +++ b/bin/updatedb.sh @@ -116,7 +116,7 @@ if (empty($version)) { $version = 2012080700; } -$dir = $opts['dir'] . DIRECTORY_SEPARATOR . $DB->db_provider; +$dir = $opts['dir'] . '/' . $DB->db_provider; if (!file_exists($dir)) { rcube::raise_error("DDL Upgrade files for " . $DB->db_provider . " driver not found.", false, true); } @@ -133,7 +133,7 @@ sort($result, SORT_NUMERIC); foreach ($result as $v) { echo "Updating database schema ($v)... "; - $error = update_db_schema($opts['package'], $v, $dir . DIRECTORY_SEPARATOR . "$v.sql"); + $error = update_db_schema($opts['package'], $v, "$dir/$v.sql"); if ($error) { echo "[FAILED]\n"; diff --git a/program/lib/Roundcube/bootstrap.php b/program/lib/Roundcube/bootstrap.php index 0aa5cb1de..98bbce5d4 100644 --- a/program/lib/Roundcube/bootstrap.php +++ b/program/lib/Roundcube/bootstrap.php @@ -58,7 +58,7 @@ define('RCUBE_VERSION', '1.1-git'); define('RCUBE_CHARSET', 'UTF-8'); if (!defined('RCUBE_LIB_DIR')) { - define('RCUBE_LIB_DIR', dirname(__FILE__).DIRECTORY_SEPARATOR); + define('RCUBE_LIB_DIR', dirname(__FILE__) . '/'); } if (!defined('RCUBE_INSTALL_PATH')) { diff --git a/program/lib/Roundcube/rcube_plugin_api.php b/program/lib/Roundcube/rcube_plugin_api.php index defccc94f..e0b8aea38 100644 --- a/program/lib/Roundcube/rcube_plugin_api.php +++ b/program/lib/Roundcube/rcube_plugin_api.php @@ -188,8 +188,7 @@ class rcube_plugin_api return true; } - $fn = $plugins_dir . DIRECTORY_SEPARATOR . $plugin_name - . DIRECTORY_SEPARATOR . $plugin_name . '.php'; + $fn = "$plugins_dir/$plugin_name/$plugin_name.php"; if (is_readable($fn)) { if (!class_exists($plugin_name, false)) { @@ -279,7 +278,7 @@ class rcube_plugin_api ); $dir = dir($this->dir); - $fn = unslashify($dir->path) . DIRECTORY_SEPARATOR . $plugin_name . DIRECTORY_SEPARATOR . $plugin_name . '.php'; + $fn = unslashify($dir->path) . "/$plugin_name/$plugin_name.php"; $info = false; if (!class_exists($plugin_name, false)) { diff --git a/program/lib/Roundcube/rcube_utils.php b/program/lib/Roundcube/rcube_utils.php index ef303f8c1..330322f10 100644 --- a/program/lib/Roundcube/rcube_utils.php +++ b/program/lib/Roundcube/rcube_utils.php @@ -1068,7 +1068,7 @@ class rcube_utils return (bool) preg_match('!^[a-z]:[\\\\/]!i', $path); } else { - return $path[0] == DIRECTORY_SEPARATOR; + return $path[0] == '/'; } } |