chamilo / chamilo-lms

app/config/auth.conf.dist.php

Indentation +21 added lines, -21 removed lines

@@ -39,29 +39,29 @@
  * 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
 );
 
 

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
   //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

news_list.php

Indentation +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 
 $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>';
 }
 

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 }
 
 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);
 }

main/auth/openid/xrds.lib.php

Indentation +29 added lines, -29 removed lines

@@ -16,70 +16,70 @@
  * 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;
 }

Spacing +2 added lines, -2 removed lines

@@ -42,8 +42,8 @@
 
   $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']) ||

Braces +1 added lines, -2 removed lines

@@ -45,8 +45,7 @@
     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;
     }

main/auth/openid/openid.lib.php

Braces +3 added lines, -2 removed lines

@@ -61,8 +61,9 @@
  */
 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;

Doc Comments +7 added lines

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

Spacing +23 added lines, -23 removed lines

@@ -9,10 +9,10 @@ 
  * 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 @@ 
 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 @@ 
  * 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 @@ 
     $normalized_url = $url;
 
     if (stristr($url, '://') === FALSE) {
-        $normalized_url = 'http://' . $url;
+        $normalized_url = 'http://'.$url;
     }
 
     if (substr_count($normalized_url, '/') < 3) {
@@ -134,7 +134,7 @@ 
             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]));
         }
     }
 
@@ -165,10 +165,10 @@ 
  */
 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);
 }
 
@@ -178,7 +178,7 @@ 
  */
 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]);
@@ -191,7 +191,7 @@ 
  * @param string $equiv
  */
 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];
@@ -212,8 +212,8 @@ 
     $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];
         }
     }
 
@@ -236,8 +236,8 @@ 
     $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;
 }
@@ -353,7 +353,7 @@ 
     }
 
     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);

main/auth/lostPassword.php

Indentation +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 
 // Forbidden to retrieve the lost password
 if (api_get_setting('allow_lostpassword') == 'false') {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 $reset = Request::get('reset');

Spacing +6 added lines, -6 removed lines

@@ -47,7 +47,7 @@ 
     Display::addFlash(
         Display::return_message($messageText, 'info', false)
     );
-    header('Location: ' . api_get_path(WEB_PATH));
+    header('Location: '.api_get_path(WEB_PATH));
     exit;
 }
 
@@ -74,7 +74,7 @@ 
         Display::addFlash(
             Display::return_message($messageText, 'error', false)
         );
-        header('Location: ' . api_get_self());
+        header('Location: '.api_get_self());
         exit;
     }
 
@@ -94,7 +94,7 @@ 
         Display::addFlash(
             Display::return_message($messageText, 'info', false)
         );
-        header('Location: ' . api_get_path(WEB_PATH));
+        header('Location: '.api_get_path(WEB_PATH));
         exit;
     }
 
@@ -102,7 +102,7 @@ 
         Display::addFlash(
             Display::return_message(get_lang('CouldNotResetPasswordBecauseLDAP'), 'info', false)
         );
-        header('Location: ' . api_get_path(WEB_PATH));
+        header('Location: '.api_get_path(WEB_PATH));
         exit;
     }
 
@@ -121,7 +121,7 @@ 
             exit;
         }
 
-        header('Location: ' . api_get_path(WEB_PATH));
+        header('Location: '.api_get_path(WEB_PATH));
         exit;
     }
 
@@ -138,7 +138,7 @@ 
     Display::addFlash(
         Display::return_message($messageText, 'info', false)
     );
-    header('Location: ' . api_get_path(WEB_PATH));
+    header('Location: '.api_get_path(WEB_PATH));
     exit;
 }
 

main/auth/cas/logout.php

Spacing +1 added lines, -1 removed lines

@@ -9,5 +9,5 @@
 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();

main/auth/cas/logincas.php

Spacing +1 added lines, -1 removed lines

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

main/auth/gotocourse.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 

     $msg .= '<div class="well_login">';

     $msg .= $form->return_form();

-    $msg .='</div>';

+    $msg .= '</div>';

     if (api_is_cas_activated()) {

         $msg .= "</div>";

     }

main/auth/conditional_login/complete_phone_number.php

Indentation +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 $url =  api_get_path(WEB_PATH).'main/auth/conditional_login/complete_phone_number.php';
 
 if (! isset($_SESSION['conditional_login']['uid']))
-  die("Not Authorised");
+    die("Not Authorised");
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html lang="fr" xml:lang="fr" xmlns="http://www.w3.org/1999/xhtml">

Spacing +3 added lines, -3 removed lines

@@ -2,9 +2,9 @@ 
 /* For licensing terms, see /license.txt */
 
 require_once dirname(__FILE__).'/../../inc/global.inc.php';
-$url =  api_get_path(WEB_PATH).'main/auth/conditional_login/complete_phone_number.php';
+$url = api_get_path(WEB_PATH).'main/auth/conditional_login/complete_phone_number.php';
 
-if (! isset($_SESSION['conditional_login']['uid']))
+if (!isset($_SESSION['conditional_login']['uid']))
   die("Not Authorised");
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -20,7 +20,7 @@ 
   </body>
 </html>
 <?php
-if (isset($_POST['submit'])){
+if (isset($_POST['submit'])) {
     $u = api_get_user_info($_SESSION['conditional_login']['uid']);
     $u['phone'] = $_POST['phone_number'];
     $password = null; // we don't want to change the password

Braces +2 added lines, -1 removed lines

@@ -4,8 +4,9 @@
 require_once dirname(__FILE__).'/../../inc/global.inc.php';
 $url =  api_get_path(WEB_PATH).'main/auth/conditional_login/complete_phone_number.php';
 
-if (! isset($_SESSION['conditional_login']['uid']))
+if (! isset($_SESSION['conditional_login']['uid'])) {
   die("Not Authorised");
+}
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html lang="fr" xml:lang="fr" xmlns="http://www.w3.org/1999/xhtml">