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/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/languages/german.php

Indentation +14 added lines, -14 removed lines

@@ -8,20 +8,20 @@
  */

 

 $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

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

Indentation +14 added lines, -14 removed lines

@@ -8,20 +8,20 @@
  */

 

 $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>).'

 );

 

 ?>