Merge remote-tracking branch 'origin/develop' into develop

Author: cdujeu

core/src/core/classes/class.AJXP_Utils.php

@@ -90,12 +90,12 @@ public static function natkrsort(&$array)
      */
     public static function securePath($path)
     {
-        if ($path == null) $path = "";
+        if ($path == null) return "";
         //
         // REMOVE ALL "../" TENTATIVES
         //
         $path = str_replace(chr(0), "", $path);
-        $dirs = explode('/', $path);
+        $dirs = self::safeExplode($path);
         for ($i = 0; $i < count($dirs); $i++) {
             if ($dirs[$i] == '.' or $dirs[$i] == '..') {
                 $dirs[$i] = '';
@@ -113,13 +113,15 @@ public static function securePath($path)
         return $path;
     }
 
-    public static function safeDirname($path)
-    {
+    public static function safeExplode($path) {
+        return (DIRECTORY_SEPARATOR === "\\" ? preg_split('/(\\\|\\/)/', $path) : explode('/', $path));
+    }
+
+    public static function safeDirname($path) {
         return (DIRECTORY_SEPARATOR === "\\" ? str_replace("\\", "/", dirname($path)): dirname($path));
     }
 
-    public static function safeBasename($path)
-    {
+    public static function safeBasename($path) {
         return (DIRECTORY_SEPARATOR === "\\" ? str_replace("\\", "/", basename($path)): basename($path));
     }