Inspection of "Fix slideshow in documents tool" - chamilo/chamilo-lms - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — 1.10.x ( 849f97...a21c08 )

by Angel Fernando Quiroz

created 2016-03-11 18:38 UTC

Status

Indentation +56 added lines, -56 removed lines patch added patch discarded remove patch

@@ -14,7 +14,7 @@  discard block
 block discarded – undo
 *
 **/
 function cas_configured() {
-	global $cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri;
+    global $cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri;
     $res = false;
     if (!empty($cas_auth_ver) && !empty($cas_auth_server) && !empty($cas_auth_port)) {
         $res = true;
@@ -32,23 +32,23 @@  discard block
 block discarded – undo
 
 function cas_is_authenticated()
 {
-	global $cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri;
-	global $PHPCAS_CLIENT;
-	global $logout;
+    global $cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri;
+    global $PHPCAS_CLIENT;
+    global $logout;
 
     if (!cas_configured()) {
         return;
     }
 
-	if (!is_object($PHPCAS_CLIENT)) {
-		phpCAS::client($cas_auth_ver,$cas_auth_server,$cas_auth_port,$cas_auth_uri);
-		phpCAS::setNoCasServerValidation();
-	}
-	$auth = phpCAS::checkAuthentication();
+    if (!is_object($PHPCAS_CLIENT)) {
+        phpCAS::client($cas_auth_ver,$cas_auth_server,$cas_auth_port,$cas_auth_uri);
+        phpCAS::setNoCasServerValidation();
+    }
+    $auth = phpCAS::checkAuthentication();
 
-	if ($auth) {
-		$login= trim(phpCAS::getUser());
-		/*
+    if ($auth) {
+        $login= trim(phpCAS::getUser());
+        /*
 		   Get user  attributes. Here are the attributes for crdp platform
 		   sn => name
 		   ENTPersonMailInterne => mail
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
 		   ENTPersonProfils => profil
 		   givenName => first name
 		 */
-		/*$user=phpCAS::getAttributes();
+        /*$user=phpCAS::getAttributes();
 		$firstName = trim($user['givenName']);
 		$lastName = trim($user['sn']);
 		$login = trim($user['ENTPersonAlias']);
@@ -79,54 +79,54 @@  discard block
 block discarded – undo
 			default:
 				$status=5; // Student
 		}*/
-		if (!$logout){
-		    // get user info from username
-		    $tab_user_info = api_get_user_info($login);
-
-		    // user found in the chamilo database
-		    if (is_array($tab_user_info)) {
-		        // if option is on we update user automatically from ldap server
-		        if (api_get_setting("update_user_info_cas_with_ldap") == "true") {
+        if (!$logout){
+            // get user info from username
+            $tab_user_info = api_get_user_info($login);
+
+            // user found in the chamilo database
+            if (is_array($tab_user_info)) {
+                // if option is on we update user automatically from ldap server
+                if (api_get_setting("update_user_info_cas_with_ldap") == "true") {
                     $ldapuser = extldap_authenticate($login, 'nopass', true);
                     if ($ldapuser !== false) {
                         $chamilo_user = extldap_get_chamilo_user($ldapuser);
                         $chamilo_user['user_id'] = $tab_user_info['user_id'];
                         $chamilo_user['status'] = $tab_user_info['status'];
-        				UserManager::update_user ($chamilo_user["user_id"], $chamilo_user["firstname"], $chamilo_user["lastname"], $login, null, null, $chamilo_user["email"], $chamilo_user["status"], '', '', '', '', 1, null, 0, null,'') ;
-		            }
-		        }
-		        return $login;
-		    }
-		    // user not found
-		    else {
-		        // if option is on we can ADD user automatically from ldap server or by modify own profil
-		        $user_added = false;
-		        switch (api_get_setting("cas_add_user_activate")) {
-		            case PLATFORM_AUTH_SOURCE :
-		                // user will have to modify firstname, lastname, email in chamilo profil edit
-		                $userdata = get_lang("EditInProfil");
-          				UserManager::create_user($userdata, $userdata, '5', $userdata, $login, 'casplaceholder', '','','','',CAS_AUTH_SOURCE);
-          				$user_added = $login;
-		                break;
-		            case LDAP_AUTH_SOURCE :
-		                // user info are read from ldap connexion
-	                    // get user info from ldap server
-	                    // user has already been authenticated by CAS
-	                    // If user not found in LDAP, user not created
-	                    $ldapuser = extldap_authenticate($login, 'nopass', true);
-	                    if ($ldapuser !== false) {
-	                        $chamilo_user = extldap_get_chamilo_user($ldapuser);
+                        UserManager::update_user ($chamilo_user["user_id"], $chamilo_user["firstname"], $chamilo_user["lastname"], $login, null, null, $chamilo_user["email"], $chamilo_user["status"], '', '', '', '', 1, null, 0, null,'') ;
+                    }
+                }
+                return $login;
+            }
+            // user not found
+            else {
+                // if option is on we can ADD user automatically from ldap server or by modify own profil
+                $user_added = false;
+                switch (api_get_setting("cas_add_user_activate")) {
+                    case PLATFORM_AUTH_SOURCE :
+                        // user will have to modify firstname, lastname, email in chamilo profil edit
+                        $userdata = get_lang("EditInProfil");
+                            UserManager::create_user($userdata, $userdata, '5', $userdata, $login, 'casplaceholder', '','','','',CAS_AUTH_SOURCE);
+                            $user_added = $login;
+                        break;
+                    case LDAP_AUTH_SOURCE :
+                        // user info are read from ldap connexion
+                        // get user info from ldap server
+                        // user has already been authenticated by CAS
+                        // If user not found in LDAP, user not created
+                        $ldapuser = extldap_authenticate($login, 'nopass', true);
+                        if ($ldapuser !== false) {
+                            $chamilo_user = extldap_get_chamilo_user($ldapuser);
                             $chamilo_user['username'] = $login;
                             $chamilo_user['auth_source'] = CAS_AUTH_SOURCE;
                             $chamilo_uid = external_add_user($chamilo_user);
-          				    $user_added = $login;
-          				}
-		                break;
-		            default : break;
-		        }
-		        return $user_added;
-		    }
-		}
+                                $user_added = $login;
+                            }
+                        break;
+                    default : break;
+                }
+                return $user_added;
+            }
+        }
 //		//If the user is in the dokeos database and we are ,not in a logout request, we upgrade his infomration by ldap
 //		if (! $logout){
 //			$user_table = Database::get_main_table(TABLE_MAIN_USER);
@@ -148,10 +148,10 @@  discard block
 block discarded – undo
 //
 //			}
 //		}
-		return $login;
+        return $login;
     } else {
-		return false;
-	}
+        return false;
+    }
 }
 
 /**

Please login to merge, or discard this patch.

main/auth/cas/lib/CAS/PGTStorage/pgt-file.php 1 patch

Indentation +184 added lines, -184 removed lines patch added patch discarded remove patch

@@ -28,9 +28,9 @@  discard block
 block discarded – undo
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /**
- * @file CAS/PGTStorage/pgt-file.php
- * Basic class for PGT file storage
- */
+     * @file CAS/PGTStorage/pgt-file.php
+     * Basic class for PGT file storage
+     */
 
 /**
  * @class PGTStorageFile
@@ -44,231 +44,231 @@  discard block
 block discarded – undo
 
 class PGTStorageFile extends PGTStorage
 {
-  /** 
-   * @addtogroup internalPGTStorageFile 
-   * @{ 
-   */
+    /** 
+     * @addtogroup internalPGTStorageFile 
+     * @{ 
+     */
 
-  /**
-   * a string telling where PGT's should be stored on the filesystem. Written by
-   * PGTStorageFile::PGTStorageFile(), read by getPath().
-   *
-   * @private
-   */
-  var $_path;
+    /**
+     * a string telling where PGT's should be stored on the filesystem. Written by
+     * PGTStorageFile::PGTStorageFile(), read by getPath().
+     *
+     * @private
+     */
+    var $_path;
 
-  /**
-   * This method returns the name of the directory where PGT's should be stored 
-   * on the filesystem.
-   *
-   * @return the name of a directory (with leading and trailing '/')
-   *
-   * @private
-   */
-  function getPath()
+    /**
+     * This method returns the name of the directory where PGT's should be stored 
+     * on the filesystem.
+     *
+     * @return the name of a directory (with leading and trailing '/')
+     *
+     * @private
+     */
+    function getPath()
     {
-      return $this->_path;
+        return $this->_path;
     }
 
-  /**
-   * a string telling the format to use to store PGT's (plain or xml). Written by
-   * PGTStorageFile::PGTStorageFile(), read by getFormat().
-   *
-   * @private
-   */
-  var $_format;
+    /**
+     * a string telling the format to use to store PGT's (plain or xml). Written by
+     * PGTStorageFile::PGTStorageFile(), read by getFormat().
+     *
+     * @private
+     */
+    var $_format;
 
-  /**
-   * This method returns the format to use when storing PGT's on the filesystem.
-   *
-   * @return a string corresponding to the format used (plain or xml).
-   *
-   * @private
-   */
-  function getFormat()
+    /**
+     * This method returns the format to use when storing PGT's on the filesystem.
+     *
+     * @return a string corresponding to the format used (plain or xml).
+     *
+     * @private
+     */
+    function getFormat()
     {
-      return $this->_format;
+        return $this->_format;
     }
 
-  // ########################################################################
-  //  DEBUGGING
-  // ########################################################################
+    // ########################################################################
+    //  DEBUGGING
+    // ########################################################################
   
-  /**
-   * This method returns an informational string giving the type of storage
-   * used by the object (used for debugging purposes).
-   *
-   * @return an informational string.
-   * @public
-   */
-  function getStorageType()
+    /**
+     * This method returns an informational string giving the type of storage
+     * used by the object (used for debugging purposes).
+     *
+     * @return an informational string.
+     * @public
+     */
+    function getStorageType()
     {
-      return "file";
+        return "file";
     }
 
-  /**
-   * This method returns an informational string giving informations on the
-   * parameters of the storage.(used for debugging purposes).
-   *
-   * @return an informational string.
-   * @public
-   */
-  function getStorageInfo()
+    /**
+     * This method returns an informational string giving informations on the
+     * parameters of the storage.(used for debugging purposes).
+     *
+     * @return an informational string.
+     * @public
+     */
+    function getStorageInfo()
     {
-      return 'path=`'.$this->getPath().'\', format=`'.$this->getFormat().'\'';
+        return 'path=`'.$this->getPath().'\', format=`'.$this->getFormat().'\'';
     }
 
-  // ########################################################################
-  //  CONSTRUCTOR
-  // ########################################################################
+    // ########################################################################
+    //  CONSTRUCTOR
+    // ########################################################################
   
-  /**
-   * The class constructor, called by CASClient::SetPGTStorageFile().
-   *
-   * @param $cas_parent the CASClient instance that creates the object.
-   * @param $format the format used to store the PGT's (`plain' and `xml' allowed).
-   * @param $path the path where the PGT's should be stored
-   *
-   * @public
-   */
-  function PGTStorageFile($cas_parent,$format,$path)
+    /**
+     * The class constructor, called by CASClient::SetPGTStorageFile().
+     *
+     * @param $cas_parent the CASClient instance that creates the object.
+     * @param $format the format used to store the PGT's (`plain' and `xml' allowed).
+     * @param $path the path where the PGT's should be stored
+     *
+     * @public
+     */
+    function PGTStorageFile($cas_parent,$format,$path)
     {
-      phpCAS::traceBegin();
-      // call the ancestor's constructor
-      $this->PGTStorage($cas_parent);
+        phpCAS::traceBegin();
+        // call the ancestor's constructor
+        $this->PGTStorage($cas_parent);
 
-      if (empty($format) ) $format = CAS_PGT_STORAGE_FILE_DEFAULT_FORMAT;
-      if (empty($path) ) $path = CAS_PGT_STORAGE_FILE_DEFAULT_PATH;
+        if (empty($format) ) $format = CAS_PGT_STORAGE_FILE_DEFAULT_FORMAT;
+        if (empty($path) ) $path = CAS_PGT_STORAGE_FILE_DEFAULT_PATH;
 
-      // check that the path is an absolute path
-      if (getenv("OS")=="Windows_NT"){
+        // check that the path is an absolute path
+        if (getenv("OS")=="Windows_NT"){
       	
-      	 if (!preg_match('`^[a-zA-Z]:`', $path)) {
-	     	phpCAS::error('an absolute path is needed for PGT storage to file');
-      	}
+            if (!preg_match('`^[a-zA-Z]:`', $path)) {
+                phpCAS::error('an absolute path is needed for PGT storage to file');
+            }
       	
-      }
-      else
-      {
+        }
+        else
+        {
       
-      	if ( $path[0] != '/' ) {
-			phpCAS::error('an absolute path is needed for PGT storage to file');
-      	}
+            if ( $path[0] != '/' ) {
+            phpCAS::error('an absolute path is needed for PGT storage to file');
+            }
 
-      	// store the path (with a leading and trailing '/')      
-      	$path = preg_replace('|[/]*$|','/',$path);
-      	$path = preg_replace('|^[/]*|','/',$path);
-      }
+            // store the path (with a leading and trailing '/')      
+            $path = preg_replace('|[/]*$|','/',$path);
+            $path = preg_replace('|^[/]*|','/',$path);
+        }
       
-      $this->_path = $path;
-      // check the format and store it
-      switch ($format) {
-      case CAS_PGT_STORAGE_FILE_FORMAT_PLAIN:
+        $this->_path = $path;
+        // check the format and store it
+        switch ($format) {
+        case CAS_PGT_STORAGE_FILE_FORMAT_PLAIN:
       case CAS_PGT_STORAGE_FILE_FORMAT_XML:
-	$this->_format = $format;
-	break;
-      default:
-	phpCAS::error('unknown PGT file storage format (`'.CAS_PGT_STORAGE_FILE_FORMAT_PLAIN.'\' and `'.CAS_PGT_STORAGE_FILE_FORMAT_XML.'\' allowed)');
-      }
-      phpCAS::traceEnd();      
+    $this->_format = $format;
+    break;
+        default:
+    phpCAS::error('unknown PGT file storage format (`'.CAS_PGT_STORAGE_FILE_FORMAT_PLAIN.'\' and `'.CAS_PGT_STORAGE_FILE_FORMAT_XML.'\' allowed)');
+        }
+        phpCAS::traceEnd();      
     }
 
-  // ########################################################################
-  //  INITIALIZATION
-  // ########################################################################
+    // ########################################################################
+    //  INITIALIZATION
+    // ########################################################################
   
-  /**
-   * This method is used to initialize the storage. Halts on error.
-   *
-   * @public
-   */
-  function init()
+    /**
+     * This method is used to initialize the storage. Halts on error.
+     *
+     * @public
+     */
+    function init()
     {
-      phpCAS::traceBegin();
-      // if the storage has already been initialized, return immediatly
-      if ( $this->isInitialized() )
-	return;
-      // call the ancestor's method (mark as initialized)
-      parent::init();
-      phpCAS::traceEnd();      
+        phpCAS::traceBegin();
+        // if the storage has already been initialized, return immediatly
+        if ( $this->isInitialized() )
+    return;
+        // call the ancestor's method (mark as initialized)
+        parent::init();
+        phpCAS::traceEnd();      
     }
 
-  // ########################################################################
-  //  PGT I/O
-  // ########################################################################
+    // ########################################################################
+    //  PGT I/O
+    // ########################################################################
 
-  /**
-   * This method returns the filename corresponding to a PGT Iou.
-   *
-   * @param $pgt_iou the PGT iou.
-   *
-   * @return a filename
-   * @private
-   */
-  function getPGTIouFilename($pgt_iou)
+    /**
+     * This method returns the filename corresponding to a PGT Iou.
+     *
+     * @param $pgt_iou the PGT iou.
+     *
+     * @return a filename
+     * @private
+     */
+    function getPGTIouFilename($pgt_iou)
     {
-      phpCAS::traceBegin();
-      $filename = $this->getPath().$pgt_iou.'.'.$this->getFormat();
-      phpCAS::traceEnd($filename);
-      return $filename;
+        phpCAS::traceBegin();
+        $filename = $this->getPath().$pgt_iou.'.'.$this->getFormat();
+        phpCAS::traceEnd($filename);
+        return $filename;
     }
   
-  /**
-   * This method stores a PGT and its corresponding PGT Iou into a file. Echoes a
-   * warning on error.
-   *
-   * @param $pgt the PGT
-   * @param $pgt_iou the PGT iou
-   *
-   * @public
-   */
-  function write($pgt,$pgt_iou)
+    /**
+     * This method stores a PGT and its corresponding PGT Iou into a file. Echoes a
+     * warning on error.
+     *
+     * @param $pgt the PGT
+     * @param $pgt_iou the PGT iou
+     *
+     * @public
+     */
+    function write($pgt,$pgt_iou)
     {
-      phpCAS::traceBegin();
-      $fname = $this->getPGTIouFilename($pgt_iou);
-      if ( $f=fopen($fname,"w") ) {
-	if ( fputs($f,$pgt) === FALSE ) {
-	  phpCAS::error('could not write PGT to `'.$fname.'\'');
-	}
-	fclose($f);
-      } else {
-	phpCAS::error('could not open `'.$fname.'\'');
-      }
-      phpCAS::traceEnd();      
+        phpCAS::traceBegin();
+        $fname = $this->getPGTIouFilename($pgt_iou);
+        if ( $f=fopen($fname,"w") ) {
+    if ( fputs($f,$pgt) === FALSE ) {
+        phpCAS::error('could not write PGT to `'.$fname.'\'');
+    }
+    fclose($f);
+        } else {
+    phpCAS::error('could not open `'.$fname.'\'');
+        }
+        phpCAS::traceEnd();      
     }
 
-  /**
-   * This method reads a PGT corresponding to a PGT Iou and deletes the 
-   * corresponding file.
-   *
-   * @param $pgt_iou the PGT iou
-   *
-   * @return the corresponding PGT, or FALSE on error
-   *
-   * @public
-   */
-  function read($pgt_iou)
+    /**
+     * This method reads a PGT corresponding to a PGT Iou and deletes the 
+     * corresponding file.
+     *
+     * @param $pgt_iou the PGT iou
+     *
+     * @return the corresponding PGT, or FALSE on error
+     *
+     * @public
+     */
+    function read($pgt_iou)
     {
-      phpCAS::traceBegin();
-      $pgt = FALSE;
-      $fname = $this->getPGTIouFilename($pgt_iou);
-      if ( !($f=fopen($fname,"r")) ) {
-	phpCAS::trace('could not open `'.$fname.'\'');
-      } else {
-	if ( ($pgt=fgets($f)) === FALSE ) {
-	  phpCAS::trace('could not read PGT from `'.$fname.'\'');
-	} 
-	fclose($f);
-      }
+        phpCAS::traceBegin();
+        $pgt = FALSE;
+        $fname = $this->getPGTIouFilename($pgt_iou);
+        if ( !($f=fopen($fname,"r")) ) {
+    phpCAS::trace('could not open `'.$fname.'\'');
+        } else {
+    if ( ($pgt=fgets($f)) === FALSE ) {
+        phpCAS::trace('could not read PGT from `'.$fname.'\'');
+    } 
+    fclose($f);
+        }
 
-      // delete the PGT file
-      @unlink($fname);
+        // delete the PGT file
+        @unlink($fname);
 
-      phpCAS::traceEnd($pgt);
-      return $pgt;
+        phpCAS::traceEnd($pgt);
+        return $pgt;
     }
   
-  /** @} */
+    /** @} */
   
 }
 

Please login to merge, or discard this patch.

main/auth/cas/lib/CAS/PGTStorage/pgt-main.php 1 patch

Indentation +131 added lines, -131 removed lines patch added patch discarded remove patch

@@ -44,167 +44,167 @@
 block discarded – undo
 
 class PGTStorage
 {
-  /** 
-   * @addtogroup internalPGTStorage
-   * @{ 
-   */
-
-  // ########################################################################
-  //  CONSTRUCTOR
-  // ########################################################################
+    /** 
+     * @addtogroup internalPGTStorage
+     * @{ 
+     */
+
+    // ########################################################################
+    //  CONSTRUCTOR
+    // ########################################################################
   
-  /**
-   * The constructor of the class, should be called only by inherited classes.
-   *
-   * @param $cas_parent the CASclient instance that creates the current object.
-   *
-   * @protected
-   */
-  function PGTStorage($cas_parent)
+    /**
+     * The constructor of the class, should be called only by inherited classes.
+     *
+     * @param $cas_parent the CASclient instance that creates the current object.
+     *
+     * @protected
+     */
+    function PGTStorage($cas_parent)
     {
-      phpCAS::traceBegin();
-      if ( !$cas_parent->isProxy() ) {
-	phpCAS::error('defining PGT storage makes no sense when not using a CAS proxy'); 
-      }
-      phpCAS::traceEnd();
+        phpCAS::traceBegin();
+        if ( !$cas_parent->isProxy() ) {
+    phpCAS::error('defining PGT storage makes no sense when not using a CAS proxy'); 
+        }
+        phpCAS::traceEnd();
     }
 
-  // ########################################################################
-  //  DEBUGGING
-  // ########################################################################
+    // ########################################################################
+    //  DEBUGGING
+    // ########################################################################
   
-  /**
-   * This virtual method returns an informational string giving the type of storage
-   * used by the object (used for debugging purposes).
-   *
-   * @public
-   */
-  function getStorageType()
+    /**
+     * This virtual method returns an informational string giving the type of storage
+     * used by the object (used for debugging purposes).
+     *
+     * @public
+     */
+    function getStorageType()
     {
-      phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); 
+        phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); 
     }
 
-  /**
-   * This virtual method returns an informational string giving informations on the
-   * parameters of the storage.(used for debugging purposes).
-   *
-   * @public
-   */
-  function getStorageInfo()
+    /**
+     * This virtual method returns an informational string giving informations on the
+     * parameters of the storage.(used for debugging purposes).
+     *
+     * @public
+     */
+    function getStorageInfo()
     {
-      phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); 
+        phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); 
     }
 
-  // ########################################################################
-  //  ERROR HANDLING
-  // ########################################################################
+    // ########################################################################
+    //  ERROR HANDLING
+    // ########################################################################
   
-  /**
-   * string used to store an error message. Written by PGTStorage::setErrorMessage(),
-   * read by PGTStorage::getErrorMessage().
-   *
-   * @hideinitializer
-   * @private
-   * @deprecated not used.
-   */
-  var $_error_message=FALSE;
-
-  /**
-   * This method sets en error message, which can be read later by 
-   * PGTStorage::getErrorMessage().
-   *
-   * @param $error_message an error message
-   *
-   * @protected
-   * @deprecated not used.
-   */
-  function setErrorMessage($error_message)
+    /**
+     * string used to store an error message. Written by PGTStorage::setErrorMessage(),
+     * read by PGTStorage::getErrorMessage().
+     *
+     * @hideinitializer
+     * @private
+     * @deprecated not used.
+     */
+    var $_error_message=FALSE;
+
+    /**
+     * This method sets en error message, which can be read later by 
+     * PGTStorage::getErrorMessage().
+     *
+     * @param $error_message an error message
+     *
+     * @protected
+     * @deprecated not used.
+     */
+    function setErrorMessage($error_message)
     {
-      $this->_error_message = $error_message;
+        $this->_error_message = $error_message;
     }
 
-  /**
-   * This method returns an error message set by PGTStorage::setErrorMessage().
-   *
-   * @return an error message when set by PGTStorage::setErrorMessage(), FALSE
-   * otherwise.
-   *
-   * @public
-   * @deprecated not used.
-   */
-  function getErrorMessage()
+    /**
+     * This method returns an error message set by PGTStorage::setErrorMessage().
+     *
+     * @return an error message when set by PGTStorage::setErrorMessage(), FALSE
+     * otherwise.
+     *
+     * @public
+     * @deprecated not used.
+     */
+    function getErrorMessage()
     {
-      return $this->_error_message;
+        return $this->_error_message;
     }
 
-  // ########################################################################
-  //  INITIALIZATION
-  // ########################################################################
-
-  /**
-   * a boolean telling if the storage has already been initialized. Written by 
-   * PGTStorage::init(), read by PGTStorage::isInitialized().
-   *
-   * @hideinitializer
-   * @private
-   */
-  var $_initialized = FALSE;
-
-  /**
-   * This method tells if the storage has already been intialized.
-   *
-   * @return a boolean
-   *
-   * @protected
-   */
-  function isInitialized()
+    // ########################################################################
+    //  INITIALIZATION
+    // ########################################################################
+
+    /**
+     * a boolean telling if the storage has already been initialized. Written by 
+     * PGTStorage::init(), read by PGTStorage::isInitialized().
+     *
+     * @hideinitializer
+     * @private
+     */
+    var $_initialized = FALSE;
+
+    /**
+     * This method tells if the storage has already been intialized.
+     *
+     * @return a boolean
+     *
+     * @protected
+     */
+    function isInitialized()
     {
-      return $this->_initialized;
+        return $this->_initialized;
     }
 
-  /**
-   * This virtual method initializes the object.
-   *
-   * @protected
-   */
-  function init()
+    /**
+     * This virtual method initializes the object.
+     *
+     * @protected
+     */
+    function init()
     {
-      $this->_initialized = TRUE;
+        $this->_initialized = TRUE;
     }
 
-  // ########################################################################
-  //  PGT I/O
-  // ########################################################################
-
-  /**
-   * This virtual method stores a PGT and its corresponding PGT Iuo.
-   * @note Should never be called.
-   *
-   * @param $pgt the PGT
-   * @param $pgt_iou the PGT iou
-   *
-   * @protected
-   */
-  function write($pgt,$pgt_iou)
+    // ########################################################################
+    //  PGT I/O
+    // ########################################################################
+
+    /**
+     * This virtual method stores a PGT and its corresponding PGT Iuo.
+     * @note Should never be called.
+     *
+     * @param $pgt the PGT
+     * @param $pgt_iou the PGT iou
+     *
+     * @protected
+     */
+    function write($pgt,$pgt_iou)
     {
-      phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); 
+        phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); 
     }
 
-  /**
-   * This virtual method reads a PGT corresponding to a PGT Iou and deletes
-   * the corresponding storage entry.
-   * @note Should never be called.
-   *
-   * @param $pgt_iou the PGT iou
-   *
-   * @protected
-   */
-  function read($pgt_iou)
+    /**
+     * This virtual method reads a PGT corresponding to a PGT Iou and deletes
+     * the corresponding storage entry.
+     * @note Should never be called.
+     *
+     * @param $pgt_iou the PGT iou
+     *
+     * @protected
+     */
+    function read($pgt_iou)
     {
-      phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); 
+        phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); 
     }
 
-  /** @} */
+    /** @} */
   
 } 
 

Please login to merge, or discard this patch.

main/auth/cas/lib/CAS/languages/german.php 1 patch

Indentation +14 added lines, -14 removed lines patch added patch discarded remove patch

@@ -8,20 +8,20 @@
 block discarded – undo
  */
 
 $this->_strings = array(
- CAS_STR_USING_SERVER 
- => 'via Server',
- CAS_STR_AUTHENTICATION_WANTED 
- => 'CAS Authentifizierung erforderlich!',
- CAS_STR_LOGOUT 
- => 'CAS Abmeldung!',
- CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 
- => 'eigentlich h&auml;ten Sie zum CAS Server weitergeleitet werden sollen. Dr&uuml;cken Sie <a href="%s">hier</a> um fortzufahren.',
- CAS_STR_AUTHENTICATION_FAILED 
- => 'CAS Anmeldung fehlgeschlagen!',
- CAS_STR_YOU_WERE_NOT_AUTHENTICATED 
- => '<p>Sie wurden nicht angemeldet.</p><p>Um es erneut zu versuchen klicken Sie <a href="%s">hier</a>.</p><p>Wenn das Problem bestehen bleibt, kontkatieren Sie den <a href="mailto:%s">Administrator</a> dieser Seite.</p>',
- CAS_STR_SERVICE_UNAVAILABLE
- => 'Der Dienst `<b>%s</b>\' ist nicht verf&uuml;gbar (<b>%s</b>).'
+    CAS_STR_USING_SERVER 
+    => 'via Server',
+    CAS_STR_AUTHENTICATION_WANTED 
+    => 'CAS Authentifizierung erforderlich!',
+    CAS_STR_LOGOUT 
+    => 'CAS Abmeldung!',
+    CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 
+    => 'eigentlich h&auml;ten Sie zum CAS Server weitergeleitet werden sollen. Dr&uuml;cken Sie <a href="%s">hier</a> um fortzufahren.',
+    CAS_STR_AUTHENTICATION_FAILED 
+    => 'CAS Anmeldung fehlgeschlagen!',
+    CAS_STR_YOU_WERE_NOT_AUTHENTICATED 
+    => '<p>Sie wurden nicht angemeldet.</p><p>Um es erneut zu versuchen klicken Sie <a href="%s">hier</a>.</p><p>Wenn das Problem bestehen bleibt, kontkatieren Sie den <a href="mailto:%s">Administrator</a> dieser Seite.</p>',
+    CAS_STR_SERVICE_UNAVAILABLE
+    => 'Der Dienst `<b>%s</b>\' ist nicht verf&uuml;gbar (<b>%s</b>).'
 );
 
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

main/auth/cas/lib/CAS/languages/catalan.php 1 patch

Indentation +14 added lines, -14 removed lines patch added patch discarded remove patch

@@ -8,20 +8,20 @@
 block discarded – undo
  */
 
 $this->_strings = array(
- CAS_STR_USING_SERVER 
- => 'usant servidor',
- CAS_STR_AUTHENTICATION_WANTED 
- => 'Autentificació CAS necessària!',
- CAS_STR_LOGOUT 
- => 'Sortida de CAS necessària!',
- CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 
- => 'Ja hauria d\ haver estat redireccionat al servidor CAS. Feu click <a href="%s">aquí</a> per a continuar.',
- CAS_STR_AUTHENTICATION_FAILED 
- => 'Autentificació CAS fallida!',
- CAS_STR_YOU_WERE_NOT_AUTHENTICATED 
- => '<p>No estàs autentificat.</p><p>Pots tornar a intentar-ho fent click <a href="%s">aquí</a>.</p><p>Si el problema persisteix hauría de contactar amb l\'<a href="mailto:%s">administrador d\'aquest llocc</a>.</p>',
- CAS_STR_SERVICE_UNAVAILABLE
- => 'El servei `<b>%s</b>\' no està disponible (<b>%s</b>).'
+    CAS_STR_USING_SERVER 
+    => 'usant servidor',
+    CAS_STR_AUTHENTICATION_WANTED 
+    => 'Autentificació CAS necessària!',
+    CAS_STR_LOGOUT 
+    => 'Sortida de CAS necessària!',
+    CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 
+    => 'Ja hauria d\ haver estat redireccionat al servidor CAS. Feu click <a href="%s">aquí</a> per a continuar.',
+    CAS_STR_AUTHENTICATION_FAILED 
+    => 'Autentificació CAS fallida!',
+    CAS_STR_YOU_WERE_NOT_AUTHENTICATED 
+    => '<p>No estàs autentificat.</p><p>Pots tornar a intentar-ho fent click <a href="%s">aquí</a>.</p><p>Si el problema persisteix hauría de contactar amb l\'<a href="mailto:%s">administrador d\'aquest llocc</a>.</p>',
+    CAS_STR_SERVICE_UNAVAILABLE
+    => 'El servei `<b>%s</b>\' no està disponible (<b>%s</b>).'
 );
 
 ?>

Please login to merge, or discard this patch.

main/auth/cas/lib/CAS/languages/english.php 1 patch

Indentation +14 added lines, -14 removed lines patch added patch discarded remove patch

@@ -8,20 +8,20 @@
 block discarded – undo
  */
 
 $this->_strings = array(
- CAS_STR_USING_SERVER 
- => 'using server',
- CAS_STR_AUTHENTICATION_WANTED 
- => 'CAS Authentication wanted!',
- CAS_STR_LOGOUT 
- => 'CAS logout wanted!',
- CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 
- => 'You should already have been redirected to the CAS server. Click <a href="%s">here</a> to continue.',
- CAS_STR_AUTHENTICATION_FAILED 
- => 'CAS Authentication failed!',
- CAS_STR_YOU_WERE_NOT_AUTHENTICATED 
- => '<p>You were not authenticated.</p><p>You may submit your request again by clicking <a href="%s">here</a>.</p><p>If the problem persists, you may contact <a href="mailto:%s">the administrator of this site</a>.</p>',
- CAS_STR_SERVICE_UNAVAILABLE
- => 'The service `<b>%s</b>\' is not available (<b>%s</b>).'
+    CAS_STR_USING_SERVER 
+    => 'using server',
+    CAS_STR_AUTHENTICATION_WANTED 
+    => 'CAS Authentication wanted!',
+    CAS_STR_LOGOUT 
+    => 'CAS logout wanted!',
+    CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 
+    => 'You should already have been redirected to the CAS server. Click <a href="%s">here</a> to continue.',
+    CAS_STR_AUTHENTICATION_FAILED 
+    => 'CAS Authentication failed!',
+    CAS_STR_YOU_WERE_NOT_AUTHENTICATED 
+    => '<p>You were not authenticated.</p><p>You may submit your request again by clicking <a href="%s">here</a>.</p><p>If the problem persists, you may contact <a href="mailto:%s">the administrator of this site</a>.</p>',
+    CAS_STR_SERVICE_UNAVAILABLE
+    => 'The service `<b>%s</b>\' is not available (<b>%s</b>).'
 );
 
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

main/auth/cas/lib/CAS/languages/japanese.php 1 patch

Indentation +14 added lines, -14 removed lines patch added patch discarded remove patch

@@ -8,20 +8,20 @@
 block discarded – undo
  **/
 
 $this->_strings = array(
- CAS_STR_USING_SERVER 
- => 'using server',
- CAS_STR_AUTHENTICATION_WANTED 
- => 'CAS�ˤ��ǧ�ڤ�Ԥ��ޤ�',
- CAS_STR_LOGOUT 
- => 'CAS����?�����Ȥ��ޤ�!',
- CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 
- => 'CAS�����Ф˹Ԥ�ɬ�פ�����ޤ�����ưŪ��ž������ʤ����� <a href="%s">������</a> �

Please login to merge, or discard this patch.

main/auth/cas/lib/CAS/languages/greek.php 1 patch

Indentation +14 added lines, -14 removed lines patch added patch discarded remove patch

		@@ -8,20 +8,20 @@
		block discarded – undo
8	8	*/
9	9
10	10	$this->_strings = array(
11		- CAS_STR_USING_SERVER
12		- => '�� ',
13		- CAS_STR_AUTHENTICATION_WANTED
14		- => '�� CAS!',
15		- CAS_STR_LOGOUT
16		- => '�� CAS!',
17		- CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED
18		- => '�� CAS. �� <a href="%s">��</a> �� .',
19		- CAS_STR_AUTHENTICATION_FAILED
20		- => '� �� CAS ��!',
21		- CAS_STR_YOU_WERE_NOT_AUTHENTICATED
22		- => '<p>�� .</p><p>�� , �� <a href="%s">��</a>.</p><p>�� , �� <a href="mailto:%s">��</a>.</p>',
23		- CAS_STR_SERVICE_UNAVAILABLE
24		- => '� �� `<b>%s</b>\' �� (<b>%s</b>).'
	11	+ CAS_STR_USING_SERVER
	12	+ => '�� ',
	13	+ CAS_STR_AUTHENTICATION_WANTED
	14	+ => '�� CAS!',
	15	+ CAS_STR_LOGOUT
	16	+ => '�� CAS!',
	17	+ CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED
	18	+ => '�� CAS. �� <a href="%s">��</a> �� .',
	19	+ CAS_STR_AUTHENTICATION_FAILED
	20	+ => '� �� CAS ��!',
	21	+ CAS_STR_YOU_WERE_NOT_AUTHENTICATED
	22	+ => '<p>�� .</p><p>�� , �� <a href="%s">��</a>.</p><p>�� , �� <a href="mailto:%s">��</a>.</p>',
	23	+ CAS_STR_SERVICE_UNAVAILABLE
	24	+ => '� �� `<b>%s</b>\' �� (<b>%s</b>).'
25	25	);
26	26
27	27	?>
28	28	\ No newline at end of file

Please login to merge, or discard this patch.

main/auth/cas/lib/CAS/languages/french.php 1 patch

Indentation +14 added lines, -14 removed lines patch added patch discarded remove patch

@@ -8,20 +8,20 @@
 block discarded – undo
  */
 
 $this->_strings = array(
- CAS_STR_USING_SERVER 
- => 'utilisant le serveur',
- CAS_STR_AUTHENTICATION_WANTED 
- => 'Authentication CAS n�cessaire&nbsp;!',
- CAS_STR_LOGOUT 
- => 'D�connexion demand�e&nbsp;!',
- CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 
- => 'Vous auriez du etre redirig�(e) vers le serveur CAS. Cliquez <a href="%s">ici</a> pour continuer.',
- CAS_STR_AUTHENTICATION_FAILED 
- => 'Authentification CAS infructueuse&nbsp;!',
- CAS_STR_YOU_WERE_NOT_AUTHENTICATED 
- => '<p>Vous n\'avez pas �t� authentifi�(e).</p><p>Vous pouvez soumettre votre requete � nouveau en cliquant <a href="%s">ici</a>.</p><p>Si le probl�me persiste, vous pouvez contacter <a href="mailto:%s">l\'administrateur de ce site</a>.</p>',
- CAS_STR_SERVICE_UNAVAILABLE
- => 'Le service `<b>%s</b>\' est indisponible (<b>%s</b>)'
+    CAS_STR_USING_SERVER 
+    => 'utilisant le serveur',
+    CAS_STR_AUTHENTICATION_WANTED 
+    => 'Authentication CAS n�cessaire&nbsp;!',
+    CAS_STR_LOGOUT 
+    => 'D�connexion demand�e&nbsp;!',
+    CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 
+    => 'Vous auriez du etre redirig�(e) vers le serveur CAS. Cliquez <a href="%s">ici</a> pour continuer.',
+    CAS_STR_AUTHENTICATION_FAILED 
+    => 'Authentification CAS infructueuse&nbsp;!',
+    CAS_STR_YOU_WERE_NOT_AUTHENTICATED 
+    => '<p>Vous n\'avez pas �t� authentifi�(e).</p><p>Vous pouvez soumettre votre requete � nouveau en cliquant <a href="%s">ici</a>.</p><p>Si le probl�me persiste, vous pouvez contacter <a href="mailto:%s">l\'administrateur de ce site</a>.</p>',
+    CAS_STR_SERVICE_UNAVAILABLE
+    => 'Le service `<b>%s</b>\' est indisponible (<b>%s</b>)'
 
 );
 

Please login to merge, or discard this patch.

		@@ -14,7 +14,7 @@ discard block
		block discarded – undo
14	14	*
15	15	**/
16	16	function cas_configured() {
17		- global $cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri;
	17	+ global $cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri;
18	18	$res = false;
19	19	if (!empty($cas_auth_ver) && !empty($cas_auth_server) && !empty($cas_auth_port)) {
20	20	$res = true;
		@@ -32,23 +32,23 @@ discard block
		block discarded – undo
32	32
33	33	function cas_is_authenticated()
34	34	{
35		- global $cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri;
36		- global $PHPCAS_CLIENT;
37		- global $logout;
	35	+ global $cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri;
	36	+ global $PHPCAS_CLIENT;
	37	+ global $logout;
38	38
39	39	if (!cas_configured()) {
40	40	return;
41	41	}
42	42
43		- if (!is_object($PHPCAS_CLIENT)) {
44		- phpCAS::client($cas_auth_ver,$cas_auth_server,$cas_auth_port,$cas_auth_uri);
45		- phpCAS::setNoCasServerValidation();
46		- }
47		- $auth = phpCAS::checkAuthentication();
	43	+ if (!is_object($PHPCAS_CLIENT)) {
	44	+ phpCAS::client($cas_auth_ver,$cas_auth_server,$cas_auth_port,$cas_auth_uri);
	45	+ phpCAS::setNoCasServerValidation();
	46	+ }
	47	+ $auth = phpCAS::checkAuthentication();
48	48
49		- if ($auth) {
50		- $login= trim(phpCAS::getUser());
51		- /*
	49	+ if ($auth) {
	50	+ $login= trim(phpCAS::getUser());
	51	+ /*
52	52	Get user attributes. Here are the attributes for crdp platform
53	53	sn => name
54	54	ENTPersonMailInterne => mail
		@@ -56,7 +56,7 @@ discard block
		block discarded – undo
56	56	ENTPersonProfils => profil
57	57	givenName => first name
58	58	*/
59		- /*$user=phpCAS::getAttributes();
	59	+ /*$user=phpCAS::getAttributes();
60	60	$firstName = trim($user['givenName']);
61	61	$lastName = trim($user['sn']);
62	62	$login = trim($user['ENTPersonAlias']);
		@@ -79,54 +79,54 @@ discard block
		block discarded – undo
79	79	default:
80	80	$status=5; // Student
81	81	}*/
82		- if (!$logout){
83		- // get user info from username
84		- $tab_user_info = api_get_user_info($login);
85		-
86		- // user found in the chamilo database
87		- if (is_array($tab_user_info)) {
88		- // if option is on we update user automatically from ldap server
89		- if (api_get_setting("update_user_info_cas_with_ldap") == "true") {
	82	+ if (!$logout){
	83	+ // get user info from username
	84	+ $tab_user_info = api_get_user_info($login);
	85	+
	86	+ // user found in the chamilo database
	87	+ if (is_array($tab_user_info)) {
	88	+ // if option is on we update user automatically from ldap server
	89	+ if (api_get_setting("update_user_info_cas_with_ldap") == "true") {
90	90	$ldapuser = extldap_authenticate($login, 'nopass', true);
91	91	if ($ldapuser !== false) {
92	92	$chamilo_user = extldap_get_chamilo_user($ldapuser);
93	93	$chamilo_user['user_id'] = $tab_user_info['user_id'];
94	94	$chamilo_user['status'] = $tab_user_info['status'];
95		- UserManager::update_user ($chamilo_user["user_id"], $chamilo_user["firstname"], $chamilo_user["lastname"], $login, null, null, $chamilo_user["email"], $chamilo_user["status"], '', '', '', '', 1, null, 0, null,'') ;
96		- }
97		- }
98		- return $login;
99		- }
100		- // user not found
101		- else {
102		- // if option is on we can ADD user automatically from ldap server or by modify own profil
103		- $user_added = false;
104		- switch (api_get_setting("cas_add_user_activate")) {
105		- case PLATFORM_AUTH_SOURCE :
106		- // user will have to modify firstname, lastname, email in chamilo profil edit
107		- $userdata = get_lang("EditInProfil");
108		- UserManager::create_user($userdata, $userdata, '5', $userdata, $login, 'casplaceholder', '','','','',CAS_AUTH_SOURCE);
109		- $user_added = $login;
110		- break;
111		- case LDAP_AUTH_SOURCE :
112		- // user info are read from ldap connexion
113		- // get user info from ldap server
114		- // user has already been authenticated by CAS
115		- // If user not found in LDAP, user not created
116		- $ldapuser = extldap_authenticate($login, 'nopass', true);
117		- if ($ldapuser !== false) {
118		- $chamilo_user = extldap_get_chamilo_user($ldapuser);
	95	+ UserManager::update_user ($chamilo_user["user_id"], $chamilo_user["firstname"], $chamilo_user["lastname"], $login, null, null, $chamilo_user["email"], $chamilo_user["status"], '', '', '', '', 1, null, 0, null,'') ;
	96	+ }
	97	+ }
	98	+ return $login;
	99	+ }
	100	+ // user not found
	101	+ else {
	102	+ // if option is on we can ADD user automatically from ldap server or by modify own profil
	103	+ $user_added = false;
	104	+ switch (api_get_setting("cas_add_user_activate")) {
	105	+ case PLATFORM_AUTH_SOURCE :
	106	+ // user will have to modify firstname, lastname, email in chamilo profil edit
	107	+ $userdata = get_lang("EditInProfil");
	108	+ UserManager::create_user($userdata, $userdata, '5', $userdata, $login, 'casplaceholder', '','','','',CAS_AUTH_SOURCE);
	109	+ $user_added = $login;
	110	+ break;
	111	+ case LDAP_AUTH_SOURCE :
	112	+ // user info are read from ldap connexion
	113	+ // get user info from ldap server
	114	+ // user has already been authenticated by CAS
	115	+ // If user not found in LDAP, user not created
	116	+ $ldapuser = extldap_authenticate($login, 'nopass', true);
	117	+ if ($ldapuser !== false) {
	118	+ $chamilo_user = extldap_get_chamilo_user($ldapuser);
119	119	$chamilo_user['username'] = $login;
120	120	$chamilo_user['auth_source'] = CAS_AUTH_SOURCE;
121	121	$chamilo_uid = external_add_user($chamilo_user);
122		- $user_added = $login;
123		- }
124		- break;
125		- default : break;
126		- }
127		- return $user_added;
128		- }
129		- }
	122	+ $user_added = $login;
	123	+ }
	124	+ break;
	125	+ default : break;
	126	+ }
	127	+ return $user_added;
	128	+ }
	129	+ }
130	130	// //If the user is in the dokeos database and we are ,not in a logout request, we upgrade his infomration by ldap
131	131	// if (! $logout){
132	132	// $user_table = Database::get_main_table(TABLE_MAIN_USER);
		@@ -148,10 +148,10 @@ discard block
		block discarded – undo
148	148	//
149	149	// }
150	150	// }
151		- return $login;
	151	+ return $login;
152	152	} else {
153		- return false;
154		- }
	153	+ return false;
	154	+ }
155	155	}
156	156
157	157	/**

		@@ -28,9 +28,9 @@ discard block
		block discarded – undo
28	28	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29	29	*/
30	30	/**
31		- * @file CAS/PGTStorage/pgt-file.php
32		- * Basic class for PGT file storage
33		- */
	31	+ * @file CAS/PGTStorage/pgt-file.php
	32	+ * Basic class for PGT file storage
	33	+ */
34	34
35	35	/**
36	36	* @class PGTStorageFile
		@@ -44,231 +44,231 @@ discard block
		block discarded – undo
44	44
45	45	class PGTStorageFile extends PGTStorage
46	46	{
47		- /**
48		- * @addtogroup internalPGTStorageFile
49		- * @{
50		- */
	47	+ /**
	48	+ * @addtogroup internalPGTStorageFile
	49	+ * @{
	50	+ */
51	51
52		- /**
53		- * a string telling where PGT's should be stored on the filesystem. Written by
54		- * PGTStorageFile::PGTStorageFile(), read by getPath().
55		- *
56		- * @private
57		- */
58		- var $_path;
	52	+ /**
	53	+ * a string telling where PGT's should be stored on the filesystem. Written by
	54	+ * PGTStorageFile::PGTStorageFile(), read by getPath().
	55	+ *
	56	+ * @private
	57	+ */
	58	+ var $_path;
59	59
60		- /**
61		- * This method returns the name of the directory where PGT's should be stored
62		- * on the filesystem.
63		- *
64		- * @return the name of a directory (with leading and trailing '/')
65		- *
66		- * @private
67		- */
68		- function getPath()
	60	+ /**
	61	+ * This method returns the name of the directory where PGT's should be stored
	62	+ * on the filesystem.
	63	+ *
	64	+ * @return the name of a directory (with leading and trailing '/')
	65	+ *
	66	+ * @private
	67	+ */
	68	+ function getPath()
69	69	{
70		- return $this->_path;
	70	+ return $this->_path;
71	71	}
72	72
73		- /**
74		- * a string telling the format to use to store PGT's (plain or xml). Written by
75		- * PGTStorageFile::PGTStorageFile(), read by getFormat().
76		- *
77		- * @private
78		- */
79		- var $_format;
	73	+ /**
	74	+ * a string telling the format to use to store PGT's (plain or xml). Written by
	75	+ * PGTStorageFile::PGTStorageFile(), read by getFormat().
	76	+ *
	77	+ * @private
	78	+ */
	79	+ var $_format;
80	80
81		- /**
82		- * This method returns the format to use when storing PGT's on the filesystem.
83		- *
84		- * @return a string corresponding to the format used (plain or xml).
85		- *
86		- * @private
87		- */
88		- function getFormat()
	81	+ /**
	82	+ * This method returns the format to use when storing PGT's on the filesystem.
	83	+ *
	84	+ * @return a string corresponding to the format used (plain or xml).
	85	+ *
	86	+ * @private
	87	+ */
	88	+ function getFormat()
89	89	{
90		- return $this->_format;
	90	+ return $this->_format;
91	91	}
92	92
93		- // ########################################################################
94		- // DEBUGGING
95		- // ########################################################################
	93	+ // ########################################################################
	94	+ // DEBUGGING
	95	+ // ########################################################################
96	96
97		- /**
98		- * This method returns an informational string giving the type of storage
99		- * used by the object (used for debugging purposes).
100		- *
101		- * @return an informational string.
102		- * @public
103		- */
104		- function getStorageType()
	97	+ /**
	98	+ * This method returns an informational string giving the type of storage
	99	+ * used by the object (used for debugging purposes).
	100	+ *
	101	+ * @return an informational string.
	102	+ * @public
	103	+ */
	104	+ function getStorageType()
105	105	{
106		- return "file";
	106	+ return "file";
107	107	}
108	108
109		- /**
110		- * This method returns an informational string giving informations on the
111		- * parameters of the storage.(used for debugging purposes).
112		- *
113		- * @return an informational string.
114		- * @public
115		- */
116		- function getStorageInfo()
	109	+ /**
	110	+ * This method returns an informational string giving informations on the
	111	+ * parameters of the storage.(used for debugging purposes).
	112	+ *
	113	+ * @return an informational string.
	114	+ * @public
	115	+ */
	116	+ function getStorageInfo()
117	117	{
118		- return 'path=`'.$this->getPath().'\', format=`'.$this->getFormat().'\'';
	118	+ return 'path=`'.$this->getPath().'\', format=`'.$this->getFormat().'\'';
119	119	}
120	120
121		- // ########################################################################
122		- // CONSTRUCTOR
123		- // ########################################################################
	121	+ // ########################################################################
	122	+ // CONSTRUCTOR
	123	+ // ########################################################################
124	124
125		- /**
126		- * The class constructor, called by CASClient::SetPGTStorageFile().
127		- *
128		- * @param $cas_parent the CASClient instance that creates the object.
129		- * @param $format the format used to store the PGT's (`plain' and `xml' allowed).
130		- * @param $path the path where the PGT's should be stored
131		- *
132		- * @public
133		- */
134		- function PGTStorageFile($cas_parent,$format,$path)
	125	+ /**
	126	+ * The class constructor, called by CASClient::SetPGTStorageFile().
	127	+ *
	128	+ * @param $cas_parent the CASClient instance that creates the object.
	129	+ * @param $format the format used to store the PGT's (`plain' and `xml' allowed).
	130	+ * @param $path the path where the PGT's should be stored
	131	+ *
	132	+ * @public
	133	+ */
	134	+ function PGTStorageFile($cas_parent,$format,$path)
135	135	{
136		- phpCAS::traceBegin();
137		- // call the ancestor's constructor
138		- $this->PGTStorage($cas_parent);
	136	+ phpCAS::traceBegin();
	137	+ // call the ancestor's constructor
	138	+ $this->PGTStorage($cas_parent);
139	139
140		- if (empty($format) ) $format = CAS_PGT_STORAGE_FILE_DEFAULT_FORMAT;
141		- if (empty($path) ) $path = CAS_PGT_STORAGE_FILE_DEFAULT_PATH;
	140	+ if (empty($format) ) $format = CAS_PGT_STORAGE_FILE_DEFAULT_FORMAT;
	141	+ if (empty($path) ) $path = CAS_PGT_STORAGE_FILE_DEFAULT_PATH;
142	142
143		- // check that the path is an absolute path
144		- if (getenv("OS")=="Windows_NT"){
	143	+ // check that the path is an absolute path
	144	+ if (getenv("OS")=="Windows_NT"){
145	145
146		- if (!preg_match('`^[a-zA-Z]:`', $path)) {
147		- phpCAS::error('an absolute path is needed for PGT storage to file');
148		- }
	146	+ if (!preg_match('`^[a-zA-Z]:`', $path)) {
	147	+ phpCAS::error('an absolute path is needed for PGT storage to file');
	148	+ }
149	149
150		- }
151		- else
152		- {
	150	+ }
	151	+ else
	152	+ {
153	153
154		- if ( $path[0] != '/' ) {
155		- phpCAS::error('an absolute path is needed for PGT storage to file');
156		- }
	154	+ if ( $path[0] != '/' ) {
	155	+ phpCAS::error('an absolute path is needed for PGT storage to file');
	156	+ }
157	157
158		- // store the path (with a leading and trailing '/')
159		- $path = preg_replace('\|[/]*$\|','/',$path);
160		- $path = preg_replace('\|^[/]*\|','/',$path);
161		- }
	158	+ // store the path (with a leading and trailing '/')
	159	+ $path = preg_replace('\|[/]*$\|','/',$path);
	160	+ $path = preg_replace('\|^[/]*\|','/',$path);
	161	+ }
162	162
163		- $this->_path = $path;
164		- // check the format and store it
165		- switch ($format) {
166		- case CAS_PGT_STORAGE_FILE_FORMAT_PLAIN:
	163	+ $this->_path = $path;
	164	+ // check the format and store it
	165	+ switch ($format) {
	166	+ case CAS_PGT_STORAGE_FILE_FORMAT_PLAIN:
167	167	case CAS_PGT_STORAGE_FILE_FORMAT_XML:
168		- $this->_format = $format;
169		- break;
170		- default:
171		- phpCAS::error('unknown PGT file storage format (`'.CAS_PGT_STORAGE_FILE_FORMAT_PLAIN.'\' and `'.CAS_PGT_STORAGE_FILE_FORMAT_XML.'\' allowed)');
172		- }
173		- phpCAS::traceEnd();
	168	+ $this->_format = $format;
	169	+ break;
	170	+ default:
	171	+ phpCAS::error('unknown PGT file storage format (`'.CAS_PGT_STORAGE_FILE_FORMAT_PLAIN.'\' and `'.CAS_PGT_STORAGE_FILE_FORMAT_XML.'\' allowed)');
	172	+ }
	173	+ phpCAS::traceEnd();
174	174	}
175	175
176		- // ########################################################################
177		- // INITIALIZATION
178		- // ########################################################################
	176	+ // ########################################################################
	177	+ // INITIALIZATION
	178	+ // ########################################################################
179	179
180		- /**
181		- * This method is used to initialize the storage. Halts on error.
182		- *
183		- * @public
184		- */
185		- function init()
	180	+ /**
	181	+ * This method is used to initialize the storage. Halts on error.
	182	+ *
	183	+ * @public
	184	+ */
	185	+ function init()
186	186	{
187		- phpCAS::traceBegin();
188		- // if the storage has already been initialized, return immediatly
189		- if ( $this->isInitialized() )
190		- return;
191		- // call the ancestor's method (mark as initialized)
192		- parent::init();
193		- phpCAS::traceEnd();
	187	+ phpCAS::traceBegin();
	188	+ // if the storage has already been initialized, return immediatly
	189	+ if ( $this->isInitialized() )
	190	+ return;
	191	+ // call the ancestor's method (mark as initialized)
	192	+ parent::init();
	193	+ phpCAS::traceEnd();
194	194	}
195	195
196		- // ########################################################################
197		- // PGT I/O
198		- // ########################################################################
	196	+ // ########################################################################
	197	+ // PGT I/O
	198	+ // ########################################################################
199	199
200		- /**
201		- * This method returns the filename corresponding to a PGT Iou.
202		- *
203		- * @param $pgt_iou the PGT iou.
204		- *
205		- * @return a filename
206		- * @private
207		- */
208		- function getPGTIouFilename($pgt_iou)
	200	+ /**
	201	+ * This method returns the filename corresponding to a PGT Iou.
	202	+ *
	203	+ * @param $pgt_iou the PGT iou.
	204	+ *
	205	+ * @return a filename
	206	+ * @private
	207	+ */
	208	+ function getPGTIouFilename($pgt_iou)
209	209	{
210		- phpCAS::traceBegin();
211		- $filename = $this->getPath().$pgt_iou.'.'.$this->getFormat();
212		- phpCAS::traceEnd($filename);
213		- return $filename;
	210	+ phpCAS::traceBegin();
	211	+ $filename = $this->getPath().$pgt_iou.'.'.$this->getFormat();
	212	+ phpCAS::traceEnd($filename);
	213	+ return $filename;
214	214	}
215	215
216		- /**
217		- * This method stores a PGT and its corresponding PGT Iou into a file. Echoes a
218		- * warning on error.
219		- *
220		- * @param $pgt the PGT
221		- * @param $pgt_iou the PGT iou
222		- *
223		- * @public
224		- */
225		- function write($pgt,$pgt_iou)
	216	+ /**
	217	+ * This method stores a PGT and its corresponding PGT Iou into a file. Echoes a
	218	+ * warning on error.
	219	+ *
	220	+ * @param $pgt the PGT
	221	+ * @param $pgt_iou the PGT iou
	222	+ *
	223	+ * @public
	224	+ */
	225	+ function write($pgt,$pgt_iou)
226	226	{
227		- phpCAS::traceBegin();
228		- $fname = $this->getPGTIouFilename($pgt_iou);
229		- if ( $f=fopen($fname,"w") ) {
230		- if ( fputs($f,$pgt) === FALSE ) {
231		- phpCAS::error('could not write PGT to `'.$fname.'\'');
232		- }
233		- fclose($f);
234		- } else {
235		- phpCAS::error('could not open `'.$fname.'\'');
236		- }
237		- phpCAS::traceEnd();
	227	+ phpCAS::traceBegin();
	228	+ $fname = $this->getPGTIouFilename($pgt_iou);
	229	+ if ( $f=fopen($fname,"w") ) {
	230	+ if ( fputs($f,$pgt) === FALSE ) {
	231	+ phpCAS::error('could not write PGT to `'.$fname.'\'');
	232	+ }
	233	+ fclose($f);
	234	+ } else {
	235	+ phpCAS::error('could not open `'.$fname.'\'');
	236	+ }
	237	+ phpCAS::traceEnd();
238	238	}
239	239
240		- /**
241		- * This method reads a PGT corresponding to a PGT Iou and deletes the
242		- * corresponding file.
243		- *
244		- * @param $pgt_iou the PGT iou
245		- *
246		- * @return the corresponding PGT, or FALSE on error
247		- *
248		- * @public
249		- */
250		- function read($pgt_iou)
	240	+ /**
	241	+ * This method reads a PGT corresponding to a PGT Iou and deletes the
	242	+ * corresponding file.
	243	+ *
	244	+ * @param $pgt_iou the PGT iou
	245	+ *
	246	+ * @return the corresponding PGT, or FALSE on error
	247	+ *
	248	+ * @public
	249	+ */
	250	+ function read($pgt_iou)
251	251	{
252		- phpCAS::traceBegin();
253		- $pgt = FALSE;
254		- $fname = $this->getPGTIouFilename($pgt_iou);
255		- if ( !($f=fopen($fname,"r")) ) {
256		- phpCAS::trace('could not open `'.$fname.'\'');
257		- } else {
258		- if ( ($pgt=fgets($f)) === FALSE ) {
259		- phpCAS::trace('could not read PGT from `'.$fname.'\'');
260		- }
261		- fclose($f);
262		- }
	252	+ phpCAS::traceBegin();
	253	+ $pgt = FALSE;
	254	+ $fname = $this->getPGTIouFilename($pgt_iou);
	255	+ if ( !($f=fopen($fname,"r")) ) {
	256	+ phpCAS::trace('could not open `'.$fname.'\'');
	257	+ } else {
	258	+ if ( ($pgt=fgets($f)) === FALSE ) {
	259	+ phpCAS::trace('could not read PGT from `'.$fname.'\'');
	260	+ }
	261	+ fclose($f);
	262	+ }
263	263
264		- // delete the PGT file
265		- @unlink($fname);
	264	+ // delete the PGT file
	265	+ @unlink($fname);
266	266
267		- phpCAS::traceEnd($pgt);
268		- return $pgt;
	267	+ phpCAS::traceEnd($pgt);
	268	+ return $pgt;
269	269	}
270	270
271		- /** @} */
	271	+ /** @} */
272	272
273	273	}
274	274

		@@ -44,167 +44,167 @@
		block discarded – undo
44	44
45	45	class PGTStorage
46	46	{
47		- /**
48		- * @addtogroup internalPGTStorage
49		- * @{
50		- */
51		-
52		- // ########################################################################
53		- // CONSTRUCTOR
54		- // ########################################################################
	47	+ /**
	48	+ * @addtogroup internalPGTStorage
	49	+ * @{
	50	+ */
	51	+
	52	+ // ########################################################################
	53	+ // CONSTRUCTOR
	54	+ // ########################################################################
55	55
56		- /**
57		- * The constructor of the class, should be called only by inherited classes.
58		- *
59		- * @param $cas_parent the CASclient instance that creates the current object.
60		- *
61		- * @protected
62		- */
63		- function PGTStorage($cas_parent)
	56	+ /**
	57	+ * The constructor of the class, should be called only by inherited classes.
	58	+ *
	59	+ * @param $cas_parent the CASclient instance that creates the current object.
	60	+ *
	61	+ * @protected
	62	+ */
	63	+ function PGTStorage($cas_parent)
64	64	{
65		- phpCAS::traceBegin();
66		- if ( !$cas_parent->isProxy() ) {
67		- phpCAS::error('defining PGT storage makes no sense when not using a CAS proxy');
68		- }
69		- phpCAS::traceEnd();
	65	+ phpCAS::traceBegin();
	66	+ if ( !$cas_parent->isProxy() ) {
	67	+ phpCAS::error('defining PGT storage makes no sense when not using a CAS proxy');
	68	+ }
	69	+ phpCAS::traceEnd();
70	70	}
71	71
72		- // ########################################################################
73		- // DEBUGGING
74		- // ########################################################################
	72	+ // ########################################################################
	73	+ // DEBUGGING
	74	+ // ########################################################################
75	75
76		- /**
77		- * This virtual method returns an informational string giving the type of storage
78		- * used by the object (used for debugging purposes).
79		- *
80		- * @public
81		- */
82		- function getStorageType()
	76	+ /**
	77	+ * This virtual method returns an informational string giving the type of storage
	78	+ * used by the object (used for debugging purposes).
	79	+ *
	80	+ * @public
	81	+ */
	82	+ function getStorageType()
83	83	{
84		- phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called');
	84	+ phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called');
85	85	}
86	86
87		- /**
88		- * This virtual method returns an informational string giving informations on the
89		- * parameters of the storage.(used for debugging purposes).
90		- *
91		- * @public
92		- */
93		- function getStorageInfo()
	87	+ /**
	88	+ * This virtual method returns an informational string giving informations on the
	89	+ * parameters of the storage.(used for debugging purposes).
	90	+ *
	91	+ * @public
	92	+ */
	93	+ function getStorageInfo()
94	94	{
95		- phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called');
	95	+ phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called');
96	96	}
97	97
98		- // ########################################################################
99		- // ERROR HANDLING
100		- // ########################################################################
	98	+ // ########################################################################
	99	+ // ERROR HANDLING
	100	+ // ########################################################################
101	101
102		- /**
103		- * string used to store an error message. Written by PGTStorage::setErrorMessage(),
104		- * read by PGTStorage::getErrorMessage().
105		- *
106		- * @hideinitializer
107		- * @private
108		- * @deprecated not used.
109		- */
110		- var $_error_message=FALSE;
111		-
112		- /**
113		- * This method sets en error message, which can be read later by
114		- * PGTStorage::getErrorMessage().
115		- *
116		- * @param $error_message an error message
117		- *
118		- * @protected
119		- * @deprecated not used.
120		- */
121		- function setErrorMessage($error_message)
	102	+ /**
	103	+ * string used to store an error message. Written by PGTStorage::setErrorMessage(),
	104	+ * read by PGTStorage::getErrorMessage().
	105	+ *
	106	+ * @hideinitializer
	107	+ * @private
	108	+ * @deprecated not used.
	109	+ */
	110	+ var $_error_message=FALSE;
	111	+
	112	+ /**
	113	+ * This method sets en error message, which can be read later by
	114	+ * PGTStorage::getErrorMessage().
	115	+ *
	116	+ * @param $error_message an error message
	117	+ *
	118	+ * @protected
	119	+ * @deprecated not used.
	120	+ */
	121	+ function setErrorMessage($error_message)
122	122	{
123		- $this->_error_message = $error_message;
	123	+ $this->_error_message = $error_message;
124	124	}
125	125
126		- /**
127		- * This method returns an error message set by PGTStorage::setErrorMessage().
128		- *
129		- * @return an error message when set by PGTStorage::setErrorMessage(), FALSE
130		- * otherwise.
131		- *
132		- * @public
133		- * @deprecated not used.
134		- */
135		- function getErrorMessage()
	126	+ /**
	127	+ * This method returns an error message set by PGTStorage::setErrorMessage().
	128	+ *
	129	+ * @return an error message when set by PGTStorage::setErrorMessage(), FALSE
	130	+ * otherwise.
	131	+ *
	132	+ * @public
	133	+ * @deprecated not used.
	134	+ */
	135	+ function getErrorMessage()
136	136	{
137		- return $this->_error_message;
	137	+ return $this->_error_message;
138	138	}
139	139
140		- // ########################################################################
141		- // INITIALIZATION
142		- // ########################################################################
143		-
144		- /**
145		- * a boolean telling if the storage has already been initialized. Written by
146		- * PGTStorage::init(), read by PGTStorage::isInitialized().
147		- *
148		- * @hideinitializer
149		- * @private
150		- */
151		- var $_initialized = FALSE;
152		-
153		- /**
154		- * This method tells if the storage has already been intialized.
155		- *
156		- * @return a boolean
157		- *
158		- * @protected
159		- */
160		- function isInitialized()
	140	+ // ########################################################################
	141	+ // INITIALIZATION
	142	+ // ########################################################################
	143	+
	144	+ /**
	145	+ * a boolean telling if the storage has already been initialized. Written by
	146	+ * PGTStorage::init(), read by PGTStorage::isInitialized().
	147	+ *
	148	+ * @hideinitializer
	149	+ * @private
	150	+ */
	151	+ var $_initialized = FALSE;
	152	+
	153	+ /**
	154	+ * This method tells if the storage has already been intialized.
	155	+ *
	156	+ * @return a boolean
	157	+ *
	158	+ * @protected
	159	+ */
	160	+ function isInitialized()
161	161	{
162		- return $this->_initialized;
	162	+ return $this->_initialized;
163	163	}
164	164
165		- /**
166		- * This virtual method initializes the object.
167		- *
168		- * @protected
169		- */
170		- function init()
	165	+ /**
	166	+ * This virtual method initializes the object.
	167	+ *
	168	+ * @protected
	169	+ */
	170	+ function init()
171	171	{
172		- $this->_initialized = TRUE;
	172	+ $this->_initialized = TRUE;
173	173	}
174	174
175		- // ########################################################################
176		- // PGT I/O
177		- // ########################################################################
178		-
179		- /**
180		- * This virtual method stores a PGT and its corresponding PGT Iuo.
181		- * @note Should never be called.
182		- *
183		- * @param $pgt the PGT
184		- * @param $pgt_iou the PGT iou
185		- *
186		- * @protected
187		- */
188		- function write($pgt,$pgt_iou)
	175	+ // ########################################################################
	176	+ // PGT I/O
	177	+ // ########################################################################
	178	+
	179	+ /**
	180	+ * This virtual method stores a PGT and its corresponding PGT Iuo.
	181	+ * @note Should never be called.
	182	+ *
	183	+ * @param $pgt the PGT
	184	+ * @param $pgt_iou the PGT iou
	185	+ *
	186	+ * @protected
	187	+ */
	188	+ function write($pgt,$pgt_iou)
189	189	{
190		- phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called');
	190	+ phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called');
191	191	}
192	192
193		- /**
194		- * This virtual method reads a PGT corresponding to a PGT Iou and deletes
195		- * the corresponding storage entry.
196		- * @note Should never be called.
197		- *
198		- * @param $pgt_iou the PGT iou
199		- *
200		- * @protected
201		- */
202		- function read($pgt_iou)
	193	+ /**
	194	+ * This virtual method reads a PGT corresponding to a PGT Iou and deletes
	195	+ * the corresponding storage entry.
	196	+ * @note Should never be called.
	197	+ *
	198	+ * @param $pgt_iou the PGT iou
	199	+ *
	200	+ * @protected
	201	+ */
	202	+ function read($pgt_iou)
203	203	{
204		- phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called');
	204	+ phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called');
205	205	}
206	206
207		- /** @} */
	207	+ /** @} */
208	208
209	209	}
210	210

chamilo / chamilo-lms

Push — 1.10.x ( 849f97...a21c08 )

Status

Category

Indentation +56 added lines, -56 removed lines patch added patch discarded remove patch

Indentation +184 added lines, -184 removed lines patch added patch discarded remove patch

Indentation +131 added lines, -131 removed lines patch added patch discarded remove patch

Indentation +14 added lines, -14 removed lines patch added patch discarded remove patch

Indentation +14 added lines, -14 removed lines patch added patch discarded remove patch

Indentation +14 added lines, -14 removed lines patch added patch discarded remove patch

Indentation +14 added lines, -14 removed lines patch added patch discarded remove patch

Indentation +14 added lines, -14 removed lines patch added patch discarded remove patch

Indentation +14 added lines, -14 removed lines patch added patch discarded remove patch