chamilo / chamilo-lms

app/Migrations/AbstractMigrationChamilo.php

Doc Comments +1 added lines, -1 removed lines

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

main/admin/settings.lib.php

Doc Comments +3 added lines, -3 removed lines

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

Spacing +115 added lines, -115 removed lines

@@ -11,7 +11,7 @@ 
  * @package chamilo.admin
  */
 
-define('CSS_UPLOAD_PATH', api_get_path(SYS_APP_PATH) . 'Resources/public/css/themes/');
+define('CSS_UPLOAD_PATH', api_get_path(SYS_APP_PATH).'Resources/public/css/themes/');
 
 use Symfony\Component\Filesystem\Filesystem;
 
@@ -40,7 +40,7 @@ 
     $possible_plugins = $plugin_obj->read_plugins_from_path();
     $installed_plugins = $plugin_obj->get_installed_plugins();
 
-    echo '<form name="plugins" method="post" action="' . api_get_self() . '?category=' . Security::remove_XSS($_GET['category']) . '">';
+    echo '<form name="plugins" method="post" action="'.api_get_self().'?category='.Security::remove_XSS($_GET['category']).'">';
     echo '<table class="data_table">';
     echo '<tr>';
     echo '<th width="400px">';
@@ -63,7 +63,7 @@ 
     unset($plugin_region_list['course_tool_plugin']);
 
     foreach ($installed_plugins as $plugin) {
-        $plugin_info_file = api_get_path(SYS_PLUGIN_PATH) . $plugin . '/plugin.php';
+        $plugin_info_file = api_get_path(SYS_PLUGIN_PATH).$plugin.'/plugin.php';
 
         if (file_exists($plugin_info_file)) {
             $plugin_info = array();
@@ -74,8 +74,8 @@ 
                 echo '<tr>';
             }
             echo '<td>';
-            echo '<h4>' . $plugin_info['title'] . ' <small>v' . $plugin_info['version'] . '</small></h4>';
-            echo '<p>' . $plugin_info['comment'] . '</p>';
+            echo '<h4>'.$plugin_info['title'].' <small>v'.$plugin_info['version'].'</small></h4>';
+            echo '<p>'.$plugin_info['comment'].'</p>';
             echo '</td><td>';
             $selected_plugins = $plugin_obj->get_areas_by_plugin($plugin);
 
@@ -84,20 +84,20 @@ 
             } else {
                 $region_list = $plugin_region_list;
             }
-            echo Display::select('plugin_' . $plugin . '[]', $region_list, $selected_plugins,
+            echo Display::select('plugin_'.$plugin.'[]', $region_list, $selected_plugins,
                 array('multiple' => 'multiple', 'style' => 'width:500px'), true, get_lang('None'));
             echo '</td></tr>';
         }
     }
     echo '</table>';
     echo '<br />';
-    echo '<button class="btn btn-success" type="submit" name="submit_plugins">' . get_lang('EnablePlugins') . '</button></form>';
+    echo '<button class="btn btn-success" type="submit" name="submit_plugins">'.get_lang('EnablePlugins').'</button></form>';
 }
 
 function handle_extensions()
 {
     echo Display::page_subheader(get_lang('ConfigureExtensions'));
-    echo '<a class="btn btn-success" href="configure_extensions.php?display=ppt2lp" role="button">' . get_lang('Ppt2lp') . '</a>';
+    echo '<a class="btn btn-success" href="configure_extensions.php?display=ppt2lp" role="button">'.get_lang('Ppt2lp').'</a>';
 
 }
 
@@ -131,7 +131,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">';
@@ -148,7 +148,7 @@ 
     }
 
     foreach ($all_plugins as $plugin) {
-        $plugin_info_file = api_get_path(SYS_PLUGIN_PATH) . $plugin . '/plugin.php';
+        $plugin_info_file = api_get_path(SYS_PLUGIN_PATH).$plugin.'/plugin.php';
 
         if (file_exists($plugin_info_file)) {
             $plugin_info = array();
@@ -162,29 +162,29 @@ 
             echo '<td>';
             //Checkbox
             if (in_array($plugin, $installed_plugins)) {
-                echo '<input type="checkbox" name="plugin_' . $plugin . '[]" checked="checked">';
+                echo '<input type="checkbox" name="plugin_'.$plugin.'[]" checked="checked">';
 
             } else {
-                echo '<input type="checkbox" name="plugin_' . $plugin . '[]">';
+                echo '<input type="checkbox" name="plugin_'.$plugin.'[]">';
             }
             echo '</td><td>';
 
-            echo '<h4>' . $plugin_info['title'] . ' <small>v ' . $plugin_info['version'] . '</small></h4>';
-            echo '<p>' . $plugin_info['comment'] . '</p>';
-            echo '<p>' . get_lang('Author') . ': ' . $plugin_info['author'] . '</p>';
+            echo '<h4>'.$plugin_info['title'].' <small>v '.$plugin_info['version'].'</small></h4>';
+            echo '<p>'.$plugin_info['comment'].'</p>';
+            echo '<p>'.get_lang('Author').': '.$plugin_info['author'].'</p>';
 
             echo '<div class="btn-group">';
             if (in_array($plugin, $installed_plugins)) {
-                echo Display::url('<em class="fa fa-cogs"></em> ' . get_lang('Configure'),
-                    'configure_plugin.php?name=' . $plugin, array('class' => 'btn btn-default'));
-                echo Display::url('<em class="fa fa-th-large"></em> ' . get_lang('Regions'),
-                    'settings.php?category=Regions&name=' . $plugin, array('class' => 'btn btn-default'));
+                echo Display::url('<em class="fa fa-cogs"></em> '.get_lang('Configure'),
+                    'configure_plugin.php?name='.$plugin, array('class' => 'btn btn-default'));
+                echo Display::url('<em class="fa fa-th-large"></em> '.get_lang('Regions'),
+                    'settings.php?category=Regions&name='.$plugin, array('class' => 'btn btn-default'));
             }
 
-            if (file_exists(api_get_path(SYS_PLUGIN_PATH) . $plugin . '/readme.txt')) {
+            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'],
@@ -200,8 +200,8 @@ 
     echo '</table>';
 
     echo '<div class="form-actions bottom_actions">';
-    echo '<button class="btn btn-success" type="submit" name="submit_plugins">' .
-        get_lang('EnablePlugins') . '</button>';
+    echo '<button class="btn btn-success" type="submit" name="submit_plugins">'.
+        get_lang('EnablePlugins').'</button>';
     echo '</div>';
     echo '</form>';
 }
@@ -255,7 +255,7 @@ 
         'woff2'
     );
 
-    $form->addRule('new_stylesheet', get_lang('InvalidExtension') . ' (' . implode(',', $allowed_file_types) . ')',
+    $form->addRule('new_stylesheet', get_lang('InvalidExtension').' ('.implode(',', $allowed_file_types).')',
         'filetype', $allowed_file_types);
     $form->addRule('new_stylesheet', get_lang('ThisFieldIsRequired'), 'required');
     $form->addButtonUpload(get_lang('Upload'), 'stylesheet_upload');
@@ -263,7 +263,7 @@ 
     $show_upload_form = false;
 
     if (!is_writable(CSS_UPLOAD_PATH)) {
-        Display::display_error_message(CSS_UPLOAD_PATH . get_lang('IsNotWritable'));
+        Display::display_error_message(CSS_UPLOAD_PATH.get_lang('IsNotWritable'));
     } else {
         // Uploading a new stylesheet.
         if ($_configuration['access_url'] == 1) {
@@ -304,7 +304,7 @@ 
     $form_change = new FormValidator(
         'stylesheet_upload',
         'post',
-        api_get_self() . '?category=Stylesheets',
+        api_get_self().'?category=Stylesheets',
         null,
         array('id' => 'stylesheets_id')
     );
@@ -321,7 +321,7 @@ 
                 // Skip directories starting with a '.'
                 continue;
             }
-            $dirpath = CSS_UPLOAD_PATH . $style_dir;
+            $dirpath = CSS_UPLOAD_PATH.$style_dir;
 
             if (is_dir($dirpath)) {
                 if ($style_dir != '.' && $style_dir != '..') {
@@ -368,15 +368,15 @@ 
             Display::display_normal_message(get_lang('Saved'));
         }
         if (isset($_POST['download'])) {
-            $arch = api_get_path(SYS_ARCHIVE_PATH) . $safe_style_dir . '.zip';
-            $dir = api_get_path(SYS_CSS_PATH) . 'themes/' . $safe_style_dir;
+            $arch = api_get_path(SYS_ARCHIVE_PATH).$safe_style_dir.'.zip';
+            $dir = api_get_path(SYS_CSS_PATH).'themes/'.$safe_style_dir;
             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)));
                 //@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'));
@@ -393,33 +393,33 @@ 
     $logoForm->addHtml(Display::return_message(sprintf(get_lang('TheLogoMustBeSizeXAndFormatY'), '250 x 70', 'PNG'),
         'info'));
 
-    $dir = api_get_path(SYS_PUBLIC_PATH) . 'css/themes/' . $selected . '/images/';
-    $url = api_get_path(WEB_CSS_PATH) . 'themes/' . $selected . '/images/';
+    $dir = api_get_path(SYS_PUBLIC_PATH).'css/themes/'.$selected.'/images/';
+    $url = api_get_path(WEB_CSS_PATH).'themes/'.$selected.'/images/';
     $logoFileName = 'header-logo.png';
     $newLogoFileName = 'header-logo-custom.png';
 
-    if (is_file($dir . $newLogoFileName)) {
+    if (is_file($dir.$newLogoFileName)) {
         $logoForm->addLabel(get_lang('CurrentLogo'),
-            '<img id="header-logo-custom" src="' . $url . $newLogoFileName . '?' . time() . '">');
+            '<img id="header-logo-custom" src="'.$url.$newLogoFileName.'?'.time().'">');
     } else {
         $logoForm->addLabel(get_lang('CurrentLogo'),
-            '<img id="header-logo-custom" src="' . $url . $logoFileName . '?' . time() . '">');
+            '<img id="header-logo-custom" src="'.$url.$logoFileName.'?'.time().'">');
     }
 
     $logoForm->addFile('new_logo', get_lang('UpdateLogo'));
     $allowedFileTypes = ['png'];
 
     if (isset($_POST['logo_reset'])) {
-        if (is_file($dir . $newLogoFileName)) {
-            unlink($dir . $newLogoFileName);
+        if (is_file($dir.$newLogoFileName)) {
+            unlink($dir.$newLogoFileName);
             Display::display_normal_message(get_lang('ResetToTheOriginalLogo'));
             echo '<script>'
-                . '$("#header-logo").attr("src","' . $url . $logoFileName . '");'
+                . '$("#header-logo").attr("src","'.$url.$logoFileName.'");'
                 . '</script>';
         }
     } elseif (isset($_POST['logo_upload'])) {
 
-        $logoForm->addRule('new_logo', get_lang('InvalidExtension') . ' (' . implode(',', $allowedFileTypes) . ')',
+        $logoForm->addRule('new_logo', get_lang('InvalidExtension').' ('.implode(',', $allowedFileTypes).')',
             'filetype', $allowedFileTypes);
         $logoForm->addRule('new_logo', get_lang('ThisFieldIsRequired'), 'required');
 
@@ -429,22 +429,22 @@ 
             $width = $imageInfo[0];
             $height = $imageInfo[1];
             if ($width <= 250 && $height <= 70) {
-                if (is_file($dir . $newLogoFileName)) {
-                    unlink($dir . $newLogoFileName);
+                if (is_file($dir.$newLogoFileName)) {
+                    unlink($dir.$newLogoFileName);
                 }
 
-                $status = move_uploaded_file($_FILES['new_logo']['tmp_name'], $dir . $newLogoFileName);
+                $status = move_uploaded_file($_FILES['new_logo']['tmp_name'], $dir.$newLogoFileName);
 
                 if ($status) {
                     Display::display_normal_message(get_lang('NewLogoUpdated'));
                     echo '<script>'
-                        . '$("#header-logo").attr("src","' . $url . $newLogoFileName . '");'
+                        . '$("#header-logo").attr("src","'.$url.$newLogoFileName.'");'
                         . '</script>';
                 } else {
-                    Display::display_error_message('Error - ' . get_lang('UplNoFileUploaded'));
+                    Display::display_error_message('Error - '.get_lang('UplNoFileUploaded'));
                 }
             } else {
-                Display::display_error_message('Error - ' . get_lang('InvalidImageDimensions'));
+                Display::display_error_message('Error - '.get_lang('InvalidImageDimensions'));
             }
         }
     }
@@ -482,11 +482,11 @@ 
         //Little hack to update the logo image in update form when submiting
         if (isset($_POST['logo_reset'])) {
             echo '<script>'
-                . '$("#header-logo-custom").attr("src","' . $url . $logoFileName . '");'
+                . '$("#header-logo-custom").attr("src","'.$url.$logoFileName.'");'
                 . '</script>';
-        } elseif (isset($_POST['logo_upload']) && is_file($dir . $newLogoFileName)) {
+        } elseif (isset($_POST['logo_upload']) && is_file($dir.$newLogoFileName)) {
             echo '<script>'
-                . '$("#header-logo-custom").attr("src","' . $url . $newLogoFileName . '");'
+                . '$("#header-logo-custom").attr("src","'.$url.$newLogoFileName.'");'
                 . '</script>';
         }
     } else {
@@ -513,8 +513,8 @@ 
 
     // Create the folder if needed.
 
-    if (!is_dir($cssToUpload . $style_name . '/')) {
-        mkdir($cssToUpload . $style_name . '/', api_get_permissions_for_new_directories());
+    if (!is_dir($cssToUpload.$style_name.'/')) {
+        mkdir($cssToUpload.$style_name.'/', api_get_permissions_for_new_directories());
     }
 
     $info = pathinfo($picture['name']);
@@ -561,21 +561,21 @@ 
             if (!$valid) {
                 $error_string = '<ul>';
                 foreach ($invalid_files as $invalid_file) {
-                    $error_string .= '<li>' . $invalid_file . '</li>';
+                    $error_string .= '<li>'.$invalid_file.'</li>';
                 }
                 $error_string .= '</ul>';
                 Display::display_error_message(
-                    get_lang('ErrorStylesheetFilesExtensionsInsideZip') . $error_string,
+                    get_lang('ErrorStylesheetFilesExtensionsInsideZip').$error_string,
                     false
                 );
             } else {
                 // If the zip does not contain a single directory, extract it.
                 if (!$single_directory) {
                     // Extract zip file.
-                    $zip->extractTo($cssToUpload . $style_name . '/');
+                    $zip->extractTo($cssToUpload.$style_name.'/');
                     $result = true;
                 } else {
-                    $extraction_path = $cssToUpload . $style_name . '/';
+                    $extraction_path = $cssToUpload.$style_name.'/';
                     for ($i = 0; $i < $num_files; $i++) {
                         $entry = $zip->getNameIndex($i);
                         if (substr($entry, -1) == '/') {
@@ -586,14 +586,14 @@ 
                         $entry_without_first_dir = substr($entry, $pos_slash + 1);
                         // If there is still a slash, we need to make sure the directories are created.
                         if (strpos($entry_without_first_dir, '/') !== false) {
-                            if (!is_dir($extraction_path . dirname($entry_without_first_dir))) {
+                            if (!is_dir($extraction_path.dirname($entry_without_first_dir))) {
                                 // Create it.
-                                @mkdir($extraction_path . dirname($entry_without_first_dir), $mode = 0777, true);
+                                @mkdir($extraction_path.dirname($entry_without_first_dir), $mode = 0777, true);
                             }
                         }
 
                         $fp = $zip->getStream($entry);
-                        $ofp = fopen($extraction_path . dirname($entry_without_first_dir) . '/' . basename($entry),
+                        $ofp = fopen($extraction_path.dirname($entry_without_first_dir).'/'.basename($entry),
                             'w');
 
                         while (!feof($fp)) {
@@ -608,17 +608,17 @@ 
             }
             $zip->close();
         } else {
-            Display::display_error_message(get_lang('ErrorReadingZip') . $info['extension'], false);
+            Display::display_error_message(get_lang('ErrorReadingZip').$info['extension'], false);
         }
     } else {
         // Simply move the file.
-        move_uploaded_file($picture['tmp_name'], $cssToUpload . $style_name . '/' . $picture['name']);
+        move_uploaded_file($picture['tmp_name'], $cssToUpload.$style_name.'/'.$picture['name']);
         $result = true;
     }
 
     if ($result) {
         $fs = new Filesystem();
-        $fs->mirror($cssToUpload, api_get_path(SYS_PATH) . 'web/css/themes/');
+        $fs->mirror($cssToUpload, api_get_path(SYS_PATH).'web/css/themes/');
     }
 
     return $result;
@@ -647,8 +647,8 @@ 
     $plugin_list = $plugin_obj->read_plugins_from_path();
 
     foreach ($plugin_list as $plugin) {
-        if (isset($_POST['plugin_' . $plugin])) {
-            $areas_to_installed = $_POST['plugin_' . $plugin];
+        if (isset($_POST['plugin_'.$plugin])) {
+            $areas_to_installed = $_POST['plugin_'.$plugin];
             if (!empty($areas_to_installed)) {
                 $plugin_obj->remove_all_regions($plugin);
                 foreach ($areas_to_installed as $region) {
@@ -675,7 +675,7 @@ 
     $installed_plugins = array();
 
     foreach ($plugin_list as $plugin) {
-        if (isset($_POST['plugin_' . $plugin])) {
+        if (isset($_POST['plugin_'.$plugin])) {
             $appPlugin->install($plugin);
             $installed_plugins[] = $plugin;
         }
@@ -722,7 +722,7 @@ 
     $dir = CSS_UPLOAD_PATH;
     $dirs = scandir($dir);
     $style = str_replace(array('/', '\\'), array('', ''), $style); // Avoid slashes or backslashes.
-    if (in_array($style, $dirs) && is_dir($dir . $style)) {
+    if (in_array($style, $dirs) && is_dir($dir.$style)) {
         return true;
     }
     return false;
@@ -737,10 +737,10 @@ 
 {
     global $SettingsStored, $_configuration;
 
-    require_once api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php';
+    require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
     $search_enabled = api_get_setting('search_enabled');
 
-    $form = new FormValidator('search-options', 'post', api_get_self() . '?category=Search');
+    $form = new FormValidator('search-options', 'post', api_get_self().'?category=Search');
     $values = api_get_settings_options('search_enabled');
     $form->addElement('header', null, get_lang('SearchEnabledTitle'));
 
@@ -808,7 +808,7 @@ 
     echo '</div>';
 
     if ($search_enabled == 'true') {
-        $xapian_path = api_get_path(SYS_UPLOAD_PATH) . 'plugins/xapian/searchdb';
+        $xapian_path = api_get_path(SYS_UPLOAD_PATH).'plugins/xapian/searchdb';
 
         /*
         @todo Test the Xapian connection
@@ -857,8 +857,8 @@ 
         }
 
         $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('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'));
@@ -916,8 +916,8 @@ 
 
     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>';
+        echo '<a href="settings.php?category=Templates&action=add">'.
+            Display::return_icon('new_template.png', get_lang('AddTemplate'), '', ICON_SIZE_MEDIUM).'</a>';
         echo '</div>';
     }
 
@@ -1039,10 +1039,10 @@ 
  */
 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;
 }
 
@@ -1059,9 +1059,9 @@ 
 function image_filter($image)
 {
     if (!empty($image)) {
-        return '<img src="' . api_get_path(WEB_APP_PATH) . 'home/default_platform_document/template_thumb/' . $image . '" alt="' . get_lang('TemplatePreview') . '"/>';
+        return '<img src="'.api_get_path(WEB_APP_PATH).'home/default_platform_document/template_thumb/'.$image.'" alt="'.get_lang('TemplatePreview').'"/>';
     } else {
-        return '<img src="' . api_get_path(WEB_APP_PATH) . 'home/default_platform_document/template_thumb/noimage.gif" alt="' . get_lang('NoTemplatePreview') . '"/>';
+        return '<img src="'.api_get_path(WEB_APP_PATH).'home/default_platform_document/template_thumb/noimage.gif" alt="'.get_lang('NoTemplatePreview').'"/>';
     }
 }
 
@@ -1076,9 +1076,9 @@ 
 function add_edit_template()
 {
     // Initialize the object.
-    $id = isset($_GET['id']) ? '&id=' . Security::remove_XSS($_GET['id']) : '';
+    $id = isset($_GET['id']) ? '&id='.Security::remove_XSS($_GET['id']) : '';
     $form = new FormValidator('template', 'post',
-        'settings.php?category=Templates&action=' . Security::remove_XSS($_GET['action']) . $id);
+        'settings.php?category=Templates&action='.Security::remove_XSS($_GET['action']).$id);
 
     // Setting the form elements: the header.
     if ($_GET['action'] == 'add') {
@@ -1105,7 +1105,7 @@ 
     if ($_GET['action'] == 'edit') {
         // Database table definition.
         $table_system_template = Database:: get_main_table('system_template');
-        $sql = "SELECT * FROM $table_system_template WHERE id = " . intval($_GET['id']) . "";
+        $sql = "SELECT * FROM $table_system_template WHERE id = ".intval($_GET['id'])."";
         $result = Database::query($sql);
         $row = Database::fetch_array($result);
 
@@ -1120,10 +1120,10 @@ 
         // Adding an extra field: a preview of the image that is currently used.
         if (!empty($row['image'])) {
             $form->addElement('static', 'template_image_preview', '',
-                '<img src="' . api_get_path(WEB_APP_PATH) . 'home/default_platform_document/template_thumb/' . $row['image'] . '" alt="' . get_lang('TemplatePreview') . '"/>');
+                '<img src="'.api_get_path(WEB_APP_PATH).'home/default_platform_document/template_thumb/'.$row['image'].'" alt="'.get_lang('TemplatePreview').'"/>');
         } else {
             $form->addElement('static', 'template_image_preview', '',
-                '<img src="' . api_get_path(WEB_APP_PATH) . 'home/default_platform_document/template_thumb/noimage.gif" alt="' . get_lang('NoTemplatePreview') . '"/>');
+                '<img src="'.api_get_path(WEB_APP_PATH).'home/default_platform_document/template_thumb/noimage.gif" alt="'.get_lang('NoTemplatePreview').'"/>');
         }
 
         // Setting the information of the template that we are editing.
@@ -1154,7 +1154,7 @@ 
                         $_FILES['template_image']['type']);
 
                     // The upload directory.
-                    $upload_dir = api_get_path(SYS_APP_PATH) . 'home/default_platform_document/template_thumb/';
+                    $upload_dir = api_get_path(SYS_APP_PATH).'home/default_platform_document/template_thumb/';
 
                     // Create the directory if it does not exist.
                     if (!is_dir($upload_dir)) {
@@ -1170,7 +1170,7 @@ 
                     if ($picture_info['width'] > $max_width_for_picture) {
                         $temp->resize($max_width_for_picture);
                     }
-                    $temp->send_image($upload_dir . $new_file_name);
+                    $temp->send_image($upload_dir.$new_file_name);
                 }
             }
 
@@ -1187,15 +1187,15 @@ 
 
                 // 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 . "'";
+                $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."'";
                 if (!empty($new_file_name)) {
-                    $sql .= ", image = '" . Database::escape_string($new_file_name) . "'";
+                    $sql .= ", image = '".Database::escape_string($new_file_name)."'";
                 }
-                $sql .= " WHERE id = " . intval($_GET['id']) . "";
+                $sql .= " WHERE id = ".intval($_GET['id'])."";
                 Database::query($sql);
 
                 // Display a feedback message.
@@ -1226,15 +1226,15 @@ 
 {
     // First we remove the image.
     $table_system_template = Database:: get_main_table('system_template');
-    $sql = "SELECT * FROM $table_system_template WHERE id = " . intval($id) . "";
+    $sql = "SELECT * FROM $table_system_template WHERE id = ".intval($id)."";
     $result = Database::query($sql);
     $row = Database::fetch_array($result);
     if (!empty($row['image'])) {
-        @unlink(api_get_path(SYS_APP_PATH) . 'home/default_platform_document/template_thumb/' . $row['image']);
+        @unlink(api_get_path(SYS_APP_PATH).'home/default_platform_document/template_thumb/'.$row['image']);
     }
 
     // Now we remove it from the database.
-    $sql = "DELETE FROM $table_system_template WHERE id = " . intval($id) . "";
+    $sql = "DELETE FROM $table_system_template WHERE id = ".intval($id)."";
     Database::query($sql);
 
     // Display a feedback message.
@@ -1309,7 +1309,7 @@ 
     global $_configuration, $settings_to_avoid, $convert_byte_to_mega_list;
     $table_settings_current = Database:: get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
 
-    $form = new FormValidator('settings', 'post', 'settings.php?category=' . Security::remove_XSS($_GET['category']));
+    $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));
@@ -1344,23 +1344,23 @@ 
                     if ($url_id == 1) {
                         if ($row['access_url_changeable'] == '1') {
                             $form->addElement('html',
-                                '<div style="float: right;"><a class="share_this_setting" data_status = "0"  data_to_send = "' . $row['variable'] . '" href="javascript:void(0);">' .
+                                '<div style="float: right;"><a class="share_this_setting" data_status = "0"  data_to_send = "'.$row['variable'].'" href="javascript:void(0);">'.
                                 Display::return_icon('shared_setting.png',
-                                    get_lang('ChangeSharedSetting')) . '</a></div>');
+                                    get_lang('ChangeSharedSetting')).'</a></div>');
                         } else {
                             $form->addElement('html',
-                                '<div style="float: right;"><a class="share_this_setting" data_status = "1" data_to_send = "' . $row['variable'] . '" href="javascript:void(0);">' .
+                                '<div style="float: right;"><a class="share_this_setting" data_status = "1" data_to_send = "'.$row['variable'].'" href="javascript:void(0);">'.
                                 Display::return_icon('shared_setting_na.png',
-                                    get_lang('ChangeSharedSetting')) . '</a></div>');
+                                    get_lang('ChangeSharedSetting')).'</a></div>');
                         }
                     } else {
                         if ($row['access_url_changeable'] == '1') {
-                            $form->addElement('html', '<div style="float: right;">' .
-                                Display::return_icon('shared_setting.png', get_lang('ChangeSharedSetting')) . '</div>');
+                            $form->addElement('html', '<div style="float: right;">'.
+                                Display::return_icon('shared_setting.png', get_lang('ChangeSharedSetting')).'</div>');
                         } else {
-                            $form->addElement('html', '<div style="float: right;">' .
+                            $form->addElement('html', '<div style="float: right;">'.
                                 Display::return_icon('shared_setting_na.png',
-                                    get_lang('ChangeSharedSetting')) . '</div>');
+                                    get_lang('ChangeSharedSetting')).'</div>');
                         }
                     }
                 }
@@ -1445,7 +1445,7 @@ 
                 break;
             case 'textarea':
                 if ($row['variable'] == 'header_extra_content') {
-                    $file = api_get_path(SYS_PATH) . api_get_home_path() . 'header_extra_content.txt';
+                    $file = api_get_path(SYS_PATH).api_get_home_path().'header_extra_content.txt';
                     $value = '';
                     if (file_exists($file)) {
                         $value = file_get_contents($file);
@@ -1454,7 +1454,7 @@ 
                         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';
+                    $file = api_get_path(SYS_PATH).api_get_home_path().'footer_extra_content.txt';
                     $value = '';
                     if (file_exists($file)) {
                         $value = file_get_contents($file);
@@ -1498,7 +1498,7 @@ 
             case 'checkbox';
                 // 1. We collect all the options of this variable.
                 $sql = "SELECT * FROM $table_settings_current
-                        WHERE variable='" . $row['variable'] . "' AND access_url =  1";
+                        WHERE variable='".$row['variable']."' AND access_url =  1";
 
                 $result = Database::query($sql);
                 $group = array();
@@ -1530,9 +1530,9 @@ 
                         }
                         $sql = "SELECT selected_value FROM $table_settings_current
                                 WHERE
-                                    variable='" . $rowkeys['variable'] . "' AND
-                                    subkey='" . $rowkeys['subkey'] . "' AND
-                                    subkeytext='" . $rowkeys['subkeytext'] . "' AND
+                                    variable='".$rowkeys['variable']."' AND
+                                    subkey='" . $rowkeys['subkey']."' AND
+                                    subkeytext='" . $rowkeys['subkeytext']."' AND
                                     access_url =  $access_url";
                         $result_access = Database::query($sql);
                         $row_access = Database::fetch_array($result_access);
@@ -1558,7 +1558,7 @@ 
                 break;
             case 'link':
                 $form->addElement('static', null, array(get_lang($row['title']), get_lang($row['comment'])),
-                    get_lang('CurrentValue') . ' : ' . $row['selected_value'], $hideme);
+                    get_lang('CurrentValue').' : '.$row['selected_value'], $hideme);
                 break;
             case 'select':
                 /*
@@ -1566,7 +1566,7 @@ 
                 * The functions being called must be added to the file settings.lib.php.
                 */
                 $form->addElement('select', $row['variable'], array(get_lang($row['title']), get_lang($row['comment'])),
-                    call_user_func('select_' . $row['variable']), $hideme);
+                    call_user_func('select_'.$row['variable']), $hideme);
                 $default_values[$row['variable']] = $row['selected_value'];
                 break;
             case 'custom':
@@ -1578,16 +1578,16 @@ 
                 $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>');
+                        '<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>');
                 }
 
                 $form->addElement('file', 'pdf_export_watermark_path', get_lang('AddWaterMark'));
                 $allowed_picture_types = array('jpg', 'jpeg', 'png', 'gif');
                 $form->addRule('pdf_export_watermark_path',
-                    get_lang('OnlyImagesAllowed') . ' (' . implode(',', $allowed_picture_types) . ')', 'filetype',
+                    get_lang('OnlyImagesAllowed').' ('.implode(',', $allowed_picture_types).')', 'filetype',
                     $allowed_picture_types);
 
                 break;

main/admin/sub_language_add.php

Doc Comments +1 added lines, -1 removed lines

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

Spacing +14 added lines, -14 removed lines

@@ -39,8 +39,8 @@ 
     $sublanguage_available = Database::escape_string($sublanguage_available);
     $parent_id = intval($parent_id);
 
-    $sql = 'INSERT INTO ' . $tbl_admin_languages . '(original_name,english_name,isocode,dokeos_folder,available,parent_id)
-    	  VALUES ("' . $original_name . '","' . $english_name . '","' . $isocode . '","' . $english_name . '","' . $sublanguage_available . '","' . $parent_id . '")';
+    $sql = 'INSERT INTO '.$tbl_admin_languages.'(original_name,english_name,isocode,dokeos_folder,available,parent_id)
+    	  VALUES ("' . $original_name.'","'.$english_name.'","'.$isocode.'","'.$english_name.'","'.$sublanguage_available.'","'.$parent_id.'")';
     $res = Database::query($sql);
     if ($res === false) {
         return false;
@@ -65,8 +65,8 @@ 
 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_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);
@@ -122,7 +122,7 @@ 
  */
 function ckeck_if_is_parent_of_sub_language($parent_id)
 {
-    $sql = 'SELECT count(*) AS count FROM language WHERE parent_id= ' . intval($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;
@@ -183,7 +183,7 @@ 
     }
 }
 
-$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');
@@ -204,15 +204,15 @@ 
     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 . ')',
+            $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 . ')',
+            $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');
+            $msg .= Display::return_message(get_lang('CodeDoesNotExists').': '.$isocode.'', 'error');
         }
         if ($index_information == 'execute_add' && $value_information === true) {
             $allow_insert_info = true;
@@ -226,7 +226,7 @@ 
             $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;
+            $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) {
@@ -236,7 +236,7 @@ 
                     $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',
+                    $_SESSION['msg'] = Display::return_message(get_lang('TheNewSubLanguageHasBeenAdded').$str_info.'confirm',
                         false);
                     unset($interbreadcrumb);
                     $_GET['sub_language_id'] = $_REQUEST['sub_language_id'] = $sl_id;
@@ -273,7 +273,7 @@ 
 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');
+        '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"');
@@ -286,7 +286,7 @@ 
     $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['english_name'] = $language_details['english_name'].'2';
     $values['isocode'] = $language_details['isocode'];
     $form->setDefaults($values);
     $form->display();
@@ -294,7 +294,7 @@ 
     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']));
+            '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);

main/admin/user_update_import.php

Doc Comments +1 added lines, -1 removed lines

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

Spacing +4 added lines, -4 removed lines

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

Braces +4 added lines, -1 removed lines

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

Indentation +2 added lines, -2 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'])) {

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/lib/CAS/PGTStorage/pgt-db.php

Doc Comments +4 added lines, -4 removed lines

@@ -62,7 +62,7 @@ 
   /**

    * This method returns the PEAR DB URL to use to connect to the database.

    *

-   * @return a PEAR DB URL

+   * @return string PEAR DB URL

    *

    * @private

    */

@@ -105,7 +105,7 @@ 
   /**

    * This method returns the name of the table where PGT's are stored.

    *

-   * @return the name of a table.

+   * @return string name of a table.

    *

    * @private

    */

@@ -122,7 +122,7 @@ 
    * This method returns an informational string giving the type of storage

    * used by the object (used for debugging purposes).

    *

-   * @return an informational string.

+   * @return string informational string.

    * @public

    */

   function getStorageType()

@@ -148,7 +148,7 @@ 
   /**

    * The class constructor, called by CASClient::SetPGTStorageDB().

    *

-   * @param $cas_parent the CASClient instance that creates the object.

+   * @param CASClient $cas_parent the CASClient instance that creates the object.

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

Spacing +9 added lines, -9 removed lines

@@ -57,7 +57,7 @@ 
    * @hideinitializer

    * @private

    */

-  var $_url='';

+  var $_url = '';

 

   /**

    * This method returns the PEAR DB URL to use to connect to the database.

@@ -159,18 +159,18 @@ 
    *

    * @public

    */

-  function PGTStorageDB($cas_parent,$user,$password,$database_type,$hostname,$port,$database,$table)

+  function PGTStorageDB($cas_parent, $user, $password, $database_type, $hostname, $port, $database, $table)

     {

       phpCAS::traceBegin();

 

       // call the ancestor's constructor

       $this->PGTStorage($cas_parent);

 

-      if ( empty($database_type) ) $database_type = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE_TYPE;

-      if ( empty($hostname) ) $hostname = CAS_PGT_STORAGE_DB_DEFAULT_HOSTNAME;

-      if ( $port==0 ) $port = CAS_PGT_STORAGE_DB_DEFAULT_PORT;

-      if ( empty($database) ) $database = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE;

-      if ( empty($table) ) $table = CAS_PGT_STORAGE_DB_DEFAULT_TABLE;

+      if (empty($database_type)) $database_type = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE_TYPE;

+      if (empty($hostname)) $hostname = CAS_PGT_STORAGE_DB_DEFAULT_HOSTNAME;

+      if ($port == 0) $port = CAS_PGT_STORAGE_DB_DEFAULT_PORT;

+      if (empty($database)) $database = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE;

+      if (empty($table)) $table = CAS_PGT_STORAGE_DB_DEFAULT_TABLE;

 

       // build and store the PEAR DB URL

       $this->_url = $database_type.':'.'//'.$user.':'.$password.'@'.$hostname.':'.$port.'/'.$database;

@@ -192,7 +192,7 @@ 
     {

       phpCAS::traceBegin();

       // if the storage has already been initialized, return immediatly

-      if ( $this->isInitialized() )

+      if ($this->isInitialized())

 		return;

       // call the ancestor's method (mark as initialized)

       parent::init();

@@ -205,7 +205,7 @@ 
 

       // try to connect to the database

       $this->_link = DB::connect($this->getURL());

-      if ( DB::isError($this->_link) ) {

+      if (DB::isError($this->_link)) {

 	phpCAS::error('could not connect to database ('.DB::errorMessage($this->_link).')');

       }

       var_dump($this->_link);

Braces +18 added lines, -7 removed lines

@@ -166,11 +166,21 @@ 
       // call the ancestor's constructor

       $this->PGTStorage($cas_parent);

 

-      if ( empty($database_type) ) $database_type = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE_TYPE;

-      if ( empty($hostname) ) $hostname = CAS_PGT_STORAGE_DB_DEFAULT_HOSTNAME;

-      if ( $port==0 ) $port = CAS_PGT_STORAGE_DB_DEFAULT_PORT;

-      if ( empty($database) ) $database = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE;

-      if ( empty($table) ) $table = CAS_PGT_STORAGE_DB_DEFAULT_TABLE;

+      if ( empty($database_type) ) {
+          $database_type = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE_TYPE;
+      }
+      if ( empty($hostname) ) {
+          $hostname = CAS_PGT_STORAGE_DB_DEFAULT_HOSTNAME;
+      }
+      if ( $port==0 ) {
+          $port = CAS_PGT_STORAGE_DB_DEFAULT_PORT;
+      }
+      if ( empty($database) ) {
+          $database = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE;
+      }
+      if ( empty($table) ) {
+          $table = CAS_PGT_STORAGE_DB_DEFAULT_TABLE;
+      }
 

       // build and store the PEAR DB URL

       $this->_url = $database_type.':'.'//'.$user.':'.$password.'@'.$hostname.':'.$port.'/'.$database;

@@ -192,8 +202,9 @@ 
     {

       phpCAS::traceBegin();

       // if the storage has already been initialized, return immediatly

-      if ( $this->isInitialized() )

-		return;

+      if ( $this->isInitialized() ) {
+      		return;
+      }
       // call the ancestor's method (mark as initialized)

       parent::init();

       

Indentation +140 added lines, -140 removed lines

@@ -45,175 +45,175 @@
 

 class PGTStorageDB extends PGTStorage

 {

-  /** 

-   * @addtogroup internalPGTStorageDB

-   * @{ 

-   */

-

-  /**

-   * a string representing a PEAR DB URL to connect to the database. Written by

-   * PGTStorageDB::PGTStorageDB(), read by getURL().

-   *

-   * @hideinitializer

-   * @private

-   */

-  var $_url='';

-

-  /**

-   * This method returns the PEAR DB URL to use to connect to the database.

-   *

-   * @return a PEAR DB URL

-   *

-   * @private

-   */

-  function getURL()

+    /** 

+     * @addtogroup internalPGTStorageDB

+     * @{ 

+     */

+

+    /**

+     * a string representing a PEAR DB URL to connect to the database. Written by

+     * PGTStorageDB::PGTStorageDB(), read by getURL().

+     *

+     * @hideinitializer

+     * @private

+     */

+    var $_url='';

+

+    /**

+     * This method returns the PEAR DB URL to use to connect to the database.

+     *

+     * @return a PEAR DB URL

+     *

+     * @private

+     */

+    function getURL()

     {

-      return $this->_url;

+        return $this->_url;

     }

 

-  /**

-   * The handle of the connection to the database where PGT's are stored. Written by

-   * PGTStorageDB::init(), read by getLink().

-   *

-   * @hideinitializer

-   * @private

-   */

-  var $_link = null;

-

-  /**

-   * This method returns the handle of the connection to the database where PGT's are 

-   * stored.

-   *

-   * @return a handle of connection.

-   *

-   * @private

-   */

-  function getLink()

+    /**

+     * The handle of the connection to the database where PGT's are stored. Written by

+     * PGTStorageDB::init(), read by getLink().

+     *

+     * @hideinitializer

+     * @private

+     */

+    var $_link = null;

+

+    /**

+     * This method returns the handle of the connection to the database where PGT's are 

+     * stored.

+     *

+     * @return a handle of connection.

+     *

+     * @private

+     */

+    function getLink()

     {

-      return $this->_link;

+        return $this->_link;

     }

 

-  /**

-   * The name of the table where PGT's are stored. Written by 

-   * PGTStorageDB::PGTStorageDB(), read by getTable().

-   *

-   * @hideinitializer

-   * @private

-   */

-  var $_table = '';

-

-  /**

-   * This method returns the name of the table where PGT's are stored.

-   *

-   * @return the name of a table.

-   *

-   * @private

-   */

-  function getTable()

+    /**

+     * The name of the table where PGT's are stored. Written by 

+     * PGTStorageDB::PGTStorageDB(), read by getTable().

+     *

+     * @hideinitializer

+     * @private

+     */

+    var $_table = '';

+

+    /**

+     * This method returns the name of the table where PGT's are stored.

+     *

+     * @return the name of a table.

+     *

+     * @private

+     */

+    function getTable()

     {

-      return $this->_table;

+        return $this->_table;

     }

 

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

-  //  DEBUGGING

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

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

+    //  DEBUGGING

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

   

-  /**

-   * This method returns an informational string giving the type of storage

-   * used by the object (used for debugging purposes).

-   *

-   * @return an informational string.

-   * @public

-   */

-  function getStorageType()

+    /**

+     * This method returns an informational string giving the type of storage

+     * used by the object (used for debugging purposes).

+     *

+     * @return an informational string.

+     * @public

+     */

+    function getStorageType()

     {

-      return "database";

+        return "database";

     }

 

-  /**

-   * This method returns an informational string giving informations on the

-   * parameters of the storage.(used for debugging purposes).

-   *

-   * @public

-   */

-  function getStorageInfo()

+    /**

+     * This method returns an informational string giving informations on the

+     * parameters of the storage.(used for debugging purposes).

+     *

+     * @public

+     */

+    function getStorageInfo()

     {

-      return 'url=`'.$this->getURL().'\', table=`'.$this->getTable().'\'';

+        return 'url=`'.$this->getURL().'\', table=`'.$this->getTable().'\'';

     }

 

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

-  //  CONSTRUCTOR

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

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

+    //  CONSTRUCTOR

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

   

-  /**

-   * The class constructor, called by CASClient::SetPGTStorageDB().

-   *

-   * @param $cas_parent the CASClient instance that creates the object.

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

-   *

-   * @public

-   */

-  function PGTStorageDB($cas_parent,$user,$password,$database_type,$hostname,$port,$database,$table)

+    /**

+     * The class constructor, called by CASClient::SetPGTStorageDB().

+     *

+     * @param $cas_parent the CASClient instance that creates the object.

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

+     *

+     * @public

+     */

+    function PGTStorageDB($cas_parent,$user,$password,$database_type,$hostname,$port,$database,$table)

     {

-      phpCAS::traceBegin();

+        phpCAS::traceBegin();

 

-      // call the ancestor's constructor

-      $this->PGTStorage($cas_parent);

+        // call the ancestor's constructor

+        $this->PGTStorage($cas_parent);

 

-      if ( empty($database_type) ) $database_type = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE_TYPE;

-      if ( empty($hostname) ) $hostname = CAS_PGT_STORAGE_DB_DEFAULT_HOSTNAME;

-      if ( $port==0 ) $port = CAS_PGT_STORAGE_DB_DEFAULT_PORT;

-      if ( empty($database) ) $database = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE;

-      if ( empty($table) ) $table = CAS_PGT_STORAGE_DB_DEFAULT_TABLE;

+        if ( empty($database_type) ) $database_type = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE_TYPE;

+        if ( empty($hostname) ) $hostname = CAS_PGT_STORAGE_DB_DEFAULT_HOSTNAME;

+        if ( $port==0 ) $port = CAS_PGT_STORAGE_DB_DEFAULT_PORT;

+        if ( empty($database) ) $database = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE;

+        if ( empty($table) ) $table = CAS_PGT_STORAGE_DB_DEFAULT_TABLE;

 

-      // build and store the PEAR DB URL

-      $this->_url = $database_type.':'.'//'.$user.':'.$password.'@'.$hostname.':'.$port.'/'.$database;

+        // build and store the PEAR DB URL

+        $this->_url = $database_type.':'.'//'.$user.':'.$password.'@'.$hostname.':'.$port.'/'.$database;

 

-      // XXX should use setURL and setTable

-      phpCAS::traceEnd();

+        // XXX should use setURL and setTable

+        phpCAS::traceEnd();

     }

   

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

-  //  INITIALIZATION

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

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

+    //  INITIALIZATION

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

   

-  /**

-   * This method is used to initialize the storage. Halts on error.

-   *

-   * @public

-   */

-  function init()

+    /**

+     * This method is used to initialize the storage. Halts on error.

+     *

+     * @public

+     */

+    function init()

     {

-      phpCAS::traceBegin();

-      // if the storage has already been initialized, return immediatly

-      if ( $this->isInitialized() )

-		return;

-      // call the ancestor's method (mark as initialized)

-      parent::init();

+        phpCAS::traceBegin();

+        // if the storage has already been initialized, return immediatly

+        if ( $this->isInitialized() )

+        return;

+        // call the ancestor's method (mark as initialized)

+        parent::init();

       

-	  //include phpDB library (the test was introduced in release 0.4.8 for 

-	  //the integration into Tikiwiki).

-	  if (!class_exists('DB')) {

-		include_once('DB.php');

-	  }

-

-      // try to connect to the database

-      $this->_link = DB::connect($this->getURL());

-      if ( DB::isError($this->_link) ) {

-	    phpCAS::error('could not connect to database ('.DB::errorMessage($this->_link).')');

-      }

-      // Dump into trace

-      var_dump($this->_link);

-      phpCAS::traceBEnd();

+        //include phpDB library (the test was introduced in release 0.4.8 for 

+        //the integration into Tikiwiki).

+        if (!class_exists('DB')) {

+        include_once('DB.php');

+        }

+

+        // try to connect to the database

+        $this->_link = DB::connect($this->getURL());

+        if ( DB::isError($this->_link) ) {

+        phpCAS::error('could not connect to database ('.DB::errorMessage($this->_link).')');

+        }

+        // Dump into trace

+        var_dump($this->_link);

+        phpCAS::traceBEnd();

     }

 

-  /** @} */

+    /** @} */

 }

 

 ?>
\ No newline at end of file

main/auth/cas/lib/CAS/PGTStorage/pgt-file.php

Doc Comments +7 added lines, -7 removed lines

@@ -98,7 +98,7 @@ 
    * This method returns an informational string giving the type of storage

    * used by the object (used for debugging purposes).

    *

-   * @return an informational string.

+   * @return string informational string.

    * @public

    */

   function getStorageType()

@@ -110,7 +110,7 @@ 
    * This method returns an informational string giving informations on the

    * parameters of the storage.(used for debugging purposes).

    *

-   * @return an informational string.

+   * @return string informational string.

    * @public

    */

   function getStorageInfo()

@@ -125,9 +125,9 @@ 
   /**

    * The class constructor, called by CASClient::SetPGTStorageFile().

    *

-   * @param $cas_parent the CASClient instance that creates the object.

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

+   * @param CASClient $cas_parent the CASClient instance that creates the object.

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

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

    *

    * @public

    */

@@ -202,7 +202,7 @@ 
    *

    * @param $pgt_iou the PGT iou.

    *

-   * @return a filename

+   * @return string filename

    * @private

    */

   function getPGTIouFilename($pgt_iou)

@@ -243,7 +243,7 @@ 
    *

    * @param $pgt_iou the PGT iou

    *

-   * @return the corresponding PGT, or FALSE on error

+   * @return false|string corresponding PGT, or FALSE on error

    *

    * @public

    */

Switch Indentation +6 added lines, -6 removed lines

@@ -163,12 +163,12 @@
       $this->_path = $path;

       // check the format and store it

       switch ($format) {

-      case CAS_PGT_STORAGE_FILE_FORMAT_PLAIN:

-      case CAS_PGT_STORAGE_FILE_FORMAT_XML:

-	$this->_format = $format;

-	break;

-      default:

-	phpCAS::error('unknown PGT file storage format (`'.CAS_PGT_STORAGE_FILE_FORMAT_PLAIN.'\' and `'.CAS_PGT_STORAGE_FILE_FORMAT_XML.'\' allowed)');

+          case CAS_PGT_STORAGE_FILE_FORMAT_PLAIN:

+          case CAS_PGT_STORAGE_FILE_FORMAT_XML:

+	    $this->_format = $format;

+	    break;

+          default:

+	    phpCAS::error('unknown PGT file storage format (`'.CAS_PGT_STORAGE_FILE_FORMAT_PLAIN.'\' and `'.CAS_PGT_STORAGE_FILE_FORMAT_XML.'\' allowed)');

       }

       phpCAS::traceEnd();      

     }

Spacing +13 added lines, -13 removed lines

@@ -131,17 +131,17 @@ 
    *

    * @public

    */

-  function PGTStorageFile($cas_parent,$format,$path)

+  function PGTStorageFile($cas_parent, $format, $path)

     {

       phpCAS::traceBegin();

       // call the ancestor's constructor

       $this->PGTStorage($cas_parent);

 

-      if (empty($format) ) $format = CAS_PGT_STORAGE_FILE_DEFAULT_FORMAT;

-      if (empty($path) ) $path = CAS_PGT_STORAGE_FILE_DEFAULT_PATH;

+      if (empty($format)) $format = CAS_PGT_STORAGE_FILE_DEFAULT_FORMAT;

+      if (empty($path)) $path = CAS_PGT_STORAGE_FILE_DEFAULT_PATH;

 

       // check that the path is an absolute path

-      if (getenv("OS")=="Windows_NT"){

+      if (getenv("OS") == "Windows_NT") {

       	

       	 if (!preg_match('`^[a-zA-Z]:`', $path)) {

 	     	phpCAS::error('an absolute path is needed for PGT storage to file');

@@ -151,13 +151,13 @@ 
       else

       {

       

-      	if ( $path[0] != '/' ) {

+      	if ($path[0] != '/') {

 			phpCAS::error('an absolute path is needed for PGT storage to file');

       	}

 

       	// store the path (with a leading and trailing '/')      

-      	$path = preg_replace('|[/]*$|','/',$path);

-      	$path = preg_replace('|^[/]*|','/',$path);

+      	$path = preg_replace('|[/]*$|', '/', $path);

+      	$path = preg_replace('|^[/]*|', '/', $path);

       }

       

       $this->_path = $path;

@@ -186,7 +186,7 @@ 
     {

       phpCAS::traceBegin();

       // if the storage has already been initialized, return immediatly

-      if ( $this->isInitialized() )

+      if ($this->isInitialized())

 	return;

       // call the ancestor's method (mark as initialized)

       parent::init();

@@ -222,12 +222,12 @@ 
    *

    * @public

    */

-  function write($pgt,$pgt_iou)

+  function write($pgt, $pgt_iou)

     {

       phpCAS::traceBegin();

       $fname = $this->getPGTIouFilename($pgt_iou);

-      if ( $f=fopen($fname,"w") ) {

-	if ( fputs($f,$pgt) === FALSE ) {

+      if ($f = fopen($fname, "w")) {

+	if (fputs($f, $pgt) === FALSE) {

 	  phpCAS::error('could not write PGT to `'.$fname.'\'');

 	}

 	fclose($f);

@@ -252,10 +252,10 @@ 
       phpCAS::traceBegin();

       $pgt = FALSE;

       $fname = $this->getPGTIouFilename($pgt_iou);

-      if ( !($f=fopen($fname,"r")) ) {

+      if (!($f = fopen($fname, "r"))) {

 	phpCAS::trace('could not open `'.$fname.'\'');

       } else {

-	if ( ($pgt=fgets($f)) === FALSE ) {

+	if (($pgt = fgets($f)) === FALSE) {

 	  phpCAS::trace('could not read PGT from `'.$fname.'\'');

 	} 

 	fclose($f);

Braces +10 added lines, -6 removed lines

@@ -137,8 +137,12 @@ 
       // call the ancestor's constructor

       $this->PGTStorage($cas_parent);

 

-      if (empty($format) ) $format = CAS_PGT_STORAGE_FILE_DEFAULT_FORMAT;

-      if (empty($path) ) $path = CAS_PGT_STORAGE_FILE_DEFAULT_PATH;

+      if (empty($format) ) {
+          $format = CAS_PGT_STORAGE_FILE_DEFAULT_FORMAT;
+      }
+      if (empty($path) ) {
+          $path = CAS_PGT_STORAGE_FILE_DEFAULT_PATH;
+      }
 

       // check that the path is an absolute path

       if (getenv("OS")=="Windows_NT"){

@@ -147,8 +151,7 @@ 
 	     	phpCAS::error('an absolute path is needed for PGT storage to file');

       	}

       	

-      }

-      else

+      } else

       {

       

       	if ( $path[0] != '/' ) {

@@ -186,8 +189,9 @@ 
     {

       phpCAS::traceBegin();

       // if the storage has already been initialized, return immediatly

-      if ( $this->isInitialized() )

-	return;

+      if ( $this->isInitialized() ) {
+      	return;
+      }
       // call the ancestor's method (mark as initialized)

       parent::init();

       phpCAS::traceEnd();      

Indentation +181 added lines, -181 removed lines

@@ -44,231 +44,231 @@
 

 class PGTStorageFile extends PGTStorage

 {

-  /** 

-   * @addtogroup internalPGTStorageFile 

-   * @{ 

-   */

+    /** 

+     * @addtogroup internalPGTStorageFile 

+     * @{ 

+     */

 

-  /**

-   * a string telling where PGT's should be stored on the filesystem. Written by

-   * PGTStorageFile::PGTStorageFile(), read by getPath().

-   *

-   * @private

-   */

-  var $_path;

+    /**

+     * a string telling where PGT's should be stored on the filesystem. Written by

+     * PGTStorageFile::PGTStorageFile(), read by getPath().

+     *

+     * @private

+     */

+    var $_path;

 

-  /**

-   * This method returns the name of the directory where PGT's should be stored 

-   * on the filesystem.

-   *

-   * @return the name of a directory (with leading and trailing '/')

-   *

-   * @private

-   */

-  function getPath()

+    /**

+     * This method returns the name of the directory where PGT's should be stored 

+     * on the filesystem.

+     *

+     * @return the name of a directory (with leading and trailing '/')

+     *

+     * @private

+     */

+    function getPath()

     {

-      return $this->_path;

+        return $this->_path;

     }

 

-  /**

-   * a string telling the format to use to store PGT's (plain or xml). Written by

-   * PGTStorageFile::PGTStorageFile(), read by getFormat().

-   *

-   * @private

-   */

-  var $_format;

+    /**

+     * a string telling the format to use to store PGT's (plain or xml). Written by

+     * PGTStorageFile::PGTStorageFile(), read by getFormat().

+     *

+     * @private

+     */

+    var $_format;

 

-  /**

-   * This method returns the format to use when storing PGT's on the filesystem.

-   *

-   * @return a string corresponding to the format used (plain or xml).

-   *

-   * @private

-   */

-  function getFormat()

+    /**

+     * This method returns the format to use when storing PGT's on the filesystem.

+     *

+     * @return a string corresponding to the format used (plain or xml).

+     *

+     * @private

+     */

+    function getFormat()

     {

-      return $this->_format;

+        return $this->_format;

     }

 

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

-  //  DEBUGGING

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

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

+    //  DEBUGGING

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

   

-  /**

-   * This method returns an informational string giving the type of storage

-   * used by the object (used for debugging purposes).

-   *

-   * @return an informational string.

-   * @public

-   */

-  function getStorageType()

+    /**

+     * This method returns an informational string giving the type of storage

+     * used by the object (used for debugging purposes).

+     *

+     * @return an informational string.

+     * @public

+     */

+    function getStorageType()

     {

-      return "file";

+        return "file";

     }

 

-  /**

-   * This method returns an informational string giving informations on the

-   * parameters of the storage.(used for debugging purposes).

-   *

-   * @return an informational string.

-   * @public

-   */

-  function getStorageInfo()

+    /**

+     * This method returns an informational string giving informations on the

+     * parameters of the storage.(used for debugging purposes).

+     *

+     * @return an informational string.

+     * @public

+     */

+    function getStorageInfo()

     {

-      return 'path=`'.$this->getPath().'\', format=`'.$this->getFormat().'\'';

+        return 'path=`'.$this->getPath().'\', format=`'.$this->getFormat().'\'';

     }

 

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

-  //  CONSTRUCTOR

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

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

+    //  CONSTRUCTOR

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

   

-  /**

-   * The class constructor, called by CASClient::SetPGTStorageFile().

-   *

-   * @param $cas_parent the CASClient instance that creates the object.

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

-   *

-   * @public

-   */

-  function PGTStorageFile($cas_parent,$format,$path)

+    /**

+     * The class constructor, called by CASClient::SetPGTStorageFile().

+     *

+     * @param $cas_parent the CASClient instance that creates the object.

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

+     *

+     * @public

+     */

+    function PGTStorageFile($cas_parent,$format,$path)

     {

-      phpCAS::traceBegin();

-      // call the ancestor's constructor

-      $this->PGTStorage($cas_parent);

+        phpCAS::traceBegin();

+        // call the ancestor's constructor

+        $this->PGTStorage($cas_parent);

 

-      if (empty($format) ) $format = CAS_PGT_STORAGE_FILE_DEFAULT_FORMAT;

-      if (empty($path) ) $path = CAS_PGT_STORAGE_FILE_DEFAULT_PATH;

+        if (empty($format) ) $format = CAS_PGT_STORAGE_FILE_DEFAULT_FORMAT;

+        if (empty($path) ) $path = CAS_PGT_STORAGE_FILE_DEFAULT_PATH;

 

-      // check that the path is an absolute path

-      if (getenv("OS")=="Windows_NT"){

+        // check that the path is an absolute path

+        if (getenv("OS")=="Windows_NT"){

       	

-      	 if (!preg_match('`^[a-zA-Z]:`', $path)) {

-	     	phpCAS::error('an absolute path is needed for PGT storage to file');

-      	}

+            if (!preg_match('`^[a-zA-Z]:`', $path)) {

+                phpCAS::error('an absolute path is needed for PGT storage to file');

+            }

       	

-      }

-      else

-      {

+        }

+        else

+        {

       

-      	if ( $path[0] != '/' ) {

-			phpCAS::error('an absolute path is needed for PGT storage to file');

-      	}

+            if ( $path[0] != '/' ) {

+            phpCAS::error('an absolute path is needed for PGT storage to file');

+            }

 

-      	// store the path (with a leading and trailing '/')      

-      	$path = preg_replace('|[/]*$|','/',$path);

-      	$path = preg_replace('|^[/]*|','/',$path);

-      }

+            // store the path (with a leading and trailing '/')      

+            $path = preg_replace('|[/]*$|','/',$path);

+            $path = preg_replace('|^[/]*|','/',$path);

+        }

       

-      $this->_path = $path;

-      // check the format and store it

-      switch ($format) {

-      case CAS_PGT_STORAGE_FILE_FORMAT_PLAIN:

+        $this->_path = $path;

+        // check the format and store it

+        switch ($format) {

+        case CAS_PGT_STORAGE_FILE_FORMAT_PLAIN:

       case CAS_PGT_STORAGE_FILE_FORMAT_XML:

-	$this->_format = $format;

-	break;

-      default:

-	phpCAS::error('unknown PGT file storage format (`'.CAS_PGT_STORAGE_FILE_FORMAT_PLAIN.'\' and `'.CAS_PGT_STORAGE_FILE_FORMAT_XML.'\' allowed)');

-      }

-      phpCAS::traceEnd();      

+    $this->_format = $format;

+    break;

+        default:

+    phpCAS::error('unknown PGT file storage format (`'.CAS_PGT_STORAGE_FILE_FORMAT_PLAIN.'\' and `'.CAS_PGT_STORAGE_FILE_FORMAT_XML.'\' allowed)');

+        }

+        phpCAS::traceEnd();      

     }

 

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

-  //  INITIALIZATION

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

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

+    //  INITIALIZATION

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

   

-  /**

-   * This method is used to initialize the storage. Halts on error.

-   *

-   * @public

-   */

-  function init()

+    /**

+     * This method is used to initialize the storage. Halts on error.

+     *

+     * @public

+     */

+    function init()

     {

-      phpCAS::traceBegin();

-      // if the storage has already been initialized, return immediatly

-      if ( $this->isInitialized() )

-	return;

-      // call the ancestor's method (mark as initialized)

-      parent::init();

-      phpCAS::traceEnd();      

+        phpCAS::traceBegin();

+        // if the storage has already been initialized, return immediatly

+        if ( $this->isInitialized() )

+    return;

+        // call the ancestor's method (mark as initialized)

+        parent::init();

+        phpCAS::traceEnd();      

     }

 

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

-  //  PGT I/O

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

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

+    //  PGT I/O

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

 

-  /**

-   * This method returns the filename corresponding to a PGT Iou.

-   *

-   * @param $pgt_iou the PGT iou.

-   *

-   * @return a filename

-   * @private

-   */

-  function getPGTIouFilename($pgt_iou)

+    /**

+     * This method returns the filename corresponding to a PGT Iou.

+     *

+     * @param $pgt_iou the PGT iou.

+     *

+     * @return a filename

+     * @private

+     */

+    function getPGTIouFilename($pgt_iou)

     {

-      phpCAS::traceBegin();

-      $filename = $this->getPath().$pgt_iou.'.'.$this->getFormat();

-      phpCAS::traceEnd($filename);

-      return $filename;

+        phpCAS::traceBegin();

+        $filename = $this->getPath().$pgt_iou.'.'.$this->getFormat();

+        phpCAS::traceEnd($filename);

+        return $filename;

     }

   

-  /**

-   * This method stores a PGT and its corresponding PGT Iou into a file. Echoes a

-   * warning on error.

-   *

-   * @param $pgt the PGT

-   * @param $pgt_iou the PGT iou

-   *

-   * @public

-   */

-  function write($pgt,$pgt_iou)

+    /**

+     * This method stores a PGT and its corresponding PGT Iou into a file. Echoes a

+     * warning on error.

+     *

+     * @param $pgt the PGT

+     * @param $pgt_iou the PGT iou

+     *

+     * @public

+     */

+    function write($pgt,$pgt_iou)

     {

-      phpCAS::traceBegin();

-      $fname = $this->getPGTIouFilename($pgt_iou);

-      if ( $f=fopen($fname,"w") ) {

-	if ( fputs($f,$pgt) === FALSE ) {

-	  phpCAS::error('could not write PGT to `'.$fname.'\'');

-	}

-	fclose($f);

-      } else {

-	phpCAS::error('could not open `'.$fname.'\'');

-      }

-      phpCAS::traceEnd();      

+        phpCAS::traceBegin();

+        $fname = $this->getPGTIouFilename($pgt_iou);

+        if ( $f=fopen($fname,"w") ) {

+    if ( fputs($f,$pgt) === FALSE ) {

+        phpCAS::error('could not write PGT to `'.$fname.'\'');

+    }

+    fclose($f);

+        } else {

+    phpCAS::error('could not open `'.$fname.'\'');

+        }

+        phpCAS::traceEnd();      

     }

 

-  /**

-   * This method reads a PGT corresponding to a PGT Iou and deletes the 

-   * corresponding file.

-   *

-   * @param $pgt_iou the PGT iou

-   *

-   * @return the corresponding PGT, or FALSE on error

-   *

-   * @public

-   */

-  function read($pgt_iou)

+    /**

+     * This method reads a PGT corresponding to a PGT Iou and deletes the 

+     * corresponding file.

+     *

+     * @param $pgt_iou the PGT iou

+     *

+     * @return the corresponding PGT, or FALSE on error

+     *

+     * @public

+     */

+    function read($pgt_iou)

     {

-      phpCAS::traceBegin();

-      $pgt = FALSE;

-      $fname = $this->getPGTIouFilename($pgt_iou);

-      if ( !($f=fopen($fname,"r")) ) {

-	phpCAS::trace('could not open `'.$fname.'\'');

-      } else {

-	if ( ($pgt=fgets($f)) === FALSE ) {

-	  phpCAS::trace('could not read PGT from `'.$fname.'\'');

-	} 

-	fclose($f);

-      }

+        phpCAS::traceBegin();

+        $pgt = FALSE;

+        $fname = $this->getPGTIouFilename($pgt_iou);

+        if ( !($f=fopen($fname,"r")) ) {

+    phpCAS::trace('could not open `'.$fname.'\'');

+        } else {

+    if ( ($pgt=fgets($f)) === FALSE ) {

+        phpCAS::trace('could not read PGT from `'.$fname.'\'');

+    } 

+    fclose($f);

+        }

 

-      // delete the PGT file

-      @unlink($fname);

+        // delete the PGT file

+        @unlink($fname);

 

-      phpCAS::traceEnd($pgt);

-      return $pgt;

+        phpCAS::traceEnd($pgt);

+        return $pgt;

     }

   

-  /** @} */

+    /** @} */

   

 }

 

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

Doc Comments +2 added lines, -2 removed lines

@@ -126,7 +126,7 @@ 
   /**

    * This method returns an error message set by PGTStorage::setErrorMessage().

    *

-   * @return an error message when set by PGTStorage::setErrorMessage(), FALSE

+   * @return boolean error message when set by PGTStorage::setErrorMessage(), FALSE

    * otherwise.

    *

    * @public

@@ -153,7 +153,7 @@ 
   /**

    * This method tells if the storage has already been intialized.

    *

-   * @return a boolean

+   * @return boolean boolean

    *

    * @protected

    */

Indentation +131 added lines, -131 removed lines

@@ -44,167 +44,167 @@
 

 class PGTStorage

 {

-  /** 

-   * @addtogroup internalPGTStorage

-   * @{ 

-   */

-

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

-  //  CONSTRUCTOR

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

+    /** 

+     * @addtogroup internalPGTStorage

+     * @{ 

+     */

+

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

+    //  CONSTRUCTOR

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

   

-  /**

-   * The constructor of the class, should be called only by inherited classes.

-   *

-   * @param $cas_parent the CASclient instance that creates the current object.

-   *

-   * @protected

-   */

-  function PGTStorage($cas_parent)

+    /**

+     * The constructor of the class, should be called only by inherited classes.

+     *

+     * @param $cas_parent the CASclient instance that creates the current object.

+     *

+     * @protected

+     */

+    function PGTStorage($cas_parent)

     {

-      phpCAS::traceBegin();

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

-	phpCAS::error('defining PGT storage makes no sense when not using a CAS proxy'); 

-      }

-      phpCAS::traceEnd();

+        phpCAS::traceBegin();

+        if ( !$cas_parent->isProxy() ) {

+    phpCAS::error('defining PGT storage makes no sense when not using a CAS proxy'); 

+        }

+        phpCAS::traceEnd();

     }

 

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

-  //  DEBUGGING

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

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

+    //  DEBUGGING

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

   

-  /**

-   * This virtual method returns an informational string giving the type of storage

-   * used by the object (used for debugging purposes).

-   *

-   * @public

-   */

-  function getStorageType()

+    /**

+     * This virtual method returns an informational string giving the type of storage

+     * used by the object (used for debugging purposes).

+     *

+     * @public

+     */

+    function getStorageType()

     {

-      phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); 

+        phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); 

     }

 

-  /**

-   * This virtual method returns an informational string giving informations on the

-   * parameters of the storage.(used for debugging purposes).

-   *

-   * @public

-   */

-  function getStorageInfo()

+    /**

+     * This virtual method returns an informational string giving informations on the

+     * parameters of the storage.(used for debugging purposes).

+     *

+     * @public

+     */

+    function getStorageInfo()

     {

-      phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); 

+        phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); 

     }

 

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

-  //  ERROR HANDLING

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

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

+    //  ERROR HANDLING

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

   

-  /**

-   * string used to store an error message. Written by PGTStorage::setErrorMessage(),

-   * read by PGTStorage::getErrorMessage().

-   *

-   * @hideinitializer

-   * @private

-   * @deprecated not used.

-   */

-  var $_error_message=FALSE;

-

-  /**

-   * This method sets en error message, which can be read later by 

-   * PGTStorage::getErrorMessage().

-   *

-   * @param $error_message an error message

-   *

-   * @protected

-   * @deprecated not used.

-   */

-  function setErrorMessage($error_message)

+    /**

+     * string used to store an error message. Written by PGTStorage::setErrorMessage(),

+     * read by PGTStorage::getErrorMessage().

+     *

+     * @hideinitializer

+     * @private

+     * @deprecated not used.

+     */

+    var $_error_message=FALSE;

+

+    /**

+     * This method sets en error message, which can be read later by 

+     * PGTStorage::getErrorMessage().

+     *

+     * @param $error_message an error message

+     *

+     * @protected

+     * @deprecated not used.

+     */

+    function setErrorMessage($error_message)

     {

-      $this->_error_message = $error_message;

+        $this->_error_message = $error_message;

     }

 

-  /**

-   * This method returns an error message set by PGTStorage::setErrorMessage().

-   *

-   * @return an error message when set by PGTStorage::setErrorMessage(), FALSE

-   * otherwise.

-   *

-   * @public

-   * @deprecated not used.

-   */

-  function getErrorMessage()

+    /**

+     * This method returns an error message set by PGTStorage::setErrorMessage().

+     *

+     * @return an error message when set by PGTStorage::setErrorMessage(), FALSE

+     * otherwise.

+     *

+     * @public

+     * @deprecated not used.

+     */

+    function getErrorMessage()

     {

-      return $this->_error_message;

+        return $this->_error_message;

     }

 

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

-  //  INITIALIZATION

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

-

-  /**

-   * a boolean telling if the storage has already been initialized. Written by 

-   * PGTStorage::init(), read by PGTStorage::isInitialized().

-   *

-   * @hideinitializer

-   * @private

-   */

-  var $_initialized = FALSE;

-

-  /**

-   * This method tells if the storage has already been intialized.

-   *

-   * @return a boolean

-   *

-   * @protected

-   */

-  function isInitialized()

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

+    //  INITIALIZATION

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

+

+    /**

+     * a boolean telling if the storage has already been initialized. Written by 

+     * PGTStorage::init(), read by PGTStorage::isInitialized().

+     *

+     * @hideinitializer

+     * @private

+     */

+    var $_initialized = FALSE;

+

+    /**

+     * This method tells if the storage has already been intialized.

+     *

+     * @return a boolean

+     *

+     * @protected

+     */

+    function isInitialized()

     {

-      return $this->_initialized;

+        return $this->_initialized;

     }

 

-  /**

-   * This virtual method initializes the object.

-   *

-   * @protected

-   */

-  function init()

+    /**

+     * This virtual method initializes the object.

+     *

+     * @protected

+     */

+    function init()

     {

-      $this->_initialized = TRUE;

+        $this->_initialized = TRUE;

     }

 

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

-  //  PGT I/O

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

-

-  /**

-   * This virtual method stores a PGT and its corresponding PGT Iuo.

-   * @note Should never be called.

-   *

-   * @param $pgt the PGT

-   * @param $pgt_iou the PGT iou

-   *

-   * @protected

-   */

-  function write($pgt,$pgt_iou)

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

+    //  PGT I/O

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

+

+    /**

+     * This virtual method stores a PGT and its corresponding PGT Iuo.

+     * @note Should never be called.

+     *

+     * @param $pgt the PGT

+     * @param $pgt_iou the PGT iou

+     *

+     * @protected

+     */

+    function write($pgt,$pgt_iou)

     {

-      phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); 

+        phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); 

     }

 

-  /**

-   * This virtual method reads a PGT corresponding to a PGT Iou and deletes

-   * the corresponding storage entry.

-   * @note Should never be called.

-   *

-   * @param $pgt_iou the PGT iou

-   *

-   * @protected

-   */

-  function read($pgt_iou)

+    /**

+     * This virtual method reads a PGT corresponding to a PGT Iou and deletes

+     * the corresponding storage entry.

+     * @note Should never be called.

+     *

+     * @param $pgt_iou the PGT iou

+     *

+     * @protected

+     */

+    function read($pgt_iou)

     {

-      phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); 

+        phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); 

     }

 

-  /** @} */

+    /** @} */

   

 } 

 

Spacing +3 added lines, -3 removed lines

@@ -63,7 +63,7 @@ 
   function PGTStorage($cas_parent)

     {

       phpCAS::traceBegin();

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

+      if (!$cas_parent->isProxy()) {

 	phpCAS::error('defining PGT storage makes no sense when not using a CAS proxy'); 

       }

       phpCAS::traceEnd();

@@ -107,7 +107,7 @@ 
    * @private

    * @deprecated not used.

    */

-  var $_error_message=FALSE;

+  var $_error_message = FALSE;

 

   /**

    * This method sets en error message, which can be read later by 

@@ -185,7 +185,7 @@ 
    *

    * @protected

    */

-  function write($pgt,$pgt_iou)

+  function write($pgt, $pgt_iou)

     {

       phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); 

     }

main/auth/courses_controller.php

Doc Comments +2 added lines, -1 removed lines

@@ -33,6 +33,7 @@ 
      * render to courses_list view
      * @param string   	action
      * @param string    confirmation message(optional)
+     * @param string $action
      */
     public function courses_list($action, $message = '')
     {
@@ -79,7 +80,7 @@ 
     /**
      * It's used for listing courses with categories,
      * render to courses_categories view
-     * @param $action
+     * @param string $action
      * @param string $category_code
      * @param string $message
      * @param string $error

Spacing +17 added lines, -18 removed lines

@@ -61,7 +61,7 @@ 
      * @param string   $message confirmation message(optional)
      * @param string   $error error message(optional)
      */
-    public function categories_list($action, $message='', $error='')
+    public function categories_list($action, $message = '', $error = '')
     {
         $data = array();
         $data['user_course_categories'] = $this->model->get_user_course_categories();
@@ -116,7 +116,7 @@ 
 
         // we need only the course codes as these will be used to match against the courses of the category
         if ($user_courses != '') {
-            foreach($user_courses as $key => $value) {
+            foreach ($user_courses as $key => $value) {
                 $user_coursecodes[] = $value['code'];
             }
         }
@@ -385,13 +385,13 @@ 
                     $html .= '</strong>';
                 } else {
                     if (!empty($categoryCourses)) {
-                        $html .= '<a href="' . getCourseCategoryUrl(
+                        $html .= '<a href="'.getCourseCategoryUrl(
                                 1,
                                 $limit['length'],
                                 $categoryCode,
                                 $hiddenLinks,
                                 $action
-                            ) . '">';
+                            ).'">';
                         $html .= "$categoryName ($categoryCourses)";
                         $html .= '</a>';
                     } else {
@@ -412,13 +412,13 @@ 
                         if ($code == $subCategory1Code) {
                             $html .= "<strong>$subCategory1Name ($subCategory1Courses)</strong>";
                         } else {
-                            $html .= '<a href="' . getCourseCategoryUrl(
+                            $html .= '<a href="'.getCourseCategoryUrl(
                                     1,
                                     $limit['length'],
                                     $categoryCode,
                                     $hiddenLinks,
                                     $action
-                                ) . '">';
+                                ).'">';
                             $html .= "$subCategory1Name ($subCategory1Courses)";
                             $html .= '</a>';
                         }
@@ -436,13 +436,13 @@ 
                                 if ($code == $subCategory2Code) {
                                     $html .= "<strong>$subCategory2Name ($subCategory2Courses)</strong>";
                                 } else {
-                                    $html .= '<a href="' . getCourseCategoryUrl(
+                                    $html .= '<a href="'.getCourseCategoryUrl(
                                             1,
                                             $limit['length'],
                                             $categoryCode,
                                             $hiddenLinks,
                                             $action
-                                        ) . '">';
+                                        ).'">';
                                     $html .= "$subCategory2Name ($subCategory2Courses)";
                                     $html .= '</a>';
                                 }
@@ -460,13 +460,13 @@ 
                                         if ($code == $subCategory3Code) {
                                             $html .= "<strong>$subCategory3Name ($subCategory3Courses)</strong>";
                                         } else {
-                                            $html .= '<a href="' . getCourseCategoryUrl(
+                                            $html .= '<a href="'.getCourseCategoryUrl(
                                                     1,
                                                     $limit['length'],
                                                     $categoryCode,
                                                     $hiddenLinks,
                                                     $action
-                                                ) . '">';
+                                                ).'">';
                                             $html .= "$subCategory3Name ($subCategory3Courses)";
                                             $html .= '</a>';
                                         }
@@ -593,7 +593,7 @@ 
         $icon = '<em class="fa fa-smile-o"></em>';
 
         return Display::div(
-            $icon . ' ' . get_lang("AlreadyRegisteredToSession"),
+            $icon.' '.get_lang("AlreadyRegisteredToSession"),
             array('class' => 'info-catalog')
         );
     }
@@ -605,7 +605,7 @@ 
      */
     public function getSessionIcon($sessionName)
     {
-        return Display::return_icon('window_list.png', $sessionName, null,ICON_SIZE_MEDIUM);
+        return Display::return_icon('window_list.png', $sessionName, null, ICON_SIZE_MEDIUM);
     }
 
     /**
@@ -626,8 +626,7 @@ 
         $pageTotal = intval(ceil(intval($countSessions) / $limit['length']));
         // Do NOT show pagination if only one page or less
         $cataloguePagination = $pageTotal > 1 ?
-            getCataloguePagination($limit['current'], $limit['length'], $pageTotal) :
-            '';
+            getCataloguePagination($limit['current'], $limit['length'], $pageTotal) : '';
         $sessionsBlocks = $this->getFormatedSessionsBlock($sessions);
 
         // Get session list catalogue URL
@@ -638,13 +637,13 @@ 
         $tpl = new Template();
         $tpl->assign('show_courses', CoursesAndSessionsCatalog::showCourses());
         $tpl->assign('show_sessions', CoursesAndSessionsCatalog::showSessions());
-        $tpl->assign('show_tutor', (api_get_setting('show_session_coach')==='true' ? true : false));
+        $tpl->assign('show_tutor', (api_get_setting('show_session_coach') === 'true' ? true : false));
         $tpl->assign('course_url', $courseUrl);
         $tpl->assign('catalog_pagination', $cataloguePagination);
         $tpl->assign('hidden_links', $hiddenLinks);
         $tpl->assign('search_token', Security::get_token());
         $tpl->assign('search_date', $date);
-        $tpl->assign('web_session_courses_ajax_url', api_get_path(WEB_AJAX_PATH) . 'course.ajax.php');
+        $tpl->assign('web_session_courses_ajax_url', api_get_path(WEB_AJAX_PATH).'course.ajax.php');
         $tpl->assign('sessions', $sessionsBlocks);
         $tpl->assign('already_subscribed_label', $this->getAlreadyRegisteredInSessionLabel());
 
@@ -671,7 +670,7 @@ 
 
         $tpl->assign('show_courses', CoursesAndSessionsCatalog::showCourses());
         $tpl->assign('show_sessions', CoursesAndSessionsCatalog::showSessions());
-        $tpl->assign('show_tutor', (api_get_setting('show_session_coach')==='true' ? true : false));
+        $tpl->assign('show_tutor', (api_get_setting('show_session_coach') === 'true' ? true : false));
         $tpl->assign('course_url', $courseUrl);
         $tpl->assign('already_subscribed_label', $this->getAlreadyRegisteredInSessionLabel());
         $tpl->assign('hidden_links', $hiddenLinks);
@@ -702,7 +701,7 @@ 
         $tpl = new Template();
         $tpl->assign('show_courses', CoursesAndSessionsCatalog::showCourses());
         $tpl->assign('show_sessions', CoursesAndSessionsCatalog::showSessions());
-        $tpl->assign('show_tutor', (api_get_setting('show_session_coach')==='true' ? true : false));
+        $tpl->assign('show_tutor', (api_get_setting('show_session_coach') === 'true' ? true : false));
         $tpl->assign('course_url', $courseUrl);
         $tpl->assign('already_subscribed_label', $this->getAlreadyRegisteredInSessionLabel());
         $tpl->assign('hidden_links', $hiddenLinks);