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

pydio · Nov 15, 2014 · c1f45a9 · c1f45a9
2 parents 96a7a96 + 84a8bb2
commit c1f45a9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/core/src/plugins/authfront.cas/CAS/Client.php b/core/src/plugins/authfront.cas/CAS/Client.php
@@ -2303,9 +2303,11 @@ private function _getCallbackURL()
 
             /*
             * modify for pydio
-            */
+
             $str_pattern = '/index|plugins|dashboard|settings|welcome|ws-(.*)$/';
             $request_uri = preg_replace($str_pattern,'',$request_uri);
+            $request_uri = rtrim($request_uri, "/");
+            */
 
             $final_uri .= $request_uri;
             $this->_callback_url = $final_uri;
@@ -3491,7 +3493,18 @@ public function getURL()
 
             $final_uri .= $this->_getClientUrl();
             $request_uri	= explode('?', $_SERVER['REQUEST_URI'], 2);
-            $final_uri		.= $request_uri[0];
+
+            // modify for pydio -------------------------------------------------
+
+            //$final_uri		.= $request_uri[0];
+            $new_request_uri = $request_uri[0];
+            $str_pattern = '/index|plugins|dashboard|settings|welcome|ws-(.*)$/';
+            $new_request_uri = preg_replace($str_pattern,'',$new_request_uri);
+            if(!(strcmp($new_request_uri, "/") === 0))
+                $new_request_uri = rtrim($new_request_uri, "/");
+            $final_uri		.= $new_request_uri;
+            //-------------------------------------------------------------------
+
 
             if (isset($request_uri[1]) && $request_uri[1]) {
                 $query_string= $this->_removeParameterFromQueryString('ticket', $request_uri[1]);

diff --git a/core/src/plugins/authfront.cas/change_log b/core/src/plugins/authfront.cas/change_log
@@ -3,6 +3,7 @@ CAS/Client.php
 2. add:    public function serviceSamba($serviceUrl, &$err_code)
 3. modify:	public function getProxiedService ($type)
 4. modify: private function getCallbackURL()
+4. modify: public function getURL()
 
 CAS.php
 6. add define("PHPCAS_PROXIED_SERVICE_IMAP", 'CAS_ProxiedService_Samba');