Completed
Push — 1.11.x ( c5cfcc...1cf9be )
by José
46:45 queued 17:54
created
main/cron/lang/langstats_file_builder.php 1 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/list_unused_langvars.php 1 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/lang/list_undefined_langvars.php 1 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 1 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/document/finddoc.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -8,19 +8,19 @@
 block discarded – undo
8 8
 die();
9 9
 require '../../inc/global.inc.php';
10 10
 if (empty($_GET['doc'])) {
11
-  echo "To add a document name to search, add ?doc=abc to the URL";
11
+    echo "To add a document name to search, add ?doc=abc to the URL";
12 12
 } else {
13
-  echo "Received param ".Security::remove_XSS($_GET['doc'])."<br />";
13
+    echo "Received param ".Security::remove_XSS($_GET['doc'])."<br />";
14 14
 }
15 15
 $courses_list = CourseManager::get_courses_list();
16 16
 foreach ($courses_list as $course) {
17
-  $title = Database::escape_string($_GET['doc']);
18
-  $td = Database::get_course_table(TABLE_DOCUMENT);
19
-  $sql = "SELECT id, path FROM $td WHERE c_id = ".$course['id']." AND path LIKE '%$title%' OR title LIKE '%$title%'";
20
-  $res = Database::query($sql);
21
-  if (Database::num_rows($res) > 0) {
17
+    $title = Database::escape_string($_GET['doc']);
18
+    $td = Database::get_course_table(TABLE_DOCUMENT);
19
+    $sql = "SELECT id, path FROM $td WHERE c_id = ".$course['id']." AND path LIKE '%$title%' OR title LIKE '%$title%'";
20
+    $res = Database::query($sql);
21
+    if (Database::num_rows($res) > 0) {
22 22
     while ($row = Database::fetch_array($res)) {
23
-      echo "Found doc ".$row['id']."-> ".$row['path']." in course ".$course['code']."<br />";
23
+        echo "Found doc ".$row['id']."-> ".$row['path']." in course ".$course['code']."<br />";
24
+    }
24 25
     }
25
-  }
26 26
 }
Please login to merge, or discard this patch.
main/webservices/testip.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@
 block discarded – undo
5 5
  */
6 6
 $ip = trim($_SERVER['REMOTE_ADDR']);
7 7
 if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
8
-  list($ip1, $ip2) = preg_split('/,/', $_SERVER['HTTP_X_FORWARDED_FOR']);
9
-  $ip = trim($ip1);
8
+    list($ip1, $ip2) = preg_split('/,/', $_SERVER['HTTP_X_FORWARDED_FOR']);
9
+    $ip = trim($ip1);
10 10
 }
11 11
 echo htmlentities($ip);
Please login to merge, or discard this patch.
plugin/openmeetings/lib/openmeetings_gateway.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -351,9 +351,9 @@
 block discarded – undo
351 351
                 . '&externalRoomType='.$room->externalRoomType;
352 352
         if ($room->allowRecording) {
353 353
             $url .= '&allowUserQuestions='.$this->var_to_str($room->allowUserQuestions)
354
-                 . '&isAudioOnly='.$this->var_to_str($room->isAudioOnly)
355
-                 . '&waitForRecording='.$this->var_to_str($room->waitForRecording)
356
-                 . '&allowRecording='.$this->var_to_str($room->allowRecording);
354
+                    . '&isAudioOnly='.$this->var_to_str($room->isAudioOnly)
355
+                    . '&waitForRecording='.$this->var_to_str($room->waitForRecording)
356
+                    . '&allowRecording='.$this->var_to_str($room->allowRecording);
357 357
         } elseif ($room->isAudioOnly) {
358 358
             $url .= '&isAudioOnly='.$this->var_to_str($room->isAudioOnly);
359 359
         }
Please login to merge, or discard this patch.
main/exercise/answer.class.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -161,12 +161,12 @@
 block discarded – undo
161 161
         return [];
162 162
     }
163 163
 
164
-     /**
165
-     * returns all answer ids from this question Id
166
-     *
167
-     * @author Yoselyn Castillo
168
-     * @return array - $id (answer ids)
169
-     */
164
+        /**
165
+         * returns all answer ids from this question Id
166
+         *
167
+         * @author Yoselyn Castillo
168
+         * @return array - $id (answer ids)
169
+         */
170 170
     public function selectAnswerId()
171 171
     {
172 172
         $TBL_ANSWER = Database::get_course_table(TABLE_QUIZ_ANSWER);
Please login to merge, or discard this patch.
main/document/show_content.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -99,11 +99,11 @@
 block discarded – undo
99 99
 $pathinfo = pathinfo($header_file);
100 100
 
101 101
 if ($pathinfo['extension'] == 'swf') {
102
-	$width = '83%';
103
-	$height = '83%';
102
+    $width = '83%';
103
+    $height = '83%';
104 104
 } else {
105
-	$width = '100%';
106
-	$height = '100%';
105
+    $width = '100%';
106
+    $height = '100%';
107 107
 }
108 108
 
109 109
 echo '<iframe border="0" frameborder="0" scrolling="no" style="width:'.$width.'; height:'.$height.';background-color:#ffffff;" id="mainFrame" name="mainFrame" src="'.$file_url_web.'?'.api_get_cidreq().'&amp;rand='.mt_rand(1, 1000).'"></iframe>';
Please login to merge, or discard this patch.