chamilo / chamilo-lms

main/auth/set_temp_password.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 $cidReset = true;
 require_once '../inc/global.inc.php';
 $this_section = SECTION_COURSES;
-$course_id = isset($_GET['course_id'])  ? intval($_GET['course_id']) : null;
+$course_id = isset($_GET['course_id']) ? intval($_GET['course_id']) : null;
 $session_id = isset($_GET['session_id']) ? intval($_GET['session_id']) : null;
 $user_id = api_get_user_id();
 

main/auth/lostPassword.php

Spacing +5 added lines, -5 removed lines

@@ -47,7 +47,7 @@ 
     Display::addFlash(
         Display::return_message($messageText)
     );
-    header('Location: ' . api_get_path(WEB_PATH));
+    header('Location: '.api_get_path(WEB_PATH));
     exit;
 }
 
@@ -74,7 +74,7 @@ 
         Display::addFlash(
             Display::return_message($messageText, 'error')
         );
-        header('Location: ' . api_get_self());
+        header('Location: '.api_get_self());
         exit;
     }
 
@@ -94,7 +94,7 @@ 
         Display::addFlash(
             Display::return_message($messageText)
         );
-        header('Location: ' . api_get_path(WEB_PATH));
+        header('Location: '.api_get_path(WEB_PATH));
         exit;
     }
 
@@ -115,7 +115,7 @@ 
             exit;
         }
 
-        header('Location: ' . api_get_path(WEB_PATH));
+        header('Location: '.api_get_path(WEB_PATH));
         exit;
     }
 
@@ -132,7 +132,7 @@ 
     Display::addFlash(
         Display::return_message($messageText)
     );
-    header('Location: ' . api_get_path(WEB_PATH));
+    header('Location: '.api_get_path(WEB_PATH));
     exit;
 }
 

main/auth/inscription.php

Spacing +15 added lines, -15 removed lines

@@ -90,7 +90,7 @@ 
         if (api_get_setting('registration', 'email') != 'true') {
             $form->addRule('email', get_lang('ThisFieldIsRequired'), 'required');
         }
-        $form->addRule('email', sprintf(get_lang('UsernameMaxXCharacters'), (string)USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
+        $form->addRule('email', sprintf(get_lang('UsernameMaxXCharacters'), (string) USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
         $form->addRule('email', get_lang('UserTaken'), 'username_available');
     }
 
@@ -123,7 +123,7 @@ 
         $form->addElement('text', 'username', get_lang('UserName'), array('id' => 'username', 'size' => USERNAME_MAX_LENGTH));
         $form->applyFilter('username', 'trim');
         $form->addRule('username', get_lang('ThisFieldIsRequired'), 'required');
-        $form->addRule('username', sprintf(get_lang('UsernameMaxXCharacters'), (string)USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
+        $form->addRule('username', sprintf(get_lang('UsernameMaxXCharacters'), (string) USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
         $form->addRule('username', get_lang('UsernameWrong'), 'username');
         $form->addRule('username', get_lang('UserTaken'), 'username_available');
     }
@@ -144,7 +144,7 @@ 
     if (CHECK_PASS_EASY_TO_FIND) {
         $form->addRule(
             'password1',
-            get_lang('PassTooEasy') . ': ' . api_generate_password(),
+            get_lang('PassTooEasy').': '.api_generate_password(),
             'callback',
             'api_check_password'
         );
@@ -209,13 +209,13 @@ 
             'sessionVar'   => basename(__FILE__, '.php'),
             'imageOptions' => array(
                 'font_size' => 20,
-                'font_path' => api_get_path(SYS_FONTS_PATH) . 'opensans/',
+                'font_path' => api_get_path(SYS_FONTS_PATH).'opensans/',
                 'font_file' => 'OpenSans-Regular.ttf',
                     //'output' => 'gif'
             )
         );
 
-        $captcha_question =  $form->addElement('CAPTCHA_Image', 'captcha_question', '', $options);
+        $captcha_question = $form->addElement('CAPTCHA_Image', 'captcha_question', '', $options);
         $form->addElement('static', null, null, get_lang('ClickOnTheImageForANewOne'));
 
         $form->addElement('text', 'captcha', get_lang('EnterTheLettersYouSee'), array('size' => 40));
@@ -333,7 +333,7 @@ 
         }
     }
 
-    $tool_name = get_lang('Registration', null, (!empty($_POST['language'])?$_POST['language']: $_user['language']));
+    $tool_name = get_lang('Registration', null, (!empty($_POST['language']) ? $_POST['language'] : $_user['language']));
 
     if (api_get_setting('allow_terms_conditions') == 'true' && $user_already_registered_show_terms) {
         $tool_name = get_lang('TermsAndConditions');
@@ -354,11 +354,11 @@ 
     }
 
     if (file_exists($home.'register_top_'.$user_selected_language.'.html')) {
-        $home_top_temp = @(string)file_get_contents($home.'register_top_'.$user_selected_language.'.html');
+        $home_top_temp = @(string) file_get_contents($home.'register_top_'.$user_selected_language.'.html');
         $open = str_replace('{rel_path}', api_get_path(REL_PATH), $home_top_temp);
         $open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
         if (!empty($open)) {
-            $content =  '<div class="well_border">'.$open.'</div>';
+            $content = '<div class="well_border">'.$open.'</div>';
         }
     }
 
@@ -407,7 +407,7 @@ 
             null,
             get_lang('IHaveReadAndAgree').'&nbsp;<a href="inscription.php?legal" target="_blank">'.get_lang('TermsAndConditions').'</a>'
         );
-        $form->addRule('legal_accept',  get_lang('ThisFieldIsRequired'), 'required');
+        $form->addRule('legal_accept', get_lang('ThisFieldIsRequired'), 'required');
     } else {
         $preview = LegalManager::show_last_condition($term_preview);
         $form->addElement('label', null, $preview);
@@ -580,7 +580,7 @@ 
                 Database::query($sql);
 
                 // 2. Send mail to all platform admin
-                $emailsubject  = get_lang('ApprovalForNewAccount', null, $values['language']).': '.$values['username'];
+                $emailsubject = get_lang('ApprovalForNewAccount', null, $values['language']).': '.$values['username'];
                 $emailbody = get_lang('ApprovalForNewAccount', null, $values['language'])."\n";
                 $emailbody .= get_lang('UserName', null, $values['language']).': '.$values['username']."\n";
 
@@ -667,7 +667,7 @@ 
         '<p>'.
         get_lang('Dear', null, $_user['language']).' '.
         stripslashes(Security::remove_XSS($recipient_name)).',<br /><br />'.
-        get_lang('PersonalSettings',null,$_user['language']).".</p>";
+        get_lang('PersonalSettings', null, $_user['language']).".</p>";
 
     $form_data = array(
         'button' => Display::button('next', get_lang('Next', null, $_user['language']), array('class' => 'btn btn-primary btn-large')),
@@ -680,14 +680,14 @@ 
     } else {
 
         if (!empty($values['email'])) {
-            $text_after_registration.= '<p>'.get_lang('MailHasBeenSent', null, $_user['language']).'.</p>';
+            $text_after_registration .= '<p>'.get_lang('MailHasBeenSent', null, $_user['language']).'.</p>';
         }
 
         if ($is_allowedCreateCourse) {
             if ($usersCanCreateCourse) {
-                $form_data['message'] = '<p>'. get_lang('NowGoCreateYourCourse', null, $_user['language']). "</p>";
+                $form_data['message'] = '<p>'.get_lang('NowGoCreateYourCourse', null, $_user['language'])."</p>";
             }
-            $form_data['action']  = '../create_course/add_course.php';
+            $form_data['action'] = '../create_course/add_course.php';
 
             if (api_get_setting('course_validation') == 'true') {
                 $form_data['button'] = Display::button(
@@ -707,7 +707,7 @@ 
         } else {
             if (api_get_setting('allow_students_to_browse_courses') == 'true') {
                 $form_data['action'] = 'courses.php?action=subscribe';
-                $form_data['message'] = '<p>'. get_lang('NowGoChooseYourCourses', null, $_user['language']). ".</p>";
+                $form_data['message'] = '<p>'.get_lang('NowGoChooseYourCourses', null, $_user['language']).".</p>";
             } else {
                 $form_data['action'] = api_get_path(WEB_PATH).'user_portal.php';
             }

main/auth/profile.php

Spacing +11 added lines, -11 removed lines

@@ -31,8 +31,8 @@ 
 }
 
 $htmlHeadXtra[] = api_get_password_checker_js('#username', '#password1');
-$htmlHeadXtra[] = '<link  href="'. api_get_path(WEB_PATH) .'web/assets/cropper/dist/cropper.min.css" rel="stylesheet">';
-$htmlHeadXtra[] = '<script src="'. api_get_path(WEB_PATH) .'web/assets/cropper/dist/cropper.min.js"></script>';
+$htmlHeadXtra[] = '<link  href="'.api_get_path(WEB_PATH).'web/assets/cropper/dist/cropper.min.css" rel="stylesheet">';
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_PATH).'web/assets/cropper/dist/cropper.min.js"></script>';
 $htmlHeadXtra[] = '<script>
 $(document).ready(function() {
     var $image = $("#previewImage");
@@ -168,10 +168,10 @@ 
 if (api_is_western_name_order()) {
     //    FIRST NAME and LAST NAME
     $form->addElement('text', 'firstname', get_lang('FirstName'), array('size' => 40));
-    $form->addElement('text', 'lastname',  get_lang('LastName'),  array('size' => 40));
+    $form->addElement('text', 'lastname', get_lang('LastName'), array('size' => 40));
 } else {
     //    LAST NAME and FIRST NAME
-    $form->addElement('text', 'lastname',  get_lang('LastName'),  array('size' => 40));
+    $form->addElement('text', 'lastname', get_lang('LastName'), array('size' => 40));
     $form->addElement('text', 'firstname', get_lang('FirstName'), array('size' => 40));
 }
 if (api_get_setting('profile', 'name') !== 'true') {
@@ -180,7 +180,7 @@ 
 $form->applyFilter(array('lastname', 'firstname'), 'stripslashes');
 $form->applyFilter(array('lastname', 'firstname'), 'trim');
 $form->applyFilter(array('lastname', 'firstname'), 'html_filter');
-$form->addRule('lastname' , get_lang('ThisFieldIsRequired'), 'required');
+$form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
 $form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
 
 //    USERNAME
@@ -223,7 +223,7 @@ 
     $form->freeze('email');
 }
 
-if (api_get_setting('registration', 'email') == 'true' &&  api_get_setting('profile', 'email') == 'true') {
+if (api_get_setting('registration', 'email') == 'true' && api_get_setting('profile', 'email') == 'true') {
     $form->applyFilter('email', 'stripslashes');
     $form->applyFilter('email', 'trim');
     $form->addRule('email', get_lang('ThisFieldIsRequired'), 'required');
@@ -389,7 +389,7 @@ 
 
 // the $jquery_ready_content variable collects all functions that
 // will be load in the $(document).ready javascript function
-$htmlHeadXtra[] ='<script>
+$htmlHeadXtra[] = '<script>
 $(document).ready(function(){
     '.$jquery_ready_content.'
 });
@@ -545,7 +545,7 @@ 
 
             if (!check_user_email($user_data['email']) &&
                 empty($user_data['password0'])
-            ){
+            ) {
                 Display::addFlash(
                     Display:: return_message(
                         get_lang('ToChangeYourEmailMustTypeYourPassword'),
@@ -654,7 +654,7 @@ 
     $available_values_to_modify = array();
     foreach ($profile_list as $key => $status) {
         if ($status == 'true') {
-            switch($key) {
+            switch ($key) {
                 case 'login':
                     $available_values_to_modify[] = 'username';
                     break;
@@ -787,10 +787,10 @@ 
 
         if (isset($_GET['type']) && $_GET['type'] == 'extended') {
             $actions .= '<a href="profile.php?type=reduced'.$show.'">'.
-                Display::return_icon('edit.png', get_lang('EditNormalProfile'),'',16).'</a>';
+                Display::return_icon('edit.png', get_lang('EditNormalProfile'), '', 16).'</a>';
         } else {
             $actions .= '<a href="profile.php?type=extended'.$show.'">'.
-                Display::return_icon('edit.png', get_lang('EditExtendProfile'),'',16).'</a>';
+                Display::return_icon('edit.png', get_lang('EditExtendProfile'), '', 16).'</a>';
         }
         $actions .= '</div>';
     }

main/auth/cas/logout.php

Spacing +1 added lines, -1 removed lines

@@ -9,5 +9,5 @@
 require_once('authcas.php');
 global $cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri;
 
-phpCAS::client($cas_auth_ver,$cas_auth_server,$cas_auth_port,$cas_auth_uri);
+phpCAS::client($cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri);
 phpCAS::logout();

main/auth/cas/authcas.php

Spacing +6 added lines, -6 removed lines

@@ -41,13 +41,13 @@ 
     }
 
 	if (!is_object($PHPCAS_CLIENT)) {
-		phpCAS::client($cas_auth_ver,$cas_auth_server,$cas_auth_port,$cas_auth_uri);
+		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());
+		$login = trim(phpCAS::getUser());
 		/*
 		   Get user  attributes. Here are the attributes for crdp platform
 		   sn => name
@@ -79,7 +79,7 @@ 
 			default:
 				$status=5; // Student
 		}*/
-		if (!$logout){
+		if (!$logout) {
 		    // get user info from username
 		    $tab_user_info = api_get_user_info($login);
 
@@ -92,7 +92,7 @@ 
                         $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,'') ;
+        				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;
@@ -105,7 +105,7 @@ 
 		            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);
+          				UserManager::create_user($userdata, $userdata, '5', $userdata, $login, 'casplaceholder', '', '', '', '', CAS_AUTH_SOURCE);
           				$user_added = $login;
 		                break;
 		            case LDAP_AUTH_SOURCE :
@@ -163,7 +163,7 @@ 
  *
  * @see online_logout()
  */
-function cas_logout($uinfo=null, $location=null)
+function cas_logout($uinfo = null, $location = null)
 {
     global $cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri;
     global $PHPCAS_CLIENT;

main/auth/cas/logincas.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
         $firstpage = $_GET['firstpage'];
         setcookie("GotoCourse", $firstpage);
     }
-    if (!is_object($PHPCAS_CLIENT) ) {
+    if (!is_object($PHPCAS_CLIENT)) {
         phpCAS::client(
             $cas_auth_ver,
             $cas_auth_server,

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

Spacing +13 added lines, -13 removed lines

@@ -131,17 +131,17 @@ 
    *

    * @public

    */

-  function PGTStorageFile($cas_parent,$format,$path)

+  function PGTStorageFile($cas_parent, $format, $path)

     {

       phpCAS::traceBegin();

       // call the ancestor's constructor

       $this->PGTStorage($cas_parent);

 

-      if (empty($format) ) $format = CAS_PGT_STORAGE_FILE_DEFAULT_FORMAT;

-      if (empty($path) ) $path = CAS_PGT_STORAGE_FILE_DEFAULT_PATH;

+      if (empty($format)) $format = CAS_PGT_STORAGE_FILE_DEFAULT_FORMAT;

+      if (empty($path)) $path = CAS_PGT_STORAGE_FILE_DEFAULT_PATH;

 

       // check that the path is an absolute path

-      if (getenv("OS")=="Windows_NT"){

+      if (getenv("OS") == "Windows_NT") {

       	

       	 if (!preg_match('`^[a-zA-Z]:`', $path)) {

 	     	phpCAS::error('an absolute path is needed for PGT storage to file');

@@ -151,13 +151,13 @@ 
       else

       {

       

-      	if ( $path[0] != '/' ) {

+      	if ($path[0] != '/') {

 			phpCAS::error('an absolute path is needed for PGT storage to file');

       	}

 

       	// store the path (with a leading and trailing '/')      

-      	$path = preg_replace('|[/]*$|','/',$path);

-      	$path = preg_replace('|^[/]*|','/',$path);

+      	$path = preg_replace('|[/]*$|', '/', $path);

+      	$path = preg_replace('|^[/]*|', '/', $path);

       }

       

       $this->_path = $path;

@@ -186,7 +186,7 @@ 
     {

       phpCAS::traceBegin();

       // if the storage has already been initialized, return immediatly

-      if ( $this->isInitialized() )

+      if ($this->isInitialized())

 	return;

       // call the ancestor's method (mark as initialized)

       parent::init();

@@ -222,12 +222,12 @@ 
    *

    * @public

    */

-  function write($pgt,$pgt_iou)

+  function write($pgt, $pgt_iou)

     {

       phpCAS::traceBegin();

       $fname = $this->getPGTIouFilename($pgt_iou);

-      if ( $f=fopen($fname,"w") ) {

-	if ( fputs($f,$pgt) === FALSE ) {

+      if ($f = fopen($fname, "w")) {

+	if (fputs($f, $pgt) === FALSE) {

 	  phpCAS::error('could not write PGT to `'.$fname.'\'');

 	}

 	fclose($f);

@@ -252,10 +252,10 @@ 
       phpCAS::traceBegin();

       $pgt = FALSE;

       $fname = $this->getPGTIouFilename($pgt_iou);

-      if ( !($f=fopen($fname,"r")) ) {

+      if (!($f = fopen($fname, "r"))) {

 	phpCAS::trace('could not open `'.$fname.'\'');

       } else {

-	if ( ($pgt=fgets($f)) === FALSE ) {

+	if (($pgt = fgets($f)) === FALSE) {

 	  phpCAS::trace('could not read PGT from `'.$fname.'\'');

 	} 

 	fclose($f);

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

Spacing +9 added lines, -9 removed lines

@@ -57,7 +57,7 @@ 
    * @hideinitializer

    * @private

    */

-  var $_url='';

+  var $_url = '';

 

   /**

    * This method returns the PEAR DB URL to use to connect to the database.

@@ -159,18 +159,18 @@ 
    *

    * @public

    */

-  function PGTStorageDB($cas_parent,$user,$password,$database_type,$hostname,$port,$database,$table)

+  function PGTStorageDB($cas_parent, $user, $password, $database_type, $hostname, $port, $database, $table)

     {

       phpCAS::traceBegin();

 

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

@@ -192,7 +192,7 @@ 
     {

       phpCAS::traceBegin();

       // if the storage has already been initialized, return immediatly

-      if ( $this->isInitialized() )

+      if ($this->isInitialized())

 		return;

       // call the ancestor's method (mark as initialized)

       parent::init();

@@ -205,7 +205,7 @@ 
 

       // try to connect to the database

       $this->_link = DB::connect($this->getURL());

-      if ( DB::isError($this->_link) ) {

+      if (DB::isError($this->_link)) {

 	phpCAS::error('could not connect to database ('.DB::errorMessage($this->_link).')');

       }

       var_dump($this->_link);