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

pydio · Jul 31, 2014 · b99b517 · b99b517
2 parents 3102f10 + d3930d0
commit b99b517
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 15 deletions.
diff --git a/core/src/plugins/authfront.cas/CAS/Client.php b/core/src/plugins/authfront.cas/CAS/Client.php
@@ -1938,23 +1938,13 @@ private function getCallbackURL()
 			$final_uri .= $this->getServerUrl();
 			$request_uri = $_SERVER['REQUEST_URI'];
 			$request_uri = preg_replace('/\?.*$/','',$request_uri);
+
             /*
              * modify for pydio
              */
-            $arr_uri = explode('/', $request_uri);
-            if(count($arr_uri) >= 3){
-                array_pop($arr_uri);
-                $request_uri = implode('/', $arr_uri).'/';
-            }else if(count($arr_uri) == 2){
-                if(!empty($arr_uri[1])){
-                    $request_uri = '/'.$arr_uri[1].'/';
-                }
-                else{
-                    $request_uri = '/';
-                }
-            }else{
-                $request_uri = '/';
-            }
+            //$str_pattern = 'index|plugins|dashboard|settings|welcome|ws-(.*)';
+            //$request_uri = preg_replace($str_pattern,'',$request_uri);
+
 
             $final_uri .= $request_uri;
             /**************************************/

diff --git a/core/src/plugins/authfront.cas/manifest.xml b/core/src/plugins/authfront.cas/manifest.xml
@@ -52,7 +52,7 @@
         <external_file filename="plugins/core.auth/standard_auth_actions.xml" include="actions/*" exclude="actions/action[@name='logoutCAS']"/>
         <actions>
             <action name="logoutCAS" expireDefault="true">
-                <gui text="164" title="169" src="" accessKey="" hasAccessKey="false">
+                <gui text="164" title="169" src="decrypted.png" accessKey="" iconClass="icon-signout" hasAccessKey="false">
                     <context selection="false" dir="" recycle="false" contextMenu="false" infoPanel="false" actionBarGroup="user" ajxpWidgets="UserWidget::logging_string"></context>
                 </gui>
                 <rightsContext noUser="false" userLogged="only" guestLogged="show" read="false" write="false" adminOnly=""></rightsContext>