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;

Braces +3 added lines, -2 removed lines

@@ -412,8 +412,9 @@
     //$table->set_column_filter(6, 'status_filter');
     //$table->set_column_filter(7, 'active_filter');
     //$table->set_column_filter(8, 'modify_filter');
-    if (api_is_platform_admin())
-        $table->set_form_actions(array('delete' => get_lang('DeleteFromPlatform')));
+    if (api_is_platform_admin()) {
+            $table->set_form_actions(array('delete' => get_lang('DeleteFromPlatform')));
+    }
     $table->display();
 }
 Display :: display_footer();

Indentation -1 removed lines

@@ -16,7 +16,6 @@
  * @author Patrick Cool
  * @author René Haentjens, added CSV file import (October 2004)
  * @package chamilo.link
-
  */
 
 // Including libraries

main/admin/settings.lib.php

Doc Comments +3 added lines, -3 removed lines

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

Braces +15 added lines, -10 removed lines

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

Spacing +37 added lines, -37 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'));
@@ -543,7 +543,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);
                     }
                 }
@@ -635,7 +635,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']);
@@ -661,12 +661,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();
@@ -674,7 +674,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 {
@@ -741,10 +741,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);
@@ -754,16 +754,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);
@@ -795,7 +795,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>';
     }
 
@@ -914,8 +914,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;
 }
 
@@ -965,7 +965,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'));
@@ -1043,7 +1043,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,
@@ -1053,7 +1053,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."'";
@@ -1071,7 +1071,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();
@@ -1171,7 +1171,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();
 
@@ -1238,9 +1238,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.
@@ -1261,7 +1261,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',
@@ -1289,7 +1289,7 @@ 
                         ),
                         $hideme
                     );
-                    $form->applyFilter($row['variable'],'html_filter');
+                    $form->applyFilter($row['variable'], 'html_filter');
                     $default_values[$row['variable']] = $row['selected_value'];
                 }
                 break;
@@ -1300,7 +1300,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';
@@ -1308,16 +1308,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(
@@ -1348,7 +1348,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') {
@@ -1420,10 +1420,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);

Indentation +144 added lines, -144 removed lines

@@ -62,43 +62,43 @@ 
  *       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).'" ';
-	//$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_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_isocode=Database::result($rs_isocode,0,'count_isocode');
-	$has_error=false;
-	$message_information=array();
+    $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_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_isocode=Database::result($rs_isocode,0,'count_isocode');
+    $has_error=false;
+    $message_information=array();
 
-	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_original_name==1) {
+        $has_error=true;
+        $message_information['original_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);
+    $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;
-	}
-	if ($has_error===true) {
-		$message_information['execute_add']=false;
-	}
-	if ($has_error===false) {
-		$message_information['execute_add']=true;
-	}
+    if (!in_array($isocode, $iso_list)) {
+        $has_error=true;
+        $message_information['isocode']=true;
+    }
+    if ($has_error===true) {
+        $message_information['execute_add']=false;
+    }
+    if ($has_error===false) {
+        $message_information['execute_add']=true;
+    }
 
-	return $message_information;
+    return $message_information;
 }
 
 /**
@@ -109,50 +109,50 @@ 
  * @todo    deprecate this function and use the static method directly
  */
 function check_if_exist_language_by_id ($language_id) {
-	return SubLanguageManager::check_if_exist_language_by_id($language_id);
+    return SubLanguageManager::check_if_exist_language_by_id($language_id);
 }
 /**
- * Check if the given language is a parent of any sub-language
- * @param   int     Language ID of the presumed parent
- * @return  bool    True if this language has children, false otherwise
- */
+     * Check if the given language is a parent of any sub-language
+     * @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) {
-		return true;
-	} else {
-		return false;
-	}
+    $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;
+    }
 }
 /**
- * Get all information of sub-language
- * @param   int     Parent language ID
- * @param   int     Child language ID
- * @return  array
- */
+     * Get all information of sub-language
+     * @param   int     Parent language ID
+     * @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);
+    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;
-		} else {
-			$sub_language_id_exist=false;
-		}
+    $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;
+        }
 
 }
 $language_details = array();
 $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'];
+    $language_name = $language_details['original_name'];
         if (check_if_exist_language_by_id ($_GET['id'])===true) {
             $parent_id=$_GET['id'];
             $language_id_exist=true;
@@ -160,67 +160,67 @@ 
             $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 (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).' )';
 
 if (ckeck_if_is_parent_of_sub_language($parent_id)===true && isset($_GET['action']) && $_GET['action']=='deletesublanguage') {
-	$language_name=get_lang('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);
-	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');
-		}
-		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=='execute_add' && $value_information===true) {
-			$allow_insert_info=true;
-		}
-	}
+    $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');
+        }
+        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=='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);
 
-			$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);
-			if ($mkdir_result) {
-			  	$sl_id = add_sub_language($original_name,$english_name,$isocode,$sublanguage_available,$parent_id);
+            $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);
                                 if ($sl_id === false) {
                                     SubLanguageManager::remove_language_directory($english_name);
                                     $msg .= Display::return_message(get_lang('LanguageDirectoryNotWriteableContactAdmin'),'error');
@@ -232,17 +232,17 @@ 
                                     require 'sub_language.php';
                                     exit();
                                 }
-			} else {
-			    $msg .= Display::return_message(get_lang('LanguageDirectoryNotWriteableContactAdmin'),'error');
-			}
-		} else {
-			if ($language_id_exist===false) {
-				$msg .= Display::return_message(get_lang('LanguageParentNotExist'),'error');
-			}
-		}
-	} else {
+            } else {
+                $msg .= Display::return_message(get_lang('LanguageDirectoryNotWriteableContactAdmin'),'error');
+            }
+        } else {
+            if ($language_id_exist===false) {
+                $msg .= Display::return_message(get_lang('LanguageParentNotExist'),'error');
+            }
+        }
+    } else {
             $msg .= Display::return_message(get_lang('FormHasErrorsPleaseComplete'),'error');
-	}
+    }
 }
 
 Display :: display_header($language_name);
@@ -250,51 +250,51 @@ 
 echo $msg;
 
 if (isset($_POST['SubmitAddDeleteLanguage'])) {
-	$rs = SubLanguageManager::remove_sub_language($_GET['id'], $_GET['sub_language_id']);
-	if ($rs===true) {
-		Display::display_confirmation_message(get_lang('TheSubLanguageHasBeenRemoved'));
-	} else {
-		Display::display_error_message(get_lang('TheSubLanguageHasNotBeenRemoved'));
-	}
+    $rs = SubLanguageManager::remove_sub_language($_GET['id'], $_GET['sub_language_id']);
+    if ($rs===true) {
+        Display::display_confirmation_message(get_lang('TheSubLanguageHasBeenRemoved'));
+    } else {
+        Display::display_error_message(get_lang('TheSubLanguageHasNotBeenRemoved'));
+    }
 }
 // ckeck_if_is_parent_of_sub_language($parent_id)===false
 //
 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';
-	$form->addElement('header', '', $text);
-	$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->addRule('english_name', get_lang('ThisFieldIsRequired'), 'required');
-	$form->addElement('text', 'isocode', get_lang('ISOCode'), 'class="input_titles"');
-	$form->addRule('isocode', get_lang('ThisFieldIsRequired'), 'required');
-	$form->addElement('static', null, '&nbsp;', '<i>en, es, fr</i>');
-	$form->addElement('checkbox', 'sub_language_is_visible', '', get_lang('Visibility'));
-	$form->addButtonCreate(get_lang('CreateSubLanguage'), 'SubmitAddNewLanguage');
+    $text = $language_name;
+    $form = new FormValidator('addsublanguage', 'post', 'sub_language_add.php?id='.Security::remove_XSS($_GET['id']).'&action=definenewsublanguage');
+    $class='add';
+    $form->addElement('header', '', $text);
+    $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->addRule('english_name', get_lang('ThisFieldIsRequired'), 'required');
+    $form->addElement('text', 'isocode', get_lang('ISOCode'), 'class="input_titles"');
+    $form->addRule('isocode', get_lang('ThisFieldIsRequired'), 'required');
+    $form->addElement('static', null, '&nbsp;', '<i>en, es, fr</i>');
+    $form->addElement('checkbox', 'sub_language_is_visible', '', get_lang('Visibility'));
+    $form->addButtonCreate(get_lang('CreateSubLanguage'), 'SubmitAddNewLanguage');
         //$values['original_name'] = $language_details['original_name'].'...'; -> cannot be used because of quickform filtering (freeze)
         $values['english_name'] = $language_details['english_name'].'2';
         $values['isocode'] = $language_details['isocode'];
         $form->setDefaults($values);
-	$form->display();
+    $form->display();
 } else {
-	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';
-		$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->addButtonCreate(get_lang('DeleteSubLanguage'), 'SubmitAddDeleteLanguage');
-		$form->display();
-	}
-	if (isset($_GET['action']) && $_GET['action']=='definenewsublanguage') {
-		Display::display_normal_message(get_lang('TheSubLanguageForThisLanguageHasBeenAdded'));
-	}
+    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';
+        $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->addButtonCreate(get_lang('DeleteSubLanguage'), 'SubmitAddDeleteLanguage');
+        $form->display();
+    }
+    if (isset($_GET['action']) && $_GET['action']=='definenewsublanguage') {
+        Display::display_normal_message(get_lang('TheSubLanguageForThisLanguageHasBeenAdded'));
+    }
 }
 /**
- * Footer
- */
+     * Footer
+     */
 Display :: display_footer();

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_list.php

Doc Comments +1 added lines, -1 removed lines

@@ -286,7 +286,7 @@
 *	This function defines globals.
 *   @param  int     $userId
  *
-*   @return bool    False on failure, redirection on success
+*   @return false|null    False on failure, redirection on success
 *	@author Evie Embrechts
 *   @author Yannick Warnier <yannick.warnier@dokeos.com>
 */

Indentation +131 added lines, -131 removed lines

@@ -239,8 +239,8 @@ 
         if (isset($keywordListValues['keyword_status']) &&
             $keywordListValues['keyword_status'] == PLATFORM_ADMIN
         ) {
-           $query_admin_table = " , $admin_table a ";
-           $keyword_admin = ' AND a.user_id = u.id ';
+            $query_admin_table = " , $admin_table a ";
+            $keyword_admin = ' AND a.user_id = u.id ';
             $keywordListValues['keyword_status'] = '%';
         }
 
@@ -306,13 +306,13 @@ 
     $firstname = $userInfo['firstname'];
     $lastname = $userInfo['lastname'];
 
-	if (api_is_western_name_order()) {
-		$message = sprintf(get_lang('AttemptingToLoginAs'),$firstname,$lastname, $userId);
-	} else {
-		$message = sprintf(get_lang('AttemptingToLoginAs'), $lastname, $firstname, $userId);
-	}
+    if (api_is_western_name_order()) {
+        $message = sprintf(get_lang('AttemptingToLoginAs'),$firstname,$lastname, $userId);
+    } else {
+        $message = sprintf(get_lang('AttemptingToLoginAs'), $lastname, $firstname, $userId);
+    }
 
-	if ($userId) {
+    if ($userId) {
 
         // Logout the current user
         LoginDelete(api_get_user_id());
@@ -347,7 +347,7 @@ 
         Display :: display_footer();
         exit;
 
-	}
+    }
 }
 
 /**
@@ -385,7 +385,7 @@ 
     }*/
 
     if (!in_array($direction, array('ASC','DESC'))) {
-    	$direction = 'ASC';
+        $direction = 'ASC';
     }
     $column = intval($column);
     $from 	= intval($from);
@@ -396,23 +396,23 @@ 
         $sql .= " WHERE u.creator_id = ".api_get_user_id();
     }
 
-	$sql .= " ORDER BY col$column $direction ";
-	$sql .= " LIMIT $from,$number_of_items";
+    $sql .= " ORDER BY col$column $direction ";
+    $sql .= " LIMIT $from,$number_of_items";
 
-	$res = Database::query($sql);
+    $res = Database::query($sql);
 
-	$users = array ();
+    $users = array ();
     $t = time();
-	while ($user = Database::fetch_row($res)) {
-		$userPicture = UserManager::getUserPicture($user[0], USER_IMAGE_SIZE_SMALL);
-		$photo = '<img src="'.$userPicture.'" width="22" height="22" alt="'.api_get_person_name($user[2], $user[3]).'" title="'.api_get_person_name($user[2], $user[3]).'" />';
+    while ($user = Database::fetch_row($res)) {
+        $userPicture = UserManager::getUserPicture($user[0], USER_IMAGE_SIZE_SMALL);
+        $photo = '<img src="'.$userPicture.'" width="22" height="22" alt="'.api_get_person_name($user[2], $user[3]).'" title="'.api_get_person_name($user[2], $user[3]).'" />';
 
         if ($user[7] == 1 && !empty($user[10])) {
             // check expiration date
             $expiration_time = convert_sql_date($user[10]);
             // if expiration date is passed, store a special value for active field
             if ($expiration_time < $t) {
-        	   $user[7] = '-1';
+                $user[7] = '-1';
             }
         }
 
@@ -430,9 +430,9 @@ 
             api_get_local_time($user[9]),
             $user[0]
         );
-	}
+    }
 
-	return $users;
+    return $users;
 }
 
 /**
@@ -441,7 +441,7 @@ 
 * @return string HTML-code with a mailto-link
 */
 function email_filter($email) {
-	return Display :: encrypted_mailto_link($email, $email);
+    return Display :: encrypted_mailto_link($email, $email);
 }
 
 /**
@@ -450,7 +450,7 @@ 
 * @return string HTML-code with a mailto-link
 */
 function user_filter($name, $params, $row) {
-	return '<a href="'.api_get_path(WEB_PATH).'whoisonline.php?origin=user_list&id='.$row[0].'">'.$name.'</a>';
+    return '<a href="'.api_get_path(WEB_PATH).'whoisonline.php?origin=user_list&id='.$row[0].'">'.$name.'</a>';
 }
 
 /**
@@ -461,84 +461,84 @@ 
  * @return string Some HTML-code with modify-buttons
  */
 function modify_filter($user_id, $url_params, $row) {
-	global $charset, $_admins_list;
-	$is_admin   = in_array($user_id,$_admins_list);
-	$statusname = api_get_status_langvars();
-	$user_is_anonymous = false;
+    global $charset, $_admins_list;
+    $is_admin   = in_array($user_id,$_admins_list);
+    $statusname = api_get_status_langvars();
+    $user_is_anonymous = false;
     $current_user_status_label = $row['7'];
 
-	if ($current_user_status_label == $statusname[ANONYMOUS]) {
-		$user_is_anonymous =true;
-	}
-	$result = '';
-	if (!$user_is_anonymous) {
-		$icon = Display::return_icon('course.png', get_lang('Courses'), array('onmouseout' => 'clear_course_list (\'div_'.$user_id.'\')'));
-		$result .= '<a href="javascript:void(0)" onclick="load_course_list(\'div_'.$user_id.'\','.$user_id.')" >
+    if ($current_user_status_label == $statusname[ANONYMOUS]) {
+        $user_is_anonymous =true;
+    }
+    $result = '';
+    if (!$user_is_anonymous) {
+        $icon = Display::return_icon('course.png', get_lang('Courses'), array('onmouseout' => 'clear_course_list (\'div_'.$user_id.'\')'));
+        $result .= '<a href="javascript:void(0)" onclick="load_course_list(\'div_'.$user_id.'\','.$user_id.')" >
 			        '.$icon.'
 					<div class="blackboard_hide" id="div_'.$user_id.'">&nbsp;&nbsp;</div>
 					</a>';
 
         $icon = Display::return_icon('session.png', get_lang('Sessions'), array('onmouseout' => 'clear_session_list (\'div_s_'.$user_id.'\')'));
-		$result .= '<a href="javascript:void(0)" onclick="load_session_list(\'div_s_'.$user_id.'\','.$user_id.')" >
+        $result .= '<a href="javascript:void(0)" onclick="load_session_list(\'div_s_'.$user_id.'\','.$user_id.')" >
 					'.$icon.'
 					<div class="blackboard_hide" id="div_s_'.$user_id.'">&nbsp;&nbsp;</div>
 					</a>';
-	} else {
-		$result .= Display::return_icon('course_na.png',get_lang('Courses')).'&nbsp;&nbsp;';
-		$result .= Display::return_icon('course_na.png',get_lang('Sessions')).'&nbsp;&nbsp;';
-	}
+    } else {
+        $result .= Display::return_icon('course_na.png',get_lang('Courses')).'&nbsp;&nbsp;';
+        $result .= Display::return_icon('course_na.png',get_lang('Sessions')).'&nbsp;&nbsp;';
+    }
 
-	if (api_is_platform_admin()) {
-		if (!$user_is_anonymous) {
-			$result .= '<a href="user_information.php?user_id='.$user_id.'">'.Display::return_icon('synthese_view.gif', get_lang('Info')).'</a>&nbsp;&nbsp;';
-		} else {
-			$result .= Display::return_icon('synthese_view_na.gif', get_lang('Info')).'&nbsp;&nbsp;';
-		}
-	}
+    if (api_is_platform_admin()) {
+        if (!$user_is_anonymous) {
+            $result .= '<a href="user_information.php?user_id='.$user_id.'">'.Display::return_icon('synthese_view.gif', get_lang('Info')).'</a>&nbsp;&nbsp;';
+        } else {
+            $result .= Display::return_icon('synthese_view_na.gif', get_lang('Info')).'&nbsp;&nbsp;';
+        }
+    }
 
     //only allow platform admins to login_as, or session admins only for students (not teachers nor other admins)
     if (api_is_platform_admin() || (api_is_session_admin() && $current_user_status_label == $statusname[STUDENT])) {
-    	if (!$user_is_anonymous) {
+        if (!$user_is_anonymous) {
             if (api_global_admin_can_edit_admin($user_id)) {
                 $result .= '<a href="user_list.php?action=login_as&user_id='.$user_id.'&sec_token='.$_SESSION['sec_token'].'">'.Display::return_icon('login_as.png', get_lang('LoginAs')).'</a>&nbsp;&nbsp;';
             } else {
                 $result .= Display::return_icon('login_as_na.png', get_lang('LoginAs')).'&nbsp;&nbsp;';
             }
-    	} else {
-    		$result .= Display::return_icon('login_as_na.png', get_lang('LoginAs')).'&nbsp;&nbsp;';
-    	}
+        } else {
+            $result .= Display::return_icon('login_as_na.png', get_lang('LoginAs')).'&nbsp;&nbsp;';
+        }
     } else {
-    	$result .= Display::return_icon('login_as_na.png', get_lang('LoginAs')).'&nbsp;&nbsp;';
+        $result .= Display::return_icon('login_as_na.png', get_lang('LoginAs')).'&nbsp;&nbsp;';
     }
 
-	if ($current_user_status_label != $statusname[STUDENT]) {
-		$result .= Display::return_icon('statistics_na.gif', get_lang('Reporting')).'&nbsp;&nbsp;';
-	} else {
-		$result .= '<a href="../mySpace/myStudents.php?student='.$user_id.'">'.Display::return_icon('statistics.gif', get_lang('Reporting')).'</a>&nbsp;&nbsp;';
-	}
+    if ($current_user_status_label != $statusname[STUDENT]) {
+        $result .= Display::return_icon('statistics_na.gif', get_lang('Reporting')).'&nbsp;&nbsp;';
+    } else {
+        $result .= '<a href="../mySpace/myStudents.php?student='.$user_id.'">'.Display::return_icon('statistics.gif', get_lang('Reporting')).'</a>&nbsp;&nbsp;';
+    }
 
-	if (api_is_platform_admin(true)) {
+    if (api_is_platform_admin(true)) {
         $editProfileUrl = Display::getProfileEditionLink($user_id, true);
 
         if (!$user_is_anonymous && api_global_admin_can_edit_admin($user_id, null, true)) {
             $result .= '<a href="' . $editProfileUrl . '">'.Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL).'</a>&nbsp;';
-		} else {
+        } else {
             $result .= Display::return_icon('edit_na.png', get_lang('Edit'), array(), ICON_SIZE_SMALL).'</a>&nbsp;';
-		}
-	}
+        }
+    }
 
-	if ($is_admin) {
-		$result .= Display::return_icon('admin_star.png', get_lang('IsAdministrator'),array('width'=> ICON_SIZE_SMALL, 'heigth'=> ICON_SIZE_SMALL));
-	} else {
-		$result .= Display::return_icon('admin_star_na.png', get_lang('IsNotAdministrator'));
-	}
+    if ($is_admin) {
+        $result .= Display::return_icon('admin_star.png', get_lang('IsAdministrator'),array('width'=> ICON_SIZE_SMALL, 'heigth'=> ICON_SIZE_SMALL));
+    } else {
+        $result .= Display::return_icon('admin_star_na.png', get_lang('IsNotAdministrator'));
+    }
 
-	// actions for assigning sessions, courses or users
-	if (api_is_session_admin()) {
-		/*if ($row[0] == api_get_user_id()) {
+    // actions for assigning sessions, courses or users
+    if (api_is_session_admin()) {
+        /*if ($row[0] == api_get_user_id()) {
 			$result .= '<a href="dashboard_add_sessions_to_user.php?user='.$user_id.'">'.Display::return_icon('view_more_stats.gif', get_lang('AssignSessions')).'</a>&nbsp;&nbsp;';
 		}*/
-	} else {
+    } else {
         if ($current_user_status_label == $statusname[SESSIONADMIN]) {
             $result .= Display::url(
                 Display::return_icon('view_more_stats.gif', get_lang('AssignSessions')),
@@ -568,7 +568,7 @@ 
                 );
             }
         }
-	}
+    }
 
     if (api_is_platform_admin()) {
         $result .= ' <a href="'.api_get_path(WEB_AJAX_PATH).'agenda.ajax.php?a=get_user_agenda&user_id='.$user_id.'&modal_size=lg" class="agenda_opener ajax">'.
@@ -586,7 +586,7 @@ 
             }
         }
     }
-	return $result;
+    return $result;
 }
 
 
@@ -619,10 +619,10 @@ 
     if ($action == 'edit') {
         $result = Display::return_icon($image.'.png', get_lang('AccountExpired'), array(), 16);
     } elseif ($row['0']<>$_user['user_id']) {
-    	// you cannot lock yourself out otherwise you could disable all the accounts including your own => everybody is locked out and nobody can change it anymore.
-		$result = Display::return_icon($image.'.png', get_lang(ucfirst($action)), array('onclick'=>'active_user(this);', 'id'=>'img_'.$row['0']), 16).'</a>';
-	}
-	return $result;
+        // you cannot lock yourself out otherwise you could disable all the accounts including your own => everybody is locked out and nobody can change it anymore.
+        $result = Display::return_icon($image.'.png', get_lang(ucfirst($action)), array('onclick'=>'active_user(this);', 'id'=>'img_'.$row['0']), 16).'</a>';
+    }
+    return $result;
 }
 
 /**
@@ -635,8 +635,8 @@ 
  * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University, Belgium
  */
 function status_filter($status) {
-	$statusname = api_get_status_langvars();
-	return $statusname[$status];
+    $statusname = api_get_status_langvars();
+    return $statusname[$status];
 }
 
 if (isset($_GET['keyword']) || isset($_GET['keyword_firstname'])) {
@@ -652,8 +652,8 @@ 
 
 if (!empty($action)) {
     $check = Security::check_token('get');
-	if ($check) {
-		switch ($action) {
+    if ($check) {
+        switch ($action) {
             case 'add_user_to_my_url':
                 $user_id = $_REQUEST["user_id"];
                 $result = UrlManager::add_user_to_url($user_id, $current_access_url_id);
@@ -663,7 +663,7 @@ 
                     $message  = Display::return_message($message, 'confirmation');
                 }
                 break;
-			case 'show_message' :
+            case 'show_message' :
                 if (!empty($_GET['warn'])) {
                     // to prevent too long messages
                     if ($_GET['warn'] == 'session_message') {
@@ -681,46 +681,46 @@ 
                     $message .= Display::return_message(stripslashes($_GET['message']), 'confirmation');
                 }
 
-				break;
-			case 'delete_user' :
-				if (api_is_platform_admin()) {
+                break;
+            case 'delete_user' :
+                if (api_is_platform_admin()) {
                     $user_to_delete = $_GET['user_id'];
                     $current_user_id = api_get_user_id();
 
-					if ($deleteUserAvailable && api_global_admin_can_edit_admin($_GET['user_id'])) {
-						if ($user_to_delete != $current_user_id && UserManager :: delete_user($_GET['user_id'])) {
-							$message = Display :: return_message(get_lang('UserDeleted'), 'confirmation');
-						} else {
-							$message = Display :: return_message(get_lang('CannotDeleteUserBecauseOwnsCourse'), 'error');
-						}
-					} else {
-						$message = Display :: return_message(get_lang('CannotDeleteUser'),'error');
-					}
-				}
-				break;
+                    if ($deleteUserAvailable && api_global_admin_can_edit_admin($_GET['user_id'])) {
+                        if ($user_to_delete != $current_user_id && UserManager :: delete_user($_GET['user_id'])) {
+                            $message = Display :: return_message(get_lang('UserDeleted'), 'confirmation');
+                        } else {
+                            $message = Display :: return_message(get_lang('CannotDeleteUserBecauseOwnsCourse'), 'error');
+                        }
+                    } else {
+                        $message = Display :: return_message(get_lang('CannotDeleteUser'),'error');
+                    }
+                }
+                break;
             case 'delete' :
-				if (api_is_platform_admin()) {
-					$number_of_selected_users = count($_POST['id']);
-					$number_of_deleted_users = 0;
-					if (is_array($_POST['id'])) {
-						foreach ($_POST['id'] as $index => $user_id) {
-							if($user_id != $_user['user_id']) {
-								if(UserManager :: delete_user($user_id)) {
-									$number_of_deleted_users++;
-								}
-							}
-						}
-					}
-					if ($number_of_selected_users == $number_of_deleted_users) {
+                if (api_is_platform_admin()) {
+                    $number_of_selected_users = count($_POST['id']);
+                    $number_of_deleted_users = 0;
+                    if (is_array($_POST['id'])) {
+                        foreach ($_POST['id'] as $index => $user_id) {
+                            if($user_id != $_user['user_id']) {
+                                if(UserManager :: delete_user($user_id)) {
+                                    $number_of_deleted_users++;
+                                }
+                            }
+                        }
+                    }
+                    if ($number_of_selected_users == $number_of_deleted_users) {
                         $message = Display :: return_message(get_lang('SelectedUsersDeleted'), 'confirmation');
-					} else {
+                    } else {
                         $message = Display :: return_message(get_lang('SomeUsersNotDeleted'), 'error');
-					}
-				}
-				break;
-		}
-		Security::clear_token();
-	}
+                    }
+                }
+                break;
+        }
+        Security::clear_token();
+    }
 }
 
 // Create a search-box
@@ -740,24 +740,24 @@ 
 
 $actions  = '';
 if (api_is_platform_admin()) {
-	$actions .= '<div style="float:right;">'.
-		 '<a href="'.api_get_path(WEB_CODE_PATH).'admin/user_add.php">'.
-         Display::return_icon('new_user.png',get_lang('AddUsers'),'',ICON_SIZE_MEDIUM).'</a>'.
-		 '</div>';
+    $actions .= '<div style="float:right;">'.
+            '<a href="'.api_get_path(WEB_CODE_PATH).'admin/user_add.php">'.
+            Display::return_icon('new_user.png',get_lang('AddUsers'),'',ICON_SIZE_MEDIUM).'</a>'.
+            '</div>';
 }
 $actions .= $form->return_form();
 
 if (isset ($_GET['keyword'])) {
-	$parameters = array ('keyword' => Security::remove_XSS($_GET['keyword']));
+    $parameters = array ('keyword' => Security::remove_XSS($_GET['keyword']));
 } elseif (isset ($_GET['keyword_firstname'])) {
-	$parameters['keyword_firstname'] 	= Security::remove_XSS($_GET['keyword_firstname']);
-	$parameters['keyword_lastname']	 	= Security::remove_XSS($_GET['keyword_lastname']);
-	$parameters['keyword_username']	 	= Security::remove_XSS($_GET['keyword_username']);
-	$parameters['keyword_email'] 	 	= Security::remove_XSS($_GET['keyword_email']);
-	$parameters['keyword_officialcode'] = Security::remove_XSS($_GET['keyword_officialcode']);
-	$parameters['keyword_status'] 		= Security::remove_XSS($_GET['keyword_status']);
-	$parameters['keyword_active'] 		= Security::remove_XSS($_GET['keyword_active']);
-	$parameters['keyword_inactive'] 	= Security::remove_XSS($_GET['keyword_inactive']);
+    $parameters['keyword_firstname'] 	= Security::remove_XSS($_GET['keyword_firstname']);
+    $parameters['keyword_lastname']	 	= Security::remove_XSS($_GET['keyword_lastname']);
+    $parameters['keyword_username']	 	= Security::remove_XSS($_GET['keyword_username']);
+    $parameters['keyword_email'] 	 	= Security::remove_XSS($_GET['keyword_email']);
+    $parameters['keyword_officialcode'] = Security::remove_XSS($_GET['keyword_officialcode']);
+    $parameters['keyword_status'] 		= Security::remove_XSS($_GET['keyword_status']);
+    $parameters['keyword_active'] 		= Security::remove_XSS($_GET['keyword_active']);
+    $parameters['keyword_inactive'] 	= Security::remove_XSS($_GET['keyword_inactive']);
 }
 // Create a sortable table with user-data
 $parameters['sec_token'] = Security::get_token();
@@ -768,7 +768,7 @@ 
 $res_admin = Database::query($sql_admin);
 $_admins_list = array();
 while ($row_admin = Database::fetch_row($res_admin)) {
-	$_admins_list[] = $row_admin[0];
+    $_admins_list[] = $row_admin[0];
 }
 
 // Display Advanced search form.
@@ -824,11 +824,11 @@ 
 $table->set_header(2, get_lang('OfficialCode'));
 
 if (api_is_western_name_order()) {
-	$table->set_header(3, get_lang('FirstName'));
-	$table->set_header(4, get_lang('LastName'));
+    $table->set_header(3, get_lang('FirstName'));
+    $table->set_header(4, get_lang('LastName'));
 } else {
-	$table->set_header(3, get_lang('LastName'));
-	$table->set_header(4, get_lang('FirstName'));
+    $table->set_header(3, get_lang('LastName'));
+    $table->set_header(4, get_lang('FirstName'));
 }
 $table->set_header(5, get_lang('LoginName'));
 $table->set_header(6, get_lang('Email'));

Spacing +47 added lines, -47 removed lines

@@ -106,10 +106,10 @@ 
 function display_advanced_search_form () {
     if ($("#advanced_search_form").css("display") == "none") {
         $("#advanced_search_form").css("display","block");
-        $("#img_plus_and_minus").html(\' '.Display::return_icon('div_hide.gif',get_lang('Hide'),array('style'=>'vertical-align:middle')).' '.get_lang('AdvancedSearch').'\');
+        $("#img_plus_and_minus").html(\' '.Display::return_icon('div_hide.gif', get_lang('Hide'), array('style'=>'vertical-align:middle')).' '.get_lang('AdvancedSearch').'\');
     } else {
         $("#advanced_search_form").css("display","none");
-        $("#img_plus_and_minus").html(\' '.Display::return_icon('div_show.gif',get_lang('Show'),array('style'=>'vertical-align:middle')).' '.get_lang('AdvancedSearch').'\');
+        $("#img_plus_and_minus").html(\' '.Display::return_icon('div_show.gif', get_lang('Show'), array('style'=>'vertical-align:middle')).' '.get_lang('AdvancedSearch').'\');
     }
 }
 
@@ -185,8 +185,8 @@ 
 
     // adding the filter to see the user's only of the current access_url
     if ((api_is_platform_admin() || api_is_session_admin()) && api_get_multiple_access_url()) {
-        $access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
-        $sql.= " INNER JOIN $access_url_rel_user_table url_rel_user ON (u.id=url_rel_user.user_id)";
+        $access_url_rel_user_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+        $sql .= " INNER JOIN $access_url_rel_user_table url_rel_user ON (u.id=url_rel_user.user_id)";
     }
 
     $keywordList = array(
@@ -217,11 +217,11 @@ 
     if (isset($keyword_extra_data) && !empty($keyword_extra_data)) {
         $extra_info = UserManager::get_extra_field_information_by_name($keyword_extra_data);
         $field_id = $extra_info['id'];
-        $sql.= " INNER JOIN user_field_values ufv ON u.id=ufv.user_id AND ufv.field_id=$field_id ";
+        $sql .= " INNER JOIN user_field_values ufv ON u.id=ufv.user_id AND ufv.field_id=$field_id ";
     }
 
     if (isset($_GET['keyword']) && !empty($_GET['keyword'])) {
-        $keywordFiltered = Database::escape_string("%". $_GET['keyword'] ."%");
+        $keywordFiltered = Database::escape_string("%".$_GET['keyword']."%");
         $sql .= " WHERE (
                     u.firstname LIKE '$keywordFiltered' OR
                     u.lastname LIKE '$keywordFiltered' OR
@@ -252,7 +252,7 @@ 
 
         $sql .= " $query_admin_table
                 WHERE (
-                    u.firstname LIKE '". Database::escape_string("%".$keywordListValues['keyword_firstname']."%")."' AND
+                    u.firstname LIKE '".Database::escape_string("%".$keywordListValues['keyword_firstname']."%")."' AND
                     u.lastname LIKE '". Database::escape_string("%".$keywordListValues['keyword_lastname']."%")."' AND
                     u.username LIKE '". Database::escape_string("%".$keywordListValues['keyword_username']."%")."' AND
                     u.email LIKE '". Database::escape_string("%".$keywordListValues['keyword_email']."%")."' AND
@@ -264,7 +264,7 @@ 
 
         if (isset($keyword_active) && !isset($keyword_inactive)) {
             $sql .= " AND u.active='1'";
-        } elseif(isset($keyword_inactive) && !isset($keyword_active)) {
+        } elseif (isset($keyword_inactive) && !isset($keyword_active)) {
             $sql .= " AND u.active='0'";
         }
         $sql .= " ) ";
@@ -307,7 +307,7 @@ 
     $lastname = $userInfo['lastname'];
 
 	if (api_is_western_name_order()) {
-		$message = sprintf(get_lang('AttemptingToLoginAs'),$firstname,$lastname, $userId);
+		$message = sprintf(get_lang('AttemptingToLoginAs'), $firstname, $lastname, $userId);
 	} else {
 		$message = sprintf(get_lang('AttemptingToLoginAs'), $lastname, $firstname, $userId);
 	}
@@ -341,7 +341,7 @@ 
         Session::write('login_as', true);
 
         $target_url = api_get_path(WEB_PATH)."user_portal.php";
-        $message .= '<br />'.sprintf(get_lang('LoginSuccessfulGoToX'),'<a href="'.$target_url.'">'.$target_url.'</a>');
+        $message .= '<br />'.sprintf(get_lang('LoginSuccessfulGoToX'), '<a href="'.$target_url.'">'.$target_url.'</a>');
         Display :: display_header(get_lang('UserList'));
         Display :: display_normal_message($message, false);
         Display :: display_footer();
@@ -384,11 +384,11 @@ 
         $sql .= "AND password LIKE '$easyPassword' ";
     }*/
 
-    if (!in_array($direction, array('ASC','DESC'))) {
+    if (!in_array($direction, array('ASC', 'DESC'))) {
     	$direction = 'ASC';
     }
     $column = intval($column);
-    $from 	= intval($from);
+    $from = intval($from);
     $number_of_items = intval($number_of_items);
 
     $preventSessionAdminsToManageAllUsers = api_get_setting('prevent_session_admins_to_manage_all_users');
@@ -401,7 +401,7 @@ 
 
 	$res = Database::query($sql);
 
-	$users = array ();
+	$users = array();
     $t = time();
 	while ($user = Database::fetch_row($res)) {
 		$userPicture = UserManager::getUserPicture($user[0], USER_IMAGE_SIZE_SMALL);
@@ -462,13 +462,13 @@ 
  */
 function modify_filter($user_id, $url_params, $row) {
 	global $charset, $_admins_list;
-	$is_admin   = in_array($user_id,$_admins_list);
+	$is_admin   = in_array($user_id, $_admins_list);
 	$statusname = api_get_status_langvars();
 	$user_is_anonymous = false;
     $current_user_status_label = $row['7'];
 
 	if ($current_user_status_label == $statusname[ANONYMOUS]) {
-		$user_is_anonymous =true;
+		$user_is_anonymous = true;
 	}
 	$result = '';
 	if (!$user_is_anonymous) {
@@ -484,8 +484,8 @@ 
 					<div class="blackboard_hide" id="div_s_'.$user_id.'">&nbsp;&nbsp;</div>
 					</a>';
 	} else {
-		$result .= Display::return_icon('course_na.png',get_lang('Courses')).'&nbsp;&nbsp;';
-		$result .= Display::return_icon('course_na.png',get_lang('Sessions')).'&nbsp;&nbsp;';
+		$result .= Display::return_icon('course_na.png', get_lang('Courses')).'&nbsp;&nbsp;';
+		$result .= Display::return_icon('course_na.png', get_lang('Sessions')).'&nbsp;&nbsp;';
 	}
 
 	if (api_is_platform_admin()) {
@@ -521,14 +521,14 @@ 
         $editProfileUrl = Display::getProfileEditionLink($user_id, true);
 
         if (!$user_is_anonymous && api_global_admin_can_edit_admin($user_id, null, true)) {
-            $result .= '<a href="' . $editProfileUrl . '">'.Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL).'</a>&nbsp;';
+            $result .= '<a href="'.$editProfileUrl.'">'.Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL).'</a>&nbsp;';
 		} else {
             $result .= Display::return_icon('edit_na.png', get_lang('Edit'), array(), ICON_SIZE_SMALL).'</a>&nbsp;';
 		}
 	}
 
 	if ($is_admin) {
-		$result .= Display::return_icon('admin_star.png', get_lang('IsAdministrator'),array('width'=> ICON_SIZE_SMALL, 'heigth'=> ICON_SIZE_SMALL));
+		$result .= Display::return_icon('admin_star.png', get_lang('IsAdministrator'), array('width'=> ICON_SIZE_SMALL, 'heigth'=> ICON_SIZE_SMALL));
 	} else {
 		$result .= Display::return_icon('admin_star_na.png', get_lang('IsNotAdministrator'));
 	}
@@ -580,7 +580,7 @@ 
                 api_global_admin_can_edit_admin($user_id)
             ) {
                 // you cannot lock yourself out otherwise you could disable all the accounts including your own => everybody is locked out and nobody can change it anymore.
-                $result .= ' <a href="user_list.php?action=delete_user&user_id='.$user_id.'&'.$url_params.'&sec_token='.$_SESSION['sec_token'].'"  onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset))."'".')) return false;">'.Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL).'</a>';
+                $result .= ' <a href="user_list.php?action=delete_user&user_id='.$user_id.'&'.$url_params.'&sec_token='.$_SESSION['sec_token'].'"  onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES, $charset))."'".')) return false;">'.Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL).'</a>';
             } else {
                 $result .= Display::return_icon('delete_na.png', get_lang('Delete'), array(), ICON_SIZE_SMALL);
             }
@@ -618,7 +618,7 @@ 
 
     if ($action == 'edit') {
         $result = Display::return_icon($image.'.png', get_lang('AccountExpired'), array(), 16);
-    } elseif ($row['0']<>$_user['user_id']) {
+    } elseif ($row['0'] <> $_user['user_id']) {
     	// you cannot lock yourself out otherwise you could disable all the accounts including your own => everybody is locked out and nobody can change it anymore.
 		$result = Display::return_icon($image.'.png', get_lang(ucfirst($action)), array('onclick'=>'active_user(this);', 'id'=>'img_'.$row['0']), 16).'</a>';
 	}
@@ -640,11 +640,11 @@ 
 }
 
 if (isset($_GET['keyword']) || isset($_GET['keyword_firstname'])) {
-    $interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
-    $interbreadcrumb[] = array ("url" => 'user_list.php', "name" => get_lang('UserList'));
+    $interbreadcrumb[] = array("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
+    $interbreadcrumb[] = array("url" => 'user_list.php', "name" => get_lang('UserList'));
     $tool_name = get_lang('SearchUsers');
 } else {
-    $interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
+    $interbreadcrumb[] = array("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
     $tool_name = get_lang('UserList');
 }
 
@@ -657,10 +657,10 @@ 
             case 'add_user_to_my_url':
                 $user_id = $_REQUEST["user_id"];
                 $result = UrlManager::add_user_to_url($user_id, $current_access_url_id);
-                if ($result ) {
+                if ($result) {
                     $user_info = api_get_user_info($user_id);
                     $message = get_lang('UserAdded').' '.$user_info['firstname'].' '.$user_info['lastname'].' ('.$user_info['username'].')';
-                    $message  = Display::return_message($message, 'confirmation');
+                    $message = Display::return_message($message, 'confirmation');
                 }
                 break;
 			case 'show_message' :
@@ -694,7 +694,7 @@ 
 							$message = Display :: return_message(get_lang('CannotDeleteUserBecauseOwnsCourse'), 'error');
 						}
 					} else {
-						$message = Display :: return_message(get_lang('CannotDeleteUser'),'error');
+						$message = Display :: return_message(get_lang('CannotDeleteUser'), 'error');
 					}
 				}
 				break;
@@ -704,8 +704,8 @@ 
 					$number_of_deleted_users = 0;
 					if (is_array($_POST['id'])) {
 						foreach ($_POST['id'] as $index => $user_id) {
-							if($user_id != $_user['user_id']) {
-								if(UserManager :: delete_user($user_id)) {
+							if ($user_id != $_user['user_id']) {
+								if (UserManager :: delete_user($user_id)) {
 									$number_of_deleted_users++;
 								}
 							}
@@ -738,17 +738,17 @@ 
     </a>'
 );
 
-$actions  = '';
+$actions = '';
 if (api_is_platform_admin()) {
 	$actions .= '<div style="float:right;">'.
 		 '<a href="'.api_get_path(WEB_CODE_PATH).'admin/user_add.php">'.
-         Display::return_icon('new_user.png',get_lang('AddUsers'),'',ICON_SIZE_MEDIUM).'</a>'.
+         Display::return_icon('new_user.png', get_lang('AddUsers'), '', ICON_SIZE_MEDIUM).'</a>'.
 		 '</div>';
 }
 $actions .= $form->return_form();
 
 if (isset ($_GET['keyword'])) {
-	$parameters = array ('keyword' => Security::remove_XSS($_GET['keyword']));
+	$parameters = array('keyword' => Security::remove_XSS($_GET['keyword']));
 } elseif (isset ($_GET['keyword_firstname'])) {
 	$parameters['keyword_firstname'] 	= Security::remove_XSS($_GET['keyword_firstname']);
 	$parameters['keyword_lastname']	 	= Security::remove_XSS($_GET['keyword_lastname']);
@@ -757,7 +757,7 @@ 
 	$parameters['keyword_officialcode'] = Security::remove_XSS($_GET['keyword_officialcode']);
 	$parameters['keyword_status'] 		= Security::remove_XSS($_GET['keyword_status']);
 	$parameters['keyword_active'] 		= Security::remove_XSS($_GET['keyword_active']);
-	$parameters['keyword_inactive'] 	= Security::remove_XSS($_GET['keyword_inactive']);
+	$parameters['keyword_inactive'] = Security::remove_XSS($_GET['keyword_inactive']);
 }
 // Create a sortable table with user-data
 $parameters['sec_token'] = Security::get_token();
@@ -774,15 +774,15 @@ 
 // Display Advanced search form.
 $form = new FormValidator('advanced_search', 'get', '', '', array(), FormValidator::LAYOUT_HORIZONTAL);
 
-$form->addElement('html','<div id="advanced_search_form" style="display:none;">');
+$form->addElement('html', '<div id="advanced_search_form" style="display:none;">');
 $form->addElement('header', get_lang('AdvancedSearch'));
-$form->addText('keyword_firstname',get_lang('FirstName'),false);
-$form->addText('keyword_lastname',get_lang('LastName'),false);
+$form->addText('keyword_firstname', get_lang('FirstName'), false);
+$form->addText('keyword_lastname', get_lang('LastName'), false);
 
-$form->addText('keyword_username',get_lang('LoginName'),false);
-$form->addText('keyword_email',get_lang('Email'),false);
+$form->addText('keyword_username', get_lang('LoginName'), false);
+$form->addText('keyword_email', get_lang('Email'), false);
 
-$form->addText('keyword_officialcode',get_lang('OfficialCode'),false);
+$form->addText('keyword_officialcode', get_lang('OfficialCode'), false);
 
 $status_options = array();
 $status_options['%'] = get_lang('All');
@@ -792,12 +792,12 @@ 
 $status_options[SESSIONADMIN] = get_lang('SessionsAdmin');
 $status_options[PLATFORM_ADMIN] = get_lang('Administrator');
 
-$form->addElement('select','keyword_status',get_lang('Profile'), $status_options    );
+$form->addElement('select', 'keyword_status', get_lang('Profile'), $status_options);
 
 $active_group = array();
-$active_group[] = $form->createElement('checkbox','keyword_active','', get_lang('Active'));
-$active_group[] = $form->createElement('checkbox','keyword_inactive','', get_lang('Inactive'));
-$form->addGroup($active_group,'',get_lang('ActiveAccount'), '<br/>',false);
+$active_group[] = $form->createElement('checkbox', 'keyword_active', '', get_lang('Active'));
+$active_group[] = $form->createElement('checkbox', 'keyword_inactive', '', get_lang('Inactive'));
+$form->addGroup($active_group, '', get_lang('ActiveAccount'), '<br/>', false);
 
 $form->addElement('checkbox', 'check_easy_passwords', null, get_lang('CheckEasyPasswords'));
 
@@ -808,7 +808,7 @@ 
 $defaults['keyword_active'] = 1;
 $defaults['keyword_inactive'] = 1;
 $form->setDefaults($defaults);
-$form->addElement('html','</div>');
+$form->addElement('html', '</div>');
 
 $form = $form->returnForm();
 
@@ -890,10 +890,10 @@ 
                 }
                 if ($add_user) {
                     $row_table = array();
-                    $row_table[] =  api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].') ';
-                    $row_table[] =  $access_info_to_string;
+                    $row_table[] = api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].') ';
+                    $row_table[] = $access_info_to_string;
                     $url = api_get_self().'?action=add_user_to_my_url&user_id='.$user['id'].'&sec_token='.$_SESSION['sec_token'];
-                    $row_table[] =  Display::url(get_lang('AddUserToMyURL'), $url, array('class' => 'btn'));
+                    $row_table[] = Display::url(get_lang('AddUserToMyURL'), $url, array('class' => 'btn'));
 
                     foreach ($row_table as $cell) {
                         $table->setCellContents($row, $column, $cell);

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 +5 added lines, -5 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]) {
@@ -424,7 +424,7 @@ 
     Display::display_error_message($error_message);
 }
 
-$form = new FormValidator('user_update_import','post','user_update_import.php');
+$form = new FormValidator('user_update_import', 'post', 'user_update_import.php');
 $form->addElement('header', '', $tool_name);
 $form->addElement('hidden', 'formSent');
 $form->addElement('file', 'import_file', get_lang('ImportFileLocation'));

Braces +4 added lines, -1 removed lines

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

Indentation +6 added lines, -6 removed lines

@@ -60,8 +60,8 @@ 
                     $user['error'] = get_lang('UserNameNotAvailable');
                     $errors[] = $user;
                 }
-             }
-          }
+                }
+            }
 
         // 3. Check status.
         if (isset($user['Status']) && !api_status_exists($user['Status'])) {
@@ -242,10 +242,10 @@ 
     return $users;
 }
 /**
- * XML-parser: handle start of element
- * @param   string  $parser Deprecated?
- * @param   string  $data The data to be parsed
- */
+     * XML-parser: handle start of element
+     * @param   string  $parser Deprecated?
+     * @param   string  $data The data to be parsed
+     */
 function element_start($parser, $data)
 {
     $data = api_utf8_decode($data);

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

Indentation +5 added lines, -5 removed lines

@@ -636,11 +636,11 @@
             }
             $formToDisplay = $form->returnForm();
         } else {
-           if (!empty($sessionId)) {
-               $sessionInfo = api_get_session_info($sessionId);
-               $startDate = $sessionInfo['access_start_date'];
-               $endDate = $sessionInfo['access_end_date'];
-           }
+            if (!empty($sessionId)) {
+                $sessionInfo = api_get_session_info($sessionId);
+                $startDate = $sessionInfo['access_start_date'];
+                $endDate = $sessionInfo['access_end_date'];
+            }
         }
 
         $attendance = new Attendance();

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

Braces +5 added lines, -4 removed lines

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

main/auth/cas/authcas.php

Doc Comments +1 added lines, -1 removed lines

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

Indentation +56 added lines, -56 removed lines

@@ -14,7 +14,7 @@ 
 *
 **/
 function cas_configured() {
-	global $cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri;
+    global $cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri;
     $res = false;
     if (!empty($cas_auth_ver) && !empty($cas_auth_server) && !empty($cas_auth_port)) {
         $res = true;
@@ -32,23 +32,23 @@ 
 
 function cas_is_authenticated()
 {
-	global $cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri;
-	global $PHPCAS_CLIENT;
-	global $logout;
+    global $cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri;
+    global $PHPCAS_CLIENT;
+    global $logout;
 
     if (!cas_configured()) {
         return;
     }
 
-	if (!is_object($PHPCAS_CLIENT)) {
-		phpCAS::client($cas_auth_ver,$cas_auth_server,$cas_auth_port,$cas_auth_uri);
-		phpCAS::setNoCasServerValidation();
-	}
-	$auth = phpCAS::checkAuthentication();
+    if (!is_object($PHPCAS_CLIENT)) {
+        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());
-		/*
+    if ($auth) {
+        $login= trim(phpCAS::getUser());
+        /*
 		   Get user  attributes. Here are the attributes for crdp platform
 		   sn => name
 		   ENTPersonMailInterne => mail
@@ -56,7 +56,7 @@ 
 		   ENTPersonProfils => profil
 		   givenName => first name
 		 */
-		/*$user=phpCAS::getAttributes();
+        /*$user=phpCAS::getAttributes();
 		$firstName = trim($user['givenName']);
 		$lastName = trim($user['sn']);
 		$login = trim($user['ENTPersonAlias']);
@@ -79,54 +79,54 @@ 
 			default:
 				$status=5; // Student
 		}*/
-		if (!$logout){
-		    // get user info from username
-		    $tab_user_info = api_get_user_info($login);
-
-		    // user found in the chamilo database
-		    if (is_array($tab_user_info)) {
-		        // if option is on we update user automatically from ldap server
-		        if (api_get_setting("update_user_info_cas_with_ldap") == "true") {
+        if (!$logout){
+            // get user info from username
+            $tab_user_info = api_get_user_info($login);
+
+            // user found in the chamilo database
+            if (is_array($tab_user_info)) {
+                // if option is on we update user automatically from ldap server
+                if (api_get_setting("update_user_info_cas_with_ldap") == "true") {
                     $ldapuser = extldap_authenticate($login, 'nopass', true);
                     if ($ldapuser !== false) {
                         $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,'') ;
-		            }
-		        }
-		        return $login;
-		    }
-		    // user not found
-		    else {
-		        // if option is on we can ADD user automatically from ldap server or by modify own profil
-		        $user_added = false;
-		        switch (api_get_setting("cas_add_user_activate")) {
-		            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);
-          				$user_added = $login;
-		                break;
-		            case LDAP_AUTH_SOURCE :
-		                // user info are read from ldap connexion
-	                    // get user info from ldap server
-	                    // user has already been authenticated by CAS
-	                    // If user not found in LDAP, user not created
-	                    $ldapuser = extldap_authenticate($login, 'nopass', true);
-	                    if ($ldapuser !== false) {
-	                        $chamilo_user = extldap_get_chamilo_user($ldapuser);
+                        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;
+            }
+            // user not found
+            else {
+                // if option is on we can ADD user automatically from ldap server or by modify own profil
+                $user_added = false;
+                switch (api_get_setting("cas_add_user_activate")) {
+                    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);
+                            $user_added = $login;
+                        break;
+                    case LDAP_AUTH_SOURCE :
+                        // user info are read from ldap connexion
+                        // get user info from ldap server
+                        // user has already been authenticated by CAS
+                        // If user not found in LDAP, user not created
+                        $ldapuser = extldap_authenticate($login, 'nopass', true);
+                        if ($ldapuser !== false) {
+                            $chamilo_user = extldap_get_chamilo_user($ldapuser);
                             $chamilo_user['username'] = $login;
                             $chamilo_user['auth_source'] = CAS_AUTH_SOURCE;
                             $chamilo_uid = external_add_user($chamilo_user);
-          				    $user_added = $login;
-          				}
-		                break;
-		            default : break;
-		        }
-		        return $user_added;
-		    }
-		}
+                                $user_added = $login;
+                            }
+                        break;
+                    default : break;
+                }
+                return $user_added;
+            }
+        }
 //		//If the user is in the dokeos database and we are ,not in a logout request, we upgrade his infomration by ldap
 //		if (! $logout){
 //			$user_table = Database::get_main_table(TABLE_MAIN_USER);
@@ -148,10 +148,10 @@ 
 //
 //			}
 //		}
-		return $login;
+        return $login;
     } else {
-		return false;
-	}
+        return false;
+    }
 }
 
 /**

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;

Indentation +1139 added lines, -1139 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');

 }

 

 /**

@@ -282,10 +282,10 @@ 
  * @hideinitializer

  */

 $GLOBALS['PHPCAS_INIT_CALL'] = array (

-	'done' => FALSE,

-	'file' => '?',

-	'line' => -1,

-	'method' => '?'

+    'done' => FALSE,

+    'file' => '?',

+    'line' => -1,

+    'method' => '?'

 );

 

 /**

@@ -295,11 +295,11 @@ 
  * @hideinitializer

  */

 $GLOBALS['PHPCAS_AUTH_CHECK_CALL'] = array (

-	'done' => FALSE,

-	'file' => '?',

-	'line' => -1,

-	'method' => '?',

-	'result' => FALSE

+    'done' => FALSE,

+    'file' => '?',

+    'line' => -1,

+    'method' => '?',

+    'result' => FALSE

 );

 

 /**

@@ -308,9 +308,9 @@ 
  * @hideinitializer

  */

 $GLOBALS['PHPCAS_DEBUG'] = array (

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

-	'indent' => 0,

-	'unique_id' => ''

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

+    'indent' => 0,

+    'unique_id' => ''

 );

 

 /** @} */

@@ -340,1141 +340,1141 @@ 
 

 class phpCAS {

 

-	// ########################################################################

-	//  INITIALIZATION

-	// ########################################################################

-

-	/**

-	 * @addtogroup publicInit

-	 * @{

-	 */

-

-	/**

-	 * phpCAS client initializer.

-	 * @note Only one of the phpCAS::client() and phpCAS::proxy functions should be

-	 * called, only once, and before all other methods (except phpCAS::getVersion()

-	 * and phpCAS::setDebug()).

-	 *

-	 * @param $server_version the version of the CAS server

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

-	 * @param $start_session Have phpCAS start PHP sessions (default true)

-	 *

-	 * @return a newly created CASClient object

-	 */

-	function client($server_version, $server_hostname, $server_port, $server_uri, $start_session = true) {

-		global $PHPCAS_CLIENT, $PHPCAS_INIT_CALL;

-

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

-		}

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

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

-		}

-		if (gettype($server_hostname) != 'string') {

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

-		}

-		if (gettype($server_port) != 'integer') {

-			phpCAS :: error('type mismatched for parameter $server_port (should be `integer\')');

-		}

-		if (gettype($server_uri) != 'string') {

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

-		}

-

-		// store where the initializer is called from

-		$dbg = phpCAS :: backtrace();

-		$PHPCAS_INIT_CALL = array (

-			'done' => TRUE,

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

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

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

-		);

-

-		// initialize the global object $PHPCAS_CLIENT

-		$PHPCAS_CLIENT = new CASClient($server_version, FALSE /*proxy*/

-		, $server_hostname, $server_port, $server_uri, $start_session);

-		phpCAS :: traceEnd();

-	}

-

-	/**

-	 * phpCAS proxy initializer.

-	 * @note Only one of the phpCAS::client() and phpCAS::proxy functions should be

-	 * called, only once, and before all other methods (except phpCAS::getVersion()

-	 * and phpCAS::setDebug()).

-	 *

-	 * @param $server_version the version of the CAS server

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

-	 * @param $start_session Have phpCAS start PHP sessions (default true)

-	 *

-	 * @return a newly created CASClient object

-	 */

-	function proxy($server_version, $server_hostname, $server_port, $server_uri, $start_session = true) {

-		global $PHPCAS_CLIENT, $PHPCAS_INIT_CALL;

-

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

-		}

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

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

-		}

-		if (gettype($server_hostname) != 'string') {

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

-		}

-		if (gettype($server_port) != 'integer') {

-			phpCAS :: error('type mismatched for parameter $server_port (should be `integer\')');

-		}

-		if (gettype($server_uri) != 'string') {

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

-		}

-

-		// store where the initialzer is called from

-		$dbg = phpCAS :: backtrace();

-		$PHPCAS_INIT_CALL = array (

-			'done' => TRUE,

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

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

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

-		);

-

-		// initialize the global object $PHPCAS_CLIENT

-		$PHPCAS_CLIENT = new CASClient($server_version, TRUE /*proxy*/

-		, $server_hostname, $server_port, $server_uri, $start_session);

-		phpCAS :: traceEnd();

-	}

-

-	/** @} */

-	// ########################################################################

-	//  DEBUGGING

-	// ########################################################################

-

-	/**

-	 * @addtogroup publicDebug

-	 * @{

-	 */

-

-	/**

-	 * Set/unset debug mode

-	 *

-	 * @param $filename the name of the file used for logging, or FALSE to stop debugging.

-	 */

-	function setDebug($filename = '') {

-		global $PHPCAS_DEBUG;

-

-		if ($filename != FALSE && gettype($filename) != 'string') {

-			phpCAS :: error('type mismatched for parameter $dbg (should be FALSE or the name of the log file)');

-		}

-

-		if (empty ($filename)) {

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

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

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

-				} else

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

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

-					} else {

-						$debugDir = '';

-					}

-			} else {

-				$debugDir = DEFAULT_DEBUG_DIR;

-			}

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

-		}

-

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

-			$PHPCAS_DEBUG['unique_id'] = substr(strtoupper(md5(uniqid(''))), 0, 4);

-		}

-

-		$PHPCAS_DEBUG['filename'] = $filename;

-

-		phpCAS :: trace('START ******************');

-	}

-

-	/** @} */

-	/**

-	 * @addtogroup internalDebug

-	 * @{

-	 */

-

-	/**

-	 * This method is a wrapper for debug_backtrace() that is not available 

-	 * in all PHP versions (>= 4.3.0 only)

-	 */

-	function backtrace() {

-		if (function_exists('debug_backtrace')) {

-			return debug_backtrace();

-		} else {

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

-			return array ();

-		}

-	}

-

-	/**

-	 * Logs a string in debug mode.

-	 *

-	 * @param $str the string to write

-	 *

-	 * @private

-	 */

-	function log($str) {

-		$indent_str = ".";

-		global $PHPCAS_DEBUG;

-

-		if ($PHPCAS_DEBUG['filename']) {

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

-				$indent_str .= '|    ';

-			}

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

-		}

-

-	}

-

-	/**

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

-	 *

-	 * @private

-	 */

-	function error($msg) {

-		$dbg = phpCAS :: backtrace();

-		$function = '?';

-		$file = '?';

-		$line = '?';

-		if (is_array($dbg)) {

-			for ($i = 1; $i < sizeof($dbg); $i++) {

-				if (is_array($dbg[$i])) {

-					if ($dbg[$i]['class'] == __CLASS__) {

-						$function = $dbg[$i]['function'];

-						$file = $dbg[$i]['file'];

-						$line = $dbg[$i]['line'];

-					}

-				}

-			}

-		}

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

-	}

-

-	/**

-	 * This method is used to log something in debug mode.

-	 */

-	function trace($str) {

-		$dbg = phpCAS :: backtrace();

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

-	}

-

-	/**

-	 * This method is used to indicate the start of the execution of a function in debug mode.

-	 */

-	function traceBegin() {

-		global $PHPCAS_DEBUG;

-

-		$dbg = phpCAS :: backtrace();

-		$str = '=> ';

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

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

-		}

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

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

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

-				if ($index != 0) {

-					$str .= ', ';

-				}

-				$str .= str_replace("\n", "", var_export($arg, TRUE));

-			}

-		}

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

-		phpCAS :: log($str);

-		$PHPCAS_DEBUG['indent']++;

-	}

-

-	/**

-	 * This method is used to indicate the end of the execution of a function in debug mode.

-	 *

-	 * @param $res the result of the function

-	 */

-	function traceEnd($res = '') {

-		global $PHPCAS_DEBUG;

-

-		$PHPCAS_DEBUG['indent']--;

-		$dbg = phpCAS :: backtrace();

-		$str = '';

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

-		phpCAS :: log($str);

-	}

-

-	/**

-	 * This method is used to indicate the end of the execution of the program

-	 */

-	function traceExit() {

-		global $PHPCAS_DEBUG;

-

-		phpCAS :: log('exit()');

-		while ($PHPCAS_DEBUG['indent'] > 0) {

-			phpCAS :: log('-');

-			$PHPCAS_DEBUG['indent']--;

-		}

-	}

-

-	/** @} */

-	// ########################################################################

-	//  INTERNATIONALIZATION

-	// ########################################################################

-	/**

-	 * @addtogroup publicLang

-	 * @{

-	 */

-

-	/**

-	 * This method is used to set the language used by phpCAS. 

-	 * @note Can be called only once.

-	 *

-	 * @param $lang a string representing the language.

-	 *

-	 * @sa PHPCAS_LANG_FRENCH, PHPCAS_LANG_ENGLISH

-	 */

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

-		}

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

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

-		}

-		$PHPCAS_CLIENT->setLang($lang);

-	}

-

-	/** @} */

-	// ########################################################################

-	//  VERSION

-	// ########################################################################

-	/**

-	 * @addtogroup public

-	 * @{

-	 */

-

-	/**

-	 * This method returns the phpCAS version.

-	 *

-	 * @return the phpCAS version.

-	 */

-	function getVersion() {

-		return PHPCAS_VERSION;

-	}

-

-	/** @} */

-	// ########################################################################

-	//  HTML OUTPUT

-	// ########################################################################

-	/**

-	 * @addtogroup publicOutput

-	 * @{

-	 */

-

-	/**

-	 * This method sets the HTML header used for all outputs.

-	 *

-	 * @param $header the HTML header.

-	 */

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

-		}

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

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

-		}

-		$PHPCAS_CLIENT->setHTMLHeader($header);

-	}

-

-	/**

-	 * This method sets the HTML footer used for all outputs.

-	 *

-	 * @param $footer the HTML footer.

-	 */

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

-		}

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

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

-		}

-		$PHPCAS_CLIENT->setHTMLFooter($footer);

-	}

-

-	/** @} */

-	// ########################################################################

-	//  PGT STORAGE

-	// ########################################################################

-	/**

-	 * @addtogroup publicPGTStorage

-	 * @{

-	 */

-

-	/**

-	 * This method is used to tell phpCAS to store the response of the

-	 * CAS server to PGT requests onto the filesystem. 

-	 *

-	 * @param $format the format used to store the PGT's (`plain' and `xml' allowed)

-	 * @param $path the path where the PGT's should be stored

-	 */

-	function setPGTStorageFile($format = '', $path = '') {

-		global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL;

-

-		phpCAS :: traceBegin();

-		if (!is_object($PHPCAS_CLIENT)) {

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

-		}

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

-		}

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

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

-		}

-		if (gettype($path) != 'string') {

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

-		}

-		$PHPCAS_CLIENT->setPGTStorageFile($format, $path);

-		phpCAS :: traceEnd();

-	}

-

-	/**

-	 * This method is used to tell phpCAS to store the response of the

-	 * CAS server to PGT requests into a database. 

-	 * @note The connection to the database is done only when needed. 

-	 * As a consequence, bad parameters are detected only when 

-	 * initializing PGT storage, except in debug mode.

-	 *

-	 * @param $user the user to access the data with

-	 * @param $password the user's password

-	 * @param $database_type the type of the database hosting the data

-	 * @param $hostname the server hosting the database

-	 * @param $port the port the server is listening on

-	 * @param $database the name of the database

-	 * @param $table the name of the table storing the data

-	 */

-	function setPGTStorageDB($user, $password, $database_type = '', $hostname = '', $port = 0, $database = '', $table = '') {

-		global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL;

-

-		phpCAS :: traceBegin();

-		if (!is_object($PHPCAS_CLIENT)) {

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

-		}

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

-		}

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

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

-		}

-		if (gettype($password) != 'string') {

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

-		}

-		if (gettype($database_type) != 'string') {

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

-		}

-		if (gettype($hostname) != 'string') {

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

-		}

-		if (gettype($port) != 'integer') {

-			phpCAS :: error('type mismatched for parameter $port (should be `integer\')');

-		}

-		if (gettype($database) != 'string') {

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

-		}

-		if (gettype($table) != 'string') {

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

-		}

-		$PHPCAS_CLIENT->setPGTStorageDB($user, $password, $database_type, $hostname, $port, $database, $table);

-		phpCAS :: traceEnd();

-	}

-

-	/** @} */

-	// ########################################################################

-	// ACCESS TO EXTERNAL SERVICES

-	// ########################################################################

-	/**

-	 * @addtogroup publicServices

-	 * @{

-	 */

-

-	/**

-	 * This method is used to access an HTTP[S] service.

-	 * 

-	 * @param $url the service to access.

-	 * @param $err_code an error code Possible values are PHPCAS_SERVICE_OK (on

-	 * success), PHPCAS_SERVICE_PT_NO_SERVER_RESPONSE, PHPCAS_SERVICE_PT_BAD_SERVER_RESPONSE,

-	 * PHPCAS_SERVICE_PT_FAILURE, PHPCAS_SERVICE_NOT AVAILABLE.

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

-	 * gives the reason why it failed and $output contains an error message).

-	 */

-	function serviceWeb($url, & $err_code, & $output) {

-		global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL;

-

-		phpCAS :: traceBegin();

-		if (!is_object($PHPCAS_CLIENT)) {

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

-		}

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

-		}

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

-		}

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

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

-		}

-

-		$res = $PHPCAS_CLIENT->serviceWeb($url, $err_code, $output);

-

-		phpCAS :: traceEnd($res);

-		return $res;

-	}

-

-	/**

-	 * This method is used to access an IMAP/POP3/NNTP service.

-	 * 

-	 * @param $url a string giving the URL of the service, including the mailing box

-	 * for IMAP URLs, as accepted by imap_open().

-	 * @param $service a string giving for CAS retrieve Proxy ticket

-	 * @param $flags options given to imap_open().

-	 * @param $err_code an error code Possible values are PHPCAS_SERVICE_OK (on

-	 * success), PHPCAS_SERVICE_PT_NO_SERVER_RESPONSE, PHPCAS_SERVICE_PT_BAD_SERVER_RESPONSE,

-	 * PHPCAS_SERVICE_PT_FAILURE, PHPCAS_SERVICE_NOT AVAILABLE.

-	 * @param $err_msg an error message on failure

-	 * @param $pt the Proxy Ticket (PT) retrieved from the CAS server to access the URL

-	 * on success, FALSE on error).

-	 *

-	 * @return an IMAP stream on success, FALSE otherwise (in this later case, $err_code

-	 * gives the reason why it failed and $err_msg contains an error message).

-	 */

-	function serviceMail($url, $service, $flags, & $err_code, & $err_msg, & $pt) {

-		global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL;

-

-		phpCAS :: traceBegin();

-		if (!is_object($PHPCAS_CLIENT)) {

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

-		}

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

-		}

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

-		}

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

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

-		}

-

-		if (gettype($flags) != 'integer') {

-			phpCAS :: error('type mismatched for parameter $flags (should be `integer\')');

-		}

-

-		$res = $PHPCAS_CLIENT->serviceMail($url, $service, $flags, $err_code, $err_msg, $pt);

-

-		phpCAS :: traceEnd($res);

-		return $res;

-	}

-

-	/** @} */

-	// ########################################################################

-	//  AUTHENTICATION

-	// ########################################################################

-	/**

-	 * @addtogroup publicAuth

-	 * @{

-	 */

-

-	/**

-	 * Set the times authentication will be cached before really accessing the CAS server in gateway mode: 

-	 * - -1: check only once, and then never again (until you pree login)

-	 * - 0: always check

-	 * - n: check every "n" time

-	 *

-	 * @param $n an integer.

-	 */

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

-		}

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

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

-		}

-		$PHPCAS_CLIENT->setCacheTimesForAuthRecheck($n);

-	}

-

-	/**

-	 * This method is called to check if the user is authenticated (use the gateway feature).

-	 * @return TRUE when the user is authenticated; otherwise FALSE.

-	 */

-	function checkAuthentication() {

-		global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL;

-

-		phpCAS :: traceBegin();

-		if (!is_object($PHPCAS_CLIENT)) {

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

-			'done' => TRUE,

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

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

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

-			'result' => $auth

-		);

-		phpCAS :: traceEnd($auth);

-		return $auth;

-	}

-

-	/**

-	 * This method is called to force authentication if the user was not already 

-	 * authenticated. If the user is not authenticated, halt by redirecting to 

-	 * the CAS server.

-	 */

-	function forceAuthentication() {

-		global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL;

-

-		phpCAS :: traceBegin();

-		if (!is_object($PHPCAS_CLIENT)) {

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

-			'done' => TRUE,

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

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

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

-			'result' => $auth

-		);

-

-		if (!$auth) {

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

-		return $auth;

-	}

-

-	/**

-	 * This method is called to renew the authentication.

-	 **/

-	function renewAuthentication() {

-		global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL;

-

-		phpCAS :: traceBegin();

-		if (!is_object($PHPCAS_CLIENT)) {

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

-			'done' => TRUE,

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

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

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

-			'result' => $auth

-		);

-

-		$PHPCAS_CLIENT->renewAuthentication();

-		phpCAS :: traceEnd();

-	}

-

-	/**

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

-	}

-

-	/**

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

-	 */

-	function isAuthenticated() {

-		global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL;

-

-		phpCAS :: traceBegin();

-		if (!is_object($PHPCAS_CLIENT)) {

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

-		}

-

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

-		$auth = $PHPCAS_CLIENT->isAuthenticated();

-

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

-		$dbg = phpCAS :: backtrace();

-		$PHPCAS_AUTH_CHECK_CALL = array (

-			'done' => TRUE,

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

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

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

-			'result' => $auth

-		);

-		phpCAS :: traceEnd($auth);

-		return $auth;

-	}

-

-	/**

-	 * Checks whether authenticated based on $_SESSION. Useful to avoid

-	 * server calls.

-	 * @return true if authenticated, false otherwise.

-	 * @since 0.4.22 by Brendan Arnold

-	 */

-	function isSessionAuthenticated() {

-		global $PHPCAS_CLIENT;

-		if (!is_object($PHPCAS_CLIENT)) {

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

-		}

-		return ($PHPCAS_CLIENT->isSessionAuthenticated());

-	}

-

-	/**

-	 * This method returns the CAS user's login name.

-	 * @warning should not be called only after phpCAS::forceAuthentication()

-	 * or phpCAS::checkAuthentication().

-	 *

-	 * @return the login name of the authenticated user

-	 */

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

-		}

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

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

-		}

-		return $PHPCAS_CLIENT->getUser();

-	}

-

-	/**

-	 * This method returns the CAS user's login name.

-	 * @warning should not be called only after phpCAS::forceAuthentication()

-	 * or phpCAS::checkAuthentication().

-	 *

-	 * @return the login name of the authenticated user

-	 */

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

-		}

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

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

-		}

-		return $PHPCAS_CLIENT->getAttributes();

-	}

-	/**

-	 * Handle logout requests.

-	 */

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

-		}

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

-	}

-

-	/**

-	 * This method returns the URL to be used to login.

-	 * or phpCAS::isAuthenticated().

-	 *

-	 * @return the login name of the authenticated user

-	 */

-	function getServerLoginURL() {

-		global $PHPCAS_CLIENT;

-		if (!is_object($PHPCAS_CLIENT)) {

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

-		}

-		return $PHPCAS_CLIENT->getServerLoginURL();

-	}

-

-	/**

-	 * Set the login URL of the CAS server.

-	 * @param $url the login URL

-	 * @since 0.4.21 by Wyman Chan

-	 */

-	function setServerLoginURL($url = '') {

-		global $PHPCAS_CLIENT;

-		phpCAS :: traceBegin();

-		if (!is_object($PHPCAS_CLIENT)) {

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

+    // ########################################################################

+    //  INITIALIZATION

+    // ########################################################################

+

+    /**

+     * @addtogroup publicInit

+     * @{

+     */

+

+    /**

+     * phpCAS client initializer.

+     * @note Only one of the phpCAS::client() and phpCAS::proxy functions should be

+     * called, only once, and before all other methods (except phpCAS::getVersion()

+     * and phpCAS::setDebug()).

+     *

+     * @param $server_version the version of the CAS server

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

+     * @param $start_session Have phpCAS start PHP sessions (default true)

+     *

+     * @return a newly created CASClient object

+     */

+    function client($server_version, $server_hostname, $server_port, $server_uri, $start_session = true) {

+        global $PHPCAS_CLIENT, $PHPCAS_INIT_CALL;

+

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

+        }

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

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

+        }

+        if (gettype($server_hostname) != 'string') {

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

+        }

+        if (gettype($server_port) != 'integer') {

+            phpCAS :: error('type mismatched for parameter $server_port (should be `integer\')');

+        }

+        if (gettype($server_uri) != 'string') {

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

+        }

+

+        // store where the initializer is called from

+        $dbg = phpCAS :: backtrace();

+        $PHPCAS_INIT_CALL = array (

+            'done' => TRUE,

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

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

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

+        );

+

+        // initialize the global object $PHPCAS_CLIENT

+        $PHPCAS_CLIENT = new CASClient($server_version, FALSE /*proxy*/

+        , $server_hostname, $server_port, $server_uri, $start_session);

+        phpCAS :: traceEnd();

+    }

+

+    /**

+     * phpCAS proxy initializer.

+     * @note Only one of the phpCAS::client() and phpCAS::proxy functions should be

+     * called, only once, and before all other methods (except phpCAS::getVersion()

+     * and phpCAS::setDebug()).

+     *

+     * @param $server_version the version of the CAS server

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

+     * @param $start_session Have phpCAS start PHP sessions (default true)

+     *

+     * @return a newly created CASClient object

+     */

+    function proxy($server_version, $server_hostname, $server_port, $server_uri, $start_session = true) {

+        global $PHPCAS_CLIENT, $PHPCAS_INIT_CALL;

+

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

+        }

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

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

+        }

+        if (gettype($server_hostname) != 'string') {

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

+        }

+        if (gettype($server_port) != 'integer') {

+            phpCAS :: error('type mismatched for parameter $server_port (should be `integer\')');

+        }

+        if (gettype($server_uri) != 'string') {

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

+        }

+

+        // store where the initialzer is called from

+        $dbg = phpCAS :: backtrace();

+        $PHPCAS_INIT_CALL = array (

+            'done' => TRUE,

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

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

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

+        );

+

+        // initialize the global object $PHPCAS_CLIENT

+        $PHPCAS_CLIENT = new CASClient($server_version, TRUE /*proxy*/

+        , $server_hostname, $server_port, $server_uri, $start_session);

+        phpCAS :: traceEnd();

+    }

+

+    /** @} */

+    // ########################################################################

+    //  DEBUGGING

+    // ########################################################################

+

+    /**

+     * @addtogroup publicDebug

+     * @{

+     */

+

+    /**

+     * Set/unset debug mode

+     *

+     * @param $filename the name of the file used for logging, or FALSE to stop debugging.

+     */

+    function setDebug($filename = '') {

+        global $PHPCAS_DEBUG;

+

+        if ($filename != FALSE && gettype($filename) != 'string') {

+            phpCAS :: error('type mismatched for parameter $dbg (should be FALSE or the name of the log file)');

+        }

+

+        if (empty ($filename)) {

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

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

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

+                } else

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

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

+                    } else {

+                        $debugDir = '';

+                    }

+            } else {

+                $debugDir = DEFAULT_DEBUG_DIR;

+            }

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

+        }

+

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

+            $PHPCAS_DEBUG['unique_id'] = substr(strtoupper(md5(uniqid(''))), 0, 4);

+        }

+

+        $PHPCAS_DEBUG['filename'] = $filename;

+

+        phpCAS :: trace('START ******************');

+    }

+

+    /** @} */

+    /**

+     * @addtogroup internalDebug

+     * @{

+     */

+

+    /**

+     * This method is a wrapper for debug_backtrace() that is not available 

+     * in all PHP versions (>= 4.3.0 only)

+     */

+    function backtrace() {

+        if (function_exists('debug_backtrace')) {

+            return debug_backtrace();

+        } else {

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

+            return array ();

+        }

+    }

+

+    /**

+     * Logs a string in debug mode.

+     *

+     * @param $str the string to write

+     *

+     * @private

+     */

+    function log($str) {

+        $indent_str = ".";

+        global $PHPCAS_DEBUG;

+

+        if ($PHPCAS_DEBUG['filename']) {

+            for ($i = 0; $i < $PHPCAS_DEBUG['indent']; $i++) {

+                $indent_str .= '|    ';

+            }

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

+        }

+

+    }

+

+    /**

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

+     *

+     * @private

+     */

+    function error($msg) {

+        $dbg = phpCAS :: backtrace();

+        $function = '?';

+        $file = '?';

+        $line = '?';

+        if (is_array($dbg)) {

+            for ($i = 1; $i < sizeof($dbg); $i++) {

+                if (is_array($dbg[$i])) {

+                    if ($dbg[$i]['class'] == __CLASS__) {

+                        $function = $dbg[$i]['function'];

+                        $file = $dbg[$i]['file'];

+                        $line = $dbg[$i]['line'];

+                    }

+                }

+            }

+        }

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

+    }

+

+    /**

+     * This method is used to log something in debug mode.

+     */

+    function trace($str) {

+        $dbg = phpCAS :: backtrace();

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

+    }

+

+    /**

+     * This method is used to indicate the start of the execution of a function in debug mode.

+     */

+    function traceBegin() {

+        global $PHPCAS_DEBUG;

+

+        $dbg = phpCAS :: backtrace();

+        $str = '=> ';

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

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

+        }

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

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

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

+                if ($index != 0) {

+                    $str .= ', ';

+                }

+                $str .= str_replace("\n", "", var_export($arg, TRUE));

+            }

+        }

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

+        phpCAS :: log($str);

+        $PHPCAS_DEBUG['indent']++;

+    }

+

+    /**

+     * This method is used to indicate the end of the execution of a function in debug mode.

+     *

+     * @param $res the result of the function

+     */

+    function traceEnd($res = '') {

+        global $PHPCAS_DEBUG;

+

+        $PHPCAS_DEBUG['indent']--;

+        $dbg = phpCAS :: backtrace();

+        $str = '';

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

+        phpCAS :: log($str);

+    }

+

+    /**

+     * This method is used to indicate the end of the execution of the program

+     */

+    function traceExit() {

+        global $PHPCAS_DEBUG;

+

+        phpCAS :: log('exit()');

+        while ($PHPCAS_DEBUG['indent'] > 0) {

+            phpCAS :: log('-');

+            $PHPCAS_DEBUG['indent']--;

+        }

+    }

+

+    /** @} */

+    // ########################################################################

+    //  INTERNATIONALIZATION

+    // ########################################################################

+    /**

+     * @addtogroup publicLang

+     * @{

+     */

+

+    /**

+     * This method is used to set the language used by phpCAS. 

+     * @note Can be called only once.

+     *

+     * @param $lang a string representing the language.

+     *

+     * @sa PHPCAS_LANG_FRENCH, PHPCAS_LANG_ENGLISH

+     */

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

+        }

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

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

+        }

+        $PHPCAS_CLIENT->setLang($lang);

+    }

+

+    /** @} */

+    // ########################################################################

+    //  VERSION

+    // ########################################################################

+    /**

+     * @addtogroup public

+     * @{

+     */

+

+    /**

+     * This method returns the phpCAS version.

+     *

+     * @return the phpCAS version.

+     */

+    function getVersion() {

+        return PHPCAS_VERSION;

+    }

+

+    /** @} */

+    // ########################################################################

+    //  HTML OUTPUT

+    // ########################################################################

+    /**

+     * @addtogroup publicOutput

+     * @{

+     */

+

+    /**

+     * This method sets the HTML header used for all outputs.

+     *

+     * @param $header the HTML header.

+     */

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

+        }

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

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

+        }

+        $PHPCAS_CLIENT->setHTMLHeader($header);

+    }

+

+    /**

+     * This method sets the HTML footer used for all outputs.

+     *

+     * @param $footer the HTML footer.

+     */

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

+        }

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

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

+        }

+        $PHPCAS_CLIENT->setHTMLFooter($footer);

+    }

+

+    /** @} */

+    // ########################################################################

+    //  PGT STORAGE

+    // ########################################################################

+    /**

+     * @addtogroup publicPGTStorage

+     * @{

+     */

+

+    /**

+     * This method is used to tell phpCAS to store the response of the

+     * CAS server to PGT requests onto the filesystem. 

+     *

+     * @param $format the format used to store the PGT's (`plain' and `xml' allowed)

+     * @param $path the path where the PGT's should be stored

+     */

+    function setPGTStorageFile($format = '', $path = '') {

+        global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL;

+

+        phpCAS :: traceBegin();

+        if (!is_object($PHPCAS_CLIENT)) {

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

+        }

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

+        }

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

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

+        }

+        if (gettype($path) != 'string') {

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

+        }

+        $PHPCAS_CLIENT->setPGTStorageFile($format, $path);

+        phpCAS :: traceEnd();

+    }

+

+    /**

+     * This method is used to tell phpCAS to store the response of the

+     * CAS server to PGT requests into a database. 

+     * @note The connection to the database is done only when needed. 

+     * As a consequence, bad parameters are detected only when 

+     * initializing PGT storage, except in debug mode.

+     *

+     * @param $user the user to access the data with

+     * @param $password the user's password

+     * @param $database_type the type of the database hosting the data

+     * @param $hostname the server hosting the database

+     * @param $port the port the server is listening on

+     * @param $database the name of the database

+     * @param $table the name of the table storing the data

+     */

+    function setPGTStorageDB($user, $password, $database_type = '', $hostname = '', $port = 0, $database = '', $table = '') {

+        global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL;

+

+        phpCAS :: traceBegin();

+        if (!is_object($PHPCAS_CLIENT)) {

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

+        }

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

+        }

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

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

+        }

+        if (gettype($password) != 'string') {

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

+        }

+        if (gettype($database_type) != 'string') {

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

+        }

+        if (gettype($hostname) != 'string') {

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

+        }

+        if (gettype($port) != 'integer') {

+            phpCAS :: error('type mismatched for parameter $port (should be `integer\')');

+        }

+        if (gettype($database) != 'string') {

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

+        }

+        if (gettype($table) != 'string') {

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

+        }

+        $PHPCAS_CLIENT->setPGTStorageDB($user, $password, $database_type, $hostname, $port, $database, $table);

+        phpCAS :: traceEnd();

+    }

+

+    /** @} */

+    // ########################################################################

+    // ACCESS TO EXTERNAL SERVICES

+    // ########################################################################

+    /**

+     * @addtogroup publicServices

+     * @{

+     */

+

+    /**

+     * This method is used to access an HTTP[S] service.

+     * 

+     * @param $url the service to access.

+     * @param $err_code an error code Possible values are PHPCAS_SERVICE_OK (on

+     * success), PHPCAS_SERVICE_PT_NO_SERVER_RESPONSE, PHPCAS_SERVICE_PT_BAD_SERVER_RESPONSE,

+     * PHPCAS_SERVICE_PT_FAILURE, PHPCAS_SERVICE_NOT AVAILABLE.

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

+     * gives the reason why it failed and $output contains an error message).

+     */

+    function serviceWeb($url, & $err_code, & $output) {

+        global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL;

+

+        phpCAS :: traceBegin();

+        if (!is_object($PHPCAS_CLIENT)) {

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

+        }

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

+        }

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

+        }

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

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

+        }

+

+        $res = $PHPCAS_CLIENT->serviceWeb($url, $err_code, $output);

+

+        phpCAS :: traceEnd($res);

+        return $res;

+    }

+

+    /**

+     * This method is used to access an IMAP/POP3/NNTP service.

+     * 

+     * @param $url a string giving the URL of the service, including the mailing box

+     * for IMAP URLs, as accepted by imap_open().

+     * @param $service a string giving for CAS retrieve Proxy ticket

+     * @param $flags options given to imap_open().

+     * @param $err_code an error code Possible values are PHPCAS_SERVICE_OK (on

+     * success), PHPCAS_SERVICE_PT_NO_SERVER_RESPONSE, PHPCAS_SERVICE_PT_BAD_SERVER_RESPONSE,

+     * PHPCAS_SERVICE_PT_FAILURE, PHPCAS_SERVICE_NOT AVAILABLE.

+     * @param $err_msg an error message on failure

+     * @param $pt the Proxy Ticket (PT) retrieved from the CAS server to access the URL

+     * on success, FALSE on error).

+     *

+     * @return an IMAP stream on success, FALSE otherwise (in this later case, $err_code

+     * gives the reason why it failed and $err_msg contains an error message).

+     */

+    function serviceMail($url, $service, $flags, & $err_code, & $err_msg, & $pt) {

+        global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL;

+

+        phpCAS :: traceBegin();

+        if (!is_object($PHPCAS_CLIENT)) {

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

+        }

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

+        }

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

+        }

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

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

+        }

+

+        if (gettype($flags) != 'integer') {

+            phpCAS :: error('type mismatched for parameter $flags (should be `integer\')');

+        }

+

+        $res = $PHPCAS_CLIENT->serviceMail($url, $service, $flags, $err_code, $err_msg, $pt);

+

+        phpCAS :: traceEnd($res);

+        return $res;

+    }

+

+    /** @} */

+    // ########################################################################

+    //  AUTHENTICATION

+    // ########################################################################

+    /**

+     * @addtogroup publicAuth

+     * @{

+     */

+

+    /**

+     * Set the times authentication will be cached before really accessing the CAS server in gateway mode: 

+     * - -1: check only once, and then never again (until you pree login)

+     * - 0: always check

+     * - n: check every "n" time

+     *

+     * @param $n an integer.

+     */

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

+        }

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

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

+        }

+        $PHPCAS_CLIENT->setCacheTimesForAuthRecheck($n);

+    }

+

+    /**

+     * This method is called to check if the user is authenticated (use the gateway feature).

+     * @return TRUE when the user is authenticated; otherwise FALSE.

+     */

+    function checkAuthentication() {

+        global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL;

+

+        phpCAS :: traceBegin();

+        if (!is_object($PHPCAS_CLIENT)) {

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

+            'done' => TRUE,

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

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

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

+            'result' => $auth

+        );

+        phpCAS :: traceEnd($auth);

+        return $auth;

+    }

+

+    /**

+     * This method is called to force authentication if the user was not already 

+     * authenticated. If the user is not authenticated, halt by redirecting to 

+     * the CAS server.

+     */

+    function forceAuthentication() {

+        global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL;

+

+        phpCAS :: traceBegin();

+        if (!is_object($PHPCAS_CLIENT)) {

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

+            'done' => TRUE,

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

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

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

+            'result' => $auth

+        );

+

+        if (!$auth) {

+            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 :: traceEnd();

+        return $auth;

+    }

+

+    /**

+     * This method is called to renew the authentication.

+     **/

+    function renewAuthentication() {

+        global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL;

+

+        phpCAS :: traceBegin();

+        if (!is_object($PHPCAS_CLIENT)) {

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

+            'done' => TRUE,

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

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

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

+            'result' => $auth

+        );

+

+        $PHPCAS_CLIENT->renewAuthentication();

+        phpCAS :: traceEnd();

+    }

+

+    /**

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

+    }

+

+    /**

+     * 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.

+     */

+    function isAuthenticated() {

+        global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL;

+

+        phpCAS :: traceBegin();

+        if (!is_object($PHPCAS_CLIENT)) {

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

+        }

+

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

+        $auth = $PHPCAS_CLIENT->isAuthenticated();

+

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

+        $dbg = phpCAS :: backtrace();

+        $PHPCAS_AUTH_CHECK_CALL = array (

+            'done' => TRUE,

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

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

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

+            'result' => $auth

+        );

+        phpCAS :: traceEnd($auth);

+        return $auth;

+    }

+

+    /**

+     * Checks whether authenticated based on $_SESSION. Useful to avoid

+     * server calls.

+     * @return true if authenticated, false otherwise.

+     * @since 0.4.22 by Brendan Arnold

+     */

+    function isSessionAuthenticated() {

+        global $PHPCAS_CLIENT;

+        if (!is_object($PHPCAS_CLIENT)) {

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

+        }

+        return ($PHPCAS_CLIENT->isSessionAuthenticated());

+    }

+

+    /**

+     * This method returns the CAS user's login name.

+     * @warning should not be called only after phpCAS::forceAuthentication()

+     * or phpCAS::checkAuthentication().

+     *

+     * @return the login name of the authenticated user

+     */

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

+        }

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

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

+        }

+        return $PHPCAS_CLIENT->getUser();

+    }

+

+    /**

+     * This method returns the CAS user's login name.

+     * @warning should not be called only after phpCAS::forceAuthentication()

+     * or phpCAS::checkAuthentication().

+     *

+     * @return the login name of the authenticated user

+     */

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

+        }

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

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

+        }

+        return $PHPCAS_CLIENT->getAttributes();

+    }

+    /**

+     * Handle logout requests.

+     */

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

+        }

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

+    }

+

+    /**

+     * This method returns the URL to be used to login.

+     * or phpCAS::isAuthenticated().

+     *

+     * @return the login name of the authenticated user

+     */

+    function getServerLoginURL() {

+        global $PHPCAS_CLIENT;

+        if (!is_object($PHPCAS_CLIENT)) {

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

+        }

+        return $PHPCAS_CLIENT->getServerLoginURL();

+    }

+

+    /**

+     * Set the login URL of the CAS server.

+     * @param $url the login URL

+     * @since 0.4.21 by Wyman Chan

+     */

+    function setServerLoginURL($url = '') {

+        global $PHPCAS_CLIENT;

+        phpCAS :: traceBegin();

+        if (!is_object($PHPCAS_CLIENT)) {

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

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

-		}

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

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

+        }

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

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

 						`string\')');

-		}

-		$PHPCAS_CLIENT->setServerLoginURL($url);

-		phpCAS :: traceEnd();

-	}

-

-	/**

-	 * Set the serviceValidate URL of the CAS server.

-	 * Used only in CAS 1.0 validations

-	 * @param $url the serviceValidate URL

-	 * @since 1.1.0 by Joachim Fritschi

-	 */

-	function setServerServiceValidateURL($url = '') {

-		global $PHPCAS_CLIENT;

-		phpCAS :: traceBegin();

-		if (!is_object($PHPCAS_CLIENT)) {

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

+        }

+        $PHPCAS_CLIENT->setServerLoginURL($url);

+        phpCAS :: traceEnd();

+    }

+

+    /**

+     * Set the serviceValidate URL of the CAS server.

+     * Used only in CAS 1.0 validations

+     * @param $url the serviceValidate URL

+     * @since 1.1.0 by Joachim Fritschi

+     */

+    function setServerServiceValidateURL($url = '') {

+        global $PHPCAS_CLIENT;

+        phpCAS :: traceBegin();

+        if (!is_object($PHPCAS_CLIENT)) {

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

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

-		}

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

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

+        }

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

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

 						`string\')');

-		}

-		$PHPCAS_CLIENT->setServerServiceValidateURL($url);

-		phpCAS :: traceEnd();

-	}

-

-	/**

-	 * Set the proxyValidate URL of the CAS server.

-	 * Used for all CAS 2.0 validations

-	 * @param $url the proxyValidate URL

-	 * @since 1.1.0 by Joachim Fritschi

-	 */

-	function setServerProxyValidateURL($url = '') {

-		global $PHPCAS_CLIENT;

-		phpCAS :: traceBegin();

-		if (!is_object($PHPCAS_CLIENT)) {

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

+        }

+        $PHPCAS_CLIENT->setServerServiceValidateURL($url);

+        phpCAS :: traceEnd();

+    }

+

+    /**

+     * Set the proxyValidate URL of the CAS server.

+     * Used for all CAS 2.0 validations

+     * @param $url the proxyValidate URL

+     * @since 1.1.0 by Joachim Fritschi

+     */

+    function setServerProxyValidateURL($url = '') {

+        global $PHPCAS_CLIENT;

+        phpCAS :: traceBegin();

+        if (!is_object($PHPCAS_CLIENT)) {

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

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

-		}

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

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

+        }

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

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

 						`string\')');

-		}

-		$PHPCAS_CLIENT->setServerProxyValidateURL($url);

-		phpCAS :: traceEnd();

-	}

-

-	/**

-	 * Set the samlValidate URL of the CAS server.

-	 * @param $url the samlValidate URL

-	 * @since 1.1.0 by Joachim Fritschi

-	 */

-	function setServerSamlValidateURL($url = '') {

-		global $PHPCAS_CLIENT;

-		phpCAS :: traceBegin();

-		if (!is_object($PHPCAS_CLIENT)) {

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

+        }

+        $PHPCAS_CLIENT->setServerProxyValidateURL($url);

+        phpCAS :: traceEnd();

+    }

+

+    /**

+     * Set the samlValidate URL of the CAS server.

+     * @param $url the samlValidate URL

+     * @since 1.1.0 by Joachim Fritschi

+     */

+    function setServerSamlValidateURL($url = '') {

+        global $PHPCAS_CLIENT;

+        phpCAS :: traceBegin();

+        if (!is_object($PHPCAS_CLIENT)) {

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

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

-		}

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

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

+        }

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

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

 						`string\')');

-		}

-		$PHPCAS_CLIENT->setServerSamlValidateURL($url);

-		phpCAS :: traceEnd();

-	}

-

-	/**

-	 * This method returns the URL to be used to login.

-	 * or phpCAS::isAuthenticated().

-	 *

-	 * @return the login name of the authenticated user

-	 */

-	function getServerLogoutURL() {

-		global $PHPCAS_CLIENT;

-		if (!is_object($PHPCAS_CLIENT)) {

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

-		}

-		return $PHPCAS_CLIENT->getServerLogoutURL();

-	}

-

-	/**

-	 * Set the logout URL of the CAS server.

-	 * @param $url the logout URL

-	 * @since 0.4.21 by Wyman Chan

-	 */

-	function setServerLogoutURL($url = '') {

-		global $PHPCAS_CLIENT;

-		phpCAS :: traceBegin();

-		if (!is_object($PHPCAS_CLIENT)) {

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

+        }

+        $PHPCAS_CLIENT->setServerSamlValidateURL($url);

+        phpCAS :: traceEnd();

+    }

+

+    /**

+     * This method returns the URL to be used to login.

+     * or phpCAS::isAuthenticated().

+     *

+     * @return the login name of the authenticated user

+     */

+    function getServerLogoutURL() {

+        global $PHPCAS_CLIENT;

+        if (!is_object($PHPCAS_CLIENT)) {

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

+        }

+        return $PHPCAS_CLIENT->getServerLogoutURL();

+    }

+

+    /**

+     * Set the logout URL of the CAS server.

+     * @param $url the logout URL

+     * @since 0.4.21 by Wyman Chan

+     */

+    function setServerLogoutURL($url = '') {

+        global $PHPCAS_CLIENT;

+        phpCAS :: traceBegin();

+        if (!is_object($PHPCAS_CLIENT)) {

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

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

-		}

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

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

+        }

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

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

 						`string\')');

-		}

-		$PHPCAS_CLIENT->setServerLogoutURL($url);

-		phpCAS :: traceEnd();

-	}

-

-	/**

-	 * This method is used to logout from CAS.

-	 * @params $params an array that contains the optional url and service parameters that will be passed to the CAS server

-	 * @public

-	 */

-	function logout($params = "") {

-		global $PHPCAS_CLIENT;

-		phpCAS :: traceBegin();

-		if (!is_object($PHPCAS_CLIENT)) {

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

-		}

-		$parsedParams = array ();

-		if ($params != "") {

-			if (is_string($params)) {

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

-			}

-			if (!is_array($params)) {

-				phpCAS :: error('type mismatched for parameter $params (should be `array\')');

-			}

-			foreach ($params as $key => $value) {

-				if ($key != "service" && $key != "url") {

-					phpCAS :: error('only `url\' and `service\' parameters are allowed for method `phpCAS::logout($params)\'');

-				}

-				$parsedParams[$key] = $value;

-			}

-		}

-		$PHPCAS_CLIENT->logout($parsedParams);

-		// never reached

-		phpCAS :: traceEnd();

-	}

-

-	/**

-	 * This method is used to logout from CAS. Halts by redirecting to the CAS server.

-	 * @param $service a URL that will be transmitted to the CAS server

-	 */

-	function logoutWithRedirectService($service) {

-		global $PHPCAS_CLIENT;

-		phpCAS :: traceBegin();

-		if (!is_object($PHPCAS_CLIENT)) {

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

-			"service" => $service

-		));

-		// never reached

-		phpCAS :: traceEnd();

-	}

-

-	/**

-	 * This method is used to logout from CAS. Halts by redirecting to the CAS server.

-	 * @param $url a URL that will be transmitted to the CAS server

-	 */

-	function logoutWithUrl($url) {

-		global $PHPCAS_CLIENT;

-		phpCAS :: traceBegin();

-		if (!is_object($PHPCAS_CLIENT)) {

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

-			"url" => $url

-		));

-		// never reached

-		phpCAS :: traceEnd();

-	}

-

-	/**

-	 * This method is used to logout from CAS. Halts by redirecting to the CAS server.

-	 * @param $service a URL that will be transmitted to the CAS server

-	 * @param $url a URL that will be transmitted to the CAS server

-	 */

-	function logoutWithRedirectServiceAndUrl($service, $url) {

-		global $PHPCAS_CLIENT;

-		phpCAS :: traceBegin();

-		if (!is_object($PHPCAS_CLIENT)) {

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

-		}

-		if (!is_string($url)) {

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

-		}

-		$PHPCAS_CLIENT->logout(array (

-			"service" => $service,

-			"url" => $url

-		));

-		// never reached

-		phpCAS :: traceEnd();

-	}

-

-	/**

-	 * Set the fixed URL that will be used by the CAS server to transmit the PGT.

-	 * When this method is not called, a phpCAS script uses its own URL for the callback.

-	 *

-	 * @param $url the URL

-	 */

-	function setFixedCallbackURL($url = '') {

-		global $PHPCAS_CLIENT;

-		phpCAS :: traceBegin();

-		if (!is_object($PHPCAS_CLIENT)) {

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

-		}

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

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

-		}

-		$PHPCAS_CLIENT->setCallbackURL($url);

-		phpCAS :: traceEnd();

-	}

-

-	/**

-	 * Set the fixed URL that will be set as the CAS service parameter. When this

-	 * method is not called, a phpCAS script uses its own URL.

-	 *

-	 * @param $url the URL

-	 */

-	function setFixedServiceURL($url) {

-		global $PHPCAS_CLIENT;

-		phpCAS :: traceBegin();

-		if (!is_object($PHPCAS_CLIENT)) {

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

-		}

-		$PHPCAS_CLIENT->setURL($url);

-		phpCAS :: traceEnd();

-	}

-

-	/**

-	 * Get the URL that is set as the CAS service parameter.

-	 */

-	function getServiceURL() {

-		global $PHPCAS_CLIENT;

-		if (!is_object($PHPCAS_CLIENT)) {

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

-		}

-		return ($PHPCAS_CLIENT->getURL());

-	}

-

-	/**

-	 * Retrieve a Proxy Ticket from the CAS server.

-	 */

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

-		}

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

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

-		}

-		return ($PHPCAS_CLIENT->retrievePT($target_service, $err_code, $err_msg));

-	}

-

-	/**

-	 * Set the certificate of the CAS server.

-	 *

-	 * @param $cert the PEM certificate

-	 */

-	function setCasServerCert($cert) {

-		global $PHPCAS_CLIENT;

-		phpCAS :: traceBegin();

-		if (!is_object($PHPCAS_CLIENT)) {

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

-		}

-		$PHPCAS_CLIENT->setCasServerCert($cert);

-		phpCAS :: traceEnd();

-	}

-

-	/**

-	 * Set the certificate of the CAS server CA.

-	 *

-	 * @param $cert the CA certificate

-	 */

-	function setCasServerCACert($cert) {

-		global $PHPCAS_CLIENT;

-		phpCAS :: traceBegin();

-		if (!is_object($PHPCAS_CLIENT)) {

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

-		}

-		$PHPCAS_CLIENT->setCasServerCACert($cert);

-		phpCAS :: traceEnd();

-	}

-

-	/**

-	 * Set no SSL validation for the CAS server.

-	 */

-	function setNoCasServerValidation() {

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

-		phpCAS :: traceEnd();

-	}

-

-	/** @} */

-

-	/**

-	 * Change CURL options.

-	 * CURL is used to connect through HTTPS to CAS server

-	 * @param $key the option key

-	 * @param $value the value to set

-	 */

-	function setExtraCurlOption($key, $value) {

-		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_CLIENT->setExtraCurlOption($key, $value);

-		phpCAS :: traceEnd();

-	}

+        }

+        $PHPCAS_CLIENT->setServerLogoutURL($url);

+        phpCAS :: traceEnd();

+    }

+

+    /**

+     * This method is used to logout from CAS.

+     * @params $params an array that contains the optional url and service parameters that will be passed to the CAS server

+     * @public

+     */

+    function logout($params = "") {

+        global $PHPCAS_CLIENT;

+        phpCAS :: traceBegin();

+        if (!is_object($PHPCAS_CLIENT)) {

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

+        }

+        $parsedParams = array ();

+        if ($params != "") {

+            if (is_string($params)) {

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

+            }

+            if (!is_array($params)) {

+                phpCAS :: error('type mismatched for parameter $params (should be `array\')');

+            }

+            foreach ($params as $key => $value) {

+                if ($key != "service" && $key != "url") {

+                    phpCAS :: error('only `url\' and `service\' parameters are allowed for method `phpCAS::logout($params)\'');

+                }

+                $parsedParams[$key] = $value;

+            }

+        }

+        $PHPCAS_CLIENT->logout($parsedParams);

+        // never reached

+        phpCAS :: traceEnd();

+    }

+

+    /**

+     * This method is used to logout from CAS. Halts by redirecting to the CAS server.

+     * @param $service a URL that will be transmitted to the CAS server

+     */

+    function logoutWithRedirectService($service) {

+        global $PHPCAS_CLIENT;

+        phpCAS :: traceBegin();

+        if (!is_object($PHPCAS_CLIENT)) {

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

+            "service" => $service

+        ));

+        // never reached

+        phpCAS :: traceEnd();

+    }

+

+    /**

+     * This method is used to logout from CAS. Halts by redirecting to the CAS server.

+     * @param $url a URL that will be transmitted to the CAS server

+     */

+    function logoutWithUrl($url) {

+        global $PHPCAS_CLIENT;

+        phpCAS :: traceBegin();

+        if (!is_object($PHPCAS_CLIENT)) {

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

+            "url" => $url

+        ));

+        // never reached

+        phpCAS :: traceEnd();

+    }

+

+    /**

+     * This method is used to logout from CAS. Halts by redirecting to the CAS server.

+     * @param $service a URL that will be transmitted to the CAS server

+     * @param $url a URL that will be transmitted to the CAS server

+     */

+    function logoutWithRedirectServiceAndUrl($service, $url) {

+        global $PHPCAS_CLIENT;

+        phpCAS :: traceBegin();

+        if (!is_object($PHPCAS_CLIENT)) {

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

+        }

+        if (!is_string($url)) {

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

+        }

+        $PHPCAS_CLIENT->logout(array (

+            "service" => $service,

+            "url" => $url

+        ));

+        // never reached

+        phpCAS :: traceEnd();

+    }

+

+    /**

+     * Set the fixed URL that will be used by the CAS server to transmit the PGT.

+     * When this method is not called, a phpCAS script uses its own URL for the callback.

+     *

+     * @param $url the URL

+     */

+    function setFixedCallbackURL($url = '') {

+        global $PHPCAS_CLIENT;

+        phpCAS :: traceBegin();

+        if (!is_object($PHPCAS_CLIENT)) {

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

+        }

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

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

+        }

+        $PHPCAS_CLIENT->setCallbackURL($url);

+        phpCAS :: traceEnd();

+    }

+

+    /**

+     * Set the fixed URL that will be set as the CAS service parameter. When this

+     * method is not called, a phpCAS script uses its own URL.

+     *

+     * @param $url the URL

+     */

+    function setFixedServiceURL($url) {

+        global $PHPCAS_CLIENT;

+        phpCAS :: traceBegin();

+        if (!is_object($PHPCAS_CLIENT)) {

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

+        }

+        $PHPCAS_CLIENT->setURL($url);

+        phpCAS :: traceEnd();

+    }

+

+    /**

+     * Get the URL that is set as the CAS service parameter.

+     */

+    function getServiceURL() {

+        global $PHPCAS_CLIENT;

+        if (!is_object($PHPCAS_CLIENT)) {

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

+        }

+        return ($PHPCAS_CLIENT->getURL());

+    }

+

+    /**

+     * Retrieve a Proxy Ticket from the CAS server.

+     */

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

+        }

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

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

+        }

+        return ($PHPCAS_CLIENT->retrievePT($target_service, $err_code, $err_msg));

+    }

+

+    /**

+     * Set the certificate of the CAS server.

+     *

+     * @param $cert the PEM certificate

+     */

+    function setCasServerCert($cert) {

+        global $PHPCAS_CLIENT;

+        phpCAS :: traceBegin();

+        if (!is_object($PHPCAS_CLIENT)) {

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

+        }

+        $PHPCAS_CLIENT->setCasServerCert($cert);

+        phpCAS :: traceEnd();

+    }

+

+    /**

+     * Set the certificate of the CAS server CA.

+     *

+     * @param $cert the CA certificate

+     */

+    function setCasServerCACert($cert) {

+        global $PHPCAS_CLIENT;

+        phpCAS :: traceBegin();

+        if (!is_object($PHPCAS_CLIENT)) {

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

+        }

+        $PHPCAS_CLIENT->setCasServerCACert($cert);

+        phpCAS :: traceEnd();

+    }

+

+    /**

+     * Set no SSL validation for the CAS server.

+     */

+    function setNoCasServerValidation() {

+        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_CLIENT->setNoCasServerValidation();

+        phpCAS :: traceEnd();

+    }

+

+    /** @} */

+

+    /**

+     * Change CURL options.

+     * CURL is used to connect through HTTPS to CAS server

+     * @param $key the option key

+     * @param $value the value to set

+     */

+    function setExtraCurlOption($key, $value) {

+        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_CLIENT->setExtraCurlOption($key, $value);

+        phpCAS :: traceEnd();

+    }

 

 }

 

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