Inspection of "Revert "Bootstrap Cache version issue"" - chamilo/chamilo-lms - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — 1.11.x (#1223)

by José

created 2016-06-09 14:31 UTC

Status

Spacing +23 added lines, -23 removed lines patch added patch discarded remove patch

@@ -9,10 +9,10 @@  discard block
 block discarded – undo
  * Code
  */
 // Diffie-Hellman Key Exchange Default Value.
-define('OPENID_DH_DEFAULT_MOD', '155172898181473697471232257763715539915724801' .
-        '966915404479707795314057629378541917580651227423698188993727816152646631' .
-        '438561595825688188889951272158842675419950341258706556549803580104870537' .
-        '681476726513255747040765857479291291572334510643245094715007229621094194' .
+define('OPENID_DH_DEFAULT_MOD', '155172898181473697471232257763715539915724801'.
+        '966915404479707795314057629378541917580651227423698188993727816152646631'.
+        '438561595825688188889951272158842675419950341258706556549803580104870537'.
+        '681476726513255747040765857479291291572334510643245094715007229621094194'.
         '349783925984760375594985848253359305585439638443');
 
 // Constants for Diffie-Hellman key exchange computations.
@@ -32,10 +32,10 @@  discard block
 block discarded – undo
 function openid_redirect_http($url, $message) {
     $query = array();
     foreach ($message as $key => $val) {
-        $query[] = $key . '=' . urlencode($val);
+        $query[] = $key.'='.urlencode($val);
     }
     $sep = (strpos($url, '?') === FALSE) ? '?' : '&';
-    header('Location: ' . $url . $sep . implode('&', $query), TRUE, 302);
+    header('Location: '.$url.$sep.implode('&', $query), TRUE, 302);
     //exit;
 }
 
@@ -44,12 +44,12 @@  discard block
 block discarded – undo
  * This function should be deprecated for 1.8.6.2 needs documentation
  */
 function openid_redirect($url, $message) {
-    $output = '<html><head><title>' . get_lang('OpenIDRedirect') . "</title></head>\n<body>";
-    $output .= '<form method="post" action="' . $url . '" id="openid-redirect-form">';
+    $output = '<html><head><title>'.get_lang('OpenIDRedirect')."</title></head>\n<body>";
+    $output .= '<form method="post" action="'.$url.'" id="openid-redirect-form">';
     foreach ($message as $key => $value) {
-        $output .='<input type="hidden" name="' . $key . '" value="' . $value . '">';
+        $output .= '<input type="hidden" name="'.$key.'" value="'.$value.'">';
     }
-    $output .= '<noscript><input type="submit" name="submit" value="' . get_lang('Send') . '"/></noscript>';
+    $output .= '<noscript><input type="submit" name="submit" value="'.get_lang('Send').'"/></noscript>';
     $output .= '</form>';
     $output .= '<script type="text/javascript">document.getElementById("openid-redirect-form").submit();</script>';
     $output .= "</body></html>";
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
     $normalized_url = $url;
 
     if (stristr($url, '://') === FALSE) {
-        $normalized_url = 'http://' . $url;
+        $normalized_url = 'http://'.$url;
     }
 
     if (substr_count($normalized_url, '/') < 3) {
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
             if ($encoded_message != '') {
                 $encoded_message .= '&';
             }
-            $encoded_message .= rawurlencode(trim($parts[0])) . '=' . rawurlencode(trim($parts[1]));
+            $encoded_message .= rawurlencode(trim($parts[0])).'='.rawurlencode(trim($parts[1]));
         }
     }
 
@@ -164,10 +164,10 @@  discard block
 block discarded – undo
  */
 function _openid_nonce() {
     // YYYY-MM-DDThh:mm:ssTZD UTC, plus some optional extra unique chars
-    return gmstrftime('%Y-%m-%dT%H:%M:%S%Z') .
-            chr(mt_rand(0, 25) + 65) .
-            chr(mt_rand(0, 25) + 65) .
-            chr(mt_rand(0, 25) + 65) .
+    return gmstrftime('%Y-%m-%dT%H:%M:%S%Z').
+            chr(mt_rand(0, 25) + 65).
+            chr(mt_rand(0, 25) + 65).
+            chr(mt_rand(0, 25) + 65).
             chr(mt_rand(0, 25) + 65);
 }
 
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
  */
 function _openid_link_href($rel, $html) {
     $rel = preg_quote($rel);
-    preg_match('|<link\s+rel=["\'](.*)' . $rel . '(.*)["\'](.*)/?>|iU', $html, $matches);
+    preg_match('|<link\s+rel=["\'](.*)'.$rel.'(.*)["\'](.*)/?>|iU', $html, $matches);
     if (isset($matches[3])) {
         preg_match('|href=["\']([^"]+)["\']|iU', $matches[0], $href);
         return trim($href[1]);
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
  * Pull the http-equiv attribute out of an html meta element
  */
 function _openid_meta_httpequiv($equiv, $html) {
-    preg_match('|<meta\s+http-equiv=["\']' . $equiv . '["\'](.*)/?>|iU', $html, $matches);
+    preg_match('|<meta\s+http-equiv=["\']'.$equiv.'["\'](.*)/?>|iU', $html, $matches);
     if (isset($matches[1])) {
         preg_match('|content=["\']([^"]+)["\']|iU', $matches[1], $content);
         return $content[1];
@@ -209,8 +209,8 @@  discard block
 block discarded – undo
     $sign_data = array();
 
     foreach ($keys_to_sign as $key) {
-        if (isset($message_array['openid.' . $key])) {
-            $sign_data[$key] = $message_array['openid.' . $key];
+        if (isset($message_array['openid.'.$key])) {
+            $sign_data[$key] = $message_array['openid.'.$key];
         }
     }
 
@@ -229,8 +229,8 @@  discard block
 block discarded – undo
     $key = str_pad($key, OPENID_SHA1_BLOCKSIZE, chr(0x00));
     $ipad = str_repeat(chr(0x36), OPENID_SHA1_BLOCKSIZE);
     $opad = str_repeat(chr(0x5c), OPENID_SHA1_BLOCKSIZE);
-    $hash1 = _openid_sha1(($key ^ $ipad) . $text, true);
-    $hmac = _openid_sha1(($key ^ $opad) . $hash1, true);
+    $hash1 = _openid_sha1(($key ^ $ipad).$text, true);
+    $hmac = _openid_sha1(($key ^ $opad).$hash1, true);
 
     return $hmac;
 }
@@ -337,7 +337,7 @@  discard block
 block discarded – undo
     }
 
     do {
-        $bytes = "\x00" . _openid_get_bytes($nbytes);
+        $bytes = "\x00"._openid_get_bytes($nbytes);
         $n = _openid_dh_binary_to_long($bytes);
         // Keep looping if this value is in the low duplicated range.
     } while (bccomp($n, $duplicate) < 0);

Please login to merge, or discard this patch.

main/auth/set_temp_password.php 1 patch

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

@@ -11,7 +11,7 @@
 block discarded – undo
 $cidReset = true;
 require_once '../inc/global.inc.php';
 $this_section = SECTION_COURSES;
-$course_id = isset($_GET['course_id'])  ? intval($_GET['course_id']) : null;
+$course_id = isset($_GET['course_id']) ? intval($_GET['course_id']) : null;
 $session_id = isset($_GET['session_id']) ? intval($_GET['session_id']) : null;
 $user_id = api_get_user_id();
 

Please login to merge, or discard this patch.

main/auth/cas/logout.php 1 patch

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

@@ -9,5 +9,5 @@
 block discarded – undo
 require_once('authcas.php');
 global $cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri;
 
-phpCAS::client($cas_auth_ver,$cas_auth_server,$cas_auth_port,$cas_auth_uri);
+phpCAS::client($cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri);
 phpCAS::logout();

Please login to merge, or discard this patch.

main/auth/cas/logincas.php 1 patch

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

@@ -39,7 +39,7 @@
 block discarded – undo
         $firstpage = $_GET['firstpage'];
         setcookie("GotoCourse", $firstpage);
     }
-    if (!is_object($PHPCAS_CLIENT) ) {
+    if (!is_object($PHPCAS_CLIENT)) {
         phpCAS::client(
             $cas_auth_ver,
             $cas_auth_server,

Please login to merge, or discard this patch.

main/auth/cas/lib/CAS/PGTStorage/pgt-file.php 1 patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

@@ -131,17 +131,17 @@  discard block
 block discarded – undo
    *
    * @public
    */
-  function PGTStorageFile($cas_parent,$format,$path)
+  function PGTStorageFile($cas_parent, $format, $path)
     {
       phpCAS::traceBegin();
       // call the ancestor's constructor
       $this->PGTStorage($cas_parent);
 
-      if (empty($format) ) $format = CAS_PGT_STORAGE_FILE_DEFAULT_FORMAT;
-      if (empty($path) ) $path = CAS_PGT_STORAGE_FILE_DEFAULT_PATH;
+      if (empty($format)) $format = CAS_PGT_STORAGE_FILE_DEFAULT_FORMAT;
+      if (empty($path)) $path = CAS_PGT_STORAGE_FILE_DEFAULT_PATH;
 
       // check that the path is an absolute path
-      if (getenv("OS")=="Windows_NT"){
+      if (getenv("OS") == "Windows_NT") {
       	
       	 if (!preg_match('`^[a-zA-Z]:`', $path)) {
 	     	phpCAS::error('an absolute path is needed for PGT storage to file');
@@ -151,13 +151,13 @@  discard block
 block discarded – undo
       else
       {
       
-      	if ( $path[0] != '/' ) {
+      	if ($path[0] != '/') {
 			phpCAS::error('an absolute path is needed for PGT storage to file');
       	}
 
       	// store the path (with a leading and trailing '/')      
-      	$path = preg_replace('|[/]*$|','/',$path);
-      	$path = preg_replace('|^[/]*|','/',$path);
+      	$path = preg_replace('|[/]*$|', '/', $path);
+      	$path = preg_replace('|^[/]*|', '/', $path);
       }
       
       $this->_path = $path;
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
     {
       phpCAS::traceBegin();
       // if the storage has already been initialized, return immediatly
-      if ( $this->isInitialized() )
+      if ($this->isInitialized())
 	return;
       // call the ancestor's method (mark as initialized)
       parent::init();
@@ -222,12 +222,12 @@  discard block
 block discarded – undo
    *
    * @public
    */
-  function write($pgt,$pgt_iou)
+  function write($pgt, $pgt_iou)
     {
       phpCAS::traceBegin();
       $fname = $this->getPGTIouFilename($pgt_iou);
-      if ( $f=fopen($fname,"w") ) {
-	if ( fputs($f,$pgt) === FALSE ) {
+      if ($f = fopen($fname, "w")) {
+	if (fputs($f, $pgt) === FALSE) {
 	  phpCAS::error('could not write PGT to `'.$fname.'\'');
 	}
 	fclose($f);
@@ -252,10 +252,10 @@  discard block
 block discarded – undo
       phpCAS::traceBegin();
       $pgt = FALSE;
       $fname = $this->getPGTIouFilename($pgt_iou);
-      if ( !($f=fopen($fname,"r")) ) {
+      if (!($f = fopen($fname, "r"))) {
 	phpCAS::trace('could not open `'.$fname.'\'');
       } else {
-	if ( ($pgt=fgets($f)) === FALSE ) {
+	if (($pgt = fgets($f)) === FALSE) {
 	  phpCAS::trace('could not read PGT from `'.$fname.'\'');
 	} 
 	fclose($f);

Please login to merge, or discard this patch.

main/auth/cas/lib/CAS/PGTStorage/pgt-db.php 1 patch

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

@@ -57,7 +57,7 @@  discard block
 block discarded – undo
    * @hideinitializer
    * @private
    */
-  var $_url='';
+  var $_url = '';
 
   /**
    * This method returns the PEAR DB URL to use to connect to the database.
@@ -159,18 +159,18 @@  discard block
 block discarded – undo
    *
    * @public
    */
-  function PGTStorageDB($cas_parent,$user,$password,$database_type,$hostname,$port,$database,$table)
+  function PGTStorageDB($cas_parent, $user, $password, $database_type, $hostname, $port, $database, $table)
     {
       phpCAS::traceBegin();
 
       // call the ancestor's constructor
       $this->PGTStorage($cas_parent);
 
-      if ( empty($database_type) ) $database_type = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE_TYPE;
-      if ( empty($hostname) ) $hostname = CAS_PGT_STORAGE_DB_DEFAULT_HOSTNAME;
-      if ( $port==0 ) $port = CAS_PGT_STORAGE_DB_DEFAULT_PORT;
-      if ( empty($database) ) $database = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE;
-      if ( empty($table) ) $table = CAS_PGT_STORAGE_DB_DEFAULT_TABLE;
+      if (empty($database_type)) $database_type = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE_TYPE;
+      if (empty($hostname)) $hostname = CAS_PGT_STORAGE_DB_DEFAULT_HOSTNAME;
+      if ($port == 0) $port = CAS_PGT_STORAGE_DB_DEFAULT_PORT;
+      if (empty($database)) $database = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE;
+      if (empty($table)) $table = CAS_PGT_STORAGE_DB_DEFAULT_TABLE;
 
       // build and store the PEAR DB URL
       $this->_url = $database_type.':'.'//'.$user.':'.$password.'@'.$hostname.':'.$port.'/'.$database;
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
     {
       phpCAS::traceBegin();
       // if the storage has already been initialized, return immediatly
-      if ( $this->isInitialized() )
+      if ($this->isInitialized())
 		return;
       // call the ancestor's method (mark as initialized)
       parent::init();
@@ -205,7 +205,7 @@  discard block
 block discarded – undo
 
       // try to connect to the database
       $this->_link = DB::connect($this->getURL());
-      if ( DB::isError($this->_link) ) {
+      if (DB::isError($this->_link)) {
 	phpCAS::error('could not connect to database ('.DB::errorMessage($this->_link).')');
       }
       var_dump($this->_link);

Please login to merge, or discard this patch.

main/auth/cas/lib/CAS/PGTStorage/pgt-main.php 1 patch

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

@@ -63,7 +63,7 @@  discard block
 block discarded – undo
   function PGTStorage($cas_parent)
     {
       phpCAS::traceBegin();
-      if ( !$cas_parent->isProxy() ) {
+      if (!$cas_parent->isProxy()) {
 	phpCAS::error('defining PGT storage makes no sense when not using a CAS proxy'); 
       }
       phpCAS::traceEnd();
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
    * @private
    * @deprecated not used.
    */
-  var $_error_message=FALSE;
+  var $_error_message = FALSE;
 
   /**
    * This method sets en error message, which can be read later by 
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
    *
    * @protected
    */
-  function write($pgt,$pgt_iou)
+  function write($pgt, $pgt_iou)
     {
       phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); 
     }

Please login to merge, or discard this patch.

main/auth/cas/lib/CAS/languages/languages.php 1 patch

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

@@ -12,13 +12,13 @@
 block discarded – undo
 /**
  * a phpCAS string index
  */
-define("CAS_STR_USING_SERVER",                1);
-define("CAS_STR_AUTHENTICATION_WANTED",       2);
-define("CAS_STR_LOGOUT",                      3);
+define("CAS_STR_USING_SERVER", 1);
+define("CAS_STR_AUTHENTICATION_WANTED", 2);
+define("CAS_STR_LOGOUT", 3);
 define("CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED", 4);
-define("CAS_STR_AUTHENTICATION_FAILED",       5);
-define("CAS_STR_YOU_WERE_NOT_AUTHENTICATED",  6);
-define("CAS_STR_SERVICE_UNAVAILABLE",         7);
+define("CAS_STR_AUTHENTICATION_FAILED", 5);
+define("CAS_STR_YOU_WERE_NOT_AUTHENTICATED", 6);
+define("CAS_STR_SERVICE_UNAVAILABLE", 7);
 //@}
 
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

main/auth/courses.php 1 patch

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

@@ -203,7 +203,7 @@  discard block
 block discarded – undo
                 $limit
             );
         } else {
-            header('Location: ' . api_get_self());
+            header('Location: '.api_get_self());
         }
         break;
     case 'display_random_courses':
@@ -278,7 +278,7 @@  discard block
 block discarded – undo
                 $continueWithSubscription = SequenceResourceManager::checkSequenceAreCompleted($requirementsData);
 
                 if (!$continueWithSubscription) {
-                    header('Location: ' .  api_get_path(WEB_CODE_PATH) . 'auth/courses.php');
+                    header('Location: '.api_get_path(WEB_CODE_PATH).'auth/courses.php');
                     exit;
                 }
             }
@@ -296,16 +296,16 @@  discard block
 block discarded – undo
 
             if ($count <= 0) {
                 // no course in session -> return to catalog
-                $url = api_get_path(WEB_CODE_PATH) . 'auth/courses.php';
+                $url = api_get_path(WEB_CODE_PATH).'auth/courses.php';
             } elseif ($count == 1) {
                 // only one course, so redirect directly to this course
                 foreach ($coursesList as $course) {
-                    $url = api_get_path(WEB_COURSE_PATH) . $course['directory'] . '/index.php?id_session=' . intval($_GET['session_id']);
+                    $url = api_get_path(WEB_COURSE_PATH).$course['directory'].'/index.php?id_session='.intval($_GET['session_id']);
                 }
             } else {
-                $url = api_get_path(WEB_CODE_PATH) . 'session/index.php?session_id=' . intval($_GET['session_id']);
+                $url = api_get_path(WEB_CODE_PATH).'session/index.php?session_id='.intval($_GET['session_id']);
             }
-            header('Location: ' . $url);
+            header('Location: '.$url);
             exit;
         }
         //else show error message?

Please login to merge, or discard this patch.

		@@ -9,10 +9,10 @@ discard block
		block discarded – undo
9	9	* Code
10	10	*/
11	11	// Diffie-Hellman Key Exchange Default Value.
12		-define('OPENID_DH_DEFAULT_MOD', '155172898181473697471232257763715539915724801' .
13		- '966915404479707795314057629378541917580651227423698188993727816152646631' .
14		- '438561595825688188889951272158842675419950341258706556549803580104870537' .
15		- '681476726513255747040765857479291291572334510643245094715007229621094194' .
	12	+define('OPENID_DH_DEFAULT_MOD', '155172898181473697471232257763715539915724801'.
	13	+ '966915404479707795314057629378541917580651227423698188993727816152646631'.
	14	+ '438561595825688188889951272158842675419950341258706556549803580104870537'.
	15	+ '681476726513255747040765857479291291572334510643245094715007229621094194'.
16	16	'349783925984760375594985848253359305585439638443');
17	17
18	18	// Constants for Diffie-Hellman key exchange computations.
		@@ -32,10 +32,10 @@ discard block
		block discarded – undo
32	32	function openid_redirect_http($url, $message) {
33	33	$query = array();
34	34	foreach ($message as $key => $val) {
35		- $query[] = $key . '=' . urlencode($val);
	35	+ $query[] = $key.'='.urlencode($val);
36	36	}
37	37	$sep = (strpos($url, '?') === FALSE) ? '?' : '&';
38		- header('Location: ' . $url . $sep . implode('&', $query), TRUE, 302);
	38	+ header('Location: '.$url.$sep.implode('&', $query), TRUE, 302);
39	39	//exit;
40	40	}
41	41
		@@ -44,12 +44,12 @@ discard block
		block discarded – undo
44	44	* This function should be deprecated for 1.8.6.2 needs documentation
45	45	*/
46	46	function openid_redirect($url, $message) {
47		- $output = '<html><head><title>' . get_lang('OpenIDRedirect') . "</title></head>\n<body>";
48		- $output .= '<form method="post" action="' . $url . '" id="openid-redirect-form">';
	47	+ $output = '<html><head><title>'.get_lang('OpenIDRedirect')."</title></head>\n<body>";
	48	+ $output .= '<form method="post" action="'.$url.'" id="openid-redirect-form">';
49	49	foreach ($message as $key => $value) {
50		- $output .='<input type="hidden" name="' . $key . '" value="' . $value . '">';
	50	+ $output .= '<input type="hidden" name="'.$key.'" value="'.$value.'">';
51	51	}
52		- $output .= '<noscript><input type="submit" name="submit" value="' . get_lang('Send') . '"/></noscript>';
	52	+ $output .= '<noscript><input type="submit" name="submit" value="'.get_lang('Send').'"/></noscript>';
53	53	$output .= '</form>';
54	54	$output .= '<script type="text/javascript">document.getElementById("openid-redirect-form").submit();</script>';
55	55	$output .= "</body></html>";
		@@ -94,7 +94,7 @@ discard block
		block discarded – undo
94	94	$normalized_url = $url;
95	95
96	96	if (stristr($url, '://') === FALSE) {
97		- $normalized_url = 'http://' . $url;
	97	+ $normalized_url = 'http://'.$url;
98	98	}
99	99
100	100	if (substr_count($normalized_url, '/') < 3) {
		@@ -133,7 +133,7 @@ discard block
		block discarded – undo
133	133	if ($encoded_message != '') {
134	134	$encoded_message .= '&';
135	135	}
136		- $encoded_message .= rawurlencode(trim($parts[0])) . '=' . rawurlencode(trim($parts[1]));
	136	+ $encoded_message .= rawurlencode(trim($parts[0])).'='.rawurlencode(trim($parts[1]));
137	137	}
138	138	}
139	139
		@@ -164,10 +164,10 @@ discard block
		block discarded – undo
164	164	*/
165	165	function _openid_nonce() {
166	166	// YYYY-MM-DDThh:mm:ssTZD UTC, plus some optional extra unique chars
167		- return gmstrftime('%Y-%m-%dT%H:%M:%S%Z') .
168		- chr(mt_rand(0, 25) + 65) .
169		- chr(mt_rand(0, 25) + 65) .
170		- chr(mt_rand(0, 25) + 65) .
	167	+ return gmstrftime('%Y-%m-%dT%H:%M:%S%Z').
	168	+ chr(mt_rand(0, 25) + 65).
	169	+ chr(mt_rand(0, 25) + 65).
	170	+ chr(mt_rand(0, 25) + 65).
171	171	chr(mt_rand(0, 25) + 65);
172	172	}
173	173
		@@ -176,7 +176,7 @@ discard block
		block discarded – undo
176	176	*/
177	177	function _openid_link_href($rel, $html) {
178	178	$rel = preg_quote($rel);
179		- preg_match('\|<link\s+rel=["\'](.)' . $rel . '(.)["\'](.*)/?>\|iU', $html, $matches);
	179	+ preg_match('\|<link\s+rel=["\'](.)'.$rel.'(.)["\'](.*)/?>\|iU', $html, $matches);
180	180	if (isset($matches[3])) {
181	181	preg_match('\|href=["\']([^"]+)["\']\|iU', $matches[0], $href);
182	182	return trim($href[1]);
		@@ -188,7 +188,7 @@ discard block
		block discarded – undo
188	188	* Pull the http-equiv attribute out of an html meta element
189	189	*/
190	190	function _openid_meta_httpequiv($equiv, $html) {
191		- preg_match('\|<meta\s+http-equiv=["\']' . $equiv . '["\'](.*)/?>\|iU', $html, $matches);
	191	+ preg_match('\|<meta\s+http-equiv=["\']'.$equiv.'["\'](.*)/?>\|iU', $html, $matches);
192	192	if (isset($matches[1])) {
193	193	preg_match('\|content=["\']([^"]+)["\']\|iU', $matches[1], $content);
194	194	return $content[1];
		@@ -209,8 +209,8 @@ discard block
		block discarded – undo
209	209	$sign_data = array();
210	210
211	211	foreach ($keys_to_sign as $key) {
212		- if (isset($message_array['openid.' . $key])) {
213		- $sign_data[$key] = $message_array['openid.' . $key];
	212	+ if (isset($message_array['openid.'.$key])) {
	213	+ $sign_data[$key] = $message_array['openid.'.$key];
214	214	}
215	215	}
216	216
		@@ -229,8 +229,8 @@ discard block
		block discarded – undo
229	229	$key = str_pad($key, OPENID_SHA1_BLOCKSIZE, chr(0x00));
230	230	$ipad = str_repeat(chr(0x36), OPENID_SHA1_BLOCKSIZE);
231	231	$opad = str_repeat(chr(0x5c), OPENID_SHA1_BLOCKSIZE);
232		- $hash1 = _openid_sha1(($key ^ $ipad) . $text, true);
233		- $hmac = _openid_sha1(($key ^ $opad) . $hash1, true);
	232	+ $hash1 = _openid_sha1(($key ^ $ipad).$text, true);
	233	+ $hmac = _openid_sha1(($key ^ $opad).$hash1, true);
234	234
235	235	return $hmac;
236	236	}
		@@ -337,7 +337,7 @@ discard block
		block discarded – undo
337	337	}
338	338
339	339	do {
340		- $bytes = "\x00" . _openid_get_bytes($nbytes);
	340	+ $bytes = "\x00"._openid_get_bytes($nbytes);
341	341	$n = _openid_dh_binary_to_long($bytes);
342	342	// Keep looping if this value is in the low duplicated range.
343	343	} while (bccomp($n, $duplicate) < 0);

		@@ -11,7 +11,7 @@
		block discarded – undo
11	11	$cidReset = true;
12	12	require_once '../inc/global.inc.php';
13	13	$this_section = SECTION_COURSES;
14		-$course_id = isset($_GET['course_id']) ? intval($_GET['course_id']) : null;
	14	+$course_id = isset($_GET['course_id']) ? intval($_GET['course_id']) : null;
15	15	$session_id = isset($_GET['session_id']) ? intval($_GET['session_id']) : null;
16	16	$user_id = api_get_user_id();
17	17

		@@ -9,5 +9,5 @@
		block discarded – undo
9	9	require_once('authcas.php');
10	10	global $cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri;
11	11
12		-phpCAS::client($cas_auth_ver,$cas_auth_server,$cas_auth_port,$cas_auth_uri);
	12	+phpCAS::client($cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri);
13	13	phpCAS::logout();

		@@ -39,7 +39,7 @@
		block discarded – undo
39	39	$firstpage = $_GET['firstpage'];
40	40	setcookie("GotoCourse", $firstpage);
41	41	}
42		- if (!is_object($PHPCAS_CLIENT) ) {
	42	+ if (!is_object($PHPCAS_CLIENT)) {
43	43	phpCAS::client(
44	44	$cas_auth_ver,
45	45	$cas_auth_server,

		@@ -131,17 +131,17 @@ discard block
		block discarded – undo
131	131	*
132	132	* @public
133	133	*/
134		- function PGTStorageFile($cas_parent,$format,$path)
	134	+ function PGTStorageFile($cas_parent, $format, $path)
135	135	{
136	136	phpCAS::traceBegin();
137	137	// call the ancestor's constructor
138	138	$this->PGTStorage($cas_parent);
139	139
140		- if (empty($format) ) $format = CAS_PGT_STORAGE_FILE_DEFAULT_FORMAT;
141		- if (empty($path) ) $path = CAS_PGT_STORAGE_FILE_DEFAULT_PATH;
	140	+ if (empty($format)) $format = CAS_PGT_STORAGE_FILE_DEFAULT_FORMAT;
	141	+ if (empty($path)) $path = CAS_PGT_STORAGE_FILE_DEFAULT_PATH;
142	142
143	143	// check that the path is an absolute path
144		- if (getenv("OS")=="Windows_NT"){
	144	+ if (getenv("OS") == "Windows_NT") {
145	145
146	146	if (!preg_match('`^[a-zA-Z]:`', $path)) {
147	147	phpCAS::error('an absolute path is needed for PGT storage to file');
		@@ -151,13 +151,13 @@ discard block
		block discarded – undo
151	151	else
152	152	{
153	153
154		- if ( $path[0] != '/' ) {
	154	+ if ($path[0] != '/') {
155	155	phpCAS::error('an absolute path is needed for PGT storage to file');
156	156	}
157	157
158	158	// store the path (with a leading and trailing '/')
159		- $path = preg_replace('\|[/]*$\|','/',$path);
160		- $path = preg_replace('\|^[/]*\|','/',$path);
	159	+ $path = preg_replace('\|[/]*$\|', '/', $path);
	160	+ $path = preg_replace('\|^[/]*\|', '/', $path);
161	161	}
162	162
163	163	$this->_path = $path;
		@@ -186,7 +186,7 @@ discard block
		block discarded – undo
186	186	{
187	187	phpCAS::traceBegin();
188	188	// if the storage has already been initialized, return immediatly
189		- if ( $this->isInitialized() )
	189	+ if ($this->isInitialized())
190	190	return;
191	191	// call the ancestor's method (mark as initialized)
192	192	parent::init();
		@@ -222,12 +222,12 @@ discard block
		block discarded – undo
222	222	*
223	223	* @public
224	224	*/
225		- function write($pgt,$pgt_iou)
	225	+ function write($pgt, $pgt_iou)
226	226	{
227	227	phpCAS::traceBegin();
228	228	$fname = $this->getPGTIouFilename($pgt_iou);
229		- if ( $f=fopen($fname,"w") ) {
230		- if ( fputs($f,$pgt) === FALSE ) {
	229	+ if ($f = fopen($fname, "w")) {
	230	+ if (fputs($f, $pgt) === FALSE) {
231	231	phpCAS::error('could not write PGT to `'.$fname.'\'');
232	232	}
233	233	fclose($f);
		@@ -252,10 +252,10 @@ discard block
		block discarded – undo
252	252	phpCAS::traceBegin();
253	253	$pgt = FALSE;
254	254	$fname = $this->getPGTIouFilename($pgt_iou);
255		- if ( !($f=fopen($fname,"r")) ) {
	255	+ if (!($f = fopen($fname, "r"))) {
256	256	phpCAS::trace('could not open `'.$fname.'\'');
257	257	} else {
258		- if ( ($pgt=fgets($f)) === FALSE ) {
	258	+ if (($pgt = fgets($f)) === FALSE) {
259	259	phpCAS::trace('could not read PGT from `'.$fname.'\'');
260	260	}
261	261	fclose($f);

		@@ -57,7 +57,7 @@ discard block
		block discarded – undo
57	57	* @hideinitializer
58	58	* @private
59	59	*/
60		- var $_url='';
	60	+ var $_url = '';
61	61
62	62	/**
63	63	* This method returns the PEAR DB URL to use to connect to the database.
		@@ -159,18 +159,18 @@ discard block
		block discarded – undo
159	159	*
160	160	* @public
161	161	*/
162		- function PGTStorageDB($cas_parent,$user,$password,$database_type,$hostname,$port,$database,$table)
	162	+ function PGTStorageDB($cas_parent, $user, $password, $database_type, $hostname, $port, $database, $table)
163	163	{
164	164	phpCAS::traceBegin();
165	165
166	166	// call the ancestor's constructor
167	167	$this->PGTStorage($cas_parent);
168	168
169		- if ( empty($database_type) ) $database_type = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE_TYPE;
170		- if ( empty($hostname) ) $hostname = CAS_PGT_STORAGE_DB_DEFAULT_HOSTNAME;
171		- if ( $port==0 ) $port = CAS_PGT_STORAGE_DB_DEFAULT_PORT;
172		- if ( empty($database) ) $database = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE;
173		- if ( empty($table) ) $table = CAS_PGT_STORAGE_DB_DEFAULT_TABLE;
	169	+ if (empty($database_type)) $database_type = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE_TYPE;
	170	+ if (empty($hostname)) $hostname = CAS_PGT_STORAGE_DB_DEFAULT_HOSTNAME;
	171	+ if ($port == 0) $port = CAS_PGT_STORAGE_DB_DEFAULT_PORT;
	172	+ if (empty($database)) $database = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE;
	173	+ if (empty($table)) $table = CAS_PGT_STORAGE_DB_DEFAULT_TABLE;
174	174
175	175	// build and store the PEAR DB URL
176	176	$this->_url = $database_type.':'.'//'.$user.':'.$password.'@'.$hostname.':'.$port.'/'.$database;
		@@ -192,7 +192,7 @@ discard block
		block discarded – undo
192	192	{
193	193	phpCAS::traceBegin();
194	194	// if the storage has already been initialized, return immediatly
195		- if ( $this->isInitialized() )
	195	+ if ($this->isInitialized())
196	196	return;
197	197	// call the ancestor's method (mark as initialized)
198	198	parent::init();
		@@ -205,7 +205,7 @@ discard block
		block discarded – undo
205	205
206	206	// try to connect to the database
207	207	$this->_link = DB::connect($this->getURL());
208		- if ( DB::isError($this->_link) ) {
	208	+ if (DB::isError($this->_link)) {
209	209	phpCAS::error('could not connect to database ('.DB::errorMessage($this->_link).')');
210	210	}
211	211	var_dump($this->_link);

		@@ -63,7 +63,7 @@ discard block
		block discarded – undo
63	63	function PGTStorage($cas_parent)
64	64	{
65	65	phpCAS::traceBegin();
66		- if ( !$cas_parent->isProxy() ) {
	66	+ if (!$cas_parent->isProxy()) {
67	67	phpCAS::error('defining PGT storage makes no sense when not using a CAS proxy');
68	68	}
69	69	phpCAS::traceEnd();
		@@ -107,7 +107,7 @@ discard block
		block discarded – undo
107	107	* @private
108	108	* @deprecated not used.
109	109	*/
110		- var $_error_message=FALSE;
	110	+ var $_error_message = FALSE;
111	111
112	112	/**
113	113	* This method sets en error message, which can be read later by
		@@ -185,7 +185,7 @@ discard block
		block discarded – undo
185	185	*
186	186	* @protected
187	187	*/
188		- function write($pgt,$pgt_iou)
	188	+ function write($pgt, $pgt_iou)
189	189	{
190	190	phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called');
191	191	}

		@@ -12,13 +12,13 @@
		block discarded – undo
12	12	/**
13	13	* a phpCAS string index
14	14	*/
15		-define("CAS_STR_USING_SERVER", 1);
16		-define("CAS_STR_AUTHENTICATION_WANTED", 2);
17		-define("CAS_STR_LOGOUT", 3);
	15	+define("CAS_STR_USING_SERVER", 1);
	16	+define("CAS_STR_AUTHENTICATION_WANTED", 2);
	17	+define("CAS_STR_LOGOUT", 3);
18	18	define("CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED", 4);
19		-define("CAS_STR_AUTHENTICATION_FAILED", 5);
20		-define("CAS_STR_YOU_WERE_NOT_AUTHENTICATED", 6);
21		-define("CAS_STR_SERVICE_UNAVAILABLE", 7);
	19	+define("CAS_STR_AUTHENTICATION_FAILED", 5);
	20	+define("CAS_STR_YOU_WERE_NOT_AUTHENTICATED", 6);
	21	+define("CAS_STR_SERVICE_UNAVAILABLE", 7);
22	22	//@}
23	23
24	24	?>
25	25	\ No newline at end of file

		@@ -203,7 +203,7 @@ discard block
		block discarded – undo
203	203	$limit
204	204	);
205	205	} else {
206		- header('Location: ' . api_get_self());
	206	+ header('Location: '.api_get_self());
207	207	}
208	208	break;
209	209	case 'display_random_courses':
		@@ -278,7 +278,7 @@ discard block
		block discarded – undo
278	278	$continueWithSubscription = SequenceResourceManager::checkSequenceAreCompleted($requirementsData);
279	279
280	280	if (!$continueWithSubscription) {
281		- header('Location: ' . api_get_path(WEB_CODE_PATH) . 'auth/courses.php');
	281	+ header('Location: '.api_get_path(WEB_CODE_PATH).'auth/courses.php');
282	282	exit;
283	283	}
284	284	}
		@@ -296,16 +296,16 @@ discard block
		block discarded – undo
296	296
297	297	if ($count <= 0) {
298	298	// no course in session -> return to catalog
299		- $url = api_get_path(WEB_CODE_PATH) . 'auth/courses.php';
	299	+ $url = api_get_path(WEB_CODE_PATH).'auth/courses.php';
300	300	} elseif ($count == 1) {
301	301	// only one course, so redirect directly to this course
302	302	foreach ($coursesList as $course) {
303		- $url = api_get_path(WEB_COURSE_PATH) . $course['directory'] . '/index.php?id_session=' . intval($_GET['session_id']);
	303	+ $url = api_get_path(WEB_COURSE_PATH).$course['directory'].'/index.php?id_session='.intval($_GET['session_id']);
304	304	}
305	305	} else {
306		- $url = api_get_path(WEB_CODE_PATH) . 'session/index.php?session_id=' . intval($_GET['session_id']);
	306	+ $url = api_get_path(WEB_CODE_PATH).'session/index.php?session_id='.intval($_GET['session_id']);
307	307	}
308		- header('Location: ' . $url);
	308	+ header('Location: '.$url);
309	309	exit;
310	310	}
311	311	//else show error message?

chamilo / chamilo-lms

Pull Request — 1.11.x (#1223)

Status

Category

Spacing +23 added lines, -23 removed lines patch added patch discarded remove patch

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

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

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

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

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

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

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

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