Inspection of "Language update" - chamilo/chamilo-lms - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — 1.10.x ( 51b3f0...0b3bd8 )

by Yannick

created 2016-03-02 15:32 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-db.php 1 patch

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

@@ -45,174 +45,174 @@
 block discarded – undo
 
 class PGTStorageDB extends PGTStorage
 {
-  /** 
-   * @addtogroup internalPGTStorageDB
-   * @{ 
-   */
-
-  /**
-   * a string representing a PEAR DB URL to connect to the database. Written by
-   * PGTStorageDB::PGTStorageDB(), read by getURL().
-   *
-   * @hideinitializer
-   * @private
-   */
-  var $_url='';
-
-  /**
-   * This method returns the PEAR DB URL to use to connect to the database.
-   *
-   * @return a PEAR DB URL
-   *
-   * @private
-   */
-  function getURL()
+    /** 
+     * @addtogroup internalPGTStorageDB
+     * @{ 
+     */
+
+    /**
+     * a string representing a PEAR DB URL to connect to the database. Written by
+     * PGTStorageDB::PGTStorageDB(), read by getURL().
+     *
+     * @hideinitializer
+     * @private
+     */
+    var $_url='';
+
+    /**
+     * This method returns the PEAR DB URL to use to connect to the database.
+     *
+     * @return a PEAR DB URL
+     *
+     * @private
+     */
+    function getURL()
     {
-      return $this->_url;
+        return $this->_url;
     }
 
-  /**
-   * The handle of the connection to the database where PGT's are stored. Written by
-   * PGTStorageDB::init(), read by getLink().
-   *
-   * @hideinitializer
-   * @private
-   */
-  var $_link = null;
-
-  /**
-   * This method returns the handle of the connection to the database where PGT's are 
-   * stored.
-   *
-   * @return a handle of connection.
-   *
-   * @private
-   */
-  function getLink()
+    /**
+     * The handle of the connection to the database where PGT's are stored. Written by
+     * PGTStorageDB::init(), read by getLink().
+     *
+     * @hideinitializer
+     * @private
+     */
+    var $_link = null;
+
+    /**
+     * This method returns the handle of the connection to the database where PGT's are 
+     * stored.
+     *
+     * @return a handle of connection.
+     *
+     * @private
+     */
+    function getLink()
     {
-      return $this->_link;
+        return $this->_link;
     }
 
-  /**
-   * The name of the table where PGT's are stored. Written by 
-   * PGTStorageDB::PGTStorageDB(), read by getTable().
-   *
-   * @hideinitializer
-   * @private
-   */
-  var $_table = '';
-
-  /**
-   * This method returns the name of the table where PGT's are stored.
-   *
-   * @return the name of a table.
-   *
-   * @private
-   */
-  function getTable()
+    /**
+     * The name of the table where PGT's are stored. Written by 
+     * PGTStorageDB::PGTStorageDB(), read by getTable().
+     *
+     * @hideinitializer
+     * @private
+     */
+    var $_table = '';
+
+    /**
+     * This method returns the name of the table where PGT's are stored.
+     *
+     * @return the name of a table.
+     *
+     * @private
+     */
+    function getTable()
     {
-      return $this->_table;
+        return $this->_table;
     }
 
-  // ########################################################################
-  //  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 "database";
+        return "database";
     }
 
-  /**
-   * This method returns an informational string giving informations on the
-   * parameters of the storage.(used for debugging purposes).
-   *
-   * @public
-   */
-  function getStorageInfo()
+    /**
+     * This method returns an informational string giving informations on the
+     * parameters of the storage.(used for debugging purposes).
+     *
+     * @public
+     */
+    function getStorageInfo()
     {
-      return 'url=`'.$this->getURL().'\', table=`'.$this->getTable().'\'';
+        return 'url=`'.$this->getURL().'\', table=`'.$this->getTable().'\'';
     }
 
-  // ########################################################################
-  //  CONSTRUCTOR
-  // ########################################################################
+    // ########################################################################
+    //  CONSTRUCTOR
+    // ########################################################################
   
-  /**
-   * The class constructor, called by CASClient::SetPGTStorageDB().
-   *
-   * @param $cas_parent the CASClient instance that creates the object.
-   * @param $user the user to access the data with
-   * @param $password the user's password
-   * @param $database_type the type of the database hosting the data
-   * @param $hostname the server hosting the database
-   * @param $port the port the server is listening on
-   * @param $database the name of the database
-   * @param $table the name of the table storing the data
-   *
-   * @public
-   */
-  function PGTStorageDB($cas_parent,$user,$password,$database_type,$hostname,$port,$database,$table)
+    /**
+     * The class constructor, called by CASClient::SetPGTStorageDB().
+     *
+     * @param $cas_parent the CASClient instance that creates the object.
+     * @param $user the user to access the data with
+     * @param $password the user's password
+     * @param $database_type the type of the database hosting the data
+     * @param $hostname the server hosting the database
+     * @param $port the port the server is listening on
+     * @param $database the name of the database
+     * @param $table the name of the table storing the data
+     *
+     * @public
+     */
+    function PGTStorageDB($cas_parent,$user,$password,$database_type,$hostname,$port,$database,$table)
     {
-      phpCAS::traceBegin();
+        phpCAS::traceBegin();
 
-      // call the ancestor's constructor
-      $this->PGTStorage($cas_parent);
+        // call the ancestor's constructor
+        $this->PGTStorage($cas_parent);
 
-      if ( empty($database_type) ) $database_type = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE_TYPE;
-      if ( empty($hostname) ) $hostname = CAS_PGT_STORAGE_DB_DEFAULT_HOSTNAME;
-      if ( $port==0 ) $port = CAS_PGT_STORAGE_DB_DEFAULT_PORT;
-      if ( empty($database) ) $database = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE;
-      if ( empty($table) ) $table = CAS_PGT_STORAGE_DB_DEFAULT_TABLE;
+        if ( empty($database_type) ) $database_type = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE_TYPE;
+        if ( empty($hostname) ) $hostname = CAS_PGT_STORAGE_DB_DEFAULT_HOSTNAME;
+        if ( $port==0 ) $port = CAS_PGT_STORAGE_DB_DEFAULT_PORT;
+        if ( empty($database) ) $database = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE;
+        if ( empty($table) ) $table = CAS_PGT_STORAGE_DB_DEFAULT_TABLE;
 
-      // build and store the PEAR DB URL
-      $this->_url = $database_type.':'.'//'.$user.':'.$password.'@'.$hostname.':'.$port.'/'.$database;
+        // build and store the PEAR DB URL
+        $this->_url = $database_type.':'.'//'.$user.':'.$password.'@'.$hostname.':'.$port.'/'.$database;
 
-      // XXX should use setURL and setTable
-      phpCAS::traceEnd();
+        // XXX should use setURL and setTable
+        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::traceBegin();
+        // if the storage has already been initialized, return immediatly
+        if ( $this->isInitialized() )
+        return;
+        // call the ancestor's method (mark as initialized)
+        parent::init();
       
-	  //include phpDB library (the test was introduced in release 0.4.8 for 
-	  //the integration into Tikiwiki).
-	  if (!class_exists('DB')) {
-		include_once('DB.php');
-	  }
-
-      // try to connect to the database
-      $this->_link = DB::connect($this->getURL());
-      if ( DB::isError($this->_link) ) {
-	phpCAS::error('could not connect to database ('.DB::errorMessage($this->_link).')');
-      }
-      var_dump($this->_link);
-      phpCAS::traceBEnd();
+        //include phpDB library (the test was introduced in release 0.4.8 for 
+        //the integration into Tikiwiki).
+        if (!class_exists('DB')) {
+        include_once('DB.php');
+        }
+
+        // try to connect to the database
+        $this->_link = DB::connect($this->getURL());
+        if ( DB::isError($this->_link) ) {
+    phpCAS::error('could not connect to database ('.DB::errorMessage($this->_link).')');
+        }
+        var_dump($this->_link);
+        phpCAS::traceBEnd();
     }
 
-  /** @} */
+    /** @} */
 }
 
 ?>
\ No newline at end of file

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	/**

		@@ -45,174 +45,174 @@
		block discarded – undo
45	45
46	46	class PGTStorageDB extends PGTStorage
47	47	{
48		- /**
49		- * @addtogroup internalPGTStorageDB
50		- * @{
51		- */
52		-
53		- /**
54		- * a string representing a PEAR DB URL to connect to the database. Written by
55		- * PGTStorageDB::PGTStorageDB(), read by getURL().
56		- *
57		- * @hideinitializer
58		- * @private
59		- */
60		- var $_url='';
61		-
62		- /**
63		- * This method returns the PEAR DB URL to use to connect to the database.
64		- *
65		- * @return a PEAR DB URL
66		- *
67		- * @private
68		- */
69		- function getURL()
	48	+ /**
	49	+ * @addtogroup internalPGTStorageDB
	50	+ * @{
	51	+ */
	52	+
	53	+ /**
	54	+ * a string representing a PEAR DB URL to connect to the database. Written by
	55	+ * PGTStorageDB::PGTStorageDB(), read by getURL().
	56	+ *
	57	+ * @hideinitializer
	58	+ * @private
	59	+ */
	60	+ var $_url='';
	61	+
	62	+ /**
	63	+ * This method returns the PEAR DB URL to use to connect to the database.
	64	+ *
	65	+ * @return a PEAR DB URL
	66	+ *
	67	+ * @private
	68	+ */
	69	+ function getURL()
70	70	{
71		- return $this->_url;
	71	+ return $this->_url;
72	72	}
73	73
74		- /**
75		- * The handle of the connection to the database where PGT's are stored. Written by
76		- * PGTStorageDB::init(), read by getLink().
77		- *
78		- * @hideinitializer
79		- * @private
80		- */
81		- var $_link = null;
82		-
83		- /**
84		- * This method returns the handle of the connection to the database where PGT's are
85		- * stored.
86		- *
87		- * @return a handle of connection.
88		- *
89		- * @private
90		- */
91		- function getLink()
	74	+ /**
	75	+ * The handle of the connection to the database where PGT's are stored. Written by
	76	+ * PGTStorageDB::init(), read by getLink().
	77	+ *
	78	+ * @hideinitializer
	79	+ * @private
	80	+ */
	81	+ var $_link = null;
	82	+
	83	+ /**
	84	+ * This method returns the handle of the connection to the database where PGT's are
	85	+ * stored.
	86	+ *
	87	+ * @return a handle of connection.
	88	+ *
	89	+ * @private
	90	+ */
	91	+ function getLink()
92	92	{
93		- return $this->_link;
	93	+ return $this->_link;
94	94	}
95	95
96		- /**
97		- * The name of the table where PGT's are stored. Written by
98		- * PGTStorageDB::PGTStorageDB(), read by getTable().
99		- *
100		- * @hideinitializer
101		- * @private
102		- */
103		- var $_table = '';
104		-
105		- /**
106		- * This method returns the name of the table where PGT's are stored.
107		- *
108		- * @return the name of a table.
109		- *
110		- * @private
111		- */
112		- function getTable()
	96	+ /**
	97	+ * The name of the table where PGT's are stored. Written by
	98	+ * PGTStorageDB::PGTStorageDB(), read by getTable().
	99	+ *
	100	+ * @hideinitializer
	101	+ * @private
	102	+ */
	103	+ var $_table = '';
	104	+
	105	+ /**
	106	+ * This method returns the name of the table where PGT's are stored.
	107	+ *
	108	+ * @return the name of a table.
	109	+ *
	110	+ * @private
	111	+ */
	112	+ function getTable()
113	113	{
114		- return $this->_table;
	114	+ return $this->_table;
115	115	}
116	116
117		- // ########################################################################
118		- // DEBUGGING
119		- // ########################################################################
	117	+ // ########################################################################
	118	+ // DEBUGGING
	119	+ // ########################################################################
120	120
121		- /**
122		- * This method returns an informational string giving the type of storage
123		- * used by the object (used for debugging purposes).
124		- *
125		- * @return an informational string.
126		- * @public
127		- */
128		- function getStorageType()
	121	+ /**
	122	+ * This method returns an informational string giving the type of storage
	123	+ * used by the object (used for debugging purposes).
	124	+ *
	125	+ * @return an informational string.
	126	+ * @public
	127	+ */
	128	+ function getStorageType()
129	129	{
130		- return "database";
	130	+ return "database";
131	131	}
132	132
133		- /**
134		- * This method returns an informational string giving informations on the
135		- * parameters of the storage.(used for debugging purposes).
136		- *
137		- * @public
138		- */
139		- function getStorageInfo()
	133	+ /**
	134	+ * This method returns an informational string giving informations on the
	135	+ * parameters of the storage.(used for debugging purposes).
	136	+ *
	137	+ * @public
	138	+ */
	139	+ function getStorageInfo()
140	140	{
141		- return 'url=`'.$this->getURL().'\', table=`'.$this->getTable().'\'';
	141	+ return 'url=`'.$this->getURL().'\', table=`'.$this->getTable().'\'';
142	142	}
143	143
144		- // ########################################################################
145		- // CONSTRUCTOR
146		- // ########################################################################
	144	+ // ########################################################################
	145	+ // CONSTRUCTOR
	146	+ // ########################################################################
147	147
148		- /**
149		- * The class constructor, called by CASClient::SetPGTStorageDB().
150		- *
151		- * @param $cas_parent the CASClient instance that creates the object.
152		- * @param $user the user to access the data with
153		- * @param $password the user's password
154		- * @param $database_type the type of the database hosting the data
155		- * @param $hostname the server hosting the database
156		- * @param $port the port the server is listening on
157		- * @param $database the name of the database
158		- * @param $table the name of the table storing the data
159		- *
160		- * @public
161		- */
162		- function PGTStorageDB($cas_parent,$user,$password,$database_type,$hostname,$port,$database,$table)
	148	+ /**
	149	+ * The class constructor, called by CASClient::SetPGTStorageDB().
	150	+ *
	151	+ * @param $cas_parent the CASClient instance that creates the object.
	152	+ * @param $user the user to access the data with
	153	+ * @param $password the user's password
	154	+ * @param $database_type the type of the database hosting the data
	155	+ * @param $hostname the server hosting the database
	156	+ * @param $port the port the server is listening on
	157	+ * @param $database the name of the database
	158	+ * @param $table the name of the table storing the data
	159	+ *
	160	+ * @public
	161	+ */
	162	+ function PGTStorageDB($cas_parent,$user,$password,$database_type,$hostname,$port,$database,$table)
163	163	{
164		- phpCAS::traceBegin();
	164	+ phpCAS::traceBegin();
165	165
166		- // call the ancestor's constructor
167		- $this->PGTStorage($cas_parent);
	166	+ // call the ancestor's constructor
	167	+ $this->PGTStorage($cas_parent);
168	168
169		- if ( empty($database_type) ) $database_type = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE_TYPE;
170		- if ( empty($hostname) ) $hostname = CAS_PGT_STORAGE_DB_DEFAULT_HOSTNAME;
171		- if ( $port==0 ) $port = CAS_PGT_STORAGE_DB_DEFAULT_PORT;
172		- if ( empty($database) ) $database = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE;
173		- if ( empty($table) ) $table = CAS_PGT_STORAGE_DB_DEFAULT_TABLE;
	169	+ if ( empty($database_type) ) $database_type = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE_TYPE;
	170	+ if ( empty($hostname) ) $hostname = CAS_PGT_STORAGE_DB_DEFAULT_HOSTNAME;
	171	+ if ( $port==0 ) $port = CAS_PGT_STORAGE_DB_DEFAULT_PORT;
	172	+ if ( empty($database) ) $database = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE;
	173	+ if ( empty($table) ) $table = CAS_PGT_STORAGE_DB_DEFAULT_TABLE;
174	174
175		- // build and store the PEAR DB URL
176		- $this->_url = $database_type.':'.'//'.$user.':'.$password.'@'.$hostname.':'.$port.'/'.$database;
	175	+ // build and store the PEAR DB URL
	176	+ $this->_url = $database_type.':'.'//'.$user.':'.$password.'@'.$hostname.':'.$port.'/'.$database;
177	177
178		- // XXX should use setURL and setTable
179		- phpCAS::traceEnd();
	178	+ // XXX should use setURL and setTable
	179	+ phpCAS::traceEnd();
180	180	}
181	181
182		- // ########################################################################
183		- // INITIALIZATION
184		- // ########################################################################
	182	+ // ########################################################################
	183	+ // INITIALIZATION
	184	+ // ########################################################################
185	185
186		- /**
187		- * This method is used to initialize the storage. Halts on error.
188		- *
189		- * @public
190		- */
191		- function init()
	186	+ /**
	187	+ * This method is used to initialize the storage. Halts on error.
	188	+ *
	189	+ * @public
	190	+ */
	191	+ function init()
192	192	{
193		- phpCAS::traceBegin();
194		- // if the storage has already been initialized, return immediatly
195		- if ( $this->isInitialized() )
196		- return;
197		- // call the ancestor's method (mark as initialized)
198		- parent::init();
	193	+ phpCAS::traceBegin();
	194	+ // if the storage has already been initialized, return immediatly
	195	+ if ( $this->isInitialized() )
	196	+ return;
	197	+ // call the ancestor's method (mark as initialized)
	198	+ parent::init();
199	199
200		- //include phpDB library (the test was introduced in release 0.4.8 for
201		- //the integration into Tikiwiki).
202		- if (!class_exists('DB')) {
203		- include_once('DB.php');
204		- }
205		-
206		- // try to connect to the database
207		- $this->_link = DB::connect($this->getURL());
208		- if ( DB::isError($this->_link) ) {
209		- phpCAS::error('could not connect to database ('.DB::errorMessage($this->_link).')');
210		- }
211		- var_dump($this->_link);
212		- phpCAS::traceBEnd();
	200	+ //include phpDB library (the test was introduced in release 0.4.8 for
	201	+ //the integration into Tikiwiki).
	202	+ if (!class_exists('DB')) {
	203	+ include_once('DB.php');
	204	+ }
	205	+
	206	+ // try to connect to the database
	207	+ $this->_link = DB::connect($this->getURL());
	208	+ if ( DB::isError($this->_link) ) {
	209	+ phpCAS::error('could not connect to database ('.DB::errorMessage($this->_link).')');
	210	+ }
	211	+ var_dump($this->_link);
	212	+ phpCAS::traceBEnd();
213	213	}
214	214
215		- /** @} */
	215	+ /** @} */
216	216	}
217	217
218	218	?>
219	219	\ No newline at end of file

		@@ -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 ( 51b3f0...0b3bd8 )

Status

Category

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

Indentation +139 added lines, -139 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