chamilo / chamilo-lms

main/auth/ldap/authldap.php

Indentation +20 added lines, -21 removed lines

@@ -46,10 +46,9 @@ 
     - Universite Jean Monet (J Dubois / Michel Courbon)
     - Michel Panckoucke for reporting and fixing a bug
     - Patrick Cool: fixing security hole
-
-    *    @author Roan Embrechts
-    *    @version 3.0
-    *    @package chamilo.auth.ldap
+ *    @author Roan Embrechts
+ *    @version 3.0
+ *    @package chamilo.auth.ldap
  * Note:
  * If you are using a firewall, you might need to check port 389 is open in
  * order for Chamilo to communicate with the LDAP server.
@@ -211,8 +210,8 @@ 
     $language = api_get_setting('platformLanguage');
     if (empty($language)) { $language = 'english'; }
     $_userId = UserManager::create_user($prenom, $nom, $status,
-                     $email, $uname, $password, $official_code,
-                     $language,'', '', 'ldap');
+                        $email, $uname, $password, $official_code,
+                        $language,'', '', 'ldap');
 
     //echo "new user added to Chamilo, id = $_userId";
 
@@ -271,7 +270,7 @@ 
         // Open anonymous LDAP connection
         $result=false;
         $ldap_bind_res = ldap_handle_bind($ds,$result);
-	// Executing the search with the $filter parametr
+    // Executing the search with the $filter parametr
         //error_log('Searching for '.$filter.' on LDAP server',0);
         $sr=ldap_search($ds,$ldap_basedn,$filter);
         $info = ldap_get_entries($ds, $sr);
@@ -564,35 +563,35 @@ 
         foreach ($UserList as $enreg_user) {
             $enreg_user = (int) $enreg_user;
             Database::query("INSERT IGNORE ".
-              " INTO $tbl_session_rel_course_rel_user ".
-              "(session_id,c_id,user_id) VALUES ".
-              "('$id_session','$enreg_course','$enreg_user')");
+                " INTO $tbl_session_rel_course_rel_user ".
+                "(session_id,c_id,user_id) VALUES ".
+                "('$id_session','$enreg_course','$enreg_user')");
         }
         $sql = "SELECT COUNT(user_id) as nbUsers ".
-               " FROM $tbl_session_rel_course_rel_user " .
-               " WHERE session_id='$id_session' ".
-               " AND c_id='$enreg_course'";
+                " FROM $tbl_session_rel_course_rel_user " .
+                " WHERE session_id='$id_session' ".
+                " AND c_id='$enreg_course'";
         $rs = Database::query($sql);
         list($nbr_users) = Database::fetch_array($rs);
         Database::query("UPDATE $tbl_session_rel_course  ".
-               " SET nbr_users=$nbr_users " .
-               " WHERE session_id='$id_session' ".
-               " AND c_id='$enreg_course'");
+                " SET nbr_users=$nbr_users " .
+                " WHERE session_id='$id_session' ".
+                " AND c_id='$enreg_course'");
     }
     foreach ($UserList as $enreg_user) {
         $enreg_user = (int) $enreg_user;
         Database::query("INSERT IGNORE INTO $tbl_session_rel_user ".
-               " (session_id, user_id, registered_at) " .
-               " VALUES('$id_session','$enreg_user', '" . api_get_utc_datetime() . "')");
+                " (session_id, user_id, registered_at) " .
+                " VALUES('$id_session','$enreg_user', '" . api_get_utc_datetime() . "')");
     }
     // We update the number of users in the session
     $sql = "SELECT COUNT(user_id) as nbUsers FROM $tbl_session_rel_user ".
-           " WHERE session_id='$id_session' ".
-           " AND relation_type<>".SESSION_RELATION_TYPE_RRHH." ";
+            " WHERE session_id='$id_session' ".
+            " AND relation_type<>".SESSION_RELATION_TYPE_RRHH." ";
     $rs = Database::query($sql);
     list($nbr_users) = Database::fetch_array($rs);
     Database::query("UPDATE $tbl_session SET nbr_users=$nbr_users ".
-           " WHERE id='$id_session'");
+            " WHERE id='$id_session'");
 }
 
 function syncro_users() {

main/admin/cli.php

Indentation +5 added lines, -5 removed lines

@@ -28,15 +28,15 @@
 switch ($_GET["cmd"]) {
     case "clear_stapi":
       echo "Are you sure you are willing to erease all storage api data (no backup)? <a href='cli.php?cmd=clear_stapi_confirm' >Yes</a>";
-      break;
+        break;
     case "clear_stapi_confirm":
       Database::query("delete from ".Database::get_main_table(TABLE_TRACK_STORED_VALUES));
-      Database::query("delete from ".Database::get_main_table(TABLE_TRACK_STORED_VALUES_STACK));
-      echo "Done";
-      break;
+        Database::query("delete from ".Database::get_main_table(TABLE_TRACK_STORED_VALUES_STACK));
+        echo "Done";
+        break;
     default:
       echo "UNKNOWN COMMAND";
-      break;
+        break;
 }
 /**
  * Footer 

main/admin/user_update_import.php

Indentation +2 added lines, -2 removed lines

@@ -60,8 +60,8 @@
                     $user['error'] = get_lang('UserNameNotAvailable');
                     $errors[] = $user;
                 }
-             }
-          }
+                }
+            }
 
         // 3. Check status.
         if (isset($user['Status']) && !api_status_exists($user['Status'])) {

main/cron/lang/langstats.php

Indentation +31 added lines, -31 removed lines

@@ -22,59 +22,59 @@
 $output = false;
 $ls = new langstats();
 if ($ls === false) {
-  exit($ls->error);
+    exit($ls->error);
 }
 $list = $ls->get_popular_terms($x_most_popular);
 if ($_GET['output'] == 1) {
-  $output = true;
-  $variables_origin = $ls->get_variables_origin();
+    $output = true;
+    $variables_origin = $ls->get_variables_origin();
 }
 /**
  * Display
  */
 if (count($list)==0) { echo 'No terms loaded so far'; }
 if (count($list)>0) {
-  $i = 1;
-  $j = 1;
-  $k = 0;
-  $files = array();
-  $trans = array();
-  echo 'Number of records: '.count($list).'<br />';
-  echo '<table><tr><th>Index</th><th>Registration order</th><th>Term</th>'.($output==1?'<th>Origin</th>':'').'<th>Count</th></tr>';
-  foreach($list as $elem) {
+    $i = 1;
+    $j = 1;
+    $k = 0;
+    $files = array();
+    $trans = array();
+    echo 'Number of records: '.count($list).'<br />';
+    echo '<table><tr><th>Index</th><th>Registration order</th><th>Term</th>'.($output==1?'<th>Origin</th>':'').'<th>Count</th></tr>';
+    foreach($list as $elem) {
     if ($k > $terms_limit) { break; }
     $fixed_elem = $elem;
     if ($output) {
-      if (empty($variables_origin[$elem['term_name']]) && !empty($variables_origin['lang'.$elem['term_name']])) {
+        if (empty($variables_origin[$elem['term_name']]) && !empty($variables_origin['lang'.$elem['term_name']])) {
         $fixed_elem = array('id' => $elem['id'], 'term_name' => 'lang'.$elem['term_name'], 'term_count' => $elem['term_count']);
-      }
-      if (empty($variables_origin[$fixed_elem['term_name']])) {
+        }
+        if (empty($variables_origin[$fixed_elem['term_name']])) {
         continue; 
-      }
-      $files[$variables_origin[$fixed_elem['term_name']]][] = $fixed_elem['term_name'];
-      $translation = get_lang($fixed_elem['term_name']);
-      $k += str_word_count($translation);
-      $trans[$fixed_elem['term_name']] = $translation;
-      $j++;
+        }
+        $files[$variables_origin[$fixed_elem['term_name']]][] = $fixed_elem['term_name'];
+        $translation = get_lang($fixed_elem['term_name']);
+        $k += str_word_count($translation);
+        $trans[$fixed_elem['term_name']] = $translation;
+        $j++;
     }
     echo '<tr><td>',$i,
-      '</td><td>',$fixed_elem['id'],
-      '</td><td>',$fixed_elem['term_name'];
+        '</td><td>',$fixed_elem['id'],
+        '</td><td>',$fixed_elem['term_name'];
     if ($output) {
-      echo '</td><td>'.$variables_origin[$fixed_elem['term_name']];
+        echo '</td><td>'.$variables_origin[$fixed_elem['term_name']];
     }
     echo '</td><td>',$fixed_elem['term_count'],'</td></tr>';
     $i++;
-  }
-  echo '</table>';
-  if ($output) {
+    }
+    echo '</table>';
+    if ($output) {
     @mkdir('/tmp/lang');
     foreach ($files as $file => $terms) {
-      @touch('/tmp/lang/'.$file);
-      file_put_contents('/tmp/lang/'.$file,"<?php".PHP_EOL);
-      foreach ($terms as $term) {
+        @touch('/tmp/lang/'.$file);
+        file_put_contents('/tmp/lang/'.$file,"<?php".PHP_EOL);
+        foreach ($terms as $term) {
         file_put_contents('/tmp/lang/'.$file,'$'.$term.' = "'.str_replace('"','\"',$trans[$term]).'";'.PHP_EOL, FILE_APPEND);
-      }
+        }
     }  
-  }
+    }
 }

main/cron/lang/langstats_file_builder.php

Indentation +24 added lines, -24 removed lines

@@ -33,15 +33,15 @@ 
  * Code run
  */
 foreach ($terms as $row) {
-  if ($words_counter > 10000) { break; }
-  $words = str_word_count(get_lang($row['term_name'],null,$orig_lang));
-  $words_counter += $words;
-  $terms_in_limit[$row['term_name']] = $i;
-  //echo "Term <b>".$row['term_name']."</b> is <b>'".get_lang($row['term_name'],null,$orig_lang)."'</b> which means $words words<br /><br />\n";
-  //if ($words_counter%1000 >= 0) {
+    if ($words_counter > 10000) { break; }
+    $words = str_word_count(get_lang($row['term_name'],null,$orig_lang));
+    $words_counter += $words;
+    $terms_in_limit[$row['term_name']] = $i;
+    //echo "Term <b>".$row['term_name']."</b> is <b>'".get_lang($row['term_name'],null,$orig_lang)."'</b> which means $words words<br /><br />\n";
+    //if ($words_counter%1000 >= 0) {
     //echo "Reached $words_counter words at term $i (".$row['term_name']." used ".$row['term_count']." times)...<br />\n";
-  //}
-  $i++;
+    //}
+    $i++;
 }
 //echo $words_counter.'<br />';
 
@@ -49,8 +49,8 @@ 
 
 echo "Scanning English files, trying to find these terms...<br />\n";
 if (!is_dir($arch_dir.'/langstats')) {
-  mkdir($arch_dir.'/langstats');
-  mkdir($arch_dir.'/langstats/'.$orig_lang);
+    mkdir($arch_dir.'/langstats');
+    mkdir($arch_dir.'/langstats/'.$orig_lang);
 }
 $list_files = scandir($lang_dir.'/'.$orig_lang);
 $j = 1;
@@ -59,35 +59,35 @@ 
 $global_var = array(); //keep the combination of all vars
 $terms_in_limit = array_flip($terms_in_limit);
 foreach ($list_files as $file) {
-  if (substr($file,0,1) == '.') {continue;}
-  //echo "'".substr($file,0,-8)."',<br />"; //print in a PHP array format
-  $vars = file($lang_dir.'/'.$orig_lang.'/'.$file);
-  $local_var = array();
-  $file_string = '<?php'."\n";
-  foreach ($vars as $line) {
+    if (substr($file,0,1) == '.') {continue;}
+    //echo "'".substr($file,0,-8)."',<br />"; //print in a PHP array format
+    $vars = file($lang_dir.'/'.$orig_lang.'/'.$file);
+    $local_var = array();
+    $file_string = '<?php'."\n";
+    foreach ($vars as $line) {
     $var = array();
     $res = preg_match('/^(\$\w*)/',$line,$var);
     if ($res>0) {
-      //echo $var[1]."<br />";
+        //echo $var[1]."<br />";
       
-      if (in_array(substr($var[1],1),$terms_in_limit)) {
+        if (in_array(substr($var[1],1),$terms_in_limit)) {
         //echo "Var ".$var[1]." was in the limit<br />";
         $local_var[$var[1]] = $line;
         $file_string .= $line;
         $terms_found[] = substr($var[1],1); //e.g. store Tools
         $words_found += str_word_count(get_lang($var[1],null,$orig_lang));
-      } elseif (in_array(substr($var[1],5),$terms_in_limit)) {
+        } elseif (in_array(substr($var[1],5),$terms_in_limit)) {
         //echo "Var ".$var[1]." was in the limit<br />";
         $local_var[$var[1]] = $line;
         $file_string .= $line;
         $terms_found[] = substr($var[1],5); //e.g. store langTools
         $words_found += str_word_count(get_lang(substr($var[1],5),null,$orig_lang));
-      } //else do not care
+        } //else do not care
     }
-  }
-  echo "Writing ".$arch_dir.'/langstats/'.$orig_lang.'/'.$file."<br />\n";
-  file_put_contents($arch_dir.'/langstats/'.$orig_lang.'/'.$file,$file_string); 
-  $global_var += $local_var;
+    }
+    echo "Writing ".$arch_dir.'/langstats/'.$orig_lang.'/'.$file."<br />\n";
+    file_put_contents($arch_dir.'/langstats/'.$orig_lang.'/'.$file,$file_string); 
+    $global_var += $local_var;
 };
 $terms_diff = count($global_var)-count($terms_in_limit);
 echo count($global_var)." terms found in English files (summing up to $words_found words). Some terms ($terms_diff in this case) might have appeared in two different files<br />";

main/inc/lib/api.lib.php

Indentation +2 added lines, -4 removed lines

@@ -625,7 +625,6 @@ 
  * The other configuration parameters have not been changed.
  *
  * This is how we can get most used paths, for common purpose:
-
  * api_get_path(REL_PATH)                       /chamilo/
  * api_get_path(REL_COURSE_PATH)                /chamilo/courses/
  * api_get_path(REL_CODE_PATH)                  /chamilo/main/
@@ -1803,7 +1802,6 @@ 
 
 /**
  * Returns the current course info array.
-
  * Now if the course_code is given, the returned array gives info about that
  * particular course, not specially the current one.
  * @param int $id Numeric ID of the course
@@ -2734,7 +2732,7 @@ 
         switch ($session_user_status) {
             case 0:
                 $session_status['status'] = 'student';
-               break;
+                break;
             case 2:
                 $session_status['status'] = 'coach';
             break;
@@ -6492,7 +6490,7 @@ 
 function api_get_jquery_ui_js($include_jqgrid = false) {
     $libraries = array();
     if ($include_jqgrid) {
-       $libraries[]='jqgrid';
+        $libraries[]='jqgrid';
     }
     return api_get_jquery_libraries_js($libraries);
 }

main/course_home/course_home.php

Indentation +7 added lines, -7 removed lines

@@ -213,7 +213,7 @@ 
             if (Database::num_rows($result) ==  0) {
                 $condition = '';
             } else {
-            	//great, there is an specific auto launch for this session we leave the $condition
+                //great, there is an specific auto launch for this session we leave the $condition
             }
         }
 
@@ -225,7 +225,7 @@ 
             $lp_data = Database::fetch_array($result,'ASSOC');
             if (!empty($lp_data['id'])) {
                 if (api_is_platform_admin() || api_is_allowed_to_edit()) {
-                	$show_autolaunch_lp_warning = true;
+                    $show_autolaunch_lp_warning = true;
                 } else {
                     $session_key = 'lp_autolaunch_'.$session_id.'_'.api_get_course_int_id().'_'.api_get_user_id();
                     if (!isset($_SESSION[$session_key])) {
@@ -254,7 +254,7 @@ 
         //if (!isset($_SESSION[$forumKey])) {
             //redirecting to the LP
             $url = api_get_path(WEB_CODE_PATH).'forum/index.php?'.api_get_cidreq().'&id_session='.$session_id;
-          //  $_SESSION[$forumKey] = true;
+            //  $_SESSION[$forumKey] = true;
             header("Location: $url");
             exit;
         //}
@@ -280,13 +280,13 @@ 
 if (api_get_setting('course.homepage_view') == 'activity' ||
     api_get_setting('course.homepage_view') == 'activity_big'
 ) {
-	require 'activity.php';
+    require 'activity.php';
 } elseif (api_get_setting('course.homepage_view') == '2column') {
-	require '2column.php';
+    require '2column.php';
 } elseif (api_get_setting('course.homepage_view') == '3column') {
-	require '3column.php';
+    require '3column.php';
 } elseif (api_get_setting('course.homepage_view') == 'vertical_activity') {
-	require 'vertical_activity.php';
+    require 'vertical_activity.php';
 }
 
 $content = '<div id="course_tools">'.$content.'</div>';

main/inc/lib/login.lib.php

Indentation +6 added lines, -6 removed lines

@@ -852,14 +852,14 @@ 
             $email = false;
         }
 
-		if ($email) {
-			$condition = "LOWER(email) = '".Database::escape_string($username)."' ";
-		} else {
+        if ($email) {
+            $condition = "LOWER(email) = '".Database::escape_string($username)."' ";
+        } else {
             $condition = "LOWER(username) = '".Database::escape_string($username)."'";
         }
 
-		$tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
-		$query = "SELECT 
+        $tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
+        $query = "SELECT 
 		            user_id AS uid, 
 		            lastname AS lastName, 
 		            firstname AS firstName, 
@@ -874,7 +874,7 @@ 
                     auth_source
 				 FROM $tbl_user
 				 WHERE ( $condition AND active = 1) ";
-		$result = Database::query($query);
+        $result = Database::query($query);
         $num_rows = Database::num_rows($result);
         if ($result && $num_rows > 0) {
             return Database::fetch_assoc($result);

main/inc/lib/formvalidator/Element/SelectLanguage.php

Indentation +18 added lines, -18 removed lines

@@ -7,22 +7,22 @@
  */
 class SelectLanguage extends HTML_QuickForm_select
 {
-	/**
-	 * Class constructor
-	 */
-	public function __construct($elementName = null, $elementLabel = null, $options = null, $attributes = null)
-	{
-		parent::__construct($elementName, $elementLabel, $options, $attributes);
-		// Get all languages
-		$languages = api_get_languages();
-		$this->_options = array();
-		$this->_values = array();
-		foreach ($languages['name'] as $index => $name) {
-			if ($languages['folder'][$index] == api_get_setting('platformLanguage')) {
-				$this->addOption($name, $languages['folder'][$index], array('selected'=>'selected'));
-			} else {
-				$this->addOption($name, $languages['folder'][$index]);
-			}
-		}
-	}
+    /**
+     * Class constructor
+     */
+    public function __construct($elementName = null, $elementLabel = null, $options = null, $attributes = null)
+    {
+        parent::__construct($elementName, $elementLabel, $options, $attributes);
+        // Get all languages
+        $languages = api_get_languages();
+        $this->_options = array();
+        $this->_values = array();
+        foreach ($languages['name'] as $index => $name) {
+            if ($languages['folder'][$index] == api_get_setting('platformLanguage')) {
+                $this->addOption($name, $languages['folder'][$index], array('selected'=>'selected'));
+            } else {
+                $this->addOption($name, $languages['folder'][$index]);
+            }
+        }
+    }
 }