@@ -49,11 +49,11 @@ discard block |
||
49 | 49 | $location = $this->Gui->skinObject->findResourceUrl("IMAGES", "consortium_logo.png"); |
50 | 50 | if ($location !== FALSE) { |
51 | 51 | $retval .= "<div id='cat_logo'> |
52 | - <a href='" . CONFIG_CONFASSISTANT['CONSORTIUM']['homepage'] . "'><img id='logo_img' src='$location' alt='Consortium Logo'/></a> |
|
52 | + <a href='" . CONFIG_CONFASSISTANT['CONSORTIUM']['homepage']."'><img id='logo_img' src='$location' alt='Consortium Logo'/></a> |
|
53 | 53 | <span>Configuration Assistant Tool</span> |
54 | 54 | </div>"; |
55 | 55 | } |
56 | - $retval .= "<div id='motd'>" . (isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : ' ') . "</div>"; |
|
56 | + $retval .= "<div id='motd'>".(isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : ' ')."</div>"; |
|
57 | 57 | $loc2 = $this->Gui->skinObject->findResourceUrl("IMAGES", "icons/menu.png"); |
58 | 58 | if ($loc2 !== FALSE) { |
59 | 59 | $retval .= "<img id='hamburger' src='$loc2' alt='Menu'/>"; |
@@ -71,13 +71,13 @@ discard block |
||
71 | 71 | public function div_user_welcome() { |
72 | 72 | $retval = " |
73 | 73 | <div id='user_welcome'> <!-- this information is shown just before the download --> |
74 | - <strong>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_PAGEHEADING] . "</strong> |
|
74 | + <strong>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_PAGEHEADING]."</strong> |
|
75 | 75 | <p> |
76 | 76 | <span id='download_info'> |
77 | 77 | <!-- the empty href is dynamically exchanged with the actual path by jQuery at runtime --> |
78 | - " . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_DOWNLOAD] . " |
|
78 | + " . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_DOWNLOAD]." |
|
79 | 79 | </span> |
80 | - <p>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_HEADING] . " |
|
80 | + <p>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_HEADING]." |
|
81 | 81 | <br/> |
82 | 82 | <br/>"; |
83 | 83 | switch (CONFIG_CONFASSISTANT['CONSORTIUM']['name']) { |
@@ -87,11 +87,11 @@ discard block |
||
87 | 87 | } |
88 | 88 | $retval .= " |
89 | 89 | </p> |
90 | - <p>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_USAGE] . " |
|
91 | - <p>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_PROBLEMS] . " |
|
90 | + <p>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_USAGE]." |
|
91 | + <p>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_PROBLEMS]." |
|
92 | 92 | </p> |
93 | 93 | <p> |
94 | - <a href='javascript:back_to_downloads()'><strong>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_BACKTODOWNLOADS] . "</strong></a> |
|
94 | + <a href='javascript:back_to_downloads()'><strong>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_BACKTODOWNLOADS]."</strong></a> |
|
95 | 95 | </p> |
96 | 96 | </div> <!-- id='user_welcomer_page' --> |
97 | 97 | "; |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | public function div_silverbullet() { |
102 | 102 | $retval = " |
103 | 103 | <div id='silverbullet'>" |
104 | - . $this->Gui->textTemplates->templates[user\SB_GO_AWAY] . |
|
104 | + . $this->Gui->textTemplates->templates[user\SB_GO_AWAY]. |
|
105 | 105 | "</div> |
106 | 106 | "; |
107 | 107 | return $retval; |
@@ -114,10 +114,10 @@ discard block |
||
114 | 114 | } |
115 | 115 | return " |
116 | 116 | <div id='welcome_top1'> |
117 | - " . $this->Gui->textTemplates->templates[user\HEADING_TOPLEVEL_GREET] . " |
|
117 | + " . $this->Gui->textTemplates->templates[user\HEADING_TOPLEVEL_GREET]." |
|
118 | 118 | </div> |
119 | 119 | <div id='top_invite'> |
120 | - " . $this->Gui->textTemplates->templates[user\HEADING_TOPLEVEL_PURPOSE] . $retval . " |
|
120 | + " . $this->Gui->textTemplates->templates[user\HEADING_TOPLEVEL_PURPOSE].$retval." |
|
121 | 121 | </div>"; |
122 | 122 | } |
123 | 123 | |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | $retval = " |
126 | 126 | <div id='roller'> |
127 | 127 | <div id='slides'> |
128 | - <span id='line1'>" . $this->Gui->textTemplates->templates[user\FRONTPAGE_ROLLER_EASY] . "</span> |
|
128 | + <span id='line1'>" . $this->Gui->textTemplates->templates[user\FRONTPAGE_ROLLER_EASY]."</span> |
|
129 | 129 | <span id='line2'></span> |
130 | 130 | <span id='line3'></span> |
131 | 131 | <span id='line4'>"; |
@@ -177,9 +177,9 @@ discard block |
||
177 | 177 | public function div_profiles() { |
178 | 178 | return " |
179 | 179 | <div id='profiles'> <!-- this is the profile selection filled during run time --> |
180 | - <div id='profiles_h' class='sub_h'>" . $this->Gui->textTemplates->templates[user\PROFILE_SELECTION] . " |
|
180 | + <div id='profiles_h' class='sub_h'>" . $this->Gui->textTemplates->templates[user\PROFILE_SELECTION]." |
|
181 | 181 | </div>" . |
182 | - "<select id='profile_list'></select><div id='profile_desc' class='profile_desc'></div>" . |
|
182 | + "<select id='profile_list'></select><div id='profile_desc' class='profile_desc'></div>". |
|
183 | 183 | "</div>"; |
184 | 184 | } |
185 | 185 | |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | public function div_institution($selectButton = TRUE) { |
194 | 194 | $retval = "<div id='institution_name'> |
195 | 195 | <span id='inst_name_span'></span> <div id='inst_extra_text'></div><!-- this will be filled with the IdP name -->" . |
196 | - ($selectButton ? "<a id='select_another' class='signin' href=\"\">" . $this->Gui->textTemplates->templates[user\INSTITUTION_SELECTION] . "</a>" : "") . |
|
196 | + ($selectButton ? "<a id='select_another' class='signin' href=\"\">".$this->Gui->textTemplates->templates[user\INSTITUTION_SELECTION]."</a>" : ""). |
|
197 | 197 | "</div>"; |
198 | 198 | $retval .= $this->emptyImage('idp_logo', 'IdP Logo'); |
199 | 199 | return $retval; |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | public function div_otherinstallers() { |
208 | 208 | $retval = " |
209 | 209 | <div class='sub_h'> |
210 | - <div id='other_installers'>" . $this->Gui->textTemplates->templates[user\DOWNLOAD_CHOOSE] . " |
|
210 | + <div id='other_installers'>" . $this->Gui->textTemplates->templates[user\DOWNLOAD_CHOOSE]." |
|
211 | 211 | <table id='device_list' style='padding:0px;'>"; |
212 | 212 | |
213 | 213 | foreach ($this->Gui->listDevices(isset($_REQUEST['hidden']) ? $_REQUEST['hidden'] : 0) as $group => $deviceGroup) { |
@@ -215,18 +215,18 @@ discard block |
||
215 | 215 | $deviceIndex = 0; |
216 | 216 | |
217 | 217 | $imgTag = ""; |
218 | - $imgLocation = $this->Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/" . $group . ".png"); |
|
218 | + $imgLocation = $this->Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/".$group.".png"); |
|
219 | 219 | if ($imgLocation !== FALSE) { |
220 | - $imgTag = '<img src="' . $imgLocation . '" alt="' . $group . ' Device" title="' . $group . ' Device">'; |
|
220 | + $imgTag = '<img src="'.$imgLocation.'" alt="'.$group.' Device" title="'.$group.' Device">'; |
|
221 | 221 | } |
222 | - $retval .= '<tbody><tr><td class="vendor" rowspan="' . $groupIndex . '">' . $imgTag . '</td>'; |
|
222 | + $retval .= '<tbody><tr><td class="vendor" rowspan="'.$groupIndex.'">'.$imgTag.'</td>'; |
|
223 | 223 | foreach ($deviceGroup as $d => $D) { |
224 | 224 | if ($deviceIndex) { |
225 | 225 | $retval .= '<tr>'; |
226 | 226 | } |
227 | - $retval .= "<td><button id='" . $d . "'>" . $D['display'] . "</button>" |
|
228 | - . "<div class='device_info' id='info_" . $d . "'></div></td>" |
|
229 | - . "<td><button class='more_info_b' id='info_b_" . $d . "'>i</button></td></tr>\n"; |
|
227 | + $retval .= "<td><button id='".$d."'>".$D['display']."</button>" |
|
228 | + . "<div class='device_info' id='info_".$d."'></div></td>" |
|
229 | + . "<td><button class='more_info_b' id='info_b_".$d."'>i</button></td></tr>\n"; |
|
230 | 230 | $deviceIndex++; |
231 | 231 | } |
232 | 232 | $retval .= "</tbody>"; |
@@ -240,15 +240,15 @@ discard block |
||
240 | 240 | } |
241 | 241 | |
242 | 242 | public function div_guess_os($operatingSystem) { |
243 | - $vendorlogo = $this->Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/" . $operatingSystem['group'] . ".png"); |
|
243 | + $vendorlogo = $this->Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/".$operatingSystem['group'].".png"); |
|
244 | 244 | $vendorstyle = ""; |
245 | 245 | if ($vendorlogo !== FALSE) { |
246 | - $vendorstyle = "style='background-image:url(\"" . $vendorlogo . "\")'"; |
|
246 | + $vendorstyle = "style='background-image:url(\"".$vendorlogo."\")'"; |
|
247 | 247 | } |
248 | 248 | $deleteIcon = $this->Gui->skinObject->findResourceUrl("IMAGES", "icons/delete_32.png"); |
249 | 249 | $deleteImg = ""; |
250 | 250 | if ($deleteIcon !== FALSE) { |
251 | - $deleteImg = "<img id='cross_icon_" . $operatingSystem['device'] . "' src='$deleteIcon' >"; |
|
251 | + $deleteImg = "<img id='cross_icon_".$operatingSystem['device']."' src='$deleteIcon' >"; |
|
252 | 252 | } |
253 | 253 | return " |
254 | 254 | <div class='sub_h' id='guess_os'> |
@@ -256,23 +256,23 @@ discard block |
||
256 | 256 | <table id='browser'> |
257 | 257 | <tr> |
258 | 258 | <td> |
259 | - <button class='large_button guess_os' $vendorstyle id='g_" . $operatingSystem['device'] . "'> |
|
259 | + <button class='large_button guess_os' $vendorstyle id='g_".$operatingSystem['device']."'> |
|
260 | 260 | $deleteImg |
261 | - <div class='download_button_text_1' id='download_button_header_" . $operatingSystem['device'] . "'> " . $this->Gui->textTemplates->templates[user\DOWNLOAD_MESSAGE] . " |
|
261 | + <div class='download_button_text_1' id='download_button_header_".$operatingSystem['device']."'> ".$this->Gui->textTemplates->templates[user\DOWNLOAD_MESSAGE]." |
|
262 | 262 | </div> |
263 | 263 | <div class='download_button_text'>" . |
264 | - $operatingSystem['display'] . " |
|
264 | + $operatingSystem['display']." |
|
265 | 265 | </div> |
266 | 266 | </button> |
267 | - <div class='device_info' id='info_g_" . $operatingSystem['device'] . "'></div> |
|
267 | + <div class='device_info' id='info_g_" . $operatingSystem['device']."'></div> |
|
268 | 268 | </td> |
269 | 269 | <td style='vertical-align:top'> |
270 | - <button class='more_info_b large_button' id='g_info_b_" . $operatingSystem['device'] . "'>i</button> |
|
270 | + <button class='more_info_b large_button' id='g_info_b_" . $operatingSystem['device']."'>i</button> |
|
271 | 271 | </td> |
272 | 272 | </tr> |
273 | 273 | </table> <!-- id='browser' --> |
274 | 274 | <div class='sub_h'> |
275 | - <a href='javascript:other_installers()'>" . $this->Gui->textTemplates->templates[user\DOWNLOAD_CHOOSE] . "</a> |
|
275 | + <a href='javascript:other_installers()'>" . $this->Gui->textTemplates->templates[user\DOWNLOAD_CHOOSE]."</a> |
|
276 | 276 | </div> |
277 | 277 | </div> <!-- id='guess_os' -->"; |
278 | 278 | } |
@@ -288,7 +288,7 @@ discard block |
||
288 | 288 | </td>"; |
289 | 289 | |
290 | 290 | if (!empty(CONFIG['APPEARANCE']['privacy_notice_url'])) { |
291 | - $retval .= "<td><a href='" . CONFIG['APPEARANCE']['privacy_notice_url'] . "'>" . sprintf(_("%s Privacy Notice"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']) . "</a></td>"; |
|
291 | + $retval .= "<td><a href='".CONFIG['APPEARANCE']['privacy_notice_url']."'>".sprintf(_("%s Privacy Notice"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])."</a></td>"; |
|
292 | 292 | } |
293 | 293 | $retval .= "<td>"; |
294 | 294 | if (CONFIG_CONFASSISTANT['CONSORTIUM']['name'] == "eduroam" && isset(CONFIG_CONFASSISTANT['CONSORTIUM']['deployment-voodoo']) && CONFIG_CONFASSISTANT['CONSORTIUM']['deployment-voodoo'] == "Operations Team") { |