Inspection of "Merge branch '1.11.x' of https://github.com/chamil..." - chamilo/chamilo-lms - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — 1.11.x ( 7ffd51...902ebd )

by José

created 2017-09-04 17:13 UTC

Status

Indentation +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -68,18 +68,18 @@  discard block
 block discarded – undo
 // defined terms, and this should prove the concept that there are much
 // more variables than what we really use
 if (count($usedTerms) < 1) {
-  die("No used terms<br />\n");
+    die("No used terms<br />\n");
 } else {
-  echo "The following terms were defined but never used: <br />\n<table>";
+    echo "The following terms were defined but never used: <br />\n<table>";
 }
 $i = 1;
 foreach ($defined_terms as $term => $file) {
-  // remove "lang" prefix just in case
-  if (substr($term, 0, 4) == 'lang') { $term = substr($term, 4); }
-  if (!isset($usedTerms[$term])) {
+    // remove "lang" prefix just in case
+    if (substr($term, 0, 4) == 'lang') { $term = substr($term, 4); }
+    if (!isset($usedTerms[$term])) {
     echo "<tr><td>$i</td><td>$term</td></tr>\n";
     $i++;
-  }
+    }
 }
 echo "</table>\n";
 
@@ -88,17 +88,17 @@  discard block
 block discarded – undo
     $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;

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
     $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 @@  discard block
 block discarded – undo
 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 @@  discard block
 block discarded – undo
         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 @@  discard block
 block discarded – undo
     $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;

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
 $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";

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
 die();
 require '../../inc/global.inc.php';
 if (empty($_GET['doc'])) {
-  echo "To add a document name to search, add ?doc=abc to the URL";
+    echo "To add a document name to search, add ?doc=abc to the URL";
 } else {
-  echo "Received param ".Security::remove_XSS($_GET['doc'])."<br />";
+    echo "Received param ".Security::remove_XSS($_GET['doc'])."<br />";
 }
 $courses_list = CourseManager::get_courses_list();
 foreach ($courses_list as $course) {
-  $title = Database::escape_string($_GET['doc']);
-  $td = Database::get_course_table(TABLE_DOCUMENT);
-  $sql = "SELECT id, path FROM $td WHERE c_id = ".$course['id']." AND path LIKE '%$title%' OR title LIKE '%$title%'";
-  $res = Database::query($sql);
-  if (Database::num_rows($res) > 0) {
+    $title = Database::escape_string($_GET['doc']);
+    $td = Database::get_course_table(TABLE_DOCUMENT);
+    $sql = "SELECT id, path FROM $td WHERE c_id = ".$course['id']." AND path LIKE '%$title%' OR title LIKE '%$title%'";
+    $res = Database::query($sql);
+    if (Database::num_rows($res) > 0) {
     while ($row = Database::fetch_array($res)) {
-      echo "Found doc ".$row['id']."-> ".$row['path']." in course ".$course['code']."<br />";
+        echo "Found doc ".$row['id']."-> ".$row['path']." in course ".$course['code']."<br />";
+    }
     }
-  }
 }

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
  */
 $ip = trim($_SERVER['REMOTE_ADDR']);
 if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
-  list($ip1, $ip2) = preg_split('/,/', $_SERVER['HTTP_X_FORWARDED_FOR']);
-  $ip = trim($ip1);
+    list($ip1, $ip2) = preg_split('/,/', $_SERVER['HTTP_X_FORWARDED_FOR']);
+    $ip = trim($ip1);
 }
 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
                 . '&externalRoomType='.$room->externalRoomType;
         if ($room->allowRecording) {
             $url .= '&allowUserQuestions='.$this->var_to_str($room->allowUserQuestions)
-                 . '&isAudioOnly='.$this->var_to_str($room->isAudioOnly)
-                 . '&waitForRecording='.$this->var_to_str($room->waitForRecording)
-                 . '&allowRecording='.$this->var_to_str($room->allowRecording);
+                    . '&isAudioOnly='.$this->var_to_str($room->isAudioOnly)
+                    . '&waitForRecording='.$this->var_to_str($room->waitForRecording)
+                    . '&allowRecording='.$this->var_to_str($room->allowRecording);
         } elseif ($room->isAudioOnly) {
             $url .= '&isAudioOnly='.$this->var_to_str($room->isAudioOnly);
         }

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
         return [];
     }
 
-     /**
-     * returns all answer ids from this question Id
-     *
-     * @author Yoselyn Castillo
-     * @return array - $id (answer ids)
-     */
+        /**
+         * returns all answer ids from this question Id
+         *
+         * @author Yoselyn Castillo
+         * @return array - $id (answer ids)
+         */
     public function selectAnswerId()
     {
         $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
 $pathinfo = pathinfo($header_file);
 
 if ($pathinfo['extension'] == 'swf') {
-	$width = '83%';
-	$height = '83%';
+    $width = '83%';
+    $height = '83%';
 } else {
-	$width = '100%';
-	$height = '100%';
+    $width = '100%';
+    $height = '100%';
 }
 
 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.

src/Chamilo/ThemeBundle/DependencyInjection/ChamiloAdminThemeExtension.php 1 patch

Indentation +124 added lines, -124 removed lines patch added patch discarded remove patch

@@ -61,134 +61,134 @@
 block discarded – undo
 
         if (isset($bundles['AsseticBundle']) && 0) {
             $container->prependExtensionConfig(
-                      'assetic',
-                          array(
-                              'bundles' => array(
+                        'assetic',
+                            array(
+                                'bundles' => array(
                                 'ChamiloThemeBundle'
                                 ),
-                              'assets' => array(
-                                  'common_js'              => array(
-                                      'inputs' => array(
-                                          $jsAssets.'public/vendor/jquery/dist/jquery.js',
-                                          $jsAssets.'public/vendor/jquery-ui/jquery-ui.js',
-                                          $jsAssets.'public/vendor/underscore/underscore.js',
-                                          $jsAssets.'public/vendor/backbone/backbone.js',
-                                          $jsAssets.'public/vendor/marionette/lib/backbone.marionette.js',
-                                          $jsAssets.'public/vendor/bootstrap/dist/js/bootstrap.min.js',
-                                          $jsAssets.'public/vendor/bootbox/bootbox.js',
-                                          $jsAssets.'public/js/dialogs.js',
-                                          $jsAssets.'public/js/namespace.js',
-                                      ),
-                                  ),
-                                  'tools_js'               => array(
-                                      'inputs' => array(
-                                          '@common_js',
-                                          $jsAssets.'public/vendor/momentjs/moment.js',
-                                          $jsAssets.'public/vendor/holderjs/holder.js',
-                                          $jsAssets.'public/vendor/spinjs/spin.js',
-                                      ),
-                                  ),
-                                  'admin_lte_js'           => array(
-                                      'inputs' => array(
-                                          $lteJs.'plugins/bootstrap-slider/bootstrap-slider.js',
-                                          $lteJs.'plugins/datatables/jquery.dataTables.js',
-                                          $lteJs.'plugins/datatables/dataTables.bootstrap.js',
-                                          $lteJs.'plugins/slimScroll/jquery.slimscroll.js',
-                                          $jsAssets.'public/js/adminLTE.js',
-                                      )
-                                  ),
-                                  'admin_lte_css'          => array(
-                                      'inputs' => array(
+                                'assets' => array(
+                                    'common_js'              => array(
+                                        'inputs' => array(
+                                            $jsAssets.'public/vendor/jquery/dist/jquery.js',
+                                            $jsAssets.'public/vendor/jquery-ui/jquery-ui.js',
+                                            $jsAssets.'public/vendor/underscore/underscore.js',
+                                            $jsAssets.'public/vendor/backbone/backbone.js',
+                                            $jsAssets.'public/vendor/marionette/lib/backbone.marionette.js',
+                                            $jsAssets.'public/vendor/bootstrap/dist/js/bootstrap.min.js',
+                                            $jsAssets.'public/vendor/bootbox/bootbox.js',
+                                            $jsAssets.'public/js/dialogs.js',
+                                            $jsAssets.'public/js/namespace.js',
+                                        ),
+                                    ),
+                                    'tools_js'               => array(
+                                        'inputs' => array(
+                                            '@common_js',
+                                            $jsAssets.'public/vendor/momentjs/moment.js',
+                                            $jsAssets.'public/vendor/holderjs/holder.js',
+                                            $jsAssets.'public/vendor/spinjs/spin.js',
+                                        ),
+                                    ),
+                                    'admin_lte_js'           => array(
+                                        'inputs' => array(
+                                            $lteJs.'plugins/bootstrap-slider/bootstrap-slider.js',
+                                            $lteJs.'plugins/datatables/jquery.dataTables.js',
+                                            $lteJs.'plugins/datatables/dataTables.bootstrap.js',
+                                            $lteJs.'plugins/slimScroll/jquery.slimscroll.js',
+                                            $jsAssets.'public/js/adminLTE.js',
+                                        )
+                                    ),
+                                    'admin_lte_css'          => array(
+                                        'inputs' => array(
 
                                         //  $lteCss . 'jQueryUI/jquery-ui-1.10.3.custom.css',
-                                         $cssAssets.'vendor/bootstrap/dist/css/bootstrap.min.css',
-                                          $lteCss.'bootstrap-slider/slider.css',
-                                          $lteCss.'datatables/dataTables.bootstrap.css',
-                                          $cssAssets.'vendor/fontawesome/css/font-awesome.min.css',
-                                          $cssAssets.'vendor/ionicons/css/ionicons.min.css',
-                                          $lteCss.'AdminLTE.css',
-                                          //$lteFont . 'fontawesome-webfont.eot',
-                                          // $lteFont . 'ionicons.eot',
-                                      )
-                                  ),
-                                  'admin_lte_forms_js'     => array(
-                                      'inputs' => array(
-                                          $lteJs.'plugins/colorpicker/bootstrap-colorpicker.js',
-                                          $lteJs.'plugins/daterangepicker/daterangepicker.js',
-                                          $lteJs.'plugins/timepicker/bootstrap-timepicker.js',
-                                          $lteJs.'plugins/input-mask/jquery.inputmask.js',
-                                          //   $lteJs.'plugins/input-mask/*',
-                                      )
-                                  ),
-                                  'admin_lte_forms_css'    => array(
-                                      'inputs' => array(
-                                          $lteCss.'colorpicker/bootstrap-colorpicker.css',
-                                          $lteCss.'daterangepicker/daterangepicker-bs3.css',
-                                          $lteCss.'timepicker/bootstrap-timepicker.css',
-                                      )
-                                  ),
-                                  'admin_lte_wysiwyg'      => array(
-                                      'inputs' => array(
-                                          $lteJs.'plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.js',
-                                      )
-                                  ),
-                                  'admin_lte_wysiwyg_css'  => array(
-                                      'inputs' => array(
-                                          $lteCss.'bootstrap-wysihtml5/bootstrap3-wysihtml5.css',
-                                      )
-                                  ),
-                                  'admin_lte_morris'       => array(
-                                      'inputs' => array(
-                                          $lteJs.'plugins/morris/morris.js',
-                                      )
-                                  ),
-                                  'admin_lte_morris_css'   => array(
-                                      'inputs' => array(
-                                          $lteCss.'morris/morris.css',
-                                      )
-                                  ),
-                                  'admin_lte_flot'         => array(
-                                      'inputs' => array(
-                                          $lteJs.'plugins/flot/*',
-                                      )
-                                  ),
-                                  'admin_lte_calendar'     => array(
-                                      'inputs' => array(
-                                          $jsAssets.'public/vendor/fullcalendar/dist/fullcalendar.min.js',
-                                      )
-                                  ),
-                                  'admin_lte_calendar_css' => array(
-                                      'inputs' => array(
-                                          $lteCss.'fullcalendar/fullcalendar.css',
-                                      )
-                                  ),
-                                  'avatar_img'             => array(
-                                      'inputs' => array(
-                                          '@ChamiloThemeBundle/Resources/public/img/avatar.png'
-                                      )
-                                  ),
-                                  'admin_lte_all'          => array(
-                                      'inputs' => array(
-                                          '@tools_js',
-                                          '@admin_lte_forms_js',
-                                          '@admin_lte_wysiwyg',
-                                          '@admin_lte_morris',
-                                          '@admin_lte_calendar',
-                                          '@admin_lte_js',
-                                          //  '@admin_lte_flot',
-                                      )
-                                  ),
-                                  'admin_lte_all_css'      => array(
-                                      'inputs' => array(
-                                          '@admin_lte_calendar_css',
-                                          '@admin_lte_morris_css',
-                                          '@admin_lte_wysiwyg_css',
-                                          '@admin_lte_forms_css',
-                                          '@admin_lte_css'
-                                      )
-                                  ),
-                              )
-                          )
+                                            $cssAssets.'vendor/bootstrap/dist/css/bootstrap.min.css',
+                                            $lteCss.'bootstrap-slider/slider.css',
+                                            $lteCss.'datatables/dataTables.bootstrap.css',
+                                            $cssAssets.'vendor/fontawesome/css/font-awesome.min.css',
+                                            $cssAssets.'vendor/ionicons/css/ionicons.min.css',
+                                            $lteCss.'AdminLTE.css',
+                                            //$lteFont . 'fontawesome-webfont.eot',
+                                            // $lteFont . 'ionicons.eot',
+                                        )
+                                    ),
+                                    'admin_lte_forms_js'     => array(
+                                        'inputs' => array(
+                                            $lteJs.'plugins/colorpicker/bootstrap-colorpicker.js',
+                                            $lteJs.'plugins/daterangepicker/daterangepicker.js',
+                                            $lteJs.'plugins/timepicker/bootstrap-timepicker.js',
+                                            $lteJs.'plugins/input-mask/jquery.inputmask.js',
+                                            //   $lteJs.'plugins/input-mask/*',
+                                        )
+                                    ),
+                                    'admin_lte_forms_css'    => array(
+                                        'inputs' => array(
+                                            $lteCss.'colorpicker/bootstrap-colorpicker.css',
+                                            $lteCss.'daterangepicker/daterangepicker-bs3.css',
+                                            $lteCss.'timepicker/bootstrap-timepicker.css',
+                                        )
+                                    ),
+                                    'admin_lte_wysiwyg'      => array(
+                                        'inputs' => array(
+                                            $lteJs.'plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.js',
+                                        )
+                                    ),
+                                    'admin_lte_wysiwyg_css'  => array(
+                                        'inputs' => array(
+                                            $lteCss.'bootstrap-wysihtml5/bootstrap3-wysihtml5.css',
+                                        )
+                                    ),
+                                    'admin_lte_morris'       => array(
+                                        'inputs' => array(
+                                            $lteJs.'plugins/morris/morris.js',
+                                        )
+                                    ),
+                                    'admin_lte_morris_css'   => array(
+                                        'inputs' => array(
+                                            $lteCss.'morris/morris.css',
+                                        )
+                                    ),
+                                    'admin_lte_flot'         => array(
+                                        'inputs' => array(
+                                            $lteJs.'plugins/flot/*',
+                                        )
+                                    ),
+                                    'admin_lte_calendar'     => array(
+                                        'inputs' => array(
+                                            $jsAssets.'public/vendor/fullcalendar/dist/fullcalendar.min.js',
+                                        )
+                                    ),
+                                    'admin_lte_calendar_css' => array(
+                                        'inputs' => array(
+                                            $lteCss.'fullcalendar/fullcalendar.css',
+                                        )
+                                    ),
+                                    'avatar_img'             => array(
+                                        'inputs' => array(
+                                            '@ChamiloThemeBundle/Resources/public/img/avatar.png'
+                                        )
+                                    ),
+                                    'admin_lte_all'          => array(
+                                        'inputs' => array(
+                                            '@tools_js',
+                                            '@admin_lte_forms_js',
+                                            '@admin_lte_wysiwyg',
+                                            '@admin_lte_morris',
+                                            '@admin_lte_calendar',
+                                            '@admin_lte_js',
+                                            //  '@admin_lte_flot',
+                                        )
+                                    ),
+                                    'admin_lte_all_css'      => array(
+                                        'inputs' => array(
+                                            '@admin_lte_calendar_css',
+                                            '@admin_lte_morris_css',
+                                            '@admin_lte_wysiwyg_css',
+                                            '@admin_lte_forms_css',
+                                            '@admin_lte_css'
+                                        )
+                                    ),
+                                )
+                            )
             );
 
         }

Please login to merge, or discard this 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	}

		@@ -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);

		@@ -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().'&rand='.mt_rand(1, 1000).'"></iframe>';

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

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

		@@ -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";

		@@ -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	}

		@@ -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);

		@@ -61,134 +61,134 @@
		block discarded – undo
61	61
62	62	if (isset($bundles['AsseticBundle']) && 0) {
63	63	$container->prependExtensionConfig(
64		- 'assetic',
65		- array(
66		- 'bundles' => array(
	64	+ 'assetic',
	65	+ array(
	66	+ 'bundles' => array(
67	67	'ChamiloThemeBundle'
68	68	),
69		- 'assets' => array(
70		- 'common_js' => array(
71		- 'inputs' => array(
72		- $jsAssets.'public/vendor/jquery/dist/jquery.js',
73		- $jsAssets.'public/vendor/jquery-ui/jquery-ui.js',
74		- $jsAssets.'public/vendor/underscore/underscore.js',
75		- $jsAssets.'public/vendor/backbone/backbone.js',
76		- $jsAssets.'public/vendor/marionette/lib/backbone.marionette.js',
77		- $jsAssets.'public/vendor/bootstrap/dist/js/bootstrap.min.js',
78		- $jsAssets.'public/vendor/bootbox/bootbox.js',
79		- $jsAssets.'public/js/dialogs.js',
80		- $jsAssets.'public/js/namespace.js',
81		- ),
82		- ),
83		- 'tools_js' => array(
84		- 'inputs' => array(
85		- '@common_js',
86		- $jsAssets.'public/vendor/momentjs/moment.js',
87		- $jsAssets.'public/vendor/holderjs/holder.js',
88		- $jsAssets.'public/vendor/spinjs/spin.js',
89		- ),
90		- ),
91		- 'admin_lte_js' => array(
92		- 'inputs' => array(
93		- $lteJs.'plugins/bootstrap-slider/bootstrap-slider.js',
94		- $lteJs.'plugins/datatables/jquery.dataTables.js',
95		- $lteJs.'plugins/datatables/dataTables.bootstrap.js',
96		- $lteJs.'plugins/slimScroll/jquery.slimscroll.js',
97		- $jsAssets.'public/js/adminLTE.js',
98		- )
99		- ),
100		- 'admin_lte_css' => array(
101		- 'inputs' => array(
	69	+ 'assets' => array(
	70	+ 'common_js' => array(
	71	+ 'inputs' => array(
	72	+ $jsAssets.'public/vendor/jquery/dist/jquery.js',
	73	+ $jsAssets.'public/vendor/jquery-ui/jquery-ui.js',
	74	+ $jsAssets.'public/vendor/underscore/underscore.js',
	75	+ $jsAssets.'public/vendor/backbone/backbone.js',
	76	+ $jsAssets.'public/vendor/marionette/lib/backbone.marionette.js',
	77	+ $jsAssets.'public/vendor/bootstrap/dist/js/bootstrap.min.js',
	78	+ $jsAssets.'public/vendor/bootbox/bootbox.js',
	79	+ $jsAssets.'public/js/dialogs.js',
	80	+ $jsAssets.'public/js/namespace.js',
	81	+ ),
	82	+ ),
	83	+ 'tools_js' => array(
	84	+ 'inputs' => array(
	85	+ '@common_js',
	86	+ $jsAssets.'public/vendor/momentjs/moment.js',
	87	+ $jsAssets.'public/vendor/holderjs/holder.js',
	88	+ $jsAssets.'public/vendor/spinjs/spin.js',
	89	+ ),
	90	+ ),
	91	+ 'admin_lte_js' => array(
	92	+ 'inputs' => array(
	93	+ $lteJs.'plugins/bootstrap-slider/bootstrap-slider.js',
	94	+ $lteJs.'plugins/datatables/jquery.dataTables.js',
	95	+ $lteJs.'plugins/datatables/dataTables.bootstrap.js',
	96	+ $lteJs.'plugins/slimScroll/jquery.slimscroll.js',
	97	+ $jsAssets.'public/js/adminLTE.js',
	98	+ )
	99	+ ),
	100	+ 'admin_lte_css' => array(
	101	+ 'inputs' => array(
102	102
103	103	// $lteCss . 'jQueryUI/jquery-ui-1.10.3.custom.css',
104		- $cssAssets.'vendor/bootstrap/dist/css/bootstrap.min.css',
105		- $lteCss.'bootstrap-slider/slider.css',
106		- $lteCss.'datatables/dataTables.bootstrap.css',
107		- $cssAssets.'vendor/fontawesome/css/font-awesome.min.css',
108		- $cssAssets.'vendor/ionicons/css/ionicons.min.css',
109		- $lteCss.'AdminLTE.css',
110		- //$lteFont . 'fontawesome-webfont.eot',
111		- // $lteFont . 'ionicons.eot',
112		- )
113		- ),
114		- 'admin_lte_forms_js' => array(
115		- 'inputs' => array(
116		- $lteJs.'plugins/colorpicker/bootstrap-colorpicker.js',
117		- $lteJs.'plugins/daterangepicker/daterangepicker.js',
118		- $lteJs.'plugins/timepicker/bootstrap-timepicker.js',
119		- $lteJs.'plugins/input-mask/jquery.inputmask.js',
120		- // $lteJs.'plugins/input-mask/*',
121		- )
122		- ),
123		- 'admin_lte_forms_css' => array(
124		- 'inputs' => array(
125		- $lteCss.'colorpicker/bootstrap-colorpicker.css',
126		- $lteCss.'daterangepicker/daterangepicker-bs3.css',
127		- $lteCss.'timepicker/bootstrap-timepicker.css',
128		- )
129		- ),
130		- 'admin_lte_wysiwyg' => array(
131		- 'inputs' => array(
132		- $lteJs.'plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.js',
133		- )
134		- ),
135		- 'admin_lte_wysiwyg_css' => array(
136		- 'inputs' => array(
137		- $lteCss.'bootstrap-wysihtml5/bootstrap3-wysihtml5.css',
138		- )
139		- ),
140		- 'admin_lte_morris' => array(
141		- 'inputs' => array(
142		- $lteJs.'plugins/morris/morris.js',
143		- )
144		- ),
145		- 'admin_lte_morris_css' => array(
146		- 'inputs' => array(
147		- $lteCss.'morris/morris.css',
148		- )
149		- ),
150		- 'admin_lte_flot' => array(
151		- 'inputs' => array(
152		- $lteJs.'plugins/flot/*',
153		- )
154		- ),
155		- 'admin_lte_calendar' => array(
156		- 'inputs' => array(
157		- $jsAssets.'public/vendor/fullcalendar/dist/fullcalendar.min.js',
158		- )
159		- ),
160		- 'admin_lte_calendar_css' => array(
161		- 'inputs' => array(
162		- $lteCss.'fullcalendar/fullcalendar.css',
163		- )
164		- ),
165		- 'avatar_img' => array(
166		- 'inputs' => array(
167		- '@ChamiloThemeBundle/Resources/public/img/avatar.png'
168		- )
169		- ),
170		- 'admin_lte_all' => array(
171		- 'inputs' => array(
172		- '@tools_js',
173		- '@admin_lte_forms_js',
174		- '@admin_lte_wysiwyg',
175		- '@admin_lte_morris',
176		- '@admin_lte_calendar',
177		- '@admin_lte_js',
178		- // '@admin_lte_flot',
179		- )
180		- ),
181		- 'admin_lte_all_css' => array(
182		- 'inputs' => array(
183		- '@admin_lte_calendar_css',
184		- '@admin_lte_morris_css',
185		- '@admin_lte_wysiwyg_css',
186		- '@admin_lte_forms_css',
187		- '@admin_lte_css'
188		- )
189		- ),
190		- )
191		- )
	104	+ $cssAssets.'vendor/bootstrap/dist/css/bootstrap.min.css',
	105	+ $lteCss.'bootstrap-slider/slider.css',
	106	+ $lteCss.'datatables/dataTables.bootstrap.css',
	107	+ $cssAssets.'vendor/fontawesome/css/font-awesome.min.css',
	108	+ $cssAssets.'vendor/ionicons/css/ionicons.min.css',
	109	+ $lteCss.'AdminLTE.css',
	110	+ //$lteFont . 'fontawesome-webfont.eot',
	111	+ // $lteFont . 'ionicons.eot',
	112	+ )
	113	+ ),
	114	+ 'admin_lte_forms_js' => array(
	115	+ 'inputs' => array(
	116	+ $lteJs.'plugins/colorpicker/bootstrap-colorpicker.js',
	117	+ $lteJs.'plugins/daterangepicker/daterangepicker.js',
	118	+ $lteJs.'plugins/timepicker/bootstrap-timepicker.js',
	119	+ $lteJs.'plugins/input-mask/jquery.inputmask.js',
	120	+ // $lteJs.'plugins/input-mask/*',
	121	+ )
	122	+ ),
	123	+ 'admin_lte_forms_css' => array(
	124	+ 'inputs' => array(
	125	+ $lteCss.'colorpicker/bootstrap-colorpicker.css',
	126	+ $lteCss.'daterangepicker/daterangepicker-bs3.css',
	127	+ $lteCss.'timepicker/bootstrap-timepicker.css',
	128	+ )
	129	+ ),
	130	+ 'admin_lte_wysiwyg' => array(
	131	+ 'inputs' => array(
	132	+ $lteJs.'plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.js',
	133	+ )
	134	+ ),
	135	+ 'admin_lte_wysiwyg_css' => array(
	136	+ 'inputs' => array(
	137	+ $lteCss.'bootstrap-wysihtml5/bootstrap3-wysihtml5.css',
	138	+ )
	139	+ ),
	140	+ 'admin_lte_morris' => array(
	141	+ 'inputs' => array(
	142	+ $lteJs.'plugins/morris/morris.js',
	143	+ )
	144	+ ),
	145	+ 'admin_lte_morris_css' => array(
	146	+ 'inputs' => array(
	147	+ $lteCss.'morris/morris.css',
	148	+ )
	149	+ ),
	150	+ 'admin_lte_flot' => array(
	151	+ 'inputs' => array(
	152	+ $lteJs.'plugins/flot/*',
	153	+ )
	154	+ ),
	155	+ 'admin_lte_calendar' => array(
	156	+ 'inputs' => array(
	157	+ $jsAssets.'public/vendor/fullcalendar/dist/fullcalendar.min.js',
	158	+ )
	159	+ ),
	160	+ 'admin_lte_calendar_css' => array(
	161	+ 'inputs' => array(
	162	+ $lteCss.'fullcalendar/fullcalendar.css',
	163	+ )
	164	+ ),
	165	+ 'avatar_img' => array(
	166	+ 'inputs' => array(
	167	+ '@ChamiloThemeBundle/Resources/public/img/avatar.png'
	168	+ )
	169	+ ),
	170	+ 'admin_lte_all' => array(
	171	+ 'inputs' => array(
	172	+ '@tools_js',
	173	+ '@admin_lte_forms_js',
	174	+ '@admin_lte_wysiwyg',
	175	+ '@admin_lte_morris',
	176	+ '@admin_lte_calendar',
	177	+ '@admin_lte_js',
	178	+ // '@admin_lte_flot',
	179	+ )
	180	+ ),
	181	+ 'admin_lte_all_css' => array(
	182	+ 'inputs' => array(
	183	+ '@admin_lte_calendar_css',
	184	+ '@admin_lte_morris_css',
	185	+ '@admin_lte_wysiwyg_css',
	186	+ '@admin_lte_forms_css',
	187	+ '@admin_lte_css'
	188	+ )
	189	+ ),
	190	+ )
	191	+ )
192	192	);
193	193
194	194	}

chamilo / chamilo-lms

Push — 1.11.x ( 7ffd51...902ebd )

Status

Category

Indentation +10 added lines, -10 removed lines patch added patch discarded remove patch

Indentation +9 added lines, -9 removed lines patch added patch discarded remove patch

Indentation +10 added lines, -10 removed lines patch added patch discarded remove patch

Indentation +9 added lines, -9 removed lines patch added patch discarded remove patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +3 added lines, -3 removed lines patch added patch discarded remove patch

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

Indentation +124 added lines, -124 removed lines patch added patch discarded remove patch