Inspection of "Merge pull request #1620 from jloguercio/1.11.x" - chamilo/chamilo-lms - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — 1.11.x ( 772bf4...b5113d )

by José

created 2017-02-03 17:20 UTC

Status

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

@@ -55,7 +55,7 @@
 block discarded – undo
                     //$gradebook['name'] = $gradebook['name'];
                     //$gradebook_list[]  = $gradebook;
                 } else {
-                  //  $gradebook['name'] = $gradebook_list[$gradebook['parent_id']]['name'].' > '.$gradebook['name'];
+                    //  $gradebook['name'] = $gradebook_list[$gradebook['parent_id']]['name'].' > '.$gradebook['name'];
                     //$gradebook_list[]  = $gradebook;
                 }
             }

Please login to merge, or discard this patch.

main/session/add_students_to_session.php 1 patch

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

@@ -70,13 +70,13 @@
 block discarded – undo
         <tr>
             <td align="center">
                 <?php
-                 echo Display::select(
-                     'sessions[]',
-                     $sessionList,
-                     '',
-                     array('style'=>'width:100%', 'multiple'=>'multiple', 'id'=>'sessions', 'size'=>'15px'),
-                     false
-                 );
+                    echo Display::select(
+                        'sessions[]',
+                        $sessionList,
+                        '',
+                        array('style'=>'width:100%', 'multiple'=>'multiple', 'id'=>'sessions', 'size'=>'15px'),
+                        false
+                    );
                 ?>
             </td>
             <td align="center">

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/inc/lib/specific_fields_manager.lib.php 1 patch

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

@@ -237,10 +237,10 @@
 block discarded – undo
  * @param   int     Internal ID used in specific tool table
  */
 function delete_all_values_for_item($course_id, $tool_id, $ref_id) {
-  $table_sf_values = Database :: get_main_table(TABLE_MAIN_SPECIFIC_FIELD_VALUES);
-  $sql = 'DELETE FROM %s WHERE course_code = \'%s\' AND tool_id = \'%s\' AND ref_id = %s';
-  $sql = sprintf($sql, $table_sf_values, $course_id, $tool_id, $ref_id);
-  Database::query($sql);
+    $table_sf_values = Database :: get_main_table(TABLE_MAIN_SPECIFIC_FIELD_VALUES);
+    $sql = 'DELETE FROM %s WHERE course_code = \'%s\' AND tool_id = \'%s\' AND ref_id = %s';
+    $sql = sprintf($sql, $table_sf_values, $course_id, $tool_id, $ref_id);
+    Database::query($sql);
 }
 
 /**

Please login to merge, or discard this patch.

main/inc/lib/access_url_edit_courses_to_url_functions.lib.php 1 patch

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

@@ -38,17 +38,17 @@
 block discarded – undo
             $needle = Database::escape_string($needle);
             // search courses where username or firstname or lastname begins likes $needle
             $sql = 'SELECT code, title FROM '.$tbl_course.' u '.
-                   ' WHERE (title LIKE "'.$needle.'%" '.
-                   ' OR code LIKE "'.$needle.'%" '.
-                   ' ) '.
-                   ' ORDER BY title, code '.
-                   ' LIMIT 11';
+                    ' WHERE (title LIKE "'.$needle.'%" '.
+                    ' OR code LIKE "'.$needle.'%" '.
+                    ' ) '.
+                    ' ORDER BY title, code '.
+                    ' LIMIT 11';
             $rs = Database::query($sql);
             $i=0;
             while ($course = Database :: fetch_array($rs)) {
                 $i++;
                 if ($i<=10) {
-                     $return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_url(\''.addslashes($course['code']).'\',\''.addslashes($course['title']).' ('.addslashes($course['code']).')'.'\')">'.$course['title'].' ('.$course['code'].')</a><br />';
+                        $return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_url(\''.addslashes($course['code']).'\',\''.addslashes($course['title']).' ('.addslashes($course['code']).')'.'\')">'.$course['title'].' ('.$course['code'].')</a><br />';
                 } else {
                     $return .= '...<br />';
                 }

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.

src/Chamilo/CoreBundle/Admin/UserGroupAdmin.php 1 patch

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

@@ -28,7 +28,7 @@
 block discarded – undo
             ->add('users', 'sonata_type_collection', array(
                     'cascade_validation' => true,
                 ), array(
-                   // 'allow_delete' => true,
+                    // 'allow_delete' => true,
                     'by_reference' => false,
                     'edit'              => 'inline',
                     'inline'            => 'table',

Please login to merge, or discard this patch.

main/session/session_category_add.php 1 patch

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

@@ -29,29 +29,29 @@  discard block
 block discarded – undo
 $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
 
 if (isset($_POST['formSent']) && $_POST['formSent']) {
-	$formSent = 1;
-	$name = $_POST['name'];
-	$year_start = $_POST['year_start'];
-	$month_start = $_POST['month_start'];
-	$day_start = $_POST['day_start'];
-	$year_end = $_POST['year_end'];
-	$month_end = $_POST['month_end'];
-	$day_end = $_POST['day_end'];
-	$return = SessionManager::create_category_session(
-		$name,
-		$year_start,
-		$month_start,
-		$day_start,
-		$year_end,
-		$month_end,
-		$day_end
-	);
-
-	if ($return == strval(intval($return))) {
-		Display::addFlash(Display::return_message(get_lang('SessionCategoryAdded')));
-		header('Location: session_category_list.php');
-		exit();
-	}
+    $formSent = 1;
+    $name = $_POST['name'];
+    $year_start = $_POST['year_start'];
+    $month_start = $_POST['month_start'];
+    $day_start = $_POST['day_start'];
+    $year_end = $_POST['year_end'];
+    $month_end = $_POST['month_end'];
+    $day_end = $_POST['day_end'];
+    $return = SessionManager::create_category_session(
+        $name,
+        $year_start,
+        $month_start,
+        $day_start,
+        $year_end,
+        $month_end,
+        $day_end
+    );
+
+    if ($return == strval(intval($return))) {
+        Display::addFlash(Display::return_message(get_lang('SessionCategoryAdded')));
+        header('Location: session_category_list.php');
+        exit();
+    }
 }
 $thisYear = date('Y');
 $thisMonth = date('m');
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
 //display the header
 Display::display_header($tool_name);
 if (!empty($return)) {
-	Display::display_error_message($return,false);
+    Display::display_error_message($return,false);
 }
 ?>
 <div class="row">
@@ -139,12 +139,12 @@  discard block
 block discarded – undo
                     /
                       <select name="year_start">
                       <?php
-                      for ($i=$thisYear-5;$i <= ($thisYear+5);$i++) {
-                      ?>
+                        for ($i=$thisYear-5;$i <= ($thisYear+5);$i++) {
+                        ?>
                               <option value="<?php echo $i; ?>" <?php if((!$formSent && $thisYear == $i) || ($formSent && $year_start == $i)) echo 'selected="selected"'; ?> ><?php echo $i; ?></option>
                       <?php
-                      }
-                      ?>
+                        }
+                        ?>
                         </select>
                 </div>
                 <div class="col-md-3"></div>

Please login to merge, or discard this patch.

main/course_progress/thematic_plan.php 1 patch

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

@@ -47,15 +47,15 @@
 block discarded – undo
         $form->addElement('hidden', 'description_type['.$id.']', $id);
         $form->addText('title['.$id.']', get_lang('Title'), false, array('size'=>'50'));
         $form->addHtmlEditor(
-           'description['.$id.']',
-           get_lang('Description'),
-           false,
-           false,
-           array(
-               'ToolbarStartExpanded' => 'false',
-               'ToolbarSet' => 'TrainingDescription',
-               'Height' => '150'
-           )
+            'description['.$id.']',
+            get_lang('Description'),
+            false,
+            false,
+            array(
+                'ToolbarStartExpanded' => 'false',
+                'ToolbarSet' => 'TrainingDescription',
+                'Height' => '150'
+            )
         );
 
         if (!empty($thematic_simple_list) && in_array($id, $thematic_simple_list)) {

Please login to merge, or discard this patch.

		@@ -237,10 +237,10 @@
		block discarded – undo
237	237	* @param int Internal ID used in specific tool table
238	238	*/
239	239	function delete_all_values_for_item($course_id, $tool_id, $ref_id) {
240		- $table_sf_values = Database :: get_main_table(TABLE_MAIN_SPECIFIC_FIELD_VALUES);
241		- $sql = 'DELETE FROM %s WHERE course_code = \'%s\' AND tool_id = \'%s\' AND ref_id = %s';
242		- $sql = sprintf($sql, $table_sf_values, $course_id, $tool_id, $ref_id);
243		- Database::query($sql);
	240	+ $table_sf_values = Database :: get_main_table(TABLE_MAIN_SPECIFIC_FIELD_VALUES);
	241	+ $sql = 'DELETE FROM %s WHERE course_code = \'%s\' AND tool_id = \'%s\' AND ref_id = %s';
	242	+ $sql = sprintf($sql, $table_sf_values, $course_id, $tool_id, $ref_id);
	243	+ Database::query($sql);
244	244	}
245	245
246	246	/**

		@@ -55,7 +55,7 @@
		block discarded – undo
55	55	//$gradebook['name'] = $gradebook['name'];
56	56	//$gradebook_list[] = $gradebook;
57	57	} else {
58		- // $gradebook['name'] = $gradebook_list[$gradebook['parent_id']]['name'].' > '.$gradebook['name'];
	58	+ // $gradebook['name'] = $gradebook_list[$gradebook['parent_id']]['name'].' > '.$gradebook['name'];
59	59	//$gradebook_list[] = $gradebook;
60	60	}
61	61	}

		@@ -70,13 +70,13 @@
		block discarded – undo
70	70	<tr>
71	71	<td align="center">
72	72	<?php
73		- echo Display::select(
74		- 'sessions[]',
75		- $sessionList,
76		- '',
77		- array('style'=>'width:100%', 'multiple'=>'multiple', 'id'=>'sessions', 'size'=>'15px'),
78		- false
79		- );
	73	+ echo Display::select(
	74	+ 'sessions[]',
	75	+ $sessionList,
	76	+ '',
	77	+ array('style'=>'width:100%', 'multiple'=>'multiple', 'id'=>'sessions', 'size'=>'15px'),
	78	+ false
	79	+ );
80	80	?>
81	81	</td>
82	82	<td align="center">

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

		@@ -38,17 +38,17 @@
		block discarded – undo
38	38	$needle = Database::escape_string($needle);
39	39	// search courses where username or firstname or lastname begins likes $needle
40	40	$sql = 'SELECT code, title FROM '.$tbl_course.' u '.
41		- ' WHERE (title LIKE "'.$needle.'%" '.
42		- ' OR code LIKE "'.$needle.'%" '.
43		- ' ) '.
44		- ' ORDER BY title, code '.
45		- ' LIMIT 11';
	41	+ ' WHERE (title LIKE "'.$needle.'%" '.
	42	+ ' OR code LIKE "'.$needle.'%" '.
	43	+ ' ) '.
	44	+ ' ORDER BY title, code '.
	45	+ ' LIMIT 11';
46	46	$rs = Database::query($sql);
47	47	$i=0;
48	48	while ($course = Database :: fetch_array($rs)) {
49	49	$i++;
50	50	if ($i<=10) {
51		- $return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_url(\''.addslashes($course['code']).'\',\''.addslashes($course['title']).' ('.addslashes($course['code']).')'.'\')">'.$course['title'].' ('.$course['code'].')</a><br />';
	51	+ $return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_url(\''.addslashes($course['code']).'\',\''.addslashes($course['title']).' ('.addslashes($course['code']).')'.'\')">'.$course['title'].' ('.$course['code'].')</a><br />';
52	52	} else {
53	53	$return .= '...<br />';
54	54	}

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

		@@ -28,7 +28,7 @@
		block discarded – undo
28	28	->add('users', 'sonata_type_collection', array(
29	29	'cascade_validation' => true,
30	30	), array(
31		- // 'allow_delete' => true,
	31	+ // 'allow_delete' => true,
32	32	'by_reference' => false,
33	33	'edit' => 'inline',
34	34	'inline' => 'table',

		@@ -29,29 +29,29 @@ discard block
		block discarded – undo
29	29	$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
30	30
31	31	if (isset($_POST['formSent']) && $_POST['formSent']) {
32		- $formSent = 1;
33		- $name = $_POST['name'];
34		- $year_start = $_POST['year_start'];
35		- $month_start = $_POST['month_start'];
36		- $day_start = $_POST['day_start'];
37		- $year_end = $_POST['year_end'];
38		- $month_end = $_POST['month_end'];
39		- $day_end = $_POST['day_end'];
40		- $return = SessionManager::create_category_session(
41		- $name,
42		- $year_start,
43		- $month_start,
44		- $day_start,
45		- $year_end,
46		- $month_end,
47		- $day_end
48		- );
49		-
50		- if ($return == strval(intval($return))) {
51		- Display::addFlash(Display::return_message(get_lang('SessionCategoryAdded')));
52		- header('Location: session_category_list.php');
53		- exit();
54		- }
	32	+ $formSent = 1;
	33	+ $name = $_POST['name'];
	34	+ $year_start = $_POST['year_start'];
	35	+ $month_start = $_POST['month_start'];
	36	+ $day_start = $_POST['day_start'];
	37	+ $year_end = $_POST['year_end'];
	38	+ $month_end = $_POST['month_end'];
	39	+ $day_end = $_POST['day_end'];
	40	+ $return = SessionManager::create_category_session(
	41	+ $name,
	42	+ $year_start,
	43	+ $month_start,
	44	+ $day_start,
	45	+ $year_end,
	46	+ $month_end,
	47	+ $day_end
	48	+ );
	49	+
	50	+ if ($return == strval(intval($return))) {
	51	+ Display::addFlash(Display::return_message(get_lang('SessionCategoryAdded')));
	52	+ header('Location: session_category_list.php');
	53	+ exit();
	54	+ }
55	55	}
56	56	$thisYear = date('Y');
57	57	$thisMonth = date('m');
		@@ -61,7 +61,7 @@ discard block
		block discarded – undo
61	61	//display the header
62	62	Display::display_header($tool_name);
63	63	if (!empty($return)) {
64		- Display::display_error_message($return,false);
	64	+ Display::display_error_message($return,false);
65	65	}
66	66	?>
67	67	<div class="row">
		@@ -139,12 +139,12 @@ discard block
		block discarded – undo
139	139	/
140	140	<select name="year_start">
141	141	<?php
142		- for ($i=$thisYear-5;$i <= ($thisYear+5);$i++) {
143		- ?>
	142	+ for ($i=$thisYear-5;$i <= ($thisYear+5);$i++) {
	143	+ ?>
144	144	<option value="<?php echo $i; ?>" <?php if((!$formSent && $thisYear == $i) \|\| ($formSent && $year_start == $i)) echo 'selected="selected"'; ?> ><?php echo $i; ?></option>
145	145	<?php
146		- }
147		- ?>
	146	+ }
	147	+ ?>
148	148	</select>
149	149	</div>
150	150	<div class="col-md-3"></div>

		@@ -47,15 +47,15 @@
		block discarded – undo
47	47	$form->addElement('hidden', 'description_type['.$id.']', $id);
48	48	$form->addText('title['.$id.']', get_lang('Title'), false, array('size'=>'50'));
49	49	$form->addHtmlEditor(
50		- 'description['.$id.']',
51		- get_lang('Description'),
52		- false,
53		- false,
54		- array(
55		- 'ToolbarStartExpanded' => 'false',
56		- 'ToolbarSet' => 'TrainingDescription',
57		- 'Height' => '150'
58		- )
	50	+ 'description['.$id.']',
	51	+ get_lang('Description'),
	52	+ false,
	53	+ false,
	54	+ array(
	55	+ 'ToolbarStartExpanded' => 'false',
	56	+ 'ToolbarSet' => 'TrainingDescription',
	57	+ 'Height' => '150'
	58	+ )
59	59	);
60	60
61	61	if (!empty($thematic_simple_list) && in_array($id, $thematic_simple_list)) {

chamilo / chamilo-lms

Push — 1.11.x ( 772bf4...b5113d )

Status

Category

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

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

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

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

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

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

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

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

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