chamilo / chamilo-lms

main/cron/user_import/resend_email_with_new_password.php

Spacing +5 added lines, -5 removed lines

@@ -34,13 +34,13 @@ 
             FROM $users WHERE email = '$mail'\n";
     $res = Database::query($sql);
     if ($res === false) {
-        echo 'Error in database with email ' . $mail . "\n";
+        echo 'Error in database with email '.$mail."\n";
     }
     if (Database::num_rows($res) == 0) {
-        echo '[Error] Email not found in database: ' . $row['email'] . "\n";
+        echo '[Error] Email not found in database: '.$row['email']."\n";
     } else {
         $row = Database::fetch_assoc($res);
-        $pass = api_substr($row['username'], 0, 4) . rand(0, 9) . rand(0, 9);
+        $pass = api_substr($row['username'], 0, 4).rand(0, 9).rand(0, 9);
 
         if ($user) {
 
@@ -71,8 +71,8 @@ 
             null,
             PERSON_NAME_EMAIL_ADDRESS
         );
-        $emailsubject = '[' . api_get_setting('siteName') . '] ' . get_lang('YourReg', null, $l) . ' ' . api_get_setting('siteName');
-        $emailbody = get_lang('Dear', null, $l) . ' ' . api_get_person_name($user['FirstName'], $user['LastName']) . ",\n\n" . get_lang('YouAreReg', null, $l) . " " . api_get_setting('siteName') . " " . get_lang('WithTheFollowingSettings', null, $l) . "\n\n" . get_lang('Username', null, $l) . " : " . $user['UserName'] . "\n" . get_lang('Pass', null, $l) . " : " . $user['Password'] . "\n\n" . get_lang('Address', null, $l) . " " . api_get_setting('siteName') . " " . get_lang('Is', null, $l) . " : " . api_get_path(WEB_PATH) . " \n\n" . get_lang('Problem', null, $l) . "\n\n" . get_lang('Formula', null, $l) . ",\n\n" . api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname')) . "\n" . get_lang('Manager', null, $l) . " " . api_get_setting('siteName') . "\nT. " . api_get_setting('administratorTelephone') . "\n" . get_lang('Email', null, $l) . " : " . api_get_setting('emailAdministrator') . "";
+        $emailsubject = '['.api_get_setting('siteName').'] '.get_lang('YourReg', null, $l).' '.api_get_setting('siteName');
+        $emailbody = get_lang('Dear', null, $l).' '.api_get_person_name($user['FirstName'], $user['LastName']).",\n\n".get_lang('YouAreReg', null, $l)." ".api_get_setting('siteName')." ".get_lang('WithTheFollowingSettings', null, $l)."\n\n".get_lang('Username', null, $l)." : ".$user['UserName']."\n".get_lang('Pass', null, $l)." : ".$user['Password']."\n\n".get_lang('Address', null, $l)." ".api_get_setting('siteName')." ".get_lang('Is', null, $l)." : ".api_get_path(WEB_PATH)." \n\n".get_lang('Problem', null, $l)."\n\n".get_lang('Formula', null, $l).",\n\n".api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'))."\n".get_lang('Manager', null, $l)." ".api_get_setting('siteName')."\nT. ".api_get_setting('administratorTelephone')."\n".get_lang('Email', null, $l)." : ".api_get_setting('emailAdministrator')."";
         $sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
         $email_admin = api_get_setting('emailAdministrator');
         @api_mail_html(

main/cron/user_import/get_data_from_mail.php

Spacing +3 added lines, -3 removed lines

@@ -18,12 +18,12 @@ 
 $list = file('input.txt');
 require_once '../../inc/global.inc.php';
 $users = Database::get_main_table(TABLE_MAIN_USER);
-$string='';
+$string = '';
 foreach ($list as $mail) {
   $mail = trim($mail);
   $sql = "SELECT user_id, official_code, firstname, lastname, email FROM $users WHERE email = '$mail'\n";
   $res = Database::query($sql);
-  if ($res === false) { die(mysql_error());}
+  if ($res === false) { die(mysql_error()); }
   if (Database::num_rows($res) == 0) {
     $string .= 'No encontrado;'.$row['email'];
   } else {
@@ -32,4 +32,4 @@ 
   }
 }
 echo $string;
-file_put_contents('/tmp/list.txt',$string);
+file_put_contents('/tmp/list.txt', $string);

Indentation +8 added lines, -8 removed lines

@@ -20,16 +20,16 @@
 $users = Database::get_main_table(TABLE_MAIN_USER);
 $string='';
 foreach ($list as $mail) {
-  $mail = trim($mail);
-  $sql = "SELECT user_id, official_code, firstname, lastname, email FROM $users WHERE email = '$mail'\n";
-  $res = Database::query($sql);
-  if ($res === false) { die(mysql_error());}
-  if (Database::num_rows($res) == 0) {
+    $mail = trim($mail);
+    $sql = "SELECT user_id, official_code, firstname, lastname, email FROM $users WHERE email = '$mail'\n";
+    $res = Database::query($sql);
+    if ($res === false) { die(mysql_error());}
+    if (Database::num_rows($res) == 0) {
     $string .= 'No encontrado;'.$row['email'];
-  } else {
+    } else {
     $row = Database::fetch_assoc($res);
-   $string .= $row['user_id'].';'.$row['email'].';'.$row['firstname'].';'.$row['lastname'].';'.$row['official_code']."\r\n";
-  }
+    $string .= $row['user_id'].';'.$row['email'].';'.$row['firstname'].';'.$row['lastname'].';'.$row['official_code']."\r\n";
+    }
 }
 echo $string;
 file_put_contents('/tmp/list.txt',$string);

main/cron/user_import/client.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
  */
 require_once dirname(__FILE__).'/../../inc/global.inc.php';
 // check if this client has been called by php_cli (command line or cron)
-if (php_sapi_name()!='cli') {
+if (php_sapi_name() != 'cli') {
     echo 'You can\'t call this service through a browser';
     die();
 }

main/cron/create_course_sessions.php

Spacing +7 added lines, -8 removed lines

@@ -14,7 +14,7 @@ 
     exit; //do not run from browser
 }
 
-require_once __DIR__ . "/../inc/global.inc.php";
+require_once __DIR__."/../inc/global.inc.php";
 
 // First day of the current month to create sessions and add courses for the next month (e.g. "07")
 define("OFFSET", "15");
@@ -41,7 +41,7 @@ 
 {
     $startDate = $initialDate ? $initialDate : date("Y-m-01");
     $month = getQuarterFirstMonth(getQuarter(date('m', $startDate)));
-    $startDate = substr($startDate, 0, 5) . $month . '-01';
+    $startDate = substr($startDate, 0, 5).$month.'-01';
     $nextQuarterStartDate = date('Y-m-d', api_strtotime($startDate.' + 3 month'));
     $endDate = date('Y-m-d', api_strtotime($nextQuarterStartDate.' - 1 minute'));
     return array('startDate' => $startDate, 'endDate' => $endDate);
@@ -145,8 +145,7 @@ 
 {
     echo "\n";
     echo $courses ?
-        "Creating sessions and adding courses for the period between ".$startDate." and ".$endDate :
-        "Every course is already in session for the period between ".$startDate." and ".$endDate;
+        "Creating sessions and adding courses for the period between ".$startDate." and ".$endDate : "Every course is already in session for the period between ".$startDate." and ".$endDate;
     echo "\n=====================================================================================\n\n";
     // Loop through courses creating one session per each and adding them
     foreach ($courses as $course) {
@@ -155,8 +154,8 @@ 
         $year = date("Y", api_strtotime($startDate));
         $quarter = getQuarter($month);
         $quarter = getQuarterRoman($quarter);
-        $period = $year . '-' . $quarter;
-        $sessionName = '[' . $period . '] ' . $course['title'];
+        $period = $year.'-'.$quarter;
+        $sessionName = '['.$period.'] '.$course['title'];
         $sessionId = SessionManager::create_session(
             $sessionName,
             $startDate,
@@ -175,7 +174,7 @@ 
 }
 
 // Starts the script
-echo "Starting process..." . PHP_EOL;
+echo "Starting process...".PHP_EOL;
 // Get first active administrator
 $administrators = array_reverse(UserManager::get_all_administrators());
 $lastingAdministrators = count($administrators);
@@ -196,7 +195,7 @@ 
 
 // Creates course sessions for the following month
 $offsetDay = intval(substr($dates['endDate'], 8, 2)) - OFFSET;
-if (date("Y-m-d") >= date(substr($dates['endDate'], 0, 8) . $offsetDay)) {
+if (date("Y-m-d") >= date(substr($dates['endDate'], 0, 8).$offsetDay)) {
     $dates = getQuarterFirstAndLastDates(date("Y-m-d", api_strtotime(date("Y-m-01")." + 3 month")));
     // Get courses that don't have any session the next month
     $courses = CourseManager::getCoursesWithoutSession($dates['startDate'], $dates['endDate']);

main/cron/lang/langstats.php

Spacing +10 added lines, -10 removed lines

@@ -32,16 +32,16 @@ 
 /**
  * Display
  */
-if (count($list)==0) { echo 'No terms loaded so far'; }
-if (count($list)>0) {
+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) {
+  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) {
@@ -57,13 +57,13 @@ 
       $trans[$fixed_elem['term_name']] = $translation;
       $j++;
     }
-    echo '<tr><td>',$i,
-      '</td><td>',$fixed_elem['id'],
-      '</td><td>',$fixed_elem['term_name'];
+    echo '<tr><td>', $i,
+      '</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>',$fixed_elem['term_count'],'</td></tr>';
+    echo '</td><td>', $fixed_elem['term_count'], '</td></tr>';
     $i++;
   }
   echo '</table>';
@@ -71,9 +71,9 @@ 
     @mkdir('/tmp/lang');
     foreach ($files as $file => $terms) {
       @touch('/tmp/lang/'.$file);
-      file_put_contents('/tmp/lang/'.$file,"<?php".PHP_EOL);
+      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);
+        file_put_contents('/tmp/lang/'.$file, '$'.$term.' = "'.str_replace('"', '\"', $trans[$term]).'";'.PHP_EOL, FILE_APPEND);
       }
     }  
   }

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/list_undefined_langvars.php

Spacing +14 added lines, -14 removed lines

@@ -9,7 +9,7 @@ 
 die();
 require_once '../../inc/global.inc.php';
 $path = api_get_path(SYS_LANG_PATH).'english';
-ini_set('memory_limit','128M');
+ini_set('memory_limit', '128M');
 /**
  * Main code
  */
@@ -18,7 +18,7 @@ 
 foreach ($list as $entry) {
     $file = $path.'/'.$entry;
     if (is_file($file)) {
-        $terms = array_merge($terms,SubLanguageManager::get_all_language_variable_in_file($file,true));
+        $terms = array_merge($terms, SubLanguageManager::get_all_language_variable_in_file($file, true));
 	}
 }
 // get only the array keys (the language variables defined in language files)
@@ -31,13 +31,13 @@ 
 $files = get_all_php_files(api_get_path(SYS_PATH));
 foreach ($files as $file) {
     //echo 'Analyzing '.$file."<br />";
-    $shortfile = substr($file,$l);
+    $shortfile = substr($file, $l);
 	$lines = file($file);
     foreach ($lines as $line) {
     	$myterms = array();
-        $res = preg_match_all('/get_lang\(\'(\\w*)\'\)/',$line,$myterms);
+        $res = preg_match_all('/get_lang\(\'(\\w*)\'\)/', $line, $myterms);
         if ($res > 0) {
-            foreach($myterms[1] as $term) {
+            foreach ($myterms[1] as $term) {
                 if (!isset($defined_terms[$term]) && !isset($defined_terms['lang'.$term])) {
                 	$undefined_terms[$term] = $shortfile;
                     //echo "Undefined: $term<br />";
@@ -45,9 +45,9 @@ 
             }
         }
         $res = 0;
-        $res = preg_match_all('/\{[\'"](\\w*)[\'"]\|get_lang\}/',$line,$myterms);
+        $res = preg_match_all('/\{[\'"](\\w*)[\'"]\|get_lang\}/', $line, $myterms);
         if ($res > 0) {
-            foreach($myterms[1] as $term) {
+            foreach ($myterms[1] as $term) {
                 if (!isset($defined_terms[$term]) && !isset($defined_terms['lang'.$term])) {
                 	$undefined_terms[$term] = $shortfile;
                     //echo "Undefined: $term<br />";
@@ -58,10 +58,10 @@ 
     flush();
 }
 //$undefined_terms = array_flip($undefined_terms);
-if (count($undefined_terms)<1) { die("No missing terms<br />\n"); } else { echo "The following terms were nowhere to be found: <br />\n<table>"; }
+if (count($undefined_terms) < 1) { die("No missing terms<br />\n"); } else { echo "The following terms were nowhere to be found: <br />\n<table>"; }
 foreach ($undefined_terms as $term => $file) {
     echo "<tr><td>$term</td><td>in $file";
-    if (substr($file,0,7)=='plugin/') {
+    if (substr($file, 0, 7) == 'plugin/') {
         echo " <span style=\"color: #00ff00;\">(this one should be taken care of by the plugin's language files)</span>";
     }
     echo "</td></tr>\n";
@@ -73,14 +73,14 @@ 
     $list = scandir($base_path);
     $files = array();
     foreach ($list as $item) {
-    	if (substr($item,0,1)=='.') {continue;}
-        $special_dirs = array(api_get_path(SYS_TEST_PATH),api_get_path(SYS_COURSE_PATH),api_get_path(SYS_LANG_PATH),api_get_path(SYS_ARCHIVE_PATH));
-        if (in_array($base_path.$item.'/',$special_dirs)) {continue;}
+    	if (substr($item, 0, 1) == '.') {continue; }
+        $special_dirs = array(api_get_path(SYS_TEST_PATH), api_get_path(SYS_COURSE_PATH), api_get_path(SYS_LANG_PATH), api_get_path(SYS_ARCHIVE_PATH));
+        if (in_array($base_path.$item.'/', $special_dirs)) {continue; }
         if (is_dir($base_path.$item)) {
-        	$files = array_merge($files,get_all_php_files($base_path.$item.'/'));
+        	$files = array_merge($files, get_all_php_files($base_path.$item.'/'));
         } else {
             //only analyse php files
-                $sub = substr($item,-4);
+                $sub = substr($item, -4);
         	if ($sub == '.php' or $sub == '.tpl') {
                     $files[] = $base_path.$item;
         	}

Indentation +9 added lines, -9 removed lines

@@ -19,7 +19,7 @@ 
     $file = $path.'/'.$entry;
     if (is_file($file)) {
         $terms = array_merge($terms,SubLanguageManager::get_all_language_variable_in_file($file,true));
-	}
+    }
 }
 // get only the array keys (the language variables defined in language files)
 $defined_terms = array_flip(array_keys($terms));
@@ -32,14 +32,14 @@ 
 foreach ($files as $file) {
     //echo 'Analyzing '.$file."<br />";
     $shortfile = substr($file,$l);
-	$lines = file($file);
+    $lines = file($file);
     foreach ($lines as $line) {
-    	$myterms = array();
+        $myterms = array();
         $res = preg_match_all('/get_lang\(\'(\\w*)\'\)/',$line,$myterms);
         if ($res > 0) {
             foreach($myterms[1] as $term) {
                 if (!isset($defined_terms[$term]) && !isset($defined_terms['lang'.$term])) {
-                	$undefined_terms[$term] = $shortfile;
+                    $undefined_terms[$term] = $shortfile;
                     //echo "Undefined: $term<br />";
                 }
             }
@@ -49,7 +49,7 @@ 
         if ($res > 0) {
             foreach($myterms[1] as $term) {
                 if (!isset($defined_terms[$term]) && !isset($defined_terms['lang'.$term])) {
-                	$undefined_terms[$term] = $shortfile;
+                    $undefined_terms[$term] = $shortfile;
                     //echo "Undefined: $term<br />";
                 }
             }
@@ -73,17 +73,17 @@ 
     $list = scandir($base_path);
     $files = array();
     foreach ($list as $item) {
-    	if (substr($item,0,1)=='.') {continue;}
+        if (substr($item,0,1)=='.') {continue;}
         $special_dirs = array(api_get_path(SYS_TEST_PATH),api_get_path(SYS_COURSE_PATH),api_get_path(SYS_LANG_PATH),api_get_path(SYS_ARCHIVE_PATH));
         if (in_array($base_path.$item.'/',$special_dirs)) {continue;}
         if (is_dir($base_path.$item)) {
-        	$files = array_merge($files,get_all_php_files($base_path.$item.'/'));
+            $files = array_merge($files,get_all_php_files($base_path.$item.'/'));
         } else {
             //only analyse php files
                 $sub = substr($item,-4);
-        	if ($sub == '.php' or $sub == '.tpl') {
+            if ($sub == '.php' or $sub == '.tpl') {
                     $files[] = $base_path.$item;
-        	}
+            }
         }
     }
     $list = null;

main/cron/lang/check_parse_lang.php

Spacing +4 added lines, -4 removed lines

@@ -9,7 +9,7 @@ 
 //die();
 require_once '../../inc/global.inc.php';
 $path = api_get_path(SYS_LANG_PATH).'english';
-ini_set('memory_limit','128M');
+ini_set('memory_limit', '128M');
 /**
  * Main code
  */
@@ -18,7 +18,7 @@ 
 $langs = scandir(api_get_path(SYS_LANG_PATH));
 foreach ($langs as $lang) {
   $dir = api_get_path(SYS_LANG_PATH).$lang;
-  if (is_dir($dir) && substr($lang,0,1) != '.' && !empty($lang)) {
+  if (is_dir($dir) && substr($lang, 0, 1) != '.' && !empty($lang)) {
     echo "$lang...";
     $ok = true;
     foreach ($list as $entry) {
@@ -26,8 +26,8 @@ 
       $out = array();
       if (is_file($file)) {
         //$terms = array_merge($terms,SubLanguageManager::get_all_language_variable_in_file($file,true));
-        @exec('php5 -l '.$file,$out);
-        if (substr($out[0],0,2)!='No') {
+        @exec('php5 -l '.$file, $out);
+        if (substr($out[0], 0, 2) != 'No') {
           echo $out[0]."\n";
           $ok = false;
         }

Indentation +10 added lines, -10 removed lines

@@ -17,25 +17,25 @@
 $list = SubLanguageManager::get_lang_folder_files_list($path);
 $langs = scandir(api_get_path(SYS_LANG_PATH));
 foreach ($langs as $lang) {
-  $dir = api_get_path(SYS_LANG_PATH).$lang;
-  if (is_dir($dir) && substr($lang,0,1) != '.' && !empty($lang)) {
+    $dir = api_get_path(SYS_LANG_PATH).$lang;
+    if (is_dir($dir) && substr($lang,0,1) != '.' && !empty($lang)) {
     echo "$lang...";
     $ok = true;
     foreach ($list as $entry) {
-      $file = $dir.'/'.$entry;
-      $out = array();
-      if (is_file($file)) {
+        $file = $dir.'/'.$entry;
+        $out = array();
+        if (is_file($file)) {
         //$terms = array_merge($terms,SubLanguageManager::get_all_language_variable_in_file($file,true));
         @exec('php5 -l '.$file,$out);
         if (substr($out[0],0,2)!='No') {
-          echo $out[0]."\n";
-          $ok = false;
+            echo $out[0]."\n";
+            $ok = false;
+        }
         }
-      }
     }
     if ($ok) {
-      echo "OK\n";
+        echo "OK\n";
+    }
     }
-  }
 }
 echo "Done\n";

main/cron/lang/langstats_file_builder.php

Spacing +13 added lines, -13 removed lines

@@ -34,7 +34,7 @@ 
  */
 foreach ($terms as $row) {
   if ($words_counter > 10000) { break; }
-  $words = str_word_count(get_lang($row['term_name'],null,$orig_lang));
+  $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";
@@ -59,37 +59,37 @@ 
 $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;}
+  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) {
+    $res = preg_match('/^(\$\w*)/', $line, $var);
+    if ($res > 0) {
       //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)) {
+        $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)) {
         //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));
+        $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
     }
   }
   echo "Writing ".$arch_dir.'/langstats/'.$orig_lang.'/'.$file."<br />\n";
-  file_put_contents($arch_dir.'/langstats/'.$orig_lang.'/'.$file,$file_string); 
+  file_put_contents($arch_dir.'/langstats/'.$orig_lang.'/'.$file, $file_string); 
   $global_var += $local_var;
 };
-$terms_diff = count($global_var)-count($terms_in_limit);
+$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 />";
 /**
  * Display results
@@ -97,5 +97,5 @@ 
 
 echo "Difference between filtered and found in English:<br />";
 //print_r($terms_found);
-echo "<pre>".print_r(array_diff($terms_in_limit,$terms_found),1)."</pre>";
+echo "<pre>".print_r(array_diff($terms_in_limit, $terms_found), 1)."</pre>";
 echo "#";

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/cron/lang/langstats.class.php

Spacing +8 added lines, -8 removed lines

@@ -30,7 +30,7 @@ 
                     return false; //cannot use if sqlite not installed
                 }
                 if (empty($file)) {
-                    $file = api_get_path(SYS_ARCHIVE_PATH) . '/langstasdb';
+                    $file = api_get_path(SYS_ARCHIVE_PATH).'/langstasdb';
                 }
                 if (is_file($file) && is_writeable($file)) {
                     $this->db = new SQLite3($file, SQLITE3_OPEN_READWRITE);
@@ -39,7 +39,7 @@ 
                         $this->db = new SQLite3($file);
                     } catch (Exception $e) {
                         $this->error = 'DatabaseCreateError';
-                        error_log('Exception: ' . $e->getMessage());
+                        error_log('Exception: '.$e->getMessage());
                         return false;
                     }
                     $err = $this->db->exec(
@@ -104,7 +104,7 @@ 
             $num = $row[3];
             $num++;
             $res = $this->db->query(
-                'UPDATE lang_freq SET term_count = ' . $num . ' WHERE id = ' . $row[0]
+                'UPDATE lang_freq SET term_count = '.$num.' WHERE id = '.$row[0]
             );
             if ($res === false) {
                 $this->error = 'CouldNotUpdateTerm';
@@ -136,7 +136,7 @@ 
     public function get_popular_terms($num = 1000)
     {
         $res = $this->db->query(
-            'SELECT * FROM lang_freq ORDER BY term_count DESC LIMIT ' . $num
+            'SELECT * FROM lang_freq ORDER BY term_count DESC LIMIT '.$num
         );
         $list = array();
         while ($row = $res->fetchArray()) {
@@ -163,16 +163,16 @@ 
      */
     public function get_variables_origin()
     {
-        $path = api_get_path(SYS_LANG_PATH) . 'english/';
+        $path = api_get_path(SYS_LANG_PATH).'english/';
         $vars = array();
         $priority = array('trad4all');
         foreach ($priority as $file) {
             $list = SubLanguageManager::get_all_language_variable_in_file(
-                $path . $file . '.inc.php',
+                $path.$file.'.inc.php',
                 true
             );
             foreach ($list as $var => $trad) {
-                $vars[$var] = $file . '.inc.php';
+                $vars[$var] = $file.'.inc.php';
             }
         }
         $files = scandir($path);
@@ -181,7 +181,7 @@ 
                 continue;
             }
             $list = SubLanguageManager::get_all_language_variable_in_file(
-                $path . $file,
+                $path.$file,
                 true
             );
             foreach ($list as $var => $trad) {