chamilo / chamilo-lms

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()

Spacing +5 added lines, -5 removed lines

@@ -5,9 +5,9 @@ 
 * Gets all the info via the ldap module (ldap has to work)
 
 */
-require_once api_get_path(SYS_PATH) . 'main/auth/cas/cas_var.inc.php';
-require_once api_get_path(SYS_PATH) . 'main/auth/external_login/ldap.inc.php';
-require_once api_get_path(SYS_PATH) . 'main/auth/external_login/functions.inc.php';
+require_once api_get_path(SYS_PATH).'main/auth/cas/cas_var.inc.php';
+require_once api_get_path(SYS_PATH).'main/auth/external_login/ldap.inc.php';
+require_once api_get_path(SYS_PATH).'main/auth/external_login/functions.inc.php';
 
 /**
  * @return true if cas is configured
@@ -187,14 +187,14 @@ 
  */
 function get_cas_direct_URL($in_course_code)
 {
-    return api_get_path(WEB_PATH) . 'main/auth/cas/logincas.php?firstpage=' . $in_course_code;
+    return api_get_path(WEB_PATH).'main/auth/cas/logincas.php?firstpage='.$in_course_code;
 }
 
 function getCASLogoHTML()
 {
     $out_res = "";
     if (api_get_setting("casLogoURL") != "") {
-        $out_res = "<img src='" . api_get_setting("casLogoURL") . "' alt='CAS Logo' />";
+        $out_res = "<img src='".api_get_setting("casLogoURL")."' alt='CAS Logo' />";
     }
     return $out_res;
 }

main/auth/cas/lib/CAS.php

Doc Comments +4 added lines, -4 removed lines

@@ -523,7 +523,7 @@ 
     /**

      * Logs a string in debug mode.

      *

-     * @param $str the string to write

+     * @param string $str the string to write

      *

      * @private

      */

@@ -545,7 +545,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

      */

@@ -678,7 +678,7 @@ 
     /**

      * This method returns the phpCAS version.

      *

-     * @return the phpCAS version.

+     * @return string phpCAS version.

      */

     function getVersion()

     {

@@ -1105,7 +1105,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()

     {

Spacing +73 added lines, -73 removed lines

@@ -33,14 +33,14 @@ 
 // hack by Vangelis Haniotakis to handle the absence of $_SERVER['REQUEST_URI'] in IIS

 //

 if (!$_SERVER['REQUEST_URI']) {

-    $_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'] . '?' . $_SERVER['QUERY_STRING'];

+    $_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'].'?'.$_SERVER['QUERY_STRING'];

 }

 

 //

 // another one by Vangelis Haniotakis also to make phpCAS work with PHP5

 //

 if (version_compare(PHP_VERSION, '5', '>=')) {

-    require_once(dirname(__FILE__) . '/CAS/domxml-php4-to-php5.php');

+    require_once(dirname(__FILE__).'/CAS/domxml-php4-to-php5.php');

 }

 

 /**

@@ -322,7 +322,7 @@ 
 // ########################################################################

 

 // include client class

-include_once(dirname(__FILE__) . '/CAS/client.php');

+include_once(dirname(__FILE__).'/CAS/client.php');

 

 // ########################################################################

 //  INTERFACE CLASS

@@ -371,7 +371,7 @@ 
 

         phpCAS:: traceBegin();

         if (is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error($PHPCAS_INIT_CALL['method'] . '() has already been called (at ' . $PHPCAS_INIT_CALL['file'] . ':' . $PHPCAS_INIT_CALL['line'] . ')');

+            phpCAS:: error($PHPCAS_INIT_CALL['method'].'() has already been called (at '.$PHPCAS_INIT_CALL['file'].':'.$PHPCAS_INIT_CALL['line'].')');

         }

         if (gettype($server_version) != 'string') {

             phpCAS:: error('type mismatched for parameter $server_version (should be `string\')');

@@ -392,7 +392,7 @@ 
             'done' => true,

             'file' => $dbg[0]['file'],

             'line' => $dbg[0]['line'],

-            'method' => __CLASS__ . '::' . __FUNCTION__

+            'method' => __CLASS__.'::'.__FUNCTION__

         );

 

         // initialize the global object $PHPCAS_CLIENT

@@ -421,7 +421,7 @@ 
 

         phpCAS:: traceBegin();

         if (is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error($PHPCAS_INIT_CALL['method'] . '() has already been called (at ' . $PHPCAS_INIT_CALL['file'] . ':' . $PHPCAS_INIT_CALL['line'] . ')');

+            phpCAS:: error($PHPCAS_INIT_CALL['method'].'() has already been called (at '.$PHPCAS_INIT_CALL['file'].':'.$PHPCAS_INIT_CALL['line'].')');

         }

         if (gettype($server_version) != 'string') {

             phpCAS:: error('type mismatched for parameter $server_version (should be `string\')');

@@ -442,7 +442,7 @@ 
             'done' => true,

             'file' => $dbg[0]['file'],

             'line' => $dbg[0]['line'],

-            'method' => __CLASS__ . '::' . __FUNCTION__

+            'method' => __CLASS__.'::'.__FUNCTION__

         );

 

         // initialize the global object $PHPCAS_CLIENT

@@ -477,10 +477,10 @@ 
         if (empty ($filename)) {

             if (preg_match('/^Win.*/', getenv('OS'))) {

                 if (isset ($_ENV['TMP'])) {

-                    $debugDir = $_ENV['TMP'] . '/';

+                    $debugDir = $_ENV['TMP'].'/';

                 } else {

                     if (isset ($_ENV['TEMP'])) {

-                        $debugDir = $_ENV['TEMP'] . '/';

+                        $debugDir = $_ENV['TEMP'].'/';

                     } else {

                         $debugDir = '';

                     }

@@ -488,7 +488,7 @@ 
             } else {

                 $debugDir = DEFAULT_DEBUG_DIR;

             }

-            $filename = $debugDir . 'phpCAS.log';

+            $filename = $debugDir.'phpCAS.log';

         }

 

         if (empty ($PHPCAS_DEBUG['unique_id'])) {

@@ -536,7 +536,7 @@ 
             for ($i = 0; $i < $PHPCAS_DEBUG['indent']; $i++) {

                 $indent_str .= '|    ';

             }

-            error_log($PHPCAS_DEBUG['unique_id'] . ' ' . $indent_str . $str . "\n", 3, $PHPCAS_DEBUG['filename']);

+            error_log($PHPCAS_DEBUG['unique_id'].' '.$indent_str.$str."\n", 3, $PHPCAS_DEBUG['filename']);

         }

 

     }

@@ -566,7 +566,7 @@ 
                 }

             }

         }

-        echo "<br />\n<b>phpCAS error</b>: <font color=\"FF0000\"><b>" . __CLASS__ . "::" . $function . '(): ' . htmlentities($msg) . "</b></font> in <b>" . $file . "</b> on line <b>" . $line . "</b><br />\n";

+        echo "<br />\n<b>phpCAS error</b>: <font color=\"FF0000\"><b>".__CLASS__."::".$function.'(): '.htmlentities($msg)."</b></font> in <b>".$file."</b> on line <b>".$line."</b><br />\n";

         phpCAS:: trace($msg);

         phpCAS:: traceExit();

         exit ();

@@ -578,7 +578,7 @@ 
     function trace($str)

     {

         $dbg = phpCAS:: backtrace();

-        phpCAS:: log($str . ' [' . basename($dbg[1]['file']) . ':' . $dbg[1]['line'] . ']');

+        phpCAS:: log($str.' ['.basename($dbg[1]['file']).':'.$dbg[1]['line'].']');

     }

 

     /**

@@ -591,9 +591,9 @@ 
         $dbg = phpCAS:: backtrace();

         $str = '=> ';

         if (!empty ($dbg[2]['class'])) {

-            $str .= $dbg[2]['class'] . '::';

+            $str .= $dbg[2]['class'].'::';

         }

-        $str .= $dbg[2]['function'] . '(';

+        $str .= $dbg[2]['function'].'(';

         if (is_array($dbg[2]['args'])) {

             foreach ($dbg[2]['args'] as $index => $arg) {

                 if ($index != 0) {

@@ -602,7 +602,7 @@ 
                 $str .= str_replace("\n", "", var_export($arg, true));

             }

         }

-        $str .= ') [' . basename($dbg[2]['file']) . ':' . $dbg[2]['line'] . ']';

+        $str .= ') ['.basename($dbg[2]['file']).':'.$dbg[2]['line'].']';

         phpCAS:: log($str);

         $PHPCAS_DEBUG['indent']++;

     }

@@ -619,7 +619,7 @@ 
         $PHPCAS_DEBUG['indent']--;

         $dbg = phpCAS:: backtrace();

         $str = '';

-        $str .= '<= ' . str_replace("\n", "", var_export($res, true));

+        $str .= '<= '.str_replace("\n", "", var_export($res, true));

         phpCAS:: log($str);

     }

 

@@ -658,7 +658,7 @@ 
     {

         global $PHPCAS_CLIENT;

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');

         }

         if (gettype($lang) != 'string') {

             phpCAS:: error('type mismatched for parameter $lang (should be `string\')');

@@ -703,7 +703,7 @@ 
     {

         global $PHPCAS_CLIENT;

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');

         }

         if (gettype($header) != 'string') {

             phpCAS:: error('type mismatched for parameter $header (should be `string\')');

@@ -720,7 +720,7 @@ 
     {

         global $PHPCAS_CLIENT;

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');

         }

         if (gettype($footer) != 'string') {

             phpCAS:: error('type mismatched for parameter $footer (should be `string\')');

@@ -750,13 +750,13 @@ 
 

         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::proxy()');

         }

         if (!$PHPCAS_CLIENT->isProxy()) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::proxy()');

         }

         if ($PHPCAS_AUTH_CHECK_CALL['done']) {

-            phpCAS:: error('this method should only be called before ' . $PHPCAS_AUTH_CHECK_CALL['method'] . '() (called at ' . $PHPCAS_AUTH_CHECK_CALL['file'] . ':' . $PHPCAS_AUTH_CHECK_CALL['line'] . ')');

+            phpCAS:: error('this method should only be called before '.$PHPCAS_AUTH_CHECK_CALL['method'].'() (called at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].')');

         }

         if (gettype($format) != 'string') {

             phpCAS:: error('type mismatched for parameter $format (should be `string\')');

@@ -796,13 +796,13 @@ 
 

         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::proxy()');

         }

         if (!$PHPCAS_CLIENT->isProxy()) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::proxy()');

         }

         if ($PHPCAS_AUTH_CHECK_CALL['done']) {

-            phpCAS:: error('this method should only be called before ' . $PHPCAS_AUTH_CHECK_CALL['method'] . '() (called at ' . $PHPCAS_AUTH_CHECK_CALL['file'] . ':' . $PHPCAS_AUTH_CHECK_CALL['line'] . ')');

+            phpCAS:: error('this method should only be called before '.$PHPCAS_AUTH_CHECK_CALL['method'].'() (called at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].')');

         }

         if (gettype($user) != 'string') {

             phpCAS:: error('type mismatched for parameter $user (should be `string\')');

@@ -857,16 +857,16 @@ 
 

         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::proxy()');

         }

         if (!$PHPCAS_CLIENT->isProxy()) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::proxy()');

         }

         if (!$PHPCAS_AUTH_CHECK_CALL['done']) {

-            phpCAS:: error('this method should only be called after the programmer is sure the user has been authenticated (by calling ' . __CLASS__ . '::checkAuthentication() or ' . __CLASS__ . '::forceAuthentication()');

+            phpCAS:: error('this method should only be called after the programmer is sure the user has been authenticated (by calling '.__CLASS__.'::checkAuthentication() or '.__CLASS__.'::forceAuthentication()');

         }

         if (!$PHPCAS_AUTH_CHECK_CALL['result']) {

-            phpCAS:: error('authentication was checked (by ' . $PHPCAS_AUTH_CHECK_CALL['method'] . '() at ' . $PHPCAS_AUTH_CHECK_CALL['file'] . ':' . $PHPCAS_AUTH_CHECK_CALL['line'] . ') but the method returned FALSE');

+            phpCAS:: error('authentication was checked (by '.$PHPCAS_AUTH_CHECK_CALL['method'].'() at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].') but the method returned FALSE');

         }

         if (gettype($url) != 'string') {

             phpCAS:: error('type mismatched for parameter $url (should be `string\')');

@@ -901,16 +901,16 @@ 
 

         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::proxy()');

         }

         if (!$PHPCAS_CLIENT->isProxy()) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::proxy()');

         }

         if (!$PHPCAS_AUTH_CHECK_CALL['done']) {

-            phpCAS:: error('this method should only be called after the programmer is sure the user has been authenticated (by calling ' . __CLASS__ . '::checkAuthentication() or ' . __CLASS__ . '::forceAuthentication()');

+            phpCAS:: error('this method should only be called after the programmer is sure the user has been authenticated (by calling '.__CLASS__.'::checkAuthentication() or '.__CLASS__.'::forceAuthentication()');

         }

         if (!$PHPCAS_AUTH_CHECK_CALL['result']) {

-            phpCAS:: error('authentication was checked (by ' . $PHPCAS_AUTH_CHECK_CALL['method'] . '() at ' . $PHPCAS_AUTH_CHECK_CALL['file'] . ':' . $PHPCAS_AUTH_CHECK_CALL['line'] . ') but the method returned FALSE');

+            phpCAS:: error('authentication was checked (by '.$PHPCAS_AUTH_CHECK_CALL['method'].'() at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].') but the method returned FALSE');

         }

         if (gettype($url) != 'string') {

             phpCAS:: error('type mismatched for parameter $url (should be `string\')');

@@ -947,7 +947,7 @@ 
     {

         global $PHPCAS_CLIENT;

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');

         }

         if (gettype($n) != 'integer') {

             phpCAS:: error('type mismatched for parameter $header (should be `string\')');

@@ -965,7 +965,7 @@ 
 

         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');

         }

 

         $auth = $PHPCAS_CLIENT->checkAuthentication();

@@ -976,7 +976,7 @@ 
             'done' => true,

             'file' => $dbg[0]['file'],

             'line' => $dbg[0]['line'],

-            'method' => __CLASS__ . '::' . __FUNCTION__,

+            'method' => __CLASS__.'::'.__FUNCTION__,

             'result' => $auth

         );

         phpCAS:: traceEnd($auth);

@@ -994,7 +994,7 @@ 
 

         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');

         }

 

         $auth = $PHPCAS_CLIENT->forceAuthentication();

@@ -1005,7 +1005,7 @@ 
             'done' => true,

             'file' => $dbg[0]['file'],

             'line' => $dbg[0]['line'],

-            'method' => __CLASS__ . '::' . __FUNCTION__,

+            'method' => __CLASS__.'::'.__FUNCTION__,

             'result' => $auth

         );

 

@@ -1013,7 +1013,7 @@ 
             phpCAS:: trace('user is not authenticated, redirecting to the CAS server');

             $PHPCAS_CLIENT->forceAuthentication();

         } else {

-            phpCAS:: trace('no need to authenticate (user `' . phpCAS:: getUser() . '\' is already authenticated)');

+            phpCAS:: trace('no need to authenticate (user `'.phpCAS:: getUser().'\' is already authenticated)');

         }

 

         phpCAS:: traceEnd();

@@ -1029,7 +1029,7 @@ 
 

         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should not be called before' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should not be called before'.__CLASS__.'::client() or '.__CLASS__.'::proxy()');

         }

 

         // store where the authentication has been checked and the result

@@ -1038,7 +1038,7 @@ 
             'done' => true,

             'file' => $dbg[0]['file'],

             'line' => $dbg[0]['line'],

-            'method' => __CLASS__ . '::' . __FUNCTION__,

+            'method' => __CLASS__.'::'.__FUNCTION__,

             'result' => $auth

         );

 

@@ -1051,7 +1051,7 @@ 
      */

     function authenticate()

     {

-        phpCAS:: error('this method is deprecated. You should use ' . __CLASS__ . '::forceAuthentication() instead');

+        phpCAS:: error('this method is deprecated. You should use '.__CLASS__.'::forceAuthentication() instead');

     }

 

     /**

@@ -1066,7 +1066,7 @@ 
 

         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');

         }

 

         // call the isAuthenticated method of the global $PHPCAS_CLIENT object

@@ -1078,7 +1078,7 @@ 
             'done' => true,

             'file' => $dbg[0]['file'],

             'line' => $dbg[0]['line'],

-            'method' => __CLASS__ . '::' . __FUNCTION__,

+            'method' => __CLASS__.'::'.__FUNCTION__,

             'result' => $auth

         );

         phpCAS:: traceEnd($auth);

@@ -1095,7 +1095,7 @@ 
     {

         global $PHPCAS_CLIENT;

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');

         }

         return ($PHPCAS_CLIENT->isSessionAuthenticated());

     }

@@ -1111,13 +1111,13 @@ 
     {

         global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL;

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');

         }

         if (!$PHPCAS_AUTH_CHECK_CALL['done']) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::forceAuthentication() or ' . __CLASS__ . '::isAuthenticated()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::forceAuthentication() or '.__CLASS__.'::isAuthenticated()');

         }

         if (!$PHPCAS_AUTH_CHECK_CALL['result']) {

-            phpCAS:: error('authentication was checked (by ' . $PHPCAS_AUTH_CHECK_CALL['method'] . '() at ' . $PHPCAS_AUTH_CHECK_CALL['file'] . ':' . $PHPCAS_AUTH_CHECK_CALL['line'] . ') but the method returned FALSE');

+            phpCAS:: error('authentication was checked (by '.$PHPCAS_AUTH_CHECK_CALL['method'].'() at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].') but the method returned FALSE');

         }

         return $PHPCAS_CLIENT->getUser();

     }

@@ -1133,13 +1133,13 @@ 
     {

         global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL;

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');

         }

         if (!$PHPCAS_AUTH_CHECK_CALL['done']) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::forceAuthentication() or ' . __CLASS__ . '::isAuthenticated()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::forceAuthentication() or '.__CLASS__.'::isAuthenticated()');

         }

         if (!$PHPCAS_AUTH_CHECK_CALL['result']) {

-            phpCAS:: error('authentication was checked (by ' . $PHPCAS_AUTH_CHECK_CALL['method'] . '() at ' . $PHPCAS_AUTH_CHECK_CALL['file'] . ':' . $PHPCAS_AUTH_CHECK_CALL['line'] . ') but the method returned FALSE');

+            phpCAS:: error('authentication was checked (by '.$PHPCAS_AUTH_CHECK_CALL['method'].'() at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].') but the method returned FALSE');

         }

         return $PHPCAS_CLIENT->getAttributes();

     }

@@ -1151,7 +1151,7 @@ 
     {

         global $PHPCAS_CLIENT;

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');

         }

         return ($PHPCAS_CLIENT->handleLogoutRequests($check_client, $allowed_clients));

     }

@@ -1166,7 +1166,7 @@ 
     {

         global $PHPCAS_CLIENT;

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');

         }

         return $PHPCAS_CLIENT->getServerLoginURL();

     }

@@ -1182,7 +1182,7 @@ 
         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

             phpCAS:: error('this method should only be called after

-							' . __CLASS__ . '::client()');

+							' . __CLASS__.'::client()');

         }

         if (gettype($url) != 'string') {

             phpCAS:: error('type mismatched for parameter $url (should be

@@ -1204,7 +1204,7 @@ 
         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

             phpCAS:: error('this method should only be called after

-							' . __CLASS__ . '::client()');

+							' . __CLASS__.'::client()');

         }

         if (gettype($url) != 'string') {

             phpCAS:: error('type mismatched for parameter $url (should be

@@ -1226,7 +1226,7 @@ 
         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

             phpCAS:: error('this method should only be called after

-							' . __CLASS__ . '::client()');

+							' . __CLASS__.'::client()');

         }

         if (gettype($url) != 'string') {

             phpCAS:: error('type mismatched for parameter $url (should be

@@ -1247,7 +1247,7 @@ 
         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

             phpCAS:: error('this method should only be called after

-							' . __CLASS__ . '::client()');

+							' . __CLASS__.'::client()');

         }

         if (gettype($url) != 'string') {

             phpCAS:: error('type mismatched for parameter $url (should be

@@ -1267,7 +1267,7 @@ 
     {

         global $PHPCAS_CLIENT;

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');

         }

         return $PHPCAS_CLIENT->getServerLogoutURL();

     }

@@ -1283,7 +1283,7 @@ 
         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

             phpCAS:: error('this method should only be called after

-							' . __CLASS__ . '::client()');

+							' . __CLASS__.'::client()');

         }

         if (gettype($url) != 'string') {

             phpCAS:: error('type mismatched for parameter $url (should be

@@ -1303,7 +1303,7 @@ 
         global $PHPCAS_CLIENT;

         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::client() or' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()');

         }

         $parsedParams = array();

         if ($params != "") {

@@ -1334,7 +1334,7 @@ 
         global $PHPCAS_CLIENT;

         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::client() or' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()');

         }

         if (!is_string($service)) {

             phpCAS:: error('type mismatched for parameter $service (should be `string\')');

@@ -1355,7 +1355,7 @@ 
         global $PHPCAS_CLIENT;

         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::client() or' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()');

         }

         if (!is_string($url)) {

             phpCAS:: error('type mismatched for parameter $url (should be `string\')');

@@ -1377,7 +1377,7 @@ 
         global $PHPCAS_CLIENT;

         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::client() or' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()');

         }

         if (!is_string($service)) {

             phpCAS:: error('type mismatched for parameter $service (should be `string\')');

@@ -1404,10 +1404,10 @@ 
         global $PHPCAS_CLIENT;

         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::proxy()');

         }

         if (!$PHPCAS_CLIENT->isProxy()) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::proxy()');

         }

         if (gettype($url) != 'string') {

             phpCAS:: error('type mismatched for parameter $url (should be `string\')');

@@ -1427,7 +1427,7 @@ 
         global $PHPCAS_CLIENT;

         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::proxy()');

         }

         if (gettype($url) != 'string') {

             phpCAS:: error('type mismatched for parameter $url (should be `string\')');

@@ -1443,7 +1443,7 @@ 
     {

         global $PHPCAS_CLIENT;

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::proxy()');

         }

         return ($PHPCAS_CLIENT->getURL());

     }

@@ -1455,7 +1455,7 @@ 
     {

         global $PHPCAS_CLIENT;

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::proxy()');

         }

         if (gettype($target_service) != 'string') {

             phpCAS:: error('type mismatched for parameter $target_service(should be `string\')');

@@ -1473,7 +1473,7 @@ 
         global $PHPCAS_CLIENT;

         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::client() or' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()');

         }

         if (gettype($cert) != 'string') {

             phpCAS:: error('type mismatched for parameter $cert (should be `string\')');

@@ -1492,7 +1492,7 @@ 
         global $PHPCAS_CLIENT;

         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::client() or' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()');

         }

         if (gettype($cert) != 'string') {

             phpCAS:: error('type mismatched for parameter $cert (should be `string\')');

@@ -1509,7 +1509,7 @@ 
         global $PHPCAS_CLIENT;

         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::client() or' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()');

         }

         $PHPCAS_CLIENT->setNoCasServerValidation();

         phpCAS:: traceEnd();

@@ -1528,7 +1528,7 @@ 
         global $PHPCAS_CLIENT;

         phpCAS:: traceBegin();

         if (!is_object($PHPCAS_CLIENT)) {

-            phpCAS:: error('this method should only be called after ' . __CLASS__ . '::client() or' . __CLASS__ . '::proxy()');

+            phpCAS:: error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()');

         }

         $PHPCAS_CLIENT->setExtraCurlOption($key, $value);

         phpCAS:: traceEnd();

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

Doc Comments +41 added lines, -39 removed lines

@@ -73,7 +73,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
      */
@@ -185,7 +185,7 @@ 
     /**
      * This method returns the language used by phpCAS.
      *
-     * @return a string representing the language
+     * @return string string representing the language
      *
      * @private
      */
@@ -211,7 +211,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.
      *
@@ -232,7 +232,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
@@ -426,7 +426,7 @@ 
 
     /**
      * This method is used to retrieve the service validating URL of the CAS server.
-     * @return a URL.
+     * @return string URL.
      * @private
      */
     function getServerServiceValidateURL()
@@ -448,7 +448,7 @@ 
 
     /**
      * This method is used to retrieve the SAML validating URL of the CAS server.
-     * @return a URL.
+     * @return string URL.
      * @private
      */
     function getServerSamlValidateURL()
@@ -468,7 +468,7 @@ 
 
     /**
      * This method is used to retrieve the proxy validating URL of the CAS server.
-     * @return a URL.
+     * @return string URL.
      * @private
      */
     function getServerProxyValidateURL()
@@ -549,7 +549,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()
@@ -570,7 +570,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
@@ -778,7 +778,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()
     {
@@ -860,7 +860,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()
@@ -906,7 +906,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()
@@ -960,7 +960,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
      */
@@ -1026,7 +1026,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()
@@ -1040,7 +1040,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
      */
@@ -1154,7 +1154,7 @@ 
     }
 
     /**
-     * @return true if the current request is a logout request.
+     * @return boolean if the current request is a logout request.
      * @private
      */
     function isLogoutRequest()
@@ -1270,7 +1270,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()
@@ -1290,7 +1290,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()
@@ -1365,7 +1365,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.
      *
@@ -1497,7 +1497,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.
      *
@@ -1684,7 +1684,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()
@@ -1704,7 +1704,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()
@@ -1739,7 +1739,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
      */
@@ -1752,7 +1752,7 @@ 
      * This method returns TRUE when the CAs client is running i callback mode,
      * FALSE otherwise.
      *
-     * @return A boolean.
+     * @return boolean boolean.
      *
      * @private
      */
@@ -1776,7 +1776,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
      */
@@ -1820,6 +1820,7 @@ 
      * This method sets the callback url.
      *
      * @param $callback_url url to set callback
+     * @param string $url
      *
      * @private
      */
@@ -1904,7 +1905,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.
      *
@@ -2037,7 +2038,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
      */
@@ -2140,14 +2141,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
@@ -2250,7 +2251,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
      */
@@ -2289,7 +2290,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
@@ -2436,7 +2437,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()
@@ -2457,7 +2458,7 @@ 
 
     /**
      * 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()
@@ -2467,7 +2468,7 @@ 
 
     /**
      * This method returns the SAML Ticket provided in the URL of the request.
-     * @return The SAML ticket.
+     * @return string SAML ticket.
      * @private
      */
     function getSA()
@@ -2487,7 +2488,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()
@@ -2507,6 +2508,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
@@ -2623,7 +2625,7 @@ 
      * This method returns the URL of the current request (without any ticket
      * CGI parameter).
      *
-     * @return The URL
+     * @return string URL
      *
      * @private
      */
@@ -2701,7 +2703,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
      */
@@ -2716,9 +2718,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)

Spacing +94 added lines, -94 removed lines

@@ -35,10 +35,10 @@ 
  */
 
 // include internationalization stuff
-include_once(dirname(__FILE__) . '/languages/languages.php');
+include_once(dirname(__FILE__).'/languages/languages.php');
 
 // include PGT storage classes
-include_once(dirname(__FILE__) . '/PGTStorage/pgt-main.php');
+include_once(dirname(__FILE__).'/PGTStorage/pgt-main.php');
 
 /**
  * @class CASClient
@@ -135,7 +135,7 @@ 
     function printHTMLFooter()
     {
         $this->HTMLFilterOutput(empty($this->_output_footer)
-            ? ('<hr><address>phpCAS __PHPCAS_VERSION__ ' . $this->getString(CAS_STR_USING_SERVER) . ' <a href="__SERVER_BASE_URL__">__SERVER_BASE_URL__</a> (CAS __CAS_VERSION__)</a></address></body></html>')
+            ? ('<hr><address>phpCAS __PHPCAS_VERSION__ '.$this->getString(CAS_STR_USING_SERVER).' <a href="__SERVER_BASE_URL__">__SERVER_BASE_URL__</a> (CAS __CAS_VERSION__)</a></address></body></html>')
             : $this->_output_footer);
     }
 
@@ -223,7 +223,7 @@ 
         $this->getLang();
 
         if (!isset($this->_strings[$str])) {
-            trigger_error('string `' . $str . '\' not defined for language `' . $this->getLang() . '\'', E_USER_ERROR);
+            trigger_error('string `'.$str.'\' not defined for language `'.$this->getLang().'\'', E_USER_ERROR);
         }
         return $this->_strings[$str];
     }
@@ -240,10 +240,10 @@ 
     function setLang($lang)
     {
         // include the corresponding language file
-        include_once(dirname(__FILE__) . '/languages/' . $lang . '.php');
+        include_once(dirname(__FILE__).'/languages/'.$lang.'.php');
 
         if (!is_array($this->_strings)) {
-            trigger_error('language `' . $lang . '\' is not implemented', E_USER_ERROR);
+            trigger_error('language `'.$lang.'\' is not implemented', E_USER_ERROR);
         }
         $this->_lang = $lang;
     }
@@ -435,15 +435,15 @@ 
         if (empty($this->_server['service_validate_url'])) {
             switch ($this->getServerVersion()) {
                 case CAS_VERSION_1_0:
-                    $this->_server['service_validate_url'] = $this->getServerBaseURL() . 'validate';
+                    $this->_server['service_validate_url'] = $this->getServerBaseURL().'validate';
                     break;
                 case CAS_VERSION_2_0:
-                    $this->_server['service_validate_url'] = $this->getServerBaseURL() . 'serviceValidate';
+                    $this->_server['service_validate_url'] = $this->getServerBaseURL().'serviceValidate';
                     break;
             }
         }
         //      return $this->_server['service_validate_url'].'?service='.preg_replace('/&/','%26',$this->getURL());
-        return $this->_server['service_validate_url'] . '?service=' . urlencode($this->getURL());
+        return $this->_server['service_validate_url'].'?service='.urlencode($this->getURL());
     }
 
     /**
@@ -458,12 +458,12 @@ 
         if (empty($this->_server['saml_validate_url'])) {
             switch ($this->getServerVersion()) {
                 case SAML_VERSION_1_1:
-                    $this->_server['saml_validate_url'] = $this->getServerBaseURL() . 'samlValidate';
+                    $this->_server['saml_validate_url'] = $this->getServerBaseURL().'samlValidate';
                     break;
             }
         }
-        phpCAS::traceEnd($this->_server['saml_validate_url'] . '?TARGET=' . urlencode($this->getURL()));
-        return $this->_server['saml_validate_url'] . '?TARGET=' . urlencode($this->getURL());
+        phpCAS::traceEnd($this->_server['saml_validate_url'].'?TARGET='.urlencode($this->getURL()));
+        return $this->_server['saml_validate_url'].'?TARGET='.urlencode($this->getURL());
     }
 
     /**
@@ -480,12 +480,12 @@ 
                     $this->_server['proxy_validate_url'] = '';
                     break;
                 case CAS_VERSION_2_0:
-                    $this->_server['proxy_validate_url'] = $this->getServerBaseURL() . 'proxyValidate';
+                    $this->_server['proxy_validate_url'] = $this->getServerBaseURL().'proxyValidate';
                     break;
             }
         }
         //      return $this->_server['proxy_validate_url'].'?service='.preg_replace('/&/','%26',$this->getURL());
-        return $this->_server['proxy_validate_url'] . '?service=' . urlencode($this->getURL());
+        return $this->_server['proxy_validate_url'].'?service='.urlencode($this->getURL());
     }
 
     /**
@@ -502,7 +502,7 @@ 
                     $this->_server['proxy_url'] = '';
                     break;
                 case CAS_VERSION_2_0:
-                    $this->_server['proxy_url'] = $this->getServerBaseURL() . 'proxy';
+                    $this->_server['proxy_url'] = $this->getServerBaseURL().'proxy';
                     break;
             }
         }
@@ -518,7 +518,7 @@ 
     {
         // the URL is build only when needed
         if (empty($this->_server['logout_url'])) {
-            $this->_server['logout_url'] = $this->getServerBaseURL() . 'logout';
+            $this->_server['logout_url'] = $this->getServerBaseURL().'logout';
         }
         return $this->_server['logout_url'];
     }
@@ -621,7 +621,7 @@ 
                 }
                 // set up a new session, of name based on the ticket
                 $session_id = preg_replace('/[^\w]/', '', $_GET['ticket']);
-                phpCAS::LOG("Session ID: " . $session_id);
+                phpCAS::LOG("Session ID: ".$session_id);
                 session_id($session_id);
                 session_start();
                 // restore old session vars
@@ -662,7 +662,7 @@ 
         if (empty($server_hostname)
             || !preg_match('/[\.\d\-abcdefghijklmnopqrstuvwxyz]*/', $server_hostname)
         ) {
-            phpCAS::error('bad CAS server hostname (`' . $server_hostname . '\')');
+            phpCAS::error('bad CAS server hostname (`'.$server_hostname.'\')');
         }
         $this->_server['hostname'] = $server_hostname;
 
@@ -670,16 +670,16 @@ 
         if ($server_port == 0
             || !is_int($server_port)
         ) {
-            phpCAS::error('bad CAS server port (`' . $server_hostname . '\')');
+            phpCAS::error('bad CAS server port (`'.$server_hostname.'\')');
         }
         $this->_server['port'] = $server_port;
 
         // check URI
         if (!preg_match('/[\.\d\-_abcdefghijklmnopqrstuvwxyz\/]*/', $server_uri)) {
-            phpCAS::error('bad CAS server URI (`' . $server_uri . '\')');
+            phpCAS::error('bad CAS server URI (`'.$server_uri.'\')');
         }
         // add leading and trailing `/' and remove doubles
-        $server_uri = preg_replace('/\/\//', '/', '/' . $server_uri . '/');
+        $server_uri = preg_replace('/\/\//', '/', '/'.$server_uri.'/');
         $this->_server['uri'] = $server_uri;
 
         // set to callback mode if PgtIou and PgtId CGI GET parameters are provided
@@ -698,7 +698,7 @@ 
             switch ($this->getServerVersion()) {
                 case CAS_VERSION_1_0: // check for a Service Ticket
                     if (preg_match('/^ST-/', $ticket)) {
-                        phpCAS::trace('ST \'' . $ticket . '\' found');
+                        phpCAS::trace('ST \''.$ticket.'\' found');
                         //ST present
                         $this->setST($ticket);
                         //ticket has been taken into account, unset it to hide it to applications
@@ -706,31 +706,31 @@ 
                     } else {
                         if (!empty($ticket)) {
                             //ill-formed ticket, halt
-                            phpCAS::error('ill-formed ticket found in the URL (ticket=`' . htmlentities($ticket) . '\')');
+                            phpCAS::error('ill-formed ticket found in the URL (ticket=`'.htmlentities($ticket).'\')');
                         }
                     }
                     break;
                 case CAS_VERSION_2_0: // check for a Service or Proxy Ticket
                     if (preg_match('/^[SP]T-/', $ticket)) {
-                        phpCAS::trace('ST or PT \'' . $ticket . '\' found');
+                        phpCAS::trace('ST or PT \''.$ticket.'\' found');
                         $this->setPT($ticket);
                         unset($_GET['ticket']);
                     } else {
                         if (!empty($ticket)) {
                             //ill-formed ticket, halt
-                            phpCAS::error('ill-formed ticket found in the URL (ticket=`' . htmlentities($ticket) . '\')');
+                            phpCAS::error('ill-formed ticket found in the URL (ticket=`'.htmlentities($ticket).'\')');
                         }
                     }
                     break;
                 case SAML_VERSION_1_1: // SAML just does Service Tickets
                     if (preg_match('/^[SP]T-/', $ticket)) {
-                        phpCAS::trace('SA \'' . $ticket . '\' found');
+                        phpCAS::trace('SA \''.$ticket.'\' found');
                         $this->setSA($ticket);
                         unset($_GET['ticket']);
                     } else {
                         if (!empty($ticket)) {
                             //ill-formed ticket, halt
-                            phpCAS::error('ill-formed ticket found in the URL (ticket=`' . htmlentities($ticket) . '\')');
+                            phpCAS::error('ill-formed ticket found in the URL (ticket=`'.htmlentities($ticket).'\')');
                         }
                     }
                     break;
@@ -783,7 +783,7 @@ 
     function getUser()
     {
         if (empty($this->_user)) {
-            phpCAS::error('this method should be used only after ' . __CLASS__ . '::forceAuthentication() or ' . __CLASS__ . '::isAuthenticated()');
+            phpCAS::error('this method should be used only after '.__CLASS__.'::forceAuthentication() or '.__CLASS__.'::isAuthenticated()');
         }
         return $this->_user;
     }
@@ -813,7 +813,7 @@ 
     function getAttributes()
     {
         if (empty($this->_user)) { // if no user is set, there shouldn't be any attributes also...
-            phpCAS::error('this method should be used only after ' . __CLASS__ . '::forceAuthentication() or ' . __CLASS__ . '::isAuthenticated()');
+            phpCAS::error('this method should be used only after '.__CLASS__.'::forceAuthentication() or '.__CLASS__.'::isAuthenticated()');
         }
         return $this->_attributes;
     }
@@ -938,7 +938,7 @@ 
 
                     if ($this->_cache_times_for_auth_recheck != -1) {
                         $_SESSION['phpCAS']['unauth_count']++;
-                        phpCAS::trace('user is not authenticated (cached for ' . $_SESSION['phpCAS']['unauth_count'] . ' times of ' . $this->_cache_times_for_auth_recheck . ')');
+                        phpCAS::trace('user is not authenticated (cached for '.$_SESSION['phpCAS']['unauth_count'].' times of '.$this->_cache_times_for_auth_recheck.')');
                     } else {
                         phpCAS::trace('user is not authenticated (cached for until login pressed)');
                     }
@@ -978,33 +978,33 @@ 
         } else {
             if ($this->hasST()) {
                 // if a Service Ticket was given, validate it
-                phpCAS::trace('ST `' . $this->getST() . '\' is present');
+                phpCAS::trace('ST `'.$this->getST().'\' is present');
                 $this->validateST($validate_url, $text_response, $tree_response); // if it fails, it halts
-                phpCAS::trace('ST `' . $this->getST() . '\' was validated');
+                phpCAS::trace('ST `'.$this->getST().'\' was validated');
                 if ($this->isProxy()) {
                     $this->validatePGT($validate_url, $text_response, $tree_response); // idem
-                    phpCAS::trace('PGT `' . $this->getPGT() . '\' was validated');
+                    phpCAS::trace('PGT `'.$this->getPGT().'\' was validated');
                     $_SESSION['phpCAS']['pgt'] = $this->getPGT();
                 }
                 $_SESSION['phpCAS']['user'] = $this->getUser();
                 $res = true;
             } elseif ($this->hasPT()) {
                 // if a Proxy Ticket was given, validate it
-                phpCAS::trace('PT `' . $this->getPT() . '\' is present');
+                phpCAS::trace('PT `'.$this->getPT().'\' is present');
                 $this->validatePT($validate_url, $text_response, $tree_response); // note: if it fails, it halts
-                phpCAS::trace('PT `' . $this->getPT() . '\' was validated');
+                phpCAS::trace('PT `'.$this->getPT().'\' was validated');
                 if ($this->isProxy()) {
                     $this->validatePGT($validate_url, $text_response, $tree_response); // idem
-                    phpCAS::trace('PGT `' . $this->getPGT() . '\' was validated');
+                    phpCAS::trace('PGT `'.$this->getPGT().'\' was validated');
                     $_SESSION['phpCAS']['pgt'] = $this->getPGT();
                 }
                 $_SESSION['phpCAS']['user'] = $this->getUser();
                 $res = true;
             } elseif ($this->hasSA()) {
                 // if we have a SAML ticket, validate it.
-                phpCAS::trace('SA `' . $this->getSA() . '\' is present');
+                phpCAS::trace('SA `'.$this->getSA().'\' is present');
                 $this->validateSA($validate_url, $text_response, $tree_response); // if it fails, it halts
-                phpCAS::trace('SA `' . $this->getSA() . '\' was validated');
+                phpCAS::trace('SA `'.$this->getSA().'\' was validated');
                 $_SESSION['phpCAS']['user'] = $this->getUser();
                 $_SESSION['phpCAS']['attributes'] = $this->getAttributes();
                 $res = true;
@@ -1015,8 +1015,8 @@ 
             if ($res) {
                 // if called with a ticket parameter, we need to redirect to the app without the ticket so that CAS-ification is transparent to the browser (for later POSTS)
                 // most of the checks and errors should have been made now, so we're safe for redirect without masking error messages.
-                header('Location: ' . $this->getURL());
-                phpCAS::log("Prepare redirect to : " . $this->getURL());
+                header('Location: '.$this->getURL());
+                phpCAS::log("Prepare redirect to : ".$this->getURL());
             }
         }
 
@@ -1060,18 +1060,18 @@ 
                 // authentication already done
                 $this->setUser($_SESSION['phpCAS']['user']);
                 $this->setPGT($_SESSION['phpCAS']['pgt']);
-                phpCAS::trace('user = `' . $_SESSION['phpCAS']['user'] . '\', PGT = `' . $_SESSION['phpCAS']['pgt'] . '\'');
+                phpCAS::trace('user = `'.$_SESSION['phpCAS']['user'].'\', PGT = `'.$_SESSION['phpCAS']['pgt'].'\'');
                 $auth = true;
             } elseif ($this->isSessionAuthenticated() && empty($_SESSION['phpCAS']['pgt'])) {
                 // these two variables should be empty or not empty at the same time
-                phpCAS::trace('username found (`' . $_SESSION['phpCAS']['user'] . '\') but PGT is empty');
+                phpCAS::trace('username found (`'.$_SESSION['phpCAS']['user'].'\') but PGT is empty');
                 // unset all tickets to enforce authentication
                 unset($_SESSION['phpCAS']);
                 $this->setST('');
                 $this->setPT('');
             } elseif (!$this->isSessionAuthenticated() && !empty($_SESSION['phpCAS']['pgt'])) {
                 // these two variables should be empty or not empty at the same time
-                phpCAS::trace('PGT found (`' . $_SESSION['phpCAS']['pgt'] . '\') but username is empty');
+                phpCAS::trace('PGT found (`'.$_SESSION['phpCAS']['pgt'].'\') but username is empty');
                 // unset all tickets to enforce authentication
                 unset($_SESSION['phpCAS']);
                 $this->setST('');
@@ -1087,7 +1087,7 @@ 
                 if (isset($_SESSION['phpCAS']['attributes'])) {
                     $this->setAttributes($_SESSION['phpCAS']['attributes']);
                 }
-                phpCAS::trace('user = `' . $_SESSION['phpCAS']['user'] . '\'');
+                phpCAS::trace('user = `'.$_SESSION['phpCAS']['user'].'\'');
                 $auth = true;
             } else {
                 phpCAS::trace('no user found');
@@ -1109,12 +1109,12 @@ 
     {
         phpCAS::traceBegin();
         $cas_url = $this->getServerLoginURL($gateway, $renew);
-        header('Location: ' . $cas_url);
-        phpCAS::log("Redirect to : " . $cas_url);
+        header('Location: '.$cas_url);
+        phpCAS::log("Redirect to : ".$cas_url);
 
         $this->printHTMLHeader($this->getString(CAS_STR_AUTHENTICATION_WANTED));
 
-        printf('<p>' . $this->getString(CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED) . '</p>', $cas_url);
+        printf('<p>'.$this->getString(CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED).'</p>', $cas_url);
         $this->printHTMLFooter();
 
         phpCAS::traceExit();
@@ -1133,20 +1133,20 @@ 
         $cas_url = $this->getServerLogoutURL();
         $paramSeparator = '?';
         if (isset($params['url'])) {
-            $cas_url = $cas_url . $paramSeparator . "url=" . urlencode($params['url']);
+            $cas_url = $cas_url.$paramSeparator."url=".urlencode($params['url']);
             $paramSeparator = '&';
         }
         if (isset($params['service'])) {
-            $cas_url = $cas_url . $paramSeparator . "service=" . urlencode($params['service']);
+            $cas_url = $cas_url.$paramSeparator."service=".urlencode($params['service']);
         }
-        header('Location: ' . $cas_url);
-        phpCAS::log("Prepare redirect to : " . $cas_url);
+        header('Location: '.$cas_url);
+        phpCAS::log("Prepare redirect to : ".$cas_url);
 
         session_unset();
         session_destroy();
 
         $this->printHTMLHeader($this->getString(CAS_STR_LOGOUT));
-        printf('<p>' . $this->getString(CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED) . '</p>', $cas_url);
+        printf('<p>'.$this->getString(CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED).'</p>', $cas_url);
         $this->printHTMLFooter();
 
         phpCAS::traceExit();
@@ -1187,26 +1187,26 @@ 
             return;
         }
         phpCAS::log("Logout requested");
-        phpCAS::log("SAML REQUEST: " . $_POST['logoutRequest']);
+        phpCAS::log("SAML REQUEST: ".$_POST['logoutRequest']);
         if ($check_client) {
             if (!$allowed_clients) {
                 $allowed_clients = array($this->getServerHostname());
             }
             $client_ip = $_SERVER['REMOTE_ADDR'];
             $client = gethostbyaddr($client_ip);
-            phpCAS::log("Client: " . $client . "/" . $client_ip);
+            phpCAS::log("Client: ".$client."/".$client_ip);
             $allowed = false;
             foreach ($allowed_clients as $allowed_client) {
                 if (($client == $allowed_client) or ($client_ip == $allowed_client)) {
-                    phpCAS::log("Allowed client '" . $allowed_client . "' matches, logout request is allowed");
+                    phpCAS::log("Allowed client '".$allowed_client."' matches, logout request is allowed");
                     $allowed = true;
                     break;
                 } else {
-                    phpCAS::log("Allowed client '" . $allowed_client . "' does not match");
+                    phpCAS::log("Allowed client '".$allowed_client."' does not match");
                 }
             }
             if (!$allowed) {
-                phpCAS::error("Unauthorized logout request from client '" . $client . "'");
+                phpCAS::error("Unauthorized logout request from client '".$client."'");
                 printf("Unauthorized!");
                 phpCAS::traceExit();
                 exit();
@@ -1219,9 +1219,9 @@ 
             PREG_OFFSET_CAPTURE, 3);
         $wrappedSamlSessionIndex = preg_replace('|<samlp:SessionIndex>|', '', $tick[0][0]);
         $ticket2logout = preg_replace('|</samlp:SessionIndex>|', '', $wrappedSamlSessionIndex);
-        phpCAS::log("Ticket to logout: " . $ticket2logout);
+        phpCAS::log("Ticket to logout: ".$ticket2logout);
         $session_id = preg_replace('/[^\w]/', '', $ticket2logout);
-        phpCAS::log("Session id: " . $session_id);
+        phpCAS::log("Session id: ".$session_id);
 
         // destroy a possible application session created before phpcas
         if (session_id()) {
@@ -1377,15 +1377,15 @@ 
     {
         phpCAS::traceBegin();
         // build the URL to validate the ticket
-        $validate_url = $this->getServerServiceValidateURL() . '&ticket=' . $this->getST();
+        $validate_url = $this->getServerServiceValidateURL().'&ticket='.$this->getST();
         if ($this->isProxy()) {
             // pass the callback url for CAS proxies
-            $validate_url .= '&pgtUrl=' . $this->getCallbackURL();
+            $validate_url .= '&pgtUrl='.$this->getCallbackURL();
         }
 
         // open and read the URL
         if (!$this->readURL($validate_url, ''/*cookies*/, $headers, $text_response, $err_msg)) {
-            phpCAS::trace('could not open URL \'' . $validate_url . '\' to validate (' . $err_msg . ')');
+            phpCAS::trace('could not open URL \''.$validate_url.'\' to validate ('.$err_msg.')');
             $this->authError('ST not validated',
                 $validate_url,
                 true/*$no_response*/);
@@ -1435,7 +1435,7 @@ 
                 }
                 // insure that tag name is 'serviceResponse'
                 if ($tree_response->node_name() != 'serviceResponse') {
-                    phpCAS::trace('bad XML root node (should be `serviceResponse\' instead of `' . $tree_response->node_name() . '\'');
+                    phpCAS::trace('bad XML root node (should be `serviceResponse\' instead of `'.$tree_response->node_name().'\'');
                     $this->authError('ST not validated',
                         $validate_url,
                         false/*$no_response*/,
@@ -1453,7 +1453,7 @@ 
                             $text_response);
                     }
                     $user = trim($user_elements[0]->get_content());
-                    phpCAS::trace('user = `' . $user);
+                    phpCAS::trace('user = `'.$user);
                     $this->setUser($user);
 
                 } else {
@@ -1514,11 +1514,11 @@ 
 
         // open and read the URL
         if (!$this->readURL($validate_url, ''/*cookies*/, $headers, $text_response, $err_msg)) {
-            phpCAS::trace('could not open URL \'' . $validate_url . '\' to validate (' . $err_msg . ')');
+            phpCAS::trace('could not open URL \''.$validate_url.'\' to validate ('.$err_msg.')');
             $this->authError('SA not validated', $validate_url, true/*$no_response*/);
         }
 
-        phpCAS::trace('server version: ' . $this->getServerVersion());
+        phpCAS::trace('server version: '.$this->getServerVersion());
 
         // analyze the result depending on the version
         switch ($this->getServerVersion()) {
@@ -1544,7 +1544,7 @@ 
                 }
                 // insure that tag name is 'Envelope'
                 if ($tree_response->node_name() != 'Envelope') {
-                    phpCAS::trace('bad XML root node (should be `Envelope\' instead of `' . $tree_response->node_name() . '\'');
+                    phpCAS::trace('bad XML root node (should be `Envelope\' instead of `'.$tree_response->node_name().'\'');
                     $this->authError('SA not validated',
                         $validate_url,
                         false/*$no_response*/,
@@ -1555,7 +1555,7 @@ 
                 if (sizeof($success_elements = $tree_response->get_elements_by_tagname("NameIdentifier")) != 0) {
                     phpCAS::trace('NameIdentifier found');
                     $user = trim($success_elements[0]->get_content());
-                    phpCAS::trace('user = `' . $user . '`');
+                    phpCAS::trace('user = `'.$user.'`');
                     $this->setUser($user);
                     $this->setSessionAttributes($text_response);
                 } else {
@@ -1590,7 +1590,7 @@ 
         $result = false;
 
         if (isset($_SESSION[SAML_ATTRIBUTES])) {
-            phpCAS::trace("session attrs already set.");  //testbml - do we care?
+            phpCAS::trace("session attrs already set."); //testbml - do we care?
         }
 
         $attr_array = array();
@@ -1610,7 +1610,7 @@ 
                     $value_array[] = $node->get_content();
 
                 }
-                phpCAS::trace("* " . $name . "=" . $value_array);
+                phpCAS::trace("* ".$name."=".$value_array);
                 $attr_array[$name] = $value_array;
             }
             $_SESSION[SAML_ATTRIBUTES] = $attr_array;
@@ -1840,8 +1840,8 @@ 
         $this->printHTMLHeader('phpCAS callback');
         $pgt_iou = $_GET['pgtIou'];
         $pgt = $_GET['pgtId'];
-        phpCAS::trace('Storing PGT `' . $pgt . '\' (id=`' . $pgt_iou . '\')');
-        echo '<p>Storing PGT `' . $pgt . '\' (id=`' . $pgt_iou . '\').</p>';
+        phpCAS::trace('Storing PGT `'.$pgt.'\' (id=`'.$pgt_iou.'\')');
+        echo '<p>Storing PGT `'.$pgt.'\' (id=`'.$pgt_iou.'\').</p>';
         $this->storePGT($pgt, $pgt_iou);
         $this->printHTMLFooter();
         phpCAS::traceExit();
@@ -2053,11 +2053,11 @@ 
 
         // build the URL to retrieve the PT
         //      $cas_url = $this->getServerProxyURL().'?targetService='.preg_replace('/&/','%26',$target_service).'&pgt='.$this->getPGT();
-        $cas_url = $this->getServerProxyURL() . '?targetService=' . urlencode($target_service) . '&pgt=' . $this->getPGT();
+        $cas_url = $this->getServerProxyURL().'?targetService='.urlencode($target_service).'&pgt='.$this->getPGT();
 
         // open and read the URL
         if (!$this->readURL($cas_url, ''/*cookies*/, $headers, $cas_response, $err_msg)) {
-            phpCAS::trace('could not open URL \'' . $cas_url . '\' to validate (' . $err_msg . ')');
+            phpCAS::trace('could not open URL \''.$cas_url.'\' to validate ('.$err_msg.')');
             $err_code = PHPCAS_SERVICE_PT_NO_SERVER_RESPONSE;
             $err_msg = 'could not retrieve PT (no response from the CAS server)';
             phpCAS::traceEnd(false);
@@ -2100,7 +2100,7 @@ 
                 if (sizeof($arr = $root->get_elements_by_tagname("proxyTicket")) != 0) {
                     $err_code = PHPCAS_SERVICE_OK;
                     $err_msg = '';
-                    phpCAS::trace('original PT: ' . trim($arr[0]->get_content()));
+                    phpCAS::trace('original PT: '.trim($arr[0]->get_content()));
                     $pt = trim($arr[0]->get_content());
                     phpCAS::traceEnd($pt);
                     return $pt;
@@ -2127,7 +2127,7 @@ 
 
         // at this step, we are sure that the response of the CAS server was ill-formed
         $err_code = PHPCAS_SERVICE_PT_BAD_SERVER_RESPONSE;
-        $err_msg = 'Invalid response from the CAS server (response=`' . $cas_response . '\')';
+        $err_msg = 'Invalid response from the CAS server (response=`'.$cas_response.'\')';
 
         phpCAS::traceEnd(false);
         return false;
@@ -2230,7 +2230,7 @@ 
         //phpCAS::trace('CURL: Call completed. Response body is: \''.$buf.'\'');
         if ($buf === false) {
             phpCAS::trace('curl_exec() failed');
-            $err_msg = 'CURL error #' . curl_errno($ch) . ': ' . curl_error($ch);
+            $err_msg = 'CURL error #'.curl_errno($ch).': '.curl_error($ch);
             //phpCAS::trace('curl error: '.$err_msg);
             // close the CURL session
             curl_close($ch);
@@ -2262,7 +2262,7 @@ 
         $sa = $this->getSA();
         //phpCAS::trace("SA: ".$sa);
 
-        $body = SAML_SOAP_ENV . SAML_SOAP_BODY . SAMLP_REQUEST . SAML_ASSERTION_ARTIFACT . $sa . SAML_ASSERTION_ARTIFACT_CLOSE . SAMLP_REQUEST_CLOSE . SAML_SOAP_BODY_CLOSE . SAML_SOAP_ENV_CLOSE;
+        $body = SAML_SOAP_ENV.SAML_SOAP_BODY.SAMLP_REQUEST.SAML_ASSERTION_ARTIFACT.$sa.SAML_ASSERTION_ARTIFACT_CLOSE.SAMLP_REQUEST_CLOSE.SAML_SOAP_BODY_CLOSE.SAML_SOAP_ENV_CLOSE;
 
         phpCAS::traceEnd($body);
         return ($body);
@@ -2311,20 +2311,20 @@ 
             // add cookies if necessary
             if (is_array($_SESSION['phpCAS']['services'][$url]['cookies'])) {
                 foreach ($_SESSION['phpCAS']['services'][$url]['cookies'] as $name => $val) {
-                    $cookies[] = $name . '=' . $val;
+                    $cookies[] = $name.'='.$val;
                 }
             }
 
             // build the URL including the PT
             if (strstr($url, '?') === false) {
-                $service_url = $url . '?ticket=' . $pt;
+                $service_url = $url.'?ticket='.$pt;
             } else {
-                $service_url = $url . '&ticket=' . $pt;
+                $service_url = $url.'&ticket='.$pt;
             }
 
-            phpCAS::trace('reading URL`' . $service_url . '\'');
+            phpCAS::trace('reading URL`'.$service_url.'\'');
             if (!$this->readURL($service_url, $cookies, $headers, $output, $err_msg)) {
-                phpCAS::trace('could not read URL`' . $service_url . '\'');
+                phpCAS::trace('could not read URL`'.$service_url.'\'');
                 $err_code = PHPCAS_SERVICE_NOT_AVAILABLE;
                 // give an error message
                 $output = sprintf($this->getString(CAS_STR_SERVICE_UNAVAILABLE),
@@ -2333,7 +2333,7 @@ 
                 $res = false;
             } else {
                 // URL has been fetched, extract the cookies
-                phpCAS::trace('URL`' . $service_url . '\' has been read, storing cookies:');
+                phpCAS::trace('URL`'.$service_url.'\' has been read, storing cookies:');
                 foreach ($headers as $header) {
                     // test if the header is a cookie
                     if (preg_match('/^Set-Cookie:/', $header)) {
@@ -2346,7 +2346,7 @@ 
                         $cookie_val = strtok('=');
                         // store the cookie
                         $_SESSION['phpCAS']['services'][$url]['cookies'][$cookie_name] = $cookie_val;
-                        phpCAS::trace($cookie_name . ' -> ' . $cookie_val);
+                        phpCAS::trace($cookie_name.' -> '.$cookie_val);
                     }
                 }
             }
@@ -2388,7 +2388,7 @@ 
             // note: $err_code and $err_msg are filled by CASClient::retrievePT()
             phpCAS::trace('PT was not retrieved correctly');
         } else {
-            phpCAS::trace('opening IMAP URL `' . $url . '\'...');
+            phpCAS::trace('opening IMAP URL `'.$url.'\'...');
             $stream = @imap_open($url, $this->getUser(), $pt, $flags);
             if (!$stream) {
                 phpCAS::trace('could not open URL');
@@ -2472,7 +2472,7 @@ 
      */
     function getSA()
     {
-        return 'ST' . substr($this->_sa, 2);
+        return 'ST'.substr($this->_sa, 2);
     }
 
     /**
@@ -2515,16 +2515,16 @@ 
     {
         phpCAS::traceBegin();
         // build the URL to validate the ticket
-        $validate_url = $this->getServerProxyValidateURL() . '&ticket=' . $this->getPT();
+        $validate_url = $this->getServerProxyValidateURL().'&ticket='.$this->getPT();
 
         if ($this->isProxy()) {
             // pass the callback url for CAS proxies
-            $validate_url .= '&pgtUrl=' . $this->getCallbackURL();
+            $validate_url .= '&pgtUrl='.$this->getCallbackURL();
         }
 
         // open and read the URL
         if (!$this->readURL($validate_url, ''/*cookies*/, $headers, $text_response, $err_msg)) {
-            phpCAS::trace('could not open URL \'' . $validate_url . '\' to validate (' . $err_msg . ')');
+            phpCAS::trace('could not open URL \''.$validate_url.'\' to validate ('.$err_msg.')');
             $this->authError('PT not validated',
                 $validate_url,
                 true/*$no_response*/);
@@ -2742,8 +2742,8 @@ 
         $this->printHTMLHeader($this->getString(CAS_STR_AUTHENTICATION_FAILED));
         printf($this->getString(CAS_STR_YOU_WERE_NOT_AUTHENTICATED), htmlentities($this->getURL()),
             $_SERVER['SERVER_ADMIN']);
-        phpCAS::trace('CAS URL: ' . $cas_url);
-        phpCAS::trace('Authentication failure: ' . $failure);
+        phpCAS::trace('CAS URL: '.$cas_url);
+        phpCAS::trace('Authentication failure: '.$failure);
         if ($no_response) {
             phpCAS::trace('Reason: no response from the CAS server');
         } else {
@@ -2758,12 +2758,12 @@ 
                         if (empty($err_code)) {
                             phpCAS::trace('Reason: no CAS error');
                         } else {
-                            phpCAS::trace('Reason: [' . $err_code . '] CAS error: ' . $err_msg);
+                            phpCAS::trace('Reason: ['.$err_code.'] CAS error: '.$err_msg);
                         }
                         break;
                 }
             }
-            phpCAS::trace('CAS response: ' . $cas_response);
+            phpCAS::trace('CAS response: '.$cas_response);
         }
         $this->printHTMLFooter();
         phpCAS::traceExit();

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

Doc Comments +7 added lines

@@ -811,6 +811,9 @@ 
         $this->myDOMXPath = new DOMXPath($this->myOwnerDocument->myDOMNode);
     }
 
+    /**
+     * @param string $eval_str
+     */
     function xpath_eval($eval_str, $contextnode = null)
     {
         if (method_exists($this->myDOMXPath, 'evaluate')) {
@@ -824,6 +827,10 @@ 
         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);

Spacing +9 added lines, -9 removed lines

@@ -238,10 +238,10 @@ 
             $prefix = $this->myDOMNode->lookupPrefix($uri);
         }
         if (($prefix == null) && (($this->myDOMNode->documentElement == null) || (!$this->myDOMNode->documentElement->isDefaultNamespace($uri)))) {
-            $prefix = 'a' . sprintf('%u', crc32($uri));
+            $prefix = 'a'.sprintf('%u', crc32($uri));
         }
         return new php4DOMElement($this->myDOMNode->createElementNS($uri,
-            $prefix == null ? $name : $prefix . ':' . $name), $this);
+            $prefix == null ? $name : $prefix.':'.$name), $this);
     }
 
     function create_entity_reference($content)
@@ -344,7 +344,7 @@ 
         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,
+            $this->myDOMNode->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:'.$prefix,
                 $uri); //By Daniel Walker 2006-09-08
             return true;
         }
@@ -403,7 +403,7 @@ 
             $newNode = $this->myDOMNode->ownerDocument->createElement($name);
         } else {
             $newNode = $this->myDOMNode->ownerDocument->createElementNS($this->myDOMNode->namespaceURI,
-                $this->myDOMNode->prefix . ':' . $name);
+                $this->myDOMNode->prefix.':'.$name);
         }
         $myDOMNodeList = $this->myDOMNode->attributes;
         $i = 0;
@@ -457,7 +457,7 @@ 
                 return $this->myDOMNode->value;
             default:
                 $myErrors = debug_backtrace();
-                trigger_error('Undefined property: ' . get_class($this) . '::$' . $name . ' [' . $myErrors[0]['file'] . ':' . $myErrors[0]['line'] . ']',
+                trigger_error('Undefined property: '.get_class($this).'::$'.$name.' ['.$myErrors[0]['file'].':'.$myErrors[0]['line'].']',
                     E_USER_NOTICE);
                 return false;
         }
@@ -639,7 +639,7 @@ 
     {//Contributions by Daniel Walker 2006-09-08
         $nsprefix = $this->myDOMNode->lookupPrefix($uri);
         if ($nsprefix == null) {
-            $nsprefix = $prefix == null ? $nsprefix = 'a' . sprintf('%u', crc32($uri)) : $prefix;
+            $nsprefix = $prefix == null ? $nsprefix = 'a'.sprintf('%u', crc32($uri)) : $prefix;
             if ($this->myDOMNode->nodeType === XML_ATTRIBUTE_NODE) {
                 if (($prefix != null) && $this->myDOMNode->ownerElement->hasAttributeNS('http://www.w3.org/2000/xmlns/',
                         $nsprefix) &&
@@ -651,18 +651,18 @@ 
                     $this->myDOMNode = $parent->getAttributeNode($this->myDOMNode->localName);
                     return;
                 }
-                $this->myDOMNode->ownerElement->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:' . $nsprefix,
+                $this->myDOMNode->ownerElement->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:'.$nsprefix,
                     $uri);
             }
         }
         if ($this->myDOMNode->nodeType === XML_ATTRIBUTE_NODE) {
             $parent = $this->myDOMNode->ownerElement;
             $parent->removeAttributeNode($this->myDOMNode);
-            $parent->setAttributeNS($uri, $nsprefix . ':' . $this->myDOMNode->localName, $this->myDOMNode->nodeValue);
+            $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) {
             $NewNode = $this->myDOMNode->ownerDocument->createElementNS($uri,
-                $nsprefix . ':' . $this->myDOMNode->localName);
+                $nsprefix.':'.$this->myDOMNode->localName);
             foreach ($this->myDOMNode->attributes as $n) {
                 $NewNode->appendChild($n->cloneNode(true));
             }