Inspection of "Minor - Indent code" - chamilo/chamilo-lms - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — 1.10.x ( ef00db...25211a )

by Yannick

created 2016-05-18 16:33 UTC

Status

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 1 patch

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.

user_portal.php 1 patch

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.

news_list.php 1 patch

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.

main/auth/openid/xrds.lib.php 1 patch

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.

main/auth/profile.php 1 patch

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

@@ -684,7 +684,7 @@
 block discarded – undo
 
     foreach ($user_data as $key => $value) {
         if (substr($key, 0, 6) == 'extra_') { //an extra field
-           continue;
+            continue;
         } elseif (strpos($key, 'remove_extra_') !== false) {
         } else {
             if (in_array($key, $available_values_to_modify)) {

Please login to merge, or discard this patch.

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

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

@@ -44,167 +44,167 @@
 block discarded – undo
 
 class PGTStorage
 {
-  /** 
-   * @addtogroup internalPGTStorage
-   * @{ 
-   */
-
-  // ########################################################################
-  //  CONSTRUCTOR
-  // ########################################################################
+    /** 
+     * @addtogroup internalPGTStorage
+     * @{ 
+     */
+
+    // ########################################################################
+    //  CONSTRUCTOR
+    // ########################################################################
   
-  /**
-   * The constructor of the class, should be called only by inherited classes.
-   *
-   * @param $cas_parent the CASclient instance that creates the current object.
-   *
-   * @protected
-   */
-  function PGTStorage($cas_parent)
+    /**
+     * The constructor of the class, should be called only by inherited classes.
+     *
+     * @param $cas_parent the CASclient instance that creates the current object.
+     *
+     * @protected
+     */
+    function PGTStorage($cas_parent)
     {
-      phpCAS::traceBegin();
-      if ( !$cas_parent->isProxy() ) {
-	phpCAS::error('defining PGT storage makes no sense when not using a CAS proxy'); 
-      }
-      phpCAS::traceEnd();
+        phpCAS::traceBegin();
+        if ( !$cas_parent->isProxy() ) {
+    phpCAS::error('defining PGT storage makes no sense when not using a CAS proxy'); 
+        }
+        phpCAS::traceEnd();
     }
 
-  // ########################################################################
-  //  DEBUGGING
-  // ########################################################################
+    // ########################################################################
+    //  DEBUGGING
+    // ########################################################################
   
-  /**
-   * This virtual method returns an informational string giving the type of storage
-   * used by the object (used for debugging purposes).
-   *
-   * @public
-   */
-  function getStorageType()
+    /**
+     * This virtual method returns an informational string giving the type of storage
+     * used by the object (used for debugging purposes).
+     *
+     * @public
+     */
+    function getStorageType()
     {
-      phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); 
+        phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); 
     }
 
-  /**
-   * This virtual method returns an informational string giving informations on the
-   * parameters of the storage.(used for debugging purposes).
-   *
-   * @public
-   */
-  function getStorageInfo()
+    /**
+     * This virtual method returns an informational string giving informations on the
+     * parameters of the storage.(used for debugging purposes).
+     *
+     * @public
+     */
+    function getStorageInfo()
     {
-      phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); 
+        phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); 
     }
 
-  // ########################################################################
-  //  ERROR HANDLING
-  // ########################################################################
+    // ########################################################################
+    //  ERROR HANDLING
+    // ########################################################################
   
-  /**
-   * string used to store an error message. Written by PGTStorage::setErrorMessage(),
-   * read by PGTStorage::getErrorMessage().
-   *
-   * @hideinitializer
-   * @private
-   * @deprecated not used.
-   */
-  var $_error_message=FALSE;
-
-  /**
-   * This method sets en error message, which can be read later by 
-   * PGTStorage::getErrorMessage().
-   *
-   * @param $error_message an error message
-   *
-   * @protected
-   * @deprecated not used.
-   */
-  function setErrorMessage($error_message)
+    /**
+     * string used to store an error message. Written by PGTStorage::setErrorMessage(),
+     * read by PGTStorage::getErrorMessage().
+     *
+     * @hideinitializer
+     * @private
+     * @deprecated not used.
+     */
+    var $_error_message=FALSE;
+
+    /**
+     * This method sets en error message, which can be read later by 
+     * PGTStorage::getErrorMessage().
+     *
+     * @param $error_message an error message
+     *
+     * @protected
+     * @deprecated not used.
+     */
+    function setErrorMessage($error_message)
     {
-      $this->_error_message = $error_message;
+        $this->_error_message = $error_message;
     }
 
-  /**
-   * This method returns an error message set by PGTStorage::setErrorMessage().
-   *
-   * @return an error message when set by PGTStorage::setErrorMessage(), FALSE
-   * otherwise.
-   *
-   * @public
-   * @deprecated not used.
-   */
-  function getErrorMessage()
+    /**
+     * This method returns an error message set by PGTStorage::setErrorMessage().
+     *
+     * @return an error message when set by PGTStorage::setErrorMessage(), FALSE
+     * otherwise.
+     *
+     * @public
+     * @deprecated not used.
+     */
+    function getErrorMessage()
     {
-      return $this->_error_message;
+        return $this->_error_message;
     }
 
-  // ########################################################################
-  //  INITIALIZATION
-  // ########################################################################
-
-  /**
-   * a boolean telling if the storage has already been initialized. Written by 
-   * PGTStorage::init(), read by PGTStorage::isInitialized().
-   *
-   * @hideinitializer
-   * @private
-   */
-  var $_initialized = FALSE;
-
-  /**
-   * This method tells if the storage has already been intialized.
-   *
-   * @return a boolean
-   *
-   * @protected
-   */
-  function isInitialized()
+    // ########################################################################
+    //  INITIALIZATION
+    // ########################################################################
+
+    /**
+     * a boolean telling if the storage has already been initialized. Written by 
+     * PGTStorage::init(), read by PGTStorage::isInitialized().
+     *
+     * @hideinitializer
+     * @private
+     */
+    var $_initialized = FALSE;
+
+    /**
+     * This method tells if the storage has already been intialized.
+     *
+     * @return a boolean
+     *
+     * @protected
+     */
+    function isInitialized()
     {
-      return $this->_initialized;
+        return $this->_initialized;
     }
 
-  /**
-   * This virtual method initializes the object.
-   *
-   * @protected
-   */
-  function init()
+    /**
+     * This virtual method initializes the object.
+     *
+     * @protected
+     */
+    function init()
     {
-      $this->_initialized = TRUE;
+        $this->_initialized = TRUE;
     }
 
-  // ########################################################################
-  //  PGT I/O
-  // ########################################################################
-
-  /**
-   * This virtual method stores a PGT and its corresponding PGT Iuo.
-   * @note Should never be called.
-   *
-   * @param $pgt the PGT
-   * @param $pgt_iou the PGT iou
-   *
-   * @protected
-   */
-  function write($pgt,$pgt_iou)
+    // ########################################################################
+    //  PGT I/O
+    // ########################################################################
+
+    /**
+     * This virtual method stores a PGT and its corresponding PGT Iuo.
+     * @note Should never be called.
+     *
+     * @param $pgt the PGT
+     * @param $pgt_iou the PGT iou
+     *
+     * @protected
+     */
+    function write($pgt,$pgt_iou)
     {
-      phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); 
+        phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); 
     }
 
-  /**
-   * This virtual method reads a PGT corresponding to a PGT Iou and deletes
-   * the corresponding storage entry.
-   * @note Should never be called.
-   *
-   * @param $pgt_iou the PGT iou
-   *
-   * @protected
-   */
-  function read($pgt_iou)
+    /**
+     * This virtual method reads a PGT corresponding to a PGT Iou and deletes
+     * the corresponding storage entry.
+     * @note Should never be called.
+     *
+     * @param $pgt_iou the PGT iou
+     *
+     * @protected
+     */
+    function read($pgt_iou)
     {
-      phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); 
+        phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); 
     }
 
-  /** @} */
+    /** @} */
   
 } 
 

Please login to merge, or discard this patch.

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

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

@@ -8,20 +8,20 @@
 block discarded – undo
  */
 
 $this->_strings = array(
- CAS_STR_USING_SERVER 
- => 'via Server',
- CAS_STR_AUTHENTICATION_WANTED 
- => 'CAS Authentifizierung erforderlich!',
- CAS_STR_LOGOUT 
- => 'CAS Abmeldung!',
- CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 
- => 'eigentlich h&auml;ten Sie zum CAS Server weitergeleitet werden sollen. Dr&uuml;cken Sie <a href="%s">hier</a> um fortzufahren.',
- CAS_STR_AUTHENTICATION_FAILED 
- => 'CAS Anmeldung fehlgeschlagen!',
- CAS_STR_YOU_WERE_NOT_AUTHENTICATED 
- => '<p>Sie wurden nicht angemeldet.</p><p>Um es erneut zu versuchen klicken Sie <a href="%s">hier</a>.</p><p>Wenn das Problem bestehen bleibt, kontkatieren Sie den <a href="mailto:%s">Administrator</a> dieser Seite.</p>',
- CAS_STR_SERVICE_UNAVAILABLE
- => 'Der Dienst `<b>%s</b>\' ist nicht verf&uuml;gbar (<b>%s</b>).'
+    CAS_STR_USING_SERVER 
+    => 'via Server',
+    CAS_STR_AUTHENTICATION_WANTED 
+    => 'CAS Authentifizierung erforderlich!',
+    CAS_STR_LOGOUT 
+    => 'CAS Abmeldung!',
+    CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 
+    => 'eigentlich h&auml;ten Sie zum CAS Server weitergeleitet werden sollen. Dr&uuml;cken Sie <a href="%s">hier</a> um fortzufahren.',
+    CAS_STR_AUTHENTICATION_FAILED 
+    => 'CAS Anmeldung fehlgeschlagen!',
+    CAS_STR_YOU_WERE_NOT_AUTHENTICATED 
+    => '<p>Sie wurden nicht angemeldet.</p><p>Um es erneut zu versuchen klicken Sie <a href="%s">hier</a>.</p><p>Wenn das Problem bestehen bleibt, kontkatieren Sie den <a href="mailto:%s">Administrator</a> dieser Seite.</p>',
+    CAS_STR_SERVICE_UNAVAILABLE
+    => 'Der Dienst `<b>%s</b>\' ist nicht verf&uuml;gbar (<b>%s</b>).'
 );
 
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

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

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

@@ -8,20 +8,20 @@
 block discarded – undo
  */
 
 $this->_strings = array(
- CAS_STR_USING_SERVER 
- => 'usant servidor',
- CAS_STR_AUTHENTICATION_WANTED 
- => 'Autentificació CAS necessària!',
- CAS_STR_LOGOUT 
- => 'Sortida de CAS necessària!',
- CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 
- => 'Ja hauria d\ haver estat redireccionat al servidor CAS. Feu click <a href="%s">aquí</a> per a continuar.',
- CAS_STR_AUTHENTICATION_FAILED 
- => 'Autentificació CAS fallida!',
- CAS_STR_YOU_WERE_NOT_AUTHENTICATED 
- => '<p>No estàs autentificat.</p><p>Pots tornar a intentar-ho fent click <a href="%s">aquí</a>.</p><p>Si el problema persisteix hauría de contactar amb l\'<a href="mailto:%s">administrador d\'aquest llocc</a>.</p>',
- CAS_STR_SERVICE_UNAVAILABLE
- => 'El servei `<b>%s</b>\' no està disponible (<b>%s</b>).'
+    CAS_STR_USING_SERVER 
+    => 'usant servidor',
+    CAS_STR_AUTHENTICATION_WANTED 
+    => 'Autentificació CAS necessària!',
+    CAS_STR_LOGOUT 
+    => 'Sortida de CAS necessària!',
+    CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 
+    => 'Ja hauria d\ haver estat redireccionat al servidor CAS. Feu click <a href="%s">aquí</a> per a continuar.',
+    CAS_STR_AUTHENTICATION_FAILED 
+    => 'Autentificació CAS fallida!',
+    CAS_STR_YOU_WERE_NOT_AUTHENTICATED 
+    => '<p>No estàs autentificat.</p><p>Pots tornar a intentar-ho fent click <a href="%s">aquí</a>.</p><p>Si el problema persisteix hauría de contactar amb l\'<a href="mailto:%s">administrador d\'aquest llocc</a>.</p>',
+    CAS_STR_SERVICE_UNAVAILABLE
+    => 'El servei `<b>%s</b>\' no està disponible (<b>%s</b>).'
 );
 
 ?>

Please login to merge, or discard this patch.

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

		@@ -684,7 +684,7 @@
		block discarded – undo
684	684
685	685	foreach ($user_data as $key => $value) {
686	686	if (substr($key, 0, 6) == 'extra_') { //an extra field
687		- continue;
	687	+ continue;
688	688	} elseif (strpos($key, 'remove_extra_') !== false) {
689	689	} else {
690	690	if (in_array($key, $available_values_to_modify)) {

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

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

		@@ -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	}

		@@ -44,167 +44,167 @@
		block discarded – undo
44	44
45	45	class PGTStorage
46	46	{
47		- /**
48		- * @addtogroup internalPGTStorage
49		- * @{
50		- */
51		-
52		- // ########################################################################
53		- // CONSTRUCTOR
54		- // ########################################################################
	47	+ /**
	48	+ * @addtogroup internalPGTStorage
	49	+ * @{
	50	+ */
	51	+
	52	+ // ########################################################################
	53	+ // CONSTRUCTOR
	54	+ // ########################################################################
55	55
56		- /**
57		- * The constructor of the class, should be called only by inherited classes.
58		- *
59		- * @param $cas_parent the CASclient instance that creates the current object.
60		- *
61		- * @protected
62		- */
63		- function PGTStorage($cas_parent)
	56	+ /**
	57	+ * The constructor of the class, should be called only by inherited classes.
	58	+ *
	59	+ * @param $cas_parent the CASclient instance that creates the current object.
	60	+ *
	61	+ * @protected
	62	+ */
	63	+ function PGTStorage($cas_parent)
64	64	{
65		- phpCAS::traceBegin();
66		- if ( !$cas_parent->isProxy() ) {
67		- phpCAS::error('defining PGT storage makes no sense when not using a CAS proxy');
68		- }
69		- phpCAS::traceEnd();
	65	+ phpCAS::traceBegin();
	66	+ if ( !$cas_parent->isProxy() ) {
	67	+ phpCAS::error('defining PGT storage makes no sense when not using a CAS proxy');
	68	+ }
	69	+ phpCAS::traceEnd();
70	70	}
71	71
72		- // ########################################################################
73		- // DEBUGGING
74		- // ########################################################################
	72	+ // ########################################################################
	73	+ // DEBUGGING
	74	+ // ########################################################################
75	75
76		- /**
77		- * This virtual method returns an informational string giving the type of storage
78		- * used by the object (used for debugging purposes).
79		- *
80		- * @public
81		- */
82		- function getStorageType()
	76	+ /**
	77	+ * This virtual method returns an informational string giving the type of storage
	78	+ * used by the object (used for debugging purposes).
	79	+ *
	80	+ * @public
	81	+ */
	82	+ function getStorageType()
83	83	{
84		- phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called');
	84	+ phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called');
85	85	}
86	86
87		- /**
88		- * This virtual method returns an informational string giving informations on the
89		- * parameters of the storage.(used for debugging purposes).
90		- *
91		- * @public
92		- */
93		- function getStorageInfo()
	87	+ /**
	88	+ * This virtual method returns an informational string giving informations on the
	89	+ * parameters of the storage.(used for debugging purposes).
	90	+ *
	91	+ * @public
	92	+ */
	93	+ function getStorageInfo()
94	94	{
95		- phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called');
	95	+ phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called');
96	96	}
97	97
98		- // ########################################################################
99		- // ERROR HANDLING
100		- // ########################################################################
	98	+ // ########################################################################
	99	+ // ERROR HANDLING
	100	+ // ########################################################################
101	101
102		- /**
103		- * string used to store an error message. Written by PGTStorage::setErrorMessage(),
104		- * read by PGTStorage::getErrorMessage().
105		- *
106		- * @hideinitializer
107		- * @private
108		- * @deprecated not used.
109		- */
110		- var $_error_message=FALSE;
111		-
112		- /**
113		- * This method sets en error message, which can be read later by
114		- * PGTStorage::getErrorMessage().
115		- *
116		- * @param $error_message an error message
117		- *
118		- * @protected
119		- * @deprecated not used.
120		- */
121		- function setErrorMessage($error_message)
	102	+ /**
	103	+ * string used to store an error message. Written by PGTStorage::setErrorMessage(),
	104	+ * read by PGTStorage::getErrorMessage().
	105	+ *
	106	+ * @hideinitializer
	107	+ * @private
	108	+ * @deprecated not used.
	109	+ */
	110	+ var $_error_message=FALSE;
	111	+
	112	+ /**
	113	+ * This method sets en error message, which can be read later by
	114	+ * PGTStorage::getErrorMessage().
	115	+ *
	116	+ * @param $error_message an error message
	117	+ *
	118	+ * @protected
	119	+ * @deprecated not used.
	120	+ */
	121	+ function setErrorMessage($error_message)
122	122	{
123		- $this->_error_message = $error_message;
	123	+ $this->_error_message = $error_message;
124	124	}
125	125
126		- /**
127		- * This method returns an error message set by PGTStorage::setErrorMessage().
128		- *
129		- * @return an error message when set by PGTStorage::setErrorMessage(), FALSE
130		- * otherwise.
131		- *
132		- * @public
133		- * @deprecated not used.
134		- */
135		- function getErrorMessage()
	126	+ /**
	127	+ * This method returns an error message set by PGTStorage::setErrorMessage().
	128	+ *
	129	+ * @return an error message when set by PGTStorage::setErrorMessage(), FALSE
	130	+ * otherwise.
	131	+ *
	132	+ * @public
	133	+ * @deprecated not used.
	134	+ */
	135	+ function getErrorMessage()
136	136	{
137		- return $this->_error_message;
	137	+ return $this->_error_message;
138	138	}
139	139
140		- // ########################################################################
141		- // INITIALIZATION
142		- // ########################################################################
143		-
144		- /**
145		- * a boolean telling if the storage has already been initialized. Written by
146		- * PGTStorage::init(), read by PGTStorage::isInitialized().
147		- *
148		- * @hideinitializer
149		- * @private
150		- */
151		- var $_initialized = FALSE;
152		-
153		- /**
154		- * This method tells if the storage has already been intialized.
155		- *
156		- * @return a boolean
157		- *
158		- * @protected
159		- */
160		- function isInitialized()
	140	+ // ########################################################################
	141	+ // INITIALIZATION
	142	+ // ########################################################################
	143	+
	144	+ /**
	145	+ * a boolean telling if the storage has already been initialized. Written by
	146	+ * PGTStorage::init(), read by PGTStorage::isInitialized().
	147	+ *
	148	+ * @hideinitializer
	149	+ * @private
	150	+ */
	151	+ var $_initialized = FALSE;
	152	+
	153	+ /**
	154	+ * This method tells if the storage has already been intialized.
	155	+ *
	156	+ * @return a boolean
	157	+ *
	158	+ * @protected
	159	+ */
	160	+ function isInitialized()
161	161	{
162		- return $this->_initialized;
	162	+ return $this->_initialized;
163	163	}
164	164
165		- /**
166		- * This virtual method initializes the object.
167		- *
168		- * @protected
169		- */
170		- function init()
	165	+ /**
	166	+ * This virtual method initializes the object.
	167	+ *
	168	+ * @protected
	169	+ */
	170	+ function init()
171	171	{
172		- $this->_initialized = TRUE;
	172	+ $this->_initialized = TRUE;
173	173	}
174	174
175		- // ########################################################################
176		- // PGT I/O
177		- // ########################################################################
178		-
179		- /**
180		- * This virtual method stores a PGT and its corresponding PGT Iuo.
181		- * @note Should never be called.
182		- *
183		- * @param $pgt the PGT
184		- * @param $pgt_iou the PGT iou
185		- *
186		- * @protected
187		- */
188		- function write($pgt,$pgt_iou)
	175	+ // ########################################################################
	176	+ // PGT I/O
	177	+ // ########################################################################
	178	+
	179	+ /**
	180	+ * This virtual method stores a PGT and its corresponding PGT Iuo.
	181	+ * @note Should never be called.
	182	+ *
	183	+ * @param $pgt the PGT
	184	+ * @param $pgt_iou the PGT iou
	185	+ *
	186	+ * @protected
	187	+ */
	188	+ function write($pgt,$pgt_iou)
189	189	{
190		- phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called');
	190	+ phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called');
191	191	}
192	192
193		- /**
194		- * This virtual method reads a PGT corresponding to a PGT Iou and deletes
195		- * the corresponding storage entry.
196		- * @note Should never be called.
197		- *
198		- * @param $pgt_iou the PGT iou
199		- *
200		- * @protected
201		- */
202		- function read($pgt_iou)
	193	+ /**
	194	+ * This virtual method reads a PGT corresponding to a PGT Iou and deletes
	195	+ * the corresponding storage entry.
	196	+ * @note Should never be called.
	197	+ *
	198	+ * @param $pgt_iou the PGT iou
	199	+ *
	200	+ * @protected
	201	+ */
	202	+ function read($pgt_iou)
203	203	{
204		- phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called');
	204	+ phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called');
205	205	}
206	206
207		- /** @} */
	207	+ /** @} */
208	208
209	209	}
210	210

		@@ -8,20 +8,20 @@
		block discarded – undo
8	8	*/
9	9
10	10	$this->_strings = array(
11		- CAS_STR_USING_SERVER
12		- => 'via Server',
13		- CAS_STR_AUTHENTICATION_WANTED
14		- => 'CAS Authentifizierung erforderlich!',
15		- CAS_STR_LOGOUT
16		- => 'CAS Abmeldung!',
17		- CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED
18		- => 'eigentlich häten Sie zum CAS Server weitergeleitet werden sollen. Drücken Sie <a href="%s">hier</a> um fortzufahren.',
19		- CAS_STR_AUTHENTICATION_FAILED
20		- => 'CAS Anmeldung fehlgeschlagen!',
21		- CAS_STR_YOU_WERE_NOT_AUTHENTICATED
22		- => '<p>Sie wurden nicht angemeldet.</p><p>Um es erneut zu versuchen klicken Sie <a href="%s">hier</a>.</p><p>Wenn das Problem bestehen bleibt, kontkatieren Sie den <a href="mailto:%s">Administrator</a> dieser Seite.</p>',
23		- CAS_STR_SERVICE_UNAVAILABLE
24		- => 'Der Dienst `<b>%s</b>\' ist nicht verfügbar (<b>%s</b>).'
	11	+ CAS_STR_USING_SERVER
	12	+ => 'via Server',
	13	+ CAS_STR_AUTHENTICATION_WANTED
	14	+ => 'CAS Authentifizierung erforderlich!',
	15	+ CAS_STR_LOGOUT
	16	+ => 'CAS Abmeldung!',
	17	+ CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED
	18	+ => 'eigentlich häten Sie zum CAS Server weitergeleitet werden sollen. Drücken Sie <a href="%s">hier</a> um fortzufahren.',
	19	+ CAS_STR_AUTHENTICATION_FAILED
	20	+ => 'CAS Anmeldung fehlgeschlagen!',
	21	+ CAS_STR_YOU_WERE_NOT_AUTHENTICATED
	22	+ => '<p>Sie wurden nicht angemeldet.</p><p>Um es erneut zu versuchen klicken Sie <a href="%s">hier</a>.</p><p>Wenn das Problem bestehen bleibt, kontkatieren Sie den <a href="mailto:%s">Administrator</a> dieser Seite.</p>',
	23	+ CAS_STR_SERVICE_UNAVAILABLE
	24	+ => 'Der Dienst `<b>%s</b>\' ist nicht verfügbar (<b>%s</b>).'
25	25	);
26	26
27	27	?>
28	28	\ No newline at end of file

chamilo / chamilo-lms

Push — 1.10.x ( ef00db...25211a )

Status

Category

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

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

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

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

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

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

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

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