Index action: switch verbose parameter to verboz, as it conflicts wit…

…h symfony command line. GUID: make it consistent with or without com extension on windows.
pydio · Oct 4, 2016 · 1f002d7 · 1f002d7
1 parent d2a6029
commit 1f002d7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/core/src/core/src/pydio/Core/Utils/Vars/StringHelper.php b/core/src/core/src/pydio/Core/Utils/Vars/StringHelper.php
@@ -302,7 +302,7 @@ public static function regexpToLdap($regexp)
     public static function createGUID()
     {
         if (function_exists('com_create_guid')) {
-            return com_create_guid();
+            return trim(com_create_guid(), "{}");
         } else {
             mt_srand((double)microtime() * 10000);//optional for php 4.2.0 and up.
             $charid = strtoupper(md5(uniqid(rand(), true)));

diff --git a/core/src/plugins/core.index/CoreIndexer.php b/core/src/plugins/core.index/CoreIndexer.php
@@ -79,7 +79,7 @@ public function applyAction(\Psr\Http\Message\ServerRequestInterface $requestInt
         }
         $nodes = $userSelection->buildNodes();
 
-        if (isSet($httpVars["verbose"]) && $httpVars["verbose"] == "true") {
+        if (isSet($httpVars["verboz"]) && $httpVars["verboz"] == "true") {
             $this->verboseIndexation = true;
         }
         $taskId = $requestInterface->getAttribute("pydio-task-id");

diff --git a/core/src/plugins/core.index/manifest.xml b/core/src/plugins/core.index/manifest.xml
@@ -29,7 +29,7 @@
 					]]></clientCallback>
                     <serverCallback methodName="applyAction" restParams="/file+" developerComment="Trigger re-indexation of a directory, recursively">
                         <input_param name="file" type="string" description="Folder to index (can be empty for root)"/>
-                        <input_param name="verbose" type="boolean" description="Print out some info about indexation"/>
+                        <input_param name="verboz" type="boolean" description="Print out some info about indexation"/>
                     </serverCallback>
                 </processing>
             </action>