chamilo / chamilo-lms

main/inc/lib/pear/Image/Text.php

Spacing +6 added lines, -6 removed lines

@@ -683,7 +683,7 @@ 
         $space = (1 + $this->_options['line_spacing'])
             * $this->_options['font_size'];
 
-        $max_lines = (int)$this->_options['max_lines'];
+        $max_lines = (int) $this->_options['max_lines'];
 
         if (($max_lines < 1) && !$force) {
             return false;
@@ -732,7 +732,7 @@ 
                     'color' => $c
                 );
                 $text_width = max($text_width, ($bounds[2] - $bounds[0]));
-                $text_height += (int)$space;
+                $text_height += (int) $space;
                 if (($text_height > $block_height) && !$force) {
                     return false;
                 }
@@ -749,7 +749,7 @@ 
                 $text_line_next = $token;
                 $beginning_of_line = false;
             } else {
-                $text_line_next = $text_line . ' ' . $token;
+                $text_line_next = $text_line.' '.$token;
             }
             $bounds = imagettfbbox($size, 0, $font, $text_line_next);
             $prev_width = isset($prev_width) ? $width : 0;
@@ -776,7 +776,7 @@ 
                     'color' => $c
                 );
                 $text_width = max($text_width, ($bounds[2] - $bounds[0]));
-                $text_height += (int)$space;
+                $text_height += (int) $space;
                 if (($text_height > $block_height) && !$force) {
                     return false;
                 }
@@ -990,7 +990,7 @@ 
     {
         if (!headers_sent()) {
             header(
-                "Content-type: " .
+                "Content-type: ".
                 image_type_to_mime_type($this->_options['image_type'])
             );
         } else {
@@ -1121,7 +1121,7 @@ 
                 $y += $vC[1];
             }
         }
-        return array('x' => (int)round($x, 0), 'y' => (int)round($y, 0));
+        return array('x' => (int) round($x, 0), 'y' => (int) round($y, 0));
     }
 
     /**

main/inc/lib/dashboard.lib.php

Spacing +13 added lines, -13 removed lines

@@ -52,7 +52,7 @@ 
 
                 echo '<tr>';
                 self::display_dashboard_plugin_checkboxes($testplugin);
-                for ($i = 0 ; $i < count($table_cols); $i++) {
+                for ($i = 0; $i < count($table_cols); $i++) {
                     if (isset($plugin_info[strtolower($table_cols[$i])])) {
                         echo '<td>';
                         echo $plugin_info[$table_cols[$i]];
@@ -67,7 +67,7 @@ 
                     echo Display::tag(
                         'tr',
                         Display::tag('td',
-                            get_lang('CheckFilePermissions') . ' ' . Security::remove_XSS($plugin_info_file),
+                            get_lang('CheckFilePermissions').' '.Security::remove_XSS($plugin_info_file),
                             array('colspan' => '3'))
                     );
                 }
@@ -79,7 +79,7 @@ 
             foreach ($disabled_blocks_data as $disabled_block) {
                 echo '<tr style="background-color:#eee">';
                 echo '<td><center><input type="checkbox" name="disabled_block" value="true" checked disabled /></center>';
-                for ($j = 0 ; $j < count($table_cols); $j++) {
+                for ($j = 0; $j < count($table_cols); $j++) {
                     if (isset($disabled_block[strtolower($table_cols[$j])])) {
                         if ($j == 2) {
                             echo '<td>';
@@ -189,10 +189,10 @@ 
             }
             // clean from block data
             if (!empty($not_selected_blocks_id)) {
-                $sql_check = "SELECT id FROM $tbl_block WHERE id IN(".implode(',',$not_selected_blocks_id).")";
+                $sql_check = "SELECT id FROM $tbl_block WHERE id IN(".implode(',', $not_selected_blocks_id).")";
                 $rs_check = Database::query($sql_check);
                 if (Database::num_rows($rs_check) > 0) {
-                    $del = "DELETE FROM $tbl_block WHERE id IN(".implode(',',$not_selected_blocks_id).")";
+                    $del = "DELETE FROM $tbl_block WHERE id IN(".implode(',', $not_selected_blocks_id).")";
                     Database::query($del);
                 }
             }
@@ -212,7 +212,7 @@ 
                         $affected_rows = Database::affected_rows($result);
                     } else {
                         // insert
-                        $plugin_info_file = $dashboard_pluginpath . $testplugin . "/$testplugin.info";
+                        $plugin_info_file = $dashboard_pluginpath.$testplugin."/$testplugin.info";
                         $plugin_info = array();
                         if (file_exists($plugin_info_file)) {
                             $plugin_info = parse_info_file($plugin_info_file);
@@ -282,10 +282,10 @@ 
 		// We check if plugin exists inside directory for updating active field
 		$sql = "SELECT * FROM $tbl_block";
 		$rs = Database::query($sql);
-		if (Database::num_rows($rs) > 0){
+		if (Database::num_rows($rs) > 0) {
 			while ($row = Database::fetch_array($rs)) {
 				$path = $row['path'];
-				if (!in_array($row['path'],$possibleplugins)) {
+				if (!in_array($row['path'], $possibleplugins)) {
 					$active = 0;
 				} else {
 					$active = 1;
@@ -390,13 +390,13 @@ 
 					echo '<td>'.$block['description'].'</td>';
 					echo '<td>
                             <select class="selectpicker show-tick form-control" name="columns['.$block['id'].']">
-                            <option value="1" '.(isset($user_block_data[$block['id']]) && $user_block_data[$block['id']]['column']==1?'selected':'').' >1</option>
-                            <option value="2" '.(isset($user_block_data[$block['id']]) && $user_block_data[$block['id']]['column']==2?'selected':'').' >2</option>
+                            <option value="1" '.(isset($user_block_data[$block['id']]) && $user_block_data[$block['id']]['column'] == 1 ? 'selected' : '').' >1</option>
+                            <option value="2" '.(isset($user_block_data[$block['id']]) && $user_block_data[$block['id']]['column'] == 2 ? 'selected' : '').' >2</option>
                             </select>
                           </td>';
 					echo '</tr>';
 				} else {
-					echo Display::tag('tr',  Display::tag('td', get_lang('Error').' '.$controller_class, array('colspan'=>'3')));
+					echo Display::tag('tr', Display::tag('td', get_lang('Error').' '.$controller_class, array('colspan'=>'3')));
 				}
 			}
 
@@ -475,10 +475,10 @@ 
 		$user_id = intval($user_id);
 		$field_variable = 'dashboard';
 		$extra_user_data = UserManager::get_extra_user_data_by_field($user_id, $field_variable);
-		$extra_user_data = explode(';',$extra_user_data[$field_variable]);
+		$extra_user_data = explode(';', $extra_user_data[$field_variable]);
 		$data = array();
 		foreach ($extra_user_data as $extra) {
-			$split_extra = explode(':',$extra);
+			$split_extra = explode(':', $extra);
 			if (!empty($split_extra)) {
 				$block_id = $split_extra[0];
 				$column = isset($split_extra[1]) ? $split_extra[1] : null;

main/inc/lib/events_email.class.php

Spacing +14 added lines, -14 removed lines

@@ -124,7 +124,7 @@ 
 
                 // If the mail only need to be send once (we know that thanks to the events.conf), we log it in the table
                 if ($event_config[$event_name]["sending_mail_once"]) {
-                    $sql = 'INSERT INTO ' . Database::get_main_table(TABLE_EVENT_SENT) . ' (user_from, user_to, event_type_name)
+                    $sql = 'INSERT INTO '.Database::get_main_table(TABLE_EVENT_SENT).' (user_from, user_to, event_type_name)
                             VALUES ('.$event_data["user_id"].', '.$id.' ,"'.Database::escape_string($event_name).'")
                     ';
                     Database::query($sql);
@@ -135,9 +135,9 @@ 
         // Second, we send to people linked to the event
         // So, we get everyone
         $sql = 'SELECT u.user_id, u.language, u.email, u.firstname, u.lastname
-                FROM ' . Database::get_main_table(TABLE_EVENT_TYPE_REL_USER) . ' ue
+                FROM ' . Database::get_main_table(TABLE_EVENT_TYPE_REL_USER).' ue
                 INNER JOIN '.Database::get_main_table(TABLE_MAIN_USER).' u ON u.user_id = ue.user_id
-                WHERE event_type_name = "' . $event_name . '"';
+                WHERE event_type_name = "' . $event_name.'"';
         $result = Database::store_result(Database::query($sql), 'ASSOC');
         // for each of the linked users
         foreach ($result as $key => $value) {
@@ -177,7 +177,7 @@ 
 
             // If the mail only need to be send once (we know that thanks to the events.conf, we log it in the table
             if ($event_config[$event_name]["sending_mail_once"]) {
-                $sql = 'INSERT INTO ' . Database::get_main_table(TABLE_EVENT_SENT) . '
+                $sql = 'INSERT INTO '.Database::get_main_table(TABLE_EVENT_SENT).'
                     (user_from, user_to, event_type_name)
                     VALUES ('.$event_data["user_id"].', '.$value["user_id"].' , "'.Database::escape_string($event_name).'");
                     ';
@@ -202,16 +202,16 @@ 
         $current_language = api_get_interface_language();
 
         $sql = 'SELECT COUNT(*) as total
-                FROM ' . Database::get_main_table(TABLE_EVENT_EMAIL_TEMPLATE) . ' em
-                INNER JOIN ' . Database::get_main_table(TABLE_MAIN_LANGUAGE) . ' l
+                FROM ' . Database::get_main_table(TABLE_EVENT_EMAIL_TEMPLATE).' em
+                INNER JOIN ' . Database::get_main_table(TABLE_MAIN_LANGUAGE).' l
                 ON em.language_id = l.id
                 WHERE
-                    em.event_type_name = "' . $event_name . '" and
+                    em.event_type_name = "' . $event_name.'" and
                     l.dokeos_folder = "'.$current_language.'" and
                     em.activated = 1';
 
         $exists = Database::store_result(Database::query($sql), 'ASSOC');
-        if ($exists[0]["total"])  {
+        if ($exists[0]["total"]) {
             return true;
         } else {
             return false;
@@ -228,12 +228,12 @@ 
     private static function getMessage($event_name, $language)
     {
         $sql = 'SELECT message, subject, l.dokeos_folder
-                FROM ' . Database::get_main_table(TABLE_EVENT_EMAIL_TEMPLATE) . ' em
-                INNER JOIN ' . Database::get_main_table(TABLE_MAIN_LANGUAGE) . ' l
+                FROM ' . Database::get_main_table(TABLE_EVENT_EMAIL_TEMPLATE).' em
+                INNER JOIN ' . Database::get_main_table(TABLE_MAIN_LANGUAGE).' l
                 ON em.language_id = l.id
                 WHERE
-                    em.event_type_name = "' . $event_name . '" AND
-                    (l.dokeos_folder = "' . $language . '" OR l.dokeos_folder = "english") AND
+                    em.event_type_name = "' . $event_name.'" AND
+                    (l.dokeos_folder = "' . $language.'" OR l.dokeos_folder = "english") AND
                     em.message <> ""
                 ';
         return Database::store_result(Database::query($sql), 'ASSOC');
@@ -274,8 +274,8 @@ 
     private static function formatMessage(&$message, &$subject, $event_config, $event_name, &$event_data)
     {
         foreach ($event_config[$event_name]["available_keyvars"] as $key => $word) {
-            $message = str_replace('((' . $key . '))', $event_data[$word], $message);
-            $subject = str_replace('((' . $key . '))', $event_data[$word], $subject);
+            $message = str_replace('(('.$key.'))', $event_data[$word], $message);
+            $subject = str_replace('(('.$key.'))', $event_data[$word], $subject);
         }
     }
 }

main/inc/lib/event_email_template.class.php

Spacing +4 added lines, -4 removed lines

@@ -7,14 +7,14 @@ 
 class EventEmailTemplate extends Model
 {
     public $table;
-    public $columns = array('id', 'message','subject','event_type_name','activated');
+    public $columns = array('id', 'message', 'subject', 'event_type_name', 'activated');
 
     /**
      * Constructor
      */
 	public function __construct()
     {
-        $this->table =  Database::get_main_table(TABLE_EVENT_EMAIL_TEMPLATE);
+        $this->table = Database::get_main_table(TABLE_EVENT_EMAIL_TEMPLATE);
 	}
 
     public function get_all($where_conditions = array())
@@ -34,7 +34,7 @@ 
 		// action links
 		$content = Display::actions(array(
                 array(
-                    'url' => 'event_type.php' ,
+                    'url' => 'event_type.php',
                     'content' => Display::return_icon('new_document.png', get_lang('Add'), array(), ICON_SIZE_MEDIUM)
                  )
             )
@@ -114,7 +114,7 @@ 
 
     public function get_count()
     {
-        $row = Database::select('count(*) as count', $this->table, array(),'first');
+        $row = Database::select('count(*) as count', $this->table, array(), 'first');
 
         return $row['count'];
     }

main/inc/lib/myspace.lib.php

Spacing +170 added lines, -170 removed lines

@@ -25,7 +25,7 @@ 
             array('url' => api_get_path(WEB_CODE_PATH).'mySpace/admin_view.php?display=course', 'content' => get_lang('DisplayCourseOverview')),
             array('url' => api_get_path(WEB_CODE_PATH).'tracking/question_course_report.php?view=admin', 'content' => get_lang('LPQuestionListResults')),
             array('url' => api_get_path(WEB_CODE_PATH).'tracking/course_session_report.php?view=admin', 'content' => get_lang('LPExerciseResultsBySession')),
-            ['url' => api_get_path(WEB_CODE_PATH) . 'mySpace/admin_view.php?display=accessoverview', 'content' => get_lang('DisplayAccessOverview') . ' (' . get_lang('Beta') . ')']
+            ['url' => api_get_path(WEB_CODE_PATH).'mySpace/admin_view.php?display=accessoverview', 'content' => get_lang('DisplayAccessOverview').' ('.get_lang('Beta').')']
         );
 
         return Display :: actions($actions, null);
@@ -34,7 +34,7 @@ 
     public static function getTopMenu()
     {
         $menu_items = array();
-        $menu_items[] = Display::url(Display::return_icon('stats.png', get_lang('MyStats'),'',ICON_SIZE_MEDIUM),api_get_path(WEB_CODE_PATH)."auth/my_progress.php" );
+        $menu_items[] = Display::url(Display::return_icon('stats.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM), api_get_path(WEB_CODE_PATH)."auth/my_progress.php");
         $menu_items[] = Display::url(Display::return_icon('teacher.png', get_lang('TeacherInterface'), array(), 32), api_get_path(WEB_CODE_PATH).'mySpace/?view=teacher');
         $menu_items[] = Display::url(Display::return_icon('star_na.png', get_lang('AdminInterface'), array(), 32), '#');
         $menu_items[] = Display::url(Display::return_icon('quiz.png', get_lang('ExamTracking'), array(), 32), api_get_path(WEB_CODE_PATH).'tracking/exams.php');
@@ -104,7 +104,7 @@ 
         $session_id  = intval($session_id);
 
         $sql = 'SELECT login_course_date, logout_course_date
-                FROM ' . $tbl_track_course . '
+                FROM ' . $tbl_track_course.'
                 WHERE
                     user_id = '.$user_id.' AND
                     c_id = '.$courseId.' AND
@@ -143,7 +143,7 @@ 
         foreach ($course_list as $course_item) {
             $courseInfo = api_get_course_info($course_item['code']);
             $courseId = $courseInfo['real_id'];
-            $new_course_list[] =  '"'.$courseId.'"';
+            $new_course_list[] = '"'.$courseId.'"';
         }
         $course_list = implode(', ', $new_course_list);
 
@@ -151,7 +151,7 @@ 
             return false;
         }
         $sql = 'SELECT login_course_date, logout_course_date, c_id
-                FROM ' . $tbl_track_course . '
+                FROM ' . $tbl_track_course.'
                 WHERE
                     user_id = '.$user_id.' AND
                     c_id IN ('.$course_list.') AND
@@ -229,7 +229,7 @@ 
             // student score
             $avg_score = Tracking :: get_avg_student_score($user_id, $courseCode);
             if (is_numeric($avg_score)) {
-                $avg_score = round($avg_score,2);
+                $avg_score = round($avg_score, 2);
             } else {
                 $$avg_score = '-';
             }
@@ -265,7 +265,7 @@ 
 
         $t_head = '    <table style="width: 100%;border:0;padding:0;border-collapse:collapse;table-layout: fixed">';
         //$t_head .= '  <caption>'.get_lang('CourseInformation').'</caption>';
-        $t_head .=      '<tr>';
+        $t_head .= '<tr>';
         $t_head .= '        <th width="155px" style="border-left:0;border-bottom:0"><span>'.get_lang('Course').'</span></th>';
         $t_head .= '        <th style="padding:0;border-bottom:0"><span>'.cut(get_lang('AvgTimeSpentInTheCourse'), 6, true).'</span></th>';
         $t_head .= '        <th style="padding:0;border-bottom:0"><span>'.cut(get_lang('AvgStudentsProgress'), 6, true).'</span></th>';
@@ -283,7 +283,7 @@ 
 
         $addparams = array('view' => 'admin', 'display' => 'user');
 
-        $table = new SortableTable('tracking_user_overview', array('MySpace','get_number_of_users_tracking_overview'), array('MySpace','get_user_data_tracking_overview'), 0);
+        $table = new SortableTable('tracking_user_overview', array('MySpace', 'get_number_of_users_tracking_overview'), array('MySpace', 'get_user_data_tracking_overview'), 0);
         $table->additional_parameters = $addparams;
 
         $table->set_header(0, get_lang('OfficialCode'), true, array('style' => 'font-size:8pt'), array('style' => 'font-size:8pt'));
@@ -296,7 +296,7 @@ 
         }
         $table->set_header(3, get_lang('LoginName'), true, array('style' => 'font-size:8pt'), array('style' => 'font-size:8pt'));
         $table->set_header(4, $t_head, false, array('style' => 'width:90%;border:0;padding:0;font-size:7.5pt;'), array('style' => 'width:90%;padding:0;font-size:7.5pt;'));
-        $table->set_column_filter(4, array('MySpace','course_info_tracking_filter'));
+        $table->set_column_filter(4, array('MySpace', 'course_info_tracking_filter'));
         $table->display();
     }
 
@@ -341,7 +341,7 @@ 
         $table -> set_header(7, get_lang('Sessions'), false);
 
         if ($is_western_name_order) {
-            $csv_header[] = array (
+            $csv_header[] = array(
                 get_lang('FirstName', ''),
                 get_lang('LastName', ''),
                 get_lang('TimeSpentOnThePlatform', ''),
@@ -351,7 +351,7 @@ 
                 get_lang('NumberOfSessions', '')
             );
         } else {
-            $csv_header[] = array (
+            $csv_header[] = array(
                 get_lang('LastName', ''),
                 get_lang('FirstName', ''),
                 get_lang('TimeSpentOnThePlatform', ''),
@@ -491,9 +491,9 @@ 
 
         if ($tracking_column != 3) {
             if ($tracking_direction == 'DESC') {
-                usort($all_datas, array('MySpace','rsort_users'));
+                usort($all_datas, array('MySpace', 'rsort_users'));
             } else {
-                usort($all_datas, array('MySpace','sort_users'));
+                usort($all_datas, array('MySpace', 'sort_users'));
             }
         }
 
@@ -552,7 +552,7 @@ 
         /**
          * Column config
          */
-        $column_model   = array(
+        $column_model = array(
             array(
                 'name' => 'username',
                 'index' => 'username',
@@ -593,7 +593,7 @@ 
 
         $action_links = '';
         // jqgrid will use this URL to do the selects
-        $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_session_lp_progress&session_id=' . $sessionId . '&course_id=' . $courseId . '&date_to=' . $date_to . '&date_from=' . $date_from;
+        $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_session_lp_progress&session_id='.$sessionId.'&course_id='.$courseId.'&date_to='.$date_to.'&date_from='.$date_from;
 
         //Table Id
         $tableId = 'lpProgress';
@@ -615,11 +615,11 @@ 
             true
         );
 
-        $return = '<script>$(function() {'. $table .
+        $return = '<script>$(function() {'.$table.
             'jQuery("#'.$tableId.'").jqGrid("navGrid","#'.$tableId.'_pager",{view:false, edit:false, add:false, del:false, search:false, excel:true});
                 jQuery("#'.$tableId.'").jqGrid("navButtonAdd","#'.$tableId.'_pager",{
                        caption:"",
-                       title:"' . get_lang('ExportExcel') . '",
+                       title:"' . get_lang('ExportExcel').'",
                        onClickButton : function () {
                            jQuery("#'.$tableId.'").jqGrid("excelExport",{"url":"'.$url.'&export_format=xls"});
                        }
@@ -669,7 +669,7 @@ 
         /**
          * Column config
          */
-        $column_model   = array(
+        $column_model = array(
             array('name'=>'session', 'index'=>'session', 'align'=>'left', 'search' => 'true', 'wrap_cell' => "true"),
             array('name'=>'exercise_id', 'index'=>'exercise_id', 'align'=>'left', 'search' => 'true'),
             array('name'=>'quiz_title', 'index'=>'quiz_title', 'align'=>'left', 'search' => 'true'),
@@ -686,7 +686,7 @@ 
         //get dynamic column names
 
         // jqgrid will use this URL to do the selects
-        $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_exercise_progress&session_id=' . $sessionId . '&course_id=' . $courseId  . '&exercise_id=' . $exerciseId . '&date_to=' . $date_to . '&date_from=' . $date_from;
+        $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_exercise_progress&session_id='.$sessionId.'&course_id='.$courseId.'&exercise_id='.$exerciseId.'&date_to='.$date_to.'&date_from='.$date_from;
 
         // Autowidth
         $extra_params['autowidth'] = 'true';
@@ -697,11 +697,11 @@ 
         $tableId = 'exerciseProgressOverview';
         $table = Display::grid_js($tableId, $url, $columns, $column_model, $extra_params, array(), '', true);
 
-        $return = '<script>$(function() {'. $table .
+        $return = '<script>$(function() {'.$table.
             'jQuery("#'.$tableId.'").jqGrid("navGrid","#'.$tableId.'_pager",{view:false, edit:false, add:false, del:false, search:false, excel:true});
                 jQuery("#'.$tableId.'").jqGrid("navButtonAdd","#'.$tableId.'_pager",{
                        caption:"",
-                       title:"' . get_lang('ExportExcel') . '",
+                       title:"' . get_lang('ExportExcel').'",
                        onClickButton : function () {
                            jQuery("#'.$tableId.'").jqGrid("excelExport",{"url":"'.$url.'&export_format=xls"});
                        }
@@ -787,8 +787,8 @@ 
 
                     $column[] = $title;
                     $column_model[] = array(
-                        'name' => 'exer' . $i,
-                        'index' => 'exer' . $i,
+                        'name' => 'exer'.$i,
+                        'index' => 'exer'.$i,
                         'align' => 'center',
                         'search' => 'true',
                         'wrap_cell' => "true"
@@ -800,7 +800,7 @@ 
 
         //end get dynamic column names
         // jqgrid will use this URL to do the selects
-        $url = api_get_path(WEB_AJAX_PATH) . 'model.ajax.php?a=get_exercise_grade&session_id=' . $sessionId . '&course_id=' . $courseId;
+        $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_exercise_grade&session_id='.$sessionId.'&course_id='.$courseId;
 
         // Autowidth
         $extra_params['autowidth'] = 'true';
@@ -811,13 +811,13 @@ 
         $tableId = 'exerciseGradeOverview';
         $table = Display::grid_js($tableId, $url, $column, $column_model, $extra_params, array(), '', true);
 
-        $return = '<script>$(function() {' . $table .
-            'jQuery("#' . $tableId . '").jqGrid("navGrid","#' . $tableId . '_pager",{view:false, edit:false, add:false, del:false, search:false, excel:true});
-                jQuery("#' . $tableId . '").jqGrid("navButtonAdd","#' . $tableId . '_pager",{
+        $return = '<script>$(function() {'.$table.
+            'jQuery("#'.$tableId.'").jqGrid("navGrid","#'.$tableId.'_pager",{view:false, edit:false, add:false, del:false, search:false, excel:true});
+                jQuery("#' . $tableId.'").jqGrid("navButtonAdd","#'.$tableId.'_pager",{
                        caption:"",
-                       title:"' . get_lang('ExportExcel') . '",
+                       title:"' . get_lang('ExportExcel').'",
                        onClickButton : function () {
-                           jQuery("#' . $tableId . '").jqGrid("excelExport",{"url":"' . $url . '&export_format=xls"});
+                           jQuery("#' . $tableId.'").jqGrid("excelExport",{"url":"'.$url.'&export_format=xls"});
                        }
                 });
             });</script>';
@@ -850,10 +850,10 @@ 
         /**
          * Column config
          */
-        $column_model   = array(
-            array('name'=>'username',   'index'=>'username',    'align'=>'left', 'search' => 'true', 'wrap_cell' => "true"),
-            array('name'=>'firstname',  'index'=>'firstname',   'align'=>'left', 'search' => 'true'),
-            array('name'=>'lastname',   'index'=>'lastname',    'align'=>'left', 'search' => 'true'),
+        $column_model = array(
+            array('name'=>'username', 'index'=>'username', 'align'=>'left', 'search' => 'true', 'wrap_cell' => "true"),
+            array('name'=>'firstname', 'index'=>'firstname', 'align'=>'left', 'search' => 'true'),
+            array('name'=>'lastname', 'index'=>'lastname', 'align'=>'left', 'search' => 'true'),
         );
         //get dinamic column names
         foreach ($questions as $question_id => $question) {
@@ -869,7 +869,7 @@ 
         $action_links = '';
 
         // jqgrid will use this URL to do the selects
-        $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_survey_overview&session_id=' . $sessionId . '&course_id=' . $courseId . '&survey_id=' . $surveyId . '&date_to=' . $date_to . '&date_from=' . $date_from;
+        $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_survey_overview&session_id='.$sessionId.'&course_id='.$courseId.'&survey_id='.$surveyId.'&date_to='.$date_to.'&date_from='.$date_from;
 
         // Table Id
         $tableId = 'lpProgress';
@@ -891,11 +891,11 @@ 
             true
         );
 
-        $return = '<script>$(function() {'. $table .
+        $return = '<script>$(function() {'.$table.
             'jQuery("#'.$tableId.'").jqGrid("navGrid","#'.$tableId.'_pager",{view:false, edit:false, add:false, del:false, search:false, excel:true});
                 jQuery("#'.$tableId.'").jqGrid("navButtonAdd","#'.$tableId.'_pager",{
                        caption:"",
-                       title:"' . get_lang('ExportExcel') . '",
+                       title:"' . get_lang('ExportExcel').'",
                        onClickButton : function () {
                            jQuery("#'.$tableId.'").jqGrid("excelExport",{"url":"'.$url.'&export_format=xls"});
                        }
@@ -910,7 +910,7 @@ 
      * Display a sortable table that contains an overview off all the progress of the user in a session
      * @author César Perales <cesar.perales@beeznest.com>, Beeznest Team
      */
-    static function display_tracking_progress_overview($sessionId = 0, $courseId = 0,  $date_from, $date_to)
+    static function display_tracking_progress_overview($sessionId = 0, $courseId = 0, $date_from, $date_to)
     {
         //The order is important you need to check the the $column variable in the model.ajax.php file
         $columns = array(
@@ -960,55 +960,55 @@ 
         );
 
         //Column config
-        $column_model   = array(
-            array('name'=>'lastname',   'index'=>'lastname',     'align'=>'left'),
-            array('name'=>'firstname',  'index'=>'firstname',    'align'=>'left'),
-            array('name'=>'username',   'index'=>'username',     'align'=>'left'),
+        $column_model = array(
+            array('name'=>'lastname', 'index'=>'lastname', 'align'=>'left'),
+            array('name'=>'firstname', 'index'=>'firstname', 'align'=>'left'),
+            array('name'=>'username', 'index'=>'username', 'align'=>'left'),
             #array('name'=>'profile',   'index'=>'username',     'align'=>'left'),
-            array('name'=>'total',      'index'=>'total',        'align'=>'left'),
-            array('name'=>'courses',    'index'=>'courses',      'align'=>'left', 'sortable' => 'false'),
-            array('name'=>'lessons',    'index'=>'lessons',      'align'=>'left', 'sortable' => 'false'),
-            array('name'=>'exercises',  'index'=>'exercises',    'align'=>'left', 'sortable' => 'false'),
-            array('name'=>'forums',     'index'=>'forums',       'align'=>'left', 'sortable' => 'false'),
-            array('name'=>'homeworks',  'index'=>'homeworks',    'align'=>'left', 'sortable' => 'false'),
-            array('name'=>'wikis',      'index'=>'wikis',        'align'=>'left', 'sortable' => 'false'),
-            array('name'=>'surveys',    'index'=>'surveys',      'align'=>'left', 'sortable' => 'false'),
+            array('name'=>'total', 'index'=>'total', 'align'=>'left'),
+            array('name'=>'courses', 'index'=>'courses', 'align'=>'left', 'sortable' => 'false'),
+            array('name'=>'lessons', 'index'=>'lessons', 'align'=>'left', 'sortable' => 'false'),
+            array('name'=>'exercises', 'index'=>'exercises', 'align'=>'left', 'sortable' => 'false'),
+            array('name'=>'forums', 'index'=>'forums', 'align'=>'left', 'sortable' => 'false'),
+            array('name'=>'homeworks', 'index'=>'homeworks', 'align'=>'left', 'sortable' => 'false'),
+            array('name'=>'wikis', 'index'=>'wikis', 'align'=>'left', 'sortable' => 'false'),
+            array('name'=>'surveys', 'index'=>'surveys', 'align'=>'left', 'sortable' => 'false'),
             //Lessons
-            array('name'=>'lessons_total',    'index'=>'lessons_total',      'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'lessons_done',     'index'=>'lessons_done',       'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'lessons_left',     'index'=>'lessons_left',       'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'lessons_progress', 'index'=>'lessons_progress',   'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'lessons_total', 'index'=>'lessons_total', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'lessons_done', 'index'=>'lessons_done', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'lessons_left', 'index'=>'lessons_left', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'lessons_progress', 'index'=>'lessons_progress', 'align'=>'center', 'sortable' => 'false'),
             //Exercises
-            array('name'=>'exercises_total',    'index'=>'exercises_total',      'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'exercises_done',     'index'=>'exercises_done',       'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'exercises_left',     'index'=>'exercises_left',       'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'exercises_progress', 'index'=>'exercises_progress',   'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'exercises_total', 'index'=>'exercises_total', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'exercises_done', 'index'=>'exercises_done', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'exercises_left', 'index'=>'exercises_left', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'exercises_progress', 'index'=>'exercises_progress', 'align'=>'center', 'sortable' => 'false'),
             //Assignments
-            array('name'=>'forums_total',    'index'=>'forums_total',        'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'forums_done',     'index'=>'forums_done',         'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'forums_left',     'index'=>'forums_left',         'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'forums_progress', 'index'=>'forums_progress',     'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'forums_total', 'index'=>'forums_total', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'forums_done', 'index'=>'forums_done', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'forums_left', 'index'=>'forums_left', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'forums_progress', 'index'=>'forums_progress', 'align'=>'center', 'sortable' => 'false'),
             //Assignments
-            array('name'=>'assigments_total',    'index'=>'assigments_total',        'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'assigments_done',     'index'=>'assigments_done',         'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'assigments_left',     'index'=>'assigments_left',         'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'assigments_progress', 'index'=>'assigments_progress',     'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'assigments_total', 'index'=>'assigments_total', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'assigments_done', 'index'=>'assigments_done', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'assigments_left', 'index'=>'assigments_left', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'assigments_progress', 'index'=>'assigments_progress', 'align'=>'center', 'sortable' => 'false'),
             //Assignments
-            array('name'=>'wiki_total',         'index'=>'wiki_total',       'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'wiki_revisions',     'index'=>'wiki_revisions',   'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'wiki_read',          'index'=>'wiki_read',        'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'wiki_unread',        'index'=>'wiki_unread',      'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'wiki_progress',      'index'=>'wiki_progress',    'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'wiki_total', 'index'=>'wiki_total', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'wiki_revisions', 'index'=>'wiki_revisions', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'wiki_read', 'index'=>'wiki_read', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'wiki_unread', 'index'=>'wiki_unread', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'wiki_progress', 'index'=>'wiki_progress', 'align'=>'center', 'sortable' => 'false'),
             //Surveys
-            array('name'=>'surveys_total',    'index'=>'surveys_total',      'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'surveys_done',     'index'=>'surveys_done',       'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'surveys_left',     'index'=>'surveys_left',       'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'surveys_progress', 'index'=>'surveys_progress',   'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'surveys_total', 'index'=>'surveys_total', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'surveys_done', 'index'=>'surveys_done', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'surveys_left', 'index'=>'surveys_left', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'surveys_progress', 'index'=>'surveys_progress', 'align'=>'center', 'sortable' => 'false'),
         );
 
         $action_links = '';
         // jqgrid will use this URL to do the selects
-        $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_session_progress&session_id=' . $sessionId . '&course_id=' . $courseId . '&date_to=' . $date_to . '&date_from=' . $date_from;
+        $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_session_progress&session_id='.$sessionId.'&course_id='.$courseId.'&date_to='.$date_to.'&date_from='.$date_from;
 
         //Table Id
         $tableId = 'progressOverview';
@@ -1068,11 +1068,11 @@ 
             true
         );
 
-        $return = '<script>$(function() {'. $table .
+        $return = '<script>$(function() {'.$table.
             'jQuery("#'.$tableId.'").jqGrid("navGrid","#'.$tableId.'_pager",{view:false, edit:false, add:false, del:false, search:false, excel:true});
                 jQuery("#'.$tableId.'").jqGrid("navButtonAdd","#'.$tableId.'_pager",{
                        caption:"",
-                       title:"' . get_lang('ExportExcel') . '",
+                       title:"' . get_lang('ExportExcel').'",
                        onClickButton : function () {
                            jQuery("#'.$tableId.'").jqGrid("excelExport",{"url":"'.$url.'&export_format=xls"});
                        }
@@ -1132,7 +1132,7 @@ 
                 // adding the fields that are checked to the session
                 $message = '';
                 foreach ($values as $field_ids => $value) {
-                    if ($value == 1 && strstr($field_ids,'extra_export_field')) {
+                    if ($value == 1 && strstr($field_ids, 'extra_export_field')) {
                         $_SESSION['additional_export_fields'][] = str_replace('extra_export_field', '', $field_ids);
                     }
                 }
@@ -1147,7 +1147,7 @@ 
                 // Displaying a feedback message
                 if (!empty($_SESSION['additional_export_fields'])) {
                     Display::display_confirmation_message(get_lang('FollowingFieldsWillAlsoBeExported').': <br /><ul>'.$message.'</ul>', false);
-                } else  {
+                } else {
                     Display::display_confirmation_message(get_lang('NoAdditionalFieldsWillBeExported'), false);
                 }
             } else {
@@ -1175,7 +1175,7 @@ 
     {
         $t_head = '    <table style="width: 100%;border:0;padding:0;border-collapse:collapse;table-layout: fixed">';
         //$t_head .= '  <caption>'.get_lang('CourseInformation').'</caption>';
-        $t_head .=      '<tr>';
+        $t_head .= '<tr>';
         $t_head .= '        <th style="padding:0;border-bottom:0"><span>'.cut(get_lang('AvgTimeSpentInTheCourse'), 6, true).'</span></th>';
         $t_head .= '        <th style="padding:0;border-bottom:0"><span>'.cut(get_lang('AvgStudentsProgress'), 6, true).'</span></th>';
         $t_head .= '        <th style="padding:0;border-bottom:0"><span>'.cut(get_lang('AvgCourseScore'), 6, true).'</span></th>';
@@ -1192,13 +1192,13 @@ 
 
         $addparams = array('view' => 'admin', 'display' => 'courseoverview');
 
-        $table = new SortableTable('tracking_session_overview', array('MySpace', 'get_total_number_courses'), array('MySpace','get_course_data_tracking_overview'), 1);
+        $table = new SortableTable('tracking_session_overview', array('MySpace', 'get_total_number_courses'), array('MySpace', 'get_course_data_tracking_overview'), 1);
         $table->additional_parameters = $addparams;
 
         $table->set_header(0, '', false, null, array('style' => 'display: none'));
         $table->set_header(1, get_lang('Course'), true, array('style' => 'font-size:8pt'), array('style' => 'font-size:8pt'));
         $table->set_header(2, $t_head, false, array('style' => 'width:90%;border:0;padding:0;font-size:7.5pt;'), array('style' => 'width:90%;padding:0;font-size:7.5pt;'));
-        $table->set_column_filter(2, array('MySpace','course_tracking_filter'));
+        $table->set_column_filter(2, array('MySpace', 'course_tracking_filter'));
         $table->display();
     }
 
@@ -1234,7 +1234,7 @@ 
         $sql .= " ORDER BY col$column $direction ";
         $sql .= " LIMIT $from,$number_of_items";
         $result = Database::query($sql);
-        $return = array ();
+        $return = array();
         while ($course = Database::fetch_row($result)) {
             $return[] = $course;
         }
@@ -1287,18 +1287,18 @@ 
             $progress += $progress_tmp[0];
             $nb_progress_lp += $progress_tmp[1];
             $score_tmp = Tracking :: get_avg_student_score($row->user_id, $course_code, array(), null, true);
-            if(is_array($score_tmp)) {
+            if (is_array($score_tmp)) {
                 $score += $score_tmp[0];
                 $nb_score_lp += $score_tmp[1];
             }
             $nb_messages += Tracking::count_student_messages($row->user_id, $course_code);
             $nb_assignments += Tracking::count_student_assignments($row->user_id, $course_code);
             $last_login_date_tmp = Tracking :: get_last_connection_date_on_the_course($row->user_id, $courseInfo, null, false);
-            if($last_login_date_tmp != false && $last_login_date == false) { // TODO: To be cleaned
+            if ($last_login_date_tmp != false && $last_login_date == false) { // TODO: To be cleaned
                 $last_login_date = $last_login_date_tmp;
-            } else if($last_login_date_tmp != false && $last_login_date != false) { // TODO: Repeated previous condition. To be cleaned.
+            } else if ($last_login_date_tmp != false && $last_login_date != false) { // TODO: Repeated previous condition. To be cleaned.
                 // Find the max and assign it to first_login_date
-                if(strtotime($last_login_date_tmp) > strtotime($last_login_date)) {
+                if (strtotime($last_login_date_tmp) > strtotime($last_login_date)) {
                     $last_login_date = $last_login_date_tmp;
                 }
             }
@@ -1308,27 +1308,27 @@ 
             $total_score_possible += $exercise_results_tmp['score_possible'];
             $total_questions_answered += $exercise_results_tmp['questions_answered'];
         }
-        if($nb_progress_lp > 0) {
+        if ($nb_progress_lp > 0) {
             $avg_progress = round($progress / $nb_progress_lp, 2);
         } else {
             $avg_progress = 0;
         }
-        if($nb_score_lp > 0) {
+        if ($nb_score_lp > 0) {
             $avg_score = round($score / $nb_score_lp, 2);
         } else {
             $avg_score = '-';
         }
-        if($last_login_date) {
+        if ($last_login_date) {
             $last_login_date = api_convert_and_format_date($last_login_date, DATE_FORMAT_SHORT, date_default_timezone_get());
         } else {
             $last_login_date = '-';
         }
-        if($total_score_possible > 0) {
+        if ($total_score_possible > 0) {
             $total_score_percentage = round($total_score_obtained / $total_score_possible * 100, 2);
         } else {
             $total_score_percentage = 0;
         }
-        if($total_score_percentage > 0) {
+        if ($total_score_percentage > 0) {
             $total_score = $total_score_obtained.'/'.$total_score_possible.' ('.$total_score_percentage.' %)';
         } else {
             $total_score = '-';
@@ -1436,7 +1436,7 @@ 
                 $progress += $progress_tmp[0];
                 $nb_progress_lp += $progress_tmp[1];
                 $score_tmp = Tracking :: get_avg_student_score($row->user_id, $course_code, array(), null, true);
-                if(is_array($score_tmp)) {
+                if (is_array($score_tmp)) {
                     $score += $score_tmp[0];
                     $nb_score_lp += $score_tmp[1];
                 }
@@ -1444,11 +1444,11 @@ 
                 $nb_assignments += Tracking::count_student_assignments($row->user_id, $course_code);
 
                 $last_login_date_tmp = Tracking::get_last_connection_date_on_the_course($row->user_id, $courseInfo, null, false);
-                if($last_login_date_tmp != false && $last_login_date == false) { // TODO: To be cleaned.
+                if ($last_login_date_tmp != false && $last_login_date == false) { // TODO: To be cleaned.
                     $last_login_date = $last_login_date_tmp;
-                } else if($last_login_date_tmp != false && $last_login_date == false) { // TODO: Repeated previous condition. To be cleaned.
+                } else if ($last_login_date_tmp != false && $last_login_date == false) { // TODO: Repeated previous condition. To be cleaned.
                     // Find the max and assign it to first_login_date
-                    if(strtotime($last_login_date_tmp) > strtotime($last_login_date)) {
+                    if (strtotime($last_login_date_tmp) > strtotime($last_login_date)) {
                         $last_login_date = $last_login_date_tmp;
                     }
                 }
@@ -1458,22 +1458,22 @@ 
                 $total_score_possible += $exercise_results_tmp['score_possible'];
                 $total_questions_answered += $exercise_results_tmp['questions_answered'];
             }
-            if($nb_progress_lp > 0) {
+            if ($nb_progress_lp > 0) {
                 $avg_progress = round($progress / $nb_progress_lp, 2);
             } else {
                 $avg_progress = 0;
             }
-            if($nb_score_lp > 0) {
+            if ($nb_score_lp > 0) {
                 $avg_score = round($score / $nb_score_lp, 2);
             } else {
                 $avg_score = '-';
             }
-            if($last_login_date) {
+            if ($last_login_date) {
                 $last_login_date = api_convert_and_format_date($last_login_date, DATE_FORMAT_SHORT, date_default_timezone_get());
             } else {
                 $last_login_date = '-';
             }
-            if($total_score_possible > 0) {
+            if ($total_score_possible > 0) {
                 $total_score_percentage = round($total_score_obtained / $total_score_possible * 100, 2);
             } else {
                 $total_score_percentage = 0;
@@ -1509,7 +1509,7 @@ 
     {
         $t_head = '    <table style="width: 100%;border:0;padding:0;border-collapse:collapse;table-layout: fixed">';
         //$t_head .= '  <caption>'.get_lang('CourseInformation').'</caption>';
-        $t_head .=      '<tr>';
+        $t_head .= '<tr>';
         $t_head .= '        <th width="155px" style="border-left:0;border-bottom:0"><span>'.get_lang('Course').'</span></th>';
         $t_head .= '        <th style="padding:0;border-bottom:0"><span>'.cut(get_lang('AvgTimeSpentInTheCourse'), 6, true).'</span></th>';
         $t_head .= '        <th style="padding:0;border-bottom:0"><span>'.cut(get_lang('AvgStudentsProgress'), 6, true).'</span></th>';
@@ -1527,7 +1527,7 @@ 
 
         $addparams = array('view' => 'admin', 'display' => 'sessionoverview');
 
-        $table = new SortableTable('tracking_session_overview', array('MySpace','get_total_number_sessions'), array('MySpace','get_session_data_tracking_overview'), 1);
+        $table = new SortableTable('tracking_session_overview', array('MySpace', 'get_total_number_sessions'), array('MySpace', 'get_session_data_tracking_overview'), 1);
         $table->additional_parameters = $addparams;
 
         $table->set_header(0, '', false, null, array('style' => 'display: none'));
@@ -1566,7 +1566,7 @@ 
         $sql .= " ORDER BY col$column $direction ";
         $sql .= " LIMIT $from,$number_of_items";
         $result = Database::query($sql);
-        $return = array ();
+        $return = array();
         while ($session = Database::fetch_row($result)) {
             $return[] = $session;
         }
@@ -1655,10 +1655,10 @@ 
                 if ($last_login_date_tmp != false && $last_login_date == false) {
                     // TODO: To be cleaned.
                     $last_login_date = $last_login_date_tmp;
-                } else if($last_login_date_tmp != false && $last_login_date != false) {
+                } else if ($last_login_date_tmp != false && $last_login_date != false) {
                     // TODO: Repeated previous condition! To be cleaned.
                     // Find the max and assign it to first_login_date
-                    if(strtotime($last_login_date_tmp) > strtotime($last_login_date)) {
+                    if (strtotime($last_login_date_tmp) > strtotime($last_login_date)) {
                         $last_login_date = $last_login_date_tmp;
                     }
                 }
@@ -1668,27 +1668,27 @@ 
                 $total_score_possible += $exercise_results_tmp['score_possible'];
                 $total_questions_answered += $exercise_results_tmp['questions_answered'];
             }
-            if($nb_progress_lp > 0) {
+            if ($nb_progress_lp > 0) {
                 $avg_progress = round($progress / $nb_progress_lp, 2);
             } else {
                 $avg_progress = 0;
             }
-            if($nb_score_lp > 0) {
+            if ($nb_score_lp > 0) {
                 $avg_score = round($score / $nb_score_lp, 2);
             } else {
                 $avg_score = '-';
             }
-            if($last_login_date) {
+            if ($last_login_date) {
                 $last_login_date = api_convert_and_format_date($last_login_date, DATE_FORMAT_SHORT, date_default_timezone_get());
             } else {
                 $last_login_date = '-';
             }
-            if($total_score_possible > 0) {
+            if ($total_score_possible > 0) {
                 $total_score_percentage = round($total_score_obtained / $total_score_possible * 100, 2);
             } else {
                 $total_score_percentage = 0;
             }
-            if($total_score_percentage > 0) {
+            if ($total_score_percentage > 0) {
                 $total_score = $total_score_obtained.'/'.$total_score_possible.' ('.$total_score_percentage.' %)';
             } else {
                 $total_score = '-';
@@ -1799,7 +1799,7 @@ 
                 $total_score_obtained = 0;
                 $total_score_possible = 0;
                 $total_questions_answered = 0;
-                while($row_user = Database::fetch_object($result_users)) {
+                while ($row_user = Database::fetch_object($result_users)) {
                     // get time spent in the course and session
                     $time_spent += Tracking::get_time_spent_on_the_course($row_user->user_id, $courseId, $session_id);
                     $progress_tmp = Tracking::get_avg_student_progress($row_user->user_id, $row->code, array(), $session_id, true);
@@ -1828,11 +1828,11 @@ 
                         $session_id,
                         false
                     );
-                    if($last_login_date_tmp != false && $last_login_date == false) { // TODO: To be cleaned.
+                    if ($last_login_date_tmp != false && $last_login_date == false) { // TODO: To be cleaned.
                         $last_login_date = $last_login_date_tmp;
-                    } else if($last_login_date_tmp != false && $last_login_date == false) { // TODO: Repeated previous condition. To be cleaned.
+                    } else if ($last_login_date_tmp != false && $last_login_date == false) { // TODO: Repeated previous condition. To be cleaned.
                         // Find the max and assign it to first_login_date
-                        if(strtotime($last_login_date_tmp) > strtotime($last_login_date)) {
+                        if (strtotime($last_login_date_tmp) > strtotime($last_login_date)) {
                             $last_login_date = $last_login_date_tmp;
                         }
                     }
@@ -1842,27 +1842,27 @@ 
                     $total_score_possible += $exercise_results_tmp['score_possible'];
                     $total_questions_answered += $exercise_results_tmp['questions_answered'];
                 }
-                if($nb_progress_lp > 0) {
+                if ($nb_progress_lp > 0) {
                     $avg_progress = round($progress / $nb_progress_lp, 2);
                 } else {
                     $avg_progress = 0;
                 }
-                if($nb_score_lp > 0) {
+                if ($nb_score_lp > 0) {
                     $avg_score = round($score / $nb_score_lp, 2);
                 } else {
                     $avg_score = '-';
                 }
-                if($last_login_date) {
+                if ($last_login_date) {
                     $last_login_date = api_convert_and_format_date($last_login_date, DATE_FORMAT_SHORT, date_default_timezone_get());
                 } else {
                     $last_login_date = '-';
                 }
-                if($total_score_possible > 0) {
+                if ($total_score_possible > 0) {
                     $total_score_percentage = round($total_score_obtained / $total_score_possible * 100, 2);
                 } else {
                     $total_score_percentage = 0;
                 }
-                if($total_score_percentage > 0) {
+                if ($total_score_percentage > 0) {
                     $total_score = $total_score_obtained.'/'.$total_score_possible.' ('.$total_score_percentage.' %)';
                 } else {
                     $total_score = '-';
@@ -1912,7 +1912,7 @@ 
             FROM '.Database :: get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES)."
             WHERE c_id = ' . $courseId . '
             AND exe_user_id = '".intval($user_id)."'";
-        if($session_id !== false) {
+        if ($session_id !== false) {
             $sql .= " AND session_id = '".$session_id."' ";
         }
         $result = Database::query($sql);
@@ -1922,7 +1922,7 @@ 
         while ($row = Database::fetch_array($result)) {
             $score_obtained += $row['exe_result'];
             $score_possible += $row['exe_weighting'];
-            $questions_answered ++;
+            $questions_answered++;
         }
 
         if ($score_possible != 0) {
@@ -2043,9 +2043,9 @@ 
                     }
                 }
                 // time spent in the course
-                $csv_row[] = api_time_to_hms(Tracking::get_time_spent_on_the_course ($user[4], $courseId));
+                $csv_row[] = api_time_to_hms(Tracking::get_time_spent_on_the_course($user[4], $courseId));
                 // student progress in course
-                $csv_row[] = round(Tracking::get_avg_student_progress ($user[4], $row[0]), 2);
+                $csv_row[] = round(Tracking::get_avg_student_progress($user[4], $row[0]), 2);
                 // student score
                 $csv_row[] = round(Tracking::get_avg_student_score($user[4], $row[0]), 2);
                 // student tes score
@@ -2053,7 +2053,7 @@ 
                 // student messages
                 $csv_row[] = Tracking::count_student_messages($user[4], $row[0]);
                 // student assignments
-                $csv_row[] = Tracking::count_student_assignments ($user[4], $row[0]);
+                $csv_row[] = Tracking::count_student_assignments($user[4], $row[0]);
                 // student exercises results
                 $exercises_results = MySpace::exercises_results($user[4], $row[0]);
                 $csv_row[] = $exercises_results['score_obtained'];
@@ -2061,7 +2061,7 @@ 
                 $csv_row[] = $exercises_results['questions_answered'];
                 $csv_row[] = $exercises_results['percentage'];
                 // first connection
-                $csv_row[] = Tracking::get_first_connection_date_on_the_course ($user[4], $courseId);
+                $csv_row[] = Tracking::get_first_connection_date_on_the_course($user[4], $courseId);
                 // last connection
                 $csv_row[] = strip_tags(Tracking::get_last_connection_date_on_the_course($user[4], $courseInfo));
 
@@ -2095,9 +2095,9 @@ 
         // get all courses with limit
         $sql = "SELECT course.code as col1, course.title as col2
                 FROM $tbl_course course
-                WHERE course.code IN (".implode(',',$courses_code).")";
+                WHERE course.code IN (".implode(',', $courses_code).")";
 
-        if (!in_array($direction, array('ASC','DESC'))) $direction = 'ASC';
+        if (!in_array($direction, array('ASC', 'DESC'))) $direction = 'ASC';
 
         $column = intval($column);
         $from = intval($from);
@@ -2166,7 +2166,7 @@ 
             $table_row[] = $avg_assignments_in_course;
 
             //set the "from" value to know if I access the Reporting by the chamilo tab or the course link
-            $table_row[] = '<center><a href="../../tracking/courseLog.php?cidReq=' .$course_code.'&from=myspace&id_session='.$session_id.'">
+            $table_row[] = '<center><a href="../../tracking/courseLog.php?cidReq='.$course_code.'&from=myspace&id_session='.$session_id.'">
                              <img src="'.api_get_path(WEB_IMG_PATH).'icons/22/2rightarrow.png" border="0" /></a>
                             </center>';
             $csv_content[] = array(
@@ -2174,7 +2174,7 @@ 
                 $nb_students_in_course,
                 $avg_time_spent_in_course,
                 is_null($avg_progress_in_course) ? null : $avg_progress_in_course.'%',
-                is_null($avg_score_in_course) ? null : is_numeric($avg_score_in_course) ? $avg_score_in_course.'%' : $avg_score_in_course ,
+                is_null($avg_score_in_course) ? null : is_numeric($avg_score_in_course) ? $avg_score_in_course.'%' : $avg_score_in_course,
                 is_null($avg_score_in_exercise) ? null : $avg_score_in_exercise.'%',
                 $avg_messages_in_course,
                 $avg_assignments_in_course,
@@ -2242,7 +2242,7 @@ 
         $sql .= " ORDER BY col$column $direction ";
         $sql .= " LIMIT $from,$number_of_items";
         $result = Database::query($sql);
-        $return = array ();
+        $return = array();
         while ($user = Database::fetch_row($result)) {
             $return[] = $user;
         }
@@ -2297,7 +2297,7 @@ 
                     $i++;
                 }
             }
-            $username_array = array('username' => $desired_username , 'sufix' => $sufix);
+            $username_array = array('username' => $desired_username, 'sufix' => $sufix);
             return $username_array;
         } else {
             $username_array = array('username' => $username, 'sufix' => '');
@@ -2571,7 +2571,7 @@ 
         foreach ($users as $index => $user) {
             $userid = $user['id'];
             $sql_insert = "INSERT IGNORE INTO $tbl_session_rel_user(session_id, user_id, registered_at)
-                           VALUES ('$id_session','$userid', '" . api_get_utc_datetime() . "')";
+                           VALUES ('$id_session','$userid', '".api_get_utc_datetime()."')";
             Database::query($sql_insert);
             $user['added_at_session'] = 1;
             $new_users[] = $user;
@@ -2605,10 +2605,10 @@ 
                 );
                 $userInfo = api_get_user_info($user['id']);
 
-                if (($user['added_at_platform'] == 1  && $user['added_at_session'] == 1) || $user['added_at_session'] == 1) {
+                if (($user['added_at_platform'] == 1 && $user['added_at_session'] == 1) || $user['added_at_session'] == 1) {
                     if ($user['added_at_platform'] == 1) {
                         $addedto = get_lang('UserCreatedPlatform');
-                    } else  {
+                    } else {
                         $addedto = '          ';
                     }
 
@@ -2671,7 +2671,7 @@ 
         global $current_tag;
         switch ($data) {
             case 'Contact' :
-                $user = array ();
+                $user = array();
                 break;
             default :
                 $current_tag = $data;
@@ -2718,9 +2718,9 @@ 
         global $current_value;
         global $user;
         global $users;
-        $users = array ();
+        $users = array();
         $parser = xml_parser_create('UTF-8');
-        xml_set_element_handler($parser, array('MySpace','element_start'), array('MySpace','element_end'));
+        xml_set_element_handler($parser, array('MySpace', 'element_start'), array('MySpace', 'element_end'));
         xml_set_character_data_handler($parser, "character_data");
         xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, false);
         xml_parse($parser, api_utf8_encode_xml(file_get_contents($file)));
@@ -2766,7 +2766,7 @@ 
             get_lang('SearchCourse'),
             $courseList,
             [
-                'url' => api_get_path(WEB_AJAX_PATH) . 'course.ajax.php?' . http_build_query([
+                'url' => api_get_path(WEB_AJAX_PATH).'course.ajax.php?'.http_build_query([
                     'a' => 'search_course_by_session_all',
                     'session_id' => $sessionId
                 ])
@@ -2785,7 +2785,7 @@ 
                             course_id: $('#course_id').val() || 0
                         });
 
-                        return '" . api_get_path(WEB_AJAX_PATH) . "session.ajax.php?' + params;
+                        return '" . api_get_path(WEB_AJAX_PATH)."session.ajax.php?' + params;
                     }
                 "
             ]
@@ -2816,7 +2816,7 @@ 
                             course_id: $('#course_id').val()
                         });
 
-                        return '" . api_get_path(WEB_AJAX_PATH) . "course.ajax.php?' + params;
+                        return '" . api_get_path(WEB_AJAX_PATH)."course.ajax.php?' + params;
                     }
                 "
             ]
@@ -2842,8 +2842,8 @@ 
         if ($form->validate()) {
             $table = new SortableTable(
                 'tracking_access_overview',
-                ['MySpace','getNumberOfRrackingAccessOverview'],
-                ['MySpace','getUserDataAccessTrackingOverview'],
+                ['MySpace', 'getNumberOfRrackingAccessOverview'],
+                ['MySpace', 'getUserDataAccessTrackingOverview'],
                 0
             );
             $table->additional_parameters = $form->exportValues();
@@ -2904,7 +2904,7 @@ 
                     " : "
                         u.lastname AS col2,
                         u.firstname AS col3,
-                " ) . "
+                " )."
                 a.logout_course_date,
                 c.title, 
                 c.code, 
@@ -2915,7 +2915,7 @@ 
 
         if (isset($_GET['session_id']) && !empty($_GET['session_id'])) {
             $sessionId = intval($_GET['session_id']);
-            $sql .= " WHERE a.session_id = " . $sessionId;
+            $sql .= " WHERE a.session_id = ".$sessionId;
         }
 
         $sql .= " ORDER BY col$column $orderDirection ";
@@ -2976,14 +2976,14 @@ 
 function get_stats($user_id, $courseId, $start_date = null, $end_date = null)
 {
     // Database table definitions
-    $tbl_track_course   = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);
+    $tbl_track_course = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);
 
     $course_info = api_get_course_info_by_id($courseId);
     if (!empty($course_info)) {
         $strg_sd    = "";
         $strg_ed    = "";
-        if ($start_date != null && $end_date != null){
-            $end_date = add_day_to( $end_date );
+        if ($start_date != null && $end_date != null) {
+            $end_date = add_day_to($end_date);
             $strg_sd = "AND login_course_date BETWEEN '$start_date' AND '$end_date'";
             $strg_ed = "AND logout_course_date BETWEEN '$start_date' AND '$end_date'";
         }
@@ -2991,10 +2991,10 @@ 
                 SEC_TO_TIME(avg(time_to_sec(timediff(logout_course_date,login_course_date)))) as avrg,
                 SEC_TO_TIME(sum(time_to_sec(timediff(logout_course_date,login_course_date)))) as total,
                 count(user_id) as times
-                FROM ' . $tbl_track_course . '
+                FROM ' . $tbl_track_course.'
                 WHERE
-                    user_id = ' . intval($user_id) . ' AND
-                    c_id = ' . intval($courseId) . ' '.$strg_sd.' '.$strg_ed.' '.'
+                    user_id = ' . intval($user_id).' AND
+                    c_id = ' . intval($courseId).' '.$strg_sd.' '.$strg_ed.' '.'
                 ORDER BY login_course_date ASC';
 
         $rs = Database::query($sql);
@@ -3012,7 +3012,7 @@ 
 }
 
 function add_day_to($end_date) {
-    $foo_date = strtotime( $end_date );
+    $foo_date = strtotime($end_date);
     $foo_date = strtotime(" +1 day", $foo_date);
     $foo_date = date("Y-m-d", $foo_date);
     return $foo_date;
@@ -3072,7 +3072,7 @@ 
  * @version OCT-22- 2010
  * @return array
  */
-function convert_to_array($sql_result){
+function convert_to_array($sql_result) {
     $result_to_print = '<table>';
     foreach ($sql_result as $key => $data) {
         $result_to_print .= '<tr><td>'.date('d-m-Y (H:i:s)', $data['login']).'</td><td>'.api_time_to_hms($data['logout'] - $data['login']).'</tr></td>'."\n";
@@ -3091,7 +3091,7 @@ 
  * @version OCT-22- 2010
  * @return string
  */
-function convert_to_string($sql_result){
+function convert_to_string($sql_result) {
     $result_to_print = '<table>';
     if (!empty($sql_result)) {
         foreach ($sql_result as $key => $data) {
@@ -3116,18 +3116,18 @@ 
  */
 function grapher($sql_result, $start_date, $end_date, $type = "")
 {
-    if (empty($start_date)) { $start_date =""; }
-    if (empty($end_date)) { $end_date =""; }
-    if ($type == ""){ $type = 'day'; }
-    $main_year  = $main_month_year = $main_day = array();
+    if (empty($start_date)) { $start_date = ""; }
+    if (empty($end_date)) { $end_date = ""; }
+    if ($type == "") { $type = 'day'; }
+    $main_year = $main_month_year = $main_day = array();
     // get last 8 days/months
     $last_days      = 5;
     $last_months    = 3;
     for ($i = $last_days; $i >= 0; $i--) {
-        $main_day[date ('d-m-Y', mktime () - $i * 3600 * 24)] = 0;
+        $main_day[date('d-m-Y', mktime() - $i * 3600 * 24)] = 0;
     }
     for ($i = $last_months; $i >= 0; $i--) {
-        $main_month_year[date ('m-Y', mktime () - $i * 30 * 3600 * 24)] = 0;
+        $main_month_year[date('m-Y', mktime() - $i * 30 * 3600 * 24)] = 0;
     }
 
     $i = 0;
@@ -3163,7 +3163,7 @@ 
         /* Create and populate the pData object */
         $myData = new pData();
         $myData->addPoints($main_date, 'Serie1');
-        if (count($main_date)!= 1) {
+        if (count($main_date) != 1) {
             $myData->addPoints($labels, 'Labels');
             $myData->setSerieDescription('Labels', 'Months');
             $myData->setAbscissa('Labels');
@@ -3171,7 +3171,7 @@ 
         $myData->setSerieWeight('Serie1', 1);
         $myData->setSerieDescription('Serie1', get_lang('MyResults'));
         $myData->setAxisName(0, get_lang('Minutes'));
-        $myData->loadPalette(api_get_path(SYS_CODE_PATH) . 'palettes/pchart/default.color', true);
+        $myData->loadPalette(api_get_path(SYS_CODE_PATH).'palettes/pchart/default.color', true);
 
         // Cache definition
         $cachePath = api_get_path(SYS_ARCHIVE_PATH);
@@ -3180,9 +3180,9 @@ 
 
         if ($myCache->isInCache($chartHash)) {
             //if we already created the img
-            $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash;
+            $imgPath = api_get_path(SYS_ARCHIVE_PATH).$chartHash;
             $myCache->saveFromCache($chartHash, $imgPath);
-            $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
+            $imgPath = api_get_path(WEB_ARCHIVE_PATH).$chartHash;
         } else {
             /* Define width, height and angle */
             $mainWidth = 760;
@@ -3211,7 +3211,7 @@ 
             /* Set the default font */
             $myPicture->setFontProperties(
                 array(
-                    "FontName" => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf',
+                    "FontName" => api_get_path(SYS_FONTS_PATH).'opensans/OpenSans-Regular.ttf',
                     "FontSize" => 10)
             );
             /* Write the chart title */
@@ -3228,7 +3228,7 @@ 
             /* Set the default font */
             $myPicture->setFontProperties(
                 array(
-                    "FontName" => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf',
+                    "FontName" => api_get_path(SYS_FONTS_PATH).'opensans/OpenSans-Regular.ttf',
                     "FontSize" => 8
                 )
             );
@@ -3270,7 +3270,7 @@ 
             /* Draw the line chart */
             $myPicture->setFontProperties(
                 array(
-                    "FontName" => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf',
+                    "FontName" => api_get_path(SYS_FONTS_PATH).'opensans/OpenSans-Regular.ttf',
                     "FontSize" => 10
                 )
             );
@@ -3289,15 +3289,15 @@ 
 
             /* Write and save into cache */
             $myCache->writeToCache($chartHash, $myPicture);
-            $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash;
+            $imgPath = api_get_path(SYS_ARCHIVE_PATH).$chartHash;
             $myCache->saveFromCache($chartHash, $imgPath);
-            $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
+            $imgPath = api_get_path(WEB_ARCHIVE_PATH).$chartHash;
         }
-        $html = '<img src="' . $imgPath . '">';
+        $html = '<img src="'.$imgPath.'">';
 
         return $html;
     } else {
-        $foo_img = api_convert_encoding('<div id="messages" class="warning-message">'.get_lang('GraphicNotAvailable').'</div>','UTF-8');
+        $foo_img = api_convert_encoding('<div id="messages" class="warning-message">'.get_lang('GraphicNotAvailable').'</div>', 'UTF-8');
 
         return $foo_img;
     }

main/inc/lib/security.lib.php

Spacing +3 added lines, -3 removed lines

@@ -91,7 +91,7 @@ 
             $rel_path = '/'.$rel_path;
         }
         $abs_path = $current_path.$rel_path;
-        $true_path=str_replace("\\", '/', realpath($abs_path));
+        $true_path = str_replace("\\", '/', realpath($abs_path));
         $found = strpos($true_path.'/', $checker_path);
         if ($found === 0) {
             return true;
@@ -321,7 +321,7 @@ 
         }
 
         if ($user_status == COURSEMANAGERLOWSECURITY) {
-            return $var;  // No filtering.
+            return $var; // No filtering.
         }
 
         static $purifier = array();
@@ -344,7 +344,7 @@ 
             }
 
             // Shows _target attribute in anchors
-            $config->set('Attr.AllowedFrameTargets', array('_blank','_top','_self', '_parent'));
+            $config->set('Attr.AllowedFrameTargets', array('_blank', '_top', '_self', '_parent'));
 
             if ($user_status == STUDENT) {
                 global $allowed_html_student;

main/inc/lib/wami-recorder/record_document.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 // Do not use here check Fileinfo method because return: text/plain
 
 $dirBaseDocuments = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
-$saveDir = $dirBaseDocuments . $wamidir;
+$saveDir = $dirBaseDocuments.$wamidir;
 
 if (!is_dir($saveDir)) {
     DocumentManager::createDefaultAudioFolder($_course);

main/inc/lib/access_url_edit_users_to_url_functions.lib.php

Spacing +4 added lines, -4 removed lines

@@ -43,22 +43,22 @@
                    ' WHERE (username LIKE "'.$needle.'%" '.
                    ' OR firstname LIKE "'.$needle.'%" '.
                    ' OR lastname LIKE "'.$needle.'%") '.
-                    $order_clause .
+                    $order_clause.
                    ' LIMIT 11';
 
             $rs = Database::query($sql);
-            $i=0;
+            $i = 0;
 
             while ($user = Database :: fetch_array($rs)) {
                 $i++;
-                if ($i<=10) {
+                if ($i <= 10) {
                     $return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_url(\''.addslashes($user['user_id']).'\',\''.api_get_person_name(addslashes($user['firstname']), addslashes($user['lastname'])).' ('.addslashes($user['username']).')'.'\')">'.api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')</a><br />';
                 } else {
                     $return .= '...<br />';
                 }
             }
         }
-        $xajax_response -> addAssign('ajax_list_users','innerHTML',api_utf8_encode($return));
+        $xajax_response -> addAssign('ajax_list_users', 'innerHTML', api_utf8_encode($return));
         return $xajax_response;
     }
 }

main/inc/lib/nusoap/class.xmlschema.php

Spacing +139 added lines, -139 removed lines

@@ -12,7 +12,7 @@ 
 * @version  $Id: class.xmlschema.php,v 1.53 2010/04/26 20:15:08 snichol Exp $

 * @access   public

 */

-class nusoap_xmlschema extends nusoap_base  {

+class nusoap_xmlschema extends nusoap_base {

 	

 	// files

 	var $schema = '';

@@ -51,7 +51,7 @@ 
 	* @param	string $namespaces namespaces defined in enclosing XML

 	* @access   public

 	*/

-	function nusoap_xmlschema($schema='',$xml='',$namespaces=array()){

+	function nusoap_xmlschema($schema = '', $xml = '', $namespaces = array()) {

 		parent::nusoap_base();

 		$this->debug('nusoap_xmlschema class instantiated, inside constructor');

 		// files

@@ -63,13 +63,13 @@ 
 		$this->namespaces = array_merge($this->namespaces, $namespaces);

 

 		// parse schema file

-		if($schema != ''){

+		if ($schema != '') {

 			$this->debug('initial schema file: '.$schema);

 			$this->parseFile($schema, 'schema');

 		}

 

 		// parse xml file

-		if($xml != ''){

+		if ($xml != '') {

 			$this->debug('initial xml file: '.$xml);

 			$this->parseFile($xml, 'xml');

 		}

@@ -84,18 +84,18 @@ 
 	* @return boolean

     * @access public

     */

-	function parseFile($xml,$type){

+	function parseFile($xml, $type) {

 		// parse xml file

-		if($xml != ""){

-			$xmlStr = @join("",@file($xml));

-			if($xmlStr == ""){

+		if ($xml != "") {

+			$xmlStr = @join("", @file($xml));

+			if ($xmlStr == "") {

 				$msg = 'Error reading XML from '.$xml;

 				$this->setError($msg);

 				$this->debug($msg);

 			return false;

 			} else {

 				$this->debug("parsing $xml");

-				$this->parseString($xmlStr,$type);

+				$this->parseString($xmlStr, $type);

 				$this->debug("done parsing $xml");

 			return true;

 			}

@@ -110,9 +110,9 @@ 
     * @param	string $type (schema|xml)

 	* @access   private

 	*/

-	function parseString($xml,$type){

+	function parseString($xml, $type) {

 		// parse xml string

-		if($xml != ""){

+		if ($xml != "") {

 

 	    	// Create an XML parser.

 	    	$this->parser = xml_parser_create();

@@ -123,28 +123,28 @@ 
 	    	xml_set_object($this->parser, $this);

 

 	    	// Set the element handlers for the parser.

-			if($type == "schema"){

-		    	xml_set_element_handler($this->parser, 'schemaStartElement','schemaEndElement');

-		    	xml_set_character_data_handler($this->parser,'schemaCharacterData');

-			} elseif($type == "xml"){

-				xml_set_element_handler($this->parser, 'xmlStartElement','xmlEndElement');

-		    	xml_set_character_data_handler($this->parser,'xmlCharacterData');

+			if ($type == "schema") {

+		    	xml_set_element_handler($this->parser, 'schemaStartElement', 'schemaEndElement');

+		    	xml_set_character_data_handler($this->parser, 'schemaCharacterData');

+			} elseif ($type == "xml") {

+				xml_set_element_handler($this->parser, 'xmlStartElement', 'xmlEndElement');

+		    	xml_set_character_data_handler($this->parser, 'xmlCharacterData');

 			}

 

 		    // Parse the XML file.

-		    if(!xml_parse($this->parser,$xml,true)){

+		    if (!xml_parse($this->parser, $xml, true)) {

 			// Display an error message.

 				$errstr = sprintf('XML error parsing XML schema on line %d: %s',

 				xml_get_current_line_number($this->parser),

 				xml_error_string(xml_get_error_code($this->parser))

 				);

 				$this->debug($errstr);

-				$this->debug("XML payload:\n" . $xml);

+				$this->debug("XML payload:\n".$xml);

 				$this->setError($errstr);

 	    	}

             

 			xml_parser_free($this->parser);

-		} else{

+		} else {

 			$this->debug('no xml passed to parseString()!!');

 			$this->setError('no xml passed to parseString()!!');

 		}

@@ -160,9 +160,9 @@ 
 	function CreateTypeName($ename) {

 		$scope = '';

 		for ($i = 0; $i < count($this->complexTypeStack); $i++) {

-			$scope .= $this->complexTypeStack[$i] . '_';

+			$scope .= $this->complexTypeStack[$i].'_';

 		}

-		return $scope . $ename . '_ContainedType';

+		return $scope.$ename.'_ContainedType';

 	}

 	

 	/**

@@ -188,7 +188,7 @@ 
 		}

 

 		// get element prefix

-		if($prefix = $this->getPrefix($name)){

+		if ($prefix = $this->getPrefix($name)) {

 			// get unqualified name

 			$name = $this->getLocalPart($name);

 		} else {

@@ -196,31 +196,31 @@ 
         }

 		

         // loop thru attributes, expanding, and registering namespace declarations

-        if(count($attrs) > 0){

-        	foreach($attrs as $k => $v){

+        if (count($attrs) > 0) {

+        	foreach ($attrs as $k => $v) {

                 // if ns declarations, add to class level array of valid namespaces

-				if(preg_match('/^xmlns/',$k)){

+				if (preg_match('/^xmlns/', $k)) {

                 	//$this->xdebug("$k: $v");

                 	//$this->xdebug('ns_prefix: '.$this->getPrefix($k));

-                	if($ns_prefix = substr(strrchr($k,':'),1)){

+                	if ($ns_prefix = substr(strrchr($k, ':'), 1)) {

                 		//$this->xdebug("Add namespace[$ns_prefix] = $v");

 						$this->namespaces[$ns_prefix] = $v;

 					} else {

 						$this->defaultNamespace[$pos] = $v;

-						if (! $this->getPrefixFromNamespace($v)) {

-							$this->namespaces['ns'.(count($this->namespaces)+1)] = $v;

+						if (!$this->getPrefixFromNamespace($v)) {

+							$this->namespaces['ns'.(count($this->namespaces) + 1)] = $v;

 						}

 					}

-					if($v == 'http://www.w3.org/2001/XMLSchema' || $v == 'http://www.w3.org/1999/XMLSchema' || $v == 'http://www.w3.org/2000/10/XMLSchema'){

+					if ($v == 'http://www.w3.org/2001/XMLSchema' || $v == 'http://www.w3.org/1999/XMLSchema' || $v == 'http://www.w3.org/2000/10/XMLSchema') {

 						$this->XMLSchemaVersion = $v;

 						$this->namespaces['xsi'] = $v.'-instance';

 					}

 				}

         	}

-        	foreach($attrs as $k => $v){

+        	foreach ($attrs as $k => $v) {

                 // expand each attribute

-                $k = strpos($k,':') ? $this->expandQname($k) : $k;

-                $v = strpos($v,':') ? $this->expandQname($v) : $v;

+                $k = strpos($k, ':') ? $this->expandQname($k) : $k;

+                $v = strpos($v, ':') ? $this->expandQname($v) : $v;

         		$eAttrs[$k] = $v;

         	}

         	$attrs = $eAttrs;

@@ -228,7 +228,7 @@ 
         	$attrs = array();

         }

 		// find status, register data

-		switch($name){

+		switch ($name) {

 			case 'all':			// (optional) compositor content for a complexType

 			case 'choice':

 			case 'group':

@@ -253,41 +253,41 @@ 
 						// no namespace in arrayType attribute value...

 						if ($this->defaultNamespace[$pos]) {

 							// ...so use the default

-							$attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'] = $this->defaultNamespace[$pos] . ':' . $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];

+							$attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'] = $this->defaultNamespace[$pos].':'.$attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];

 						}

 					}

             	}

-                if(isset($attrs['name'])){

+                if (isset($attrs['name'])) {

 					$this->attributes[$attrs['name']] = $attrs;

 					$aname = $attrs['name'];

-				} elseif(isset($attrs['ref']) && $attrs['ref'] == 'http://schemas.xmlsoap.org/soap/encoding/:arrayType'){

+				} elseif (isset($attrs['ref']) && $attrs['ref'] == 'http://schemas.xmlsoap.org/soap/encoding/:arrayType') {

 					if (isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'])) {

 	                	$aname = $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];

 	                } else {

 	                	$aname = '';

 	                }

-				} elseif(isset($attrs['ref'])){

+				} elseif (isset($attrs['ref'])) {

 					$aname = $attrs['ref'];

                     $this->attributes[$attrs['ref']] = $attrs;

 				}

                 

-				if($this->currentComplexType){	// This should *always* be

+				if ($this->currentComplexType) {	// This should *always* be

 					$this->complexTypes[$this->currentComplexType]['attrs'][$aname] = $attrs;

 				}

 				// arrayType attribute

-				if(isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType']) || $this->getLocalPart($aname) == 'arrayType'){

+				if (isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType']) || $this->getLocalPart($aname) == 'arrayType') {

 					$this->complexTypes[$this->currentComplexType]['phpType'] = 'array';

                 	$prefix = $this->getPrefix($aname);

-					if(isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'])){

+					if (isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'])) {

 						$v = $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];

 					} else {

 						$v = '';

 					}

-                    if(strpos($v,'[,]')){

+                    if (strpos($v, '[,]')) {

                         $this->complexTypes[$this->currentComplexType]['multidimensional'] = true;

                     }

-                    $v = substr($v,0,strpos($v,'[')); // clip the []

-                    if(!strpos($v,':') && isset($this->typemap[$this->XMLSchemaVersion][$v])){

+                    $v = substr($v, 0, strpos($v, '[')); // clip the []

+                    if (!strpos($v, ':') && isset($this->typemap[$this->XMLSchemaVersion][$v])) {

                         $v = $this->XMLSchemaVersion.':'.$v;

                     }

                     $this->complexTypes[$this->currentComplexType]['arrayType'] = $v;

@@ -298,7 +298,7 @@ 
 			break;

 			case 'complexType':

 				array_push($this->complexTypeStack, $this->currentComplexType);

-				if(isset($attrs['name'])){

+				if (isset($attrs['name'])) {

 					// TODO: what is the scope of named complexTypes that appear

 					//       nested within other c complexTypes?

 					$this->xdebug('processing named complexType '.$attrs['name']);

@@ -313,7 +313,7 @@ 
 					//                        minOccurs="0" maxOccurs="unbounded" />

 					//                </sequence>

 					//            </complexType>

-					if(isset($attrs['base']) && preg_match('/:Array$/',$attrs['base'])){

+					if (isset($attrs['base']) && preg_match('/:Array$/', $attrs['base'])) {

 						$this->xdebug('complexType is unusual array');

 						$this->complexTypes[$this->currentComplexType]['phpType'] = 'array';

 					} else {

@@ -321,7 +321,7 @@ 
 					}

 				} else {

 					$name = $this->CreateTypeName($this->currentElement);

-					$this->xdebug('processing unnamed complexType for element ' . $this->currentElement . ' named ' . $name);

+					$this->xdebug('processing unnamed complexType for element '.$this->currentElement.' named '.$name);

 					$this->currentComplexType = $name;

 					//$this->currentElement = false;

 					$this->complexTypes[$this->currentComplexType] = $attrs;

@@ -333,7 +333,7 @@ 
 					//                        minOccurs="0" maxOccurs="unbounded" />

 					//                </sequence>

 					//            </complexType>

-					if(isset($attrs['base']) && preg_match('/:Array$/',$attrs['base'])){

+					if (isset($attrs['base']) && preg_match('/:Array$/', $attrs['base'])) {

 						$this->xdebug('complexType is unusual array');

 						$this->complexTypes[$this->currentComplexType]['phpType'] = 'array';

 					} else {

@@ -352,12 +352,12 @@ 
 						$attrs['form'] = 'qualified';

 					}

 				}

-				if(isset($attrs['type'])){

+				if (isset($attrs['type'])) {

 					$this->xdebug("processing typed element ".$attrs['name']." of type ".$attrs['type']);

-					if (! $this->getPrefix($attrs['type'])) {

+					if (!$this->getPrefix($attrs['type'])) {

 						if ($this->defaultNamespace[$pos]) {

-							$attrs['type'] = $this->defaultNamespace[$pos] . ':' . $attrs['type'];

-							$this->xdebug('used default namespace to make type ' . $attrs['type']);

+							$attrs['type'] = $this->defaultNamespace[$pos].':'.$attrs['type'];

+							$this->xdebug('used default namespace to make type '.$attrs['type']);

 						}

 					}

 					// This is for constructs like

@@ -368,20 +368,20 @@ 
 					//                </sequence>

 					//            </complexType>

 					if ($this->currentComplexType && $this->complexTypes[$this->currentComplexType]['phpType'] == 'array') {

-						$this->xdebug('arrayType for unusual array is ' . $attrs['type']);

+						$this->xdebug('arrayType for unusual array is '.$attrs['type']);

 						$this->complexTypes[$this->currentComplexType]['arrayType'] = $attrs['type'];

 					}

 					$this->currentElement = $attrs['name'];

 					$ename = $attrs['name'];

-				} elseif(isset($attrs['ref'])){

+				} elseif (isset($attrs['ref'])) {

 					$this->xdebug("processing element as ref to ".$attrs['ref']);

 					$this->currentElement = "ref to ".$attrs['ref'];

 					$ename = $this->getLocalPart($attrs['ref']);

 				} else {

-					$type = $this->CreateTypeName($this->currentComplexType . '_' . $attrs['name']);

-					$this->xdebug("processing untyped element " . $attrs['name'] . ' type ' . $type);

+					$type = $this->CreateTypeName($this->currentComplexType.'_'.$attrs['name']);

+					$this->xdebug("processing untyped element ".$attrs['name'].' type '.$type);

 					$this->currentElement = $attrs['name'];

-					$attrs['type'] = $this->schemaTargetNamespace . ':' . $type;

+					$attrs['type'] = $this->schemaTargetNamespace.':'.$type;

 					$ename = $attrs['name'];

 				}

 				if (isset($ename) && $this->currentComplexType) {

@@ -389,12 +389,12 @@ 
 					$this->complexTypes[$this->currentComplexType]['elements'][$ename] = $attrs;

 				} elseif (!isset($attrs['ref'])) {

 					$this->xdebug("add element $ename to elements array");

-					$this->elements[ $attrs['name'] ] = $attrs;

-					$this->elements[ $attrs['name'] ]['typeClass'] = 'element';

+					$this->elements[$attrs['name']] = $attrs;

+					$this->elements[$attrs['name']]['typeClass'] = 'element';

 				}

 			break;

 			case 'enumeration':	//	restriction value list member

-				$this->xdebug('enumeration ' . $attrs['value']);

+				$this->xdebug('enumeration '.$attrs['value']);

 				if ($this->currentSimpleType) {

 					$this->simpleTypes[$this->currentSimpleType]['enumeration'][] = $attrs['value'];

 				} elseif ($this->currentComplexType) {

@@ -402,11 +402,11 @@ 
 				}

 			break;

 			case 'extension':	// simpleContent or complexContent type extension

-				$this->xdebug('extension ' . $attrs['base']);

+				$this->xdebug('extension '.$attrs['base']);

 				if ($this->currentComplexType) {

 					$ns = $this->getPrefix($attrs['base']);

 					if ($ns == '') {

-						$this->complexTypes[$this->currentComplexType]['extensionBase'] = $this->schemaTargetNamespace . ':' . $attrs['base'];

+						$this->complexTypes[$this->currentComplexType]['extensionBase'] = $this->schemaTargetNamespace.':'.$attrs['base'];

 					} else {

 						$this->complexTypes[$this->currentComplexType]['extensionBase'] = $attrs['base'];

 					}

@@ -416,19 +416,19 @@ 
 			break;

 			case 'import':

 			    if (isset($attrs['schemaLocation'])) {

-					$this->xdebug('import namespace ' . $attrs['namespace'] . ' from ' . $attrs['schemaLocation']);

+					$this->xdebug('import namespace '.$attrs['namespace'].' from '.$attrs['schemaLocation']);

                     $this->imports[$attrs['namespace']][] = array('location' => $attrs['schemaLocation'], 'loaded' => false);

 				} else {

-					$this->xdebug('import namespace ' . $attrs['namespace']);

+					$this->xdebug('import namespace '.$attrs['namespace']);

                     $this->imports[$attrs['namespace']][] = array('location' => '', 'loaded' => true);

-					if (! $this->getPrefixFromNamespace($attrs['namespace'])) {

-						$this->namespaces['ns'.(count($this->namespaces)+1)] = $attrs['namespace'];

+					if (!$this->getPrefixFromNamespace($attrs['namespace'])) {

+						$this->namespaces['ns'.(count($this->namespaces) + 1)] = $attrs['namespace'];

 					}

 				}

 			break;

 			case 'include':

 			    if (isset($attrs['schemaLocation'])) {

-					$this->xdebug('include into namespace ' . $this->schemaTargetNamespace . ' from ' . $attrs['schemaLocation']);

+					$this->xdebug('include into namespace '.$this->schemaTargetNamespace.' from '.$attrs['schemaLocation']);

                     $this->imports[$this->schemaTargetNamespace][] = array('location' => $attrs['schemaLocation'], 'loaded' => false);

 				} else {

 					$this->xdebug('ignoring invalid XML Schema construct: include without schemaLocation attribute');

@@ -438,12 +438,12 @@ 
 				$this->xdebug("do nothing for element $name");

 			break;

 			case 'restriction':	// simpleType, simpleContent or complexContent value restriction

-				$this->xdebug('restriction ' . $attrs['base']);

-				if($this->currentSimpleType){

+				$this->xdebug('restriction '.$attrs['base']);

+				if ($this->currentSimpleType) {

 					$this->simpleTypes[$this->currentSimpleType]['type'] = $attrs['base'];

-				} elseif($this->currentComplexType){

+				} elseif ($this->currentComplexType) {

 					$this->complexTypes[$this->currentComplexType]['restrictionBase'] = $attrs['base'];

-					if(strstr($attrs['base'],':') == ':Array'){

+					if (strstr($attrs['base'], ':') == ':Array') {

 						$this->complexTypes[$this->currentComplexType]['phpType'] = 'array';

 					}

 				}

@@ -470,15 +470,15 @@ 
 			break;

 			case 'simpleType':

 				array_push($this->simpleTypeStack, $this->currentSimpleType);

-				if(isset($attrs['name'])){

-					$this->xdebug("processing simpleType for name " . $attrs['name']);

+				if (isset($attrs['name'])) {

+					$this->xdebug("processing simpleType for name ".$attrs['name']);

 					$this->currentSimpleType = $attrs['name'];

-					$this->simpleTypes[ $attrs['name'] ] = $attrs;

-					$this->simpleTypes[ $attrs['name'] ]['typeClass'] = 'simpleType';

-					$this->simpleTypes[ $attrs['name'] ]['phpType'] = 'scalar';

+					$this->simpleTypes[$attrs['name']] = $attrs;

+					$this->simpleTypes[$attrs['name']]['typeClass'] = 'simpleType';

+					$this->simpleTypes[$attrs['name']]['phpType'] = 'scalar';

 				} else {

-					$name = $this->CreateTypeName($this->currentComplexType . '_' . $this->currentElement);

-					$this->xdebug('processing unnamed simpleType for element ' . $this->currentElement . ' named ' . $name);

+					$name = $this->CreateTypeName($this->currentComplexType.'_'.$this->currentElement);

+					$this->xdebug('processing unnamed simpleType for element '.$this->currentElement.' named '.$name);

 					$this->currentSimpleType = $name;

 					//$this->currentElement = false;

 					$this->simpleTypes[$this->currentSimpleType] = $attrs;

@@ -504,29 +504,29 @@ 
 		// bring depth down a notch

 		$this->depth--;

 		// position of current element is equal to the last value left in depth_array for my depth

-		if(isset($this->depth_array[$this->depth])){

+		if (isset($this->depth_array[$this->depth])) {

         	$pos = $this->depth_array[$this->depth];

         }

 		// get element prefix

-		if ($prefix = $this->getPrefix($name)){

+		if ($prefix = $this->getPrefix($name)) {

 			// get unqualified name

 			$name = $this->getLocalPart($name);

 		} else {

         	$prefix = '';

         }

 		// move on...

-		if($name == 'complexType'){

-			$this->xdebug('done processing complexType ' . ($this->currentComplexType ? $this->currentComplexType : '(unknown)'));

+		if ($name == 'complexType') {

+			$this->xdebug('done processing complexType '.($this->currentComplexType ? $this->currentComplexType : '(unknown)'));

 			$this->xdebug($this->varDump($this->complexTypes[$this->currentComplexType]));

 			$this->currentComplexType = array_pop($this->complexTypeStack);

 			//$this->currentElement = false;

 		}

-		if($name == 'element'){

-			$this->xdebug('done processing element ' . ($this->currentElement ? $this->currentElement : '(unknown)'));

+		if ($name == 'element') {

+			$this->xdebug('done processing element '.($this->currentElement ? $this->currentElement : '(unknown)'));

 			$this->currentElement = array_pop($this->elementStack);

 		}

-		if($name == 'simpleType'){

-			$this->xdebug('done processing simpleType ' . ($this->currentSimpleType ? $this->currentSimpleType : '(unknown)'));

+		if ($name == 'simpleType') {

+			$this->xdebug('done processing simpleType '.($this->currentSimpleType ? $this->currentSimpleType : '(unknown)'));

 			$this->xdebug($this->varDump($this->simpleTypes[$this->currentSimpleType]));

 			$this->currentSimpleType = array_pop($this->simpleTypeStack);

 		}

@@ -539,7 +539,7 @@ 
 	* @param    string $data element content

 	* @access   private

 	*/

-	function schemaCharacterData($parser, $data){

+	function schemaCharacterData($parser, $data) {

 		$pos = $this->depth_array[$this->depth - 1];

 		$this->message[$pos]['cdata'] .= $data;

 	}

@@ -549,32 +549,32 @@ 
 	*

 	* @access   public

 	*/

-	function serializeSchema(){

+	function serializeSchema() {

 

 		$schemaPrefix = $this->getPrefixFromNamespace($this->XMLSchemaVersion);

 		$xml = '';

 		// imports

 		if (sizeof($this->imports) > 0) {

-			foreach($this->imports as $ns => $list) {

+			foreach ($this->imports as $ns => $list) {

 				foreach ($list as $ii) {

 					if ($ii['location'] != '') {

-						$xml .= " <$schemaPrefix:import location=\"" . $ii['location'] . '" namespace="' . $ns . "\" />\n";

+						$xml .= " <$schemaPrefix:import location=\"".$ii['location'].'" namespace="'.$ns."\" />\n";

 					} else {

-						$xml .= " <$schemaPrefix:import namespace=\"" . $ns . "\" />\n";

+						$xml .= " <$schemaPrefix:import namespace=\"".$ns."\" />\n";

 					}

 				}

 			} 

 		} 

 		// complex types

-		foreach($this->complexTypes as $typeName => $attrs){

+		foreach ($this->complexTypes as $typeName => $attrs) {

 			$contentStr = '';

 			// serialize child elements

-			if(isset($attrs['elements']) && (count($attrs['elements']) > 0)){

-				foreach($attrs['elements'] as $element => $eParts){

-					if(isset($eParts['ref'])){

+			if (isset($attrs['elements']) && (count($attrs['elements']) > 0)) {

+				foreach ($attrs['elements'] as $element => $eParts) {

+					if (isset($eParts['ref'])) {

 						$contentStr .= "   <$schemaPrefix:element ref=\"$element\"/>\n";

 					} else {

-						$contentStr .= "   <$schemaPrefix:element name=\"$element\" type=\"" . $this->contractQName($eParts['type']) . "\"";

+						$contentStr .= "   <$schemaPrefix:element name=\"$element\" type=\"".$this->contractQName($eParts['type'])."\"";

 						foreach ($eParts as $aName => $aValue) {

 							// handle, e.g., abstract, default, form, minOccurs, maxOccurs, nillable

 							if ($aName != 'name' && $aName != 'type') {

@@ -590,8 +590,8 @@ 
 				}

 			}

 			// attributes

-			if(isset($attrs['attrs']) && (count($attrs['attrs']) >= 1)){

-				foreach($attrs['attrs'] as $attr => $aParts){

+			if (isset($attrs['attrs']) && (count($attrs['attrs']) >= 1)) {

+				foreach ($attrs['attrs'] as $attr => $aParts) {

 					$contentStr .= "    <$schemaPrefix:attribute";

 					foreach ($aParts as $a => $v) {

 						if ($a == 'ref' || $a == 'type') {

@@ -607,15 +607,15 @@ 
 				}

 			}

 			// if restriction

-			if (isset($attrs['restrictionBase']) && $attrs['restrictionBase'] != ''){

+			if (isset($attrs['restrictionBase']) && $attrs['restrictionBase'] != '') {

 				$contentStr = "   <$schemaPrefix:restriction base=\"".$this->contractQName($attrs['restrictionBase'])."\">\n".$contentStr."   </$schemaPrefix:restriction>\n";

 				// complex or simple content

-				if ((isset($attrs['elements']) && count($attrs['elements']) > 0) || (isset($attrs['attrs']) && count($attrs['attrs']) > 0)){

+				if ((isset($attrs['elements']) && count($attrs['elements']) > 0) || (isset($attrs['attrs']) && count($attrs['attrs']) > 0)) {

 					$contentStr = "  <$schemaPrefix:complexContent>\n".$contentStr."  </$schemaPrefix:complexContent>\n";

 				}

 			}

 			// finalize complex type

-			if($contentStr != ''){

+			if ($contentStr != '') {

 				$contentStr = " <$schemaPrefix:complexType name=\"$typeName\">\n".$contentStr." </$schemaPrefix:complexType>\n";

 			} else {

 				$contentStr = " <$schemaPrefix:complexType name=\"$typeName\"/>\n";

@@ -623,8 +623,8 @@ 
 			$xml .= $contentStr;

 		}

 		// simple types

-		if(isset($this->simpleTypes) && count($this->simpleTypes) > 0){

-			foreach($this->simpleTypes as $typeName => $eParts){

+		if (isset($this->simpleTypes) && count($this->simpleTypes) > 0) {

+			foreach ($this->simpleTypes as $typeName => $eParts) {

 				$xml .= " <$schemaPrefix:simpleType name=\"$typeName\">\n  <$schemaPrefix:restriction base=\"".$this->contractQName($eParts['type'])."\">\n";

 				if (isset($eParts['enumeration'])) {

 					foreach ($eParts['enumeration'] as $e) {

@@ -635,14 +635,14 @@ 
 			}

 		}

 		// elements

-		if(isset($this->elements) && count($this->elements) > 0){

-			foreach($this->elements as $element => $eParts){

+		if (isset($this->elements) && count($this->elements) > 0) {

+			foreach ($this->elements as $element => $eParts) {

 				$xml .= " <$schemaPrefix:element name=\"$element\" type=\"".$this->contractQName($eParts['type'])."\"/>\n";

 			}

 		}

 		// attributes

-		if(isset($this->attributes) && count($this->attributes) > 0){

-			foreach($this->attributes as $attr => $aParts){

+		if (isset($this->attributes) && count($this->attributes) > 0) {

+			foreach ($this->attributes as $attr => $aParts) {

 				$xml .= " <$schemaPrefix:attribute name=\"$attr\" type=\"".$this->contractQName($aParts['type'])."\"\n/>";

 			}

 		}

@@ -657,7 +657,7 @@ 
 		foreach (array_diff($this->usedNamespaces, $this->enclosingNamespaces) as $nsp => $ns) {

 			$el .= " xmlns:$nsp=\"$ns\"";

 		}

-		$xml = $el . ">\n".$xml."</$schemaPrefix:schema>\n";

+		$xml = $el.">\n".$xml."</$schemaPrefix:schema>\n";

 		return $xml;

 	}

 

@@ -667,8 +667,8 @@ 
 	* @param    string $string debug data

 	* @access   private

 	*/

-	function xdebug($string){

-		$this->debug('<' . $this->schemaTargetNamespace . '> '.$string);

+	function xdebug($string) {

+		$this->debug('<'.$this->schemaTargetNamespace.'> '.$string);

 	}

 

     /**

@@ -683,11 +683,11 @@ 
     * @access public

     * @deprecated

     */

-	function getPHPType($type,$ns){

-		if(isset($this->typemap[$ns][$type])){

+	function getPHPType($type, $ns) {

+		if (isset($this->typemap[$ns][$type])) {

 			//print "found type '$type' and ns $ns in typemap<br>";

 			return $this->typemap[$ns][$type];

-		} elseif(isset($this->complexTypes[$type])){

+		} elseif (isset($this->complexTypes[$type])) {

 			//print "getting type '$type' and ns $ns from complexTypes array<br>";

 			return $this->complexTypes[$type]['phpType'];

 		}

@@ -716,7 +716,7 @@ 
     * @see addSimpleType

     * @see addElement

     */

-	function getTypeDef($type){

+	function getTypeDef($type) {

 		//$this->debug("in getTypeDef for type $type");

 		if (substr($type, -1) == '^') {

 			$is_element = 1;

@@ -725,10 +725,10 @@ 
 			$is_element = 0;

 		}

 

-		if((! $is_element) && isset($this->complexTypes[$type])){

+		if ((!$is_element) && isset($this->complexTypes[$type])) {

 			$this->xdebug("in getTypeDef, found complexType $type");

 			return $this->complexTypes[$type];

-		} elseif((! $is_element) && isset($this->simpleTypes[$type])){

+		} elseif ((!$is_element) && isset($this->simpleTypes[$type])) {

 			$this->xdebug("in getTypeDef, found simpleType $type");

 			if (!isset($this->simpleTypes[$type]['phpType'])) {

 				// get info for type to tack onto the simple type

@@ -748,7 +748,7 @@ 
 				}

 			}

 			return $this->simpleTypes[$type];

-		} elseif(isset($this->elements[$type])){

+		} elseif (isset($this->elements[$type])) {

 			$this->xdebug("in getTypeDef, found element $type");

 			if (!isset($this->elements[$type]['phpType'])) {

 				// get info for type to tack onto the element

@@ -773,7 +773,7 @@ 
 				}

 			}

 			return $this->elements[$type];

-		} elseif(isset($this->attributes[$type])){

+		} elseif (isset($this->attributes[$type])) {

 			$this->xdebug("in getTypeDef, found attribute $type");

 			return $this->attributes[$type];

 		} elseif (preg_match('/_ContainedType$/', $type)) {

@@ -795,23 +795,23 @@ 
     * @access public

     * @deprecated

     */

-    function serializeTypeDef($type){

+    function serializeTypeDef($type) {

     	//print "in sTD() for type $type<br>";

-	if($typeDef = $this->getTypeDef($type)){

+	if ($typeDef = $this->getTypeDef($type)) {

 		$str .= '<'.$type;

-	    if(is_array($typeDef['attrs'])){

-		foreach($typeDef['attrs'] as $attName => $data){

+	    if (is_array($typeDef['attrs'])) {

+		foreach ($typeDef['attrs'] as $attName => $data) {

 		    $str .= " $attName=\"{type = ".$data['type']."}\"";

 		}

 	    }

 	    $str .= " xmlns=\"".$this->schema['targetNamespace']."\"";

-	    if(count($typeDef['elements']) > 0){

+	    if (count($typeDef['elements']) > 0) {

 		$str .= ">";

-		foreach($typeDef['elements'] as $element => $eData){

+		foreach ($typeDef['elements'] as $element => $eData) {

 		    $str .= $this->serializeTypeDef($element);

 		}

 		$str .= "</$type>";

-	    } elseif($typeDef['typeClass'] == 'element') {

+	    } elseif ($typeDef['typeClass'] == 'element') {

 		$str .= "></$type>";

 	    } else {

 		$str .= "/>";

@@ -831,22 +831,22 @@ 
     * @access public

     * @deprecated

 	*/

-	function typeToForm($name,$type){

+	function typeToForm($name, $type) {

 		// get typedef

-		if($typeDef = $this->getTypeDef($type)){

+		if ($typeDef = $this->getTypeDef($type)) {

 			// if struct

-			if($typeDef['phpType'] == 'struct'){

+			if ($typeDef['phpType'] == 'struct') {

 				$buffer .= '<table>';

-				foreach($typeDef['elements'] as $child => $childDef){

+				foreach ($typeDef['elements'] as $child => $childDef) {

 					$buffer .= "

 					<tr><td align='right'>$childDef[name] (type: ".$this->getLocalPart($childDef['type'])."):</td>

 					<td><input type='text' name='parameters[".$name."][$childDef[name]]'></td></tr>";

 				}

 				$buffer .= '</table>';

 			// if array

-			} elseif($typeDef['phpType'] == 'array'){

+			} elseif ($typeDef['phpType'] == 'array') {

 				$buffer .= '<table>';

-				for($i=0;$i < 3; $i++){

+				for ($i = 0; $i < 3; $i++) {

 					$buffer .= "

 					<tr><td align='right'>array item (type: $typeDef[arrayType]):</td>

 					<td><input type='text' name='parameters[".$name."][]'></td></tr>";

@@ -903,7 +903,7 @@ 
 	* @access public

 	* @see getTypeDef

 	*/

-	function addComplexType($name,$typeClass='complexType',$phpType='array',$compositor='',$restrictionBase='',$elements=array(),$attrs=array(),$arrayType=''){

+	function addComplexType($name, $typeClass = 'complexType', $phpType = 'array', $compositor = '', $restrictionBase = '', $elements = array(), $attrs = array(), $arrayType = '') {

 		$this->complexTypes[$name] = array(

 	    'name'		=> $name,

 	    'typeClass'	=> $typeClass,

@@ -931,7 +931,7 @@ 
 	* @see nusoap_xmlschema

 	* @see getTypeDef

 	*/

-	function addSimpleType($name, $restrictionBase='', $typeClass='simpleType', $phpType='scalar', $enumeration=array()) {

+	function addSimpleType($name, $restrictionBase = '', $typeClass = 'simpleType', $phpType = 'scalar', $enumeration = array()) {

 		$this->simpleTypes[$name] = array(

 	    'name'			=> $name,

 	    'typeClass'		=> $typeClass,

@@ -952,14 +952,14 @@ 
 	* @access public

 	*/

 	function addElement($attrs) {

-		if (! $this->getPrefix($attrs['type'])) {

-			$attrs['type'] = $this->schemaTargetNamespace . ':' . $attrs['type'];

+		if (!$this->getPrefix($attrs['type'])) {

+			$attrs['type'] = $this->schemaTargetNamespace.':'.$attrs['type'];

 		}

-		$this->elements[ $attrs['name'] ] = $attrs;

-		$this->elements[ $attrs['name'] ]['typeClass'] = 'element';

+		$this->elements[$attrs['name']] = $attrs;

+		$this->elements[$attrs['name']]['typeClass'] = 'element';

 		

-		$this->xdebug("addElement " . $attrs['name']);

-		$this->appendDebug($this->varDump($this->elements[ $attrs['name'] ]));

+		$this->xdebug("addElement ".$attrs['name']);

+		$this->appendDebug($this->varDump($this->elements[$attrs['name']]));

 	}

 }