chamilo / chamilo-lms

main/inc/lib/fileDisplay.lib.php

Spacing +2 added lines, -2 removed lines

@@ -211,7 +211,7 @@ 
     $last_modified = 0;
     $return = 0;
     if (is_dir($dir)) {
-        while(($entry = $dir->read()) !== false)
+        while (($entry = $dir->read()) !== false)
         {
             if ($entry != '.' && $entry != '..')
                 continue;
@@ -284,7 +284,7 @@ 
         'props.session_id'
     );
 
-    $visibility_rule = ' props.visibility ' . ($can_see_invisible ? '<> 2' : '= 1');
+    $visibility_rule = ' props.visibility '.($can_see_invisible ? '<> 2' : '= 1');
 
     $sql = "SELECT SUM(table1.size) FROM (
                 SELECT size

main/inc/lib/zombie/zombie_manager.class.php

Spacing +3 added lines, -3 removed lines

@@ -79,7 +79,7 @@ 
         $count = intval($count);
         $from = intval($from);
 
-        $sql .=  " ORDER BY $column $direction";
+        $sql .= " ORDER BY $column $direction";
         $sql .= " LIMIT $count, $from ";
 
         $result = Database::query($sql);
@@ -93,8 +93,8 @@ 
     static function deactivate_zombies($ceiling)
     {
         $zombies = self::list_zombies($ceiling);
-        $ids  = array();
-        foreach($zombies as $zombie) {
+        $ids = array();
+        foreach ($zombies as $zombie) {
             $ids[] = $zombie['user_id'];
         }
         UserManager::deactivate_users($ids);

main/inc/lib/zombie/zombie_report.class.php

Spacing +2 added lines, -2 removed lines

@@ -167,7 +167,7 @@ 
         }
 
         $action = $this->get_action();
-        $f = array($this, 'action_' . $action);
+        $f = array($this, 'action_'.$action);
         if (is_callable($f)) {
             return call_user_func($f, $ids);
         }
@@ -292,7 +292,7 @@ 
             $text = get_lang('No');
         }
 
-        $result = Display::return_icon($image . '.png', $text);
+        $result = Display::return_icon($image.'.png', $text);
         return $result;
     }
 

main/inc/lib/xajax/xajaxCompress.php

Spacing +29 added lines, -29 removed lines

@@ -43,13 +43,13 @@ 
 function xajaxCompressJavascript($sJS)
 {
 	//remove windows cariage returns
-	$sJS = str_replace("\r","",$sJS);
+	$sJS = str_replace("\r", "", $sJS);
 
 	//array to store replaced literal strings
 	$literal_strings = array();
 
 	//explode the string into lines
-	$lines = explode("\n",$sJS);
+	$lines = explode("\n", $sJS);
 	//loop through all the lines, building a new string at the same time as removing literal strings
 	$clean = "";
 	$inComment = false;
@@ -58,22 +58,22 @@ 
 	$escaped = false;
 	$quoteChar = "";
 
-	for($i=0;$i<count($lines);$i++)
+	for ($i = 0; $i < count($lines); $i++)
 	{
 		$line = $lines[$i];
 		$inNormalComment = false;
 
 		//loop through line's characters and take out any literal strings, replace them with ___i___ where i is the index of this string
-		for($j=0;$j<strlen($line);$j++)
+		for ($j = 0; $j < strlen($line); $j++)
 		{
-			$c = substr($line,$j,1);
-			$d = substr($line,$j,2);
+			$c = substr($line, $j, 1);
+			$d = substr($line, $j, 2);
 
 			//look for start of quote
-			if(!$inQuote && !$inComment)
+			if (!$inQuote && !$inComment)
 			{
 				//is this character a quote or a comment
-				if(($c=="\"" || $c=="'") && !$inComment && !$inNormalComment)
+				if (($c == "\"" || $c == "'") && !$inComment && !$inNormalComment)
 				{
 					$inQuote = true;
 					$inComment = false;
@@ -81,7 +81,7 @@ 
 					$quoteChar = $c;
 					$literal = $c;
 				}
-				else if($d=="/*" && !$inNormalComment)
+				else if ($d == "/*" && !$inNormalComment)
 				{
 					$inQuote = false;
 					$inComment = true;
@@ -90,7 +90,7 @@ 
 					$literal = $d;
 					$j++;
 				}
-				else if($d=="//") //ignore string markers that are found inside comments
+				else if ($d == "//") //ignore string markers that are found inside comments
 				{
 					$inNormalComment = true;
 					$clean .= $c;
@@ -102,32 +102,32 @@ 
 			}
 			else //allready in a string so find end quote
 			{
-				if($c == $quoteChar && !$escaped && !$inComment)
+				if ($c == $quoteChar && !$escaped && !$inComment)
 				{
 					$inQuote = false;
 					$literal .= $c;
 
 					//subsitute in a marker for the string
-					$clean .= "___" . count($literal_strings) . "___";
+					$clean .= "___".count($literal_strings)."___";
 
 					//push the string onto our array
-					array_push($literal_strings,$literal);
+					array_push($literal_strings, $literal);
 
 				}
-				else if($inComment && $d=="*/")
+				else if ($inComment && $d == "*/")
 				{
 					$inComment = false;
 					$literal .= $d;
 
 					//subsitute in a marker for the string
-					$clean .= "___" . count($literal_strings) . "___";
+					$clean .= "___".count($literal_strings)."___";
 
 					//push the string onto our array
-					array_push($literal_strings,$literal);
+					array_push($literal_strings, $literal);
 
 					$j++;
 				}
-				else if($c == "\\" && !$escaped)
+				else if ($c == "\\" && !$escaped)
 					$escaped = true;
 				else
 					$escaped = false;
@@ -135,47 +135,47 @@ 
 				$literal .= $c;
 			}
 		}
-		if($inComment) $literal .= "\n";
+		if ($inComment) $literal .= "\n";
 		$clean .= "\n";
 	}
 	//explode the clean string into lines again
-	$lines = explode("\n",$clean);
+	$lines = explode("\n", $clean);
 
 	//now process each line at a time
-	for($i=0;$i<count($lines);$i++)
+	for ($i = 0; $i < count($lines); $i++)
 	{
 		$line = $lines[$i];
 
 		//remove comments
-		$line = preg_replace("/\/\/(.*)/","",$line);
+		$line = preg_replace("/\/\/(.*)/", "", $line);
 
 		//strip leading and trailing whitespace
 		$line = trim($line);
 
 		//remove all whitespace with a single space
-		$line = preg_replace("/\s+/"," ",$line);
+		$line = preg_replace("/\s+/", " ", $line);
 
 		//remove any whitespace that occurs after/before an operator
-		$line = preg_replace("/\s*([!\}\{;,&=\|\-\+\*\/\)\(:])\s*/","\\1",$line);
+		$line = preg_replace("/\s*([!\}\{;,&=\|\-\+\*\/\)\(:])\s*/", "\\1", $line);
 
 		$lines[$i] = $line;
 	}
 
 	//implode the lines
-	$sJS = implode("\n",$lines);
+	$sJS = implode("\n", $lines);
 
 	//make sure there is a max of 1 \n after each line
-	$sJS = preg_replace("/[\n]+/","\n",$sJS);
+	$sJS = preg_replace("/[\n]+/", "\n", $sJS);
 
 	//strip out line breaks that immediately follow a semi-colon
-	$sJS = preg_replace("/;\n/",";",$sJS);
+	$sJS = preg_replace("/;\n/", ";", $sJS);
 
 	//curly brackets aren't on their own
-	$sJS = preg_replace("/[\n]*\{[\n]*/","{",$sJS);
+	$sJS = preg_replace("/[\n]*\{[\n]*/", "{", $sJS);
 
 	//finally loop through and replace all the literal strings:
-	for($i=0;$i<count($literal_strings);$i++)
-		$sJS = str_replace("___".$i."___",$literal_strings[$i],$sJS);
+	for ($i = 0; $i < count($literal_strings); $i++)
+		$sJS = str_replace("___".$i."___", $literal_strings[$i], $sJS);
 
 	return $sJS;
 }

main/inc/lib/text.lib.php

Spacing +74 added lines, -74 removed lines

@@ -58,10 +58,10 @@ 
     if (@preg_match('/(.*<head.*)(<meta[^>]*content=[^>]*>)(.*<\/head>.*)/si', $string, $matches)) {
         $meta = $matches[2];
         if (@preg_match("/(<meta[^>]*charset=)(.*)([\"';][^>]*>)/si", $meta, $matches1)) {
-            $meta = $matches1[1] . $encoding . $matches1[3];
-            $string = $matches[1] . $meta . $matches[3];
+            $meta = $matches1[1].$encoding.$matches1[3];
+            $string = $matches[1].$meta.$matches[3];
         } else {
-            $string = $matches[1] . '<meta http-equiv="Content-Type" content="text/html; charset='.$encoding.'"/>' . $matches[3];
+            $string = $matches[1].'<meta http-equiv="Content-Type" content="text/html; charset='.$encoding.'"/>'.$matches[3];
         }
     } else {
         $count = 1;
@@ -168,9 +168,9 @@ 
     if (!preg_match(_PCRE_XML_ENCODING, $string)) {
         if (strpos($matches[0], 'standalone') !== false) {
             // The encoding option should precede the standalone option, othewise DOMDocument fails to load the document.
-            $replace = str_replace('standalone', ' encoding="'.$to_encoding.'" standalone' , $matches[0]);
+            $replace = str_replace('standalone', ' encoding="'.$to_encoding.'" standalone', $matches[0]);
         } else {
-            $replace = str_replace('?>', ' encoding="'.$to_encoding.'"?>' , $matches[0]);
+            $replace = str_replace('?>', ' encoding="'.$to_encoding.'"?>', $matches[0]);
         }
         return api_convert_encoding(str_replace($matches[0], $replace, $string), $to_encoding, $from_encoding);
     }
@@ -335,7 +335,7 @@ 
 function _make_url_clickable_cb($matches) {
     $url = $matches[2];
 
-    if ( ')' == $matches[3] && strpos( $url, '(' ) ) {
+    if (')' == $matches[3] && strpos($url, '(')) {
         // If the trailing character is a closing parethesis, and the URL has an opening parenthesis in it, add the closing parenthesis to the URL.
         // Then we can let the parenthesis balancer do its thing below.
         $url .= $matches[3];
@@ -345,16 +345,16 @@ 
     }
 
     // Include parentheses in the URL only if paired
-    while ( substr_count( $url, '(' ) < substr_count( $url, ')' ) ) {
-        $suffix = strrchr( $url, ')' ) . $suffix;
-        $url = substr( $url, 0, strrpos( $url, ')' ) );
+    while (substr_count($url, '(') < substr_count($url, ')')) {
+        $suffix = strrchr($url, ')').$suffix;
+        $url = substr($url, 0, strrpos($url, ')'));
     }
 
     $url = esc_url($url);
-    if ( empty($url) )
+    if (empty($url))
         return $matches[0];
 
-    return $matches[1] . "<a href=\"$url\" rel=\"nofollow\">$url</a>" . $suffix;
+    return $matches[1]."<a href=\"$url\" rel=\"nofollow\">$url</a>".$suffix;
 }
 
 /**
@@ -374,10 +374,10 @@ 
  * @param string $_context Private. Use esc_url_raw() for database usage.
  * @return string The cleaned $url after the 'clean_url' filter is applied.
  */
-function esc_url( $url, $protocols = null, $_context = 'display' ) {
+function esc_url($url, $protocols = null, $_context = 'display') {
     //$original_url = $url;
 
-    if ( '' == $url )
+    if ('' == $url)
         return $url;
     $url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%@$\|*\'()\\x80-\\xff]|i', '', $url);
     $strip = array('%0d', '%0a', '%0D', '%0A');
@@ -387,9 +387,9 @@ 
      * presume it needs http:// appended (unless a relative
      * link starting with /, # or ? or a php file).
      */
-    if ( strpos($url, ':') === false && ! in_array( $url[0], array( '/', '#', '?' ) ) &&
-        ! preg_match('/^[a-z0-9-]+?\.php/i', $url) )
-        $url = 'http://' . $url;
+    if (strpos($url, ':') === false && !in_array($url[0], array('/', '#', '?')) &&
+        !preg_match('/^[a-z0-9-]+?\.php/i', $url))
+        $url = 'http://'.$url;
 
     return Security::remove_XSS($url);
 
@@ -437,12 +437,12 @@ 
  * @param string $subject The string being searched and replaced on, otherwise known as the haystack.
  * @return string The string with the replaced svalues.
  */
-function _deep_replace( $search, $subject ) {
+function _deep_replace($search, $subject) {
     $subject = (string) $subject;
 
     $count = 1;
-    while ( $count ) {
-        $subject = str_replace( $search, '', $subject, $count );
+    while ($count) {
+        $subject = str_replace($search, '', $subject, $count);
     }
 
     return $subject;
@@ -464,17 +464,17 @@ 
 function _make_web_ftp_clickable_cb($matches) {
     $ret = '';
     $dest = $matches[2];
-    $dest = 'http://' . $dest;
+    $dest = 'http://'.$dest;
     $dest = esc_url($dest);
-    if ( empty($dest) )
+    if (empty($dest))
         return $matches[0];
 
     // removed trailing [.,;:)] from URL
-    if ( in_array( substr($dest, -1), array('.', ',', ';', ':', ')') ) === true ) {
+    if (in_array(substr($dest, -1), array('.', ',', ';', ':', ')')) === true) {
         $ret = substr($dest, -1);
-        $dest = substr($dest, 0, strlen($dest)-1);
+        $dest = substr($dest, 0, strlen($dest) - 1);
     }
-    return $matches[1] . "<a href=\"$dest\" rel=\"nofollow\">$dest</a>$ret";
+    return $matches[1]."<a href=\"$dest\" rel=\"nofollow\">$dest</a>$ret";
 }
 
 /**
@@ -490,8 +490,8 @@ 
  * @return string HTML A element with email address.
  */
 function _make_email_clickable_cb($matches) {
-    $email = $matches[2] . '@' . $matches[3];
-    return $matches[1] . "<a href=\"mailto:$email\">$email</a>";
+    $email = $matches[2].'@'.$matches[3];
+    return $matches[1]."<a href=\"mailto:$email\">$email</a>";
 }
 
 /**
@@ -505,30 +505,30 @@ 
  * @param string $text Content to convert URIs.
  * @return string Content with converted URIs.
  */
-function make_clickable( $text ) {
+function make_clickable($text) {
     $r = '';
-    $textarr = preg_split( '/(<[^<>]+>)/', $text, -1, PREG_SPLIT_DELIM_CAPTURE ); // split out HTML tags
+    $textarr = preg_split('/(<[^<>]+>)/', $text, -1, PREG_SPLIT_DELIM_CAPTURE); // split out HTML tags
     $nested_code_pre = 0; // Keep track of how many levels link is nested inside <pre> or <code>
-    foreach ( $textarr as $piece ) {
+    foreach ($textarr as $piece) {
 
-        if ( preg_match( '|^<code[\s>]|i', $piece ) || preg_match( '|^<pre[\s>]|i', $piece ) )
+        if (preg_match('|^<code[\s>]|i', $piece) || preg_match('|^<pre[\s>]|i', $piece))
             $nested_code_pre++;
-        elseif ( ( '</code>' === strtolower( $piece ) || '</pre>' === strtolower( $piece ) ) && $nested_code_pre )
+        elseif (('</code>' === strtolower($piece) || '</pre>' === strtolower($piece)) && $nested_code_pre)
             $nested_code_pre--;
 
-        if ( $nested_code_pre || empty( $piece ) || ( $piece[0] === '<' && ! preg_match( '|^<\s*[\w]{1,20}+://|', $piece ) ) ) {
+        if ($nested_code_pre || empty($piece) || ($piece[0] === '<' && !preg_match('|^<\s*[\w]{1,20}+://|', $piece))) {
             $r .= $piece;
             continue;
         }
 
         // Long strings might contain expensive edge cases ...
-        if ( 10000 < strlen( $piece ) ) {
+        if (10000 < strlen($piece)) {
             // ... break it up
-            foreach ( _split_str_by_whitespace( $piece, 2100 ) as $chunk ) { // 2100: Extra room for scheme and leading and trailing paretheses
-                if ( 2101 < strlen( $chunk ) ) {
+            foreach (_split_str_by_whitespace($piece, 2100) as $chunk) { // 2100: Extra room for scheme and leading and trailing paretheses
+                if (2101 < strlen($chunk)) {
                     $r .= $chunk; // Too big, no whitespace: bail.
                 } else {
-                    $r .= make_clickable( $chunk );
+                    $r .= make_clickable($chunk);
                 }
             }
         } else {
@@ -549,18 +549,18 @@ 
 			~xS'; // The regex is a non-anchored pattern and does not have a single fixed starting character.
             // Tell PCRE to spend more time optimizing since, when used on a page load, it will probably be used several times.
 
-            $ret = preg_replace_callback( $url_clickable, '_make_url_clickable_cb', $ret );
+            $ret = preg_replace_callback($url_clickable, '_make_url_clickable_cb', $ret);
 
-            $ret = preg_replace_callback( '#([\s>])((www|ftp)\.[\w\\x80-\\xff\#$%&~/.\-;:=,?@\[\]+]+)#is', '_make_web_ftp_clickable_cb', $ret );
-            $ret = preg_replace_callback( '#([\s>])([.0-9a-z_+-]+)@(([0-9a-z-]+\.)+[0-9a-z]{2,})#i', '_make_email_clickable_cb', $ret );
+            $ret = preg_replace_callback('#([\s>])((www|ftp)\.[\w\\x80-\\xff\#$%&~/.\-;:=,?@\[\]+]+)#is', '_make_web_ftp_clickable_cb', $ret);
+            $ret = preg_replace_callback('#([\s>])([.0-9a-z_+-]+)@(([0-9a-z-]+\.)+[0-9a-z]{2,})#i', '_make_email_clickable_cb', $ret);
 
-            $ret = substr( $ret, 1, -1 ); // Remove our whitespace padding.
+            $ret = substr($ret, 1, -1); // Remove our whitespace padding.
             $r .= $ret;
         }
     }
 
     // Cleanup of accidental links within links
-    $r = preg_replace( '#(<a([ \r\n\t]+[^>]+?>|>))<a [^>]+?>([^>]+?)</a></a>#i', "$1$3</a>", $r );
+    $r = preg_replace('#(<a([ \r\n\t]+[^>]+?>|>))<a [^>]+?>([^>]+?)</a></a>#i', "$1$3</a>", $r);
     return $r;
 }
 
@@ -595,27 +595,27 @@ 
  * @param int $goal The desired chunk length.
  * @return array Numeric array of chunks.
  */
-function _split_str_by_whitespace( $string, $goal ) {
+function _split_str_by_whitespace($string, $goal) {
     $chunks = array();
 
-    $string_nullspace = strtr( $string, "\r\n\t\v\f ", "\000\000\000\000\000\000" );
+    $string_nullspace = strtr($string, "\r\n\t\v\f ", "\000\000\000\000\000\000");
 
-    while ( $goal < strlen( $string_nullspace ) ) {
-        $pos = strrpos( substr( $string_nullspace, 0, $goal + 1 ), "\000" );
+    while ($goal < strlen($string_nullspace)) {
+        $pos = strrpos(substr($string_nullspace, 0, $goal + 1), "\000");
 
-        if ( false === $pos ) {
-            $pos = strpos( $string_nullspace, "\000", $goal + 1 );
-            if ( false === $pos ) {
+        if (false === $pos) {
+            $pos = strpos($string_nullspace, "\000", $goal + 1);
+            if (false === $pos) {
                 break;
             }
         }
 
-        $chunks[] = substr( $string, 0, $pos + 1 );
-        $string = substr( $string, $pos + 1 );
-        $string_nullspace = substr( $string_nullspace, $pos + 1 );
+        $chunks[] = substr($string, 0, $pos + 1);
+        $string = substr($string, $pos + 1);
+        $string_nullspace = substr($string_nullspace, $pos + 1);
     }
 
-    if ( $string ) {
+    if ($string) {
         $chunks[] = $string;
     }
 
@@ -693,7 +693,7 @@ 
  */
 function get_week_from_day($date) {
     if (!empty($date)) {
-       $time = api_strtotime($date,'UTC');
+       $time = api_strtotime($date, 'UTC');
        return date('W', $time);
     } else {
         return date('W');
@@ -710,17 +710,17 @@ 
  * @return a reduce string
  */
 
-function substrwords($text,$maxchar,$end='...')
+function substrwords($text, $maxchar, $end = '...')
 {
-	if(strlen($text)>$maxchar)
+	if (strlen($text) > $maxchar)
 	{
-		$words=explode(" ",$text);
+		$words = explode(" ", $text);
 		$output = '';
-		$i=0;
-		while(1)
+		$i = 0;
+		while (1)
 		{
-			$length = (strlen($output)+strlen($words[$i]));
-			if($length>$maxchar)
+			$length = (strlen($output) + strlen($words[$i]));
+			if ($length > $maxchar)
 			{
 				break;
 			}
@@ -742,7 +742,7 @@ 
 function implode_with_key($glue, $array) {
     if (!empty($array)) {
         $string = '';
-        foreach($array as $key => $value) {
+        foreach ($array as $key => $value) {
             if (empty($value)) {
                 $value = 'null';
             }
@@ -764,13 +764,13 @@ 
 {
     $file_size = intval($file_size);
     if ($file_size >= 1073741824) {
-        $file_size = round($file_size / 1073741824 * 100) / 100 . 'G';
-    } elseif($file_size >= 1048576) {
-        $file_size = round($file_size / 1048576 * 100) / 100 . 'M';
-    } elseif($file_size >= 1024) {
-        $file_size = round($file_size / 1024 * 100) / 100 . 'k';
+        $file_size = round($file_size / 1073741824 * 100) / 100.'G';
+    } elseif ($file_size >= 1048576) {
+        $file_size = round($file_size / 1048576 * 100) / 100.'M';
+    } elseif ($file_size >= 1024) {
+        $file_size = round($file_size / 1024 * 100) / 100.'k';
     } else {
-        $file_size = $file_size . 'B';
+        $file_size = $file_size.'B';
     }
     return $file_size;
 }
@@ -779,18 +779,18 @@ 
 {
     $year	 = '0000';
     $month = $day = $hours = $minutes = $seconds = '00';
-    if (isset($array['Y']) && (isset($array['F']) || isset($array['M']))  && isset($array['d']) && isset($array['H']) && isset($array['i'])) {
+    if (isset($array['Y']) && (isset($array['F']) || isset($array['M'])) && isset($array['d']) && isset($array['H']) && isset($array['i'])) {
         $year = $array['Y'];
-        $month = isset($array['F'])?$array['F']:$array['M'];
-        if (intval($month) < 10 ) $month = '0'.$month;
+        $month = isset($array['F']) ? $array['F'] : $array['M'];
+        if (intval($month) < 10) $month = '0'.$month;
         $day = $array['d'];
-        if (intval($day) < 10 ) $day = '0'.$day;
+        if (intval($day) < 10) $day = '0'.$day;
         $hours = $array['H'];
-        if (intval($hours) < 10 ) $hours = '0'.$hours;
+        if (intval($hours) < 10) $hours = '0'.$hours;
         $minutes = $array['i'];
-        if (intval($minutes) < 10 ) $minutes = '0'.$minutes;
+        if (intval($minutes) < 10) $minutes = '0'.$minutes;
     }
-    if (checkdate($month,$day,$year)) {
+    if (checkdate($month, $day, $year)) {
         $datetime = $year.'-'.$month.'-'.$day.' '.$hours.':'.$minutes.':'.$seconds;
     }
     return $datetime;

main/tracking/toolaccess_details.php

Spacing +28 added lines, -28 removed lines

@@ -23,7 +23,7 @@ 
 
 $nameTools = get_lang('ToolName');
 
-$interbreadcrumb[]= array ("url"=>"courseLog.php", "name"=> "Statistics");
+$interbreadcrumb[] = array("url"=>"courseLog.php", "name"=> "Statistics");
 
 $htmlHeadXtra[] = "<style type='text/css'>
 /*<![CDATA[*/
@@ -40,7 +40,7 @@ 
 td {border-bottom: thin dashed gray;}
 /*]]>*/
 </style>";
-Display::display_header($nameTools,"Tracking");
+Display::display_header($nameTools, "Tracking");
 ?>
 
 <h3>
@@ -59,16 +59,16 @@ 
 // Defining the months of the year to allow translation of the months
 $MonthsShort = api_get_months_short();
 
-$tool=$_REQUEST['tool'];
-$period=$_REQUEST['period'];
-$reqdate=$_REQUEST['reqdate'];
+$tool = $_REQUEST['tool'];
+$period = $_REQUEST['period'];
+$reqdate = $_REQUEST['reqdate'];
 ?>
 <table width="100%" cellpadding="2" cellspacing="0" border="0">
 <?php
     $TABLETRACK_ACCESS = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS);
     $courseId = api_get_course_int_id();
     //stats for the current course
-    if(isset($_cid)) {
+    if (isset($_cid)) {
         // to see stats of one course user must be courseAdmin of this course
         $is_allowedToTrack = $is_courseAdmin;
         $courseCodeEqualcidIfNeeded = "AND c_id = '$courseId'";
@@ -78,7 +78,7 @@ 
         $is_allowedToTrack = $is_platformAdmin;
         $courseCodeEqualcidIfNeeded = "";
     }
-    if( $is_allowedToTrack) {
+    if ($is_allowedToTrack) {
         // list of all tools
         if (!isset($tool)) {
             $sql = "SELECT access_tool, count( access_tool )
@@ -90,7 +90,7 @@ 
             echo "<tr>
                     <td>
                     ";
-            if(isset($_cid)) echo "<b>$_cid : </b>";
+            if (isset($_cid)) echo "<b>$_cid : </b>";
             echo "		<b>".get_lang('ToolList')."</b>
 					</td>
                 </tr>
@@ -108,7 +108,7 @@ 
                 </tr>";
             if (is_array($results))
             {
-                for($j = 0 ; $j < count($results) ; $j++)
+                for ($j = 0; $j < count($results); $j++)
                 {
                         echo "<tr>";
                         echo "<td><a href='toolaccess_details.php?tool=".urlencode($results[$j][0])."'>".get_lang($results[$j][0])."</a></td>";
@@ -131,12 +131,12 @@ 
             $encodedTool = urlencode($tool);
             $tool = urldecode($tool);
 
-            if( !isset($reqdate) )
+            if (!isset($reqdate))
                 $reqdate = time();
             echo "<tr>
                     <td>
 					";
-            if(isset($_cid)) echo "<b>$_cid : </b>";
+            if (isset($_cid)) echo "<b>$_cid : </b>";
             echo "        <b>".get_lang($tool)."</b>
 					</td>
                 </tr>
@@ -145,22 +145,22 @@ 
             /* ------ display ------ */
             // displayed period
             echo "<tr><td>";
-            switch($period)
+            switch ($period)
             {
                 case "month" :
-                    echo $MonthsLong[date("n", $reqdate)-1].date(" Y", $reqdate);
+                    echo $MonthsLong[date("n", $reqdate) - 1].date(" Y", $reqdate);
                     break;
                 case "week" :
-                    $weeklowreqdate = ($reqdate-(86400*date("w" , $reqdate)));
-                    $weekhighreqdate = ($reqdate+(86400*(6-date("w" , $reqdate)) ));
-                    echo "<b>".$langFrom."</b> ".date("d " , $weeklowreqdate).$MonthsLong[date("n", $weeklowreqdate)-1].date(" Y" , $weeklowreqdate);
-                    echo " <b>".$langTo."</b> ".date("d " , $weekhighreqdate ).$MonthsLong[date("n", $weekhighreqdate)-1].date(" Y" , $weekhighreqdate);
+                    $weeklowreqdate = ($reqdate - (86400 * date("w", $reqdate)));
+                    $weekhighreqdate = ($reqdate + (86400 * (6 - date("w", $reqdate))));
+                    echo "<b>".$langFrom."</b> ".date("d ", $weeklowreqdate).$MonthsLong[date("n", $weeklowreqdate) - 1].date(" Y", $weeklowreqdate);
+                    echo " <b>".$langTo."</b> ".date("d ", $weekhighreqdate).$MonthsLong[date("n", $weekhighreqdate) - 1].date(" Y", $weekhighreqdate);
                     break;
                 // default == day
                 default :
                     $period = "day";
                 case "day" :
-                    echo $DaysLong[date("w" , $reqdate)].date(" d " , $reqdate).$MonthsLong[date("n", $reqdate)-1].date(" Y" , $reqdate);
+                    echo $DaysLong[date("w", $reqdate)].date(" d ", $reqdate).$MonthsLong[date("n", $reqdate) - 1].date(" Y", $reqdate);
                     break;
             }
             echo "</tr></td>";
@@ -174,13 +174,13 @@ 
                     &nbsp;&nbsp;&nbsp;||&nbsp;&nbsp;&nbsp;
 
                     ";
-            switch($period)
+            switch ($period)
             {
                 case "month" :
                     // previous and next date must be evaluated
                     // 30 days should be a good approximation
-                    $previousReqDate = mktime(1,1,1,date("m",$reqdate)-1,1,date("Y",$reqdate));
-                    $nextReqDate = mktime(1,1,1,date("m",$reqdate)+1,1,date("Y",$reqdate));
+                    $previousReqDate = mktime(1, 1, 1, date("m", $reqdate) - 1, 1, date("Y", $reqdate));
+                    $nextReqDate = mktime(1, 1, 1, date("m", $reqdate) + 1, 1, date("Y", $reqdate));
                     echo   "
                         [<a href='".api_get_self()."?tool=$encodedTool&period=month&reqdate=$previousReqDate' class='specialLink'>$langPreviousMonth</a>]
                         [<a href='".api_get_self()."?tool=$encodedTool&period=month&reqdate=$nextReqDate' class='specialLink'>$langNextMonth</a>]
@@ -188,8 +188,8 @@ 
                     break;
                 case "week" :
                     // previous and next date must be evaluated
-                    $previousReqDate = $reqdate - 7*86400;
-                    $nextReqDate = $reqdate + 7*86400;
+                    $previousReqDate = $reqdate - 7 * 86400;
+                    $nextReqDate = $reqdate + 7 * 86400;
                     echo   "
                         [<a href='".api_get_self()."?tool=$encodedTool&period=week&reqdate=$previousReqDate' class='specialLink'>$langPreviousWeek</a>]
                         [<a href='".api_get_self()."?tool=$encodedTool&period=week&reqdate=$nextReqDate' class='specialLink'>$langNextWeek</a>]
@@ -213,7 +213,7 @@ 
                 </tr>
             ";
             // display information about this period
-            switch($period)
+            switch ($period)
             {
                 // all days
                 case "month" :
@@ -226,7 +226,7 @@ 
                                 ORDER BY access_date ASC";
 
                     $days_array = StatsUtils::daysTab($sql);
-                    StatsUtils::makeHitsTable($days_array,$langDay);
+                    StatsUtils::makeHitsTable($days_array, $langDay);
                     break;
                 // all days
                 case "week" :
@@ -239,7 +239,7 @@ 
                                 ORDER BY access_date ASC";
 
                     $days_array = StatsUtils::daysTab($sql);
-                    StatsUtils::makeHitsTable($days_array,$langDay);
+                    StatsUtils::makeHitsTable($days_array, $langDay);
                     break;
                 // all hours
                 case "day"  :
@@ -251,8 +251,8 @@ 
                                     AND YEAR(access_date) = YEAR(FROM_UNIXTIME('$reqdate'))
                                 ORDER BY access_date ASC";
 
-                    $hours_array = StatsUtils::hoursTab($sql,$reqdate);
-                    StatsUtils::makeHitsTable($hours_array,$langHour);
+                    $hours_array = StatsUtils::hoursTab($sql, $reqdate);
+                    StatsUtils::makeHitsTable($hours_array, $langHour);
                     break;
             }
         }

main/tracking/logins_details.php

Spacing +25 added lines, -25 removed lines

@@ -75,13 +75,13 @@ 
     // check if uid is tutor of this group
     $courseId = api_get_course_int_id();
 
-    if (( $is_allowedToTrack || $is_allowedToTrackEverybodyInCourse)) {
+    if (($is_allowedToTrack || $is_allowedToTrackEverybodyInCourse)) {
         if ($is_allowedToTrackEverybodyInCourse) {
             $sql = "SELECT u.firstname,u.lastname, u.email
                     FROM $TABLECOURSUSER cu , $TABLEUSER u
                     WHERE
                         cu.user_id = u.user_id AND
-                        cu.relation_type<>" . COURSE_RELATION_TYPE_RRHH . " AND
+                        cu.relation_type<>".COURSE_RELATION_TYPE_RRHH." AND
                         cu.c_id = '$courseId' AND
                         u.user_id = '$uInfo'";
         } else {
@@ -97,21 +97,21 @@ 
             $res[2] == "" ? $res2 = get_lang('NoEmail') : $res2 = Display::encrypted_mailto_link($res[2]);
 
             echo "<tr><td>";
-            echo $informationsAbout . " : <br>";
+            echo $informationsAbout." : <br>";
             echo "<ul>\n"
-            . "<li>" . get_lang('FirstName') . " : " . $res[0] . "</li>\n"
-            . "<li>" . get_lang('LastName') . " : " . $res[1] . "</li>\n"
-            . "<li>" . get_lang('Email') . " : " . $res2 . "</li>\n"
+            . "<li>".get_lang('FirstName')." : ".$res[0]."</li>\n"
+            . "<li>".get_lang('LastName')." : ".$res[1]."</li>\n"
+            . "<li>".get_lang('Email')." : ".$res2."</li>\n"
             . "</ul>";
             echo "</td></tr>";
             /*             * ***** MENU ******* */
             echo "<tr>
                 <td>
-                [<a href='userLog.php?uInfo=$uInfo&view=$view'>" . get_lang('Back') . "</a>]
+                [<a href='userLog.php?uInfo=$uInfo&view=$view'>".get_lang('Back')."</a>]
         ";
             echo "  &nbsp;&nbsp;&nbsp;||&nbsp;&nbsp;&nbsp;
-                [<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=week&reqdate=$reqdate' class='specialLink'>" . get_lang('PeriodWeek') . "</a>]
-                [<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=month&reqdate=$reqdate' class='specialLink'>" . get_lang('PeriodMonth') . "</a>]
+                [<a href='" . api_get_self()."?uInfo=$uInfo&view=$view&period=week&reqdate=$reqdate' class='specialLink'>".get_lang('PeriodWeek')."</a>]
+                [<a href='" . api_get_self()."?uInfo=$uInfo&view=$view&period=month&reqdate=$reqdate' class='specialLink'>".get_lang('PeriodMonth')."</a>]
                 &nbsp;&nbsp;&nbsp;||&nbsp;&nbsp;&nbsp;
         ";
             switch ($period) {
@@ -120,8 +120,8 @@ 
                     $previousReqDate = $reqdate - 7 * 86400;
                     $nextReqDate = $reqdate + 7 * 86400;
                     echo "
-                    [<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=week&reqdate=$previousReqDate' class='specialLink'>" . get_lang('PreviousWeek') . "</a>]
-                    [<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=week&reqdate=$nextReqDate' class='specialLink'>" . get_lang('NextWeek') . "</a>]
+                    [<a href='" . api_get_self()."?uInfo=$uInfo&view=$view&period=week&reqdate=$previousReqDate' class='specialLink'>".get_lang('PreviousWeek')."</a>]
+                    [<a href='" . api_get_self()."?uInfo=$uInfo&view=$view&period=week&reqdate=$nextReqDate' class='specialLink'>".get_lang('NextWeek')."</a>]
                 ";
                     break;
                 default :
@@ -132,8 +132,8 @@ 
                     $previousReqDate = mktime(1, 1, 1, date("m", $reqdate) - 1, 1, date("Y", $reqdate));
                     $nextReqDate = mktime(1, 1, 1, date("m", $reqdate) + 1, 1, date("Y", $reqdate));
                     echo "
-                    [<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=month&reqdate=$previousReqDate' class='specialLink'>" . get_lang('PreviousMonth') . "</a>]
-                    [<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=month&reqdate=$nextReqDate' class='specialLink'>" . get_lang('NextMonth') . "</a>]
+                    [<a href='" . api_get_self()."?uInfo=$uInfo&view=$view&period=month&reqdate=$previousReqDate' class='specialLink'>".get_lang('PreviousMonth')."</a>]
+                    [<a href='" . api_get_self()."?uInfo=$uInfo&view=$view&period=month&reqdate=$nextReqDate' class='specialLink'>".get_lang('NextMonth')."</a>]
                 ";
                     break;
             }
@@ -153,7 +153,7 @@ 
                         AND YEAR(access_date) = YEAR(FROM_UNIXTIME('$reqdate'))
                         GROUP BY DAYOFMONTH(access_date)
                         ORDER BY access_date ASC";
-                $displayedDate = $MonthsLong[date("n", $reqdate) - 1] . date(" Y", $reqdate);
+                $displayedDate = $MonthsLong[date("n", $reqdate) - 1].date(" Y", $reqdate);
                 break;
             case "week" :
                 $sql = "SELECT access_date
@@ -165,24 +165,24 @@ 
                         GROUP BY DAYOFMONTH(access_date)
                         ORDER BY access_date ASC";
                 $weeklowreqdate = ($reqdate - (86400 * date("w", $reqdate)));
-                $weekhighreqdate = ($reqdate + (86400 * (6 - date("w", $reqdate)) ));
-                $displayedDate = get_lang('From') . " " . date("d ", $weeklowreqdate) . $MonthsLong[date("n", $weeklowreqdate) - 1] . date(" Y", $weeklowreqdate)
-                        . " " . get_lang('To') . " " . date("d ", $weekhighreqdate) . $MonthsLong[date("n", $weekhighreqdate) - 1] . date(" Y", $weekhighreqdate);
+                $weekhighreqdate = ($reqdate + (86400 * (6 - date("w", $reqdate))));
+                $displayedDate = get_lang('From')." ".date("d ", $weeklowreqdate).$MonthsLong[date("n", $weeklowreqdate) - 1].date(" Y", $weeklowreqdate)
+                        . " ".get_lang('To')." ".date("d ", $weekhighreqdate).$MonthsLong[date("n", $weekhighreqdate) - 1].date(" Y", $weekhighreqdate);
                 break;
         }
         echo "<tr><td>";
         $results = StatsUtils::getManyResults1Col($sql);
         /*             * * display of the displayed period  ** */
         echo "<table width='100%' cellpadding='2' cellspacing='1' border='0' align=center>";
-        echo "<td bgcolor='#E6E6E6'>" . $displayedDate . "</td>";
+        echo "<td bgcolor='#E6E6E6'>".$displayedDate."</td>";
         if (is_array($results)) {
             for ($j = 0; $j < sizeof($results); $j++) {
                 $beautifulDateTime = api_convert_and_format_date($results[$j], null, date_default_timezone_get());
                 echo "<tr>";
-                echo "<td style='padding-left : 40px;' valign='top'>" . $beautifulDateTime . "</td>";
+                echo "<td style='padding-left : 40px;' valign='top'>".$beautifulDateTime."</td>";
                 echo"</tr>";
                 // $limit is used to select only results between $results[$j] (current login) and next one
-                if ($j == ( sizeof($results) - 1 ))
+                if ($j == (sizeof($results) - 1))
                     $limit = date("Y-m-d H:i:s", $nextReqDate);
                 else
                     $limit = $results[$j + 1];
@@ -192,8 +192,8 @@ 
                         FROM $TABLETRACK_ACCESS
                         WHERE access_user_id = $uInfo
                             AND access_tool IS NOT NULL
-                            AND access_date > '" . $results[$j] . "'
-                            AND access_date < '" . $limit . "'
+                            AND access_date > '".$results[$j]."'
+                            AND access_date < '" . $limit."'
                             AND c_id = $courseId
                         GROUP BY access_tool
                         ORDER BY access_tool ASC";
@@ -204,8 +204,8 @@ 
                     echo "<table width='50%' cellpadding='0' cellspacing='0' border='0'>\n";
                     for ($k = 0; $k < count($results2); $k++) {
                         echo "<tr>\n";
-                        echo "<td width='70%' style='padding-left : 60px;'>" . get_lang($results2[$k][0]) . "</td>\n";
-                        echo "<td width='30%' align='right' style='padding-right : 40px'>" . $results2[$k][1] . " " . get_lang('Visits') . "</td>\n";
+                        echo "<td width='70%' style='padding-left : 60px;'>".get_lang($results2[$k][0])."</td>\n";
+                        echo "<td width='30%' align='right' style='padding-right : 40px'>".$results2[$k][1]." ".get_lang('Visits')."</td>\n";
                         echo "</tr>";
                     }
                     echo "</table>\n";
@@ -215,7 +215,7 @@ 
             }
         } else {
             echo "<tr>";
-            echo "<td colspan='2' bgcolor='#eeeeee'>" . get_lang('NoResult') . "</td>";
+            echo "<td colspan='2' bgcolor='#eeeeee'>".get_lang('NoResult')."</td>";
             echo "</tr>";
         }
         echo "</table>";

main/tracking/course_log_groups.php

Spacing +2 added lines, -2 removed lines

@@ -98,7 +98,7 @@ 
 
 $action_links = '
 function action_formatter(cellvalue, options, rowObject) {
-    return \'<a href="course_log_tools.php?id_session=0&cidReq='.$course_code.'&gidReq=\'+options.rowId+\'">'.Display::return_icon('2rightarrow.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>'.
+    return \'<a href="course_log_tools.php?id_session=0&cidReq='.$course_code.'&gidReq=\'+options.rowId+\'">'.Display::return_icon('2rightarrow.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>'.
     '\';
 }';
 
@@ -108,7 +108,7 @@ 
 $htmlHeadXtra[] = '
 <script>
 $(function() {
-    '.Display::grid_js('group_users',$url, $columns, $column_model, $extra_params, array(), $action_links, true).'
+    '.Display::grid_js('group_users', $url, $columns, $column_model, $extra_params, array(), $action_links, true).'
 });
 </script>';
 

main/tracking/exams.php

Spacing +19 added lines, -19 removed lines

@@ -81,7 +81,7 @@ 
 
 if (!$exportToXLS) {
     Display :: display_header(get_lang('Reporting'));
-    $actionsLeft = $actionsRight ='';
+    $actionsLeft = $actionsRight = '';
     if ($global) {
 
         $actionsLeft .= '<a href="'.api_get_path(WEB_CODE_PATH).'auth/my_progress.php">'.
@@ -98,9 +98,9 @@ 
         }
 
         $actionsRight .= '<a href="'.api_get_self().'?export=1&score='.$filter_score.'&exercise_id='.$exerciseId.'&'.$courseLink.'">'.
-            Display::return_icon('export_excel.png',get_lang('ExportAsXLS'),'',ICON_SIZE_MEDIUM).'</a>';
+            Display::return_icon('export_excel.png', get_lang('ExportAsXLS'), '', ICON_SIZE_MEDIUM).'</a>';
         $actionsRight .= '<a href="javascript: void(0);" onclick="javascript: window.print()">'.
-            Display::return_icon('printer.png',get_lang('Print'),'',ICON_SIZE_MEDIUM).'</a>';
+            Display::return_icon('printer.png', get_lang('Print'), '', ICON_SIZE_MEDIUM).'</a>';
         
 
         $menuItems[] = Display::url(
@@ -147,7 +147,7 @@ 
     }
     
     
-    $toolbar = Display::toolbarAction('toolbar-exams', $content = array( 0 => $actionsLeft, 1 => $actionsRight ));
+    $toolbar = Display::toolbarAction('toolbar-exams', $content = array(0 => $actionsLeft, 1 => $actionsRight));
     echo $toolbar;
 
     $form->display();
@@ -207,7 +207,7 @@ 
             $countExercises = Database::store_result($result);
             $exerciseSessionCount = $countExercises[0]['count'];
 
-            $exerciseCount =  $exerciseCount + $exerciseCount * count($newSessionList) + $exerciseSessionCount;
+            $exerciseCount = $exerciseCount + $exerciseCount * count($newSessionList) + $exerciseSessionCount;
 
             // Add course and session list.
             if ($exerciseCount == 0) {
@@ -424,7 +424,7 @@ 
         $column++;
         $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('ExamNotTaken'));
         $column++;
-        $worksheet->SetCellValueByColumnAndRow($line, $column, sprintf(get_lang('ExamPassX'), $filter_score) . '%');
+        $worksheet->SetCellValueByColumnAndRow($line, $column, sprintf(get_lang('ExamPassX'), $filter_score).'%');
         $column++;
         $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('ExamFail'));
         $column++;
@@ -442,15 +442,15 @@ 
         }
         $line++;
     } else {
-        $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('Exercises'));
+        $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Exercises'));
         $column++;
-        $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('User'));
+        $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('User'));
         $column++;
-        $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('Percentage'));
+        $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Percentage'));
         $column++;
-        $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('Status'));
+        $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Status'));
         $column++;
-        $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('Attempts'));
+        $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Attempts'));
         $column++;
         $line++;
         foreach ($array as $row) {
@@ -601,10 +601,10 @@ 
         $percentageScore = 0;
 
         if ($weighting != 0) {
-            $percentageScore = round(($score*100)/$weighting);
+            $percentageScore = round(($score * 100) / $weighting);
         }
 
-        if ($attempts['count'] > 0 ) {
+        if ($attempts['count'] > 0) {
             $taken++;
         }
 
@@ -647,7 +647,7 @@ 
             } else {
                 $score = '-';
                 $userRow .= '<td>';
-                $userRow .=  '-';
+                $userRow .= '-';
                 $tempArray[] = '-';
                 $userRow .= '</td>';
 
@@ -701,13 +701,13 @@ 
         // Exam taken
         $html .= '<td>';
         $html .= $taken;
-        $globalRow[]= $taken;
+        $globalRow[] = $taken;
         $html .= '</td>';
 
         // Exam NOT taken
         $html .= '<td>';
         $html .= $not_taken = $totalStudents - $taken;
-        $globalRow[]= $not_taken;
+        $globalRow[] = $not_taken;
         $html .= '</td>';
 
         // Exam pass
@@ -718,19 +718,19 @@ 
         }
 
         $html .= $total_with_parameter_score;
-        $globalRow[]= $total_with_parameter_score;
+        $globalRow[] = $total_with_parameter_score;
         $html .= '</td>';
 
         // Exam fail
         $html .= '<td>';
 
         $html .= $fail = $taken - $total_with_parameter_score;
-        $globalRow[]= $fail;
+        $globalRow[] = $fail;
         $html .= '</td>';
 
         $html .= '<td>';
         $html .= $totalStudents;
-        $globalRow[]= $totalStudents;
+        $globalRow[] = $totalStudents;
 
         $html .= '</td>';