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

Completed

Push — 1.11.x ( 747e79...744431 )

by José

created 2016-07-27 20:32 UTC

Status

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

@@ -13,7 +13,7 @@  discard block
 block discarded – undo
 ?>
 <html>
 <head>
-    <title><?php echo custompages_get_lang('Registration');?></title>
+    <title><?php echo custompages_get_lang('Registration'); ?></title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
                     </div>
                     <div id="registration-form-box" class="form-box">
                         <div class="block-form-login">
-                            <?php   echo $content['info'];  ?>
+                            <?php   echo $content['info']; ?>
                         </div>
                     </div>
                     <div id="footer">

Please login to merge, or discard this patch.

bin/doctrine.php 1 patch

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

@@ -19,26 +19,26 @@  discard block
 block discarded – undo
 use Doctrine\ORM\Tools\Console\ConsoleRunner;
 use Symfony\Component\Console\Helper\HelperSet;
 
-(@include_once __DIR__ . '/../vendor/autoload.php') || @include_once __DIR__ . '/../../../autoload.php';
+(@include_once __DIR__.'/../vendor/autoload.php') || @include_once __DIR__.'/../../../autoload.php';
 
-$directories = array(getcwd(), getcwd() . DIRECTORY_SEPARATOR . 'config');
+$directories = array(getcwd(), getcwd().DIRECTORY_SEPARATOR.'config');
 
 $configFile = null;
 foreach ($directories as $directory) {
-    $configFile = $directory . DIRECTORY_SEPARATOR . 'cli-config.php';
+    $configFile = $directory.DIRECTORY_SEPARATOR.'cli-config.php';
 
     if (file_exists($configFile)) {
         break;
     }
 }
 
-if ( ! file_exists($configFile)) {
+if (!file_exists($configFile)) {
     ConsoleRunner::printCliConfigTemplate();
     exit(1);
 }
 
-if ( ! is_readable($configFile)) {
-    echo 'Configuration file [' . $configFile . '] does not have read permission.' . "\n";
+if (!is_readable($configFile)) {
+    echo 'Configuration file ['.$configFile.'] does not have read permission.'."\n";
     exit(1);
 }
 
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
 
 $helperSet = require $configFile;
 
-if ( ! ($helperSet instanceof HelperSet)) {
+if (!($helperSet instanceof HelperSet)) {
     foreach ($GLOBALS as $helperSetCandidate) {
         if ($helperSetCandidate instanceof HelperSet) {
             $helperSet = $helperSetCandidate;

Please login to merge, or discard this patch.

app/config/events.conf.dist.php 1 patch

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

@@ -23,7 +23,7 @@  discard block
 block discarded – undo
         'self_sent' => false, // this key states that we can't add user to this event through the admin panel
         'name_lang_var' => get_lang('PortalHomepageEdited'),
         'desc_lang_var' => get_lang('PortalHomepageEdited'),
-        'available_keyvars' => array (// keys used for the mail template
+        'available_keyvars' => array(// keys used for the mail template
             'url'           => 'portal',
             'sitename'      => 'sitename',
             'firstname'     => 'firstname',
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
         'self_sent' => true, // this key states that we can't add user to this event through the admin panel
         'name_lang_var' => get_lang('UserRegistrationTitle'),
         'desc_lang_var' => get_lang('UserRegistrationComment'),
-        'available_keyvars' => array (// keys used for the mail template
+        'available_keyvars' => array(// keys used for the mail template
             'url'           => 'portal',
             'sitename'      => 'sitename',
             'firstname'     => 'firstname',

Please login to merge, or discard this patch.

app/config/profile.conf.dist.php 1 patch

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

@@ -19,11 +19,11 @@
 block discarded – undo
 
 // Replacing user photos
 define('KEEP_THE_NAME_WHEN_CHANGE_IMAGE', true);
-	// true  -> the new image have the name of previous.
-	// false -> a new name is build for each upladed image.
+    // true  -> the new image have the name of previous.
+    // false -> a new name is build for each upladed image.
 define('KEEP_THE_OLD_IMAGE_AFTER_CHANGE', true);
-	// true  -> if KEEP_THE_NAME_WHEN_CHANGE_IMAGE is true, the  previous image is rename before.
-	// false -> only the last image still on server.
+    // true  -> if KEEP_THE_NAME_WHEN_CHANGE_IMAGE is true, the  previous image is rename before.
+    // false -> only the last image still on server.
 
 // Official code
 // Don't forget to change name of offical code in your organization

Please login to merge, or discard this patch.

app/config/auth.conf.dist.php 2 patches

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

@@ -39,29 +39,29 @@
 block discarded – undo
  * Array of connection parameters
  **/
 $extldap_config = array(
-  //base dommain string
-  'base_dn' => 'DC=cblue,DC=be',
-  //admin distinguished name
-  'admin_dn' => 'CN=admin,dc=cblue,dc=be',
-  //admin password
-  'admin_password' => 'pass',
-  //ldap host
-  'host' => array('1.2.3.4', '2.3.4.5', '3.4.5.6'),
-  // filter
+    //base dommain string
+    'base_dn' => 'DC=cblue,DC=be',
+    //admin distinguished name
+    'admin_dn' => 'CN=admin,dc=cblue,dc=be',
+    //admin password
+    'admin_password' => 'pass',
+    //ldap host
+    'host' => array('1.2.3.4', '2.3.4.5', '3.4.5.6'),
+    // filter
 //  'filter' => '', // no () arround the string
-  //'port' => , default on 389
-  //protocl version (2 or 3)
-  'protocol_version' => 3,
-  // set this to 0 to connect to AD server
-  'referrals' => 0,
-  //String used to search the user in ldap. %username will ber replaced by the username.
-  //See extldap_get_user_search_string() function below
+    //'port' => , default on 389
+    //protocl version (2 or 3)
+    'protocol_version' => 3,
+    // set this to 0 to connect to AD server
+    'referrals' => 0,
+    //String used to search the user in ldap. %username will ber replaced by the username.
+    //See extldap_get_user_search_string() function below
 //  'user_search' => 'sAMAccountName=%username%',  // no () arround the string
-  'user_search' => 'uid=%username%',  // no () arround the string
-  //encoding used in ldap (most common are UTF-8 and ISO-8859-1
-  'encoding' => 'UTF-8',
-  //Set to true if user info have to be update at each login
-  'update_userinfo' => true
+    'user_search' => 'uid=%username%',  // no () arround the string
+    //encoding used in ldap (most common are UTF-8 and ISO-8859-1
+    'encoding' => 'UTF-8',
+    //Set to true if user info have to be update at each login
+    'update_userinfo' => true
 );
 
 

Please login to merge, or discard this patch.

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

@@ -57,7 +57,7 @@
 block discarded – undo
   //String used to search the user in ldap. %username will ber replaced by the username.
   //See extldap_get_user_search_string() function below
 //  'user_search' => 'sAMAccountName=%username%',  // no () arround the string
-  'user_search' => 'uid=%username%',  // no () arround the string
+  'user_search' => 'uid=%username%', // no () arround the string
   //encoding used in ldap (most common are UTF-8 and ISO-8859-1
   'encoding' => 'UTF-8',
   //Set to true if user info have to be update at each login

Please login to merge, or discard this patch.

user_portal.php 2 patches

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

@@ -188,7 +188,7 @@
 block discarded – undo
 
 //Show the chamilo mascot
 if (empty($courseAndSessions['html']) && !isset($_GET['history'])) {
-	$controller->tpl->assign('welcome_to_course_block', $controller->return_welcome_to_course_block());
+    $controller->tpl->assign('welcome_to_course_block', $controller->return_welcome_to_course_block());
 }
 
 $controller->tpl->assign('content', $courseAndSessions['html']);

Please login to merge, or discard this patch.

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

@@ -47,7 +47,7 @@  discard block
 block discarded – undo
     $url = api_get_path(WEB_AJAX_PATH).'document.ajax.php?a=document_preview';
     $folder_icon = api_get_path(WEB_IMG_PATH).'icons/22/folder.png';
     $close_icon = api_get_path(WEB_IMG_PATH).'loading1.gif';
-    $htmlHeadXtra[] =  '<script>
+    $htmlHeadXtra[] = '<script>
 	$(document).ready(function() {
 		$(".document_preview_container").hide();
 		$(".document_preview").click(function() {
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
 if ($displayMyCourseViewBySessionLink) {
     $htmlHeadXtra[] = '
     <script>
-        userId = ' . $userId . '
+        userId = ' . $userId.'
         $(document).ready(function() {
             changeMyCoursesView($.cookie("defaultMyCourseView"+userId));
         });
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
         function changeMyCoursesView(inView)
         {
             $.cookie("defaultMyCourseView"+userId, inView, { expires: 365 });
-            if (inView == ' . IndexManager::VIEW_BY_SESSION . ') {
+            if (inView == ' . IndexManager::VIEW_BY_SESSION.') {
                 $("#viewBySession").addClass("btn-primary");
                 $("#viewByDefault").removeClass("btn-primary");
             } else {
@@ -150,16 +150,16 @@  discard block
 block discarded – undo
             if (isset($sessionInfo['courses']) && count($sessionInfo['courses']) == 1) {
                 $courseCode = $sessionInfo['courses'][0]['code'];
                 $courseInfo = api_get_course_info_by_id($sessionInfo['courses'][0]['real_id']);
-                $courseUrl = $courseInfo['course_public_url'] . '?id_session=' . $sessionInfo['session_id'];
-                header('Location:' . $courseUrl);
+                $courseUrl = $courseInfo['course_public_url'].'?id_session='.$sessionInfo['session_id'];
+                header('Location:'.$courseUrl);
                 exit;
             }
 
             // Session has many courses.
             if (isset($sessionInfo['session_id'])) {
-                $url = api_get_path(WEB_CODE_PATH) . 'session/?session_id=' . $sessionInfo['session_id'];
+                $url = api_get_path(WEB_CODE_PATH).'session/?session_id='.$sessionInfo['session_id'];
 
-                header('Location:' . $url);
+                header('Location:'.$url);
                 exit;
             }
         }
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
             $courseInfo = api_get_course_info_by_id($courses[0]['real_id']);
             if (!empty($courseInfo)) {
                 $courseUrl = $courseInfo['course_public_url'];
-                header('Location:' . $courseUrl);
+                header('Location:'.$courseUrl);
                 exit;
             }
         }

Please login to merge, or discard this patch.

news_list.php 2 patches

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

@@ -7,7 +7,7 @@
 block discarded – undo
 
 $actions = '';
 if (api_is_platform_admin()) {
-	$actions = '<a href="'.api_get_path(WEB_PATH).'main/admin/system_announcements.php">'.
+    $actions = '<a href="'.api_get_path(WEB_PATH).'main/admin/system_announcements.php">'.
         Display::return_icon('edit.png', get_lang('EditSystemAnnouncement'), array(), 32).'</a>';
 }
 

Please login to merge, or discard this patch.

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

@@ -18,7 +18,7 @@
 block discarded – undo
 }
 
 if (!isset($_GET['id']) || empty($_GET['id'])) {
-    $content =  SystemAnnouncementManager::display_announcements_slider($visibility, $_GET['id']);
+    $content = SystemAnnouncementManager::display_announcements_slider($visibility, $_GET['id']);
 } else {
     $content = SystemAnnouncementManager::displayAnnouncement($_GET['id'], $visibility);
 }

Please login to merge, or discard this patch.

main/auth/openid/xrds.lib.php 3 patches

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

@@ -16,70 +16,70 @@
 block discarded – undo
  * Main entry point for parsing XRDS documents
  */
 function xrds_parse($xml) {
-  global $xrds_services;
+    global $xrds_services;
 
-  $parser = xml_parser_create_ns();
-  xml_set_element_handler($parser, '_xrds_element_start', '_xrds_element_end');
-  xml_set_character_data_handler($parser, '_xrds_cdata');
+    $parser = xml_parser_create_ns();
+    xml_set_element_handler($parser, '_xrds_element_start', '_xrds_element_end');
+    xml_set_character_data_handler($parser, '_xrds_cdata');
 
-  xml_parse($parser, $xml);
-  xml_parser_free($parser);
+    xml_parse($parser, $xml);
+    xml_parser_free($parser);
 
-  return $xrds_services;
+    return $xrds_services;
 }
 
 /**
  * Parser callback functions
  */
 function _xrds_element_start(&$parser, $name, $attribs) {
-  global $xrds_open_elements;
+    global $xrds_open_elements;
 
-  $xrds_open_elements[] = _xrds_strip_namespace($name);
+    $xrds_open_elements[] = _xrds_strip_namespace($name);
 }
 
 function _xrds_element_end(&$parser, $name) {
-  global $xrds_open_elements, $xrds_services, $xrds_current_service;
+    global $xrds_open_elements, $xrds_services, $xrds_current_service;
 
-  $name = _xrds_strip_namespace($name);
-  if ($name == 'SERVICE') {
+    $name = _xrds_strip_namespace($name);
+    if ($name == 'SERVICE') {
     if (in_array(OPENID_NS_2_0 .'/signon', $xrds_current_service['types']) ||
         in_array(OPENID_NS_2_0 .'/server', $xrds_current_service['types'])) {
-      $xrds_current_service['version'] = 2;
+        $xrds_current_service['version'] = 2;
     }
     elseif (in_array(OPENID_NS_1_1, $xrds_current_service['types']) ||
             in_array(OPENID_NS_1_0, $xrds_current_service['types'])) {
-      $xrds_current_service['version'] = 1;
+        $xrds_current_service['version'] = 1;
     }
     if (!empty($xrds_current_service['version'])) {
-      $xrds_services[] = $xrds_current_service;
+        $xrds_services[] = $xrds_current_service;
     }
     $xrds_current_service = array();
-  }
-  array_pop($xrds_open_elements);
+    }
+    array_pop($xrds_open_elements);
 }
 
 function _xrds_cdata(&$parser, $data) {
-  global $xrds_open_elements, $xrds_services, $xrds_current_service;
-  $path = strtoupper(implode('/', $xrds_open_elements));
-  switch ($path) {
+    global $xrds_open_elements, $xrds_services, $xrds_current_service;
+    $path = strtoupper(implode('/', $xrds_open_elements));
+    switch ($path) {
     case 'XRDS/XRD/SERVICE/TYPE':
       $xrds_current_service['types'][] = $data;
-      break;
+        break;
     case 'XRDS/XRD/SERVICE/URI':
       $xrds_current_service['uri'] = $data;
-      break;
+        break;
     case 'XRDS/XRD/SERVICE/DELEGATE':
       $xrds_current_service['delegate'] = $data;
-      break;
-  }
+        break;
+    }
 }
 
 function _xrds_strip_namespace($name) {
-  // Strip namespacing.
-  $pos = strrpos($name, ':');
-  if ($pos !== FALSE) {
+    // Strip namespacing.
+    $pos = strrpos($name, ':');
+    if ($pos !== FALSE) {
     $name = substr($name, $pos + 1, strlen($name));
-  }
+    }
 
-  return $name;
+    return $name;
 }

Please login to merge, or discard this patch.

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

@@ -42,8 +42,8 @@
 block discarded – undo
 
   $name = _xrds_strip_namespace($name);
   if ($name == 'SERVICE') {
-    if (in_array(OPENID_NS_2_0 .'/signon', $xrds_current_service['types']) ||
-        in_array(OPENID_NS_2_0 .'/server', $xrds_current_service['types'])) {
+    if (in_array(OPENID_NS_2_0.'/signon', $xrds_current_service['types']) ||
+        in_array(OPENID_NS_2_0.'/server', $xrds_current_service['types'])) {
       $xrds_current_service['version'] = 2;
     }
     elseif (in_array(OPENID_NS_1_1, $xrds_current_service['types']) ||

Please login to merge, or discard this patch.

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

@@ -45,8 +45,7 @@
 block discarded – undo
     if (in_array(OPENID_NS_2_0 .'/signon', $xrds_current_service['types']) ||
         in_array(OPENID_NS_2_0 .'/server', $xrds_current_service['types'])) {
       $xrds_current_service['version'] = 2;
-    }
-    elseif (in_array(OPENID_NS_1_1, $xrds_current_service['types']) ||
+    } elseif (in_array(OPENID_NS_1_1, $xrds_current_service['types']) ||
             in_array(OPENID_NS_1_0, $xrds_current_service['types'])) {
       $xrds_current_service['version'] = 1;
     }

Please login to merge, or discard this patch.

main/auth/openid/openid.lib.php 3 patches

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.

Braces +3 added lines, -2 removed lines patch added patch discarded remove patch

@@ -61,8 +61,9 @@
 block discarded – undo
  */
 function _openid_is_xri($identifier) {
     $firstchar = substr($identifier, 0, 1);
-    if ($firstchar == "@" || $firstchar == "=")
-        return TRUE;
+    if ($firstchar == "@" || $firstchar == "=") {
+            return TRUE;
+    }
 
     if (stristr($identifier, 'xri://') !== FALSE) {
         return TRUE;

Please login to merge, or discard this patch.

Doc Comments +7 added lines patch added patch discarded remove patch

@@ -242,6 +242,9 @@  discard block
 block discarded – undo
     return $hmac;
 }
 
+/**
+ * @param string|false $text
+ */
 function _openid_sha1($text) {
     $hex = sha1($text);
     $raw = '';
@@ -404,6 +407,10 @@  discard block
 block discarded – undo
  */
 if (!function_exists('bcpowmod')) {
 
+    /**
+     * @param string $exp
+     * @param string $mod
+     */
     function bcpowmod($base, $exp, $mod) {
         $square = bcmod($base, $mod);
         $result = 1;

Please login to merge, or discard this patch.

		@@ -13,7 +13,7 @@ discard block
		block discarded – undo
13	13	?>
14	14	<html>
15	15	<head>
16		- <title><?php echo custompages_get_lang('Registration');?></title>
	16	+ <title><?php echo custompages_get_lang('Registration'); ?></title>
17	17	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
18	18	<meta http-equiv="X-UA-Compatible" content="IE=edge">
19	19	<meta name="viewport" content="width=device-width, initial-scale=1.0">
		@@ -39,7 +39,7 @@ discard block
		block discarded – undo
39	39	</div>
40	40	<div id="registration-form-box" class="form-box">
41	41	<div class="block-form-login">
42		- <?php echo $content['info']; ?>
	42	+ <?php echo $content['info']; ?>
43	43	</div>
44	44	</div>
45	45	<div id="footer">

		@@ -19,26 +19,26 @@ discard block
		block discarded – undo
19	19	use Doctrine\ORM\Tools\Console\ConsoleRunner;
20	20	use Symfony\Component\Console\Helper\HelperSet;
21	21
22		-(@include_once __DIR__ . '/../vendor/autoload.php') \|\| @include_once __DIR__ . '/../../../autoload.php';
	22	+(@include_once __DIR__.'/../vendor/autoload.php') \|\| @include_once __DIR__.'/../../../autoload.php';
23	23
24		-$directories = array(getcwd(), getcwd() . DIRECTORY_SEPARATOR . 'config');
	24	+$directories = array(getcwd(), getcwd().DIRECTORY_SEPARATOR.'config');
25	25
26	26	$configFile = null;
27	27	foreach ($directories as $directory) {
28		- $configFile = $directory . DIRECTORY_SEPARATOR . 'cli-config.php';
	28	+ $configFile = $directory.DIRECTORY_SEPARATOR.'cli-config.php';
29	29
30	30	if (file_exists($configFile)) {
31	31	break;
32	32	}
33	33	}
34	34
35		-if ( ! file_exists($configFile)) {
	35	+if (!file_exists($configFile)) {
36	36	ConsoleRunner::printCliConfigTemplate();
37	37	exit(1);
38	38	}
39	39
40		-if ( ! is_readable($configFile)) {
41		- echo 'Configuration file [' . $configFile . '] does not have read permission.' . "\n";
	40	+if (!is_readable($configFile)) {
	41	+ echo 'Configuration file ['.$configFile.'] does not have read permission.'."\n";
42	42	exit(1);
43	43	}
44	44
		@@ -54,7 +54,7 @@ discard block
		block discarded – undo
54	54
55	55	$helperSet = require $configFile;
56	56
57		-if ( ! ($helperSet instanceof HelperSet)) {
	57	+if (!($helperSet instanceof HelperSet)) {
58	58	foreach ($GLOBALS as $helperSetCandidate) {
59	59	if ($helperSetCandidate instanceof HelperSet) {
60	60	$helperSet = $helperSetCandidate;

		@@ -23,7 +23,7 @@ discard block
		block discarded – undo
23	23	'self_sent' => false, // this key states that we can't add user to this event through the admin panel
24	24	'name_lang_var' => get_lang('PortalHomepageEdited'),
25	25	'desc_lang_var' => get_lang('PortalHomepageEdited'),
26		- 'available_keyvars' => array (// keys used for the mail template
	26	+ 'available_keyvars' => array(// keys used for the mail template
27	27	'url' => 'portal',
28	28	'sitename' => 'sitename',
29	29	'firstname' => 'firstname',
		@@ -45,7 +45,7 @@ discard block
		block discarded – undo
45	45	'self_sent' => true, // this key states that we can't add user to this event through the admin panel
46	46	'name_lang_var' => get_lang('UserRegistrationTitle'),
47	47	'desc_lang_var' => get_lang('UserRegistrationComment'),
48		- 'available_keyvars' => array (// keys used for the mail template
	48	+ 'available_keyvars' => array(// keys used for the mail template
49	49	'url' => 'portal',
50	50	'sitename' => 'sitename',
51	51	'firstname' => 'firstname',

		@@ -19,11 +19,11 @@
		block discarded – undo
19	19
20	20	// Replacing user photos
21	21	define('KEEP_THE_NAME_WHEN_CHANGE_IMAGE', true);
22		- // true -> the new image have the name of previous.
23		- // false -> a new name is build for each upladed image.
	22	+ // true -> the new image have the name of previous.
	23	+ // false -> a new name is build for each upladed image.
24	24	define('KEEP_THE_OLD_IMAGE_AFTER_CHANGE', true);
25		- // true -> if KEEP_THE_NAME_WHEN_CHANGE_IMAGE is true, the previous image is rename before.
26		- // false -> only the last image still on server.
	25	+ // true -> if KEEP_THE_NAME_WHEN_CHANGE_IMAGE is true, the previous image is rename before.
	26	+ // false -> only the last image still on server.
27	27
28	28	// Official code
29	29	// Don't forget to change name of offical code in your organization

		@@ -39,29 +39,29 @@
		block discarded – undo
39	39	* Array of connection parameters
40	40	**/
41	41	$extldap_config = array(
42		- //base dommain string
43		- 'base_dn' => 'DC=cblue,DC=be',
44		- //admin distinguished name
45		- 'admin_dn' => 'CN=admin,dc=cblue,dc=be',
46		- //admin password
47		- 'admin_password' => 'pass',
48		- //ldap host
49		- 'host' => array('1.2.3.4', '2.3.4.5', '3.4.5.6'),
50		- // filter
	42	+ //base dommain string
	43	+ 'base_dn' => 'DC=cblue,DC=be',
	44	+ //admin distinguished name
	45	+ 'admin_dn' => 'CN=admin,dc=cblue,dc=be',
	46	+ //admin password
	47	+ 'admin_password' => 'pass',
	48	+ //ldap host
	49	+ 'host' => array('1.2.3.4', '2.3.4.5', '3.4.5.6'),
	50	+ // filter
51	51	// 'filter' => '', // no () arround the string
52		- //'port' => , default on 389
53		- //protocl version (2 or 3)
54		- 'protocol_version' => 3,
55		- // set this to 0 to connect to AD server
56		- 'referrals' => 0,
57		- //String used to search the user in ldap. %username will ber replaced by the username.
58		- //See extldap_get_user_search_string() function below
	52	+ //'port' => , default on 389
	53	+ //protocl version (2 or 3)
	54	+ 'protocol_version' => 3,
	55	+ // set this to 0 to connect to AD server
	56	+ 'referrals' => 0,
	57	+ //String used to search the user in ldap. %username will ber replaced by the username.
	58	+ //See extldap_get_user_search_string() function below
59	59	// 'user_search' => 'sAMAccountName=%username%', // no () arround the string
60		- 'user_search' => 'uid=%username%', // no () arround the string
61		- //encoding used in ldap (most common are UTF-8 and ISO-8859-1
62		- 'encoding' => 'UTF-8',
63		- //Set to true if user info have to be update at each login
64		- 'update_userinfo' => true
	60	+ 'user_search' => 'uid=%username%', // no () arround the string
	61	+ //encoding used in ldap (most common are UTF-8 and ISO-8859-1
	62	+ 'encoding' => 'UTF-8',
	63	+ //Set to true if user info have to be update at each login
	64	+ 'update_userinfo' => true
65	65	);
66	66
67	67

		@@ -57,7 +57,7 @@
		block discarded – undo
57	57	//String used to search the user in ldap. %username will ber replaced by the username.
58	58	//See extldap_get_user_search_string() function below
59	59	// 'user_search' => 'sAMAccountName=%username%', // no () arround the string
60		- 'user_search' => 'uid=%username%', // no () arround the string
	60	+ 'user_search' => 'uid=%username%', // no () arround the string
61	61	//encoding used in ldap (most common are UTF-8 and ISO-8859-1
62	62	'encoding' => 'UTF-8',
63	63	//Set to true if user info have to be update at each login

		@@ -188,7 +188,7 @@
		block discarded – undo
188	188
189	189	//Show the chamilo mascot
190	190	if (empty($courseAndSessions['html']) && !isset($_GET['history'])) {
191		- $controller->tpl->assign('welcome_to_course_block', $controller->return_welcome_to_course_block());
	191	+ $controller->tpl->assign('welcome_to_course_block', $controller->return_welcome_to_course_block());
192	192	}
193	193
194	194	$controller->tpl->assign('content', $courseAndSessions['html']);

		@@ -47,7 +47,7 @@ discard block
		block discarded – undo
47	47	$url = api_get_path(WEB_AJAX_PATH).'document.ajax.php?a=document_preview';
48	48	$folder_icon = api_get_path(WEB_IMG_PATH).'icons/22/folder.png';
49	49	$close_icon = api_get_path(WEB_IMG_PATH).'loading1.gif';
50		- $htmlHeadXtra[] = '<script>
	50	+ $htmlHeadXtra[] = '<script>
51	51	$(document).ready(function() {
52	52	$(".document_preview_container").hide();
53	53	$(".document_preview").click(function() {
		@@ -79,7 +79,7 @@ discard block
		block discarded – undo
79	79	if ($displayMyCourseViewBySessionLink) {
80	80	$htmlHeadXtra[] = '
81	81	<script>
82		- userId = ' . $userId . '
	82	+ userId = ' . $userId.'
83	83	$(document).ready(function() {
84	84	changeMyCoursesView($.cookie("defaultMyCourseView"+userId));
85	85	});
		@@ -91,7 +91,7 @@ discard block
		block discarded – undo
91	91	function changeMyCoursesView(inView)
92	92	{
93	93	$.cookie("defaultMyCourseView"+userId, inView, { expires: 365 });
94		- if (inView == ' . IndexManager::VIEW_BY_SESSION . ') {
	94	+ if (inView == ' . IndexManager::VIEW_BY_SESSION.') {
95	95	$("#viewBySession").addClass("btn-primary");
96	96	$("#viewByDefault").removeClass("btn-primary");
97	97	} else {
		@@ -150,16 +150,16 @@ discard block
		block discarded – undo
150	150	if (isset($sessionInfo['courses']) && count($sessionInfo['courses']) == 1) {
151	151	$courseCode = $sessionInfo['courses'][0]['code'];
152	152	$courseInfo = api_get_course_info_by_id($sessionInfo['courses'][0]['real_id']);
153		- $courseUrl = $courseInfo['course_public_url'] . '?id_session=' . $sessionInfo['session_id'];
154		- header('Location:' . $courseUrl);
	153	+ $courseUrl = $courseInfo['course_public_url'].'?id_session='.$sessionInfo['session_id'];
	154	+ header('Location:'.$courseUrl);
155	155	exit;
156	156	}
157	157
158	158	// Session has many courses.
159	159	if (isset($sessionInfo['session_id'])) {
160		- $url = api_get_path(WEB_CODE_PATH) . 'session/?session_id=' . $sessionInfo['session_id'];
	160	+ $url = api_get_path(WEB_CODE_PATH).'session/?session_id='.$sessionInfo['session_id'];
161	161
162		- header('Location:' . $url);
	162	+ header('Location:'.$url);
163	163	exit;
164	164	}
165	165	}
		@@ -175,7 +175,7 @@ discard block
		block discarded – undo
175	175	$courseInfo = api_get_course_info_by_id($courses[0]['real_id']);
176	176	if (!empty($courseInfo)) {
177	177	$courseUrl = $courseInfo['course_public_url'];
178		- header('Location:' . $courseUrl);
	178	+ header('Location:'.$courseUrl);
179	179	exit;
180	180	}
181	181	}

		@@ -7,7 +7,7 @@
		block discarded – undo
7	7
8	8	$actions = '';
9	9	if (api_is_platform_admin()) {
10		- $actions = '<a href="'.api_get_path(WEB_PATH).'main/admin/system_announcements.php">'.
	10	+ $actions = '<a href="'.api_get_path(WEB_PATH).'main/admin/system_announcements.php">'.
11	11	Display::return_icon('edit.png', get_lang('EditSystemAnnouncement'), array(), 32).'</a>';
12	12	}
13	13

		@@ -18,7 +18,7 @@
		block discarded – undo
18	18	}
19	19
20	20	if (!isset($_GET['id']) \|\| empty($_GET['id'])) {
21		- $content = SystemAnnouncementManager::display_announcements_slider($visibility, $_GET['id']);
	21	+ $content = SystemAnnouncementManager::display_announcements_slider($visibility, $_GET['id']);
22	22	} else {
23	23	$content = SystemAnnouncementManager::displayAnnouncement($_GET['id'], $visibility);
24	24	}

		@@ -16,70 +16,70 @@
		block discarded – undo
16	16	* Main entry point for parsing XRDS documents
17	17	*/
18	18	function xrds_parse($xml) {
19		- global $xrds_services;
	19	+ global $xrds_services;
20	20
21		- $parser = xml_parser_create_ns();
22		- xml_set_element_handler($parser, '_xrds_element_start', '_xrds_element_end');
23		- xml_set_character_data_handler($parser, '_xrds_cdata');
	21	+ $parser = xml_parser_create_ns();
	22	+ xml_set_element_handler($parser, '_xrds_element_start', '_xrds_element_end');
	23	+ xml_set_character_data_handler($parser, '_xrds_cdata');
24	24
25		- xml_parse($parser, $xml);
26		- xml_parser_free($parser);
	25	+ xml_parse($parser, $xml);
	26	+ xml_parser_free($parser);
27	27
28		- return $xrds_services;
	28	+ return $xrds_services;
29	29	}
30	30
31	31	/**
32	32	* Parser callback functions
33	33	*/
34	34	function _xrds_element_start(&$parser, $name, $attribs) {
35		- global $xrds_open_elements;
	35	+ global $xrds_open_elements;
36	36
37		- $xrds_open_elements[] = _xrds_strip_namespace($name);
	37	+ $xrds_open_elements[] = _xrds_strip_namespace($name);
38	38	}
39	39
40	40	function _xrds_element_end(&$parser, $name) {
41		- global $xrds_open_elements, $xrds_services, $xrds_current_service;
	41	+ global $xrds_open_elements, $xrds_services, $xrds_current_service;
42	42
43		- $name = _xrds_strip_namespace($name);
44		- if ($name == 'SERVICE') {
	43	+ $name = _xrds_strip_namespace($name);
	44	+ if ($name == 'SERVICE') {
45	45	if (in_array(OPENID_NS_2_0 .'/signon', $xrds_current_service['types']) \|\|
46	46	in_array(OPENID_NS_2_0 .'/server', $xrds_current_service['types'])) {
47		- $xrds_current_service['version'] = 2;
	47	+ $xrds_current_service['version'] = 2;
48	48	}
49	49	elseif (in_array(OPENID_NS_1_1, $xrds_current_service['types']) \|\|
50	50	in_array(OPENID_NS_1_0, $xrds_current_service['types'])) {
51		- $xrds_current_service['version'] = 1;
	51	+ $xrds_current_service['version'] = 1;
52	52	}
53	53	if (!empty($xrds_current_service['version'])) {
54		- $xrds_services[] = $xrds_current_service;
	54	+ $xrds_services[] = $xrds_current_service;
55	55	}
56	56	$xrds_current_service = array();
57		- }
58		- array_pop($xrds_open_elements);
	57	+ }
	58	+ array_pop($xrds_open_elements);
59	59	}
60	60
61	61	function _xrds_cdata(&$parser, $data) {
62		- global $xrds_open_elements, $xrds_services, $xrds_current_service;
63		- $path = strtoupper(implode('/', $xrds_open_elements));
64		- switch ($path) {
	62	+ global $xrds_open_elements, $xrds_services, $xrds_current_service;
	63	+ $path = strtoupper(implode('/', $xrds_open_elements));
	64	+ switch ($path) {
65	65	case 'XRDS/XRD/SERVICE/TYPE':
66	66	$xrds_current_service['types'][] = $data;
67		- break;
	67	+ break;
68	68	case 'XRDS/XRD/SERVICE/URI':
69	69	$xrds_current_service['uri'] = $data;
70		- break;
	70	+ break;
71	71	case 'XRDS/XRD/SERVICE/DELEGATE':
72	72	$xrds_current_service['delegate'] = $data;
73		- break;
74		- }
	73	+ break;
	74	+ }
75	75	}
76	76
77	77	function _xrds_strip_namespace($name) {
78		- // Strip namespacing.
79		- $pos = strrpos($name, ':');
80		- if ($pos !== FALSE) {
	78	+ // Strip namespacing.
	79	+ $pos = strrpos($name, ':');
	80	+ if ($pos !== FALSE) {
81	81	$name = substr($name, $pos + 1, strlen($name));
82		- }
	82	+ }
83	83
84		- return $name;
	84	+ return $name;
85	85	}

		@@ -42,8 +42,8 @@
		block discarded – undo
42	42
43	43	$name = _xrds_strip_namespace($name);
44	44	if ($name == 'SERVICE') {
45		- if (in_array(OPENID_NS_2_0 .'/signon', $xrds_current_service['types']) \|\|
46		- in_array(OPENID_NS_2_0 .'/server', $xrds_current_service['types'])) {
	45	+ if (in_array(OPENID_NS_2_0.'/signon', $xrds_current_service['types']) \|\|
	46	+ in_array(OPENID_NS_2_0.'/server', $xrds_current_service['types'])) {
47	47	$xrds_current_service['version'] = 2;
48	48	}
49	49	elseif (in_array(OPENID_NS_1_1, $xrds_current_service['types']) \|\|

		@@ -45,8 +45,7 @@
		block discarded – undo
45	45	if (in_array(OPENID_NS_2_0 .'/signon', $xrds_current_service['types']) \|\|
46	46	in_array(OPENID_NS_2_0 .'/server', $xrds_current_service['types'])) {
47	47	$xrds_current_service['version'] = 2;
48		- }
49		- elseif (in_array(OPENID_NS_1_1, $xrds_current_service['types']) \|\|
	48	+ } elseif (in_array(OPENID_NS_1_1, $xrds_current_service['types']) \|\|
50	49	in_array(OPENID_NS_1_0, $xrds_current_service['types'])) {
51	50	$xrds_current_service['version'] = 1;
52	51	}

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

		@@ -61,8 +61,9 @@
		block discarded – undo
61	61	*/
62	62	function _openid_is_xri($identifier) {
63	63	$firstchar = substr($identifier, 0, 1);
64		- if ($firstchar == "@" \|\| $firstchar == "=")
65		- return TRUE;
	64	+ if ($firstchar == "@" \|\| $firstchar == "=") {
	65	+ return TRUE;
	66	+ }
66	67
67	68	if (stristr($identifier, 'xri://') !== FALSE) {
68	69	return TRUE;

		@@ -242,6 +242,9 @@ discard block
		block discarded – undo
242	242	return $hmac;
243	243	}
244	244
	245	+/**
	246	+ * @param string\|false $text
	247	+ */
245	248	function _openid_sha1($text) {
246	249	$hex = sha1($text);
247	250	$raw = '';
		@@ -404,6 +407,10 @@ discard block
		block discarded – undo
404	407	*/
405	408	if (!function_exists('bcpowmod')) {
406	409
	410	+ /**
	411	+ * @param string $exp
	412	+ * @param string $mod
	413	+ */
407	414	function bcpowmod($base, $exp, $mod) {
408	415	$square = bcmod($base, $mod);
409	416	$result = 1;

chamilo / chamilo-lms

Push — 1.11.x ( 747e79...744431 )

Status

Category

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

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

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

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

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

Spacing +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

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

Indentation +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

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

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

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

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

Braces +3 added lines, -2 removed lines patch added patch discarded remove patch

Doc Comments +7 added lines patch added patch discarded remove patch