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

Completed

Push — master ( 565c08...93d030 )

by José

created 2017-01-06 23:31 UTC

Status

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

@@ -4,8 +4,7 @@
 block discarded – undo
     @author Andre Boivin base code
 	@author Julio Montoya fixing lot of little details
 	@todo this script is not ready for a production use that's why I'm commenting the function delete_inactive_student
-
-*	@package chamilo.admin
+ *	@package chamilo.admin
 *	script pour effacer les user inactif depuis x temps
 */
 $cidReset = true;

Please login to merge, or discard this patch.

main/admin/course_create_content.php 1 patch

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

@@ -15,15 +15,15 @@
 block discarded – undo
 Display::display_header($tool_name);
 //api_display_tool_title($tool_name);
 if (api_get_setting('server_type') != 'test') {
-	echo get_lang('DummyCourseOnlyOnTestServer');
+    echo get_lang('DummyCourseOnlyOnTestServer');
 } elseif( isset($_POST['action'])) {
-	require_once('../coursecopy/classes/DummyCourseCreator.class.php');
-	$dcc = new DummyCourseCreator();
-	$dcc->create_dummy_course($_POST['course_code']);
-	echo get_lang('Done');
+    require_once('../coursecopy/classes/DummyCourseCreator.class.php');
+    $dcc = new DummyCourseCreator();
+    $dcc->create_dummy_course($_POST['course_code']);
+    echo get_lang('Done');
 } else {
-	echo get_lang('DummyCourseDescription');
-	echo '<form method="post"><input type="hidden" name="course_code" value="'.Security::remove_XSS($_GET['course_code']).'"/><input type="submit" name="action" value="'.get_lang('Ok').'"/></form>';
+    echo get_lang('DummyCourseDescription');
+    echo '<form method="post"><input type="hidden" name="course_code" value="'.Security::remove_XSS($_GET['course_code']).'"/><input type="submit" name="action" value="'.get_lang('Ok').'"/></form>';
 }
 
 Display::display_footer();

Please login to merge, or discard this patch.

main/mySpace/progression.php 1 patch

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

@@ -33,36 +33,36 @@
 block discarded – undo
 $result_course = Database::query($sql_course);
 
 if (Database::num_rows($result_course) > 0) {
-	if (isset($_POST['export'])) {
-		$export_result = export_csv($header, $data, 'test.csv'); // TODO: There is no data for exporting yet.
-		Display :: display_error_message($export_result);
-	}
-	echo '<table class="data_table"><tr><th>'.get_lang('Course').'</th><th>'.get_lang('TempsFrequentation').'</th><th>'.get_lang('Progression').'</th><th>'.get_lang('MoyenneTest').'</th></tr>';
-	$header = array(get_lang('Course', ''), get_lang('TempsFrequentation', ''), get_lang('Progression', ''), get_lang('MoyenneTest', ''));
-	while ($a_course = Database::fetch_array($result_course)) {
-		// TODO: This query is to be checked, there are no HotPotatoes tests results.
-		$sql_moy_test = "SELECT exe_result,exe_weighting
+    if (isset($_POST['export'])) {
+        $export_result = export_csv($header, $data, 'test.csv'); // TODO: There is no data for exporting yet.
+        Display :: display_error_message($export_result);
+    }
+    echo '<table class="data_table"><tr><th>'.get_lang('Course').'</th><th>'.get_lang('TempsFrequentation').'</th><th>'.get_lang('Progression').'</th><th>'.get_lang('MoyenneTest').'</th></tr>';
+    $header = array(get_lang('Course', ''), get_lang('TempsFrequentation', ''), get_lang('Progression', ''), get_lang('MoyenneTest', ''));
+    while ($a_course = Database::fetch_array($result_course)) {
+        // TODO: This query is to be checked, there are no HotPotatoes tests results.
+        $sql_moy_test = "SELECT exe_result,exe_weighting
 			FROM $tbl_track_exercice
 			WHERE c_id = ".$a_course['id'];
-		$result_moy_test = Database::query($sql_moy_test);
-		$result = 0;
-		$weighting = 0;
-		while ($moy_test = Database::fetch_array($result_moy_test)) {
-			$result = $result + $moy_test['exe_result'];
-			$weighting = $weighting + $moy_test['exe_weighting'];
-		}
-		if ($weighting != 0) {
-			$moyenne_test = round(($result * 100) / $weighting);
-		} else {
-			$moyenne_test = null;
-		}
-		echo '<tr><td>'.$a_course['title'].'</td><td> </td><td> </td><td>'.(is_null($moyenne_test) ? '' : $moyenne_test.'%').'</td> </tr>';
-	}
-	echo '</table>';
-	echo "<br /><br />";
-	echo "<form method='post'><input type='submit' name='export' value='".get_lang('ExportExcel')."'/><form>";
+        $result_moy_test = Database::query($sql_moy_test);
+        $result = 0;
+        $weighting = 0;
+        while ($moy_test = Database::fetch_array($result_moy_test)) {
+            $result = $result + $moy_test['exe_result'];
+            $weighting = $weighting + $moy_test['exe_weighting'];
+        }
+        if ($weighting != 0) {
+            $moyenne_test = round(($result * 100) / $weighting);
+        } else {
+            $moyenne_test = null;
+        }
+        echo '<tr><td>'.$a_course['title'].'</td><td> </td><td> </td><td>'.(is_null($moyenne_test) ? '' : $moyenne_test.'%').'</td> </tr>';
+    }
+    echo '</table>';
+    echo "<br /><br />";
+    echo "<form method='post'><input type='submit' name='export' value='".get_lang('ExportExcel')."'/><form>";
 } else {
-	echo get_lang('NoCourse');
+    echo get_lang('NoCourse');
 }
 
 Display :: display_footer();

Please login to merge, or discard this patch.

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

Indentation -1 removed lines patch added patch discarded remove patch

@@ -16,7 +16,6 @@
 block discarded – undo
  * @author Patrick Cool
  * @author René Haentjens, added CSV file import (October 2004)
  * @package chamilo.link
-
  */
 
 // Including libraries

Please login to merge, or discard this patch.

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

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

@@ -693,8 +693,8 @@  discard block
 block discarded – undo
  */
 function get_week_from_day($date) {
     if (!empty($date)) {
-       $time = api_strtotime($date,'UTC');
-       return date('W', $time);
+        $time = api_strtotime($date,'UTC');
+        return date('W', $time);
     } else {
         return date('W');
     }
@@ -712,31 +712,31 @@  discard block
 block discarded – undo
 
 function substrwords($text,$maxchar,$end='...')
 {
-	if(strlen($text)>$maxchar)
-	{
-		$words=explode(" ",$text);
-		$output = '';
-		$i=0;
-		while(1)
-		{
-			$length = (strlen($output)+strlen($words[$i]));
-			if($length>$maxchar)
-			{
-				break;
-			}
-			else
-			{
-				$output = $output." ".$words[$i];
-				$i++;
-			};
-		};
-	}
-	else
-	{
-		$output = $text;
-		return $output;
-	}
-	return $output.$end;
+    if(strlen($text)>$maxchar)
+    {
+        $words=explode(" ",$text);
+        $output = '';
+        $i=0;
+        while(1)
+        {
+            $length = (strlen($output)+strlen($words[$i]));
+            if($length>$maxchar)
+            {
+                break;
+            }
+            else
+            {
+                $output = $output." ".$words[$i];
+                $i++;
+            };
+        };
+    }
+    else
+    {
+        $output = $text;
+        return $output;
+    }
+    return $output.$end;
 }
 
 function implode_with_key($glue, $array) {

Please login to merge, or discard this patch.

main/inc/lib/internationalization_database/transliteration/x03.php 1 patch

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

		@@ -2,7 +2,7 @@
		block discarded – undo
2	2	// $Id: xfd.php,v 1.1.8.1 2008/06/12 20:34:32 smk Exp $
3	3
4	4	return array(
5		- 'en' => array('', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
	5	+ 'en' => array('', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
6	6	'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
7	7	'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
8	8	'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',

Please login to merge, or discard this patch.

main/inc/lib/internationalization_database/transliteration/x17.php 1 patch

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

@@ -2,7 +2,7 @@
 block discarded – undo
 // $Id: x05.php,v 1.1.8.1 2008/06/12 20:34:31 smk Exp $
 
 return array(
-  'en' => array(NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+    'en' => array(NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
     NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
     NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
     NULL, 'A', 'B', 'G', 'D', 'E', 'Z', 'E', 'E', 'T`', 'Zh', 'I', 'L', 'Kh', 'Ts', 'K',

Please login to merge, or discard this patch.

main/inc/lib/internationalization_database/transliteration/x4d.php 1 patch

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

@@ -2,7 +2,7 @@
 block discarded – undo
 // $Id: x05.php,v 1.1.8.1 2008/06/12 20:34:31 smk Exp $
 
 return array(
-  'en' => array(NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+    'en' => array(NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
     NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
     NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
     NULL, 'A', 'B', 'G', 'D', 'E', 'Z', 'E', 'E', 'T`', 'Zh', 'I', 'L', 'Kh', 'Ts', 'K',

Please login to merge, or discard this patch.

main/inc/lib/internationalization_database/transliteration/x2f.php 1 patch

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

@@ -2,7 +2,7 @@
 block discarded – undo
 // $Id: x05.php,v 1.1.8.1 2008/06/12 20:34:31 smk Exp $
 
 return array(
-  'en' => array(NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+    'en' => array(NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
     NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
     NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
     NULL, 'A', 'B', 'G', 'D', 'E', 'Z', 'E', 'E', 'T`', 'Zh', 'I', 'L', 'Kh', 'Ts', 'K',

Please login to merge, or discard this patch.

		@@ -693,8 +693,8 @@ discard block
		block discarded – undo
693	693	*/
694	694	function get_week_from_day($date) {
695	695	if (!empty($date)) {
696		- $time = api_strtotime($date,'UTC');
697		- return date('W', $time);
	696	+ $time = api_strtotime($date,'UTC');
	697	+ return date('W', $time);
698	698	} else {
699	699	return date('W');
700	700	}
		@@ -712,31 +712,31 @@ discard block
		block discarded – undo
712	712
713	713	function substrwords($text,$maxchar,$end='...')
714	714	{
715		- if(strlen($text)>$maxchar)
716		- {
717		- $words=explode(" ",$text);
718		- $output = '';
719		- $i=0;
720		- while(1)
721		- {
722		- $length = (strlen($output)+strlen($words[$i]));
723		- if($length>$maxchar)
724		- {
725		- break;
726		- }
727		- else
728		- {
729		- $output = $output." ".$words[$i];
730		- $i++;
731		- };
732		- };
733		- }
734		- else
735		- {
736		- $output = $text;
737		- return $output;
738		- }
739		- return $output.$end;
	715	+ if(strlen($text)>$maxchar)
	716	+ {
	717	+ $words=explode(" ",$text);
	718	+ $output = '';
	719	+ $i=0;
	720	+ while(1)
	721	+ {
	722	+ $length = (strlen($output)+strlen($words[$i]));
	723	+ if($length>$maxchar)
	724	+ {
	725	+ break;
	726	+ }
	727	+ else
	728	+ {
	729	+ $output = $output." ".$words[$i];
	730	+ $i++;
	731	+ };
	732	+ };
	733	+ }
	734	+ else
	735	+ {
	736	+ $output = $text;
	737	+ return $output;
	738	+ }
	739	+ return $output.$end;
740	740	}
741	741
742	742	function implode_with_key($glue, $array) {

		@@ -4,8 +4,7 @@
		block discarded – undo
4	4	@author Andre Boivin base code
5	5	@author Julio Montoya fixing lot of little details
6	6	@todo this script is not ready for a production use that's why I'm commenting the function delete_inactive_student
7		-
8		-* @package chamilo.admin
	7	+ * @package chamilo.admin
9	8	* script pour effacer les user inactif depuis x temps
10	9	*/
11	10	$cidReset = true;

		@@ -15,15 +15,15 @@
		block discarded – undo
15	15	Display::display_header($tool_name);
16	16	//api_display_tool_title($tool_name);
17	17	if (api_get_setting('server_type') != 'test') {
18		- echo get_lang('DummyCourseOnlyOnTestServer');
	18	+ echo get_lang('DummyCourseOnlyOnTestServer');
19	19	} elseif( isset($_POST['action'])) {
20		- require_once('../coursecopy/classes/DummyCourseCreator.class.php');
21		- $dcc = new DummyCourseCreator();
22		- $dcc->create_dummy_course($_POST['course_code']);
23		- echo get_lang('Done');
	20	+ require_once('../coursecopy/classes/DummyCourseCreator.class.php');
	21	+ $dcc = new DummyCourseCreator();
	22	+ $dcc->create_dummy_course($_POST['course_code']);
	23	+ echo get_lang('Done');
24	24	} else {
25		- echo get_lang('DummyCourseDescription');
26		- echo '<form method="post"><input type="hidden" name="course_code" value="'.Security::remove_XSS($_GET['course_code']).'"/><input type="submit" name="action" value="'.get_lang('Ok').'"/></form>';
	25	+ echo get_lang('DummyCourseDescription');
	26	+ echo '<form method="post"><input type="hidden" name="course_code" value="'.Security::remove_XSS($_GET['course_code']).'"/><input type="submit" name="action" value="'.get_lang('Ok').'"/></form>';
27	27	}
28	28
29	29	Display::display_footer();

		@@ -33,36 +33,36 @@
		block discarded – undo
33	33	$result_course = Database::query($sql_course);
34	34
35	35	if (Database::num_rows($result_course) > 0) {
36		- if (isset($_POST['export'])) {
37		- $export_result = export_csv($header, $data, 'test.csv'); // TODO: There is no data for exporting yet.
38		- Display :: display_error_message($export_result);
39		- }
40		- echo '<table class="data_table"><tr><th>'.get_lang('Course').'</th><th>'.get_lang('TempsFrequentation').'</th><th>'.get_lang('Progression').'</th><th>'.get_lang('MoyenneTest').'</th></tr>';
41		- $header = array(get_lang('Course', ''), get_lang('TempsFrequentation', ''), get_lang('Progression', ''), get_lang('MoyenneTest', ''));
42		- while ($a_course = Database::fetch_array($result_course)) {
43		- // TODO: This query is to be checked, there are no HotPotatoes tests results.
44		- $sql_moy_test = "SELECT exe_result,exe_weighting
	36	+ if (isset($_POST['export'])) {
	37	+ $export_result = export_csv($header, $data, 'test.csv'); // TODO: There is no data for exporting yet.
	38	+ Display :: display_error_message($export_result);
	39	+ }
	40	+ echo '<table class="data_table"><tr><th>'.get_lang('Course').'</th><th>'.get_lang('TempsFrequentation').'</th><th>'.get_lang('Progression').'</th><th>'.get_lang('MoyenneTest').'</th></tr>';
	41	+ $header = array(get_lang('Course', ''), get_lang('TempsFrequentation', ''), get_lang('Progression', ''), get_lang('MoyenneTest', ''));
	42	+ while ($a_course = Database::fetch_array($result_course)) {
	43	+ // TODO: This query is to be checked, there are no HotPotatoes tests results.
	44	+ $sql_moy_test = "SELECT exe_result,exe_weighting
45	45	FROM $tbl_track_exercice
46	46	WHERE c_id = ".$a_course['id'];
47		- $result_moy_test = Database::query($sql_moy_test);
48		- $result = 0;
49		- $weighting = 0;
50		- while ($moy_test = Database::fetch_array($result_moy_test)) {
51		- $result = $result + $moy_test['exe_result'];
52		- $weighting = $weighting + $moy_test['exe_weighting'];
53		- }
54		- if ($weighting != 0) {
55		- $moyenne_test = round(($result * 100) / $weighting);
56		- } else {
57		- $moyenne_test = null;
58		- }
59		- echo '<tr><td>'.$a_course['title'].'</td><td> </td><td> </td><td>'.(is_null($moyenne_test) ? '' : $moyenne_test.'%').'</td> </tr>';
60		- }
61		- echo '</table>';
62		- echo "<br /><br />";
63		- echo "<form method='post'><input type='submit' name='export' value='".get_lang('ExportExcel')."'/><form>";
	47	+ $result_moy_test = Database::query($sql_moy_test);
	48	+ $result = 0;
	49	+ $weighting = 0;
	50	+ while ($moy_test = Database::fetch_array($result_moy_test)) {
	51	+ $result = $result + $moy_test['exe_result'];
	52	+ $weighting = $weighting + $moy_test['exe_weighting'];
	53	+ }
	54	+ if ($weighting != 0) {
	55	+ $moyenne_test = round(($result * 100) / $weighting);
	56	+ } else {
	57	+ $moyenne_test = null;
	58	+ }
	59	+ echo '<tr><td>'.$a_course['title'].'</td><td> </td><td> </td><td>'.(is_null($moyenne_test) ? '' : $moyenne_test.'%').'</td> </tr>';
	60	+ }
	61	+ echo '</table>';
	62	+ echo "<br /><br />";
	63	+ echo "<form method='post'><input type='submit' name='export' value='".get_lang('ExportExcel')."'/><form>";
64	64	} else {
65		- echo get_lang('NoCourse');
	65	+ echo get_lang('NoCourse');
66	66	}
67	67
68	68	Display :: display_footer();

		@@ -16,7 +16,6 @@
		block discarded – undo
16	16	* @author Patrick Cool
17	17	* @author René Haentjens, added CSV file import (October 2004)
18	18	* @package chamilo.link
19		-
20	19	*/
21	20
22	21	// Including libraries

		@@ -2,7 +2,7 @@
		block discarded – undo
2	2	// $Id: x05.php,v 1.1.8.1 2008/06/12 20:34:31 smk Exp $
3	3
4	4	return array(
5		- 'en' => array(NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
	5	+ 'en' => array(NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
6	6	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
7	7	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
8	8	NULL, 'A', 'B', 'G', 'D', 'E', 'Z', 'E', 'E', 'T`', 'Zh', 'I', 'L', 'Kh', 'Ts', 'K',

chamilo / chamilo-lms

Push — master ( 565c08...93d030 )

Status

Category

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

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

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

Indentation -1 removed lines patch added patch discarded remove patch

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

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

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

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

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