Avoid using : and * chars for queue files on windows

pydio · Oct 3, 2016 · 034bc4f · 034bc4f
1 parent 60ee9fd
commit 034bc4f
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/core/src/plugins/mq.serial/SerialMessageExchanger.php b/core/src/plugins/mq.serial/SerialMessageExchanger.php
@@ -42,6 +42,19 @@ class SerialMessageExchanger extends Plugin implements IMessageExchanger
     private $channels;
     private $clientsGCTime = 10;
 
+    /**
+     * Windows-ify channel name to avoid forbidden characters
+     * @param $channelName
+     * @return mixed
+     */
+    protected function channelNameToFileName($channelName){
+        if(strtoupper(substr(PHP_OS, 0, 3)) === 'WIN'){
+            return str_replace(array(":", "*"), array("---", "__ALL__"), $channelName);
+        }else{
+            return $channelName;
+        }
+    }
+
     /**
      * @param $channelName
      * @param bool $create
@@ -54,7 +67,7 @@ public function loadChannel($channelName, $create = false)
         }
         if (is_file($this->getPluginWorkDir()."/queues/channel-$channelName")) {
             if(!isset($this->channels)) $this->channels = array();
-            $data = FileHelper::loadSerialFile($this->getPluginWorkDir() . "/queues/channel-$channelName");
+            $data = FileHelper::loadSerialFile($this->getPluginWorkDir() . "/queues/channel-".$this->channelNameToFileName($channelName));
             if (is_array($data)) {
                 if(!is_array($data["MESSAGES"])) $data["MESSAGES"] = array();
                 if(!is_array($data["CLIENTS"])) $data["CLIENTS"] = array();
@@ -74,7 +87,7 @@ public function __destruct()
         if (isSet($this->channels) && is_array($this->channels)) {
             foreach ($this->channels as $channelName => $data) {
                 if (is_array($data)) {
-                    FileHelper::saveSerialFile($this->getPluginWorkDir() . "/queues/channel-$channelName", $data);
+                    FileHelper::saveSerialFile($this->getPluginWorkDir() . "/queues/channel-".$this->channelNameToFileName($channelName), $data);
                 }
             }
         }