chamilo / chamilo-lms

app/Migrations/AbstractMigrationChamilo.php

Doc Comments +1 added lines, -1 removed lines

@@ -124,7 +124,7 @@
     }
 
     /**
-     * @param $variable
+     * @param string $variable
      * @return mixed
      */
     public function getConfigurationValue($variable)

main/admin/settings.lib.php

Doc Comments +3 added lines, -3 removed lines

@@ -907,7 +907,7 @@ 
  * display the edit and delete icons in the sortable table
  *
  * @param integer $id the id of the template
- * @return html code for the link to edit and delete the template
+ * @return string code for the link to edit and delete the template
  *
  * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University, Belgium
  * @version August 2008
@@ -923,7 +923,7 @@ 
  * Display the image of the template in the sortable table
  *
  * @param string $image the image
- * @return html code for the image
+ * @return string code for the image
  *
  * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University, Belgium
  * @version August 2008
@@ -1120,7 +1120,7 @@ 
 /**
  * Returns an array containing the list of options used to populate the gradebook_number_decimals variable
  * This function is called through a call_user_func() in the generate_settings_form function.
- * @return array List of gradebook_number_decimals options
+ * @return string[] List of gradebook_number_decimals options
  *
  * @author Guillaume Viguier <guillaume.viguier@beeznest.com>
  */

Braces +15 added lines, -10 removed lines

@@ -471,8 +471,9 @@ 
                     $extraction_path = $cssToUpload.$style_name.'/';
                     for ($i = 0; $i < $num_files; $i++) {
                         $entry = $zip->getNameIndex($i);
-                        if (substr($entry, -1) == '/')
-                            continue;
+                        if (substr($entry, -1) == '/') {
+                                                    continue;
+                        }
 
                         $pos_slash = strpos($entry, '/');
                         $entry_without_first_dir = substr($entry, $pos_slash + 1);
@@ -1231,17 +1232,21 @@ 
                 $hideme = array('disabled');
             } elseif ($url_info['active'] == 1) {
                 // We show the elements.
-                if (empty($row['variable']))
-                    $row['variable'] = 0;
-                if (empty($row['subkey']))
-                    $row['subkey'] = 0;
-                if (empty($row['category']))
-                    $row['category'] = 0;
+                if (empty($row['variable'])) {
+                                    $row['variable'] = 0;
+                }
+                if (empty($row['subkey'])) {
+                                    $row['subkey'] = 0;
+                }
+                if (empty($row['category'])) {
+                                    $row['category'] = 0;
+                }
 
                 if (is_array($settings_by_access_list[ $row['variable'] ] [ $row['subkey'] ] [ $row['category'] ])) {
                     // We are sure that the other site have a selected value.
-                    if ($settings_by_access_list[ $row['variable'] ] [ $row['subkey'] ] [ $row['category'] ]['selected_value'] != '')
-                        $row['selected_value'] = $settings_by_access_list[$row['variable']] [$row['subkey']] [$row['category']]['selected_value'];
+                    if ($settings_by_access_list[ $row['variable'] ] [ $row['subkey'] ] [ $row['category'] ]['selected_value'] != '') {
+                                            $row['selected_value'] = $settings_by_access_list[$row['variable']] [$row['subkey']] [$row['category']]['selected_value'];
+                    }
                 }
                 // There is no else{} statement because we load the default $row['selected_value'] of the main Chamilo site.
             }

main/admin/sub_language_add.php

Doc Comments +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
  * @param   string  ISO code (fr_FR, ...)
  * @param   int     Whether the sublanguage is published (0=unpublished, 1=published)
  * @param   int     ID del idioma padre
- * @return  int     New sub language ID or false on error
+ * @return  false|string     New sub language ID or false on error
  */
 function add_sub_language ($original_name,$english_name,$isocode,$sublanguage_available,$parent_id) {
     $tbl_admin_languages    = Database :: get_main_table(TABLE_MAIN_LANGUAGE);

main/admin/user_update_import.php

Doc Comments +1 added lines, -1 removed lines

@@ -128,7 +128,7 @@
 /**
  * Update users from the imported data
  * @param   array   $users List of users
- * @return  void
+ * @return  false|null
  * @uses global variable $inserted_in_course, which returns the list of courses the user was inserted in
  */
 

Braces +4 added lines, -1 removed lines

@@ -454,7 +454,10 @@
     <blockquote>
         <pre>
             <b>UserName</b>;LastName;FirstName;Email;NewUserName;Password;AuthSource;OfficialCode;PhoneNumber;Status;ExpiryDate;Active;Language;Courses;ClassId;
-            xxx;xxx;xxx;xxx;xxx;xxx;xxx;xxx;xxx;user/teacher/drh;0000-00-00 00:00:00;0/1;xxx;<span style="color:red;"><?php if (count($list_reponse) > 0) echo implode(';', $list_reponse).';'; ?></span>xxx1|xxx2|xxx3;1;<br />
+            xxx;xxx;xxx;xxx;xxx;xxx;xxx;xxx;xxx;user/teacher/drh;0000-00-00 00:00:00;0/1;xxx;<span style="color:red;"><?php if (count($list_reponse) > 0) {
+    echo implode(';', $list_reponse).';';
+}
+?></span>xxx1|xxx2|xxx3;1;<br />
         </pre>
     </blockquote>
 <p><?php

main/attendance/attendance_controller.php

Doc Comments +1 added lines, -1 removed lines

@@ -206,7 +206,7 @@
 
     /**
      * Restores an attendance entry and fallback to attendances rendering
-     * @param int	$attendanceId
+     * @param int	$attendance_id
      */
     public function attendance_restore($attendance_id)
     {

Braces +5 added lines, -4 removed lines

@@ -529,10 +529,11 @@
                 $result['full_name'] = api_get_person_name($user['firstname'], $user['lastname']);
                 foreach ($data_array['attendant_calendar'] as $class_day) {
                     if ($class_day['done_attendance'] == 1) {
-                        if ($data_users_presence[$user['user_id']][$class_day['id']]['presence'] == 1)
-                            $result[$class_day['id']] = get_lang('UserAttendedSymbol');
-                        else
-                            $result[$class_day['id']] = '<span style="color:red">'.get_lang('UserNotAttendedSymbol').'</span>';
+                        if ($data_users_presence[$user['user_id']][$class_day['id']]['presence'] == 1) {
+                                                    $result[$class_day['id']] = get_lang('UserAttendedSymbol');
+                        } else {
+                                                    $result[$class_day['id']] = '<span style="color:red">'.get_lang('UserNotAttendedSymbol').'</span>';
+                        }
                     } else {
                         $result[$class_day['id']] = " ";
                     }

main/auth/cas/authcas.php

Doc Comments +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 require_once api_get_path(SYS_PATH).'main/auth/external_login/functions.inc.php';
 
 /**
-* @return true if cas is configured
+* @return boolean if cas is configured
 *
 **/
 function cas_configured() {

main/auth/cas/lib/CAS.php

Doc Comments +4 added lines, -4 removed lines

@@ -516,7 +516,7 @@ 
 	/**

 	 * Logs a string in debug mode.

 	 *

-	 * @param $str the string to write

+	 * @param string $str the string to write

 	 *

 	 * @private

 	 */

@@ -537,7 +537,7 @@ 
 	 * This method is used by interface methods to print an error and where the function

 	 * was originally called from.

 	 *

-	 * @param $msg the message to print

+	 * @param string $msg the message to print

 	 *

 	 * @private

 	 */

@@ -664,7 +664,7 @@ 
 	/**

 	 * This method returns the phpCAS version.

 	 *

-	 * @return the phpCAS version.

+	 * @return string phpCAS version.

 	 */

 	function getVersion() {

 		return PHPCAS_VERSION;

@@ -1070,7 +1070,7 @@ 
 	 * @warning should not be called only after phpCAS::forceAuthentication()

 	 * or phpCAS::checkAuthentication().

 	 *

-	 * @return the login name of the authenticated user

+	 * @return string login name of the authenticated user

 	 */

 	function getUser() {

 		global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL;

main/auth/cas/lib/CAS/client.php

Doc Comments +41 added lines, -39 removed lines

@@ -74,7 +74,7 @@ 
 	 *
 	 * Used by CASClient::PrintHTMLHeader() and CASClient::printHTMLFooter().
 	 *
-	 * @param $str the string to filter and output
+	 * @param string $str the string to filter and output
 	 *
 	 * @private
 	 */
@@ -187,7 +187,7 @@ 
 	/**
 	 * This method returns the language used by phpCAS.
 	 *
-	 * @return a string representing the language
+	 * @return string string representing the language
 	 *
 	 * @private
 	 */
@@ -212,7 +212,7 @@ 
 	/**
 	 * This method returns a string depending on the language.
 	 *
-	 * @param $str the index of the string in $_string.
+	 * @param integer $str the index of the string in $_string.
 	 *
 	 * @return the string corresponding to $index in $string.
 	 *
@@ -233,7 +233,7 @@ 
 	 * This method is used to set the language used by phpCAS. 
 	 * @note Can be called only once.
 	 *
-	 * @param $lang a string representing the language.
+	 * @param string $lang a string representing the language.
 	 *
 	 * @public
 	 * @sa CAS_LANG_FRENCH, CAS_LANG_ENGLISH
@@ -420,7 +420,7 @@ 
 	
 	/**
 	 * This method is used to retrieve the service validating URL of the CAS server.
-	 * @return a URL.
+	 * @return string URL.
 	 * @private
 	 */
 	function getServerServiceValidateURL()
@@ -441,7 +441,7 @@ 
 		}
 	/**
 	 * This method is used to retrieve the SAML validating URL of the CAS server.
-	 * @return a URL.
+	 * @return string URL.
 	 * @private
 	 */
 	function getServerSamlValidateURL()
@@ -460,7 +460,7 @@ 
 		}
 	/**
 	 * This method is used to retrieve the proxy validating URL of the CAS server.
-	 * @return a URL.
+	 * @return string URL.
 	 * @private
 	 */
 	function getServerProxyValidateURL()
@@ -541,7 +541,7 @@ 
 	
 	/**
 	 * This method checks to see if the request is secured via HTTPS
-	 * @return true if https, false otherwise
+	 * @return boolean if https, false otherwise
 	 * @private
 	 */
 	function isHttps() {
@@ -561,7 +561,7 @@ 
 	 * CASClient constructor.
 	 *
 	 * @param $server_version the version of the CAS server
-	 * @param $proxy TRUE if the CAS client is a CAS proxy, FALSE otherwise
+	 * @param boolean $proxy TRUE if the CAS client is a CAS proxy, FALSE otherwise
 	 * @param $server_hostname the hostname of the CAS server
 	 * @param $server_port the port the CAS server is running on
 	 * @param $server_uri the URI the CAS server is responding on
@@ -759,7 +759,7 @@ 
 	 * @warning should be called only after CASClient::forceAuthentication() or 
 	 * CASClient::isAuthenticated(), otherwise halt with an error.
 	 *
-	 * @return the login name of the authenticated user
+	 * @return string login name of the authenticated user
 	 */
 	function getUser()
 		{
@@ -831,7 +831,7 @@ 
 	/**
 	 * This method is called to be sure that the user is authenticated. When not 
 	 * authenticated, halt by redirecting to the CAS server; otherwise return TRUE.
-	 * @return TRUE when the user is authenticated; otherwise halt.
+	 * @return boolean when the user is authenticated; otherwise halt.
 	 * @public
 	 */
 	function forceAuthentication()
@@ -877,7 +877,7 @@ 
 	
 	/**
 	 * This method is called to check whether the user is authenticated or not.
-	 * @return TRUE when the user is authenticated, FALSE otherwise.
+	 * @return boolean when the user is authenticated, FALSE otherwise.
 	 * @public
 	 */
 	function checkAuthentication()
@@ -933,7 +933,7 @@ 
 	 * This method is called to check if the user is authenticated (previously or by
 	 * tickets given in the URL).
 	 *
-	 * @return TRUE when the user is authenticated. Also may redirect to the same URL without the ticket.
+	 * @return boolean when the user is authenticated. Also may redirect to the same URL without the ticket.
 	 *
 	 * @public
 	 */
@@ -1003,7 +1003,7 @@ 
 	
 	/**
 	 * This method tells if the current session is authenticated.
-	 * @return true if authenticated based soley on $_SESSION variable
+	 * @return boolean if authenticated based soley on $_SESSION variable
 	 * @since 0.4.22 by Brendan Arnold
 	 */
 	function isSessionAuthenticated ()
@@ -1017,7 +1017,7 @@ 
 	 *
 	 * @note This function switches to callback mode when needed.
 	 *
-	 * @return TRUE when the user has already been authenticated; FALSE otherwise.
+	 * @return boolean when the user has already been authenticated; FALSE otherwise.
 	 *
 	 * @private
 	 */
@@ -1129,7 +1129,7 @@ 
 	}
 	
 	/**
-	 * @return true if the current request is a logout request.
+	 * @return boolean if the current request is a logout request.
 	 * @private
 	 */
 	function isLogoutRequest() {
@@ -1241,7 +1241,7 @@ 
 	
 	/**
 	 * This method returns the Service Ticket provided in the URL of the request.
-	 * @return The service ticket.
+	 * @return string service ticket.
 	 * @private
 	 */
 	function getST()
@@ -1257,7 +1257,7 @@ 
 	
 	/**
 	 * This method tells if a Service Ticket was stored.
-	 * @return TRUE if a Service Ticket has been stored.
+	 * @return boolean if a Service Ticket has been stored.
 	 * @private
 	 */
 	function hasST()
@@ -1330,7 +1330,7 @@ 
 	 * $text_reponse and $tree_response on success. These parameters are used later
 	 * by CASClient::validatePGT() for CAS proxies.
 	 * Used for all CAS 1.0 validations
-	 * @param $validate_url the URL of the request to the CAS server.
+	 * @param string $validate_url the URL of the request to the CAS server.
 	 * @param $text_response the response of the CAS server, as is (XML text).
 	 * @param $tree_response the response of the CAS server, as a DOM XML tree.
 	 *
@@ -1460,7 +1460,7 @@ 
 	 * $text_reponse and $tree_response on success. These parameters are used later
 	 * by CASClient::validatePGT() for CAS proxies.
 	 *
-	 * @param $validate_url the URL of the request to the CAS server.
+	 * @param string $validate_url the URL of the request to the CAS server.
 	 * @param $text_response the response of the CAS server, as is (XML text).
 	 * @param $tree_response the response of the CAS server, as a DOM XML tree.
 	 *
@@ -1648,7 +1648,7 @@ 
 	
 	/**
 	 * This method returns the Proxy Granting Ticket given by the CAS server.
-	 * @return The Proxy Granting Ticket.
+	 * @return string Proxy Granting Ticket.
 	 * @private
 	 */
 	function getPGT()
@@ -1664,7 +1664,7 @@ 
 	
 	/**
 	 * This method tells if a Proxy Granting Ticket was stored.
-	 * @return TRUE if a Proxy Granting Ticket has been stored.
+	 * @return boolean if a Proxy Granting Ticket has been stored.
 	 * @private
 	 */
 	function hasPGT()
@@ -1697,7 +1697,7 @@ 
 	/**
 	 * This method sets/unsets callback mode.
 	 *
-	 * @param $callback_mode TRUE to set callback mode, FALSE otherwise.
+	 * @param boolean $callback_mode TRUE to set callback mode, FALSE otherwise.
 	 *
 	 * @private
 	 */
@@ -1710,7 +1710,7 @@ 
 	 * This method returns TRUE when the CAs client is running i callback mode, 
 	 * FALSE otherwise.
 	 *
-	 * @return A boolean.
+	 * @return boolean boolean.
 	 *
 	 * @private
 	 */
@@ -1734,7 +1734,7 @@ 
 	 * fact the URL of the current request without any CGI parameter, except if
 	 * phpCAS::setFixedCallbackURL() was used).
 	 *
-	 * @return The callback URL
+	 * @return string callback URL
 	 *
 	 * @private
 	 */
@@ -1777,6 +1777,7 @@ 
 	 * This method sets the callback url.
 	 *
 	 * @param $callback_url url to set callback 
+	 * @param string $url
 	 *
 	 * @private
 	 */
@@ -1861,7 +1862,7 @@ 
 	/**
 	 * This method reads a PGT from its Iou and deletes the corresponding storage entry.
 	 *
-	 * @param $pgt_iou the PGT Iou
+	 * @param string $pgt_iou the PGT Iou
 	 *
 	 * @return The PGT corresponding to the Iou, FALSE when not found.
 	 *
@@ -1991,7 +1992,7 @@ 
 	 * @param $err_code an error code (PHPCAS_SERVICE_OK on success).
 	 * @param $err_msg an error message (empty on success).
 	 *
-	 * @return a Proxy Ticket, or FALSE on error.
+	 * @return false|string Proxy Ticket, or FALSE on error.
 	 *
 	 * @private
 	 */
@@ -2093,14 +2094,14 @@ 
 	/**
 	 * This method is used to acces a remote URL.
 	 *
-	 * @param $url the URL to access.
+	 * @param string $url the URL to access.
 	 * @param $cookies an array containing cookies strings such as 'name=val'
 	 * @param $headers an array containing the HTTP header lines of the response
 	 * (an empty array on failure).
 	 * @param $body the body of the response, as a string (empty on failure).
 	 * @param $err_msg an error message, filled on failure.
 	 *
-	 * @return TRUE on success, FALSE otherwise (in this later case, $err_msg
+	 * @return boolean on success, FALSE otherwise (in this later case, $err_msg
 	 * contains an error message).
 	 *
 	 * @private
@@ -2197,7 +2198,7 @@ 
 	/**
 	 * This method is used to build the SAML POST body sent to /samlValidate URL.
 	 *
-	 * @return the SOAP-encased SAMLP artifact (the ticket).
+	 * @return string SOAP-encased SAMLP artifact (the ticket).
 	 *
 	 * @private
 	 */
@@ -2235,7 +2236,7 @@ 
 	 * @param $output the output of the service (also used to give an error
 	 * message on failure).
 	 *
-	 * @return TRUE on success, FALSE otherwise (in this later case, $err_code
+	 * @return boolean on success, FALSE otherwise (in this later case, $err_code
 	 * gives the reason why it failed and $output contains an error message).
 	 *
 	 * @public
@@ -2382,7 +2383,7 @@ 
 	
 	/**
 	 * This method returns the Proxy Ticket provided in the URL of the request.
-	 * @return The proxy ticket.
+	 * @return string proxy ticket.
 	 * @private
 	 */
 	function getPT()
@@ -2401,14 +2402,14 @@ 
 	
 	/**
 	 * This method tells if a Proxy Ticket was stored.
-	 * @return TRUE if a Proxy Ticket has been stored.
+	 * @return boolean if a Proxy Ticket has been stored.
 	 * @private
 	 */
 	function hasPT()
 		{ return !empty($this->_pt); }
 	/**
 	 * This method returns the SAML Ticket provided in the URL of the request.
-	 * @return The SAML ticket.
+	 * @return string SAML ticket.
 	 * @private
 	 */
 	function getSA()
@@ -2424,7 +2425,7 @@ 
 	
 	/**
 	 * This method tells if a SAML Ticket was stored.
-	 * @return TRUE if a SAML Ticket has been stored.
+	 * @return boolean if a SAML Ticket has been stored.
 	 * @private
 	 */
 	function hasSA()
@@ -2442,6 +2443,7 @@ 
 	/**
 	 * This method is used to validate a ST or PT; halt on failure
 	 * Used for all CAS 2.0 validations
+	 * @param string $validate_url
 	 * @return bool TRUE when successfull, halt otherwise by calling CASClient::authError().
 	 *
 	 * @private
@@ -2556,7 +2558,7 @@ 
 	 * This method returns the URL of the current request (without any ticket
 	 * CGI parameter).
 	 *
-	 * @return The URL
+	 * @return string URL
 	 *
 	 * @private
 	 */
@@ -2634,7 +2636,7 @@ 
 	/**
 	 * This method sets the URL of the current request 
 	 *
-	 * @param $url url to set for service
+	 * @param string $url url to set for service
 	 *
 	 * @private
 	 */
@@ -2649,9 +2651,9 @@ 
 	/**
 	 * This method is used to print the HTML output when the user was not authenticated.
 	 *
-	 * @param $failure the failure that occured
+	 * @param string $failure the failure that occured
 	 * @param $cas_url the URL the CAS server was asked for
-	 * @param $no_response the response from the CAS server (other 
+	 * @param boolean $no_response the response from the CAS server (other 
 	 * parameters are ignored if TRUE)
 	 * @param $bad_response bad response from the CAS server ($err_code
 	 * and $err_msg ignored if TRUE)

Braces +31 added lines, -31 removed lines

@@ -193,8 +193,9 @@ 
 	 */
 	function getLang()
 		{
-		if ( empty($this->_lang) )
-			$this->setLang(PHPCAS_LANG_DEFAULT);
+		if ( empty($this->_lang) ) {
+					$this->setLang(PHPCAS_LANG_DEFAULT);
+		}
 		return $this->_lang;
 		}
 	
@@ -596,14 +597,14 @@ 
 					phpCAS::trace("No session found, creating new session");
 					session_start();
 				}
-			}else{
+			} else{
 				phpCAS::trace("Ticket found");
 				// We have to copy any old data before renaming the session
 				if (session_id()) {
 					phpCAS::trace("Old active session found, saving old data and destroying session");
 					$old_session = $_SESSION;
 					session_destroy();	
-				}else{
+				} else{
 					session_start();
 					phpCAS::trace("Starting possible old session to copy variables");
 					$old_session = $_SESSION;
@@ -620,7 +621,7 @@ 
 					$_SESSION = $old_session;
 				}
 			}
-		}else{
+		} else{
 			phpCAS::trace("Skipping session creation");
 		}
 		
@@ -631,9 +632,10 @@ 
 		//check version
 		switch ($server_version) {
 			case CAS_VERSION_1_0:
-				if ( $this->isProxy() )
-					phpCAS::error('CAS proxies are not supported in CAS '
+				if ( $this->isProxy() ) {
+									phpCAS::error('CAS proxies are not supported in CAS '
 						.$server_version);
+				}
 				break;
 			case CAS_VERSION_2_0:
 				break;
@@ -817,8 +819,9 @@ 
 	function renewAuthentication(){
 		phpCAS::traceBegin();
 		// Either way, the user is authenticated by CAS
-		if( isset( $_SESSION['phpCAS']['auth_checked'] ) )
-			unset($_SESSION['phpCAS']['auth_checked']);
+		if( isset( $_SESSION['phpCAS']['auth_checked'] ) ) {
+					unset($_SESSION['phpCAS']['auth_checked']);
+		}
 		if ( $this->isAuthenticated() ) {
 			phpCAS::trace('user already authenticated; renew');
 			$this->redirectToCas(false,true);
@@ -897,8 +900,10 @@ 
 			//	    // never reached
 			//	    $res = FALSE;
 			// avoid a check against CAS on every request
-			if (! isset($_SESSION['phpCAS']['unauth_count']) )
-				$_SESSION['phpCAS']['unauth_count'] = -2; // uninitialized
+			if (! isset($_SESSION['phpCAS']['unauth_count']) ) {
+							$_SESSION['phpCAS']['unauth_count'] = -2;
+			}
+			// uninitialized
 			
 			if (($_SESSION['phpCAS']['unauth_count'] != -2 && $this->_cache_times_for_auth_recheck == -1) 
 					|| ($_SESSION['phpCAS']['unauth_count'] >= 0 && $_SESSION['phpCAS']['unauth_count'] < $this->_cache_times_for_auth_recheck))
@@ -909,13 +914,11 @@ 
 				{
 					$_SESSION['phpCAS']['unauth_count']++;
 					phpCAS::trace('user is not authenticated (cached for '.$_SESSION['phpCAS']['unauth_count'].' times of '.$this->_cache_times_for_auth_recheck.')');
-				}
-				else
+				} else
 				{
 					phpCAS::trace('user is not authenticated (cached for until login pressed)');
 				}
-			}
-			else
+			} else
 			{
 				$_SESSION['phpCAS']['unauth_count'] = 0;
 				$_SESSION['phpCAS']['auth_checked'] = true;
@@ -948,8 +951,7 @@ 
 			// authenticated, nothing to be done.
 			phpCAS::trace('user was already authenticated, no need to look for tickets');
 			$res = TRUE;
-		}
-		else {
+		} else {
 			if ( $this->hasST() ) {
 				// if a Service Ticket was given, validate it
 				phpCAS::trace('ST `'.$this->getST().'\' is present');
@@ -962,8 +964,7 @@ 
 				}
 				$_SESSION['phpCAS']['user'] = $this->getUser();
 				$res = TRUE;
-			}
-			elseif ( $this->hasPT() ) {
+			} elseif ( $this->hasPT() ) {
 				// if a Proxy Ticket was given, validate it
 				phpCAS::trace('PT `'.$this->getPT().'\' is present');
 				$this->validatePT($validate_url,$text_response,$tree_response); // note: if it fails, it halts
@@ -975,8 +976,7 @@ 
 				}
 				$_SESSION['phpCAS']['user'] = $this->getUser();
 				$res = TRUE;
-			}
-			elseif ( $this->hasSA() ) {
+			} elseif ( $this->hasSA() ) {
 				// if we have a SAML ticket, validate it.
 				phpCAS::trace('SA `'.$this->getSA().'\' is present');
 				$this->validateSA($validate_url,$text_response,$tree_response); // if it fails, it halts
@@ -984,8 +984,7 @@ 
 				$_SESSION['phpCAS']['user'] = $this->getUser();
 				$_SESSION['phpCAS']['attributes'] = $this->getAttributes();
 				$res = TRUE;
-			}
-			else {
+			} else {
 				// no ticket given, not authenticated
 				phpCAS::trace('no ticket found');
 			}
@@ -1581,8 +1580,7 @@ 
 			foreach($attr_array as $attr_key => $attr_value) {
 				if(count($attr_value) > 1) {
 					$this->_attributes[$attr_key] = $attr_value;
-				}
-				else {
+				} else {
 					$this->_attributes[$attr_key] = $attr_value[0];
 				}
 			}
@@ -2601,8 +2599,9 @@ 
 				$query_string	= $this->removeParameterFromQueryString('ticket', $request_uri[1]);
 				
 				// If the query string still has anything left, append it to the final URI
-				if ($query_string !== '')
-					$final_uri	.= "?$query_string";
+				if ($query_string !== '') {
+									$final_uri	.= "?$query_string";
+				}
 				
 			}
 			
@@ -2680,10 +2679,11 @@ 
 						phpCAS::trace('Reason: CAS error');
 						break;
 					case CAS_VERSION_2_0:
-						if ( empty($err_code) )
-							phpCAS::trace('Reason: no CAS error');
-						else
-							phpCAS::trace('Reason: ['.$err_code.'] CAS error: '.$err_msg);
+						if ( empty($err_code) ) {
+													phpCAS::trace('Reason: no CAS error');
+						} else {
+													phpCAS::trace('Reason: ['.$err_code.'] CAS error: '.$err_msg);
+						}
 						break;
 				}
 			}

main/auth/cas/lib/CAS/domxml-php4-to-php5.php

Doc Comments +9 added lines

@@ -457,6 +457,10 @@ 
 		$this->myOwnerDocument=$dom_document->myOwnerDocument;
 		$this->myDOMXPath=new DOMXPath($this->myOwnerDocument->myDOMNode);
 	}
+
+	/**
+	 * @param string $eval_str
+	 */
 	function xpath_eval($eval_str,$contextnode=null)
 	{
 		if (method_exists($this->myDOMXPath,'evaluate')) $xp=isset($contextnode) ? $this->myDOMXPath->evaluate($eval_str,$contextnode->myDOMNode) : $this->myDOMXPath->evaluate($eval_str);
@@ -464,6 +468,11 @@ 
 		$xp=new php4DOMNodelist($xp,$this->myOwnerDocument);
 		return ($xp->type===XPATH_UNDEFINED) ? false : $xp;
 	}
+
+	/**
+	 * @param string $prefix
+	 * @param string $namespaceURI
+	 */
 	function xpath_register_ns($prefix,$namespaceURI) {return $this->myDOMXPath->registerNamespace($prefix,$namespaceURI);}
 }
 

Braces +124 added lines, -57 removed lines

@@ -55,8 +55,12 @@ 
 {
 	$dom=new php4DOMDocument($mode);
 	$errorMode=(func_num_args()>2)&&defined('LIBXML_VERSION');
-	if ($errorMode) libxml_use_internal_errors(true);
-	if (!$dom->myDOMNode->load($filename)) $dom=null;
+	if ($errorMode) {
+	    libxml_use_internal_errors(true);
+	}
+	if (!$dom->myDOMNode->load($filename)) {
+	    $dom=null;
+	}
 	if ($errorMode)
 	{
 		$error=array_map('_error_report',libxml_get_errors());
@@ -68,8 +72,12 @@ 
 {
 	$dom=new php4DOMDocument($mode);
 	$errorMode=(func_num_args()>2)&&defined('LIBXML_VERSION');
-	if ($errorMode) libxml_use_internal_errors(true);
-	if (!$dom->myDOMNode->loadXML($str)) $dom=null;
+	if ($errorMode) {
+	    libxml_use_internal_errors(true);
+	}
+	if (!$dom->myDOMNode->loadXML($str)) {
+	    $dom=null;
+	}
 	if ($errorMode)
 	{
 		$error=array_map('_error_report',libxml_get_errors());
@@ -80,8 +88,11 @@ 
 function html_doc($html_doc,$from_file=false)
 {
 	$dom=new php4DOMDocument();
-	if ($from_file) $result=$dom->myDOMNode->loadHTMLFile($html_doc);
-	else $result=$dom->myDOMNode->loadHTML($html_doc);
+	if ($from_file) {
+	    $result=$dom->myDOMNode->loadHTMLFile($html_doc);
+	} else {
+	    $result=$dom->myDOMNode->loadHTML($html_doc);
+	}
 	return $result ? $dom : null;
 }
 function html_doc_file($filename) {return html_doc($filename,true);}
@@ -97,8 +108,11 @@ 
 {
 	function __get($name)
 	{
-		if ($name==='name') return $this->myDOMNode->name;
-		else return parent::__get($name);
+		if ($name==='name') {
+		    return $this->myDOMNode->name;
+		} else {
+		    return parent::__get($name);
+		}
 	}
 	function name() {return $this->myDOMNode->name;}
 	function set_content($text) {}
@@ -113,14 +127,24 @@ 
 	{
 		$this->myDOMNode=new DOMDocument();
 		$this->myOwnerDocument=$this;
-		if ($mode & DOMXML_LOAD_VALIDATING) $this->myDOMNode->validateOnParse=true;
-		if ($mode & DOMXML_LOAD_RECOVERING) $this->myDOMNode->recover=true;
-		if ($mode & DOMXML_LOAD_SUBSTITUTE_ENTITIES) $this->myDOMNode->substituteEntities=true;
-		if ($mode & DOMXML_LOAD_DONT_KEEP_BLANKS) $this->myDOMNode->preserveWhiteSpace=false;
+		if ($mode & DOMXML_LOAD_VALIDATING) {
+		    $this->myDOMNode->validateOnParse=true;
+		}
+		if ($mode & DOMXML_LOAD_RECOVERING) {
+		    $this->myDOMNode->recover=true;
+		}
+		if ($mode & DOMXML_LOAD_SUBSTITUTE_ENTITIES) {
+		    $this->myDOMNode->substituteEntities=true;
+		}
+		if ($mode & DOMXML_LOAD_DONT_KEEP_BLANKS) {
+		    $this->myDOMNode->preserveWhiteSpace=false;
+		}
 	}
 	function add_root($name)
 	{
-		if ($this->myDOMNode->hasChildNodes()) $this->myDOMNode->removeChild($this->myDOMNode->firstChild);
+		if ($this->myDOMNode->hasChildNodes()) {
+		    $this->myDOMNode->removeChild($this->myDOMNode->firstChild);
+		}
 		return new php4DOMElement($this->myDOMNode->appendChild($this->myDOMNode->createElement($name)),$this->myOwnerDocument);
 	}
 	function create_attribute($name,$value)
@@ -134,8 +158,12 @@ 
 	function create_element($name) {return new php4DOMElement($this->myDOMNode->createElement($name),$this);}
 	function create_element_ns($uri,$name,$prefix=null)
 	{
-		if ($prefix==null) $prefix=$this->myDOMNode->lookupPrefix($uri);
-		if (($prefix==null)&&(($this->myDOMNode->documentElement==null)||(!$this->myDOMNode->documentElement->isDefaultNamespace($uri)))) $prefix='a'.sprintf('%u',crc32($uri));
+		if ($prefix==null) {
+		    $prefix=$this->myDOMNode->lookupPrefix($uri);
+		}
+		if (($prefix==null)&&(($this->myDOMNode->documentElement==null)||(!$this->myDOMNode->documentElement->isDefaultNamespace($uri)))) {
+		    $prefix='a'.sprintf('%u',crc32($uri));
+		}
 		return new php4DOMElement($this->myDOMNode->createElementNS($uri,$prefix==null ? $name : $prefix.':'.$name),$this);
 	}
 	function create_entity_reference($content) {return new php4DOMNode($this->myDOMNode->createEntityReference($content),$this);} //By Walter Ebert 2007-01-22
@@ -155,15 +183,22 @@ 
 		$format0=$this->myDOMNode->formatOutput;
 		$this->myDOMNode->formatOutput=$format;
 		$encoding0=$this->myDOMNode->encoding;
-		if ($encoding) $this->myDOMNode->encoding=$encoding;
+		if ($encoding) {
+		    $this->myDOMNode->encoding=$encoding;
+		}
 		$dump=$this->myDOMNode->saveXML();
 		$this->myDOMNode->formatOutput=$format0;
-		if ($encoding) $this->myDOMNode->encoding= $encoding0=='' ? 'UTF-8' : $encoding0; //UTF-8 is XML default encoding
+		if ($encoding) {
+		    $this->myDOMNode->encoding= $encoding0=='' ? 'UTF-8' : $encoding0;
+		}
+		//UTF-8 is XML default encoding
 		return $dump;
 	}
 	function free()
 	{
-		if ($this->myDOMNode->hasChildNodes()) $this->myDOMNode->removeChild($this->myDOMNode->firstChild);
+		if ($this->myDOMNode->hasChildNodes()) {
+		    $this->myDOMNode->removeChild($this->myDOMNode->firstChild);
+		}
 		$this->myDOMNode=null;
 		$this->myOwnerDocument=null;
 	}
@@ -173,8 +208,9 @@ 
 		$myDOMNodeList=$this->myDOMNode->getElementsByTagName($name);
 		$nodeSet=array();
 		$i=0;
-		if (isset($myDOMNodeList))
-			while ($node=$myDOMNodeList->item($i++)) $nodeSet[]=new php4DOMElement($node,$this);
+		if (isset($myDOMNodeList)) {
+					while ($node=$myDOMNodeList->item($i++)) $nodeSet[]=new php4DOMElement($node,$this);
+		}
 		return $nodeSet;
 	}
 	function html_dump_mem() {return $this->myDOMNode->saveHTML();}
@@ -187,8 +223,9 @@ 
 {
 	function add_namespace($uri,$prefix)
 	{
-		if ($this->myDOMNode->hasAttributeNS('http://www.w3.org/2000/xmlns/',$prefix)) return false;
-		else
+		if ($this->myDOMNode->hasAttributeNS('http://www.w3.org/2000/xmlns/',$prefix)) {
+		    return false;
+		} else
 		{
 			$this->myDOMNode->setAttributeNS('http://www.w3.org/2000/xmlns/','xmlns:'.$prefix,$uri); //By Daniel Walker 2006-09-08
 			return true;
@@ -201,8 +238,9 @@ 
 		$myDOMNodeList=$this->myDOMNode->getElementsByTagName($name);
 		$nodeSet=array();
 		$i=0;
-		if (isset($myDOMNodeList))
-			while ($node=$myDOMNodeList->item($i++)) $nodeSet[]=new php4DOMElement($node,$this->myOwnerDocument);
+		if (isset($myDOMNodeList)) {
+					while ($node=$myDOMNodeList->item($i++)) $nodeSet[]=new php4DOMElement($node,$this->myOwnerDocument);
+		}
 		return $nodeSet;
 	}
 	function has_attribute($name) {return $this->myDOMNode->hasAttribute($name);}
@@ -222,17 +260,23 @@ 
 	}*/
 	function set_name($name)
 	{
-		if ($this->myDOMNode->prefix=='') $newNode=$this->myDOMNode->ownerDocument->createElement($name);
-		else $newNode=$this->myDOMNode->ownerDocument->createElementNS($this->myDOMNode->namespaceURI,$this->myDOMNode->prefix.':'.$name);
+		if ($this->myDOMNode->prefix=='') {
+		    $newNode=$this->myDOMNode->ownerDocument->createElement($name);
+		} else {
+		    $newNode=$this->myDOMNode->ownerDocument->createElementNS($this->myDOMNode->namespaceURI,$this->myDOMNode->prefix.':'.$name);
+		}
 		$myDOMNodeList=$this->myDOMNode->attributes;
 		$i=0;
-		if (isset($myDOMNodeList))
-			while ($node=$myDOMNodeList->item($i++))
+		if (isset($myDOMNodeList)) {
+					while ($node=$myDOMNodeList->item($i++))
 				if ($node->namespaceURI=='') $newNode->setAttribute($node->name,$node->value);
-				else $newNode->setAttributeNS($node->namespaceURI,$node->nodeName,$node->value);
+		} else {
+				    $newNode->setAttributeNS($node->namespaceURI,$node->nodeName,$node->value);
+				}
 		$myDOMNodeList=$this->myDOMNode->childNodes;
-		if (isset($myDOMNodeList))
-			while ($node=$myDOMNodeList->item(0)) $newNode->appendChild($node);
+		if (isset($myDOMNodeList)) {
+					while ($node=$myDOMNodeList->item(0)) $newNode->appendChild($node);
+		}
 		$this->myDOMNode->parentNode->replaceChild($newNode,$this->myDOMNode);
 		$this->myDOMNode=$newNode;
 		return true;
@@ -270,10 +314,14 @@ 
 	function attributes()
 	{
 		$myDOMNodeList=$this->myDOMNode->attributes;
-		if (!(isset($myDOMNodeList)&&$this->myDOMNode->hasAttributes())) return null;
+		if (!(isset($myDOMNodeList)&&$this->myDOMNode->hasAttributes())) {
+		    return null;
+		}
 		$nodeSet=array();
 		$i=0;
-		while ($node=$myDOMNodeList->item($i++)) $nodeSet[]=new php4DOMAttr($node,$this->myOwnerDocument);
+		while ($node=$myDOMNodeList->item($i++)) {
+		    $nodeSet[]=new php4DOMAttr($node,$this->myOwnerDocument);
+		}
 		return $nodeSet;
 	}
 	function child_nodes()
@@ -281,8 +329,9 @@ 
 		$myDOMNodeList=$this->myDOMNode->childNodes;
 		$nodeSet=array();
 		$i=0;
-		if (isset($myDOMNodeList))
-			while ($node=$myDOMNodeList->item($i++)) $nodeSet[]=self::_newDOMElement($node,$this->myOwnerDocument);
+		if (isset($myDOMNodeList)) {
+					while ($node=$myDOMNodeList->item($i++)) $nodeSet[]=self::_newDOMElement($node,$this->myOwnerDocument);
+		}
 		return $nodeSet;
 	}
 	function children() {return $this->child_nodes();}
@@ -342,15 +391,20 @@ 
 			$parent->removeAttributeNode($this->myDOMNode);
 			$parent->setAttributeNS($uri,$nsprefix.':'.$this->myDOMNode->localName,$this->myDOMNode->nodeValue);
 			$this->myDOMNode=$parent->getAttributeNodeNS($uri,$this->myDOMNode->localName);
-		}
-		elseif ($this->myDOMNode->nodeType===XML_ELEMENT_NODE)
+		} elseif ($this->myDOMNode->nodeType===XML_ELEMENT_NODE)
 		{
 			$NewNode=$this->myDOMNode->ownerDocument->createElementNS($uri,$nsprefix.':'.$this->myDOMNode->localName);
-			foreach ($this->myDOMNode->attributes as $n) $NewNode->appendChild($n->cloneNode(true));
-			foreach ($this->myDOMNode->childNodes as $n) $NewNode->appendChild($n->cloneNode(true));
+			foreach ($this->myDOMNode->attributes as $n) {
+			    $NewNode->appendChild($n->cloneNode(true));
+			}
+			foreach ($this->myDOMNode->childNodes as $n) {
+			    $NewNode->appendChild($n->cloneNode(true));
+			}
 			$xpath=new DOMXPath($this->myDOMNode->ownerDocument);
 			$myDOMNodeList=$xpath->query('namespace::*[name()!="xml"]',$this->myDOMNode); //Add old namespaces
-			foreach ($myDOMNodeList as $n) $NewNode->setAttributeNS('http://www.w3.org/2000/xmlns/',$n->nodeName,$n->nodeValue); 
+			foreach ($myDOMNodeList as $n) {
+			    $NewNode->setAttributeNS('http://www.w3.org/2000/xmlns/',$n->nodeName,$n->nodeValue);
+			}
 			$this->myDOMNode->parentNode->replaceChild($NewNode,$this->myDOMNode);
 			$this->myDOMNode=$NewNode;
 		}
@@ -359,14 +413,19 @@ 
 	{
 		if ($this->myDOMNode->parentNode!=null)
 		{
-			if ($this->myDOMNode->nodeType===XML_ATTRIBUTE_NODE) $this->myDOMNode->parentNode->removeAttributeNode($this->myDOMNode);
-			else $this->myDOMNode->parentNode->removeChild($this->myDOMNode);
+			if ($this->myDOMNode->nodeType===XML_ATTRIBUTE_NODE) {
+			    $this->myDOMNode->parentNode->removeAttributeNode($this->myDOMNode);
+			} else {
+			    $this->myDOMNode->parentNode->removeChild($this->myDOMNode);
+			}
 		}
 	}
 	protected function _importNode($newnode) {return $this->myOwnerDocument===$newnode->myOwnerDocument ? $newnode->myDOMNode : $this->myOwnerDocument->myDOMNode->importNode($newnode->myDOMNode,true);} //To import DOMNode from another DOMDocument
 	static function _newDOMElement($aDOMNode,$aOwnerDocument)
 	{//Check the PHP5 DOMNode before creating a new associated PHP4 DOMNode wrapper
-		if ($aDOMNode==null) return null;
+		if ($aDOMNode==null) {
+		    return null;
+		}
 		switch ($aDOMNode->nodeType)
 		{
 			case XML_ELEMENT_NODE: return new php4DOMElement($aDOMNode,$aOwnerDocument);
@@ -388,8 +447,11 @@ 
 {
 	function __get($name)
 	{
-		if ($name==='tagname') return '#text';
-		else return parent::__get($name);
+		if ($name==='tagname') {
+		    return '#text';
+		} else {
+		    return parent::__get($name);
+		}
 	}
 	function tagname() {return '#text';}
 	function set_content($text) {$this->myDOMNode->nodeValue=$text; return true;}
@@ -417,8 +479,9 @@ 
 	public $value;
 	function php4DOMNodelist($aDOMNodelist,$aOwnerDocument)
 	{
-		if (!isset($aDOMNodelist)) return; 
-		elseif (is_object($aDOMNodelist)||is_array($aDOMNodelist))
+		if (!isset($aDOMNodelist)) {
+		    return;
+		} elseif (is_object($aDOMNodelist)||is_array($aDOMNodelist))
 		{
 			if ($aDOMNodelist->length>0)
 			{
@@ -426,20 +489,19 @@ 
 				$this->nodeset=array();
 				$this->type=XPATH_NODESET;
 				$i=0;
-				while ($node=$this->myDOMNodelist->item($i++)) $this->nodeset[]=php4DOMNode::_newDOMElement($node,$aOwnerDocument);
+				while ($node=$this->myDOMNodelist->item($i++)) {
+				    $this->nodeset[]=php4DOMNode::_newDOMElement($node,$aOwnerDocument);
+				}
 			}
-		}
-		elseif (is_int($aDOMNodelist)||is_float($aDOMNodelist))
+		} elseif (is_int($aDOMNodelist)||is_float($aDOMNodelist))
 		{
 			$this->type=XPATH_NUMBER;
 			$this->value=$aDOMNodelist;
-		}
-		elseif (is_bool($aDOMNodelist))
+		} elseif (is_bool($aDOMNodelist))
 		{
 			$this->type=XPATH_BOOLEAN;
 			$this->value=$aDOMNodelist;
-		}
-		elseif (is_string($aDOMNodelist))
+		} elseif (is_string($aDOMNodelist))
 		{
 			$this->type=XPATH_STRING;
 			$this->value=$aDOMNodelist;
@@ -459,8 +521,11 @@ 
 	}
 	function xpath_eval($eval_str,$contextnode=null)
 	{
-		if (method_exists($this->myDOMXPath,'evaluate')) $xp=isset($contextnode) ? $this->myDOMXPath->evaluate($eval_str,$contextnode->myDOMNode) : $this->myDOMXPath->evaluate($eval_str);
-		else $xp=isset($contextnode) ? $this->myDOMXPath->query($eval_str,$contextnode->myDOMNode) : $this->myDOMXPath->query($eval_str);
+		if (method_exists($this->myDOMXPath,'evaluate')) {
+		    $xp=isset($contextnode) ? $this->myDOMXPath->evaluate($eval_str,$contextnode->myDOMNode) : $this->myDOMXPath->evaluate($eval_str);
+		} else {
+		    $xp=isset($contextnode) ? $this->myDOMXPath->query($eval_str,$contextnode->myDOMNode) : $this->myDOMXPath->query($eval_str);
+		}
 		$xp=new php4DOMNodelist($xp,$this->myOwnerDocument);
 		return ($xp->type===XPATH_UNDEFINED) ? false : $xp;
 	}
@@ -482,7 +547,9 @@ 
 		}
 		function process($dom_document,$xslt_parameters=array(),$param_is_xpath=false)
 		{
-			foreach ($xslt_parameters as $param=>$value) $this->myxsltProcessor->setParameter('',$param,$value);
+			foreach ($xslt_parameters as $param=>$value) {
+			    $this->myxsltProcessor->setParameter('',$param,$value);
+			}
 			$myphp4DOMDocument=new php4DOMDocument();
 			$myphp4DOMDocument->myDOMNode=$this->myxsltProcessor->transformToDoc($dom_document->myDOMNode);
 			return $myphp4DOMDocument;