Completed
Push — 1.11.x ( d84d27...922b6f )
by José
30:17
created
main/cron/lang/list_undefined_langvars.php 2 patches
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
 die();
10 10
 require_once '../../inc/global.inc.php';
11 11
 $path = api_get_path(SYS_LANG_PATH).'english';
12
-ini_set('memory_limit','128M');
12
+ini_set('memory_limit', '128M');
13 13
 /**
14 14
  * Main code
15 15
  */
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
 foreach ($list as $entry) {
19 19
     $file = $path.'/'.$entry;
20 20
     if (is_file($file)) {
21
-        $terms = array_merge($terms,SubLanguageManager::get_all_language_variable_in_file($file,true));
21
+        $terms = array_merge($terms, SubLanguageManager::get_all_language_variable_in_file($file, true));
22 22
 	}
23 23
 }
24 24
 // get only the array keys (the language variables defined in language files)
@@ -31,13 +31,13 @@  discard block
 block discarded – undo
31 31
 $files = get_all_php_files(api_get_path(SYS_PATH));
32 32
 foreach ($files as $file) {
33 33
     //echo 'Analyzing '.$file."<br />";
34
-    $shortfile = substr($file,$l);
34
+    $shortfile = substr($file, $l);
35 35
 	$lines = file($file);
36 36
     foreach ($lines as $line) {
37 37
     	$myterms = array();
38
-        $res = preg_match_all('/get_lang\(\'(\\w*)\'\)/',$line,$myterms);
38
+        $res = preg_match_all('/get_lang\(\'(\\w*)\'\)/', $line, $myterms);
39 39
         if ($res > 0) {
40
-            foreach($myterms[1] as $term) {
40
+            foreach ($myterms[1] as $term) {
41 41
                 if (!isset($defined_terms[$term]) && !isset($defined_terms['lang'.$term])) {
42 42
                 	$undefined_terms[$term] = $shortfile;
43 43
                     //echo "Undefined: $term<br />";
@@ -45,9 +45,9 @@  discard block
 block discarded – undo
45 45
             }
46 46
         }
47 47
         $res = 0;
48
-        $res = preg_match_all('/\{[\'"](\\w*)[\'"]\|get_lang\}/',$line,$myterms);
48
+        $res = preg_match_all('/\{[\'"](\\w*)[\'"]\|get_lang\}/', $line, $myterms);
49 49
         if ($res > 0) {
50
-            foreach($myterms[1] as $term) {
50
+            foreach ($myterms[1] as $term) {
51 51
                 if (!isset($defined_terms[$term]) && !isset($defined_terms['lang'.$term])) {
52 52
                 	$undefined_terms[$term] = $shortfile;
53 53
                     //echo "Undefined: $term<br />";
@@ -58,10 +58,10 @@  discard block
 block discarded – undo
58 58
     flush();
59 59
 }
60 60
 //$undefined_terms = array_flip($undefined_terms);
61
-if (count($undefined_terms)<1) { die("No missing terms<br />\n"); } else { echo "The following terms were nowhere to be found: <br />\n<table>"; }
61
+if (count($undefined_terms) < 1) { die("No missing terms<br />\n"); } else { echo "The following terms were nowhere to be found: <br />\n<table>"; }
62 62
 foreach ($undefined_terms as $term => $file) {
63 63
     echo "<tr><td>$term</td><td>in $file";
64
-    if (substr($file,0,7)=='plugin/') {
64
+    if (substr($file, 0, 7) == 'plugin/') {
65 65
         echo " <span style=\"color: #00ff00;\">(this one should be taken care of by the plugin's language files)</span>";
66 66
     }
67 67
     echo "</td></tr>\n";
@@ -73,14 +73,14 @@  discard block
 block discarded – undo
73 73
     $list = scandir($base_path);
74 74
     $files = array();
75 75
     foreach ($list as $item) {
76
-    	if (substr($item,0,1)=='.') {continue;}
77
-        $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));
78
-        if (in_array($base_path.$item.'/',$special_dirs)) {continue;}
76
+    	if (substr($item, 0, 1) == '.') {continue; }
77
+        $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));
78
+        if (in_array($base_path.$item.'/', $special_dirs)) {continue; }
79 79
         if (is_dir($base_path.$item)) {
80
-        	$files = array_merge($files,get_all_php_files($base_path.$item.'/'));
80
+        	$files = array_merge($files, get_all_php_files($base_path.$item.'/'));
81 81
         } else {
82 82
             //only analyse php files
83
-                $sub = substr($item,-4);
83
+                $sub = substr($item, -4);
84 84
         	if ($sub == '.php' or $sub == '.tpl') {
85 85
                     $files[] = $base_path.$item;
86 86
         	}
Please login to merge, or discard this patch.
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
     $file = $path.'/'.$entry;
20 20
     if (is_file($file)) {
21 21
         $terms = array_merge($terms,SubLanguageManager::get_all_language_variable_in_file($file,true));
22
-	}
22
+    }
23 23
 }
24 24
 // get only the array keys (the language variables defined in language files)
25 25
 $defined_terms = array_flip(array_keys($terms));
@@ -32,14 +32,14 @@  discard block
 block discarded – undo
32 32
 foreach ($files as $file) {
33 33
     //echo 'Analyzing '.$file."<br />";
34 34
     $shortfile = substr($file,$l);
35
-	$lines = file($file);
35
+    $lines = file($file);
36 36
     foreach ($lines as $line) {
37
-    	$myterms = array();
37
+        $myterms = array();
38 38
         $res = preg_match_all('/get_lang\(\'(\\w*)\'\)/',$line,$myterms);
39 39
         if ($res > 0) {
40 40
             foreach($myterms[1] as $term) {
41 41
                 if (!isset($defined_terms[$term]) && !isset($defined_terms['lang'.$term])) {
42
-                	$undefined_terms[$term] = $shortfile;
42
+                    $undefined_terms[$term] = $shortfile;
43 43
                     //echo "Undefined: $term<br />";
44 44
                 }
45 45
             }
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
         if ($res > 0) {
50 50
             foreach($myterms[1] as $term) {
51 51
                 if (!isset($defined_terms[$term]) && !isset($defined_terms['lang'.$term])) {
52
-                	$undefined_terms[$term] = $shortfile;
52
+                    $undefined_terms[$term] = $shortfile;
53 53
                     //echo "Undefined: $term<br />";
54 54
                 }
55 55
             }
@@ -73,17 +73,17 @@  discard block
 block discarded – undo
73 73
     $list = scandir($base_path);
74 74
     $files = array();
75 75
     foreach ($list as $item) {
76
-    	if (substr($item,0,1)=='.') {continue;}
76
+        if (substr($item,0,1)=='.') {continue;}
77 77
         $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));
78 78
         if (in_array($base_path.$item.'/',$special_dirs)) {continue;}
79 79
         if (is_dir($base_path.$item)) {
80
-        	$files = array_merge($files,get_all_php_files($base_path.$item.'/'));
80
+            $files = array_merge($files,get_all_php_files($base_path.$item.'/'));
81 81
         } else {
82 82
             //only analyse php files
83 83
                 $sub = substr($item,-4);
84
-        	if ($sub == '.php' or $sub == '.tpl') {
84
+            if ($sub == '.php' or $sub == '.tpl') {
85 85
                     $files[] = $base_path.$item;
86
-        	}
86
+            }
87 87
         }
88 88
     }
89 89
     $list = null;
Please login to merge, or discard this patch.
main/cron/lang/check_parse_lang.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
 //die();
10 10
 require_once '../../inc/global.inc.php';
11 11
 $path = api_get_path(SYS_LANG_PATH).'english';
12
-ini_set('memory_limit','128M');
12
+ini_set('memory_limit', '128M');
13 13
 /**
14 14
  * Main code
15 15
  */
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
 $langs = scandir(api_get_path(SYS_LANG_PATH));
19 19
 foreach ($langs as $lang) {
20 20
   $dir = api_get_path(SYS_LANG_PATH).$lang;
21
-  if (is_dir($dir) && substr($lang,0,1) != '.' && !empty($lang)) {
21
+  if (is_dir($dir) && substr($lang, 0, 1) != '.' && !empty($lang)) {
22 22
     echo "$lang...";
23 23
     $ok = true;
24 24
     foreach ($list as $entry) {
@@ -26,8 +26,8 @@  discard block
 block discarded – undo
26 26
       $out = array();
27 27
       if (is_file($file)) {
28 28
         //$terms = array_merge($terms,SubLanguageManager::get_all_language_variable_in_file($file,true));
29
-        @exec('php5 -l '.$file,$out);
30
-        if (substr($out[0],0,2)!='No') {
29
+        @exec('php5 -l '.$file, $out);
30
+        if (substr($out[0], 0, 2) != 'No') {
31 31
           echo $out[0]."\n";
32 32
           $ok = false;
33 33
         }
Please login to merge, or discard this patch.
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -17,25 +17,25 @@
 block discarded – undo
17 17
 $list = SubLanguageManager::get_lang_folder_files_list($path);
18 18
 $langs = scandir(api_get_path(SYS_LANG_PATH));
19 19
 foreach ($langs as $lang) {
20
-  $dir = api_get_path(SYS_LANG_PATH).$lang;
21
-  if (is_dir($dir) && substr($lang,0,1) != '.' && !empty($lang)) {
20
+    $dir = api_get_path(SYS_LANG_PATH).$lang;
21
+    if (is_dir($dir) && substr($lang,0,1) != '.' && !empty($lang)) {
22 22
     echo "$lang...";
23 23
     $ok = true;
24 24
     foreach ($list as $entry) {
25
-      $file = $dir.'/'.$entry;
26
-      $out = array();
27
-      if (is_file($file)) {
25
+        $file = $dir.'/'.$entry;
26
+        $out = array();
27
+        if (is_file($file)) {
28 28
         //$terms = array_merge($terms,SubLanguageManager::get_all_language_variable_in_file($file,true));
29 29
         @exec('php5 -l '.$file,$out);
30 30
         if (substr($out[0],0,2)!='No') {
31
-          echo $out[0]."\n";
32
-          $ok = false;
31
+            echo $out[0]."\n";
32
+            $ok = false;
33
+        }
33 34
         }
34
-      }
35 35
     }
36 36
     if ($ok) {
37
-      echo "OK\n";
37
+        echo "OK\n";
38
+    }
38 39
     }
39
-  }
40 40
 }
41 41
 echo "Done\n";
Please login to merge, or discard this patch.
main/cron/lang/langstats_file_builder.php 2 patches
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
  */
35 35
 foreach ($terms as $row) {
36 36
   if ($words_counter > 10000) { break; }
37
-  $words = str_word_count(get_lang($row['term_name'],null,$orig_lang));
37
+  $words = str_word_count(get_lang($row['term_name'], null, $orig_lang));
38 38
   $words_counter += $words;
39 39
   $terms_in_limit[$row['term_name']] = $i;
40 40
   //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 @@  discard block
 block discarded – undo
59 59
 $global_var = array(); //keep the combination of all vars
60 60
 $terms_in_limit = array_flip($terms_in_limit);
61 61
 foreach ($list_files as $file) {
62
-  if (substr($file,0,1) == '.') {continue;}
62
+  if (substr($file, 0, 1) == '.') {continue; }
63 63
   //echo "'".substr($file,0,-8)."',<br />"; //print in a PHP array format
64 64
   $vars = file($lang_dir.'/'.$orig_lang.'/'.$file);
65 65
   $local_var = array();
66 66
   $file_string = '<?php'."\n";
67 67
   foreach ($vars as $line) {
68 68
     $var = array();
69
-    $res = preg_match('/^(\$\w*)/',$line,$var);
70
-    if ($res>0) {
69
+    $res = preg_match('/^(\$\w*)/', $line, $var);
70
+    if ($res > 0) {
71 71
       //echo $var[1]."<br />";
72 72
       
73
-      if (in_array(substr($var[1],1),$terms_in_limit)) {
73
+      if (in_array(substr($var[1], 1), $terms_in_limit)) {
74 74
         //echo "Var ".$var[1]." was in the limit<br />";
75 75
         $local_var[$var[1]] = $line;
76 76
         $file_string .= $line;
77
-        $terms_found[] = substr($var[1],1); //e.g. store Tools
78
-        $words_found += str_word_count(get_lang($var[1],null,$orig_lang));
79
-      } elseif (in_array(substr($var[1],5),$terms_in_limit)) {
77
+        $terms_found[] = substr($var[1], 1); //e.g. store Tools
78
+        $words_found += str_word_count(get_lang($var[1], null, $orig_lang));
79
+      } elseif (in_array(substr($var[1], 5), $terms_in_limit)) {
80 80
         //echo "Var ".$var[1]." was in the limit<br />";
81 81
         $local_var[$var[1]] = $line;
82 82
         $file_string .= $line;
83
-        $terms_found[] = substr($var[1],5); //e.g. store langTools
84
-        $words_found += str_word_count(get_lang(substr($var[1],5),null,$orig_lang));
83
+        $terms_found[] = substr($var[1], 5); //e.g. store langTools
84
+        $words_found += str_word_count(get_lang(substr($var[1], 5), null, $orig_lang));
85 85
       } //else do not care
86 86
     }
87 87
   }
88 88
   echo "Writing ".$arch_dir.'/langstats/'.$orig_lang.'/'.$file."<br />\n";
89
-  file_put_contents($arch_dir.'/langstats/'.$orig_lang.'/'.$file,$file_string); 
89
+  file_put_contents($arch_dir.'/langstats/'.$orig_lang.'/'.$file, $file_string); 
90 90
   $global_var += $local_var;
91 91
 };
92
-$terms_diff = count($global_var)-count($terms_in_limit);
92
+$terms_diff = count($global_var) - count($terms_in_limit);
93 93
 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 />";
94 94
 /**
95 95
  * Display results
@@ -97,5 +97,5 @@  discard block
 block discarded – undo
97 97
 
98 98
 echo "Difference between filtered and found in English:<br />";
99 99
 //print_r($terms_found);
100
-echo "<pre>".print_r(array_diff($terms_in_limit,$terms_found),1)."</pre>";
100
+echo "<pre>".print_r(array_diff($terms_in_limit, $terms_found), 1)."</pre>";
101 101
 echo "#";
Please login to merge, or discard this patch.
Indentation   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -33,15 +33,15 @@  discard block
 block discarded – undo
33 33
  * Code run
34 34
  */
35 35
 foreach ($terms as $row) {
36
-  if ($words_counter > 10000) { break; }
37
-  $words = str_word_count(get_lang($row['term_name'],null,$orig_lang));
38
-  $words_counter += $words;
39
-  $terms_in_limit[$row['term_name']] = $i;
40
-  //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";
41
-  //if ($words_counter%1000 >= 0) {
36
+    if ($words_counter > 10000) { break; }
37
+    $words = str_word_count(get_lang($row['term_name'],null,$orig_lang));
38
+    $words_counter += $words;
39
+    $terms_in_limit[$row['term_name']] = $i;
40
+    //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";
41
+    //if ($words_counter%1000 >= 0) {
42 42
     //echo "Reached $words_counter words at term $i (".$row['term_name']." used ".$row['term_count']." times)...<br />\n";
43
-  //}
44
-  $i++;
43
+    //}
44
+    $i++;
45 45
 }
46 46
 //echo $words_counter.'<br />';
47 47
 
@@ -49,8 +49,8 @@  discard block
 block discarded – undo
49 49
 
50 50
 echo "Scanning English files, trying to find these terms...<br />\n";
51 51
 if (!is_dir($arch_dir.'/langstats')) {
52
-  mkdir($arch_dir.'/langstats');
53
-  mkdir($arch_dir.'/langstats/'.$orig_lang);
52
+    mkdir($arch_dir.'/langstats');
53
+    mkdir($arch_dir.'/langstats/'.$orig_lang);
54 54
 }
55 55
 $list_files = scandir($lang_dir.'/'.$orig_lang);
56 56
 $j = 1;
@@ -59,35 +59,35 @@  discard block
 block discarded – undo
59 59
 $global_var = array(); //keep the combination of all vars
60 60
 $terms_in_limit = array_flip($terms_in_limit);
61 61
 foreach ($list_files as $file) {
62
-  if (substr($file,0,1) == '.') {continue;}
63
-  //echo "'".substr($file,0,-8)."',<br />"; //print in a PHP array format
64
-  $vars = file($lang_dir.'/'.$orig_lang.'/'.$file);
65
-  $local_var = array();
66
-  $file_string = '<?php'."\n";
67
-  foreach ($vars as $line) {
62
+    if (substr($file,0,1) == '.') {continue;}
63
+    //echo "'".substr($file,0,-8)."',<br />"; //print in a PHP array format
64
+    $vars = file($lang_dir.'/'.$orig_lang.'/'.$file);
65
+    $local_var = array();
66
+    $file_string = '<?php'."\n";
67
+    foreach ($vars as $line) {
68 68
     $var = array();
69 69
     $res = preg_match('/^(\$\w*)/',$line,$var);
70 70
     if ($res>0) {
71
-      //echo $var[1]."<br />";
71
+        //echo $var[1]."<br />";
72 72
       
73
-      if (in_array(substr($var[1],1),$terms_in_limit)) {
73
+        if (in_array(substr($var[1],1),$terms_in_limit)) {
74 74
         //echo "Var ".$var[1]." was in the limit<br />";
75 75
         $local_var[$var[1]] = $line;
76 76
         $file_string .= $line;
77 77
         $terms_found[] = substr($var[1],1); //e.g. store Tools
78 78
         $words_found += str_word_count(get_lang($var[1],null,$orig_lang));
79
-      } elseif (in_array(substr($var[1],5),$terms_in_limit)) {
79
+        } elseif (in_array(substr($var[1],5),$terms_in_limit)) {
80 80
         //echo "Var ".$var[1]." was in the limit<br />";
81 81
         $local_var[$var[1]] = $line;
82 82
         $file_string .= $line;
83 83
         $terms_found[] = substr($var[1],5); //e.g. store langTools
84 84
         $words_found += str_word_count(get_lang(substr($var[1],5),null,$orig_lang));
85
-      } //else do not care
85
+        } //else do not care
86 86
     }
87
-  }
88
-  echo "Writing ".$arch_dir.'/langstats/'.$orig_lang.'/'.$file."<br />\n";
89
-  file_put_contents($arch_dir.'/langstats/'.$orig_lang.'/'.$file,$file_string); 
90
-  $global_var += $local_var;
87
+    }
88
+    echo "Writing ".$arch_dir.'/langstats/'.$orig_lang.'/'.$file."<br />\n";
89
+    file_put_contents($arch_dir.'/langstats/'.$orig_lang.'/'.$file,$file_string); 
90
+    $global_var += $local_var;
91 91
 };
92 92
 $terms_diff = count($global_var)-count($terms_in_limit);
93 93
 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 />";
Please login to merge, or discard this patch.
main/cron/lang/langstats.class.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
                     return false; //cannot use if sqlite not installed
31 31
                 }
32 32
                 if (empty($file)) {
33
-                    $file = api_get_path(SYS_ARCHIVE_PATH) . '/langstasdb';
33
+                    $file = api_get_path(SYS_ARCHIVE_PATH).'/langstasdb';
34 34
                 }
35 35
                 if (is_file($file) && is_writeable($file)) {
36 36
                     $this->db = new SQLite3($file, SQLITE3_OPEN_READWRITE);
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
                         $this->db = new SQLite3($file);
40 40
                     } catch (Exception $e) {
41 41
                         $this->error = 'DatabaseCreateError';
42
-                        error_log('Exception: ' . $e->getMessage());
42
+                        error_log('Exception: '.$e->getMessage());
43 43
                         return false;
44 44
                     }
45 45
                     $err = $this->db->exec(
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
             $num = $row[3];
105 105
             $num++;
106 106
             $res = $this->db->query(
107
-                'UPDATE lang_freq SET term_count = ' . $num . ' WHERE id = ' . $row[0]
107
+                'UPDATE lang_freq SET term_count = '.$num.' WHERE id = '.$row[0]
108 108
             );
109 109
             if ($res === false) {
110 110
                 $this->error = 'CouldNotUpdateTerm';
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
     public function get_popular_terms($num = 1000)
137 137
     {
138 138
         $res = $this->db->query(
139
-            'SELECT * FROM lang_freq ORDER BY term_count DESC LIMIT ' . $num
139
+            'SELECT * FROM lang_freq ORDER BY term_count DESC LIMIT '.$num
140 140
         );
141 141
         $list = array();
142 142
         while ($row = $res->fetchArray()) {
@@ -163,16 +163,16 @@  discard block
 block discarded – undo
163 163
      */
164 164
     public function get_variables_origin()
165 165
     {
166
-        $path = api_get_path(SYS_LANG_PATH) . 'english/';
166
+        $path = api_get_path(SYS_LANG_PATH).'english/';
167 167
         $vars = array();
168 168
         $priority = array('trad4all');
169 169
         foreach ($priority as $file) {
170 170
             $list = SubLanguageManager::get_all_language_variable_in_file(
171
-                $path . $file . '.inc.php',
171
+                $path.$file.'.inc.php',
172 172
                 true
173 173
             );
174 174
             foreach ($list as $var => $trad) {
175
-                $vars[$var] = $file . '.inc.php';
175
+                $vars[$var] = $file.'.inc.php';
176 176
             }
177 177
         }
178 178
         $files = scandir($path);
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
181 181
                 continue;
182 182
             }
183 183
             $list = SubLanguageManager::get_all_language_variable_in_file(
184
-                $path . $file,
184
+                $path.$file,
185 185
                 true
186 186
             );
187 187
             foreach ($list as $var => $trad) {
Please login to merge, or discard this patch.
main/cron/lang/list_unused_langvars.php 2 patches
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
         $res = preg_match_all('/get_lang\(\'(\\w*)\'\)/', $line, $myTerms);
44 44
         if ($res > 0) {
45 45
             foreach ($myTerms[1] as $term) {
46
-                if (substr($term, 0, 4)=='lang') {
46
+                if (substr($term, 0, 4) == 'lang') {
47 47
                     $term = substr($term, 4);
48 48
                 }
49 49
                 $usedTerms[$term] = $shortFile;
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
             $res = preg_match_all('/\{[\'"](\\w*)[\'"]\|get_lang\}/', $line, $myTerms);
54 54
             if ($res > 0) {
55 55
                 foreach ($myTerms[1] as $term) {
56
-                    if (substr($term, 0, 4)=='lang') {
56
+                    if (substr($term, 0, 4) == 'lang') {
57 57
                         $term = substr($term, 4);
58 58
                     }
59 59
                     $usedTerms[$term] = $shortFile;
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 // Compare defined terms VS used terms. Used terms should be smaller than
68 68
 // defined terms, and this should prove the concept that there are much
69 69
 // more variables than what we really use
70
-if (count($usedTerms)<1) {
70
+if (count($usedTerms) < 1) {
71 71
   die("No used terms<br />\n");
72 72
 } else {
73 73
   echo "The following terms were defined but never used: <br />\n<table>";
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
 $i = 1;
76 76
 foreach ($defined_terms as $term => $file) {
77 77
   // remove "lang" prefix just in case
78
-  if (substr($term,0,4)=='lang') { $term = substr($term,4); }
78
+  if (substr($term, 0, 4) == 'lang') { $term = substr($term, 4); }
79 79
   if (!isset($usedTerms[$term])) {
80 80
     echo "<tr><td>$i</td><td>$term</td></tr>\n";
81 81
     $i++;
@@ -88,14 +88,14 @@  discard block
 block discarded – undo
88 88
     $list = scandir($base_path);
89 89
     $files = array();
90 90
     foreach ($list as $item) {
91
-    	if (substr($item,0,1)=='.') {continue;}
92
-        $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));
93
-        if (in_array($base_path.$item.'/',$special_dirs)) {continue;}
91
+    	if (substr($item, 0, 1) == '.') {continue; }
92
+        $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));
93
+        if (in_array($base_path.$item.'/', $special_dirs)) {continue; }
94 94
         if (is_dir($base_path.$item)) {
95
-        	$files = array_merge($files,get_all_php_files($base_path.$item.'/'));
95
+        	$files = array_merge($files, get_all_php_files($base_path.$item.'/'));
96 96
         } else {
97 97
             //only analyse php files
98
-                $sub = substr($item,-4);
98
+                $sub = substr($item, -4);
99 99
         	if ($sub == '.php' or $sub == '.tpl') {
100 100
                     $files[] = $base_path.$item;
101 101
         	}
Please login to merge, or discard this patch.
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -68,18 +68,18 @@  discard block
 block discarded – undo
68 68
 // defined terms, and this should prove the concept that there are much
69 69
 // more variables than what we really use
70 70
 if (count($usedTerms)<1) {
71
-  die("No used terms<br />\n");
71
+    die("No used terms<br />\n");
72 72
 } else {
73
-  echo "The following terms were defined but never used: <br />\n<table>";
73
+    echo "The following terms were defined but never used: <br />\n<table>";
74 74
 }
75 75
 $i = 1;
76 76
 foreach ($defined_terms as $term => $file) {
77
-  // remove "lang" prefix just in case
78
-  if (substr($term,0,4)=='lang') { $term = substr($term,4); }
79
-  if (!isset($usedTerms[$term])) {
77
+    // remove "lang" prefix just in case
78
+    if (substr($term,0,4)=='lang') { $term = substr($term,4); }
79
+    if (!isset($usedTerms[$term])) {
80 80
     echo "<tr><td>$i</td><td>$term</td></tr>\n";
81 81
     $i++;
82
-  }
82
+    }
83 83
 }
84 84
 echo "</table>\n";
85 85
 
@@ -88,17 +88,17 @@  discard block
 block discarded – undo
88 88
     $list = scandir($base_path);
89 89
     $files = array();
90 90
     foreach ($list as $item) {
91
-    	if (substr($item,0,1)=='.') {continue;}
91
+        if (substr($item,0,1)=='.') {continue;}
92 92
         $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));
93 93
         if (in_array($base_path.$item.'/',$special_dirs)) {continue;}
94 94
         if (is_dir($base_path.$item)) {
95
-        	$files = array_merge($files,get_all_php_files($base_path.$item.'/'));
95
+            $files = array_merge($files,get_all_php_files($base_path.$item.'/'));
96 96
         } else {
97 97
             //only analyse php files
98 98
                 $sub = substr($item,-4);
99
-        	if ($sub == '.php' or $sub == '.tpl') {
99
+            if ($sub == '.php' or $sub == '.tpl') {
100 100
                     $files[] = $base_path.$item;
101
-        	}
101
+            }
102 102
         }
103 103
     }
104 104
     $list = null;
Please login to merge, or discard this patch.
main/cron/fix_online_time.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  discard block
 block discarded – undo
6 6
  * @package chamilo.cron
7 7
  * @author Imanol Losada <[email protected]>
8 8
  */
9
-require_once __DIR__ . '/../inc/global.inc.php';
9
+require_once __DIR__.'/../inc/global.inc.php';
10 10
 
11 11
 /**
12 12
  * Get ids of COURSEMANAGERs that are inside a course right now
@@ -15,9 +15,9 @@  discard block
 block discarded – undo
15 15
 function getTeachersInCourseIds()
16 16
 {
17 17
     $table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
18
-    $joinStatement = ' JOIN ' . Database::get_main_table(TABLE_MAIN_USER) . ' ON login_user_id = user_id';
18
+    $joinStatement = ' JOIN '.Database::get_main_table(TABLE_MAIN_USER).' ON login_user_id = user_id';
19 19
     return Database::select(
20
-        'login_user_id', $table . $joinStatement,
20
+        'login_user_id', $table.$joinStatement,
21 21
         array(
22 22
             'where' => array(
23 23
                 'c_id IS NOT NULL AND status = ?' => array(
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
     $dataBaseCurrentHour = array_shift($utcResult);
45 45
     $maximumIdleTimeInCourse = date(
46 46
         'Y-m-d H:i:s',
47
-        strtotime($dataBaseCurrentHour . ' ' . $timeLimit)
47
+        strtotime($dataBaseCurrentHour.' '.$timeLimit)
48 48
     );
49 49
     $table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);
50 50
     $onLineTrackTable = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
             array(
70 70
                 'logout_course_date' => date(
71 71
                     'Y-m-d H:i:s',
72
-                    strtotime($currentTeacherData['logout_course_date'] . ' ' . $extraTime)
72
+                    strtotime($currentTeacherData['logout_course_date'].' '.$extraTime)
73 73
                 )
74 74
             ),
75 75
             array(
Please login to merge, or discard this patch.
main/cron/fix_fill_blank.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@
 block discarded – undo
9 9
 
10 10
 $execute = isset($_GET['execute']) ? $_GET['execute'] : null;
11 11
 $courseId = isset($_GET['c_id']) ? $_GET['c_id'] : null;
12
-$questionId  = isset($_GET['question_id']) ? $_GET['question_id'] : null;
12
+$questionId = isset($_GET['question_id']) ? $_GET['question_id'] : null;
13 13
 
14 14
 $sql2 = "SELECT * FROM $table WHERE answer LIKE '%[%]%'";
15 15
 
Please login to merge, or discard this patch.
main/dashboard/index.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -20,12 +20,12 @@
 block discarded – undo
20 20
 
21 21
 // current section
22 22
 $this_section = SECTION_DASHBOARD;
23
-unset($_SESSION['this_section']);//for hmtl editor repository
23
+unset($_SESSION['this_section']); //for hmtl editor repository
24 24
 
25 25
 // get actions
26 26
 $actions = array('listing', 'store_user_block', 'disable_block');
27 27
 $action = 'listing';
28
-if (isset($_GET['action']) && in_array($_GET['action'],$actions)) {
28
+if (isset($_GET['action']) && in_array($_GET['action'], $actions)) {
29 29
 	$action = $_GET['action'];
30 30
 }
31 31
 
Please login to merge, or discard this patch.
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 $actions = array('listing', 'store_user_block', 'disable_block');
27 27
 $action = 'listing';
28 28
 if (isset($_GET['action']) && in_array($_GET['action'],$actions)) {
29
-	$action = $_GET['action'];
29
+    $action = $_GET['action'];
30 30
 }
31 31
 
32 32
 // load styles from dashboard plugins
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 $dashboard_controller = new DashboardController();
38 38
 
39 39
 if (isset($_GET['path'])) {
40
-	$path = $_GET['path'];
40
+    $path = $_GET['path'];
41 41
 }
42 42
 
43 43
 // distpacher actions to controller
Please login to merge, or discard this patch.
main/dashboard/dashboard.php 2 patches
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -14,23 +14,23 @@  discard block
 block discarded – undo
14 14
 $views = array('blocks', 'list');
15 15
 
16 16
 if(isset($_GET['view']) && in_array($_GET['view'], $views)){
17
-	$dashboard_view = $_GET['view'];
17
+    $dashboard_view = $_GET['view'];
18 18
 }
19 19
 
20 20
 $link_blocks_view = $link_list_view = null;
21 21
 
22 22
 if (isset($dashboard_view) && $dashboard_view == 'list') {
23
-	$link_blocks_view = '<a href="'.api_get_self().'?view=blocks">'.
24
-		Display::return_icon('blocks.png',get_lang('DashboardBlocks'),'',ICON_SIZE_MEDIUM).'</a>';
23
+    $link_blocks_view = '<a href="'.api_get_self().'?view=blocks">'.
24
+        Display::return_icon('blocks.png',get_lang('DashboardBlocks'),'',ICON_SIZE_MEDIUM).'</a>';
25 25
 } else {
26
-	$link_list_view = '<a href="'.api_get_self().'?view=list">'.
27
-		Display::return_icon('edit.png',get_lang('EditBlocks'),'',ICON_SIZE_MEDIUM).'</a>';
26
+    $link_list_view = '<a href="'.api_get_self().'?view=list">'.
27
+        Display::return_icon('edit.png',get_lang('EditBlocks'),'',ICON_SIZE_MEDIUM).'</a>';
28 28
 }
29 29
 
30 30
 $configuration_link = null;
31 31
 if (api_is_platform_admin()) {
32
-	$configuration_link = '<a href="'.api_get_path(WEB_CODE_PATH).'admin/settings.php?category=Plugins">'
33
-	.Display::return_icon('settings.png',get_lang('ConfigureDashboardPlugin'),'',ICON_SIZE_MEDIUM).'</a>';
32
+    $configuration_link = '<a href="'.api_get_path(WEB_CODE_PATH).'admin/settings.php?category=Plugins">'
33
+    .Display::return_icon('settings.png',get_lang('ConfigureDashboardPlugin'),'',ICON_SIZE_MEDIUM).'</a>';
34 34
 }
35 35
 
36 36
 echo '<div class="actions">';
@@ -87,10 +87,10 @@  discard block
 block discarded – undo
87 87
     }
88 88
 
89 89
 } else {
90
-	// block dashboard list
91
-	if (isset($success)) {
92
-		Display::display_confirmation_message(get_lang('BlocksHaveBeenUpdatedSuccessfully'));
93
-	}
94
-	$user_id = api_get_user_id();
95
-	DashboardManager::display_user_dashboard_list($user_id);
90
+    // block dashboard list
91
+    if (isset($success)) {
92
+        Display::display_confirmation_message(get_lang('BlocksHaveBeenUpdatedSuccessfully'));
93
+    }
94
+    $user_id = api_get_user_id();
95
+    DashboardManager::display_user_dashboard_list($user_id);
96 96
 }
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 // menu actions for dashboard views
14 14
 $views = array('blocks', 'list');
15 15
 
16
-if(isset($_GET['view']) && in_array($_GET['view'], $views)){
16
+if (isset($_GET['view']) && in_array($_GET['view'], $views)) {
17 17
 	$dashboard_view = $_GET['view'];
18 18
 }
19 19
 
@@ -21,16 +21,16 @@  discard block
 block discarded – undo
21 21
 
22 22
 if (isset($dashboard_view) && $dashboard_view == 'list') {
23 23
 	$link_blocks_view = '<a href="'.api_get_self().'?view=blocks">'.
24
-		Display::return_icon('blocks.png',get_lang('DashboardBlocks'),'',ICON_SIZE_MEDIUM).'</a>';
24
+		Display::return_icon('blocks.png', get_lang('DashboardBlocks'), '', ICON_SIZE_MEDIUM).'</a>';
25 25
 } else {
26 26
 	$link_list_view = '<a href="'.api_get_self().'?view=list">'.
27
-		Display::return_icon('edit.png',get_lang('EditBlocks'),'',ICON_SIZE_MEDIUM).'</a>';
27
+		Display::return_icon('edit.png', get_lang('EditBlocks'), '', ICON_SIZE_MEDIUM).'</a>';
28 28
 }
29 29
 
30 30
 $configuration_link = null;
31 31
 if (api_is_platform_admin()) {
32 32
 	$configuration_link = '<a href="'.api_get_path(WEB_CODE_PATH).'admin/settings.php?category=Plugins">'
33
-	.Display::return_icon('settings.png',get_lang('ConfigureDashboardPlugin'),'',ICON_SIZE_MEDIUM).'</a>';
33
+	.Display::return_icon('settings.png', get_lang('ConfigureDashboardPlugin'), '', ICON_SIZE_MEDIUM).'</a>';
34 34
 }
35 35
 
36 36
 echo '<div class="actions">';
Please login to merge, or discard this patch.