chamilo / chamilo-lms

main/inc/lib/events.lib.php

Spacing +9 added lines, -11 removed lines

@@ -77,9 +77,7 @@ 
         Database::query($sql);
 
         // Auto subscribe
-        $user_status = $userInfo['status']  == SESSIONADMIN ? 'sessionadmin' :
-            $userInfo['status'] == COURSEMANAGER ? 'teacher' :
-                $userInfo['status'] == DRH ? 'DRH' : 'student';
+        $user_status = $userInfo['status'] == SESSIONADMIN ? 'sessionadmin' : $userInfo['status'] == COURSEMANAGER ? 'teacher' : $userInfo['status'] == DRH ? 'DRH' : 'student';
         $autoSubscribe = api_get_setting($user_status.'_autosubscribe');
         if ($autoSubscribe) {
             $autoSubscribe = explode('|', $autoSubscribe);
@@ -336,7 +334,7 @@ 
         global $debug;
 
         if ($debug) error_log('Called to update_event_exercice');
-        if ($debug) error_log('duration:' . $duration);
+        if ($debug) error_log('duration:'.$duration);
 
         if ($exeid != '') {
             /*
@@ -384,7 +382,7 @@ 
         		   status = '".$status."',
         		   questions_to_check = '".$remind_list."',
         		   data_tracking = '".implode(',', $question_list)."',
-                   user_ip = '" . Database::escape_string(api_get_real_ip()) . "'
+                   user_ip = '" . Database::escape_string(api_get_real_ip())."'
         		 WHERE exe_id = '".Database::escape_string($exeid)."'";
             $res = Database::query($sql);
 
@@ -1055,15 +1053,15 @@ 
 
         if (!empty($exe_list) && is_array($exe_list) && count($exe_list) > 0) {
             $sql = "DELETE FROM $track_e_exercises
-                WHERE exe_id IN (" . implode(',', $exe_list) . ")";
+                WHERE exe_id IN (".implode(',', $exe_list).")";
             Database::query($sql);
 
             $sql = "DELETE FROM $track_attempts
-                WHERE exe_id IN (" . implode(',', $exe_list) . ")";
+                WHERE exe_id IN (".implode(',', $exe_list).")";
             Database::query($sql);
 
             $sql = "DELETE FROM $recording_table
-                WHERE exe_id IN (" . implode(',', $exe_list) . ")";
+                WHERE exe_id IN (".implode(',', $exe_list).")";
             Database::query($sql);
         }
 
@@ -1105,7 +1103,7 @@ 
             Event::addEvent(
                 LOG_EXERCISE_RESULT_DELETE,
                 LOG_EXERCISE_AND_USER_ID,
-                $exercise_id . '-' . $user_id,
+                $exercise_id.'-'.$user_id,
                 null,
                 null,
                 $course_id,
@@ -1705,7 +1703,7 @@ 
         Event::addEvent(
             LOG_QUESTION_RESULT_DELETE,
             LOG_EXERCISE_ATTEMPT_QUESTION_ID,
-            $exe_id . '-' . $question_id,
+            $exe_id.'-'.$question_id,
             null,
             null,
             $courseId,
@@ -1741,7 +1739,7 @@ 
         Event::addEvent(
             LOG_QUESTION_RESULT_DELETE,
             LOG_EXERCISE_ATTEMPT_QUESTION_ID,
-            $exe_id . '-' . $question_id,
+            $exe_id.'-'.$question_id,
             null,
             null,
             $courseId,

main/admin/dashboard_add_users_to_user.php

Spacing +30 added lines, -30 removed lines

@@ -24,7 +24,7 @@ 
 
 // setting breadcrumbs
 $interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
-$interbreadcrumb[] = array('url' => 'user_list.php','name' => get_lang('UserList'));
+$interbreadcrumb[] = array('url' => 'user_list.php', 'name' => get_lang('UserList'));
 
 // Database Table Definitions
 $tbl_user = Database::get_main_table(TABLE_MAIN_USER);
@@ -44,17 +44,17 @@ 
 $isAdmin = UserManager::is_admin($user_id);
 if ($isAdmin) {
     $userStatus = PLATFORM_ADMIN;
-    $tool_name= get_lang('AssignUsersToPlatformAdministrator');
+    $tool_name = get_lang('AssignUsersToPlatformAdministrator');
 } else if ($user_info['status'] == SESSIONADMIN) {
-    $tool_name= get_lang('AssignUsersToSessionsAdministrator');
-} else if  ($user_info['status'] == STUDENT_BOSS) {
-    $tool_name= get_lang('AssignUsersToBoss');
+    $tool_name = get_lang('AssignUsersToSessionsAdministrator');
+} else if ($user_info['status'] == STUDENT_BOSS) {
+    $tool_name = get_lang('AssignUsersToBoss');
 } else {
-    $tool_name= get_lang('AssignUsersToHumanResourcesManager');
+    $tool_name = get_lang('AssignUsersToHumanResourcesManager');
 }
 
 $add_type = 'multiple';
-if (isset($_GET['add_type']) && $_GET['add_type']!='') {
+if (isset($_GET['add_type']) && $_GET['add_type'] != '') {
 	$add_type = Security::remove_XSS($_REQUEST['add_type']);
 }
 
@@ -64,7 +64,7 @@ 
 
 function search_users($needle, $type)
 {
-    global $tbl_access_url_rel_user,  $tbl_user, $user_anonymous, $current_user_id, $user_id, $userStatus;
+    global $tbl_access_url_rel_user, $tbl_user, $user_anonymous, $current_user_id, $user_id, $userStatus;
 
     $xajax_response = new xajaxResponse();
     $return = '';
@@ -102,7 +102,7 @@ 
                     LEFT JOIN $tbl_access_url_rel_user au ON (au.user_id = user.user_id)
                     WHERE
                         ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%' AND
-                        status NOT IN(".DRH.", ".SESSIONADMIN.", " . STUDENT_BOSS . ") AND
+                        status NOT IN(".DRH.", ".SESSIONADMIN.", ".STUDENT_BOSS.") AND
                         user.user_id NOT IN ($user_anonymous, $current_user_id, $user_id)
                         $without_assigned_users AND
                         access_url_id = ".api_get_current_access_url_id()."
@@ -114,13 +114,13 @@ 
                     FROM $tbl_user user
                     WHERE
                         ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%' AND
-                        status NOT IN(".DRH.", ".SESSIONADMIN.", " . STUDENT_BOSS . ") AND
+                        status NOT IN(".DRH.", ".SESSIONADMIN.", ".STUDENT_BOSS.") AND
                         user_id NOT IN ($user_anonymous, $current_user_id, $user_id)
                     $without_assigned_users
                     $order_clause
             ";
         }
-        $rs	= Database::query($sql);
+        $rs = Database::query($sql);
         $xajax_response->addAssign('ajax_list_users_multiple', 'innerHTML', api_utf8_encode($return));
 
         if ($type == 'single') {
@@ -140,10 +140,10 @@ 
 
             switch ($userStatus) {
                 case DRH:
-                    $sql .= " user.status <> 6 AND user.status <> " . DRH;
+                    $sql .= " user.status <> 6 AND user.status <> ".DRH;
                     break;
                 case STUDENT_BOSS:
-                    $sql .= " user.status <> 6 AND user.status <> " . STUDENT_BOSS;
+                    $sql .= " user.status <> 6 AND user.status <> ".STUDENT_BOSS;
                     break;
             }
 
@@ -160,12 +160,12 @@ 
                     $return .= '...<br />';
                 }
             }
-           $xajax_response->addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return));
+           $xajax_response->addAssign('ajax_list_users_single', 'innerHTML', api_utf8_encode($return));
         } else {
             $return .= '<select id="origin" class="form-control" name="NoAssignedUsersList[]" multiple="multiple" size="15" ">';
-            while($user = Database :: fetch_array($rs)) {
+            while ($user = Database :: fetch_array($rs)) {
                 $person_name = api_get_person_name($user['firstname'], $user['lastname']);
-                $return .= '<option value="'.$user['user_id'].'" title="'.htmlspecialchars($person_name,ENT_QUOTES).'">'.$person_name.' ('.$user['username'].')</option>';
+                $return .= '<option value="'.$user['user_id'].'" title="'.htmlspecialchars($person_name, ENT_QUOTES).'">'.$person_name.' ('.$user['username'].')</option>';
             }
             $return .= '</select>';
             $xajax_response->addAssign('ajax_list_users_multiple', 'innerHTML', api_utf8_encode($return));
@@ -242,7 +242,7 @@ 
 }
 </script>';
 
-$formSent=0;
+$formSent = 0;
 $errorMsg = '';
 $UserList = array();
 
@@ -257,7 +257,7 @@ 
 
 $searchForm = new FormValidator('search', 'get', api_get_self().'?user='.$user_id);
 $searchForm->addHeader(get_lang('AdvancedSearch'));
-$renderer =& $searchForm->defaultRenderer();
+$renderer = & $searchForm->defaultRenderer();
 
 $searchForm->addElement('hidden', 'user', $user_id);
 foreach ($filters as $param) {
@@ -299,7 +299,7 @@ 
             $affected_rows = 0;
     }
 
-    if ($affected_rows)	{
+    if ($affected_rows) {
         $msg = get_lang('AssignedUsersHaveBeenUpdatedSuccessfully');
     }
 }
@@ -322,7 +322,7 @@ 
 }
 
 $actionsRight = Display::url(
-    '<em class="fa fa-search"></em> ' . get_lang('AdvancedSearch'),
+    '<em class="fa fa-search"></em> '.get_lang('AdvancedSearch'),
     '#',
     array('class' => 'btn btn-default advanced_options', 'id' => 'advanced_search')
 );
@@ -359,13 +359,13 @@ 
 $assigned_users_id = array_keys($assigned_users_to_hrm);
 $without_assigned_users = '';
 if (count($assigned_users_id) > 0) {
-	$without_assigned_users = " user.user_id NOT IN(".implode(',',$assigned_users_id).") AND ";
+	$without_assigned_users = " user.user_id NOT IN(".implode(',', $assigned_users_id).") AND ";
 }
 
 $search_user = '';
 if (!empty($firstLetterUser)) {
 	$needle = Database::escape_string($firstLetterUser);
-	$search_user ="AND ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%'";
+	$search_user = "AND ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%'";
 }
 
 $sqlConditions = null;
@@ -406,12 +406,12 @@ 
 			    $sqlConditions
             ORDER BY firstname ";
 }
-$result	= Database::query($sql);
+$result = Database::query($sql);
 ?>
-<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?user=<?php echo $user_id ?>" class="form-horizontal" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
+<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?user=<?php echo $user_id ?>" class="form-horizontal" <?php if ($ajax_search) {echo ' onsubmit="valide();"'; }?>>
 <input type="hidden" name="formSent" value="1" />
 <?php
-if(!empty($msg)) {
+if (!empty($msg)) {
 	Display::display_normal_message($msg); //main API
 }
 ?>
@@ -427,7 +427,7 @@ 
                         <?php
                             while ($enreg = Database::fetch_array($result)) {
                                 $person_name = api_get_person_name($enreg['firstname'], $enreg['lastname']); ?>
-                                <option value="<?php echo $enreg['user_id']; ?>" <?php echo 'title="'.htmlspecialchars($person_name,ENT_QUOTES).'"';?>>
+                                <option value="<?php echo $enreg['user_id']; ?>" <?php echo 'title="'.htmlspecialchars($person_name, ENT_QUOTES).'"'; ?>>
                                 <?php echo $person_name.' ('.$enreg['username'].')'; ?>
                                 </option>
                         <?php } ?>
@@ -440,8 +440,8 @@ 
     </div>
     <div class="col-md-4">
         <div class="code-course">
-            <?php if($add_type == 'multiple') { ?>
-                <p><?php echo get_lang('FirstLetterUser');?></p>
+            <?php if ($add_type == 'multiple') { ?>
+                <p><?php echo get_lang('FirstLetterUser'); ?></p>
                 <select class="selectpicker show-tick form-control" name="firstLetterUser" onchange = "xajax_search_users(this.value,'multiple')">
                     <option value="%">--</option>
                     <?php echo Display::get_alphabet_options($firstLetterUser); ?>
@@ -492,10 +492,10 @@ 
                 <select id='destination' class="form-control" name="UsersList[]" multiple="multiple" size="15" >
                     <?php
                     if (is_array($assigned_users_to_hrm)) {
-                        foreach($assigned_users_to_hrm as $enreg) {
+                        foreach ($assigned_users_to_hrm as $enreg) {
                             $person_name = api_get_person_name($enreg['firstname'], $enreg['lastname']);
                     ?>
-                            <option value="<?php echo $enreg['user_id']; ?>" <?php echo 'title="'.htmlspecialchars($person_name,ENT_QUOTES).'"'; ?>>
+                            <option value="<?php echo $enreg['user_id']; ?>" <?php echo 'title="'.htmlspecialchars($person_name, ENT_QUOTES).'"'; ?>>
                             <?php echo $person_name.' ('.$enreg['username'].')'; ?>
                             </option>
                         <?php }

main/admin/dashboard_add_sessions_to_user.php

Spacing +17 added lines, -17 removed lines

@@ -46,7 +46,7 @@ 
 }
 
 $add_type = 'multiple';
-if (isset($_GET['add_type']) && $_GET['add_type']!='') {
+if (isset($_GET['add_type']) && $_GET['add_type'] != '') {
     $add_type = Security::remove_XSS($_REQUEST['add_type']);
 }
 
@@ -82,13 +82,13 @@ 
             $sql = "SELECT s.id, s.name FROM $tbl_session s
                     WHERE  s.name LIKE '$needle%' $without_assigned_sessions ";
         }
-        $rs	= Database::query($sql);
+        $rs = Database::query($sql);
         $return .= '<select class="form-control" id="origin" name="NoAssignedSessionsList[]" multiple="multiple" size="20">';
-        while($session = Database :: fetch_array($rs)) {
-            $return .= '<option value="'.$session['id'].'" title="'.htmlspecialchars($session['name'],ENT_QUOTES).'">'.$session['name'].'</option>';
+        while ($session = Database :: fetch_array($rs)) {
+            $return .= '<option value="'.$session['id'].'" title="'.htmlspecialchars($session['name'], ENT_QUOTES).'">'.$session['name'].'</option>';
         }
         $return .= '</select>';
-        $xajax_response->addAssign('ajax_list_sessions_multiple','innerHTML',api_utf8_encode($return));
+        $xajax_response->addAssign('ajax_list_sessions_multiple', 'innerHTML', api_utf8_encode($return));
     }
 
     return $xajax_response;
@@ -147,7 +147,7 @@ 
 }
 </script>';
 
-$formSent=0;
+$formSent = 0;
 $firstLetterSession = isset($_POST['firstLetterSession']) ? $_POST['firstLetterSession'] : null;
 $errorMsg = '';
 $UserList = array();
@@ -171,10 +171,10 @@ 
 
 // Actions
 if ($user_info['status'] != SESSIONADMIN) {
-    $actionsLeft = '<a href="dashboard_add_users_to_user.php?user='.$user_id.'">' .
-        Display::return_icon('add-user.png', get_lang('AssignUsers'), null, ICON_SIZE_MEDIUM ) . '</a>';
-    $actionsLeft .= '<a href="dashboard_add_courses_to_user.php?user='.$user_id.'">' .
-        Display::return_icon('course-add.png', get_lang('AssignCourses'), null, ICON_SIZE_MEDIUM) . '</a>';
+    $actionsLeft = '<a href="dashboard_add_users_to_user.php?user='.$user_id.'">'.
+        Display::return_icon('add-user.png', get_lang('AssignUsers'), null, ICON_SIZE_MEDIUM).'</a>';
+    $actionsLeft .= '<a href="dashboard_add_courses_to_user.php?user='.$user_id.'">'.
+        Display::return_icon('course-add.png', get_lang('AssignCourses'), null, ICON_SIZE_MEDIUM).'</a>';
 }
 
 echo Display::toolbarAction('toolbar-dashboard', array($actionsLeft));
@@ -189,7 +189,7 @@ 
 
 $without_assigned_sessions = '';
 if (count($assigned_sessions_id) > 0) {
-    $without_assigned_sessions = " AND s.id NOT IN (".implode(',',$assigned_sessions_id).") ";
+    $without_assigned_sessions = " AND s.id NOT IN (".implode(',', $assigned_sessions_id).") ";
 }
 
 $needle = '%';
@@ -210,9 +210,9 @@ 
 		    WHERE  s.name LIKE '$needle%' $without_assigned_sessions
             ORDER BY s.name";
 }
-$result	= Database::query($sql);
+$result = Database::query($sql);
 ?>
-<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?user=<?php echo $user_id ?>" style="margin:0px;" <?php if($ajax_search){ echo ' onsubmit="valide();"';}?>>
+<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?user=<?php echo $user_id ?>" style="margin:0px;" <?php if ($ajax_search) { echo ' onsubmit="valide();"'; }?>>
     <input type="hidden" name="formSent" value="1" />
 
     <div class="row">
@@ -223,7 +223,7 @@ 
                     <?php
                     while ($enreg = Database::fetch_array($result)) {
                     ?>
-                        <option value="<?php echo $enreg['id']; ?>" <?php echo 'title="'.htmlspecialchars($enreg['name'],ENT_QUOTES).'"';?>>
+                        <option value="<?php echo $enreg['id']; ?>" <?php echo 'title="'.htmlspecialchars($enreg['name'], ENT_QUOTES).'"'; ?>>
                             <?php echo $enreg['name']; ?>
                         </option>
                     <?php } ?>
@@ -233,7 +233,7 @@ 
         <div class="col-md-4">
             <div class="code-course">
                 <?php if ($add_type == 'multiple') { ?>
-                <p><?php echo get_lang('FirstLetterSession');?> :</p>
+                <p><?php echo get_lang('FirstLetterSession'); ?> :</p>
                 <select class="selectpicker form-control" name="firstLetterSession" onchange = "xajax_search_sessions(this.value, 'multiple')">
                     <option value="%">--</option>
                         <?php  echo Display :: get_alphabet_options($firstLetterSession); ?>
@@ -282,9 +282,9 @@ 
              <select id='destination' name="SessionsList[]" multiple="multiple" size="20" style="width:320px;">
                 <?php
                 if (is_array($assigned_sessions_to_hrm)) {
-                    foreach($assigned_sessions_to_hrm as $enreg) {
+                    foreach ($assigned_sessions_to_hrm as $enreg) {
                         ?>
-                        <option value="<?php echo $enreg['id']; ?>" <?php echo 'title="'.htmlspecialchars($enreg['name'],ENT_QUOTES).'"'; ?>>
+                        <option value="<?php echo $enreg['id']; ?>" <?php echo 'title="'.htmlspecialchars($enreg['name'], ENT_QUOTES).'"'; ?>>
                             <?php echo $enreg['name'] ?>
                         </option>
                 <?php }

main/gradebook/gradebook_edit_link.php

Spacing +4 added lines, -4 removed lines

@@ -24,7 +24,7 @@ 
 }
 
 $linkcat  = isset($_GET['selectcat']) ? (int) $_GET['selectcat'] : 0;
-$linkedit = isset($_GET['editlink']) ? Security::remove_XSS($_GET['editlink']):'';
+$linkedit = isset($_GET['editlink']) ? Security::remove_XSS($_GET['editlink']) : '';
 $course_code = api_get_course_id();
 $session_id = api_get_session_id();
 
@@ -48,7 +48,7 @@ 
     null,
     $link,
     'edit_link_form',
-    api_get_self() . '?selectcat=' . $linkcat. '&editlink=' . $linkedit.'&'.api_get_cidreq()
+    api_get_self().'?selectcat='.$linkcat.'&editlink='.$linkedit.'&'.api_get_cidreq()
 );
 if ($form->validate()) {
     $values = $form->exportValues();
@@ -65,7 +65,7 @@ 
     //Update weight for attendance
     $sql = 'SELECT ref_id FROM '.$tbl_grade_links.'
             WHERE id = '.intval($_GET['editlink']).' AND type='.LINK_ATTENDANCE;
-    $rs_attendance  = Database::query($sql);
+    $rs_attendance = Database::query($sql);
     if (Database::num_rows($rs_attendance) > 0) {
         $row_attendance = Database::fetch_array($rs_attendance);
         $attendance_id  = $row_attendance['ref_id'];
@@ -101,7 +101,7 @@ 
             'type' => LINK_STUDENTPUBLICATION
         ]);
 
-    header('Location: '.$_SESSION['gradebook_dest'].'?linkedited=&selectcat=' . $link->get_category_id().'&'.api_get_cidreq());
+    header('Location: '.$_SESSION['gradebook_dest'].'?linkedited=&selectcat='.$link->get_category_id().'&'.api_get_cidreq());
     exit;
 }
 

main/admin/settings.php

Spacing +2 added lines, -2 removed lines

@@ -59,7 +59,7 @@ 
     Display::addFlash(Display::return_message(get_lang('FileDeleted')));
 }
 
-if (isset($_GET['action']) &&  $_GET['action'] == 'delete_grading') {
+if (isset($_GET['action']) && $_GET['action'] == 'delete_grading') {
     $id = intval($_GET['id']);
     api_delete_setting_option($id);
 }
@@ -226,7 +226,7 @@ 
         // Set true for allow_message_tool variable if social tool is actived
         foreach ($convert_byte_to_mega_list as $item) {
             if (isset($values[$item])) {
-                $values[$item] = round($values[$item]*1024*1024);
+                $values[$item] = round($values[$item] * 1024 * 1024);
             }
         }
 

main/mySpace/student.php

Spacing +4 added lines, -4 removed lines

@@ -31,7 +31,7 @@ 
     );
 }
 
-if (isset($_GET["user_id"]) && $_GET["user_id"]!="" && isset($_GET["type"]) && $_GET["type"] == "coach") {
+if (isset($_GET["user_id"]) && $_GET["user_id"] != "" && isset($_GET["type"]) && $_GET["type"] == "coach") {
     $interbreadcrumb[] = array("url" => "coaches.php", "name" => get_lang('Tutors'));
 }
 
@@ -167,7 +167,7 @@ 
             $detailsLink = '<a href="myStudents.php?student='.$student_id.'&id_coach='.$coach_id.'&id_session='.$sessionId.'">
 				            '.Display::return_icon('2rightarrow.png').'</a>';
         } else {
-            $detailsLink =  '<a href="myStudents.php?student='.$student_id.'">
+            $detailsLink = '<a href="myStudents.php?student='.$student_id.'">
 				             '.Display::return_icon('2rightarrow.png').'</a>';
         }
 
@@ -239,7 +239,7 @@ 
     );
     $actionsLeft .= Display::url(
         Display::return_icon("statistics.png", get_lang("CompanyReport"), array(), ICON_SIZE_MEDIUM),
-        api_get_path(WEB_CODE_PATH) . "mySpace/company_reports.php"
+        api_get_path(WEB_CODE_PATH)."mySpace/company_reports.php"
     );
     $actionsLeft .= Display::url(
         Display::return_icon(
@@ -248,7 +248,7 @@ 
             [],
             ICON_SIZE_MEDIUM
         ),
-        api_get_path(WEB_CODE_PATH) . "gradebook/certificate_report.php"
+        api_get_path(WEB_CODE_PATH)."gradebook/certificate_report.php"
     );
 }
 

main/session/session_category_edit.php

Spacing +96 added lines, -96 removed lines

@@ -33,10 +33,10 @@ 
 	exit();
 }
 
-list($year_start,$month_start,$day_start)=explode('-',$infos['date_start']);
-list($year_end,$month_end,$day_end)=explode('-',$infos['date_end']);
+list($year_start, $month_start, $day_start) = explode('-', $infos['date_start']);
+list($year_end, $month_end, $day_end) = explode('-', $infos['date_end']);
 
-if (!api_is_platform_admin() && $infos['session_admin_id']!=$_user['user_id'] && !api_is_session_admin()) {
+if (!api_is_platform_admin() && $infos['session_admin_id'] != $_user['user_id'] && !api_is_session_admin()) {
 	api_not_allowed(true);
 }
 
@@ -73,24 +73,24 @@ 
 // display the header
 Display::display_header($tool_name);
 if (!empty($return)) {
-	Display::display_error_message($return,false);
+	Display::display_error_message($return, false);
 }
 ?>
 <div class="row">
     <div class="col-md-12">
         <form method="post" name="form" action="<?php echo api_get_self(); ?>?id=<?php echo $id; ?>" class="form-horizontal">
         <input type="hidden" name="formSent" value="1">
-        <legend><?php echo $tool_name;?> </legend>
+        <legend><?php echo $tool_name; ?> </legend>
         <div class="form-group">
             <label class="col-sm-3 control-label"><?php echo get_lang('SessionName') ?></label>
             <div class="col-sm-6">
-                <input class="form-control" type="text" name="name" size="50" maxlength="50" value="<?php if($formSent) echo api_htmlentities($name,ENT_QUOTES,$charset); else echo api_htmlentities($infos['name'],ENT_QUOTES,$charset); ?>">
+                <input class="form-control" type="text" name="name" size="50" maxlength="50" value="<?php if ($formSent) echo api_htmlentities($name, ENT_QUOTES, $charset); else echo api_htmlentities($infos['name'], ENT_QUOTES, $charset); ?>">
             </div>
             <div class="col-sm-3"></div>
         </div>
         <div class="form-group">
             <div class="col-sm-offset-3 col-sm-6">
-                <?php echo get_lang('TheTimeLimitsAreReferential');?>
+                <?php echo get_lang('TheTimeLimitsAreReferential'); ?>
                 <a href="javascript://" onclick="if(document.getElementById('options').style.display == 'none'){document.getElementById('options').style.display = 'block';}else{document.getElementById('options').style.display = 'none';}"><?php echo get_lang('EditTimeLimit') ?></a>
             </div>
         </div>
@@ -100,58 +100,58 @@ 
                 <div class="col-sm-6">
                     <select name="day_start">
                         <option value="1">01</option>
-                        <option value="2" <?php if($day_start == 2) echo 'selected="selected"'; ?> >02</option>
-                        <option value="3" <?php if($day_start == 3) echo 'selected="selected"'; ?> >03</option>
-                        <option value="4" <?php if($day_start == 4) echo 'selected="selected"'; ?> >04</option>
-                        <option value="5" <?php if($day_start == 5) echo 'selected="selected"'; ?> >05</option>
-                        <option value="6" <?php if($day_start == 6) echo 'selected="selected"'; ?> >06</option>
-                        <option value="7" <?php if($day_start == 7) echo 'selected="selected"'; ?> >07</option>
-                        <option value="8" <?php if($day_start == 8) echo 'selected="selected"'; ?> >08</option>
-                        <option value="9" <?php if($day_start == 9) echo 'selected="selected"'; ?> >09</option>
-                        <option value="10" <?php if($day_start == 10) echo 'selected="selected"'; ?> >10</option>
-                        <option value="11" <?php if($day_start == 11) echo 'selected="selected"'; ?> >11</option>
-                        <option value="12" <?php if($day_start == 12) echo 'selected="selected"'; ?> >12</option>
-                        <option value="13" <?php if($day_start == 13) echo 'selected="selected"'; ?> >13</option>
-                        <option value="14" <?php if($day_start == 14) echo 'selected="selected"'; ?> >14</option>
-                        <option value="15" <?php if($day_start == 15) echo 'selected="selected"'; ?> >15</option>
-                        <option value="16" <?php if($day_start == 16) echo 'selected="selected"'; ?> >16</option>
-                        <option value="17" <?php if($day_start == 17) echo 'selected="selected"'; ?> >17</option>
-                        <option value="18" <?php if($day_start == 18) echo 'selected="selected"'; ?> >18</option>
-                        <option value="19" <?php if($day_start == 19) echo 'selected="selected"'; ?> >19</option>
-                        <option value="20" <?php if($day_start == 20) echo 'selected="selected"'; ?> >20</option>
-                        <option value="21" <?php if($day_start == 21) echo 'selected="selected"'; ?> >21</option>
-                        <option value="22" <?php if($day_start == 22) echo 'selected="selected"'; ?> >22</option>
-                        <option value="23" <?php if($day_start == 23) echo 'selected="selected"'; ?> >23</option>
-                        <option value="24" <?php if($day_start == 24) echo 'selected="selected"'; ?> >24</option>
-                        <option value="25" <?php if($day_start == 25) echo 'selected="selected"'; ?> >25</option>
-                        <option value="26" <?php if($day_start == 26) echo 'selected="selected"'; ?> >26</option>
-                        <option value="27" <?php if($day_start == 27) echo 'selected="selected"'; ?> >27</option>
-                        <option value="28" <?php if($day_start == 28) echo 'selected="selected"'; ?> >28</option>
-                        <option value="29" <?php if($day_start == 29) echo 'selected="selected"'; ?> >29</option>
-                        <option value="30" <?php if($day_start == 30) echo 'selected="selected"'; ?> >30</option>
-                        <option value="31" <?php if($day_start == 31) echo 'selected="selected"'; ?> >31</option>
+                        <option value="2" <?php if ($day_start == 2) echo 'selected="selected"'; ?> >02</option>
+                        <option value="3" <?php if ($day_start == 3) echo 'selected="selected"'; ?> >03</option>
+                        <option value="4" <?php if ($day_start == 4) echo 'selected="selected"'; ?> >04</option>
+                        <option value="5" <?php if ($day_start == 5) echo 'selected="selected"'; ?> >05</option>
+                        <option value="6" <?php if ($day_start == 6) echo 'selected="selected"'; ?> >06</option>
+                        <option value="7" <?php if ($day_start == 7) echo 'selected="selected"'; ?> >07</option>
+                        <option value="8" <?php if ($day_start == 8) echo 'selected="selected"'; ?> >08</option>
+                        <option value="9" <?php if ($day_start == 9) echo 'selected="selected"'; ?> >09</option>
+                        <option value="10" <?php if ($day_start == 10) echo 'selected="selected"'; ?> >10</option>
+                        <option value="11" <?php if ($day_start == 11) echo 'selected="selected"'; ?> >11</option>
+                        <option value="12" <?php if ($day_start == 12) echo 'selected="selected"'; ?> >12</option>
+                        <option value="13" <?php if ($day_start == 13) echo 'selected="selected"'; ?> >13</option>
+                        <option value="14" <?php if ($day_start == 14) echo 'selected="selected"'; ?> >14</option>
+                        <option value="15" <?php if ($day_start == 15) echo 'selected="selected"'; ?> >15</option>
+                        <option value="16" <?php if ($day_start == 16) echo 'selected="selected"'; ?> >16</option>
+                        <option value="17" <?php if ($day_start == 17) echo 'selected="selected"'; ?> >17</option>
+                        <option value="18" <?php if ($day_start == 18) echo 'selected="selected"'; ?> >18</option>
+                        <option value="19" <?php if ($day_start == 19) echo 'selected="selected"'; ?> >19</option>
+                        <option value="20" <?php if ($day_start == 20) echo 'selected="selected"'; ?> >20</option>
+                        <option value="21" <?php if ($day_start == 21) echo 'selected="selected"'; ?> >21</option>
+                        <option value="22" <?php if ($day_start == 22) echo 'selected="selected"'; ?> >22</option>
+                        <option value="23" <?php if ($day_start == 23) echo 'selected="selected"'; ?> >23</option>
+                        <option value="24" <?php if ($day_start == 24) echo 'selected="selected"'; ?> >24</option>
+                        <option value="25" <?php if ($day_start == 25) echo 'selected="selected"'; ?> >25</option>
+                        <option value="26" <?php if ($day_start == 26) echo 'selected="selected"'; ?> >26</option>
+                        <option value="27" <?php if ($day_start == 27) echo 'selected="selected"'; ?> >27</option>
+                        <option value="28" <?php if ($day_start == 28) echo 'selected="selected"'; ?> >28</option>
+                        <option value="29" <?php if ($day_start == 29) echo 'selected="selected"'; ?> >29</option>
+                        <option value="30" <?php if ($day_start == 30) echo 'selected="selected"'; ?> >30</option>
+                        <option value="31" <?php if ($day_start == 31) echo 'selected="selected"'; ?> >31</option>
                   </select>
                   /
                   <select name="month_start">
                         <option value="1">01</option>
-                        <option value="2" <?php if($month_start == 2) echo 'selected="selected"'; ?> >02</option>
-                        <option value="3" <?php if($month_start == 3) echo 'selected="selected"'; ?> >03</option>
-                        <option value="4" <?php if($month_start == 4) echo 'selected="selected"'; ?> >04</option>
-                        <option value="5" <?php if($month_start == 5) echo 'selected="selected"'; ?> >05</option>
-                        <option value="6" <?php if($month_start == 6) echo 'selected="selected"'; ?> >06</option>
-                        <option value="7" <?php if($month_start == 7) echo 'selected="selected"'; ?> >07</option>
-                        <option value="8" <?php if($month_start == 8) echo 'selected="selected"'; ?> >08</option>
-                        <option value="9" <?php if($month_start == 9) echo 'selected="selected"'; ?> >09</option>
-                        <option value="10" <?php if($month_start == 10) echo 'selected="selected"'; ?> >10</option>
-                        <option value="11" <?php if($month_start == 11) echo 'selected="selected"'; ?> >11</option>
-                        <option value="12" <?php if($month_start == 12) echo 'selected="selected"'; ?> >12</option>
+                        <option value="2" <?php if ($month_start == 2) echo 'selected="selected"'; ?> >02</option>
+                        <option value="3" <?php if ($month_start == 3) echo 'selected="selected"'; ?> >03</option>
+                        <option value="4" <?php if ($month_start == 4) echo 'selected="selected"'; ?> >04</option>
+                        <option value="5" <?php if ($month_start == 5) echo 'selected="selected"'; ?> >05</option>
+                        <option value="6" <?php if ($month_start == 6) echo 'selected="selected"'; ?> >06</option>
+                        <option value="7" <?php if ($month_start == 7) echo 'selected="selected"'; ?> >07</option>
+                        <option value="8" <?php if ($month_start == 8) echo 'selected="selected"'; ?> >08</option>
+                        <option value="9" <?php if ($month_start == 9) echo 'selected="selected"'; ?> >09</option>
+                        <option value="10" <?php if ($month_start == 10) echo 'selected="selected"'; ?> >10</option>
+                        <option value="11" <?php if ($month_start == 11) echo 'selected="selected"'; ?> >11</option>
+                        <option value="12" <?php if ($month_start == 12) echo 'selected="selected"'; ?> >12</option>
                   </select>
                   /
                 <select name="year_start">
                         <?php
-                        for($i=$thisYear-5;$i <= ($thisYear+5);$i++)
+                        for ($i = $thisYear - 5; $i <= ($thisYear + 5); $i++)
                         { ?>
-                                <option value="<?php echo $i; ?>" <?php if($year_start == $i) echo 'selected="selected"'; ?> ><?php echo $i; ?></option>
+                                <option value="<?php echo $i; ?>" <?php if ($year_start == $i) echo 'selected="selected"'; ?> ><?php echo $i; ?></option>
                         <?php
                         } ?>
                 </select>
@@ -163,61 +163,61 @@ 
                 <div class="col-sm-6">
                     <select name="day_end">
                         <option value="0">--</option>
-                        <option value="1" <?php if($day_end == 1) echo 'selected="selected"'; ?> >01</option>
-                        <option value="2" <?php if($day_end == 2) echo 'selected="selected"'; ?> >02</option>
-                        <option value="3" <?php if($day_end == 3) echo 'selected="selected"'; ?> >03</option>
-                        <option value="4" <?php if($day_end == 4) echo 'selected="selected"'; ?> >04</option>
-                        <option value="5" <?php if($day_end == 5) echo 'selected="selected"'; ?> >05</option>
-                        <option value="6" <?php if($day_end == 6) echo 'selected="selected"'; ?> >06</option>
-                        <option value="7" <?php if($day_end == 7) echo 'selected="selected"'; ?> >07</option>
-                        <option value="8" <?php if($day_end == 8) echo 'selected="selected"'; ?> >08</option>
-                        <option value="9" <?php if($day_end == 9) echo 'selected="selected"'; ?> >09</option>
-                        <option value="10" <?php if($day_end == 10) echo 'selected="selected"'; ?> >10</option>
-                        <option value="11" <?php if($day_end == 11) echo 'selected="selected"'; ?> >11</option>
-                        <option value="12" <?php if($day_end == 12) echo 'selected="selected"'; ?> >12</option>
-                        <option value="13" <?php if($day_end == 13) echo 'selected="selected"'; ?> >13</option>
-                        <option value="14" <?php if($day_end == 14) echo 'selected="selected"'; ?> >14</option>
-                        <option value="15" <?php if($day_end == 15) echo 'selected="selected"'; ?> >15</option>
-                        <option value="16" <?php if($day_end == 16) echo 'selected="selected"'; ?> >16</option>
-                        <option value="17" <?php if($day_end == 17) echo 'selected="selected"'; ?> >17</option>
-                        <option value="18" <?php if($day_end == 18) echo 'selected="selected"'; ?> >18</option>
-                        <option value="19" <?php if($day_end == 19) echo 'selected="selected"'; ?> >19</option>
-                        <option value="20" <?php if($day_end == 20) echo 'selected="selected"'; ?> >20</option>
-                        <option value="21" <?php if($day_end == 21) echo 'selected="selected"'; ?> >21</option>
-                        <option value="22" <?php if($day_end == 22) echo 'selected="selected"'; ?> >22</option>
-                        <option value="23" <?php if($day_end == 23) echo 'selected="selected"'; ?> >23</option>
-                        <option value="24" <?php if($day_end == 24) echo 'selected="selected"'; ?> >24</option>
-                        <option value="25" <?php if($day_end == 25) echo 'selected="selected"'; ?> >25</option>
-                        <option value="26" <?php if($day_end == 26) echo 'selected="selected"'; ?> >26</option>
-                        <option value="27" <?php if($day_end == 27) echo 'selected="selected"'; ?> >27</option>
-                        <option value="28" <?php if($day_end == 28) echo 'selected="selected"'; ?> >28</option>
-                        <option value="29" <?php if($day_end == 29) echo 'selected="selected"'; ?> >29</option>
-                        <option value="30" <?php if($day_end == 30) echo 'selected="selected"'; ?> >30</option>
-                        <option value="31" <?php if($day_end == 31) echo 'selected="selected"'; ?> >31</option>
+                        <option value="1" <?php if ($day_end == 1) echo 'selected="selected"'; ?> >01</option>
+                        <option value="2" <?php if ($day_end == 2) echo 'selected="selected"'; ?> >02</option>
+                        <option value="3" <?php if ($day_end == 3) echo 'selected="selected"'; ?> >03</option>
+                        <option value="4" <?php if ($day_end == 4) echo 'selected="selected"'; ?> >04</option>
+                        <option value="5" <?php if ($day_end == 5) echo 'selected="selected"'; ?> >05</option>
+                        <option value="6" <?php if ($day_end == 6) echo 'selected="selected"'; ?> >06</option>
+                        <option value="7" <?php if ($day_end == 7) echo 'selected="selected"'; ?> >07</option>
+                        <option value="8" <?php if ($day_end == 8) echo 'selected="selected"'; ?> >08</option>
+                        <option value="9" <?php if ($day_end == 9) echo 'selected="selected"'; ?> >09</option>
+                        <option value="10" <?php if ($day_end == 10) echo 'selected="selected"'; ?> >10</option>
+                        <option value="11" <?php if ($day_end == 11) echo 'selected="selected"'; ?> >11</option>
+                        <option value="12" <?php if ($day_end == 12) echo 'selected="selected"'; ?> >12</option>
+                        <option value="13" <?php if ($day_end == 13) echo 'selected="selected"'; ?> >13</option>
+                        <option value="14" <?php if ($day_end == 14) echo 'selected="selected"'; ?> >14</option>
+                        <option value="15" <?php if ($day_end == 15) echo 'selected="selected"'; ?> >15</option>
+                        <option value="16" <?php if ($day_end == 16) echo 'selected="selected"'; ?> >16</option>
+                        <option value="17" <?php if ($day_end == 17) echo 'selected="selected"'; ?> >17</option>
+                        <option value="18" <?php if ($day_end == 18) echo 'selected="selected"'; ?> >18</option>
+                        <option value="19" <?php if ($day_end == 19) echo 'selected="selected"'; ?> >19</option>
+                        <option value="20" <?php if ($day_end == 20) echo 'selected="selected"'; ?> >20</option>
+                        <option value="21" <?php if ($day_end == 21) echo 'selected="selected"'; ?> >21</option>
+                        <option value="22" <?php if ($day_end == 22) echo 'selected="selected"'; ?> >22</option>
+                        <option value="23" <?php if ($day_end == 23) echo 'selected="selected"'; ?> >23</option>
+                        <option value="24" <?php if ($day_end == 24) echo 'selected="selected"'; ?> >24</option>
+                        <option value="25" <?php if ($day_end == 25) echo 'selected="selected"'; ?> >25</option>
+                        <option value="26" <?php if ($day_end == 26) echo 'selected="selected"'; ?> >26</option>
+                        <option value="27" <?php if ($day_end == 27) echo 'selected="selected"'; ?> >27</option>
+                        <option value="28" <?php if ($day_end == 28) echo 'selected="selected"'; ?> >28</option>
+                        <option value="29" <?php if ($day_end == 29) echo 'selected="selected"'; ?> >29</option>
+                        <option value="30" <?php if ($day_end == 30) echo 'selected="selected"'; ?> >30</option>
+                        <option value="31" <?php if ($day_end == 31) echo 'selected="selected"'; ?> >31</option>
                   </select>
                   /
                   <select name="month_end">
                         <option value="0">--</option>
-                        <option value="1" <?php if($month_end == 1) echo 'selected="selected"'; ?> >01</option>
-                        <option value="2" <?php if($month_end == 2) echo 'selected="selected"'; ?> >02</option>
-                        <option value="3" <?php if($month_end == 3) echo 'selected="selected"'; ?> >03</option>
-                        <option value="4" <?php if($month_end == 4) echo 'selected="selected"'; ?> >04</option>
-                        <option value="5" <?php if($month_end == 5) echo 'selected="selected"'; ?> >05</option>
-                        <option value="6" <?php if($month_end == 6) echo 'selected="selected"'; ?> >06</option>
-                        <option value="7" <?php if($month_end == 7) echo 'selected="selected"'; ?> >07</option>
-                        <option value="8" <?php if($month_end == 8) echo 'selected="selected"'; ?> >08</option>
-                        <option value="9" <?php if($month_end == 9) echo 'selected="selected"'; ?> >09</option>
-                        <option value="10" <?php if($month_end == 10) echo 'selected="selected"'; ?> >10</option>
-                        <option value="11" <?php if($month_end == 11) echo 'selected="selected"'; ?> >11</option>
-                        <option value="12" <?php if($month_end == 12) echo 'selected="selected"'; ?> >12</option>
+                        <option value="1" <?php if ($month_end == 1) echo 'selected="selected"'; ?> >01</option>
+                        <option value="2" <?php if ($month_end == 2) echo 'selected="selected"'; ?> >02</option>
+                        <option value="3" <?php if ($month_end == 3) echo 'selected="selected"'; ?> >03</option>
+                        <option value="4" <?php if ($month_end == 4) echo 'selected="selected"'; ?> >04</option>
+                        <option value="5" <?php if ($month_end == 5) echo 'selected="selected"'; ?> >05</option>
+                        <option value="6" <?php if ($month_end == 6) echo 'selected="selected"'; ?> >06</option>
+                        <option value="7" <?php if ($month_end == 7) echo 'selected="selected"'; ?> >07</option>
+                        <option value="8" <?php if ($month_end == 8) echo 'selected="selected"'; ?> >08</option>
+                        <option value="9" <?php if ($month_end == 9) echo 'selected="selected"'; ?> >09</option>
+                        <option value="10" <?php if ($month_end == 10) echo 'selected="selected"'; ?> >10</option>
+                        <option value="11" <?php if ($month_end == 11) echo 'selected="selected"'; ?> >11</option>
+                        <option value="12" <?php if ($month_end == 12) echo 'selected="selected"'; ?> >12</option>
                   </select>
                   /
                   <select name="year_end">
                         <option value="0">----</option>
                         <?php
-                        for($i=$thisYear-5;$i <= ($thisYear+5);$i++)
+                        for ($i = $thisYear - 5; $i <= ($thisYear + 5); $i++)
                         { ?>
-                         <option value="<?php echo $i; ?>" <?php if($year_end == $i) echo 'selected="selected"'; ?> ><?php echo $i; ?></option>
+                         <option value="<?php echo $i; ?>" <?php if ($year_end == $i) echo 'selected="selected"'; ?> ><?php echo $i; ?></option>
                         <?php
                         } ?>
                  </select>
@@ -238,7 +238,7 @@ 
 
 
 <script>
-<?php if($year_start=="0000") echo "setDisable(document.form.nolimit);\r\n"; ?>
+<?php if ($year_start == "0000") echo "setDisable(document.form.nolimit);\r\n"; ?>
 function setDisable(select){
 	document.form.day_start.disabled = (select.checked) ? true : false;
 	document.form.month_start.disabled = (select.checked) ? true : false;

main/user/add_users_to_session.php

Spacing +39 added lines, -39 removed lines

@@ -22,9 +22,9 @@ 
 
 // setting breadcrumbs
 if (api_is_platform_admin()) {
-    $interbreadcrumb[] = array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
-    $interbreadcrumb[] = array('url' => 'session_list.php','name' => get_lang('SessionList'));
-    $interbreadcrumb[] = array('url' => "resume_session.php?id_session=".$id_session,"name" => get_lang('SessionOverview'));
+    $interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
+    $interbreadcrumb[] = array('url' => 'session_list.php', 'name' => get_lang('SessionList'));
+    $interbreadcrumb[] = array('url' => "resume_session.php?id_session=".$id_session, "name" => get_lang('SessionOverview'));
 }
 $allowTutors = api_get_setting('allow_tutors_to_assign_students_to_session');
 $extra_field_list = [];
@@ -39,7 +39,7 @@ 
     $tool_name = get_lang('SubscribeUsersToSession');
     $add_type = 'unique';
 
-    if (isset($_REQUEST['add_type']) && $_REQUEST['add_type']!='') {
+    if (isset($_REQUEST['add_type']) && $_REQUEST['add_type'] != '') {
         $add_type = Security::remove_XSS($_REQUEST['add_type']);
     }
 
@@ -51,7 +51,7 @@ 
     if (is_array($extra_field_list)) {
     	foreach ($extra_field_list as $extra_field) {
     		//if is enabled to filter and is a "<select>" field type
-    		if ($extra_field[8]==1 && $extra_field[2]==4 ) {
+    		if ($extra_field[8] == 1 && $extra_field[2] == 4) {
                 $new_field_list[] = array(
                     'name' => $extra_field[3],
                     'variable' => $extra_field[1],
@@ -74,7 +74,7 @@ 
     	if (!empty($needle) && !empty($type)) {
 
             //normal behaviour
-            if ($type == 'any_session' && $needle == 'false')  {
+            if ($type == 'any_session' && $needle == 'false') {
                 $type = 'multiple';
                 $needle = '';
             }
@@ -88,7 +88,7 @@ 
     		$cond_user_id = '';
 
             //Only for single & multiple
-            if (in_array($type, array('single','multiple'))) {
+            if (in_array($type, array('single', 'multiple'))) {
         		if (!empty($id_session)) {
         		    $id_session = intval($id_session);
         			// check id_user from session_rel_user table
@@ -98,11 +98,11 @@ 
         			$user_ids = array();
         			if (Database::num_rows($res) > 0) {
         				while ($row = Database::fetch_row($res)) {
-        					$user_ids[] = (int)$row[0];
+        					$user_ids[] = (int) $row[0];
         				}
         			}
         			if (count($user_ids) > 0) {
-        				$cond_user_id = ' AND user.user_id NOT IN('.implode(",",$user_ids).')';
+        				$cond_user_id = ' AND user.user_id NOT IN('.implode(",", $user_ids).')';
         			}
         		}
             }
@@ -138,7 +138,7 @@ 
                     break;
     		}
     		if (api_is_multiple_url_enabled()) {
-    			$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+    			$tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
     			$access_url_id = api_get_current_access_url_id();
     			if ($access_url_id != -1) {
                     switch ($type) {
@@ -183,11 +183,11 @@ 
     		}
 
     		$rs = Database::query($sql);
-            $i=0;
+            $i = 0;
     		if ($type == 'single') {
     			while ($user = Database::fetch_array($rs)) {
     	            $i++;
-    	            if ($i<=10) {
+    	            if ($i <= 10) {
                 		$person_name = api_get_person_name($user['firstname'], $user['lastname']);
     					$return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_session(\''.$user['user_id'].'\',\''.$person_name.' ('.$user['username'].')'.'\')">'.$person_name.' ('.$user['username'].')</a><br />';
     	            } else {
@@ -195,7 +195,7 @@ 
     	            }
     			}
 
-    			$xajax_response -> addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return));
+    			$xajax_response -> addAssign('ajax_list_users_single', 'innerHTML', api_utf8_encode($return));
     		} else {
     			$return .= '<select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" style="width:360px;">';
     			while ($user = Database :: fetch_array($rs)) {
@@ -203,7 +203,7 @@ 
     	            $return .= '<option value="'.$user['user_id'].'">'.$person_name.' ('.$user['username'].')</option>';
     			}
     			$return .= '</select>';
-    			$xajax_response -> addAssign('ajax_list_users_multiple','innerHTML',api_utf8_encode($return));
+    			$xajax_response -> addAssign('ajax_list_users_multiple', 'innerHTML', api_utf8_encode($return));
     		}
     	}
 
@@ -260,7 +260,7 @@ 
     </script>';
 
     $form_sent = 0;
-    $firstLetterUser = $firstLetterSession='';
+    $firstLetterUser = $firstLetterSession = '';
     $UserList = $SessionList = array();
     $sessions = array();
     $noPHP_SELF = true;
@@ -272,7 +272,7 @@ 
         $UserList = $_POST['sessionUsersList'];
 
         if (!is_array($UserList)) {
-            $UserList=array();
+            $UserList = array();
         }
 
         if ($form_sent == 1) {
@@ -302,7 +302,7 @@ 
                 WHERE u.status <> ".DRH." AND u.status<>6 $order_clause";
 
         if (api_is_multiple_url_enabled()) {
-            $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+            $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
             $access_url_id = api_get_current_access_url_id();
             if ($access_url_id != -1) {
                 $sql = "SELECT u.user_id, lastname, firstname, username, session_id
@@ -321,7 +321,7 @@ 
         $result = Database::query($sql);
         $users = Database::store_result($result);
         foreach ($users as $user) {
-            $sessionUsersList[$user['user_id']] = $user ;
+            $sessionUsersList[$user['user_id']] = $user;
         }
         unset($users); //clean to free memory
     } else {
@@ -333,7 +333,7 @@ 
                 foreach ($new_field_list as $new_field) {
                     $varname = 'field_'.$new_field['variable'];
                     if (UserManager::is_extra_field_available($new_field['variable'])) {
-                        if (isset($_POST[$varname]) && $_POST[$varname]!='0') {
+                        if (isset($_POST[$varname]) && $_POST[$varname] != '0') {
                             $use_extra_fields = true;
                             $extra_field_result[] = UserManager::get_extra_user_data_by_value(
                                 $new_field['variable'],
@@ -347,9 +347,9 @@ 
 
         if ($use_extra_fields) {
             $final_result = array();
-           	if (count($extra_field_result)>1) {
-    	    for($i=0;$i<count($extra_field_result)-1;$i++) {
-                    if (is_array($extra_field_result[$i+1])) {
+           	if (count($extra_field_result) > 1) {
+    	    for ($i = 0; $i < count($extra_field_result) - 1; $i++) {
+                    if (is_array($extra_field_result[$i + 1])) {
                         $final_result = array_intersect(
                             $extra_field_result[$i],
                             $extra_field_result[$i + 1]
@@ -360,17 +360,17 @@ 
                 $final_result = $extra_field_result[0];
             }
 
-            $where_filter ='';
+            $where_filter = '';
             if (api_is_multiple_url_enabled()) {
-                if (is_array($final_result) && count($final_result)>0) {
-                    $where_filter = " AND u.user_id IN  ('".implode("','",$final_result)."') ";
+                if (is_array($final_result) && count($final_result) > 0) {
+                    $where_filter = " AND u.user_id IN  ('".implode("','", $final_result)."') ";
                 } else {
                     //no results
                     $where_filter = " AND u.user_id  = -1";
                 }
             } else {
-                if (is_array($final_result) && count($final_result)>0) {
-                    $where_filter = " WHERE u.user_id IN  ('".implode("','",$final_result)."') ";
+                if (is_array($final_result) && count($final_result) > 0) {
+                    $where_filter = " WHERE u.user_id IN  ('".implode("','", $final_result)."') ";
                 } else {
                     //no results
                     $where_filter = " WHERE u.user_id  = -1";
@@ -399,7 +399,7 @@ 
                     $order_clause";
         }
         if (api_is_multiple_url_enabled()) {
-            $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+            $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
             $access_url_id = api_get_current_access_url_id();
             if ($access_url_id != -1) {
                 $sql = "SELECT  u.user_id, lastname, firstname, username, session_id
@@ -416,7 +416,7 @@ 
         }
 
         $result = Database::query($sql);
-        $users = Database::store_result($result,'ASSOC');
+        $users = Database::store_result($result, 'ASSOC');
 
         foreach ($users as $uid => $user) {
             if ($user['session_id'] != $id_session) {
@@ -441,7 +441,7 @@ 
                 WHERE u.status <> ".DRH." AND u.status<>6 $order_clause";
 
         if (api_is_multiple_url_enabled()) {
-            $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+            $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
             $access_url_id = api_get_current_access_url_id();
             if ($access_url_id != -1) {
                 $sql = "SELECT  u.user_id, lastname, firstname, username, session_id
@@ -457,11 +457,11 @@ 
             }
         }
         $result = Database::query($sql);
-        $users = Database::store_result($result,'ASSOC');
+        $users = Database::store_result($result, 'ASSOC');
         foreach ($users as $uid => $user) {
             if ($user['session_id'] == $id_session) {
                 $sessionUsersList[$user['user_id']] = $user;
-                if (array_key_exists($user['user_id'],$nosessionUsersList)) {
+                if (array_key_exists($user['user_id'], $nosessionUsersList)) {
                     unset($nosessionUsersList[$user['user_id']]);
                 }
             }
@@ -483,20 +483,20 @@ 
     <div class="actions">
     	<?php echo $link_add_type_unique ?>&nbsp;|&nbsp;<?php echo $link_add_type_multiple ?>&nbsp;|&nbsp;<?php echo $link_add_group; ?>
     </div>
-    <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?page=<?php echo $page; ?>&id_session=<?php echo $id_session; ?><?php if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
-    <?php echo '<legend>'.$tool_name.' (' . $session->getName() . ') </legend>'; ?>
+    <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?page=<?php echo $page; ?>&id_session=<?php echo $id_session; ?><?php if (!empty($_GET['add'])) echo '&add=true'; ?>" style="margin:0px;" <?php if ($ajax_search) {echo ' onsubmit="valide();"'; }?>>
+    <?php echo '<legend>'.$tool_name.' ('.$session->getName().') </legend>'; ?>
     <?php
     if ($add_type === 'multiple') {
     	if (is_array($extra_field_list)) {
-    		if (is_array($new_field_list) && count($new_field_list)>0 ) {
+    		if (is_array($new_field_list) && count($new_field_list) > 0) {
     			echo '<h3>'.get_lang('FilterUsers').'</h3>';
     			foreach ($new_field_list as $new_field) {
     				echo $new_field['name'];
     				$varname = 'field_'.$new_field['variable'];
     				echo '&nbsp;<select name="'.$varname.'">';
     				echo '<option value="0">--'.get_lang('Select').'--</option>';
-    				foreach	($new_field['data'] as $option) {
-    					$checked='';
+    				foreach ($new_field['data'] as $option) {
+    					$checked = '';
     					if (isset($_POST[$varname])) {
     						if ($_POST[$varname] == $option[1]) {
     							$checked = 'selected="true"';
@@ -544,7 +544,7 @@ 
                   <?php
                   foreach ($nosessionUsersList as $uid => $enreg) {
                   ?>
-                      <option value="<?php echo $uid; ?>" <?php if(in_array($uid,$UserList)) echo 'selected="selected"'; ?>><?php echo api_get_person_name($enreg['fn'], $enreg['ln']).' ('.$enreg['un'].')'; ?></option>
+                      <option value="<?php echo $uid; ?>" <?php if (in_array($uid, $UserList)) echo 'selected="selected"'; ?>><?php echo api_get_person_name($enreg['fn'], $enreg['ln']).' ('.$enreg['un'].')'; ?></option>
                   <?php
                   }
                   ?>
@@ -596,7 +596,7 @@ 
             </div>
             <select id="destination_users" name="sessionUsersList[]" multiple="multiple" size="15" class="span5">
             <?php
-            foreach($sessionUsersList as $enreg) {
+            foreach ($sessionUsersList as $enreg) {
             ?>
                 <option value="<?php echo $enreg['user_id']; ?>"><?php echo api_get_person_name($enreg['firstname'], $enreg['lastname']).' ('.$enreg['username'].')'; ?></option>
             <?php

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

Spacing +205 added lines, -207 removed lines

@@ -45,13 +45,13 @@ 
 	var $proxypassword = '';

 	var $timeout = 0;

 	var $response_timeout = 30;

-	var $curl_options = array();	// User-specified cURL options

-	var $use_curl = false;			// whether to always try to use cURL

+	var $curl_options = array(); // User-specified cURL options

+	var $use_curl = false; // whether to always try to use cURL

 	// for HTTP authentication

-	var $username = '';				// Username for HTTP authentication

-	var $password = '';				// Password for HTTP authentication

-	var $authtype = '';				// Type of HTTP authentication

-	var $certRequest = array();		// Certificate for HTTP SSL authentication

+	var $username = ''; // Username for HTTP authentication

+	var $password = ''; // Password for HTTP authentication

+	var $authtype = ''; // Type of HTTP authentication

+	var $certRequest = array(); // Certificate for HTTP SSL authentication

 

     /**

      * constructor

@@ -67,7 +67,7 @@ 
 	 * @param boolean $use_curl try to use cURL

      * @access public

      */

-    function __construct($wsdl = '',$proxyhost=false,$proxyport=false,$proxyusername=false,$proxypassword=false,$timeout=0,$response_timeout=30,$curl_options=null,$use_curl=false){

+    function __construct($wsdl = '', $proxyhost = false, $proxyport = false, $proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30, $curl_options = null, $use_curl = false) {

 		parent::__construct();

 		$this->debug("ctor wsdl=$wsdl timeout=$timeout response_timeout=$response_timeout");

         $this->proxyhost = $proxyhost;

@@ -103,19 +103,19 @@ 
     		// Schema imports

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

     			foreach ($list as $xs) {

-					$wsdlparts = parse_url($this->wsdl);	// this is bogusly simple!

+					$wsdlparts = parse_url($this->wsdl); // this is bogusly simple!

 		            foreach ($xs->imports as $ns2 => $list2) {

 		                for ($ii = 0; $ii < count($list2); $ii++) {

-		                	if (! $list2[$ii]['loaded']) {

+		                	if (!$list2[$ii]['loaded']) {

 		                		$this->schemas[$ns]->imports[$ns2][$ii]['loaded'] = true;

 		                		$url = $list2[$ii]['location'];

 								if ($url != '') {

 									$urlparts = parse_url($url);

 									if (!isset($urlparts['host'])) {

-										$url = $wsdlparts['scheme'] . '://' . $wsdlparts['host'] . (isset($wsdlparts['port']) ? ':' .$wsdlparts['port'] : '') .

-												substr($wsdlparts['path'],0,strrpos($wsdlparts['path'],'/') + 1) .$urlparts['path'];

+										$url = $wsdlparts['scheme'].'://'.$wsdlparts['host'].(isset($wsdlparts['port']) ? ':'.$wsdlparts['port'] : '').

+												substr($wsdlparts['path'], 0, strrpos($wsdlparts['path'], '/') + 1).$urlparts['path'];

 									}

-									if (! in_array($url, $imported_urls)) {

+									if (!in_array($url, $imported_urls)) {

 					                	$this->parseWSDL($url);

 				                		$imported++;

 				                		$imported_urls[] = $url;

@@ -129,19 +129,19 @@ 
     			}

     		}

     		// WSDL imports

-			$wsdlparts = parse_url($this->wsdl);	// this is bogusly simple!

+			$wsdlparts = parse_url($this->wsdl); // this is bogusly simple!

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

                 for ($ii = 0; $ii < count($list); $ii++) {

-                	if (! $list[$ii]['loaded']) {

+                	if (!$list[$ii]['loaded']) {

                 		$this->import[$ns][$ii]['loaded'] = true;

                 		$url = $list[$ii]['location'];

 						if ($url != '') {

 							$urlparts = parse_url($url);

 							if (!isset($urlparts['host'])) {

-								$url = $wsdlparts['scheme'] . '://' . $wsdlparts['host'] . (isset($wsdlparts['port']) ? ':' . $wsdlparts['port'] : '') .

-										substr($wsdlparts['path'],0,strrpos($wsdlparts['path'],'/') + 1) .$urlparts['path'];

+								$url = $wsdlparts['scheme'].'://'.$wsdlparts['host'].(isset($wsdlparts['port']) ? ':'.$wsdlparts['port'] : '').

+										substr($wsdlparts['path'], 0, strrpos($wsdlparts['path'], '/') + 1).$urlparts['path'];

 							}

-							if (! in_array($url, $imported_urls)) {

+							if (!in_array($url, $imported_urls)) {

 			                	$this->parseWSDL($url);

 		                		$imported++;

 		                		$imported_urls[] = $url;

@@ -154,30 +154,28 @@ 
             }

 		}

         // add new data to operation data

-        foreach($this->bindings as $binding => $bindingData) {

+        foreach ($this->bindings as $binding => $bindingData) {

             if (isset($bindingData['operations']) && is_array($bindingData['operations'])) {

-                foreach($bindingData['operations'] as $operation => $data) {

-                    $this->debug('post-parse data gathering for ' . $operation);

+                foreach ($bindingData['operations'] as $operation => $data) {

+                    $this->debug('post-parse data gathering for '.$operation);

                     $this->bindings[$binding]['operations'][$operation]['input'] =

 						isset($this->bindings[$binding]['operations'][$operation]['input']) ?

-						array_merge($this->bindings[$binding]['operations'][$operation]['input'], $this->portTypes[ $bindingData['portType'] ][$operation]['input']) :

-						$this->portTypes[ $bindingData['portType'] ][$operation]['input'];

+						array_merge($this->bindings[$binding]['operations'][$operation]['input'], $this->portTypes[$bindingData['portType']][$operation]['input']) : $this->portTypes[$bindingData['portType']][$operation]['input'];

                     $this->bindings[$binding]['operations'][$operation]['output'] =

 						isset($this->bindings[$binding]['operations'][$operation]['output']) ?

-						array_merge($this->bindings[$binding]['operations'][$operation]['output'], $this->portTypes[ $bindingData['portType'] ][$operation]['output']) :

-						$this->portTypes[ $bindingData['portType'] ][$operation]['output'];

-                    if(isset($this->messages[ $this->bindings[$binding]['operations'][$operation]['input']['message'] ])){

-						$this->bindings[$binding]['operations'][$operation]['input']['parts'] = $this->messages[ $this->bindings[$binding]['operations'][$operation]['input']['message'] ];

+						array_merge($this->bindings[$binding]['operations'][$operation]['output'], $this->portTypes[$bindingData['portType']][$operation]['output']) : $this->portTypes[$bindingData['portType']][$operation]['output'];

+                    if (isset($this->messages[$this->bindings[$binding]['operations'][$operation]['input']['message']])) {

+						$this->bindings[$binding]['operations'][$operation]['input']['parts'] = $this->messages[$this->bindings[$binding]['operations'][$operation]['input']['message']];

 					}

-					if(isset($this->messages[ $this->bindings[$binding]['operations'][$operation]['output']['message'] ])){

-                   		$this->bindings[$binding]['operations'][$operation]['output']['parts'] = $this->messages[ $this->bindings[$binding]['operations'][$operation]['output']['message'] ];

+					if (isset($this->messages[$this->bindings[$binding]['operations'][$operation]['output']['message']])) {

+                   		$this->bindings[$binding]['operations'][$operation]['output']['parts'] = $this->messages[$this->bindings[$binding]['operations'][$operation]['output']['message']];

                     }

                     // Set operation style if necessary, but do not override one already provided

 					if (isset($bindingData['style']) && !isset($this->bindings[$binding]['operations'][$operation]['style'])) {

                         $this->bindings[$binding]['operations'][$operation]['style'] = $bindingData['style'];

                     }

                     $this->bindings[$binding]['operations'][$operation]['transport'] = isset($bindingData['transport']) ? $bindingData['transport'] : '';

-                    $this->bindings[$binding]['operations'][$operation]['documentation'] = isset($this->portTypes[ $bindingData['portType'] ][$operation]['documentation']) ? $this->portTypes[ $bindingData['portType'] ][$operation]['documentation'] : '';

+                    $this->bindings[$binding]['operations'][$operation]['documentation'] = isset($this->portTypes[$bindingData['portType']][$operation]['documentation']) ? $this->portTypes[$bindingData['portType']][$operation]['documentation'] : '';

                     $this->bindings[$binding]['operations'][$operation]['endpoint'] = isset($bindingData['endpoint']) ? $bindingData['endpoint'] : '';

                 }

             }

@@ -203,13 +201,13 @@ 
         $wsdl_props = parse_url($wsdl);

 

         if (isset($wsdl_props['scheme']) && ($wsdl_props['scheme'] == 'http' || $wsdl_props['scheme'] == 'https')) {

-            $this->debug('getting WSDL http(s) URL ' . $wsdl);

+            $this->debug('getting WSDL http(s) URL '.$wsdl);

         	// get wsdl

 	        $tr = new soap_transport_http($wsdl, $this->curl_options, $this->use_curl);

 			$tr->request_method = 'GET';

 			$tr->useSOAPAction = false;

-			if($this->proxyhost && $this->proxyport){

-				$tr->setProxy($this->proxyhost,$this->proxyport,$this->proxyusername,$this->proxypassword);

+			if ($this->proxyhost && $this->proxyport) {

+				$tr->setProxy($this->proxyhost, $this->proxyport, $this->proxyusername, $this->proxypassword);

 			}

 			if ($this->authtype != '') {

 				$tr->setCredentials($this->username, $this->password, $this->authtype, array(), $this->certRequest);

@@ -220,8 +218,8 @@ 
 			//$this->debug("WSDL response\n" . $tr->incoming_payload);

 			$this->appendDebug($tr->getDebug());

 			// catch errors

-			if($err = $tr->getError() ){

-				$errstr = 'Getting ' . $wsdl . ' - HTTP ERROR: '.$err;

+			if ($err = $tr->getError()) {

+				$errstr = 'Getting '.$wsdl.' - HTTP ERROR: '.$err;

 				$this->debug($errstr);

 	            $this->setError($errstr);

 				unset($tr);

@@ -232,11 +230,11 @@ 
         } else {

             // $wsdl is not http(s), so treat it as a file URL or plain file path

         	if (isset($wsdl_props['scheme']) && ($wsdl_props['scheme'] == 'file') && isset($wsdl_props['path'])) {

-        		$path = isset($wsdl_props['host']) ? ($wsdl_props['host'] . ':' . $wsdl_props['path']) : $wsdl_props['path'];

+        		$path = isset($wsdl_props['host']) ? ($wsdl_props['host'].':'.$wsdl_props['path']) : $wsdl_props['path'];

         	} else {

         		$path = $wsdl;

         	}

-            $this->debug('getting WSDL file ' . $path);

+            $this->debug('getting WSDL file '.$path);

             if ($fp = @fopen($path, 'r')) {

                 $wsdl_string = '';

                 while ($data = fread($fp, 32768)) {

@@ -272,7 +270,7 @@ 
                 xml_error_string(xml_get_error_code($this->parser))

                 );

             $this->debug($errstr);

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

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

             $this->setError($errstr);

             return false;

         }

@@ -280,7 +278,7 @@ 
         xml_parser_free($this->parser);

         $this->debug('Parsing WSDL done');

 		// catch wsdl parse errors

-		if($this->getError()){

+		if ($this->getError()) {

 			return false;

 		}

         return true;

@@ -318,21 +316,21 @@ 
             // process attributes

             if (count($attrs) > 0) {

 				// register namespace declarations

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

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

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

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

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

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

                         } else {

-                            $this->namespaces['ns' . (count($this->namespaces) + 1)] = $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') {

                             $this->XMLSchemaVersion = $v;

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

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

                         }

                     }

                 }

                 // expand each attribute prefix to its namespace

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

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

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

                     if ($k != 'location' && $k != 'soapAction' && $k != 'namespace') {

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

@@ -358,12 +356,12 @@ 
                 case 'message':

                     if ($name == 'part') {

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

-		                    $this->debug("msg " . $this->currentMessage . ": found part (with type) $attrs[name]: " . implode(',', $attrs));

+		                    $this->debug("msg ".$this->currentMessage.": found part (with type) $attrs[name]: ".implode(',', $attrs));

 		                    $this->messages[$this->currentMessage][$attrs['name']] = $attrs['type'];

             			}

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

-		                    $this->debug("msg " . $this->currentMessage . ": found part (with element) $attrs[name]: " . implode(',', $attrs));

-			                $this->messages[$this->currentMessage][$attrs['name']] = $attrs['element'] . '^';

+		                    $this->debug("msg ".$this->currentMessage.": found part (with element) $attrs[name]: ".implode(',', $attrs));

+			                $this->messages[$this->currentMessage][$attrs['name']] = $attrs['element'].'^';

 			            }

         			}

         			break;

@@ -432,15 +430,15 @@ 
 					switch ($name) {

 					    case 'port':

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

-					        $this->debug('current port: ' . $this->currentPort);

+					        $this->debug('current port: '.$this->currentPort);

 					        $this->ports[$this->currentPort]['binding'] = $this->getLocalPart($attrs['binding']);

 

 					        break;

 					    case 'address':

 					        $this->ports[$this->currentPort]['location'] = $attrs['location'];

 					        $this->ports[$this->currentPort]['bindingType'] = $namespace;

-					        $this->bindings[ $this->ports[$this->currentPort]['binding'] ]['bindingType'] = $namespace;

-					        $this->bindings[ $this->ports[$this->currentPort]['binding'] ]['endpoint'] = $attrs['location'];

+					        $this->bindings[$this->ports[$this->currentPort]['binding']]['bindingType'] = $namespace;

+					        $this->bindings[$this->ports[$this->currentPort]['binding']]['endpoint'] = $attrs['location'];

 					        break;

 					}

 					break;

@@ -450,13 +448,13 @@ 
 			case 'import':

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

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

-                    $this->debug('parsing import ' . $attrs['namespace']. ' - ' . $attrs['location'] . ' (' . count($this->import[$attrs['namespace']]).')');

+                    $this->debug('parsing import '.$attrs['namespace'].' - '.$attrs['location'].' ('.count($this->import[$attrs['namespace']]).')');

 				} else {

                     $this->import[$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'];

 					}

-                    $this->debug('parsing import ' . $attrs['namespace']. ' - [no location] (' . count($this->import[$attrs['namespace']]).')');

+                    $this->debug('parsing import '.$attrs['namespace'].' - [no location] ('.count($this->import[$attrs['namespace']]).')');

 				}

 				break;

 			//wait for schema

@@ -483,13 +481,13 @@ 
 					}

 					$this->status = 'binding';

 					$this->bindings[$this->currentBinding]['portType'] = $this->getLocalPart($attrs['type']);

-					$this->debug("current binding: $this->currentBinding of portType: " . $attrs['type']);

+					$this->debug("current binding: $this->currentBinding of portType: ".$attrs['type']);

 				}

 				break;

 			case 'service':

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

 				$this->status = 'service';

-				$this->debug('current service: ' . $this->serviceName);

+				$this->debug('current service: '.$this->serviceName);

 				break;

 			case 'definitions':

 				foreach ($attrs as $name => $value) {

@@ -507,7 +505,7 @@ 
 	* @param string $name element name

 	* @access private

 	*/

-	function end_element($parser, $name){

+	function end_element($parser, $name) {

 		// unset schema status

 		if (/*preg_match('/types$/', $name) ||*/ preg_match('/schema$/', $name)) {

 			$this->status = "";

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

 		$this->debug("getOperations for port '$portName' bindingType $bindingType");

 		// loop thru ports

-		foreach($this->ports as $port => $portData) {

-			$this->debug("getOperations checking port $port bindingType " . $portData['bindingType']);

+		foreach ($this->ports as $port => $portData) {

+			$this->debug("getOperations checking port $port bindingType ".$portData['bindingType']);

 			if ($portName == '' || $port == $portName) {

 				// binding type of port matches parameter

 				if ($portData['bindingType'] == $bindingType) {

@@ -601,8 +599,8 @@ 
 					//$this->debug("port data: " . $this->varDump($portData));

 					//$this->debug("bindings: " . $this->varDump($this->bindings[ $portData['binding'] ]));

 					// merge bindings

-					if (isset($this->bindings[ $portData['binding'] ]['operations'])) {

-						$ops = array_merge ($ops, $this->bindings[ $portData['binding'] ]['operations']);

+					if (isset($this->bindings[$portData['binding']]['operations'])) {

+						$ops = array_merge($ops, $this->bindings[$portData['binding']]['operations']);

 					}

 				}

 			}

@@ -629,15 +627,15 @@ 
 			$bindingType = 'http://schemas.xmlsoap.org/wsdl/soap12/';

 		}

 		// loop thru ports

-		foreach($this->ports as $port => $portData) {

+		foreach ($this->ports as $port => $portData) {

 			// binding type of port matches parameter

 			if ($portData['bindingType'] == $bindingType) {

 				// get binding

 				//foreach($this->bindings[ $portData['binding'] ]['operations'] as $bOperation => $opData) {

-				foreach(array_keys($this->bindings[ $portData['binding'] ]['operations']) as $bOperation) {

+				foreach (array_keys($this->bindings[$portData['binding']]['operations']) as $bOperation) {

 					// note that we could/should also check the namespace here

 					if ($operation == $bOperation) {

-						$opData = $this->bindings[ $portData['binding'] ]['operations'][$operation];

+						$opData = $this->bindings[$portData['binding']]['operations'][$operation];

 					    return $opData;

 					}

 				}

@@ -660,11 +658,11 @@ 
 			$bindingType = 'http://schemas.xmlsoap.org/wsdl/soap12/';

 		}

 		// loop thru ports

-		foreach($this->ports as $port => $portData) {

+		foreach ($this->ports as $port => $portData) {

 			// binding type of port matches parameter

 			if ($portData['bindingType'] == $bindingType) {

 				// loop through operations for the binding

-				foreach ($this->bindings[ $portData['binding'] ]['operations'] as $bOperation => $opData) {

+				foreach ($this->bindings[$portData['binding']]['operations'] as $bOperation => $opData) {

 					if ($opData['soapAction'] == $soapAction) {

 					    return $opData;

 					}

@@ -693,7 +691,7 @@ 
     */

 	function getTypeDef($type, $ns) {

 		$this->debug("in getTypeDef: type=$type, ns=$ns");

-		if ((! $ns) && isset($this->namespaces['tns'])) {

+		if ((!$ns) && isset($this->namespaces['tns'])) {

 			$ns = $this->namespaces['tns'];

 			$this->debug("in getTypeDef: type namespace forced to $ns");

 		}

@@ -751,7 +749,7 @@ 
     *

     * @access private

     */

-    function webDescription(){

+    function webDescription() {

     	global $HTTP_SERVER_VARS;

 

 		if (isset($_SERVER)) {

@@ -845,19 +843,19 @@ 
 				<p>View the <a href="'.$PHP_SELF.'?wsdl">WSDL</a> for the service.

 				Click on an operation name to view it&apos;s details.</p>

 				<ul>';

-				foreach($this->getOperations() as $op => $data){

+				foreach ($this->getOperations() as $op => $data) {

 				    $b .= "<li><a href='#' onclick=\"popout();popup('$op')\">$op</a></li>";

 				    // create hidden div

 				    $b .= "<div id='$op' class='hidden'>

 				    <a href='#' onclick='popout()'><font color='#ffffff'>Close</font></a><br><br>";

-				    foreach($data as $donnie => $marie){ // loop through opdata

-						if($donnie == 'input' || $donnie == 'output'){ // show input/output data

+				    foreach ($data as $donnie => $marie) { // loop through opdata

+						if ($donnie == 'input' || $donnie == 'output') { // show input/output data

 						    $b .= "<font color='white'>".ucfirst($donnie).':</font><br>';

-						    foreach($marie as $captain => $tenille){ // loop through data

-								if($captain == 'parts'){ // loop thru parts

+						    foreach ($marie as $captain => $tenille) { // loop through data

+								if ($captain == 'parts') { // loop thru parts

 								    $b .= "&nbsp;&nbsp;$captain:<br>";

 					                //if(is_array($tenille)){

-								    	foreach($tenille as $joanie => $chachi){

+								    	foreach ($tenille as $joanie => $chachi) {

 											$b .= "&nbsp;&nbsp;&nbsp;&nbsp;$joanie: $chachi<br>";

 								    	}

 					        		//}

@@ -889,31 +887,31 @@ 
 	{

 		$xml = '<?xml version="1.0" encoding="ISO-8859-1"?>';

 		$xml .= "\n<definitions";

-		foreach($this->namespaces as $k => $v) {

+		foreach ($this->namespaces as $k => $v) {

 			$xml .= " xmlns:$k=\"$v\"";

 		}

 		// 10.9.02 - add poulter fix for wsdl and tns declarations

 		if (isset($this->namespaces['wsdl'])) {

-			$xml .= " xmlns=\"" . $this->namespaces['wsdl'] . "\"";

+			$xml .= " xmlns=\"".$this->namespaces['wsdl']."\"";

 		}

 		if (isset($this->namespaces['tns'])) {

-			$xml .= " targetNamespace=\"" . $this->namespaces['tns'] . "\"";

+			$xml .= " targetNamespace=\"".$this->namespaces['tns']."\"";

 		}

 		$xml .= '>';

 		// imports

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

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

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

 				foreach ($list as $ii) {

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

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

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

 					} else {

-						$xml .= '<import namespace="' . $ns . '" />';

+						$xml .= '<import namespace="'.$ns.'" />';

 					}

 				}

 			}

 		}

 		// types

-		if (count($this->schemas)>=1) {

+		if (count($this->schemas) >= 1) {

 			$xml .= "\n<types>\n";

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

 				foreach ($list as $xs) {

@@ -924,10 +922,10 @@ 
 		}

 		// messages

 		if (count($this->messages) >= 1) {

-			foreach($this->messages as $msgName => $msgParts) {

-				$xml .= "\n<message name=\"" . $msgName . '">';

-				if(is_array($msgParts)){

-					foreach($msgParts as $partName => $partType) {

+			foreach ($this->messages as $msgName => $msgParts) {

+				$xml .= "\n<message name=\"".$msgName.'">';

+				if (is_array($msgParts)) {

+					foreach ($msgParts as $partName => $partType) {

 						// print 'serializing '.$partType.', sv: '.$this->XMLSchemaVersion.'<br>';

 						if (strpos($partType, ':')) {

 						    $typePrefix = $this->getPrefixFromNamespace($this->getPrefix($partType));

@@ -935,7 +933,7 @@ 
 						    // print 'checking typemap: '.$this->XMLSchemaVersion.'<br>';

 						    $typePrefix = 'xsd';

 						} else {

-						    foreach($this->typemap as $ns => $types) {

+						    foreach ($this->typemap as $ns => $types) {

 						        if (isset($types[$partType])) {

 						            $typePrefix = $this->getPrefixFromNamespace($ns);

 						        }

@@ -955,7 +953,7 @@ 
 						} else {

 							$elementortype = 'type';

 						}

-						$xml .= "\n" . '  <part name="' . $partName . '" ' . $elementortype . '="' . $typePrefix . ':' . $localPart . '" />';

+						$xml .= "\n".'  <part name="'.$partName.'" '.$elementortype.'="'.$typePrefix.':'.$localPart.'" />';

 					}

 				}

 				$xml .= '</message>';

@@ -965,54 +963,54 @@ 
 		if (count($this->bindings) >= 1) {

 			$binding_xml = '';

 			$portType_xml = '';

-			foreach($this->bindings as $bindingName => $attrs) {

-				$binding_xml .= "\n<binding name=\"" . $bindingName . '" type="tns:' . $attrs['portType'] . '">';

-				$binding_xml .= "\n" . '  <soap:binding style="' . $attrs['style'] . '" transport="' . $attrs['transport'] . '"/>';

-				$portType_xml .= "\n<portType name=\"" . $attrs['portType'] . '">';

-				foreach($attrs['operations'] as $opName => $opParts) {

-					$binding_xml .= "\n" . '  <operation name="' . $opName . '">';

-					$binding_xml .= "\n" . '    <soap:operation soapAction="' . $opParts['soapAction'] . '" style="'. $opParts['style'] . '"/>';

+			foreach ($this->bindings as $bindingName => $attrs) {

+				$binding_xml .= "\n<binding name=\"".$bindingName.'" type="tns:'.$attrs['portType'].'">';

+				$binding_xml .= "\n".'  <soap:binding style="'.$attrs['style'].'" transport="'.$attrs['transport'].'"/>';

+				$portType_xml .= "\n<portType name=\"".$attrs['portType'].'">';

+				foreach ($attrs['operations'] as $opName => $opParts) {

+					$binding_xml .= "\n".'  <operation name="'.$opName.'">';

+					$binding_xml .= "\n".'    <soap:operation soapAction="'.$opParts['soapAction'].'" style="'.$opParts['style'].'"/>';

 					if (isset($opParts['input']['encodingStyle']) && $opParts['input']['encodingStyle'] != '') {

-						$enc_style = ' encodingStyle="' . $opParts['input']['encodingStyle'] . '"';

+						$enc_style = ' encodingStyle="'.$opParts['input']['encodingStyle'].'"';

 					} else {

 						$enc_style = '';

 					}

-					$binding_xml .= "\n" . '    <input><soap:body use="' . $opParts['input']['use'] . '" namespace="' . $opParts['input']['namespace'] . '"' . $enc_style . '/></input>';

+					$binding_xml .= "\n".'    <input><soap:body use="'.$opParts['input']['use'].'" namespace="'.$opParts['input']['namespace'].'"'.$enc_style.'/></input>';

 					if (isset($opParts['output']['encodingStyle']) && $opParts['output']['encodingStyle'] != '') {

-						$enc_style = ' encodingStyle="' . $opParts['output']['encodingStyle'] . '"';

+						$enc_style = ' encodingStyle="'.$opParts['output']['encodingStyle'].'"';

 					} else {

 						$enc_style = '';

 					}

-					$binding_xml .= "\n" . '    <output><soap:body use="' . $opParts['output']['use'] . '" namespace="' . $opParts['output']['namespace'] . '"' . $enc_style . '/></output>';

-					$binding_xml .= "\n" . '  </operation>';

-					$portType_xml .= "\n" . '  <operation name="' . $opParts['name'] . '"';

+					$binding_xml .= "\n".'    <output><soap:body use="'.$opParts['output']['use'].'" namespace="'.$opParts['output']['namespace'].'"'.$enc_style.'/></output>';

+					$binding_xml .= "\n".'  </operation>';

+					$portType_xml .= "\n".'  <operation name="'.$opParts['name'].'"';

 					if (isset($opParts['parameterOrder'])) {

-					    $portType_xml .= ' parameterOrder="' . $opParts['parameterOrder'] . '"';

+					    $portType_xml .= ' parameterOrder="'.$opParts['parameterOrder'].'"';

 					}

 					$portType_xml .= '>';

-					if(isset($opParts['documentation']) && $opParts['documentation'] != '') {

-						$portType_xml .= "\n" . '    <documentation>' . htmlspecialchars($opParts['documentation']) . '</documentation>';

+					if (isset($opParts['documentation']) && $opParts['documentation'] != '') {

+						$portType_xml .= "\n".'    <documentation>'.htmlspecialchars($opParts['documentation']).'</documentation>';

 					}

-					$portType_xml .= "\n" . '    <input message="tns:' . $opParts['input']['message'] . '"/>';

-					$portType_xml .= "\n" . '    <output message="tns:' . $opParts['output']['message'] . '"/>';

-					$portType_xml .= "\n" . '  </operation>';

+					$portType_xml .= "\n".'    <input message="tns:'.$opParts['input']['message'].'"/>';

+					$portType_xml .= "\n".'    <output message="tns:'.$opParts['output']['message'].'"/>';

+					$portType_xml .= "\n".'  </operation>';

 				}

-				$portType_xml .= "\n" . '</portType>';

-				$binding_xml .= "\n" . '</binding>';

+				$portType_xml .= "\n".'</portType>';

+				$binding_xml .= "\n".'</binding>';

 			}

-			$xml .= $portType_xml . $binding_xml;

+			$xml .= $portType_xml.$binding_xml;

 		}

 		// services

-		$xml .= "\n<service name=\"" . $this->serviceName . '">';

+		$xml .= "\n<service name=\"".$this->serviceName.'">';

 		if (count($this->ports) >= 1) {

-			foreach($this->ports as $pName => $attrs) {

-				$xml .= "\n" . '  <port name="' . $pName . '" binding="tns:' . $attrs['binding'] . '">';

-				$xml .= "\n" . '    <soap:address location="' . $attrs['location'] . ($debug ? '?debug=1' : '') . '"/>';

-				$xml .= "\n" . '  </port>';

+			foreach ($this->ports as $pName => $attrs) {

+				$xml .= "\n".'  <port name="'.$pName.'" binding="tns:'.$attrs['binding'].'">';

+				$xml .= "\n".'    <soap:address location="'.$attrs['location'].($debug ? '?debug=1' : '').'"/>';

+				$xml .= "\n".'  </port>';

 			}

 		}

-		$xml .= "\n" . '</service>';

-		return $xml . "\n</definitions>";

+		$xml .= "\n".'</service>';

+		return $xml."\n</definitions>";

 	}

 

 	/**

@@ -1109,7 +1107,7 @@ 
 	 */

 	function serializeRPCParameters($operation, $direction, $parameters, $bindingType = 'soap') {

 		$this->debug("in serializeRPCParameters: operation=$operation, direction=$direction, XMLSchemaVersion=$this->XMLSchemaVersion, bindingType=$bindingType");

-		$this->appendDebug('parameters=' . $this->varDump($parameters));

+		$this->appendDebug('parameters='.$this->varDump($parameters));

 

 		if ($direction != 'input' && $direction != 'output') {

 			$this->debug('The value of the \$direction argument needs to be either "input" or "output"');

@@ -1117,8 +1115,8 @@ 
 			return false;

 		}

 		if (!$opData = $this->getOperationData($operation, $bindingType)) {

-			$this->debug('Unable to retrieve WSDL data for operation: ' . $operation . ' bindingType: ' . $bindingType);

-			$this->setError('Unable to retrieve WSDL data for operation: ' . $operation . ' bindingType: ' . $bindingType);

+			$this->debug('Unable to retrieve WSDL data for operation: '.$operation.' bindingType: '.$bindingType);

+			$this->setError('Unable to retrieve WSDL data for operation: '.$operation.' bindingType: '.$bindingType);

 			return false;

 		}

 		$this->debug('in serializeRPCParameters: opData:');

@@ -1126,7 +1124,7 @@ 
 

 		// Get encoding style for output and set to current

 		$encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';

-		if(($direction == 'input') && isset($opData['output']['encodingStyle']) && ($opData['output']['encodingStyle'] != $encodingStyle)) {

+		if (($direction == 'input') && isset($opData['output']['encodingStyle']) && ($opData['output']['encodingStyle'] != $encodingStyle)) {

 			$encodingStyle = $opData['output']['encodingStyle'];

 			$enc_style = $encodingStyle;

 		}

@@ -1211,7 +1209,7 @@ 
 	function serializeParameters($operation, $direction, $parameters)

 	{

 		$this->debug("in serializeParameters: operation=$operation, direction=$direction, XMLSchemaVersion=$this->XMLSchemaVersion");

-		$this->appendDebug('parameters=' . $this->varDump($parameters));

+		$this->appendDebug('parameters='.$this->varDump($parameters));

 

 		if ($direction != 'input' && $direction != 'output') {

 			$this->debug('The value of the \$direction argument needs to be either "input" or "output"');

@@ -1219,8 +1217,8 @@ 
 			return false;

 		}

 		if (!$opData = $this->getOperationData($operation)) {

-			$this->debug('Unable to retrieve WSDL data for operation: ' . $operation);

-			$this->setError('Unable to retrieve WSDL data for operation: ' . $operation);

+			$this->debug('Unable to retrieve WSDL data for operation: '.$operation);

+			$this->setError('Unable to retrieve WSDL data for operation: '.$operation);

 			return false;

 		}

 		$this->debug('opData:');

@@ -1228,7 +1226,7 @@ 
 

 		// Get encoding style for output and set to current

 		$encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';

-		if(($direction == 'input') && isset($opData['output']['encodingStyle']) && ($opData['output']['encodingStyle'] != $encodingStyle)) {

+		if (($direction == 'input') && isset($opData['output']['encodingStyle']) && ($opData['output']['encodingStyle'] != $encodingStyle)) {

 			$encodingStyle = $opData['output']['encodingStyle'];

 			$enc_style = $encodingStyle;

 		}

@@ -1239,14 +1237,14 @@ 
 

 			$use = $opData[$direction]['use'];

 			$this->debug("use=$use");

-			$this->debug('got ' . count($opData[$direction]['parts']) . ' part(s)');

+			$this->debug('got '.count($opData[$direction]['parts']).' part(s)');

 			if (is_array($parameters)) {

 				$parametersArrayType = $this->isArraySimpleOrStruct($parameters);

-				$this->debug('have ' . $parametersArrayType . ' parameters');

-				foreach($opData[$direction]['parts'] as $name => $type) {

+				$this->debug('have '.$parametersArrayType.' parameters');

+				foreach ($opData[$direction]['parts'] as $name => $type) {

 					$this->debug('serializing part "'.$name.'" of type "'.$type.'"');

 					// Track encoding style

-					if(isset($opData[$direction]['encodingStyle']) && $encodingStyle != $opData[$direction]['encodingStyle']) {

+					if (isset($opData[$direction]['encodingStyle']) && $encodingStyle != $opData[$direction]['encodingStyle']) {

 						$encodingStyle = $opData[$direction]['encodingStyle'];

 						$enc_style = $encodingStyle;

 					} else {

@@ -1287,18 +1285,18 @@ 
 	 * @return string value serialized as an XML string

 	 * @access private

 	 */

-	function serializeType($name, $type, $value, $use='encoded', $encodingStyle=false, $unqualified=false)

+	function serializeType($name, $type, $value, $use = 'encoded', $encodingStyle = false, $unqualified = false)

 	{

-		$this->debug("in serializeType: name=$name, type=$type, use=$use, encodingStyle=$encodingStyle, unqualified=" . ($unqualified ? "unqualified" : "qualified"));

-		$this->appendDebug("value=" . $this->varDump($value));

-		if($use == 'encoded' && $encodingStyle) {

-			$encodingStyle = ' SOAP-ENV:encodingStyle="' . $encodingStyle . '"';

+		$this->debug("in serializeType: name=$name, type=$type, use=$use, encodingStyle=$encodingStyle, unqualified=".($unqualified ? "unqualified" : "qualified"));

+		$this->appendDebug("value=".$this->varDump($value));

+		if ($use == 'encoded' && $encodingStyle) {

+			$encodingStyle = ' SOAP-ENV:encodingStyle="'.$encodingStyle.'"';

 		}

 

 		// if a soapval has been supplied, let its type override the WSDL

     	if (is_object($value) && get_class($value) == 'soapval') {

     		if ($value->type_ns) {

-    			$type = $value->type_ns . ':' . $value->type;

+    			$type = $value->type_ns.':'.$value->type;

 		    	$forceType = true;

 		    	$this->debug("in serializeType: soapval overrides type to $type");

     		} elseif ($value->type) {

@@ -1317,7 +1315,7 @@ 
 	    			$value['!'] = $value;

 	    		}

 	    		foreach ($attrs as $n => $v) {

-	    			$value['!' . $n] = $v;

+	    			$value['!'.$n] = $v;

 	    		}

 		    	$this->debug("in serializeType: soapval provides attributes");

 		    }

@@ -1335,7 +1333,7 @@ 
 				$this->debug("in serializeType: expanded prefixed type: $uqType, $ns");

 			}

 

-			if($ns == $this->XMLSchemaVersion || $ns == 'http://schemas.xmlsoap.org/soap/encoding/'){

+			if ($ns == $this->XMLSchemaVersion || $ns == 'http://schemas.xmlsoap.org/soap/encoding/') {

 				$this->debug('in serializeType: type namespace indicates XML Schema or SOAP Encoding type');

 				if ($unqualified && $use == 'literal') {

 					$elementNS = " xmlns=\"\"";

@@ -1348,7 +1346,7 @@ 
 						$xml = "<$name$elementNS/>";

 					} else {

 						// TODO: depends on nillable, which should be checked before calling this method

-						$xml = "<$name$elementNS xsi:nil=\"true\" xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\"/>";

+						$xml = "<$name$elementNS xsi:nil=\"true\" xsi:type=\"".$this->getPrefixFromNamespace($ns).":$uqType\"/>";

 					}

 					$this->debug("in serializeType: returning: $xml");

 					return $xml;

@@ -1358,7 +1356,7 @@ 
 					return $this->serialize_val($value, $name, false, false, false, false, $use);

 				}

 		    	if ($uqType == 'boolean') {

-		    		if ((is_string($value) && $value == 'false') || (! $value)) {

+		    		if ((is_string($value) && $value == 'false') || (!$value)) {

 						$value = 'false';

 					} else {

 						$value = 'true';

@@ -1376,12 +1374,12 @@ 
 				if (!$this->getTypeDef($uqType, $ns)) {

 					if ($use == 'literal') {

 						if ($forceType) {

-							$xml = "<$name$elementNS xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\">$value</$name>";

+							$xml = "<$name$elementNS xsi:type=\"".$this->getPrefixFromNamespace($ns).":$uqType\">$value</$name>";

 						} else {

 							$xml = "<$name$elementNS>$value</$name>";

 						}

 					} else {

-						$xml = "<$name$elementNS xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\"$encodingStyle>$value</$name>";

+						$xml = "<$name$elementNS xsi:type=\"".$this->getPrefixFromNamespace($ns).":$uqType\"$encodingStyle>$value</$name>";

 					}

 					$this->debug("in serializeType: returning: $xml");

 					return $xml;

@@ -1391,29 +1389,29 @@ 
 				$this->debug('in serializeType: appears to be Apache SOAP type');

 				if ($uqType == 'Map') {

 					$tt_prefix = $this->getPrefixFromNamespace('http://xml.apache.org/xml-soap');

-					if (! $tt_prefix) {

+					if (!$tt_prefix) {

 						$this->debug('in serializeType: Add namespace for Apache SOAP type');

-						$tt_prefix = 'ns' . rand(1000, 9999);

+						$tt_prefix = 'ns'.rand(1000, 9999);

 						$this->namespaces[$tt_prefix] = 'http://xml.apache.org/xml-soap';

 						// force this to be added to usedNamespaces

 						$tt_prefix = $this->getPrefixFromNamespace('http://xml.apache.org/xml-soap');

 					}

 					$contents = '';

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

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

 						$this->debug("serializing map element: key $k, value $v");

 						$contents .= '<item>';

-						$contents .= $this->serialize_val($k,'key',false,false,false,false,$use);

-						$contents .= $this->serialize_val($v,'value',false,false,false,false,$use);

+						$contents .= $this->serialize_val($k, 'key', false, false, false, false, $use);

+						$contents .= $this->serialize_val($v, 'value', false, false, false, false, $use);

 						$contents .= '</item>';

 					}

 					if ($use == 'literal') {

 						if ($forceType) {

-							$xml = "<$name xsi:type=\"" . $tt_prefix . ":$uqType\">$contents</$name>";

+							$xml = "<$name xsi:type=\"".$tt_prefix.":$uqType\">$contents</$name>";

 						} else {

 							$xml = "<$name>$contents</$name>";

 						}

 					} else {

-						$xml = "<$name xsi:type=\"" . $tt_prefix . ":$uqType\"$encodingStyle>$contents</$name>";

+						$xml = "<$name xsi:type=\"".$tt_prefix.":$uqType\"$encodingStyle>$contents</$name>";

 					}

 					$this->debug("in serializeType: returning: $xml");

 					return $xml;

@@ -1427,13 +1425,13 @@ 
 			$ns = '';

 			$uqType = $type;

 		}

-		if(!$typeDef = $this->getTypeDef($uqType, $ns)){

+		if (!$typeDef = $this->getTypeDef($uqType, $ns)) {

 			$this->setError("$type ($uqType) is not a supported type.");

 			$this->debug("in serializeType: $type ($uqType) is not a supported type.");

 			return false;

 		} else {

 			$this->debug("in serializeType: found typeDef");

-			$this->appendDebug('typeDef=' . $this->varDump($typeDef));

+			$this->appendDebug('typeDef='.$this->varDump($typeDef));

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

 				$uqType = substr($uqType, 0, -1);

 			}

@@ -1444,7 +1442,7 @@ 
 			return false;

 		}

 		$phpType = $typeDef['phpType'];

-		$this->debug("in serializeType: uqType: $uqType, ns: $ns, phptype: $phpType, arrayType: " . (isset($typeDef['arrayType']) ? $typeDef['arrayType'] : '') );

+		$this->debug("in serializeType: uqType: $uqType, ns: $ns, phptype: $phpType, arrayType: ".(isset($typeDef['arrayType']) ? $typeDef['arrayType'] : ''));

 		// if php type == struct, map value to the <all> element names

 		if ($phpType == 'struct') {

 			if (isset($typeDef['typeClass']) && $typeDef['typeClass'] == 'element') {

@@ -1467,7 +1465,7 @@ 
 					// TODO: depends on minOccurs and nillable

 					$xml = "<$elementName$elementNS/>";

 				} else {

-					$xml = "<$elementName$elementNS xsi:nil=\"true\" xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\"/>";

+					$xml = "<$elementName$elementNS xsi:nil=\"true\" xsi:type=\"".$this->getPrefixFromNamespace($ns).":$uqType\"/>";

 				}

 				$this->debug("in serializeType: returning: $xml");

 				return $xml;

@@ -1479,12 +1477,12 @@ 
 				$elementAttrs = $this->serializeComplexTypeAttributes($typeDef, $value, $ns, $uqType);

 				if ($use == 'literal') {

 					if ($forceType) {

-						$xml = "<$elementName$elementNS$elementAttrs xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\">";

+						$xml = "<$elementName$elementNS$elementAttrs xsi:type=\"".$this->getPrefixFromNamespace($ns).":$uqType\">";

 					} else {

 						$xml = "<$elementName$elementNS$elementAttrs>";

 					}

 				} else {

-					$xml = "<$elementName$elementNS$elementAttrs xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\"$encodingStyle>";

+					$xml = "<$elementName$elementNS$elementAttrs xsi:type=\"".$this->getPrefixFromNamespace($ns).":$uqType\"$encodingStyle>";

 				}

 

 				if (isset($typeDef['simpleContent']) && $typeDef['simpleContent'] == 'true') {

@@ -1519,13 +1517,13 @@ 
 					// TODO: depends on minOccurs

 					$xml = "<$name$elementNS/>";

 				} else {

-					$xml = "<$name$elementNS xsi:nil=\"true\" xsi:type=\"" .

-						$this->getPrefixFromNamespace('http://schemas.xmlsoap.org/soap/encoding/') .

-						":Array\" " .

-						$this->getPrefixFromNamespace('http://schemas.xmlsoap.org/soap/encoding/') .

-						':arrayType="' .

-						$this->getPrefixFromNamespace($this->getPrefix($typeDef['arrayType'])) .

-						':' .

+					$xml = "<$name$elementNS xsi:nil=\"true\" xsi:type=\"".

+						$this->getPrefixFromNamespace('http://schemas.xmlsoap.org/soap/encoding/').

+						":Array\" ".

+						$this->getPrefixFromNamespace('http://schemas.xmlsoap.org/soap/encoding/').

+						':arrayType="'.

+						$this->getPrefixFromNamespace($this->getPrefix($typeDef['arrayType'])).

+						':'.

 						$this->getLocalPart($typeDef['arrayType'])."[0]\"/>";

 				}

 				$this->debug("in serializeType: returning: $xml");

@@ -1533,8 +1531,8 @@ 
 			}

 			if (isset($typeDef['multidimensional'])) {

 				$nv = array();

-				foreach($value as $v) {

-					$cols = ',' . sizeof($v);

+				foreach ($value as $v) {

+					$cols = ','.sizeof($v);

 					$nv = array_merge($nv, $v);

 				}

 				$value = $nv;

@@ -1544,10 +1542,10 @@ 
 			if (is_array($value) && sizeof($value) >= 1) {

 				$rows = sizeof($value);

 				$contents = '';

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

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

 					//$this->debug("serializing array element: $k, $v of type: $typeDef[arrayType]");

 					//if (strpos($typeDef['arrayType'], ':') ) {

-					if (!in_array($typeDef['arrayType'],$this->typemap['http://www.w3.org/2001/XMLSchema'])) {

+					if (!in_array($typeDef['arrayType'], $this->typemap['http://www.w3.org/2001/XMLSchema'])) {

 					    $contents .= $this->serializeType('item', $typeDef['arrayType'], $v, $use);

 					} else {

 					    $contents .= $this->serialize_val($v, 'item', $typeDef['arrayType'], null, $this->XMLSchemaVersion, false, $use);

@@ -1584,12 +1582,12 @@ 
 			}

 			if ($use == 'literal') {

 				if ($forceType) {

-					$xml = "<$name$elementNS xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\">$value</$name>";

+					$xml = "<$name$elementNS xsi:type=\"".$this->getPrefixFromNamespace($ns).":$uqType\">$value</$name>";

 				} else {

 					$xml = "<$name$elementNS>$value</$name>";

 				}

 			} else {

-				$xml = "<$name$elementNS xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\"$encodingStyle>$value</$name>";

+				$xml = "<$name$elementNS xsi:type=\"".$this->getPrefixFromNamespace($ns).":$uqType\"$encodingStyle>$value</$name>";

 			}

 		}

 		$this->debug("in serializeType: returning: $xml");

@@ -1633,22 +1631,22 @@ 
 				$xvalue = array();

 			}

 			foreach ($typeDef['attrs'] as $aName => $attrs) {

-				if (isset($xvalue['!' . $aName])) {

-					$xname = '!' . $aName;

+				if (isset($xvalue['!'.$aName])) {

+					$xname = '!'.$aName;

 					$this->debug("value provided for attribute $aName with key $xname");

 				} elseif (isset($xvalue[$aName])) {

 					$xname = $aName;

 					$this->debug("value provided for attribute $aName with key $xname");

 				} elseif (isset($attrs['default'])) {

-					$xname = '!' . $aName;

+					$xname = '!'.$aName;

 					$xvalue[$xname] = $attrs['default'];

-					$this->debug('use default value of ' . $xvalue[$aName] . ' for attribute ' . $aName);

+					$this->debug('use default value of '.$xvalue[$aName].' for attribute '.$aName);

 				} else {

 					$xname = '';

 					$this->debug("no value provided for attribute $aName");

 				}

 				if ($xname) {

-					$xml .=  " $aName=\"" . $this->expandEntities($xvalue[$xname]) . "\"";

+					$xml .= " $aName=\"".$this->expandEntities($xvalue[$xname])."\"";

 				}

 			}

 		} else {

@@ -1669,7 +1667,7 @@ 
 	 * @return string value serialized as an XML string

 	 * @access private

 	 */

-	function serializeComplexTypeElements($typeDef, $value, $ns, $uqType, $use='encoded', $encodingStyle=false) {

+	function serializeComplexTypeElements($typeDef, $value, $ns, $uqType, $use = 'encoded', $encodingStyle = false) {

 		$this->debug("in serializeComplexTypeElements for XML Schema type $ns:$uqType");

 		$xml = '';

 		if (isset($typeDef['extensionBase'])) {

@@ -1696,23 +1694,23 @@ 
 				$xvalue = array();

 			}

 			// toggle whether all elements are present - ideally should validate against schema

-			if (count($typeDef['elements']) != count($xvalue)){

+			if (count($typeDef['elements']) != count($xvalue)) {

 				$optionals = true;

 			}

 			foreach ($typeDef['elements'] as $eName => $attrs) {

 				if (!isset($xvalue[$eName])) {

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

 						$xvalue[$eName] = $attrs['default'];

-						$this->debug('use default value of ' . $xvalue[$eName] . ' for element ' . $eName);

+						$this->debug('use default value of '.$xvalue[$eName].' for element '.$eName);

 					}

 				}

 				// if user took advantage of a minOccurs=0, then only serialize named parameters

 				if (isset($optionals)

 				    && (!isset($xvalue[$eName]))

-					&& ( (!isset($attrs['nillable'])) || $attrs['nillable'] != 'true')

-					){

+					&& ((!isset($attrs['nillable'])) || $attrs['nillable'] != 'true')

+					) {

 					if (isset($attrs['minOccurs']) && $attrs['minOccurs'] <> '0') {

-						$this->debug("apparent error: no value provided for element $eName with minOccurs=" . $attrs['minOccurs']);

+						$this->debug("apparent error: no value provided for element $eName with minOccurs=".$attrs['minOccurs']);

 					}

 					// do nothing

 					$this->debug("no value provided for complexType element $eName and element is not nillable, so serialize nothing");

@@ -1777,15 +1775,15 @@ 
 	* @see nusoap_xmlschema

 	* @access public

 	*/

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

 		if (count($elements) > 0) {

 			$eElements = array();

-	    	foreach($elements as $n => $e){

+	    	foreach ($elements as $n => $e) {

 	            // expand each element

 	            $ee = array();

 	            foreach ($e as $k => $v) {

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

 		            $ee[$k] = $v;

 		    	}

 	    		$eElements[$n] = $ee;

@@ -1794,11 +1792,11 @@ 
 		}

 

 		if (count($attrs) > 0) {

-	    	foreach($attrs as $n => $a){

+	    	foreach ($attrs as $n => $a) {

 	            // expand each attribute

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

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

 		            $aa[$k] = $v;

 		    	}

 	    		$eAttrs[$n] = $aa;

@@ -1806,11 +1804,11 @@ 
 	    	$attrs = $eAttrs;

 		}

 

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

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

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

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

 

 		$typens = isset($this->namespaces['types']) ? $this->namespaces['types'] : $this->namespaces['tns'];

-		$this->schemas[$typens][0]->addComplexType($name,$typeClass,$phpType,$compositor,$restrictionBase,$elements,$attrs,$arrayType);

+		$this->schemas[$typens][0]->addComplexType($name, $typeClass, $phpType, $compositor, $restrictionBase, $elements, $attrs, $arrayType);

 	}

 

 	/**

@@ -1824,8 +1822,8 @@ 
 	* @see nusoap_xmlschema

 	* @access public

 	*/

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

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

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

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

 

 		$typens = isset($this->namespaces['types']) ? $this->namespaces['types'] : $this->namespaces['tns'];

 		$this->schemas[$typens][0]->addSimpleType($name, $restrictionBase, $typeClass, $phpType, $enumeration);

@@ -1857,7 +1855,7 @@ 
 	* @param string $encodingStyle optional (usually 'http://schemas.xmlsoap.org/soap/encoding/' for encoded)

 	* @access public

 	*/

-	function addOperation($name, $in = false, $out = false, $namespace = false, $soapaction = false, $style = 'rpc', $use = 'encoded', $documentation = '', $encodingStyle = ''){

+	function addOperation($name, $in = false, $out = false, $namespace = false, $soapaction = false, $style = 'rpc', $use = 'encoded', $documentation = '', $encodingStyle = '') {

 		if ($use == 'encoded' && $encodingStyle == '') {

 			$encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';

 		}

@@ -1867,24 +1865,24 @@ 
 			foreach ($in as $n => $t) {

 				$elements[$n] = array('name' => $n, 'type' => $t, 'form' => 'unqualified');

 			}

-			$this->addComplexType($name . 'RequestType', 'complexType', 'struct', 'all', '', $elements);

-			$this->addElement(array('name' => $name, 'type' => $name . 'RequestType'));

-			$in = array('parameters' => 'tns:' . $name . '^');

+			$this->addComplexType($name.'RequestType', 'complexType', 'struct', 'all', '', $elements);

+			$this->addElement(array('name' => $name, 'type' => $name.'RequestType'));

+			$in = array('parameters' => 'tns:'.$name.'^');

 

 			$elements = array();

 			foreach ($out as $n => $t) {

 				$elements[$n] = array('name' => $n, 'type' => $t, 'form' => 'unqualified');

 			}

-			$this->addComplexType($name . 'ResponseType', 'complexType', 'struct', 'all', '', $elements);

-			$this->addElement(array('name' => $name . 'Response', 'type' => $name . 'ResponseType', 'form' => 'qualified'));

-			$out = array('parameters' => 'tns:' . $name . 'Response' . '^');

+			$this->addComplexType($name.'ResponseType', 'complexType', 'struct', 'all', '', $elements);

+			$this->addElement(array('name' => $name.'Response', 'type' => $name.'ResponseType', 'form' => 'qualified'));

+			$out = array('parameters' => 'tns:'.$name.'Response'.'^');

 		}

 

 		// get binding

-		$this->bindings[ $this->serviceName . 'Binding' ]['operations'][$name] =

+		$this->bindings[$this->serviceName.'Binding']['operations'][$name] =

 		array(

 		'name' => $name,

-		'binding' => $this->serviceName . 'Binding',

+		'binding' => $this->serviceName.'Binding',

 		'endpoint' => $this->endpoint,

 		'soapAction' => $soapaction,

 		'style' => $style,

@@ -1892,42 +1890,42 @@ 
 			'use' => $use,

 			'namespace' => $namespace,

 			'encodingStyle' => $encodingStyle,

-			'message' => $name . 'Request',

+			'message' => $name.'Request',

 			'parts' => $in),

 		'output' => array(

 			'use' => $use,

 			'namespace' => $namespace,

 			'encodingStyle' => $encodingStyle,

-			'message' => $name . 'Response',

+			'message' => $name.'Response',

 			'parts' => $out),

 		'namespace' => $namespace,

 		'transport' => 'http://schemas.xmlsoap.org/soap/http',

 		'documentation' => $documentation);

 		// add portTypes

 		// add messages

-		if($in)

+		if ($in)

 		{

-			foreach($in as $pName => $pType)

+			foreach ($in as $pName => $pType)

 			{

-				if(strpos($pType,':')) {

+				if (strpos($pType, ':')) {

 					$pType = $this->getNamespaceFromPrefix($this->getPrefix($pType)).":".$this->getLocalPart($pType);

 				}

 				$this->messages[$name.'Request'][$pName] = $pType;

 			}

 		} else {

-            $this->messages[$name.'Request']= '0';

+            $this->messages[$name.'Request'] = '0';

         }

-		if($out)

+		if ($out)

 		{

-			foreach($out as $pName => $pType)

+			foreach ($out as $pName => $pType)

 			{

-				if(strpos($pType,':')) {

+				if (strpos($pType, ':')) {

 					$pType = $this->getNamespaceFromPrefix($this->getPrefix($pType)).":".$this->getLocalPart($pType);

 				}

 				$this->messages[$name.'Response'][$pName] = $pType;

 			}

 		} else {

-            $this->messages[$name.'Response']= '0';

+            $this->messages[$name.'Response'] = '0';

         }

 		return true;

 	}