chamilo / chamilo-lms

app/Migrations/Schema/V110/Version20150528103216.php

Indentation +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
      */
     public function up(Schema $schema)
     {
-  	    $this->addSql('ALTER TABLE session ADD COLUMN access_start_date datetime');
+            $this->addSql('ALTER TABLE session ADD COLUMN access_start_date datetime');
         $this->addSql('ALTER TABLE session ADD COLUMN access_end_date datetime');
         $this->addSql('ALTER TABLE session ADD COLUMN coach_access_start_date datetime');
         $this->addSql('ALTER TABLE session ADD COLUMN coach_access_end_date datetime');

app/config/profile.conf.dist.php

Indentation +4 added lines, -4 removed lines

@@ -19,11 +19,11 @@
 
 // Replacing user photos
 define('KEEP_THE_NAME_WHEN_CHANGE_IMAGE', true);
-	// true  -> the new image have the name of previous.
-	// false -> a new name is build for each upladed image.
+    // true  -> the new image have the name of previous.
+    // false -> a new name is build for each upladed image.
 define('KEEP_THE_OLD_IMAGE_AFTER_CHANGE', true);
-	// true  -> if KEEP_THE_NAME_WHEN_CHANGE_IMAGE is true, the  previous image is rename before.
-	// false -> only the last image still on server.
+    // true  -> if KEEP_THE_NAME_WHEN_CHANGE_IMAGE is true, the  previous image is rename before.
+    // false -> only the last image still on server.
 
 // Official code
 // Don't forget to change name of offical code in your organization

app/config/auth.conf.dist.php

Indentation +21 added lines, -21 removed lines

@@ -39,29 +39,29 @@
  * Array of connection parameters
  **/
 $extldap_config = array(
-  //base dommain string
-  'base_dn' => 'DC=cblue,DC=be',
-  //admin distinguished name
-  'admin_dn' => 'CN=admin,dc=cblue,dc=be',
-  //admin password
-  'admin_password' => 'pass',
-  //ldap host
-  'host' => array('1.2.3.4', '2.3.4.5', '3.4.5.6'),
-  // filter
+    //base dommain string
+    'base_dn' => 'DC=cblue,DC=be',
+    //admin distinguished name
+    'admin_dn' => 'CN=admin,dc=cblue,dc=be',
+    //admin password
+    'admin_password' => 'pass',
+    //ldap host
+    'host' => array('1.2.3.4', '2.3.4.5', '3.4.5.6'),
+    // filter
 //  'filter' => '', // no () arround the string
-  //'port' => , default on 389
-  //protocl version (2 or 3)
-  'protocol_version' => 3,
-  // set this to 0 to connect to AD server
-  'referrals' => 0,
-  //String used to search the user in ldap. %username will ber replaced by the username.
-  //See extldap_get_user_search_string() function below
+    //'port' => , default on 389
+    //protocl version (2 or 3)
+    'protocol_version' => 3,
+    // set this to 0 to connect to AD server
+    'referrals' => 0,
+    //String used to search the user in ldap. %username will ber replaced by the username.
+    //See extldap_get_user_search_string() function below
 //  'user_search' => 'sAMAccountName=%username%',  // no () arround the string
-  'user_search' => 'uid=%username%',  // no () arround the string
-  //encoding used in ldap (most common are UTF-8 and ISO-8859-1
-  'encoding' => 'UTF-8',
-  //Set to true if user info have to be update at each login
-  'update_userinfo' => true
+    'user_search' => 'uid=%username%',  // no () arround the string
+    //encoding used in ldap (most common are UTF-8 and ISO-8859-1
+    'encoding' => 'UTF-8',
+    //Set to true if user info have to be update at each login
+    'update_userinfo' => true
 );
 
 

user_portal.php

Indentation +1 added lines, -1 removed lines

@@ -188,7 +188,7 @@
 
 //Show the chamilo mascot
 if (empty($courseAndSessions['html']) && !isset($_GET['history'])) {
-	$controller->tpl->assign('welcome_to_course_block', $controller->return_welcome_to_course_block());
+    $controller->tpl->assign('welcome_to_course_block', $controller->return_welcome_to_course_block());
 }
 
 $controller->tpl->assign('content', $courseAndSessions['html']);

news_list.php

Indentation +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 
 $actions = '';
 if (api_is_platform_admin()) {
-	$actions = '<a href="'.api_get_path(WEB_PATH).'main/admin/system_announcements.php">'.
+    $actions = '<a href="'.api_get_path(WEB_PATH).'main/admin/system_announcements.php">'.
         Display::return_icon('edit.png', get_lang('EditSystemAnnouncement'), array(), 32).'</a>';
 }
 

main/auth/openid/whatis.php

Indentation +5 added lines, -5 removed lines

@@ -1,12 +1,12 @@
 <?php
 /* For licensing terms, see /license.txt */
 /**
- * OpenID 
- * @package chamilo.auth.openid
- */
+     * OpenID 
+     * @package chamilo.auth.openid
+     */
 /**
- * Code
- */
+     * Code
+     */
 require_once '../../inc/global.inc.php';
 Display::display_header('OpenID', NULL);
 echo Display::page_header(get_lang('OpenIDWhatIs'));

main/auth/profile.php

Indentation +1 added lines, -1 removed lines

@@ -684,7 +684,7 @@
 
     foreach ($user_data as $key => $value) {
         if (substr($key, 0, 6) == 'extra_') { //an extra field
-           continue;
+            continue;
         } elseif (strpos($key, 'remove_extra_') !== false) {
         } else {
             if (in_array($key, $available_values_to_modify)) {

main/auth/cas/authcas.php

Indentation +56 added lines, -56 removed lines

@@ -14,7 +14,7 @@ 
 *
 **/
 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 @@ 
 
 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 @@ 
 		   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 @@ 
 			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 @@ 
 //
 //			}
 //		}
-		return $login;
+        return $login;
     } else {
-		return false;
-	}
+        return false;
+    }
 }
 
 /**

main/auth/cas/lib/CAS/PGTStorage/pgt-db.php

Indentation +139 added lines, -139 removed lines

@@ -45,174 +45,174 @@
 

 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