@@ -20,24 +20,24 @@ discard block |
||
20 | 20 | $form_sent = 0; |
21 | 21 | $first_letter_user = ''; |
22 | 22 | $first_letter_course = ''; |
23 | -$courses = array (); |
|
23 | +$courses = array(); |
|
24 | 24 | $url_list = array(); |
25 | 25 | $users = array(); |
26 | 26 | |
27 | 27 | $tbl_access_url_rel_user = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); |
28 | 28 | $tbl_access_url = Database :: get_main_table(TABLE_MAIN_ACCESS_URL); |
29 | -$tbl_user = Database :: get_main_table(TABLE_MAIN_USER); |
|
29 | +$tbl_user = Database :: get_main_table(TABLE_MAIN_USER); |
|
30 | 30 | |
31 | 31 | /* Header */ |
32 | 32 | $tool_name = get_lang('AddUsersToURL'); |
33 | -$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin')); |
|
34 | -$interbreadcrumb[] = array ('url' => 'access_urls.php', 'name' => get_lang('MultipleAccessURLs')); |
|
33 | +$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin')); |
|
34 | +$interbreadcrumb[] = array('url' => 'access_urls.php', 'name' => get_lang('MultipleAccessURLs')); |
|
35 | 35 | |
36 | 36 | Display :: display_header($tool_name); |
37 | 37 | |
38 | 38 | echo '<div class="actions">'; |
39 | 39 | echo Display::url( |
40 | - Display::return_icon('edit.png', get_lang('EditUsersToURL'),''), |
|
40 | + Display::return_icon('edit.png', get_lang('EditUsersToURL'), ''), |
|
41 | 41 | api_get_path(WEB_CODE_PATH).'admin/access_url_edit_users_to_url.php'); |
42 | 42 | echo '</div>'; |
43 | 43 | |
@@ -45,11 +45,11 @@ discard block |
||
45 | 45 | |
46 | 46 | if ($_POST['form_sent']) { |
47 | 47 | $form_sent = $_POST['form_sent']; |
48 | - $users = is_array($_POST['user_list']) ? $_POST['user_list'] : array() ; |
|
49 | - $url_list = is_array($_POST['url_list']) ? $_POST['url_list'] : array() ; |
|
48 | + $users = is_array($_POST['user_list']) ? $_POST['user_list'] : array(); |
|
49 | + $url_list = is_array($_POST['url_list']) ? $_POST['url_list'] : array(); |
|
50 | 50 | $first_letter_user = $_POST['first_letter_user']; |
51 | 51 | |
52 | - foreach($users as $key => $value) { |
|
52 | + foreach ($users as $key => $value) { |
|
53 | 53 | $users[$key] = intval($value); |
54 | 54 | } |
55 | 55 | |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | if (count($users) == 0 || count($url_list) == 0) { |
58 | 58 | Display :: display_error_message(get_lang('AtLeastOneUserAndOneURL')); |
59 | 59 | } else { |
60 | - UrlManager::add_users_to_urls($users,$url_list); |
|
60 | + UrlManager::add_users_to_urls($users, $url_list); |
|
61 | 61 | Display :: display_confirmation_message(get_lang('UsersBelongURL')); |
62 | 62 | } |
63 | 63 | } |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | $sql = "SELECT count(*) as nb_users FROM $tbl_user"; |
69 | 69 | $result = Database::query($sql); |
70 | 70 | $num_row = Database::fetch_array($result); |
71 | - if ($num_row['nb_users']>1000) { |
|
71 | + if ($num_row['nb_users'] > 1000) { |
|
72 | 72 | //if there are too much users to gracefully handle with the HTML select list, |
73 | 73 | // assign a default filter on users names |
74 | 74 | $first_letter_user = 'A'; |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | <td width="40%" align="center"> |
100 | 100 | <b><?php echo get_lang('UserList'); ?></b> |
101 | 101 | <br/><br/> |
102 | - <?php echo get_lang('Select').' ' ; echo $target_name == 'firstname'? get_lang('FirstName') : get_lang('LastName'); ?> |
|
102 | + <?php echo get_lang('Select').' '; echo $target_name == 'firstname' ? get_lang('FirstName') : get_lang('LastName'); ?> |
|
103 | 103 | <select name="first_letter_user" onchange="javascript:document.formulaire.form_sent.value='2'; document.formulaire.submit();"> |
104 | 104 | <option value="">--</option> |
105 | 105 | <?php |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | <?php |
119 | 119 | foreach ($db_users as $user) { |
120 | 120 | ?> |
121 | - <option value="<?php echo $user['user_id']; ?>" <?php if(in_array($user['user_id'], $users)) echo 'selected="selected"'; ?>> |
|
121 | + <option value="<?php echo $user['user_id']; ?>" <?php if (in_array($user['user_id'], $users)) echo 'selected="selected"'; ?>> |
|
122 | 122 | <?php echo api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')'; ?> |
123 | 123 | </option> |
124 | 124 | <?php |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | <?php |
135 | 135 | foreach ($db_urls as $url_obj) { |
136 | 136 | ?> |
137 | - <option value="<?php echo $url_obj['id']; ?>" <?php if(in_array($url_obj['id'],$url_list)) echo 'selected="selected"'; ?>> |
|
137 | + <option value="<?php echo $url_obj['id']; ?>" <?php if (in_array($url_obj['id'], $url_list)) echo 'selected="selected"'; ?>> |
|
138 | 138 | <?php echo $url_obj['url']; ?> |
139 | 139 | </option> |
140 | 140 | <?php |
@@ -189,8 +189,8 @@ |
||
189 | 189 | { |
190 | 190 | $code = CourseRequestManager::get_course_request_code($id); |
191 | 191 | $result = '<a href="course_request_edit.php?id='.$id.'&caller=0">'.Display::return_icon('edit.png', get_lang('Edit'), array('style' => 'vertical-align: middle;')).'</a>'. |
192 | - ' <a href="?accept_course_request='.$id.'">'.Display::return_icon('accept.png', get_lang('AcceptThisCourseRequest'), array('style' => 'vertical-align: middle;', 'onclick' => 'javascript: if (!confirm(\''.addslashes(api_htmlentities(sprintf(get_lang('ANewCourseWillBeCreated'), $code), ENT_QUOTES)).'\')) return false;'),16).'</a>'. |
|
193 | - ' <a href="?reject_course_request='.$id.'">'.Display::return_icon('error.png', get_lang('RejectThisCourseRequest'), array('style' => 'vertical-align: middle;', 'onclick' => 'javascript: if (!confirm(\''.addslashes(api_htmlentities(sprintf(get_lang('ACourseRequestWillBeRejected'), $code), ENT_QUOTES)).'\')) return false;'),16).'</a>'; |
|
192 | + ' <a href="?accept_course_request='.$id.'">'.Display::return_icon('accept.png', get_lang('AcceptThisCourseRequest'), array('style' => 'vertical-align: middle;', 'onclick' => 'javascript: if (!confirm(\''.addslashes(api_htmlentities(sprintf(get_lang('ANewCourseWillBeCreated'), $code), ENT_QUOTES)).'\')) return false;'), 16).'</a>'. |
|
193 | + ' <a href="?reject_course_request='.$id.'">'.Display::return_icon('error.png', get_lang('RejectThisCourseRequest'), array('style' => 'vertical-align: middle;', 'onclick' => 'javascript: if (!confirm(\''.addslashes(api_htmlentities(sprintf(get_lang('ACourseRequestWillBeRejected'), $code), ENT_QUOTES)).'\')) return false;'), 16).'</a>'; |
|
194 | 194 | if (!CourseRequestManager::additional_info_asked($id)) { |
195 | 195 | $result .= ' <a href="?request_info='.$id.'">'.Display::return_icon('request_info.gif', get_lang('AskAdditionalInfo'), array('style' => 'vertical-align: middle;', 'onclick' => 'javascript: if (!confirm(\''.addslashes(api_htmlentities(sprintf(get_lang('AdditionalInfoWillBeAsked'), $code), ENT_QUOTES)).'\')) return false;')).'</a>'; |
196 | 196 | } |
@@ -8,43 +8,43 @@ discard block |
||
8 | 8 | */ |
9 | 9 | exit(); //not yet functional, needs to be revised |
10 | 10 | |
11 | -$cidReset=true; |
|
11 | +$cidReset = true; |
|
12 | 12 | |
13 | 13 | require('../inc/global.inc.php'); |
14 | 14 | $libpath = api_get_path(LIBRARY_PATH); |
15 | 15 | require("../auth/ldap/authldap.php"); |
16 | -$annee_base=date('Y'); |
|
16 | +$annee_base = date('Y'); |
|
17 | 17 | // setting the section (for the tabs) |
18 | 18 | $this_section = SECTION_PLATFORM_ADMIN; |
19 | 19 | api_protect_admin_script(); |
20 | 20 | |
21 | 21 | // setting breadcrumbs |
22 | -$interbreadcrumb[]=array('url' => 'index.php',"name" => get_lang('PlatformAdmin')); |
|
23 | -$interbreadcrumb[]=array('url' => api_get_self(),"name" => get_lang('SessionsList')); |
|
22 | +$interbreadcrumb[] = array('url' => 'index.php', "name" => get_lang('PlatformAdmin')); |
|
23 | +$interbreadcrumb[] = array('url' => api_get_self(), "name" => get_lang('SessionsList')); |
|
24 | 24 | |
25 | 25 | // Database Table Definitions |
26 | 26 | $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION); |
27 | -$tbl_session_rel_class = Database::get_main_table(TABLE_MAIN_SESSION_CLASS); |
|
28 | -$tbl_session_rel_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE); |
|
29 | -$tbl_session_rel_course_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER); |
|
30 | -$tbl_course = Database::get_main_table(TABLE_MAIN_COURSE); |
|
31 | -$tbl_user = Database::get_main_table(TABLE_MAIN_USER); |
|
32 | -$tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER); |
|
33 | -$tbl_class = Database::get_main_table(TABLE_MAIN_CLASS); |
|
34 | -$tbl_class_user = Database::get_main_table(TABLE_MAIN_CLASS_USER); |
|
27 | +$tbl_session_rel_class = Database::get_main_table(TABLE_MAIN_SESSION_CLASS); |
|
28 | +$tbl_session_rel_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE); |
|
29 | +$tbl_session_rel_course_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER); |
|
30 | +$tbl_course = Database::get_main_table(TABLE_MAIN_COURSE); |
|
31 | +$tbl_user = Database::get_main_table(TABLE_MAIN_USER); |
|
32 | +$tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER); |
|
33 | +$tbl_class = Database::get_main_table(TABLE_MAIN_CLASS); |
|
34 | +$tbl_class_user = Database::get_main_table(TABLE_MAIN_CLASS_USER); |
|
35 | 35 | |
36 | -$tbl_session_rel_etape = "session_rel_etape"; |
|
36 | +$tbl_session_rel_etape = "session_rel_etape"; |
|
37 | 37 | |
38 | -$id_session=intval($_GET['id_session']); |
|
38 | +$id_session = intval($_GET['id_session']); |
|
39 | 39 | |
40 | -$formSent=0; |
|
41 | -$errorMsg=$firstLetterUser=$firstLetterSession=''; |
|
42 | -$UserList=$SessionList=array(); |
|
43 | -$users=$sessions=array(); |
|
44 | -$noPHP_SELF=true; |
|
40 | +$formSent = 0; |
|
41 | +$errorMsg = $firstLetterUser = $firstLetterSession = ''; |
|
42 | +$UserList = $SessionList = array(); |
|
43 | +$users = $sessions = array(); |
|
44 | +$noPHP_SELF = true; |
|
45 | 45 | |
46 | -$page=intval($_GET['page']); |
|
47 | -$action=$_REQUEST['action']; |
|
46 | +$page = intval($_GET['page']); |
|
47 | +$action = $_REQUEST['action']; |
|
48 | 48 | |
49 | 49 | $tool_name = get_lang('Synchro LDAP : Import Etudiants/Etapes dans session'); |
50 | 50 | Display::display_header($tool_name); |
@@ -59,10 +59,10 @@ discard block |
||
59 | 59 | </form> |
60 | 60 | |
61 | 61 | <?php |
62 | -if (isset($action) && ($action=="synchro")) { |
|
63 | - $included=true; |
|
62 | +if (isset($action) && ($action == "synchro")) { |
|
63 | + $included = true; |
|
64 | 64 | require('ldap_synchro.php'); |
65 | - Display :: display_normal_message($message,false); |
|
65 | + Display :: display_normal_message($message, false); |
|
66 | 66 | } |
67 | 67 | Display::display_footer(); |
68 | 68 | ?> |
@@ -13,8 +13,8 @@ |
||
13 | 13 | |
14 | 14 | $tool_name = get_lang('Export'); |
15 | 15 | |
16 | -$interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAdmin')); |
|
17 | -$interbreadcrumb[] = array ('url' => 'usergroups.php', 'name' => get_lang('Classes')); |
|
16 | +$interbreadcrumb[] = array("url" => 'index.php', "name" => get_lang('PlatformAdmin')); |
|
17 | +$interbreadcrumb[] = array('url' => 'usergroups.php', 'name' => get_lang('Classes')); |
|
18 | 18 | |
19 | 19 | set_time_limit(0); |
20 | 20 |
@@ -23,14 +23,14 @@ |
||
23 | 23 | |
24 | 24 | $interbreadcrumb = array( |
25 | 25 | array( |
26 | - 'url' => api_get_path(WEB_CODE_PATH) . 'admin/index.php', |
|
26 | + 'url' => api_get_path(WEB_CODE_PATH).'admin/index.php', |
|
27 | 27 | 'name' => get_lang('Administration') |
28 | 28 | ) |
29 | 29 | ); |
30 | 30 | |
31 | 31 | $toolbar = Display::toolbarButton( |
32 | 32 | get_lang('ManageSkills'), |
33 | - api_get_path(WEB_CODE_PATH) . 'admin/skill_list.php', |
|
33 | + api_get_path(WEB_CODE_PATH).'admin/skill_list.php', |
|
34 | 34 | 'list', |
35 | 35 | 'primary', |
36 | 36 | ['title' => get_lang('ManageSkills')] |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | $htmlHeadXtra[] = api_get_jqgrid_js(); |
19 | 19 | |
20 | 20 | // setting breadcrumbs |
21 | -$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('PlatformAdmin')); |
|
21 | +$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin')); |
|
22 | 22 | |
23 | 23 | $tool_name = null; |
24 | 24 | |
@@ -39,23 +39,23 @@ discard block |
||
39 | 39 | $token = Security::get_token(); |
40 | 40 | |
41 | 41 | if ($action == 'add') { |
42 | - $interbreadcrumb[]=array('url' => 'extra_fields.php?type='.$extra_field->type,'name' => $extra_field->pageName); |
|
43 | - $interbreadcrumb[]=array('url' => 'extra_fields.php?type='.$extra_field->type.'&action=edit&id='.$extra_field_info['id'],'name' => $extra_field_info['display_text']); |
|
44 | - $interbreadcrumb[]=array('url' => 'extra_field_options.php?type='.$extra_field->type.'&field_id='.$extra_field_info['id'], 'name' => get_lang('EditExtraFieldOptions')); |
|
45 | - $interbreadcrumb[]=array('url' => '#','name' => get_lang('Add')); |
|
42 | + $interbreadcrumb[] = array('url' => 'extra_fields.php?type='.$extra_field->type, 'name' => $extra_field->pageName); |
|
43 | + $interbreadcrumb[] = array('url' => 'extra_fields.php?type='.$extra_field->type.'&action=edit&id='.$extra_field_info['id'], 'name' => $extra_field_info['display_text']); |
|
44 | + $interbreadcrumb[] = array('url' => 'extra_field_options.php?type='.$extra_field->type.'&field_id='.$extra_field_info['id'], 'name' => get_lang('EditExtraFieldOptions')); |
|
45 | + $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('Add')); |
|
46 | 46 | } elseif ($action == 'edit') { |
47 | - $interbreadcrumb[]=array('url' => 'extra_fields.php?type='.$extra_field->type,'name' => $extra_field->pageName); |
|
48 | - $interbreadcrumb[]=array('url' => 'extra_fields.php?type='.$extra_field->type.'&action=edit&id='.$extra_field_info['id'],'name' => $extra_field_info['display_text']); |
|
49 | - $interbreadcrumb[]=array('url' => 'extra_field_options.php?type='.$extra_field->type.'&field_id='.$extra_field_info['id'], 'name' => get_lang('EditExtraFieldOptions')); |
|
47 | + $interbreadcrumb[] = array('url' => 'extra_fields.php?type='.$extra_field->type, 'name' => $extra_field->pageName); |
|
48 | + $interbreadcrumb[] = array('url' => 'extra_fields.php?type='.$extra_field->type.'&action=edit&id='.$extra_field_info['id'], 'name' => $extra_field_info['display_text']); |
|
49 | + $interbreadcrumb[] = array('url' => 'extra_field_options.php?type='.$extra_field->type.'&field_id='.$extra_field_info['id'], 'name' => get_lang('EditExtraFieldOptions')); |
|
50 | 50 | |
51 | - $interbreadcrumb[]=array('url' => '#','name' => get_lang('Edit')); |
|
51 | + $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('Edit')); |
|
52 | 52 | } else { |
53 | - $interbreadcrumb[]=array('url' => 'extra_fields.php?type='.$extra_field->type,'name' => $extra_field->pageName); |
|
54 | - $interbreadcrumb[]=array( |
|
53 | + $interbreadcrumb[] = array('url' => 'extra_fields.php?type='.$extra_field->type, 'name' => $extra_field->pageName); |
|
54 | + $interbreadcrumb[] = array( |
|
55 | 55 | 'url' => 'extra_fields.php?type='.$extra_field->type.'&action=edit&id='.$extra_field_info['id'], |
56 | 56 | 'name' => $extra_field_info['display_text'] |
57 | 57 | ); |
58 | - $interbreadcrumb[]=array('url' => '#','name' => get_lang('EditExtraFieldOptions')); |
|
58 | + $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('EditExtraFieldOptions')); |
|
59 | 59 | } |
60 | 60 | |
61 | 61 | //jqgrid will use this URL to do the selects |
@@ -108,12 +108,12 @@ discard block |
||
108 | 108 | |
109 | 109 | //With this function we can add actions to the jgrid (edit, delete, etc) |
110 | 110 | $action_links = 'function action_formatter(cellvalue, options, rowObject) { |
111 | - return \'<a href="?action=edit&'.$params.'&id=\'+options.rowId+\'">'.Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>'. |
|
112 | - ' <a onclick="javascript:if(!confirm('."\'".addslashes(get_lang("ConfirmYourChoice"))."\'".')) return false;" href="?sec_token='.$token.'&action=delete&'.$params.'&id=\'+options.rowId+\'">'.Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>'. |
|
111 | + return \'<a href="?action=edit&'.$params.'&id=\'+options.rowId+\'">'.Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>'. |
|
112 | + ' <a onclick="javascript:if(!confirm('."\'".addslashes(get_lang("ConfirmYourChoice"))."\'".')) return false;" href="?sec_token='.$token.'&action=delete&'.$params.'&id=\'+options.rowId+\'">'.Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>'. |
|
113 | 113 | '\'; |
114 | 114 | }'; |
115 | 115 | |
116 | -$htmlHeadXtra[]='<script> |
|
116 | +$htmlHeadXtra[] = '<script> |
|
117 | 117 | $(function() { |
118 | 118 | // grid definition see the $obj->display() function |
119 | 119 | '.Display::grid_js( |
@@ -11,7 +11,7 @@ |
||
11 | 11 | $this_section = SECTION_PLATFORM_ADMIN; |
12 | 12 | // User permissions |
13 | 13 | api_protect_admin_script(); |
14 | -$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin')); |
|
14 | +$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin')); |
|
15 | 15 | Display :: display_header(get_lang('SystemStatus')); |
16 | 16 | $diag = new Diagnoser(); |
17 | 17 | $diag->show_html(); |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | $tool_name = get_lang('SurveyPublication'); |
65 | 65 | |
66 | 66 | // Displaying the header |
67 | -Display::display_header($tool_name,'Survey'); |
|
67 | +Display::display_header($tool_name, 'Survey'); |
|
68 | 68 | |
69 | 69 | echo '<script> |
70 | 70 | $(function() { |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | ); |
133 | 133 | |
134 | 134 | $form->addElement('html', '<div id="check_mail">'); |
135 | -$form->addElement('checkbox', 'send_mail','', get_lang('SendMail')); |
|
135 | +$form->addElement('checkbox', 'send_mail', '', get_lang('SendMail')); |
|
136 | 136 | $form->addElement('html', '</div>'); |
137 | 137 | |
138 | 138 | $form->addElement('html', '<div id="mail_text_wrapper">'); |
@@ -219,8 +219,8 @@ discard block |
||
219 | 219 | ); |
220 | 220 | |
221 | 221 | // Saving the invitations for the additional users |
222 | - $values['additional_users'] = $values['additional_users'].';'; // This is for the case when you enter only one email |
|
223 | - $temp = str_replace(',', ';', $values['additional_users']); // This is to allow , and ; as email separators |
|
222 | + $values['additional_users'] = $values['additional_users'].';'; // This is for the case when you enter only one email |
|
223 | + $temp = str_replace(',', ';', $values['additional_users']); // This is to allow , and ; as email separators |
|
224 | 224 | $additional_users = explode(';', $temp); |
225 | 225 | for ($i = 0; $i < count($additional_users); $i++) { |
226 | 226 | $additional_users[$i] = trim($additional_users[$i]); |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | $now = api_get_utc_datetime(); |
113 | 113 | if (Database :: num_rows($result) == 0) { |
114 | 114 | $params = [ |
115 | - 'c_id' => $course_id , |
|
115 | + 'c_id' => $course_id, |
|
116 | 116 | 'survey_code' => $surveyCode, |
117 | 117 | 'user' => $userid, |
118 | 118 | 'invitation_code' => $autoInvitationcode, |
@@ -471,7 +471,7 @@ discard block |
||
471 | 471 | $jquery_ready_content = $returnParams['jquery_ready_content']; |
472 | 472 | |
473 | 473 | // the $jquery_ready_content variable collects all functions that will be load in the $(document).ready javascript function |
474 | - $htmlHeadXtra[] ='<script> |
|
474 | + $htmlHeadXtra[] = '<script> |
|
475 | 475 | $(document).ready(function(){ |
476 | 476 | '.$jquery_ready_content.' |
477 | 477 | }); |
@@ -904,16 +904,16 @@ discard block |
||
904 | 904 | $group2 = $groups[0]; |
905 | 905 | $secondary .= " OR ( survey_group_sec1 = '$group1' AND survey_group_sec2 = '$group2') "; |
906 | 906 | $secondary .= " OR ( survey_group_sec1 = '$group2' AND survey_group_sec2 = '$group1' ) "; |
907 | - $combi.= $group1.' - '.$group2." or ".$group2.' - '.$group1.'<br />'; |
|
907 | + $combi .= $group1.' - '.$group2." or ".$group2.' - '.$group1.'<br />'; |
|
908 | 908 | } else { |
909 | 909 | if ($i != 0) { |
910 | 910 | $secondary .= " OR ( survey_group_sec1 = '$group1' AND survey_group_sec2 = '$group2') "; |
911 | 911 | $secondary .= " OR ( survey_group_sec1 = '$group2' AND survey_group_sec2 = '$group1' ) "; |
912 | - $combi.= $group1.' - '.$group2." or ".$group2.' - '.$group1.'<br />'; |
|
912 | + $combi .= $group1.' - '.$group2." or ".$group2.' - '.$group1.'<br />'; |
|
913 | 913 | } else { |
914 | 914 | $secondary .= " ( survey_group_sec1 = '$group1' AND survey_group_sec2 = '$group2') "; |
915 | 915 | $secondary .= " OR ( survey_group_sec1 = '$group2' AND survey_group_sec2 = '$group1' ) "; |
916 | - $combi.= $group1.' - '.$group2." or ".$group2.' - '.$group1.'<br />'; |
|
916 | + $combi .= $group1.' - '.$group2." or ".$group2.' - '.$group1.'<br />'; |
|
917 | 917 | } |
918 | 918 | } |
919 | 919 | } |
@@ -1132,7 +1132,7 @@ discard block |
||
1132 | 1132 | $questions[$row['sort']]['survey_group_sec1'] = $row['survey_group_sec1']; |
1133 | 1133 | $questions[$row['sort']]['survey_group_sec2'] = $row['survey_group_sec2']; |
1134 | 1134 | $questions[$row['sort']]['survey_group_pri'] = $row['survey_group_pri']; |
1135 | - } else { |
|
1135 | + } else { |
|
1136 | 1136 | // If the type is a page break we are finished loading the questions for this page |
1137 | 1137 | break; |
1138 | 1138 | } |