From 29c24e647cb4c4a0928382a9ab2964980898562b Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 28 Aug 2014 19:24:03 +0200
Subject: Get rid of DIRECTORY_SEPARATOR for consistency

---
 program/lib/Roundcube/bootstrap.php        | 2 +-
 program/lib/Roundcube/rcube_plugin_api.php | 5 ++---
 program/lib/Roundcube/rcube_utils.php      | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'program/lib')

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] == '/';
         }
     }
 
-- 
cgit v1.2.3