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/group_list.php

Doc Comments +1 added lines, -2 removed lines

@@ -204,7 +204,6 @@ 
  * lock = the user can no longer use this account
  * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
  * @param int $active the current state of the account
- * @param int $user_id The user id
  * @param string $url_params
  * @return string Some HTML-code with the lock/unlock button
  */
@@ -236,7 +235,7 @@ 
  * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
  * @param int $status, do we want to lock the user ($status=lock) or unlock it ($status=unlock)
  * @param int $user_id The user id
- * @return language variable
+ * @return string|null variable
  */
 function lock_unlock_user($status, $user_id) {
     $user_table = Database :: get_main_table(TABLE_MAIN_USER);

Spacing +2 added lines, -4 removed lines

@@ -117,14 +117,12 @@
         // Loops while the current group is a subgroup
         while (isset($groupRelations[$id]['group_id'])) {
             $name = $name ?
-                $groupRelations[$id]['name'] . " > " . $name :
-                $groupRelations[$id]['name'];
+                $groupRelations[$id]['name']." > ".$name : $groupRelations[$id]['name'];
             $id = $groupRelations[$id]['group_id'];
         }
         // The base group
         $name = $name ?
-            $groupRelations[$id]['name'] . " > " . $name :
-            $groupRelations[$id]['name'];
+            $groupRelations[$id]['name']." > ".$name : $groupRelations[$id]['name'];
         $group[3] = $status[$group[3]];
         $group['1'] = '<a href="'.api_get_path(WEB_CODE_PATH).'social/group_view.php?id='.$group['0'].'">'.$name.'</a>';
         $groups[] = $group;

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>
  */

Spacing +43 added lines, -43 removed lines

@@ -129,7 +129,7 @@ 
 
     //Plugins NOT installed
     echo Display::page_subheader(get_lang('Plugins'));
-    echo '<form class="form-horizontal" name="plugins" method="post" action="'.api_get_self().'?category='.Security::remove_XSS($_GET['category']).'&sec_token=' . $token . '">';
+    echo '<form class="form-horizontal" name="plugins" method="post" action="'.api_get_self().'?category='.Security::remove_XSS($_GET['category']).'&sec_token='.$token.'">';
     echo '<table class="data_table">';
     echo '<tr>';
     echo '<th width="20px">';
@@ -141,7 +141,7 @@ 
 
     $plugin_list = array();
     $my_plugin_list = $plugin_obj->get_plugin_regions();
-    foreach($my_plugin_list as $plugin_item) {
+    foreach ($my_plugin_list as $plugin_item) {
         $plugin_list[$plugin_item] = $plugin_item;
     }
 
@@ -180,7 +180,7 @@ 
             if (file_exists(api_get_path(SYS_PLUGIN_PATH).$plugin.'/readme.txt')) {
                 echo Display::url(
                     "<em class='fa fa-file-text-o'></em> readme.txt",
-                    api_get_path(WEB_PLUGIN_PATH) . $plugin . "/readme.txt",
+                    api_get_path(WEB_PLUGIN_PATH).$plugin."/readme.txt",
                     [
                         'class' => 'btn btn-default ajax',
                         'data-title' => $plugin_info['title'],
@@ -322,7 +322,7 @@ 
                     $show_name = ucwords(str_replace('_', ' ', $style_dir));
 
                     if ($is_style_changeable) {
-                        $list_of_names[$style_dir]  = $show_name;
+                        $list_of_names[$style_dir] = $show_name;
                     }
                     $counter++;
                 }
@@ -353,9 +353,9 @@ 
             if (is_dir($dir)) {
                 $zip = new PclZip($arch);
                 // Remove path prefix except the style name and put file on disk
-                $zip->create($dir, PCLZIP_OPT_REMOVE_PATH, substr($dir,0,-strlen($safe_style_dir)));
+                $zip->create($dir, PCLZIP_OPT_REMOVE_PATH, substr($dir, 0, -strlen($safe_style_dir)));
                 //@TODO: use more generic script to download.
-                $str = '<a class="btn btn-primary btn-large" href="' . api_get_path(WEB_CODE_PATH) . 'course_info/download.php?archive=' . str_replace(api_get_path(SYS_ARCHIVE_PATH), '', $arch) . '">'.get_lang('ClickHereToDownloadTheFile').'</a>';
+                $str = '<a class="btn btn-primary btn-large" href="'.api_get_path(WEB_CODE_PATH).'course_info/download.php?archive='.str_replace(api_get_path(SYS_ARCHIVE_PATH), '', $arch).'">'.get_lang('ClickHereToDownloadTheFile').'</a>';
                 Display::display_normal_message($str, false);
             } else {
                 Display::addFlash(Display::return_message(get_lang('FileNotFound'), 'warning'));
@@ -371,15 +371,15 @@ 
     
     $logoForm->addHtml(Display::return_message(sprintf(get_lang('TheLogoMustBeSizeXAndFormatY'), '250 x 70', 'PNG'), 'info'));
     
-    $dir = api_get_path(SYS_PUBLIC_PATH).'css/themes/' . $selected . '/images/';
-    $url = api_get_path(WEB_CSS_PATH).'themes/' . $selected . '/images/';
+    $dir = api_get_path(SYS_PUBLIC_PATH).'css/themes/'.$selected.'/images/';
+    $url = api_get_path(WEB_CSS_PATH).'themes/'.$selected.'/images/';
     $logoFileName = 'header-logo.png';
     $newLogoFileName = 'header-logo-custom.png';
     
     if (is_file($dir.$newLogoFileName)) {
-        $logoForm->addLabel(get_lang('CurrentLogo'), '<img id="header-logo-custom" src="'. $url . $newLogoFileName .'?'. time() . '">'); 
+        $logoForm->addLabel(get_lang('CurrentLogo'), '<img id="header-logo-custom" src="'.$url.$newLogoFileName.'?'.time().'">'); 
     } else {
-        $logoForm->addLabel(get_lang('CurrentLogo'), '<img id="header-logo-custom" src="'. $url . $logoFileName .'?'. time() . '">');
+        $logoForm->addLabel(get_lang('CurrentLogo'), '<img id="header-logo-custom" src="'.$url.$logoFileName.'?'.time().'">');
     }
     
     $logoForm->addFile('new_logo', get_lang('UpdateLogo'));
@@ -403,7 +403,7 @@ 
             $imageInfo = getimagesize($_FILES['new_logo']['tmp_name']);
             $width = $imageInfo[0];
             $height = $imageInfo[1];
-            if ($width <= 250 && $height <= 70 ) {
+            if ($width <= 250 && $height <= 70) {
                 if (is_file($dir.$newLogoFileName)) {
                     unlink($dir.$newLogoFileName);
                 }
@@ -447,7 +447,7 @@ 
             });
             </script>';
             echo Display::tabs(
-                array(get_lang('Update'),get_lang('UpdateLogo'), get_lang('UploadNewStylesheet')),
+                array(get_lang('Update'), get_lang('UpdateLogo'), get_lang('UploadNewStylesheet')),
                 array($form_change->return_form(), $logoForm->return_form(), $form->return_form())
             );
         } else {
@@ -622,7 +622,7 @@ 
             if (!empty($areas_to_installed)) {
                 $plugin_obj->remove_all_regions($plugin);
                 foreach ($areas_to_installed as $region) {
-                    if (!empty($region) && $region != '-1' ) {
+                    if (!empty($region) && $region != '-1') {
                         $plugin_obj->add_to_region($plugin, $region);
                     }
                 }
@@ -714,7 +714,7 @@ 
     $values = api_get_settings_options('search_enabled');
     $form->addElement('header', null, get_lang('SearchEnabledTitle'));
 
-    $group = array ();
+    $group = array();
     if (is_array($values)) {
         foreach ($values as $key => $value) {
             $element = & $form->createElement('radio', 'search_enabled', '', get_lang($value['display_text']), $value['value']);
@@ -740,12 +740,12 @@ 
 
     if ($search_enabled == 'true') {
         $values = api_get_settings_options('search_show_unlinked_results');
-        $group = array ();
+        $group = array();
         foreach ($values as $key => $value) {
             $element = & $form->createElement('radio', 'search_show_unlinked_results', '', get_lang($value['display_text']), $value['value']);
             $group[] = $element;
         }
-        $form->addGroup($group, 'search_show_unlinked_results', array(get_lang('SearchShowUnlinkedResultsTitle'),get_lang('SearchShowUnlinkedResultsComment')), '', false);
+        $form->addGroup($group, 'search_show_unlinked_results', array(get_lang('SearchShowUnlinkedResultsTitle'), get_lang('SearchShowUnlinkedResultsComment')), '', false);
         $default_values['search_show_unlinked_results'] = api_get_setting('search_show_unlinked_results');
 
         $sf_values = array();
@@ -753,7 +753,7 @@ 
             $sf_values[$sf['code']] = $sf['name'];
         }
         $group = array();
-        $url =  Display::div(Display::url(get_lang('AddSpecificSearchField'), 'specific_fields.php'), array('class'=>'sectioncomment'));
+        $url = Display::div(Display::url(get_lang('AddSpecificSearchField'), 'specific_fields.php'), array('class'=>'sectioncomment'));
         if (empty($sf_values)) {
             $form->addElement('html', get_lang('SearchPrefilterPrefix').$url);
         } else {
@@ -820,10 +820,10 @@ 
             $dir_is_writable = Display::return_icon('bullet_red.png', get_lang('Error'));
         }
 
-        $data[] = array(get_lang('XapianModuleInstalled'),$xapian_loaded);
-        $data[] = array(get_lang('DirectoryExists').' - '.$xapian_path,$dir_exists);
-        $data[] = array(get_lang('IsWritable').' - '.$xapian_path,$dir_is_writable);
-        $data[] = array(get_lang('SpecificSearchFieldsAvailable') ,$specific_fields_exists);
+        $data[] = array(get_lang('XapianModuleInstalled'), $xapian_loaded);
+        $data[] = array(get_lang('DirectoryExists').' - '.$xapian_path, $dir_exists);
+        $data[] = array(get_lang('IsWritable').' - '.$xapian_path, $dir_is_writable);
+        $data[] = array(get_lang('SpecificSearchFieldsAvailable'), $specific_fields_exists);
 
         echo Display::tag('h3', get_lang('Settings'));
         $table = new SortableTableFromArray($data);
@@ -833,16 +833,16 @@ 
 
         //@todo windows support
         if (api_is_windows_os() == false) {
-            $list_of_programs = array('pdftotext','ps2pdf', 'catdoc','html2text','unrtf', 'catppt', 'xls2csv');
+            $list_of_programs = array('pdftotext', 'ps2pdf', 'catdoc', 'html2text', 'unrtf', 'catppt', 'xls2csv');
 
-            foreach($list_of_programs as $program) {
+            foreach ($list_of_programs as $program) {
                 $output = $ret_val = null;
                 exec("which $program", $output, $ret_val);
                 $icon = Display::return_icon('bullet_red.png', get_lang('NotInstalled'));
                 if (!empty($output[0])) {
                     $icon = Display::return_icon('bullet_green.png', get_lang('Installed'));
                 }
-                $data2[]= array($program, $output[0], $icon);
+                $data2[] = array($program, $output[0], $icon);
             }
             echo Display::tag('h3', get_lang('ProgramsNeededToConvertFiles'));
             $table = new SortableTableFromArray($data2);
@@ -874,7 +874,7 @@ 
     if ($action != 'add') {
         echo '<div class="actions" style="margin-left: 1px;">';
         echo '<a href="settings.php?category=Templates&action=add">'.
-                Display::return_icon('new_template.png', get_lang('AddTemplate'),'',ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('new_template.png', get_lang('AddTemplate'), '', ICON_SIZE_MEDIUM).'</a>';
         echo '</div>';
     }
 
@@ -993,8 +993,8 @@ 
  * @since Dokeos 1.8.6
  */
 function actions_filter($id) {
-    $return = '<a href="settings.php?category=Templates&action=edit&id='.Security::remove_XSS($id).'">'.Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>';
-    $return .= '<a href="settings.php?category=Templates&action=delete&id='.Security::remove_XSS($id).'" onClick="javascript:if(!confirm('."'".get_lang('ConfirmYourChoice')."'".')) return false;">'.Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
+    $return = '<a href="settings.php?category=Templates&action=edit&id='.Security::remove_XSS($id).'">'.Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>';
+    $return .= '<a href="settings.php?category=Templates&action=delete&id='.Security::remove_XSS($id).'" onClick="javascript:if(!confirm('."'".get_lang('ConfirmYourChoice')."'".')) return false;">'.Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>';
     return $return;
 }
 
@@ -1044,7 +1044,7 @@ 
     $form->addElement('html_editor', 'template_text', get_lang('Text'), null, array('ToolbarSet' => 'AdminTemplates', 'Width' => '100%', 'Height' => '400'));
 
     // Setting the form elements: the form to upload an image to be used with the template.
-    $form->addElement('file','template_image',get_lang('Image'),'');
+    $form->addElement('file', 'template_image', get_lang('Image'), '');
 
     // Setting the form elements: a little bit information about the template image.
     $form->addElement('static', 'file_comment', '', get_lang('TemplateImageComment100x70'));
@@ -1122,7 +1122,7 @@ 
             // Store the information in the database (as insert or as update).
             $table_system_template = Database :: get_main_table('system_template');
             if ($_GET['action'] == 'add') {
-                $content_template =  Security::remove_XSS($values['template_text'], COURSEMANAGERLOWSECURITY);
+                $content_template = Security::remove_XSS($values['template_text'], COURSEMANAGERLOWSECURITY);
                 $params = [
                     'title' =>  $values['title'],
                     'content' => $content_template,
@@ -1132,7 +1132,7 @@ 
 
                 // Display a feedback message.
                 Display::display_confirmation_message(get_lang('TemplateAdded'));
-                echo '<a href="settings.php?category=Templates&action=add">'.Display::return_icon('new_template.png', get_lang('AddTemplate'),'',ICON_SIZE_MEDIUM).'</a>';
+                echo '<a href="settings.php?category=Templates&action=add">'.Display::return_icon('new_template.png', get_lang('AddTemplate'), '', ICON_SIZE_MEDIUM).'</a>';
             } else {
                 $content_template = '<head>{CSS}<style type="text/css">.text{font-weight: normal;}</style></head><body>'.Database::escape_string($values['template_text']).'</body>';
                 $sql = "UPDATE $table_system_template set title = '".Database::escape_string($values['title'])."', content = '".$content_template."'";
@@ -1150,7 +1150,7 @@ 
         display_templates();
     } else {
         $token = Security::get_token();
-        $form->addElement('hidden','sec_token');
+        $form->addElement('hidden', 'sec_token');
         $form->setConstants(array('sec_token' => $token));
         // Display the form.
         $form->display();
@@ -1250,7 +1250,7 @@ 
 
     $form = new FormValidator('settings', 'post', 'settings.php?category='.Security::remove_XSS($_GET['category']));
 
-    $form->addElement('hidden', 'search_field', (!empty($_GET['search_field'])?Security::remove_XSS($_GET['search_field']):null));
+    $form->addElement('hidden', 'search_field', (!empty($_GET['search_field']) ? Security::remove_XSS($_GET['search_field']) : null));
 
     $url_id = api_get_current_access_url_id();
 
@@ -1317,9 +1317,9 @@ 
                 if (empty($row['category']))
                     $row['category'] = 0;
 
-                if (is_array($settings_by_access_list[ $row['variable'] ] [ $row['subkey'] ] [ $row['category'] ])) {
+                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'] != '')
+                    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.
@@ -1340,7 +1340,7 @@ 
                         array('maxlength' => '8')
                     );
                     $form->applyFilter($row['variable'], 'html_filter');
-                    $default_values[$row['variable']] = round($row['selected_value']/1024/1024, 1);
+                    $default_values[$row['variable']] = round($row['selected_value'] / 1024 / 1024, 1);
                 } elseif ($row['variable'] == 'account_valid_duration') {
                     $form->addElement(
                         'text',
@@ -1368,7 +1368,7 @@ 
                         ),
                         $hideme
                     );
-                    $form->applyFilter($row['variable'],'html_filter');
+                    $form->applyFilter($row['variable'], 'html_filter');
                     $default_values[$row['variable']] = $row['selected_value'];
                 }
                 break;
@@ -1379,7 +1379,7 @@ 
                     if (file_exists($file)) {
                         $value = file_get_contents($file);
                     }
-                    $form->addElement('textarea', $row['variable'], array(get_lang($row['title']), get_lang($row['comment'])) , array('rows'=>'10'), $hideme);
+                    $form->addElement('textarea', $row['variable'], array(get_lang($row['title']), get_lang($row['comment'])), array('rows'=>'10'), $hideme);
                     $default_values[$row['variable']] = $value;
                 } elseif ($row['variable'] == 'footer_extra_content') {
                     $file = api_get_path(SYS_PATH).api_get_home_path().'footer_extra_content.txt';
@@ -1387,16 +1387,16 @@ 
                     if (file_exists($file)) {
                         $value = file_get_contents($file);
                     }
-                    $form->addElement('textarea', $row['variable'], array(get_lang($row['title']), get_lang($row['comment'])) , array('rows'=>'10'), $hideme);
+                    $form->addElement('textarea', $row['variable'], array(get_lang($row['title']), get_lang($row['comment'])), array('rows'=>'10'), $hideme);
                     $default_values[$row['variable']] = $value;
                 } else {
-                    $form->addElement('textarea', $row['variable'], array(get_lang($row['title']), get_lang($row['comment'])) , array('rows'=>'10'), $hideme);
+                    $form->addElement('textarea', $row['variable'], array(get_lang($row['title']), get_lang($row['comment'])), array('rows'=>'10'), $hideme);
                     $default_values[$row['variable']] = $row['selected_value'];
                 }
                 break;
             case 'radio':
                 $values = api_get_settings_options($row['variable']);
-                $group = array ();
+                $group = array();
                 if (is_array($values)) {
                     foreach ($values as $key => $value) {
                         $element = &$form->createElement(
@@ -1427,7 +1427,7 @@ 
                         WHERE variable='".$row['variable']."' AND access_url =  1";
 
                 $result = Database::query($sql);
-                $group = array ();
+                $group = array();
                 while ($rowkeys = Database::fetch_array($result)) {
                     // Profile tab option should be hidden when the social tool is enabled.
                     if (api_get_setting('allow_social_tool') == 'true') {
@@ -1499,10 +1499,10 @@ 
 
         switch ($row['variable']) {
             case 'pdf_export_watermark_enable':
-                $url =  PDF::get_watermark(null);
+                $url = PDF::get_watermark(null);
 
                 if ($url != false) {
-                    $delete_url = '<a href="?delete_watermark">'.get_lang('DelImage').' '.Display::return_icon('delete.png',get_lang('DelImage')).'</a>';
+                    $delete_url = '<a href="?delete_watermark">'.get_lang('DelImage').' '.Display::return_icon('delete.png', get_lang('DelImage')).'</a>';
                     $form->addElement('html', '<div style="max-height:100px; max-width:100px; margin-left:162px; margin-bottom:10px; clear:both;"><img src="'.$url.'" style="margin-bottom:10px;" />'.$delete_url.'</div>');
                 }
 

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

Spacing +97 added lines, -97 removed lines

@@ -18,8 +18,8 @@ 
 $tool_name = get_lang('CreateSubLanguage');
 
 // setting breadcrumbs
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
-$interbreadcrumb[] = array ('url' => 'languages.php', 'name' => get_lang('PlatformLanguages'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'languages.php', 'name' => get_lang('PlatformLanguages'));
 
 /**
  * Add sub-language
@@ -30,7 +30,7 @@ 
  * @param   int     ID del idioma padre
  * @return  int     New sub language ID or false on error
  */
-function add_sub_language ($original_name,$english_name,$isocode,$sublanguage_available,$parent_id) {
+function add_sub_language($original_name, $english_name, $isocode, $sublanguage_available, $parent_id) {
     $tbl_admin_languages    = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
     $original_name          = Database::escape_string($original_name);
     $english_name           = Database::escape_string($english_name);
@@ -61,41 +61,41 @@ 
  * @todo This function is not transaction-safe and should probably be included
  *       inside the add_sub_language function.
  */
-function check_if_language_exist ($original_name, $english_name, $isocode, $sublanguage_available) {
-	$tbl_admin_languages 	= Database :: get_main_table(TABLE_MAIN_LANGUAGE);
-	$sql_original_name='SELECT count(*) AS count_original_name FROM '.$tbl_admin_languages.' WHERE original_name="'.Database::escape_string($original_name).'" ';
-	$sql_english_name='SELECT count(*) AS count_english_name FROM '.$tbl_admin_languages.' WHERE english_name="'.Database::escape_string($english_name).'" ';
+function check_if_language_exist($original_name, $english_name, $isocode, $sublanguage_available) {
+	$tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
+	$sql_original_name = 'SELECT count(*) AS count_original_name FROM '.$tbl_admin_languages.' WHERE original_name="'.Database::escape_string($original_name).'" ';
+	$sql_english_name = 'SELECT count(*) AS count_english_name FROM '.$tbl_admin_languages.' WHERE english_name="'.Database::escape_string($english_name).'" ';
 	//$sql_isocode='SELECT count(*) AS count_isocode FROM '.$tbl_admin_languages.' WHERE isocode="'.Database::escape_string($isocode).'" ';
-	$rs_original_name=Database::query($sql_original_name);
-	$rs_english_name=Database::query($sql_english_name);
+	$rs_original_name = Database::query($sql_original_name);
+	$rs_english_name = Database::query($sql_english_name);
 	//$rs_isocode=Database::query($sql_isocode);
-	$count_original_name=Database::result($rs_original_name,0,'count_original_name');
-	$count_english_name=Database::result($rs_english_name,0,'count_english_name');
+	$count_original_name = Database::result($rs_original_name, 0, 'count_original_name');
+	$count_english_name = Database::result($rs_english_name, 0, 'count_english_name');
 	//$count_isocode=Database::result($rs_isocode,0,'count_isocode');
-	$has_error=false;
-	$message_information=array();
+	$has_error = false;
+	$message_information = array();
 
-	if ($count_original_name==1) {
-		$has_error=true;
-		$message_information['original_name']=true;
+	if ($count_original_name == 1) {
+		$has_error = true;
+		$message_information['original_name'] = true;
 	}
-	if ($count_english_name==1) {
-		$has_error=true;
-		$message_information['english_name']=true;
+	if ($count_english_name == 1) {
+		$has_error = true;
+		$message_information['english_name'] = true;
 	}
 
 	$iso_list = api_get_platform_isocodes();
 	$iso_list = array_values($iso_list);
 
 	if (!in_array($isocode, $iso_list)) {
-		$has_error=true;
-		$message_information['isocode']=true;
+		$has_error = true;
+		$message_information['isocode'] = true;
 	}
-	if ($has_error===true) {
-		$message_information['execute_add']=false;
+	if ($has_error === true) {
+		$message_information['execute_add'] = false;
 	}
-	if ($has_error===false) {
-		$message_information['execute_add']=true;
+	if ($has_error === false) {
+		$message_information['execute_add'] = true;
 	}
 
 	return $message_information;
@@ -108,7 +108,7 @@ 
  * @return  bool
  * @todo    deprecate this function and use the static method directly
  */
-function check_if_exist_language_by_id ($language_id) {
+function check_if_exist_language_by_id($language_id) {
 	return SubLanguageManager::check_if_exist_language_by_id($language_id);
 }
 /**
@@ -116,10 +116,10 @@ 
  * @param   int     Language ID of the presumed parent
  * @return  bool    True if this language has children, false otherwise
  */
-function ckeck_if_is_parent_of_sub_language ($parent_id) {
-	$sql='SELECT count(*) AS count FROM language WHERE parent_id= '.intval($parent_id).'';
-	$rs=Database::query($sql);
-	if (Database::num_rows($rs)>0 && Database::result($rs,0,'count')==1) {
+function ckeck_if_is_parent_of_sub_language($parent_id) {
+	$sql = 'SELECT count(*) AS count FROM language WHERE parent_id= '.intval($parent_id).'';
+	$rs = Database::query($sql);
+	if (Database::num_rows($rs) > 0 && Database::result($rs, 0, 'count') == 1) {
 		return true;
 	} else {
 		return false;
@@ -131,117 +131,117 @@ 
  * @param   int     Child language ID
  * @return  array
  */
-function allow_get_all_information_of_sub_language ($parent_id,$sub_language_id) {
-	return SubLanguageManager::get_all_information_of_sub_language($parent_id,$sub_language_id);
+function allow_get_all_information_of_sub_language($parent_id, $sub_language_id) {
+	return SubLanguageManager::get_all_information_of_sub_language($parent_id, $sub_language_id);
 }
 /*end declare functions*/
 
 //add data
 
-if (isset($_GET['sub_language_id']) && $_GET['sub_language_id']==strval(intval($_GET['sub_language_id']))) {
-	$language_name=SubLanguageManager::get_name_of_language_by_id($_GET['sub_language_id']);
-		if (check_if_exist_language_by_id ($_GET['sub_language_id'])===true) {
-			$sub_language_id=$_GET['sub_language_id'];
-			$sub_language_id_exist=true;
+if (isset($_GET['sub_language_id']) && $_GET['sub_language_id'] == strval(intval($_GET['sub_language_id']))) {
+	$language_name = SubLanguageManager::get_name_of_language_by_id($_GET['sub_language_id']);
+		if (check_if_exist_language_by_id($_GET['sub_language_id']) === true) {
+			$sub_language_id = $_GET['sub_language_id'];
+			$sub_language_id_exist = true;
 		} else {
-			$sub_language_id_exist=false;
+			$sub_language_id_exist = false;
 		}
 
 }
 $language_details = array();
-$language_name='';
-if (isset($_GET['id']) && $_GET['id']==strval(intval($_GET['id']))) {
+$language_name = '';
+if (isset($_GET['id']) && $_GET['id'] == strval(intval($_GET['id']))) {
         $language_details = SubLanguageManager::get_all_information_of_language($_GET['id']);
 	$language_name = $language_details['original_name'];
-        if (check_if_exist_language_by_id ($_GET['id'])===true) {
-            $parent_id=$_GET['id'];
-            $language_id_exist=true;
+        if (check_if_exist_language_by_id($_GET['id']) === true) {
+            $parent_id = $_GET['id'];
+            $language_id_exist = true;
         } else {
-            $language_id_exist=false;
+            $language_id_exist = false;
         }
 } else {
-	$language_id_exist=false;
+	$language_id_exist = false;
 }
 
 //removed and register
 
-if ((isset($_GET['id']) && $_GET['id']==strval(intval($_GET['id']))) && (isset($_GET['sub_language_id']) && $_GET['sub_language_id']==strval(intval($_GET['sub_language_id'])))) {
-	if (check_if_exist_language_by_id($_GET['id'])===true && check_if_exist_language_by_id($_GET['sub_language_id'])===true) {
-	 	$get_all_information=allow_get_all_information_of_sub_language ($_GET['id'],$_GET['sub_language_id']);
-		$original_name=$get_all_information['original_name'];
-		$english_name=$get_all_information['english_name'];
-		$isocode=$get_all_information['isocode'];
+if ((isset($_GET['id']) && $_GET['id'] == strval(intval($_GET['id']))) && (isset($_GET['sub_language_id']) && $_GET['sub_language_id'] == strval(intval($_GET['sub_language_id'])))) {
+	if (check_if_exist_language_by_id($_GET['id']) === true && check_if_exist_language_by_id($_GET['sub_language_id']) === true) {
+	 	$get_all_information = allow_get_all_information_of_sub_language($_GET['id'], $_GET['sub_language_id']);
+		$original_name = $get_all_information['original_name'];
+		$english_name = $get_all_information['english_name'];
+		$isocode = $get_all_information['isocode'];
 
 	}
 }
 
-$language_name=get_lang('CreateSubLanguageForLanguage').' ( '.strtolower($language_name).' )';
+$language_name = get_lang('CreateSubLanguageForLanguage').' ( '.strtolower($language_name).' )';
 
-if (ckeck_if_is_parent_of_sub_language($parent_id)===true && isset($_GET['action']) && $_GET['action']=='deletesublanguage') {
-	$language_name=get_lang('DeleteSubLanguage');
+if (ckeck_if_is_parent_of_sub_language($parent_id) === true && isset($_GET['action']) && $_GET['action'] == 'deletesublanguage') {
+	$language_name = get_lang('DeleteSubLanguage');
 }
 
 $msg = '';
 
 if (isset($_POST['SubmitAddNewLanguage'])) {
-	$original_name=$_POST['original_name'];
-	$english_name=$_POST['english_name'];
-	$isocode=$_POST['isocode'];
-	$english_name=str_replace(' ','_',$english_name);
-	$isocode=str_replace(' ','_',$isocode);
+	$original_name = $_POST['original_name'];
+	$english_name = $_POST['english_name'];
+	$isocode = $_POST['isocode'];
+	$english_name = str_replace(' ', '_', $english_name);
+	$isocode = str_replace(' ', '_', $isocode);
 
-	$sublanguage_available=$_POST['sub_language_is_visible'];
-	$check_information=array();
-	$check_information=check_if_language_exist($original_name,$english_name,$isocode,$sublanguage_available);
+	$sublanguage_available = $_POST['sub_language_is_visible'];
+	$check_information = array();
+	$check_information = check_if_language_exist($original_name, $english_name, $isocode, $sublanguage_available);
 	foreach ($check_information as $index_information => $value_information) {
-		$allow_insert_info=false;
-		if ($index_information=='original_name') {
-			$msg .= Display::return_message(get_lang('AlreadyExists').' "'.get_lang('OriginalName').'" '.'('.$original_name.')','error');
+		$allow_insert_info = false;
+		if ($index_information == 'original_name') {
+			$msg .= Display::return_message(get_lang('AlreadyExists').' "'.get_lang('OriginalName').'" '.'('.$original_name.')', 'error');
 		}
-		if ($index_information=='english_name') {
-			$msg .= Display::return_message(get_lang('AlreadyExists').' "'.get_lang('EnglishName').'" '.'('.$english_name.')','error');
+		if ($index_information == 'english_name') {
+			$msg .= Display::return_message(get_lang('AlreadyExists').' "'.get_lang('EnglishName').'" '.'('.$english_name.')', 'error');
 		}
-		if ($index_information=='isocode') {
-			$msg .= Display::return_message(get_lang('CodeDoesNotExists').': '.$isocode.'','error');
+		if ($index_information == 'isocode') {
+			$msg .= Display::return_message(get_lang('CodeDoesNotExists').': '.$isocode.'', 'error');
 		}
-		if ($index_information=='execute_add' && $value_information===true) {
-			$allow_insert_info=true;
+		if ($index_information == 'execute_add' && $value_information === true) {
+			$allow_insert_info = true;
 		}
 	}
 
-	if (strlen($original_name)>0 && strlen($english_name)>0 && strlen($isocode)>0) {
-		if ($allow_insert_info===true && $language_id_exist===true) {
-			$english_name=str_replace(' ','_',$english_name);
+	if (strlen($original_name) > 0 && strlen($english_name) > 0 && strlen($isocode) > 0) {
+		if ($allow_insert_info === true && $language_id_exist === true) {
+			$english_name = str_replace(' ', '_', $english_name);
                         //Fixes BT#1636
-                        $english_name=api_strtolower($english_name);
+                        $english_name = api_strtolower($english_name);
 
-			$isocode=str_replace(' ','_',$isocode);
-			$str_info='<br/>'.get_lang('OriginalName').' : '.$original_name.'<br/>'.get_lang('EnglishName').' : '.$english_name.'<br/>'.get_lang('PlatformCharsetTitle').' : '.$isocode;
+			$isocode = str_replace(' ', '_', $isocode);
+			$str_info = '<br/>'.get_lang('OriginalName').' : '.$original_name.'<br/>'.get_lang('EnglishName').' : '.$english_name.'<br/>'.get_lang('PlatformCharsetTitle').' : '.$isocode;
 
-			$mkdir_result=SubLanguageManager::add_language_directory($english_name);
+			$mkdir_result = SubLanguageManager::add_language_directory($english_name);
 			if ($mkdir_result) {
-			  	$sl_id = add_sub_language($original_name,$english_name,$isocode,$sublanguage_available,$parent_id);
+			  	$sl_id = add_sub_language($original_name, $english_name, $isocode, $sublanguage_available, $parent_id);
                                 if ($sl_id === false) {
                                     SubLanguageManager::remove_language_directory($english_name);
-                                    $msg .= Display::return_message(get_lang('LanguageDirectoryNotWriteableContactAdmin'),'error');
+                                    $msg .= Display::return_message(get_lang('LanguageDirectoryNotWriteableContactAdmin'), 'error');
                                 } else {
                                     // Here we build the confirmation message and we send the user to the sub language terms definition page, using a little hack - see #3712
-                                    $_SESSION['msg'] = Display::return_message(get_lang('TheNewSubLanguageHasBeenAdded').$str_info.'confirm',false);
+                                    $_SESSION['msg'] = Display::return_message(get_lang('TheNewSubLanguageHasBeenAdded').$str_info.'confirm', false);
                                     unset($interbreadcrumb);
                                     $_GET['sub_language_id'] = $_REQUEST['sub_language_id'] = $sl_id;
                                     require 'sub_language.php';
                                     exit();
                                 }
 			} else {
-			    $msg .= Display::return_message(get_lang('LanguageDirectoryNotWriteableContactAdmin'),'error');
+			    $msg .= Display::return_message(get_lang('LanguageDirectoryNotWriteableContactAdmin'), 'error');
 			}
 		} else {
-			if ($language_id_exist===false) {
-				$msg .= Display::return_message(get_lang('LanguageParentNotExist'),'error');
+			if ($language_id_exist === false) {
+				$msg .= Display::return_message(get_lang('LanguageParentNotExist'), 'error');
 			}
 		}
 	} else {
-            $msg .= Display::return_message(get_lang('FormHasErrorsPleaseComplete'),'error');
+            $msg .= Display::return_message(get_lang('FormHasErrorsPleaseComplete'), 'error');
 	}
 }
 
@@ -251,7 +251,7 @@ 
 
 if (isset($_POST['SubmitAddDeleteLanguage'])) {
 	$rs = SubLanguageManager::remove_sub_language($_GET['id'], $_GET['sub_language_id']);
-	if ($rs===true) {
+	if ($rs === true) {
 		Display::display_confirmation_message(get_lang('TheSubLanguageHasBeenRemoved'));
 	} else {
 		Display::display_error_message(get_lang('TheSubLanguageHasNotBeenRemoved'));
@@ -259,14 +259,14 @@ 
 }
 // ckeck_if_is_parent_of_sub_language($parent_id)===false
 //
-if (isset($_GET['action']) && $_GET['action']=='definenewsublanguage') {
+if (isset($_GET['action']) && $_GET['action'] == 'definenewsublanguage') {
 	$text = $language_name;
 	$form = new FormValidator('addsublanguage', 'post', 'sub_language_add.php?id='.Security::remove_XSS($_GET['id']).'&action=definenewsublanguage');
-	$class='add';
+	$class = 'add';
 	$form->addElement('header', '', $text);
-	$form->addElement('text', 'original_name', get_lang('OriginalName'),'class="input_titles"');
+	$form->addElement('text', 'original_name', get_lang('OriginalName'), 'class="input_titles"');
 	$form->addRule('original_name', get_lang('ThisFieldIsRequired'), 'required');
-	$form->addElement('text', 'english_name', get_lang('EnglishName'),'class="input_titles"');
+	$form->addElement('text', 'english_name', get_lang('EnglishName'), 'class="input_titles"');
 	$form->addRule('english_name', get_lang('ThisFieldIsRequired'), 'required');
 	$form->addElement('text', 'isocode', get_lang('ISOCode'), 'class="input_titles"');
 	$form->addRule('isocode', get_lang('ThisFieldIsRequired'), 'required');
@@ -279,18 +279,18 @@ 
         $form->setDefaults($values);
 	$form->display();
 } else {
-	if (isset($_GET['action']) && $_GET['action']=='deletesublanguage') {
-		$text=$language_name;
+	if (isset($_GET['action']) && $_GET['action'] == 'deletesublanguage') {
+		$text = $language_name;
 		$form = new FormValidator('deletesublanguage', 'post', 'sub_language_add.php?id='.Security::remove_XSS($_GET['id']).'&sub_language_id='.Security::remove_XSS($_GET['sub_language_id']));
-		$class='minus';
+		$class = 'minus';
 		$form->addElement('header', '', $text);
-		$form->addElement('static', '', get_lang('OriginalName'),$original_name);
-		$form->addElement('static', '', get_lang('EnglishName'),$english_name);
-		$form->addElement('static', '', get_lang('PlatformCharsetTitle'),$isocode);
+		$form->addElement('static', '', get_lang('OriginalName'), $original_name);
+		$form->addElement('static', '', get_lang('EnglishName'), $english_name);
+		$form->addElement('static', '', get_lang('PlatformCharsetTitle'), $isocode);
 		$form->addButtonCreate(get_lang('DeleteSubLanguage'), 'SubmitAddDeleteLanguage');
 		$form->display();
 	}
-	if (isset($_GET['action']) && $_GET['action']=='definenewsublanguage') {
+	if (isset($_GET['action']) && $_GET['action'] == 'definenewsublanguage') {
 		Display::display_normal_message(get_lang('TheSubLanguageForThisLanguageHasBeenAdded'));
 	}
 }

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
  */
 

Spacing +4 added lines, -4 removed lines

@@ -215,8 +215,8 @@ 
             // We are sure that the extra field exists.
             foreach ($extra_fields as $extras) {
                 if (isset($user[$extras[1]])) {
-                    $key 	= $extras[1];
-                    $value 	= $user[$extras[1]];
+                    $key = $extras[1];
+                    $value = $user[$extras[1]];
                     UserManager::update_extra_field_value($user_id, $key, $value);
                 }
             }
@@ -253,7 +253,7 @@ 
     global $current_tag;
     switch ($data) {
         case 'Contact':
-            $user = array ();
+            $user = array();
             break;
         default:
             $current_tag = $data;
@@ -350,7 +350,7 @@ 
 
     if (in_array($ext_import_file, $allowed_file_mimetype)) {
         if (strcmp($file_type, 'csv') === 0 && $ext_import_file == $allowed_file_mimetype[0]) {
-            $users	= parse_csv_data($_FILES['import_file']['tmp_name']);
+            $users = parse_csv_data($_FILES['import_file']['tmp_name']);
             $errors = validate_data($users);
             $error_kind_file = false;
         } elseif (strcmp($file_type, 'xml') === 0 && $ext_import_file == $allowed_file_mimetype[1]) {

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

Spacing +8 added lines, -8 removed lines

@@ -60,7 +60,7 @@ 
                     $attendance->set_attendance_qualify_title($_POST['attendance_qualify_title']);
                     $attendance->set_attendance_weight($_POST['attendance_weight']);
                     $link_to_gradebook = false;
-                    if ( isset($_POST['attendance_qualify_gradebook']) && $_POST['attendance_qualify_gradebook'] == 1 ) {
+                    if (isset($_POST['attendance_qualify_gradebook']) && $_POST['attendance_qualify_gradebook'] == 1) {
                         $link_to_gradebook = true;
                     }
                     $attendance->category_id = $_POST['category_id'];
@@ -112,7 +112,7 @@ 
                     ) {
                         $link_to_gradebook = true;
                     }
-                    $attendance->attendance_edit($attendance_id,$link_to_gradebook);
+                    $attendance->attendance_edit($attendance_id, $link_to_gradebook);
                     Security::clear_token();
                     header('location:index.php?action=attendance_list&'.api_get_cidreq());
                     exit;
@@ -543,17 +543,17 @@ 
             }
         }
         $max_cols_per_page = 12; //10 dates + 2 name and number
-        $max_dates_per_page = $max_dates_per_page_original = $max_cols_per_page - 2;//10
+        $max_dates_per_page = $max_dates_per_page_original = $max_cols_per_page - 2; //10
         $rows = count($data_table);
 
         if ($cols > $max_cols_per_page) {
-            $number_tables = round(($cols-2)/$max_dates_per_page);
+            $number_tables = round(($cols - 2) / $max_dates_per_page);
             $headers = $data_table[0];
             $all = array();
             $tables = array();
             $changed = 1;
 
-            for ($i= 0; $i <= $rows; $i++) {
+            for ($i = 0; $i <= $rows; $i++) {
                 $row = isset($data_table[$i]) ? $data_table[$i] : null;
                 $key = 1;
                 $max_dates_per_page = 10;
@@ -564,7 +564,7 @@ 
                     foreach ($item as $value) {
                         if ($count_j >= $max_dates_per_page) {
                             $key++;
-                            $max_dates_per_page = $max_dates_per_page_original*$key;
+                            $max_dates_per_page = $max_dates_per_page_original * $key;
                             //magic hack
                             $tables[$key][$i][] = $tables[1][$i][0];
                             $tables[$key][$i][] = $tables[1][$i][1];
@@ -622,8 +622,8 @@ 
             $form = new FormValidator(
                 'search',
                 'post',
-                api_get_self() . '?' . api_get_cidreq(
-                ) . '&action=calendar_logins'
+                api_get_self().'?'.api_get_cidreq(
+                ).'&action=calendar_logins'
             );
             $form->addDateRangePicker('range', get_lang('DateRange'));
             $form->addButton('submit', get_lang('Submit'));

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 +6 added lines, -6 removed lines

@@ -41,13 +41,13 @@ 
     }
 
 	if (!is_object($PHPCAS_CLIENT)) {
-		phpCAS::client($cas_auth_ver,$cas_auth_server,$cas_auth_port,$cas_auth_uri);
+		phpCAS::client($cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri);
 		phpCAS::setNoCasServerValidation();
 	}
 	$auth = phpCAS::checkAuthentication();
 
 	if ($auth) {
-		$login= trim(phpCAS::getUser());
+		$login = trim(phpCAS::getUser());
 		/*
 		   Get user  attributes. Here are the attributes for crdp platform
 		   sn => name
@@ -79,7 +79,7 @@ 
 			default:
 				$status=5; // Student
 		}*/
-		if (!$logout){
+		if (!$logout) {
 		    // get user info from username
 		    $tab_user_info = api_get_user_info($login);
 
@@ -92,7 +92,7 @@ 
                         $chamilo_user = extldap_get_chamilo_user($ldapuser);
                         $chamilo_user['user_id'] = $tab_user_info['user_id'];
                         $chamilo_user['status'] = $tab_user_info['status'];
-        				UserManager::update_user ($chamilo_user["user_id"], $chamilo_user["firstname"], $chamilo_user["lastname"], $login, null, null, $chamilo_user["email"], $chamilo_user["status"], '', '', '', '', 1, null, 0, null,'') ;
+        				UserManager::update_user($chamilo_user["user_id"], $chamilo_user["firstname"], $chamilo_user["lastname"], $login, null, null, $chamilo_user["email"], $chamilo_user["status"], '', '', '', '', 1, null, 0, null, '');
 		            }
 		        }
 		        return $login;
@@ -105,7 +105,7 @@ 
 		            case PLATFORM_AUTH_SOURCE :
 		                // user will have to modify firstname, lastname, email in chamilo profil edit
 		                $userdata = get_lang("EditInProfil");
-          				UserManager::create_user($userdata, $userdata, '5', $userdata, $login, 'casplaceholder', '','','','',CAS_AUTH_SOURCE);
+          				UserManager::create_user($userdata, $userdata, '5', $userdata, $login, 'casplaceholder', '', '', '', '', CAS_AUTH_SOURCE);
           				$user_added = $login;
 		                break;
 		            case LDAP_AUTH_SOURCE :
@@ -163,7 +163,7 @@ 
  *
  * @see online_logout()
  */
-function cas_logout($uinfo=null, $location=null)
+function cas_logout($uinfo = null, $location = null)
 {
     global $cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri;
     global $PHPCAS_CLIENT;

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;

Spacing +87 added lines, -87 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');

 }

 

 /**

@@ -281,7 +281,7 @@ 
  *

  * @hideinitializer

  */

-$GLOBALS['PHPCAS_INIT_CALL'] = array (

+$GLOBALS['PHPCAS_INIT_CALL'] = array(

 	'done' => FALSE,

 	'file' => '?',

 	'line' => -1,

@@ -294,7 +294,7 @@ 
  *

  * @hideinitializer

  */

-$GLOBALS['PHPCAS_AUTH_CHECK_CALL'] = array (

+$GLOBALS['PHPCAS_AUTH_CHECK_CALL'] = array(

 	'done' => FALSE,

 	'file' => '?',

 	'line' => -1,

@@ -307,7 +307,7 @@ 
  *

  * @hideinitializer

  */

-$GLOBALS['PHPCAS_DEBUG'] = array (

+$GLOBALS['PHPCAS_DEBUG'] = array(

 	'filename' => '/tmp/cas.log',

 	'indent' => 0,

 	'unique_id' => ''

@@ -320,7 +320,7 @@ 
 // ########################################################################

 

 // include client class

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

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

 

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

 //  INTERFACE CLASS

@@ -368,7 +368,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\')');

@@ -385,11 +385,11 @@ 
 

 		// store where the initializer is called from

 		$dbg = phpCAS :: backtrace();

-		$PHPCAS_INIT_CALL = array (

+		$PHPCAS_INIT_CALL = array(

 			'done' => TRUE,

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

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

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

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

 		);

 

 		// initialize the global object $PHPCAS_CLIENT

@@ -417,7 +417,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\')');

@@ -434,11 +434,11 @@ 
 

 		// store where the initialzer is called from

 		$dbg = phpCAS :: backtrace();

-		$PHPCAS_INIT_CALL = array (

+		$PHPCAS_INIT_CALL = array(

 			'done' => TRUE,

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

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

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

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

 		);

 

 		// initialize the global object $PHPCAS_CLIENT

@@ -472,17 +472,17 @@ 
 		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 = '';

 					}

 			} else {

 				$debugDir = DEFAULT_DEBUG_DIR;

 			}

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

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

 		}

 

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

@@ -509,7 +509,7 @@ 
 			return debug_backtrace();

 		} else {

 			// poor man's hack ... but it does work ...

-			return array ();

+			return array();

 		}

 	}

 

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

 		}

 

 	}

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

@@ -568,7 +568,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'].']');

 	}

 

 	/**

@@ -580,9 +580,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) {

@@ -591,7 +591,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']++;

 	}

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

 	}

 

@@ -644,7 +644,7 @@ 
 	function setLang($lang) {

 		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\')');

@@ -687,7 +687,7 @@ 
 	function setHTMLHeader($header) {

 		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\')');

@@ -703,7 +703,7 @@ 
 	function setHTMLFooter($footer) {

 		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\')');

@@ -732,13 +732,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\')');

@@ -770,13 +770,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\')');

@@ -830,16 +830,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\')');

@@ -873,16 +873,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\')');

@@ -918,7 +918,7 @@ 
 	function setCacheTimesForAuthRecheck($n) {

 		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\')');

@@ -935,18 +935,18 @@ 
 

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

 

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

 		$dbg = phpCAS :: backtrace();

-		$PHPCAS_AUTH_CHECK_CALL = array (

+		$PHPCAS_AUTH_CHECK_CALL = array(

 			'done' => TRUE,

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

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

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

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

 			'result' => $auth

 		);

 		phpCAS :: traceEnd($auth);

@@ -963,18 +963,18 @@ 
 

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

 

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

 		$dbg = phpCAS :: backtrace();

-		$PHPCAS_AUTH_CHECK_CALL = array (

+		$PHPCAS_AUTH_CHECK_CALL = array(

 			'done' => TRUE,

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

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

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

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

 			'result' => $auth

 		);

 

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

@@ -997,16 +997,16 @@ 
 

 		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

 		$dbg = phpCAS :: backtrace();

-		$PHPCAS_AUTH_CHECK_CALL = array (

+		$PHPCAS_AUTH_CHECK_CALL = array(

 			'done' => TRUE,

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

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

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

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

 			'result' => $auth

 		);

 

@@ -1018,7 +1018,7 @@ 
 	 * This method has been left from version 0.4.1 for compatibility reasons.

 	 */

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

 	}

 

 	/**

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

@@ -1040,11 +1040,11 @@ 
 

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

 		$dbg = phpCAS :: backtrace();

-		$PHPCAS_AUTH_CHECK_CALL = array (

+		$PHPCAS_AUTH_CHECK_CALL = array(

 			'done' => TRUE,

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

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

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

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

 			'result' => $auth

 		);

 		phpCAS :: traceEnd($auth);

@@ -1060,7 +1060,7 @@ 
 	function isSessionAuthenticated() {

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

 	}

@@ -1075,13 +1075,13 @@ 
 	function getUser() {

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

 	}

@@ -1096,13 +1096,13 @@ 
 	function getAttributes() {

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

 	}

@@ -1112,7 +1112,7 @@ 
 	function handleLogoutRequests($check_client = true, $allowed_clients = false) {

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

 	}

@@ -1126,7 +1126,7 @@ 
 	function getServerLoginURL() {

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

 	}

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

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

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

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

@@ -1222,7 +1222,7 @@ 
 	function getServerLogoutURL() {

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

 	}

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

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

+		$parsedParams = array();

 		if ($params != "") {

 			if (is_string($params)) {

 				phpCAS :: error('method `phpCAS::logout($url)\' is now deprecated, use `phpCAS::logoutWithUrl($url)\' instead');

@@ -1286,12 +1286,12 @@ 
 		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\')');

 		}

-		$PHPCAS_CLIENT->logout(array (

+		$PHPCAS_CLIENT->logout(array(

 			"service" => $service

 		));

 		// never reached

@@ -1306,12 +1306,12 @@ 
 		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\')');

 		}

-		$PHPCAS_CLIENT->logout(array (

+		$PHPCAS_CLIENT->logout(array(

 			"url" => $url

 		));

 		// never reached

@@ -1327,7 +1327,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\')');

@@ -1335,7 +1335,7 @@ 
 		if (!is_string($url)) {

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

 		}

-		$PHPCAS_CLIENT->logout(array (

+		$PHPCAS_CLIENT->logout(array(

 			"service" => $service,

 			"url" => $url

 		));

@@ -1353,10 +1353,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\')');

@@ -1375,7 +1375,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\')');

@@ -1390,7 +1390,7 @@ 
 	function getServiceURL() {

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

 	}

@@ -1401,7 +1401,7 @@ 
 	function retrievePT($target_service, & $err_code, & $err_msg) {

 		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\')');

@@ -1418,7 +1418,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\')');

@@ -1436,7 +1436,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\')');

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

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

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

Spacing +196 added lines, -196 removed lines

@@ -80,9 +80,9 @@ 
 	 */
 	function HTMLFilterOutput($str)
 		{
-		$str = str_replace('__CAS_VERSION__',$this->getServerVersion(),$str);
-		$str = str_replace('__PHPCAS_VERSION__',phpCAS::getVersion(),$str);
-		$str = str_replace('__SERVER_BASE_URL__',$this->getServerBaseURL(),$str);
+		$str = str_replace('__CAS_VERSION__', $this->getServerVersion(), $str);
+		$str = str_replace('__PHPCAS_VERSION__', phpCAS::getVersion(), $str);
+		$str = str_replace('__SERVER_BASE_URL__', $this->getServerBaseURL(), $str);
 		echo $str;
 		}
 	
@@ -136,7 +136,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);
 		}
 	
@@ -193,7 +193,7 @@ 
 	 */
 	function getLang()
 		{
-		if ( empty($this->_lang) )
+		if (empty($this->_lang))
 			$this->setLang(PHPCAS_LANG_DEFAULT);
 		return $this->_lang;
 		}
@@ -223,8 +223,8 @@ 
 		// call CASclient::getLang() to be sure the language is initialized
 		$this->getLang();
 		
-		if ( !isset($this->_strings[$str]) ) {
-			trigger_error('string `'.$str.'\' not defined for language `'.$this->getLang().'\'',E_USER_ERROR);
+		if (!isset($this->_strings[$str])) {
+			trigger_error('string `'.$str.'\' not defined for language `'.$this->getLang().'\'', E_USER_ERROR);
 		}
 		return $this->_strings[$str];
 		}
@@ -243,8 +243,8 @@ 
 		// include the corresponding language file
 		include_once(dirname(__FILE__).'/languages/'.$lang.'.php');
 		
-		if ( !is_array($this->_strings) ) {
-			trigger_error('language `'.$lang.'\' is not implemented',E_USER_ERROR);
+		if (!is_array($this->_strings)) {
+			trigger_error('language `'.$lang.'\' is not implemented', E_USER_ERROR);
 		}
 		$this->_lang = $lang;
 		}
@@ -331,7 +331,7 @@ 
 	function getServerBaseURL()
 		{ 
 		// the URL is build only when needed
-		if ( empty($this->_server['base_url']) ) {
+		if (empty($this->_server['base_url'])) {
 			$this->_server['base_url'] = 'https://'
 				.$this->getServerHostname()
 				.':'
@@ -350,15 +350,15 @@ 
 	 * @return a URL.
 	 * @private
 	 */
-	function getServerLoginURL($gateway=false,$renew=false) {
+	function getServerLoginURL($gateway = false, $renew = false) {
 		phpCAS::traceBegin();
 		// the URL is build only when needed
-		if ( empty($this->_server['login_url']) ) {
+		if (empty($this->_server['login_url'])) {
 			$this->_server['login_url'] = $this->getServerBaseURL();
 			$this->_server['login_url'] .= 'login?service=';
 			// $this->_server['login_url'] .= preg_replace('/&/','%26',$this->getURL());
 			$this->_server['login_url'] .= urlencode($this->getURL());
-			if($renew) {
+			if ($renew) {
 				// It is recommended that when the "renew" parameter is set, its value be "true"
 				$this->_server['login_url'] .= '&renew=true';
 			} elseif ($gateway) {
@@ -426,7 +426,7 @@ 
 	function getServerServiceValidateURL()
 		{ 
 		// the URL is build only when needed
-		if ( empty($this->_server['service_validate_url']) ) {
+		if (empty($this->_server['service_validate_url'])) {
 			switch ($this->getServerVersion()) {
 				case CAS_VERSION_1_0:
 					$this->_server['service_validate_url'] = $this->getServerBaseURL().'validate';
@@ -448,7 +448,7 @@ 
 		{
 		phpCAS::traceBegin();
 		// the URL is build only when needed
-		if ( empty($this->_server['saml_validate_url']) ) {
+		if (empty($this->_server['saml_validate_url'])) {
 			switch ($this->getServerVersion()) {
 				case SAML_VERSION_1_1:
 					$this->_server['saml_validate_url'] = $this->getServerBaseURL().'samlValidate';
@@ -466,7 +466,7 @@ 
 	function getServerProxyValidateURL()
 		{ 
 		// the URL is build only when needed
-		if ( empty($this->_server['proxy_validate_url']) ) {
+		if (empty($this->_server['proxy_validate_url'])) {
 			switch ($this->getServerVersion()) {
 				case CAS_VERSION_1_0:
 					$this->_server['proxy_validate_url'] = '';
@@ -488,7 +488,7 @@ 
 	function getServerProxyURL()
 		{ 
 		// the URL is build only when needed
-		if ( empty($this->_server['proxy_url']) ) {
+		if (empty($this->_server['proxy_url'])) {
 			switch ($this->getServerVersion()) {
 				case CAS_VERSION_1_0:
 					$this->_server['proxy_url'] = '';
@@ -509,7 +509,7 @@ 
 	function getServerLogoutURL()
 		{ 
 		// the URL is build only when needed
-		if ( empty($this->_server['logout_url']) ) {
+		if (empty($this->_server['logout_url'])) {
 			$this->_server['logout_url'] = $this->getServerBaseURL().'logout';
 		}
 		return $this->_server['logout_url']; 
@@ -547,7 +547,7 @@ 
 	function isHttps() {
 		//if ( isset($_SERVER['HTTPS']) && !empty($_SERVER['HTTPS']) ) {
 		//0.4.24 by Hinnack
-		if ( isset($_SERVER['HTTPS']) && !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
+		if (isset($_SERVER['HTTPS']) && !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
 			return true;
 		} else {
 			return false;
@@ -582,45 +582,45 @@ 
 		phpCAS::traceBegin();
 		
 		// the redirect header() call and DOM parsing code from domxml-php4-php5.php won't work in PHP4 compatibility mode
-		if (version_compare(PHP_VERSION,'5','>=') && ini_get('zend.ze1_compatibility_mode')) {
+		if (version_compare(PHP_VERSION, '5', '>=') && ini_get('zend.ze1_compatibility_mode')) {
 			phpCAS::error('phpCAS cannot support zend.ze1_compatibility_mode. Sorry.');
 		}
 		// skip Session Handling for logout requests and if don't want it'
 		if ($start_session && !$this->isLogoutRequest()) {
 			phpCAS::trace("Starting session handling");
 			// Check for Tickets from the CAS server
-			if (empty($_GET['ticket'])){
+			if (empty($_GET['ticket'])) {
 				phpCAS::trace("No ticket found");
 				// only create a session if necessary
 				if (!session_id()) {
 					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;
 					session_destroy();	
 				}
 				// set up a new session, of name based on the ticket
-				$session_id = preg_replace('/[^\w]/','',$_GET['ticket']);
-				phpCAS::LOG("Session ID: " . $session_id);
+				$session_id = preg_replace('/[^\w]/', '', $_GET['ticket']);
+				phpCAS::LOG("Session ID: ".$session_id);
 				session_id($session_id);
 				session_start();
 				// restore old session vars
-				if(isset($old_session)){
+				if (isset($old_session)) {
 					phpCAS::trace("Restoring old session vars");
 					$_SESSION = $old_session;
 				}
 			}
-		}else{
+		} else {
 			phpCAS::trace("Skipping session creation");
 		}
 		
@@ -631,7 +631,7 @@ 
 		//check version
 		switch ($server_version) {
 			case CAS_VERSION_1_0:
-				if ( $this->isProxy() )
+				if ($this->isProxy())
 					phpCAS::error('CAS proxies are not supported in CAS '
 						.$server_version);
 				break;
@@ -648,35 +648,35 @@ 
 		$this->_server['version'] = $server_version;
 		
 		// check hostname
-		if ( empty($server_hostname) 
-				|| !preg_match('/[\.\d\-abcdefghijklmnopqrstuvwxyz]*/',$server_hostname) ) {
+		if (empty($server_hostname) 
+				|| !preg_match('/[\.\d\-abcdefghijklmnopqrstuvwxyz]*/', $server_hostname)) {
 			phpCAS::error('bad CAS server hostname (`'.$server_hostname.'\')');
 		}
 		$this->_server['hostname'] = $server_hostname;
 		
 		// check port
-		if ( $server_port == 0 
-			|| !is_int($server_port) ) {
+		if ($server_port == 0 
+			|| !is_int($server_port)) {
 			phpCAS::error('bad CAS server port (`'.$server_hostname.'\')');
 		}
 		$this->_server['port'] = $server_port;
 		
 		// check URI
-		if ( !preg_match('/[\.\d\-_abcdefghijklmnopqrstuvwxyz\/]*/',$server_uri) ) {
+		if (!preg_match('/[\.\d\-_abcdefghijklmnopqrstuvwxyz\/]*/', $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 
-		if ( $this->isProxy() ) {
-			$this->setCallbackMode(!empty($_GET['pgtIou'])&&!empty($_GET['pgtId']));
+		if ($this->isProxy()) {
+			$this->setCallbackMode(!empty($_GET['pgtIou']) && !empty($_GET['pgtId']));
 		}
 		
-		if ( $this->isCallbackMode() ) {
+		if ($this->isCallbackMode()) {
 			//callback mode: check that phpCAS is secured
-			if ( !$this->isHttps() ) {
+			if (!$this->isHttps()) {
 				phpCAS::error('CAS proxies must be secured to use phpCAS; PGT\'s will not be received from the CAS server');
 			}
 		} else {
@@ -684,33 +684,33 @@ 
 			$ticket = (isset($_GET['ticket']) ? $_GET['ticket'] : null);
 			switch ($this->getServerVersion()) {
 				case CAS_VERSION_1_0: // check for a Service Ticket
-					if( preg_match('/^ST-/',$ticket) ) {
+					if (preg_match('/^ST-/', $ticket)) {
 						phpCAS::trace('ST \''.$ticket.'\' found');
 						//ST present
 						$this->setST($ticket);
 						//ticket has been taken into account, unset it to hide it to applications
 						unset($_GET['ticket']);
-					} else if ( !empty($ticket) ) {
+					} else if (!empty($ticket)) {
 						//ill-formed ticket, halt
 						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) ) {
+					if (preg_match('/^[SP]T-/', $ticket)) {
 						phpCAS::trace('ST or PT \''.$ticket.'\' found');
 						$this->setPT($ticket);
 						unset($_GET['ticket']);
-					} else if ( !empty($ticket) ) {
+					} else if (!empty($ticket)) {
 						//ill-formed ticket, halt
 						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) ) {
+					if (preg_match('/^[SP]T-/', $ticket)) {
 						phpCAS::trace('SA \''.$ticket.'\' found');
 						$this->setSA($ticket);
 						unset($_GET['ticket']);
-					} else if ( !empty($ticket) ) {
+					} else if (!empty($ticket)) {
 						//ill-formed ticket, halt
 						phpCAS::error('ill-formed ticket found in the URL (ticket=`'.htmlentities($ticket).'\')');
 					}
@@ -763,7 +763,7 @@ 
 	 */
 	function getUser()
 		{
-		if ( empty($this->_user) ) {
+		if (empty($this->_user)) {
 			phpCAS::error('this method should be used only after '.__CLASS__.'::forceAuthentication() or '.__CLASS__.'::isAuthenticated()');
 		}
 		return $this->_user;
@@ -790,7 +790,7 @@ 
 		{ $this->_attributes = $attributes; }
 	
 	function getAttributes() {
-		if ( empty($this->_user) ) { // if no user is set, there shouldn't be any attributes also...
+		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()');
 		}
 		return $this->_attributes;
@@ -802,8 +802,8 @@ 
 	function hasAttribute($key)
 		{ return (is_array($this->_attributes) && array_key_exists($key, $this->_attributes)); }
 	
-	function getAttribute($key)	{
-		if($this->hasAttribute($key)) {
+	function getAttribute($key) {
+		if ($this->hasAttribute($key)) {
 			return $this->_attributes[$key];
 		}
 	}
@@ -814,14 +814,14 @@ 
 	 * If not, redirect to CAS
 	 * @public
 	 */
-	function renewAuthentication(){
+	function renewAuthentication() {
 		phpCAS::traceBegin();
 		// Either way, the user is authenticated by CAS
-		if( isset( $_SESSION['phpCAS']['auth_checked'] ) )
+		if (isset($_SESSION['phpCAS']['auth_checked']))
 			unset($_SESSION['phpCAS']['auth_checked']);
-		if ( $this->isAuthenticated() ) {
+		if ($this->isAuthenticated()) {
 			phpCAS::trace('user already authenticated; renew');
-			$this->redirectToCas(false,true);
+			$this->redirectToCas(false, true);
 		} else {
 			$this->redirectToCas();
 		}
@@ -838,7 +838,7 @@ 
 		{
 		phpCAS::traceBegin();
 		
-		if ( $this->isAuthenticated() ) {
+		if ($this->isAuthenticated()) {
 			// the user is authenticated, nothing to be done.
 			phpCAS::trace('no need to authenticate');
 			$res = TRUE;
@@ -883,7 +883,7 @@ 
 	function checkAuthentication()
 		{
 		phpCAS::traceBegin();
-		if ( $this->isAuthenticated() ) {
+		if ($this->isAuthenticated()) {
             phpCAS::trace('user is authenticated');
 			$res = TRUE;
 		} else if (isset($_SESSION['phpCAS']['auth_checked'])) {
@@ -897,7 +897,7 @@ 
 			//	    // never reached
 			//	    $res = FALSE;
 			// avoid a check against CAS on every request
-			if (! isset($_SESSION['phpCAS']['unauth_count']) )
+			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) 
@@ -943,43 +943,43 @@ 
 		$res = FALSE;
 		$validate_url = '';
 		
-		if ( $this->wasPreviouslyAuthenticated() ) {
+		if ($this->wasPreviouslyAuthenticated()) {
 			// the user has already (previously during the session) been
 			// authenticated, nothing to be done.
 			phpCAS::trace('user was already authenticated, no need to look for tickets');
 			$res = TRUE;
 		}
 		else {
-			if ( $this->hasST() ) {
+			if ($this->hasST()) {
 				// if a Service Ticket was given, validate it
 				phpCAS::trace('ST `'.$this->getST().'\' is present');
-				$this->validateST($validate_url,$text_response,$tree_response); // if it fails, it halts
+				$this->validateST($validate_url, $text_response, $tree_response); // if it fails, it halts
 				phpCAS::trace('ST `'.$this->getST().'\' was validated');
-				if ( $this->isProxy() ) {
-					$this->validatePGT($validate_url,$text_response,$tree_response); // idem
+				if ($this->isProxy()) {
+					$this->validatePGT($validate_url, $text_response, $tree_response); // idem
 					phpCAS::trace('PGT `'.$this->getPGT().'\' was validated');
 					$_SESSION['phpCAS']['pgt'] = $this->getPGT();
 				}
 				$_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
+				$this->validatePT($validate_url, $text_response, $tree_response); // note: if it fails, it halts
 				phpCAS::trace('PT `'.$this->getPT().'\' was validated');
-				if ( $this->isProxy() ) {
-					$this->validatePGT($validate_url,$text_response,$tree_response); // idem
+				if ($this->isProxy()) {
+					$this->validatePGT($validate_url, $text_response, $tree_response); // idem
 					phpCAS::trace('PGT `'.$this->getPGT().'\' was validated');
 					$_SESSION['phpCAS']['pgt'] = $this->getPGT();
 				}
 				$_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
+				$this->validateSA($validate_url, $text_response, $tree_response); // if it fails, it halts
 				phpCAS::trace('SA `'.$this->getSA().'\' was validated');
 				$_SESSION['phpCAS']['user'] = $this->getUser();
 				$_SESSION['phpCAS']['attributes'] = $this->getAttributes();
@@ -993,7 +993,7 @@ 
 				// 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() );
+				phpCAS::log("Prepare redirect to : ".$this->getURL());
 			}
 		}
 		
@@ -1006,7 +1006,7 @@ 
 	 * @return true if authenticated based soley on $_SESSION variable
 	 * @since 0.4.22 by Brendan Arnold
 	 */
-	function isSessionAuthenticated ()
+	function isSessionAuthenticated()
 		{
 		return !empty($_SESSION['phpCAS']['user']);
 		}
@@ -1025,28 +1025,28 @@ 
 		{
 		phpCAS::traceBegin();
 		
-		if ( $this->isCallbackMode() ) {
+		if ($this->isCallbackMode()) {
 			$this->callback();
 		}
 		
 		$auth = FALSE;
 		
-		if ( $this->isProxy() ) {
+		if ($this->isProxy()) {
 			// CAS proxy: username and PGT must be present
-			if ( $this->isSessionAuthenticated() && !empty($_SESSION['phpCAS']['pgt']) ) {
+			if ($this->isSessionAuthenticated() && !empty($_SESSION['phpCAS']['pgt'])) {
 				// authentication already done
 				$this->setUser($_SESSION['phpCAS']['user']);
 				$this->setPGT($_SESSION['phpCAS']['pgt']);
 				phpCAS::trace('user = `'.$_SESSION['phpCAS']['user'].'\', PGT = `'.$_SESSION['phpCAS']['pgt'].'\''); 
 				$auth = TRUE;
-			} elseif ( $this->isSessionAuthenticated() && empty($_SESSION['phpCAS']['pgt']) ) {
+			} 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');
 				// unset all tickets to enforce authentication
 				unset($_SESSION['phpCAS']);
 				$this->setST('');
 				$this->setPT('');
-			} elseif ( !$this->isSessionAuthenticated() && !empty($_SESSION['phpCAS']['pgt']) ) {
+			} 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'); 
 				// unset all tickets to enforce authentication
@@ -1058,10 +1058,10 @@ 
 			}
 		} else {
 			// `simple' CAS client (not a proxy): username must be present
-			if ( $this->isSessionAuthenticated() ) {
+			if ($this->isSessionAuthenticated()) {
 				// authentication already done
 				$this->setUser($_SESSION['phpCAS']['user']);
-				if(isset($_SESSION['phpCAS']['attributes'])){
+				if (isset($_SESSION['phpCAS']['attributes'])) {
 					$this->setAttributes($_SESSION['phpCAS']['attributes']);
 				}
 				phpCAS::trace('user = `'.$_SESSION['phpCAS']['user'].'\''); 
@@ -1082,15 +1082,15 @@ 
 	 * @param $renew true to force the authentication with the CAS server
 	 * @public
 	 */
-	function redirectToCas($gateway=false,$renew=false){
+	function redirectToCas($gateway = false, $renew = false) {
 		phpCAS::traceBegin();
-		$cas_url = $this->getServerLoginURL($gateway,$renew);
+		$cas_url = $this->getServerLoginURL($gateway, $renew);
 		header('Location: '.$cas_url);
-		phpCAS::log( "Redirect to : ".$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();
@@ -1108,20 +1108,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 );
+		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();
@@ -1151,7 +1151,7 @@ 
 	 * By default, only the CAs server (declared in the constructor) will be allowed.
 	 * @public
 	 */
-	function handleLogoutRequests($check_client=true, $allowed_clients=false) {
+	function handleLogoutRequests($check_client = true, $allowed_clients = false) {
 		phpCAS::traceBegin();
 		if (!$this->isLogoutRequest()) {
 			phpCAS::log("Not a logout request");
@@ -1162,7 +1162,7 @@ 
 		phpCAS::log("SAML REQUEST: ".$_POST['logoutRequest']);
 		if ($check_client) {
 			if (!$allowed_clients) {
-				$allowed_clients = array( $this->getServerHostname() ); 
+				$allowed_clients = array($this->getServerHostname()); 
 			}
 			$client_ip = $_SERVER['REMOTE_ADDR'];
 			$client = gethostbyaddr($client_ip);
@@ -1188,21 +1188,21 @@ 
 		}
 		// Extract the ticket from the SAML Request
 		preg_match("|<samlp:SessionIndex>(.*)</samlp:SessionIndex>|", $_POST['logoutRequest'], $tick, PREG_OFFSET_CAPTURE, 3);
-		$wrappedSamlSessionIndex = preg_replace('|<samlp:SessionIndex>|','',$tick[0][0]);
-		$ticket2logout = preg_replace('|</samlp:SessionIndex>|','',$wrappedSamlSessionIndex);
+		$wrappedSamlSessionIndex = preg_replace('|<samlp:SessionIndex>|', '', $tick[0][0]);
+		$ticket2logout = preg_replace('|</samlp:SessionIndex>|', '', $wrappedSamlSessionIndex);
 		phpCAS::log("Ticket to logout: ".$ticket2logout);
-		$session_id = preg_replace('/[^\w]/','',$ticket2logout);
+		$session_id = preg_replace('/[^\w]/', '', $ticket2logout);
 		phpCAS::log("Session id: ".$session_id);
 		
 		// destroy a possible application session created before phpcas
-		if(session_id()){
+		if (session_id()) {
 			session_unset();
 			session_destroy();
 		}
 		// fix session ID
 		session_id($session_id);
-		$_COOKIE[session_name()]=$session_id;
-		$_GET[session_name()]=$session_id;
+		$_COOKIE[session_name()] = $session_id;
+		$_GET[session_name()] = $session_id;
 		
 		// Overwrite session
 		session_start();	
@@ -1338,18 +1338,18 @@ 
 	 *
 	 * @private
 	 */
-	function validateST($validate_url,&$text_response,&$tree_response)
+	function validateST($validate_url, &$text_response, &$tree_response)
 		{
 		phpCAS::traceBegin();
 		// build the URL to validate the ticket
 		$validate_url = $this->getServerServiceValidateURL().'&ticket='.$this->getST();
-		if ( $this->isProxy() ) {
+		if ($this->isProxy()) {
 			// pass the callback url for CAS proxies
 			$validate_url .= '&pgtUrl='.$this->getCallbackURL();
 		}
 		
 		// open and read the URL
-		if ( !$this->readURL($validate_url,''/*cookies*/,$headers,$text_response,$err_msg) ) {
+		if (!$this->readURL($validate_url, ''/*cookies*/, $headers, $text_response, $err_msg)) {
 			phpCAS::trace('could not open URL \''.$validate_url.'\' to validate ('.$err_msg.')');
 			$this->authError('ST not validated',
 				$validate_url,
@@ -1359,7 +1359,7 @@ 
 		// analyze the result depending on the version
 		switch ($this->getServerVersion()) {
 			case CAS_VERSION_1_0:
-				if (preg_match('/^no\n/',$text_response)) {
+				if (preg_match('/^no\n/', $text_response)) {
 					phpCAS::trace('ST has not been validated');
 					$this->authError('ST not validated',
 						$validate_url,
@@ -1367,7 +1367,7 @@ 
 						FALSE/*$bad_response*/,
 						$text_response);
 				}
-				if (!preg_match('/^yes\n/',$text_response)) {
+				if (!preg_match('/^yes\n/', $text_response)) {
 					phpCAS::trace('ill-formed response');
 					$this->authError('ST not validated',
 						$validate_url,
@@ -1376,12 +1376,12 @@ 
 						$text_response);
 				}
 				// ST has been validated, extract the user name
-				$arr = preg_split('/\n/',$text_response);
+				$arr = preg_split('/\n/', $text_response);
 				$this->setUser(trim($arr[1]));
 				break;
 			case CAS_VERSION_2_0:
 				// read the response of the CAS server into a DOM object
-				if ( !($dom = domxml_open_mem($text_response))) {
+				if (!($dom = domxml_open_mem($text_response))) {
 					phpCAS::trace('domxml_open_mem() failed');
 					$this->authError('ST not validated',
 						$validate_url,
@@ -1390,7 +1390,7 @@ 
 						$text_response);
 				}
 				// read the root node of the XML tree
-				if ( !($tree_response = $dom->document_element()) ) {
+				if (!($tree_response = $dom->document_element())) {
 					phpCAS::trace('document_element() failed');
 					$this->authError('ST not validated',
 						$validate_url,
@@ -1399,7 +1399,7 @@ 
 						$text_response);
 				}
 				// insure that tag name is 'serviceResponse'
-				if ( $tree_response->node_name() != 'serviceResponse' ) {
+				if ($tree_response->node_name() != 'serviceResponse') {
 					phpCAS::trace('bad XML root node (should be `serviceResponse\' instead of `'.$tree_response->node_name().'\'');
 					$this->authError('ST not validated',
 						$validate_url,
@@ -1407,9 +1407,9 @@ 
 						TRUE/*$bad_response*/,
 						$text_response);
 				}
-				if ( sizeof($success_elements = $tree_response->get_elements_by_tagname("authenticationSuccess")) != 0) {
+				if (sizeof($success_elements = $tree_response->get_elements_by_tagname("authenticationSuccess")) != 0) {
 					// authentication succeded, extract the user name
-					if ( sizeof($user_elements = $success_elements[0]->get_elements_by_tagname("user")) == 0) {
+					if (sizeof($user_elements = $success_elements[0]->get_elements_by_tagname("user")) == 0) {
 						phpCAS::trace('<authenticationSuccess> found, but no <user>');
 						$this->authError('ST not validated',
 							$validate_url,
@@ -1421,7 +1421,7 @@ 
 					phpCAS::trace('user = `'.$user);
 					$this->setUser($user);
 					
-				} else if ( sizeof($failure_elements = $tree_response->get_elements_by_tagname("authenticationFailure")) != 0) {
+				} else if (sizeof($failure_elements = $tree_response->get_elements_by_tagname("authenticationFailure")) != 0) {
 					phpCAS::trace('<authenticationFailure> found');
 					// authentication failed, extract the error code and message
 					$this->authError('ST not validated',
@@ -1468,7 +1468,7 @@ 
 	 *
 	 * @private
 	 */
-	function validateSA($validate_url,&$text_response,&$tree_response)
+	function validateSA($validate_url, &$text_response, &$tree_response)
 		{
 		phpCAS::traceBegin();
 		
@@ -1476,7 +1476,7 @@ 
 		$validate_url = $this->getServerSamlValidateURL();
 		
 		// open and read the URL
-		if ( !$this->readURL($validate_url,''/*cookies*/,$headers,$text_response,$err_msg) ) {
+		if (!$this->readURL($validate_url, ''/*cookies*/, $headers, $text_response, $err_msg)) {
 			phpCAS::trace('could not open URL \''.$validate_url.'\' to validate ('.$err_msg.')');
 			$this->authError('SA not validated', $validate_url, TRUE/*$no_response*/);
 		}
@@ -1488,7 +1488,7 @@ 
 			case SAML_VERSION_1_1:
 				
 				// read the response of the CAS server into a DOM object
-				if ( !($dom = domxml_open_mem($text_response))) {
+				if (!($dom = domxml_open_mem($text_response))) {
 					phpCAS::trace('domxml_open_mem() failed');
 					$this->authError('SA not validated',
 						$validate_url,
@@ -1497,7 +1497,7 @@ 
 						$text_response);
 				}
 				// read the root node of the XML tree
-				if ( !($tree_response = $dom->document_element()) ) {
+				if (!($tree_response = $dom->document_element())) {
 					phpCAS::trace('document_element() failed');
 					$this->authError('SA not validated',
 						$validate_url,
@@ -1506,7 +1506,7 @@ 
 						$text_response);
 				}
 				// insure that tag name is 'Envelope'
-				if ( $tree_response->node_name() != 'Envelope' ) {
+				if ($tree_response->node_name() != 'Envelope') {
 					phpCAS::trace('bad XML root node (should be `Envelope\' instead of `'.$tree_response->node_name().'\'');
 					$this->authError('SA not validated',
 						$validate_url,
@@ -1515,7 +1515,7 @@ 
 						$text_response);
 				}
 				// check for the NameIdentifier tag in the SAML response
-				if ( sizeof($success_elements = $tree_response->get_elements_by_tagname("NameIdentifier")) != 0) {
+				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.'`');
@@ -1553,7 +1553,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();
@@ -1565,21 +1565,21 @@ 
 			$nodelist = $xPath->xpath_eval("//saml:Attribute");
 			$attrs = $nodelist->nodeset;
 			phpCAS::trace($text_response);
-			foreach($attrs as $attr){
+			foreach ($attrs as $attr) {
 				$xres = $xPath->xpath_eval("saml:AttributeValue", $attr);
 				$name = $attr->get_attribute("AttributeName");
 				$value_array = array();
-				foreach($xres->nodeset as $node){
+				foreach ($xres->nodeset as $node) {
 					$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;
 			// UGent addition...
-			foreach($attr_array as $attr_key => $attr_value) {
-				if(count($attr_value) > 1) {
+			foreach ($attr_array as $attr_key => $attr_value) {
+				if (count($attr_value) > 1) {
 					$this->_attributes[$attr_key] = $attr_value;
 				}
 				else {
@@ -1741,14 +1741,14 @@ 
 	function getCallbackURL()
 		{
 		// the URL is built when needed only
-		if ( empty($this->_callback_url) ) {
+		if (empty($this->_callback_url)) {
 			$final_uri = '';
 			// remove the ticket if present in the URL
 			$final_uri = 'https://';
 			/* replaced by Julien Marchal - v0.4.6
 			 * $this->uri .= $_SERVER['SERVER_NAME'];
 			 */
-			if(empty($_SERVER['HTTP_X_FORWARDED_SERVER'])){
+			if (empty($_SERVER['HTTP_X_FORWARDED_SERVER'])) {
 				/* replaced by teedog - v0.4.12
 				 * $final_uri .= $_SERVER['SERVER_NAME'];
 				 */
@@ -1760,13 +1760,13 @@ 
 			} else {
 				$final_uri .= $_SERVER['HTTP_X_FORWARDED_SERVER'];
 			}
-			if ( ($this->isHttps() && $_SERVER['SERVER_PORT']!=443)
-					|| (!$this->isHttps() && $_SERVER['SERVER_PORT']!=80) ) {
+			if (($this->isHttps() && $_SERVER['SERVER_PORT'] != 443)
+					|| (!$this->isHttps() && $_SERVER['SERVER_PORT'] != 80)) {
 				$final_uri .= ':';
 				$final_uri .= $_SERVER['SERVER_PORT'];
 			}
 			$request_uri = $_SERVER['REQUEST_URI'];
-			$request_uri = preg_replace('/\?.*$/','',$request_uri);
+			$request_uri = preg_replace('/\?.*$/', '', $request_uri);
 			$final_uri .= $request_uri;
 			$this->setCallbackURL($final_uri);
 		}
@@ -1799,7 +1799,7 @@ 
 		$pgt = $_GET['pgtId'];
 		phpCAS::trace('Storing PGT `'.$pgt.'\' (id=`'.$pgt_iou.'\')');
 		echo '<p>Storing PGT `'.$pgt.'\' (id=`'.$pgt_iou.'\').</p>';
-		$this->storePGT($pgt,$pgt_iou);
+		$this->storePGT($pgt, $pgt_iou);
 		$this->printHTMLFooter();
 		phpCAS::traceExit();
 		exit();
@@ -1834,7 +1834,7 @@ 
 	function initPGTStorage()
 		{
 		// if no SetPGTStorageXxx() has been used, default to file
-		if ( !is_object($this->_pgt_storage) ) {
+		if (!is_object($this->_pgt_storage)) {
 			$this->setPGTStorageFile();
 		}
 		
@@ -1850,12 +1850,12 @@ 
 	 *
 	 * @private
 	 */
-	function storePGT($pgt,$pgt_iou)
+	function storePGT($pgt, $pgt_iou)
 		{
 		// ensure that storage is initialized
 		$this->initPGTStorage();
 		// writes the PGT
-		$this->_pgt_storage->write($pgt,$pgt_iou);
+		$this->_pgt_storage->write($pgt, $pgt_iou);
 		}
 	
 	/**
@@ -1884,16 +1884,16 @@ 
 	 *
 	 * @public
 	 */
-	function setPGTStorageFile($format='',
-		$path='')
+	function setPGTStorageFile($format = '',
+		$path = '')
 		{
 		// check that the storage has not already been set
-		if ( is_object($this->_pgt_storage) ) {
+		if (is_object($this->_pgt_storage)) {
 			phpCAS::error('PGT storage already defined');
 		}
 		
 		// create the storage object
-		$this->_pgt_storage = new PGTStorageFile($this,$format,$path);
+		$this->_pgt_storage = new PGTStorageFile($this, $format, $path);
 		}
 	
 	/**
@@ -1922,15 +1922,15 @@ 
 							 $table)
 		{
 		// check that the storage has not already been set
-		if ( is_object($this->_pgt_storage) ) {
+		if (is_object($this->_pgt_storage)) {
 			phpCAS::error('PGT storage already defined');
 		}
 		
 		// warn the user that he should use file storage...
-		trigger_error('PGT storage into database is an experimental feature, use at your own risk',E_USER_WARNING);
+		trigger_error('PGT storage into database is an experimental feature, use at your own risk', E_USER_WARNING);
 		
 		// create the storage object
-		$this->_pgt_storage = new PGTStorageDB($this,$user,$password,$database_type,$hostname,$port,$database,$table);
+		$this->_pgt_storage = new PGTStorageDB($this, $user, $password, $database_type, $hostname, $port, $database, $table);
 		}
 	
 	// ########################################################################
@@ -1949,11 +1949,11 @@ 
 	 *
 	 * @private
 	 */
-	function validatePGT(&$validate_url,$text_response,$tree_response)
+	function validatePGT(&$validate_url, $text_response, $tree_response)
 		{
 		// here cannot use phpCAS::traceBegin(); alongside domxml-php4-to-php5.php
 		phpCAS::log('start validatePGT()');
-		if ( sizeof($arr = $tree_response->get_elements_by_tagname("proxyGrantingTicket")) == 0) {
+		if (sizeof($arr = $tree_response->get_elements_by_tagname("proxyGrantingTicket")) == 0) {
 			phpCAS::trace('<proxyGrantingTicket> not found');
 			// authentication succeded, but no PGT Iou was transmitted
 			$this->authError('Ticket validated but no PGT Iou transmitted',
@@ -1965,7 +1965,7 @@ 
 			// PGT Iou transmitted, extract it
 			$pgt_iou = trim($arr[0]->get_content());
 			$pgt = $this->loadPGT($pgt_iou);
-			if ( $pgt == FALSE ) {
+			if ($pgt == FALSE) {
 				phpCAS::trace('could not load PGT');
 				$this->authError('PGT Iou was transmitted but PGT could not be retrieved',
 					$validate_url,
@@ -1995,7 +1995,7 @@ 
 	 *
 	 * @private
 	 */
-	function retrievePT($target_service,&$err_code,&$err_msg)
+	function retrievePT($target_service, &$err_code, &$err_msg)
 		{
 		phpCAS::traceBegin();
 		
@@ -2010,7 +2010,7 @@ 
 		$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) ) {
+		if (!$this->readURL($cas_url, ''/*cookies*/, $headers, $cas_response, $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)';
@@ -2020,38 +2020,38 @@ 
 		
 		$bad_response = FALSE;
 		
-		if ( !$bad_response ) {
+		if (!$bad_response) {
 			// read the response of the CAS server into a DOM object
-			if ( !($dom = @domxml_open_mem($cas_response))) {
+			if (!($dom = @domxml_open_mem($cas_response))) {
 				phpCAS::trace('domxml_open_mem() failed');
 				// read failed
 				$bad_response = TRUE;
 			} 
 		}
 		
-		if ( !$bad_response ) {
+		if (!$bad_response) {
 			// read the root node of the XML tree
-			if ( !($root = $dom->document_element()) ) {
+			if (!($root = $dom->document_element())) {
 				phpCAS::trace('document_element() failed');
 				// read failed
 				$bad_response = TRUE;
 			} 
 		}
 		
-		if ( !$bad_response ) {
+		if (!$bad_response) {
 			// insure that tag name is 'serviceResponse'
-			if ( $root->node_name() != 'serviceResponse' ) {
+			if ($root->node_name() != 'serviceResponse') {
 				phpCAS::trace('node_name() failed');
 				// bad root node
 				$bad_response = TRUE;
 			} 
 		}
 		
-		if ( !$bad_response ) {
+		if (!$bad_response) {
 			// look for a proxySuccess tag
-			if ( sizeof($arr = $root->get_elements_by_tagname("proxySuccess")) != 0) {
+			if (sizeof($arr = $root->get_elements_by_tagname("proxySuccess")) != 0) {
 				// authentication succeded, look for a proxyTicket tag
-				if ( sizeof($arr = $root->get_elements_by_tagname("proxyTicket")) != 0) {
+				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()));
@@ -2063,7 +2063,7 @@ 
 				}
 			} 
 			// look for a proxyFailure tag
-			else if ( sizeof($arr = $root->get_elements_by_tagname("proxyFailure")) != 0) {
+			else if (sizeof($arr = $root->get_elements_by_tagname("proxyFailure")) != 0) {
 				// authentication failed, extract the error
 				$err_code = PHPCAS_SERVICE_PT_FAILURE;
 				$err_msg = 'PT retrieving failed (code=`'
@@ -2105,7 +2105,7 @@ 
 	 *
 	 * @private
 	 */
-	function readURL($url,$cookies,&$headers,&$body,&$err_msg)
+	function readURL($url, $cookies, &$headers, &$body, &$err_msg)
 		{
 		phpCAS::traceBegin();
 		$headers = '';
@@ -2117,7 +2117,7 @@ 
 		// initialize the CURL session
 		$ch = curl_init($url);
 		
-		if (version_compare(PHP_VERSION,'5.1.3','>=')) {
+		if (version_compare(PHP_VERSION, '5.1.3', '>=')) {
 			//only avaible in php5
 			curl_setopt_array($ch, $this->_curl_options);
 		} else {
@@ -2137,7 +2137,7 @@ 
 			curl_setopt($ch, CURLOPT_CAINFO, $this->_cas_server_ca_cert);
 			curl_setopt($ch, CURLOPT_VERBOSE, '1');
 			phpCAS::trace('CURL: Set all required opts for mutual authentication ------');
-		} else if ($this->_cas_server_cert != '' ) {
+		} else if ($this->_cas_server_cert != '') {
 			curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 1);
 			curl_setopt($ch, CURLOPT_SSLCERT, $this->_cas_server_cert);
 		} else if ($this->_cas_server_ca_cert != '') {
@@ -2154,12 +2154,12 @@ 
 		$this->_curl_headers = array(); // empty the headers array
 		curl_setopt($ch, CURLOPT_HEADERFUNCTION, array($this, '_curl_read_headers'));
 		// add cookies headers
-		if ( is_array($cookies) ) {
-			curl_setopt($ch,CURLOPT_COOKIE,implode(';',$cookies));
+		if (is_array($cookies)) {
+			curl_setopt($ch, CURLOPT_COOKIE, implode(';', $cookies));
 		}
 		// add extra stuff if SAML
 		if ($this->hasSA()) {
-			$more_headers = array ("soapaction: http://www.oasis-open.org/committees/security",
+			$more_headers = array("soapaction: http://www.oasis-open.org/committees/security",
 				"cache-control: no-cache",
 				"pragma: no-cache",
 				"accept: text/xml",
@@ -2173,18 +2173,18 @@ 
 			curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
 		}
 		// perform the query
-		$buf = curl_exec ($ch);
+		$buf = curl_exec($ch);
 		//phpCAS::trace('CURL: Call completed. Response body is: \''.$buf.'\'');
-		if ( $buf === FALSE ) {
+		if ($buf === FALSE) {
 			phpCAS::trace('curl_exec() failed');
 			$err_msg = 'CURL error #'.curl_errno($ch).': '.curl_error($ch);
 			//phpCAS::trace('curl error: '.$err_msg);
 			// close the CURL session
-			curl_close ($ch);
+			curl_close($ch);
 			$res = FALSE;
 		} else {
 			// close the CURL session
-			curl_close ($ch);
+			curl_close($ch);
 			
 			$headers = $this->_curl_headers;
 			$body = $buf;
@@ -2209,7 +2209,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);
@@ -2240,36 +2240,36 @@ 
 	 *
 	 * @public
 	 */
-	function serviceWeb($url,&$err_code,&$output)
+	function serviceWeb($url, &$err_code, &$output)
 		{
 		phpCAS::traceBegin();
 		// at first retrieve a PT
-		$pt = $this->retrievePT($url,$err_code,$output);
+		$pt = $this->retrievePT($url, $err_code, $output);
 		
 		$res = TRUE;
 		
 		// test if PT was retrieved correctly
-		if ( !$pt ) {
+		if (!$pt) {
 			// note: $err_code and $err_msg are filled by CASClient::retrievePT()
 			phpCAS::trace('PT was not retrieved correctly');
 			$res = FALSE;
 		} else {
 			// add cookies if necessary
-			if ( is_array($_SESSION['phpCAS']['services'][$url]['cookies']) ) {
-				foreach ( $_SESSION['phpCAS']['services'][$url]['cookies'] as $name => $val ) { 
+			if (is_array($_SESSION['phpCAS']['services'][$url]['cookies'])) {
+				foreach ($_SESSION['phpCAS']['services'][$url]['cookies'] as $name => $val) { 
 					$cookies[] = $name.'='.$val;
 				}
 			}
 			
 			// build the URL including the PT
-			if ( strstr($url,'?') === FALSE ) {
+			if (strstr($url, '?') === FALSE) {
 				$service_url = $url.'?ticket='.$pt;
 			} else {
 				$service_url = $url.'&ticket='.$pt;
 			}
 			
 			phpCAS::trace('reading URL`'.$service_url.'\'');
-			if ( !$this->readURL($service_url,$cookies,$headers,$output,$err_msg) ) {
+			if (!$this->readURL($service_url, $cookies, $headers, $output, $err_msg)) {
 				phpCAS::trace('could not read URL`'.$service_url.'\'');
 				$err_code = PHPCAS_SERVICE_NOT_AVAILABLE;
 				// give an error message
@@ -2280,15 +2280,15 @@ 
 			} else {
 				// URL has been fetched, extract the cookies
 				phpCAS::trace('URL`'.$service_url.'\' has been read, storing cookies:');
-				foreach ( $headers as $header ) {
+				foreach ($headers as $header) {
 					// test if the header is a cookie
-					if ( preg_match('/^Set-Cookie:/',$header) ) {
+					if (preg_match('/^Set-Cookie:/', $header)) {
 						// the header is a cookie, remove the beginning
-						$header_val = preg_replace('/^Set-Cookie: */','',$header);
+						$header_val = preg_replace('/^Set-Cookie: */', '', $header);
 						// extract interesting information
-						$name_val = strtok($header_val,'; ');
+						$name_val = strtok($header_val, '; ');
 						// extract the name and the value of the cookie
-						$cookie_name = strtok($name_val,'=');
+						$cookie_name = strtok($name_val, '=');
 						$cookie_val = strtok('=');
 						// store the cookie 
 						$_SESSION['phpCAS']['services'][$url]['cookies'][$cookie_name] = $cookie_val;
@@ -2321,28 +2321,28 @@ 
 	 *
 	 * @public
 	 */
-	function serviceMail($url,$service,$flags,&$err_code,&$err_msg,&$pt)
+	function serviceMail($url, $service, $flags, &$err_code, &$err_msg, &$pt)
 		{
 		phpCAS::traceBegin();
 		// at first retrieve a PT
-		$pt = $this->retrievePT($service,$err_code,$output);
+		$pt = $this->retrievePT($service, $err_code, $output);
 		
 		$stream = FALSE;
 		
 		// test if PT was retrieved correctly
-		if ( !$pt ) {
+		if (!$pt) {
 			// 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.'\'...');
-			$stream = @imap_open($url,$this->getUser(),$pt,$flags);
-			if ( !$stream ) {
+			$stream = @imap_open($url, $this->getUser(), $pt, $flags);
+			if (!$stream) {
 				phpCAS::trace('could not open URL');
 				$err_code = PHPCAS_SERVICE_NOT_AVAILABLE;
 				// give an error message
 				$err_msg = sprintf($this->getString(CAS_STR_SERVICE_UNAVAILABLE),
 					$service_url,
-					var_export(imap_errors(),TRUE));
+					var_export(imap_errors(), TRUE));
 				$pt = FALSE;
 				$stream = FALSE;
 			} else {
@@ -2446,19 +2446,19 @@ 
 	 *
 	 * @private
 	 */
-	function validatePT(&$validate_url,&$text_response,&$tree_response)
+	function validatePT(&$validate_url, &$text_response, &$tree_response)
 		{
 		phpCAS::traceBegin();
 		// build the URL to validate the ticket
 		$validate_url = $this->getServerProxyValidateURL().'&ticket='.$this->getPT();
 		
-		if ( $this->isProxy() ) {
+		if ($this->isProxy()) {
 			// pass the callback url for CAS proxies
 			$validate_url .= '&pgtUrl='.$this->getCallbackURL();
 		}
 		
 		// open and read the URL
-		if ( !$this->readURL($validate_url,''/*cookies*/,$headers,$text_response,$err_msg) ) {
+		if (!$this->readURL($validate_url, ''/*cookies*/, $headers, $text_response, $err_msg)) {
 			phpCAS::trace('could not open URL \''.$validate_url.'\' to validate ('.$err_msg.')');
 			$this->authError('PT not validated',
 				$validate_url,
@@ -2466,7 +2466,7 @@ 
 		}
 		
 		// read the response of the CAS server into a DOM object
-		if ( !($dom = domxml_open_mem($text_response))) {
+		if (!($dom = domxml_open_mem($text_response))) {
 			// read failed
 			$this->authError('PT not validated',
 				$validate_url,
@@ -2475,7 +2475,7 @@ 
 				$text_response);
 		}
 		// read the root node of the XML tree
-		if ( !($tree_response = $dom->document_element()) ) {
+		if (!($tree_response = $dom->document_element())) {
 			// read failed
 			$this->authError('PT not validated',
 				$validate_url,
@@ -2484,7 +2484,7 @@ 
 				$text_response);
 		}
 		// insure that tag name is 'serviceResponse'
-		if ( $tree_response->node_name() != 'serviceResponse' ) {
+		if ($tree_response->node_name() != 'serviceResponse') {
 			// bad root node
 			$this->authError('PT not validated',
 				$validate_url,
@@ -2492,9 +2492,9 @@ 
 				TRUE/*$bad_response*/,
 				$text_response);
 		}
-		if ( sizeof($arr = $tree_response->get_elements_by_tagname("authenticationSuccess")) != 0) {
+		if (sizeof($arr = $tree_response->get_elements_by_tagname("authenticationSuccess")) != 0) {
 			// authentication succeded, extract the user name
-			if ( sizeof($arr = $tree_response->get_elements_by_tagname("user")) == 0) {
+			if (sizeof($arr = $tree_response->get_elements_by_tagname("user")) == 0) {
 				// no user specified => error
 				$this->authError('PT not validated',
 					$validate_url,
@@ -2504,7 +2504,7 @@ 
 			}
 			$this->setUser(trim($arr[0]->get_content()));
 			
-		} else if ( sizeof($arr = $tree_response->get_elements_by_tagname("authenticationFailure")) != 0) {
+		} else if (sizeof($arr = $tree_response->get_elements_by_tagname("authenticationFailure")) != 0) {
 			// authentication succeded, extract the error code and message
 			$this->authError('PT not validated',
 				$validate_url,
@@ -2564,7 +2564,7 @@ 
 		{
 		phpCAS::traceBegin();
 		// the URL is built when needed only
-		if ( empty($this->_url) ) {
+		if (empty($this->_url)) {
 			$final_uri = '';
 			// remove the ticket if present in the URL
 			$final_uri = ($this->isHttps()) ? 'https' : 'http';
@@ -2572,7 +2572,7 @@ 
 			/* replaced by Julien Marchal - v0.4.6
 			 * $this->_url .= $_SERVER['SERVER_NAME'];
 			 */
-			if(empty($_SERVER['HTTP_X_FORWARDED_SERVER'])){
+			if (empty($_SERVER['HTTP_X_FORWARDED_SERVER'])) {
 				/* replaced by teedog - v0.4.12
 				 * $this->_url .= $_SERVER['SERVER_NAME'];
 				 */
@@ -2586,8 +2586,8 @@ 
 			}
 			$final_uri .= $server_name;
 			if (!strpos($server_name, ':')) {
-				if ( ($this->isHttps() && $_SERVER['SERVER_PORT']!=443)
-						|| (!$this->isHttps() && $_SERVER['SERVER_PORT']!=80) ) {
+				if (($this->isHttps() && $_SERVER['SERVER_PORT'] != 443)
+						|| (!$this->isHttps() && $_SERVER['SERVER_PORT'] != 80)) {
 					$final_uri .= ':';
 					$final_uri .= $_SERVER['SERVER_PORT'];
 				}
@@ -2598,11 +2598,11 @@ 
 			
 			if (isset($request_uri[1]) && $request_uri[1])
 			{
-				$query_string	= $this->removeParameterFromQueryString('ticket', $request_uri[1]);
+				$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";
+					$final_uri .= "?$query_string";
 				
 			}
 			
@@ -2626,7 +2626,7 @@ 
 	 */
 	function removeParameterFromQueryString($parameterName, $queryString)
 	{
-		$parameterName	= preg_quote($parameterName);
+		$parameterName = preg_quote($parameterName);
 		return preg_replace("/&$parameterName(=[^&]*)?|^$parameterName(=[^&]*)?&?/", '', $queryString);
 	}
 
@@ -2661,18 +2661,18 @@ 
 	 *
 	 * @private
 	 */
-	function authError($failure,$cas_url,$no_response,$bad_response='',$cas_response='',$err_code='',$err_msg='')
+	function authError($failure, $cas_url, $no_response, $bad_response = '', $cas_response = '', $err_code = '', $err_msg = '')
 		{
 		phpCAS::traceBegin();
 		
 		$this->printHTMLHeader($this->getString(CAS_STR_AUTHENTICATION_FAILED));
-		printf($this->getString(CAS_STR_YOU_WERE_NOT_AUTHENTICATED),htmlentities($this->getURL()),$_SERVER['SERVER_ADMIN']);
+		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);
-		if ( $no_response ) {
+		if ($no_response) {
 			phpCAS::trace('Reason: no response from the CAS server');
 		} else {
-			if ( $bad_response ) {
+			if ($bad_response) {
 				phpCAS::trace('Reason: bad response from the CAS server');
 			} else {
 				switch ($this->getServerVersion()) {
@@ -2680,7 +2680,7 @@ 
 						phpCAS::trace('Reason: CAS error');
 						break;
 					case CAS_VERSION_2_0:
-						if ( empty($err_code) )
+						if (empty($err_code))
 							phpCAS::trace('Reason: no CAS error');
 						else
 							phpCAS::trace('Reason: ['.$err_code.'] CAS error: '.$err_msg);