/[smecontribs]/rpms/smeserver-coova-chilli/contribs7/smeserver-coova-chilli-0.1-loginPageDir.patch
ViewVC logotype

Contents of /rpms/smeserver-coova-chilli/contribs7/smeserver-coova-chilli-0.1-loginPageDir.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (show annotations) (download)
Wed Aug 27 11:36:18 2008 UTC (16 years, 2 months ago) by vip-ire
Branch: MAIN
CVS Tags: smeserver-coova-chilli-0_1-2_el4_sme, smeserver-coova-chilli-0_1-5_el4_sme, smeserver-coova-chilli-0_1-8_el4_sme, smeserver-coova-chilli-0_1-4_el4_sme, smeserver-coova-chilli-0_1-7_el4_sme, smeserver-coova-chilli-0_1-3_el4_sme, smeserver-coova-chilli-0_1-6_el4_sme
Error occurred while calculating annotation data.
firewall2db and spec cleaning

1 diff -Nur -x '*.orig' -x '*.rej' smeserver-coova-chilli-0.1/root/opt/chilli/hotspotlogin-config.php mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli/hotspotlogin-config.php
2 --- smeserver-coova-chilli-0.1/root/opt/chilli/hotspotlogin-config.php 1970-01-01 01:00:00.000000000 +0100
3 +++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli/hotspotlogin-config.php 2008-04-07 09:45:38.000000000 +0200
4 @@ -0,0 +1,6 @@
5 +<?php
6 +
7 +$uamsecret = 'InhBpiz6MzCcUH5dd017xafSz8';
8 +$userpassword=1;
9 +
10 +?>
11 diff -Nur -x '*.orig' -x '*.rej' smeserver-coova-chilli-0.1/root/opt/chilli/hotspotlogin-loginform.php mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli/hotspotlogin-loginform.php
12 --- smeserver-coova-chilli-0.1/root/opt/chilli/hotspotlogin-loginform.php 1970-01-01 01:00:00.000000000 +0100
13 +++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli/hotspotlogin-loginform.php 2008-04-07 09:45:38.000000000 +0200
14 @@ -0,0 +1,41 @@
15 +<?php
16 +# daloRADIUS edition - fixed up variable definition through-out the code
17 +# as well as parted the code for the sake of modularity and ability to
18 +# to support templates and languages easier.
19 +# Copyright (C) Enginx and Liran Tal 2007, 2008
20 +
21 +echo "
22 + <form name='form1' method='post' action='$loginpath'>
23 + <input type='hidden' name='challenge' value='$challenge'>
24 + <input type='hidden' name='uamip' value='$uamip'>
25 + <input type='hidden' name='uamport' value='$uamport'>
26 + <input type='hidden' name='userurl' value='$userurl'>
27 +
28 + <center>
29 + <table border='0' cellpadding='5' cellspacing='0' style='width: 217px;'>
30 + <tbody>
31 + <tr>
32 + <td align='right'>$centerUsername:</td>
33 + <td><input style='font-family: Arial' type='text' name='UserName' size='20' maxlength='128'></td>
34 + </tr>
35 +
36 + <tr>
37 + <td align='right'>$centerPassword:</td>
38 + <td><input style='font-family: Arial' type='password' name='Password' size='20' maxlength='128'></td>
39 + </tr>
40 +
41 + <tr>
42 + <td align='center' colspan='2' height='23'><input type='submit' name='button' value='Login'
43 + onClick=\"javascript:popUp('$loginpath?res=popup1&uamip=$uamip&uamport=$uamport')\"></td>
44 + </tr>
45 +
46 + </tbody>
47 + </table>
48 + </center>
49 + </form>
50 +</body>
51 +</html>
52 +";
53 +
54 +
55 +?>
56 diff -Nur -x '*.orig' -x '*.rej' smeserver-coova-chilli-0.1/root/opt/chilli/hotspotlogin-nonchilli.php mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli/hotspotlogin-nonchilli.php
57 --- smeserver-coova-chilli-0.1/root/opt/chilli/hotspotlogin-nonchilli.php 1970-01-01 01:00:00.000000000 +0100
58 +++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli/hotspotlogin-nonchilli.php 2008-04-07 12:54:34.000000000 +0200
59 @@ -0,0 +1,26 @@
60 +<?php
61 +# daloRADIUS edition - fixed up variable definition through-out the code
62 +# as well as parted the code for the sake of modularity and ability to
63 +# to support templates and languages easier.
64 +# Copyright (C) Enginx and Liran Tal 2007, 2008
65 +
66 +echo "
67 +<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">
68 +<html>
69 +<head>
70 + <title>$title</title>
71 + <meta http-equiv=\"Cache-control\" content=\"no-cache\">
72 + <meta http-equiv=\"Pragma\" content=\"no-cache\">
73 + <link href=\"template/css/style.css\" rel=\"stylesheet\" type=\"text/css\" />
74 +</head>
75 +
76 +<body bgColor = '#c0d8f4'>
77 + <h1 style=\"text-align: center;\">$h1Failed</h1>
78 + <center>
79 + $centerdaemon
80 + </center>
81 +</body>
82 +</html>
83 +";
84 +
85 +?>
86 diff -Nur -x '*.orig' -x '*.rej' smeserver-coova-chilli-0.1/root/opt/chilli/hotspotlogin-nonssl.php mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli/hotspotlogin-nonssl.php
87 --- smeserver-coova-chilli-0.1/root/opt/chilli/hotspotlogin-nonssl.php 1970-01-01 01:00:00.000000000 +0100
88 +++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli/hotspotlogin-nonssl.php 2008-04-07 12:55:22.000000000 +0200
89 @@ -0,0 +1,39 @@
90 +<?php
91 +# daloRADIUS edition - fixed up variable definition through-out the code
92 +# as well as parted the code for the sake of modularity and ability to
93 +# to support templates and languages easier.
94 +# Copyright (C) Enginx and Liran Tal 2007, 2008
95 +
96 +echo "
97 +<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">
98 +<html>
99 +<head>
100 + <title>$title</title>
101 + <meta http-equiv=\"Cache-control\" content=\"no-cache\">
102 + <meta http-equiv=\"Pragma\" content=\"no-cache\">
103 + <link href=\"template/css/style.css\" rel=\"stylesheet\" type=\"text/css\" />
104 +</head>
105 +
106 +<body bgColor = '#c0d8f4'>
107 + <h1 style=\"text-align: center;\">$h1Failed</h1>
108 + <center>
109 + $centerencrypted
110 + </center>
111 +</body>
112 +
113 +<!--
114 +<?xml version=\"1.0\" encoding=\"UTF-8\"?>
115 +<WISPAccessGatewayParam
116 + xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"
117 + xsi:noNamespaceSchemaLocation=\"http://www.acmewisp.com/WISPAccessGatewayParam.xsd\">
118 +<AuthenticationReply>
119 +<MessageType>120</MessageType>
120 +<ResponseCode>102</ResponseCode>
121 +<ReplyMessage>Login must use encrypted connection</ReplyMessage>
122 +</AuthenticationReply>
123 +</WISPAccessGatewayParam>
124 +-->
125 +</html>
126 +";
127 +
128 +?>
129 diff -Nur -x '*.orig' -x '*.rej' smeserver-coova-chilli-0.1/root/opt/chilli/hotspotlogin.php mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli/hotspotlogin.php
130 --- smeserver-coova-chilli-0.1/root/opt/chilli/hotspotlogin.php 1970-01-01 01:00:00.000000000 +0100
131 +++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli/hotspotlogin.php 2008-04-07 18:14:25.000000000 +0200
132 @@ -0,0 +1,424 @@
133 +<?php
134 +#
135 +# chilli - ChilliSpot.org. A Wireless LAN Access Point Controller
136 +# Copyright (C) 2003, 2004 Mondru AB.
137 +#
138 +# The contents of this file may be used under the terms of the GNU
139 +# General Public License Version 2, provided that the above copyright
140 +# notice and this permission notice is included in all copies or
141 +# substantial portions of the software.
142 +#
143 +# daloRADIUS edition - fixed up variable definition through-out the code
144 +# as well as parted the code for the sake of modularity and ability to
145 +# to support templates and languages easier.
146 +# Copyright (C) Enginx and Liran Tal 2007, 2008
147 +#
148 +# Redirects from ChilliSpot daemon:
149 +#
150 +# Redirection when not yet or already authenticated
151 +# notyet: ChilliSpot daemon redirects to login page.
152 +# already: ChilliSpot daemon redirects to success status page.
153 +#
154 +# Response to login:
155 +# already: Attempt to login when already logged in.
156 +# failed: Login failed
157 +# success: Login succeded
158 +#
159 +# logoff: Response to a logout
160 +
161 +
162 +# Shared secret used to encrypt challenge with. Prevents dictionary attacks.
163 +# You should change this to your own shared secret.
164 +#$uamsecret = "InhBpiz6MzCcUH5dd017xafSz8";
165 +
166 +# Uncomment the following line if you want to use ordinary user-password
167 +# for radius authentication. Must be used together with $uamsecret.
168 +#$userpassword=1;
169 +include('hotspotlogin-config.php');
170 +
171 +# Our own path
172 +$loginpath = $_SERVER['PHP_SELF'];
173 +
174 +include('lang/main.php');
175 +
176 +/* if SSL was not used show an error */
177 +if (!($_SERVER['HTTPS'] == 'on')) {
178 + include('hotspotlogin-nonssl.php');
179 + exit(0);
180 +}
181 +
182 +# Read form parameters which we care about
183 +if (isset($_POST['UserName']))
184 + $username = $_POST['UserName'];
185 +elseif (isset($_GET['UserName']))
186 + $username = $_GET['UserName'];
187 +else
188 + $username = "";
189 +
190 +
191 +if (isset($_POST['Password']))
192 + $password = $_POST['Password'];
193 +elseif (isset($_GET['Password']))
194 + $password = $_GET['Password'];
195 +else
196 + $password = "";
197 +
198 +
199 +if (isset($_POST['challenge']))
200 + $challenge = $_POST['challenge'];
201 +elseif (isset($_GET['challenge']))
202 + $challenge = $_GET['challenge'];
203 +else
204 + $challenge = "";
205 +
206 +
207 +if (isset($_POST['button']))
208 + $button = $_POST['button'];
209 +elseif (isset($_GET['button']))
210 + $button = $_GET['button'];
211 +else
212 + $button = "";
213 +
214 +
215 +if (isset($_POST['logout']))
216 + $logout = $_POST['logout'];
217 +elseif (isset($_GET['logout']))
218 + $logout = $_GET['logout'];
219 +else
220 + $logout = "";
221 +
222 +
223 +if (isset($_POST['prelogin']))
224 + $prelogin = $_POST['prelogin'];
225 +elseif (isset($_GET['prelogin']))
226 + $prelogin = $_GET['prelogin'];
227 +else
228 + $prelogin = "";
229 +
230 +
231 +if (isset($_POST['res']))
232 + $res = $_POST['res'];
233 +elseif (isset($_GET['res']))
234 + $res = $_GET['res'];
235 +else
236 + $res = "";
237 +
238 +
239 +if (isset($_POST['uamip']))
240 + $uamip = $_POST['uamip'];
241 +elseif (isset($_GET['uamip']))
242 + $uamip = $_GET['uamip'];
243 +else
244 + $uamip = "";
245 +
246 +
247 +if (isset($_POST['uamport']))
248 + $uamport = $_POST['uamport'];
249 +elseif (isset($_GET['uamport']))
250 + $uamport = $_GET['uamport'];
251 +else
252 + $uamport = "";
253 +
254 +
255 +if (isset($_POST['userurl']))
256 + $userurl = $_POST['userurl'];
257 +elseif (isset($_GET['userurl']))
258 + $userurl = $_GET['userurl'];
259 +else
260 + $userurl = "";
261 +
262 +
263 +if (isset($_POST['timeleft']))
264 + $timeleft = $_POST['timeleft'];
265 +elseif (isset($_GET['timeleft']))
266 + $timeleft = $_GET['timeleft'];
267 +else
268 + $timeleft = "";
269 +
270 +
271 +if (isset($_POST['redirurl']))
272 + $redirurl = $_POST['redirurl'];
273 +elseif (isset($_GET['redirurl']))
274 + $redirurl = $_GET['redirurl'];
275 +else
276 + $redirurl = "";
277 +
278 +
279 +(isset($_GET['reply'])) ? $reply = $_GET['reply'] : $reply = "";
280 +
281 +
282 +$userurldecode = $userurl;
283 +$redirurldecode = $redirurl;
284 +
285 +# If attempt to login
286 +if ($button == 'Login') {
287 + $hexchal = pack ("H32", $challenge);
288 + if ($uamsecret) {
289 + $newchal = pack ("H*", md5($hexchal . $uamsecret));
290 + } else {
291 + $newchal = $hexchal;
292 + }
293 + $response = md5("\0" . $password . $newchal);
294 + $newpwd = pack("a32", $password);
295 + $pappassword = implode ("", unpack("H32", ($newpwd ^ $newchal)));
296 + echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">
297 +<html>
298 +<head>
299 + <title>$title</title>
300 + <meta http-equiv=\"Cache-control\" content=\"no-cache\">
301 + <meta http-equiv=\"Pragma\" content=\"no-cache\">
302 + <meta http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-1\" />
303 + <link href=\"template/css/style.css\" rel=\"stylesheet\" type=\"text/css\" />
304 + ";
305 + if (isset($uamsecret) && isset($userpassword)) {
306 + echo " <meta http-equiv=\"refresh\" content=\"0;url=http://$uamip:$uamport/logon?username=$username&password=$pappassword\">";
307 + } else {
308 + echo " <meta http-equiv=\"refresh\" content=\"0;url=http://$uamip:$uamport/logon?username=$username&response=$response&userurl=$userurl\">";
309 + }
310 +
311 + include('template/loggingin.php');
312 +
313 +echo "
314 +<!--
315 +<?xml version=\"1.0\" encoding=\"UTF-8\"?>
316 +<WISPAccessGatewayParam
317 + xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"
318 + xsi:noNamespaceSchemaLocation=\"http://www.acmewisp.com/WISPAccessGatewayParam.xsd\">
319 +<AuthenticationReply>
320 +<MessageType>120</MessageType>
321 +<ResponseCode>201</ResponseCode>
322 +";
323 + if (isset($uamsecret) && isset($userpassword)) {
324 + echo "<LoginResultsURL>http://$uamip:$uamport/logon?username=$username&password=$pappassword</LoginResultsURL>";
325 + } else {
326 + echo "<LoginResultsURL>http://$uamip:$uamport/logon?username=$username&response=$response&userurl=$userurl</LoginResultsURL>";
327 + }
328 + echo "</AuthenticationReply>
329 +</WISPAccessGatewayParam>
330 +-->
331 +</html>
332 +";
333 + exit(0);
334 +}
335 +
336 +switch($res) {
337 + case 'success': $result = 1; break; // If login successful
338 + case 'failed': $result = 2; break; // If login failed
339 + case 'logoff': $result = 3; break; // If logout successful
340 + case 'already': $result = 4; break; // If tried to login while already logged in
341 + case 'notyet': $result = 5; break; // If not logged in yet
342 + case 'smartclient': $result = 6; break; // If login from smart client
343 + case 'popup1': $result = 11; break; // If requested a logging in pop up window
344 + case 'popup2': $result = 12; break; // If requested a success pop up window
345 + case 'popup3': $result = 13; break; // If requested a logout pop up window
346 + default: $result = 0; // Default: It was not a form request
347 +}
348 +
349 +/* Otherwise it was not a form request
350 + * Send out an error message
351 + */
352 +if ($result == 0) {
353 + include('hotspotlogin-nonchilli.php');
354 + exit(0);
355 +}
356 +
357 +# Generate the output
358 +#echo "Content-type: text/html\n\n";
359 +echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">
360 +<html>
361 +<head>
362 + <title>$title</title>
363 + <meta http-equiv=\"Cache-control\" content=\"no-cache\">
364 + <meta http-equiv=\"Pragma\" content=\"no-cache\">
365 + <meta http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-1\" />
366 + <link href=\"template/css/style.css\" rel=\"stylesheet\" type=\"text/css\" />
367 + <SCRIPT LANGUAGE=\"JavaScript\">
368 + var blur = 0;
369 + var starttime = new Date();
370 + var startclock = starttime.getTime();
371 + var mytimeleft = 0;
372 +
373 + function doOnUnLoad(result) {
374 + if ((result==12) && (self.name=='chillispot_popup')) {
375 + document.location.href=('http://1.1.1.1/');
376 + window.close();
377 + }
378 + }
379 +
380 + function doTime() {
381 + window.setTimeout( \"doTime()\", 1000 );
382 + t = new Date();
383 + time = Math.round((t.getTime() - starttime.getTime())/1000);
384 + if (mytimeleft) {
385 + time = mytimeleft - time;
386 + if (time <= 0) {
387 + window.location = \"$loginpath?res=popup3&uamip=$uamip&uamport=$uamport\";
388 + }
389 + }
390 + if (time < 0) time = 0;
391 + hours = (time - (time % 3600)) / 3600;
392 + time = time - (hours * 3600);
393 + mins = (time - (time % 60)) / 60;
394 + secs = time - (mins * 60);
395 + if (hours < 10) hours = \"0\" + hours;
396 + if (mins < 10) mins = \"0\" + mins;
397 + if (secs < 10) secs = \"0\" + secs;
398 + title = \"Online time: \" + hours + \":\" + mins + \":\" + secs;
399 + if (mytimeleft) {
400 + title = \"$remainingTime: \" + hours + \":\" + mins + \":\" + secs;
401 + }
402 + if(document.all || document.getElementById){
403 + document.title = title;
404 + }
405 + else {
406 + self.status = title;
407 + }
408 + }
409 +
410 + function popUp(URL) {
411 + if (self.name != \"chillispot_popup\") {
412 + chillispot_popup = window.open(URL, 'chillispot_popup', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=375');
413 + }
414 + }
415 +
416 + function doOnLoad(result, URL, userurl, redirurl, timeleft) {
417 + if (timeleft) {
418 + mytimeleft = timeleft;
419 + }
420 + if ((result == 1) && (self.name == \"chillispot_popup\")) {
421 + doTime();
422 + }
423 + if ((result == 1) && (self.name != \"chillispot_popup\")) {
424 + chillispot_popup = window.open(URL, 'chillispot_popup', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=375');
425 + }
426 + if ((result == 2) || result == 5) {
427 + document.form1.UserName.focus()
428 + }
429 + if ((result == 2) && (self.name != \"chillispot_popup\")) {
430 + chillispot_popup = window.open('', 'chillispot_popup', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=400,height=200');
431 + chillispot_popup.close();
432 + }
433 + if ((result == 12) && (self.name == \"chillispot_popup\")) {
434 + doTime();
435 + if (redirurl) {
436 + opener.location = redirurl;
437 + }
438 + else if (opener.home) {
439 + opener.home();
440 + }
441 + else {
442 + opener.location = \"about:home\";
443 + }
444 + self.focus();
445 + blur = 0;
446 + }
447 + if ((result == 13) && (self.name == \"chillispot_popup\")) {
448 + self.focus();
449 + blur = 1;
450 + }
451 + }
452 +
453 + function doOnBlur(result) {
454 + if ((result == 12) && (self.name == \"chillispot_popup\")) {
455 + if (blur == 0) {
456 + blur = 1;
457 + self.focus();
458 + }
459 + }
460 + }
461 + </script>
462 +</head>
463 +<body onLoad=\"javascript:doOnLoad($result, '$loginpath?res=popup2&uamip=$uamip&uamport=$uamport&userurl=$userurl&redirurl=$redirurl&timeleft=$timeleft','$userurldecode', '$redirurldecode', '$timeleft')\" onBlur = 'javascript:doOnBlur($result)' onUnLoad=\"doOnUnLoad($result)\" bgColor = '#c0d8f4'>";
464 +
465 +if ($result == 2) {
466 + echo "
467 + <h1 style=\"text-align: center;\">$h1Failed</h1>";
468 + if ($reply) {
469 + echo "<center> $reply </BR></BR></center>";
470 + }
471 +}
472 +
473 +if ($result == 5) {
474 +// chillispot header - login form
475 +// echo "<h1 style=\"text-align: center;\">$h1Login</h1>";
476 +}
477 +
478 +if ($result == 2 || $result == 5) {
479 + //include('hotspotlogin-loginform.php');
480 + include('template/loginform-header.php');
481 +
482 + echo "
483 + <form name=\"form1\" method=\"get\" action=\"$loginpath\">
484 + <input type=\"hidden\" name=\"challenge\" value=\"$challenge\">
485 + <input type=\"hidden\" name=\"uamip\" value=\"$uamip\">
486 + <input type=\"hidden\" name=\"uamport\" value=\"$uamport\">
487 + <input type=\"hidden\" name=\"userurl\" value=\"$userurl\">
488 + <center>
489 + <table border=\"0\" cellpadding=\"5\" cellspacing=\"0\" style=\"width: 400px;\">
490 + <tbody>
491 + <tr>
492 + <td align=\"right\">$centerUsername:</td>
493 + <td><input style=\"font-family: Arial\" type=\"text\" name=\"UserName\" size=\"20\" maxlength=\"128\"></td>
494 + </tr>
495 + <tr>
496 + <td align=\"right\">$centerPassword:</td>
497 + <td><input style=\"font-family: Arial\" type=\"password\" name=\"Password\" size=\"20\" maxlength=\"128\"></td>
498 + </tr>
499 + <tr>
500 + <td align=\"center\" colspan=\"2\" height=\"23\"><input type=\"submit\" name=\"button\" value=\"Login\"
501 + onClick=\"javascript:popUp('$loginpath?res=popup1&uamip=$uamip&uamport=$uamport')\"></td>
502 + </tr>
503 + </tbody>
504 + </table>
505 + </center>
506 + </form>
507 +";
508 +
509 +
510 + include('template/loginform-footer.php');
511 +}
512 +
513 +if ($result == 1) {
514 + echo "
515 + <h1 style=\"text-align: center;\">$h1Loggedin</h1>";
516 +
517 + if ($reply) {
518 + echo "<center> $reply </br></br></center>";
519 + }
520 +
521 + echo "
522 + <center>
523 + <a href=\"http://$uamip:$uamport/logoff\">$centerLogout</a>
524 + </center>
525 +</body>
526 +</html>";
527 +}
528 +
529 +if (($result == 4) || ($result == 12)) {
530 + echo "
531 + <h1 style=\"text-align: center;\">$h1Loggedin</h1>
532 + <center>
533 + <a href=\"javascript:doOnUnLoad(12);\">$centerLogout</a>
534 + </center>
535 +</body>
536 +</html>";
537 +}
538 +
539 +
540 +if ($result == 11) {
541 + include('template/loggingin.php');
542 +}
543 +
544 +
545 +if (($result == 3) || ($result == 13)) {
546 + echo "
547 + <h1 style=\"text-align: center;\">$h1Loggedout</h1>
548 + <center>
549 + <a href=\"http://$uamip:$uamport/prelogin\">$centerLogin</a>
550 + </center>
551 +</body>
552 +</html>";
553 +}
554 +
555 +exit(0);
556 +?>
557 diff -Nur -x '*.orig' -x '*.rej' smeserver-coova-chilli-0.1/root/opt/chilli/js/hotspotlogin.js mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli/js/hotspotlogin.js
558 --- smeserver-coova-chilli-0.1/root/opt/chilli/js/hotspotlogin.js 1970-01-01 01:00:00.000000000 +0100
559 +++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli/js/hotspotlogin.js 2008-04-07 09:45:38.000000000 +0200
560 @@ -0,0 +1,108 @@
561 +var blur = 0;
562 +var starttime = new Date();
563 +var startclock = starttime.getTime();
564 +var mytimeleft = 0;
565 +
566 +function doTime() {
567 + window.setTimeout( \"doTime()\", 1000 );
568 + t = new Date();
569 + time = Math.round((t.getTime() - starttime.getTime())/1000);
570 +
571 + if (mytimeleft) {
572 + time = mytimeleft - time;
573 +
574 + if (time <= 0) {
575 + window.location = \"$loginpath?res=popup3&uamip=$uamip&uamport=$uamport\";
576 + }
577 + }
578 +
579 + if (time < 0) time = 0;
580 +
581 + hours = (time - (time % 3600)) / 3600;
582 + time = time - (hours * 3600);
583 + mins = (time - (time % 60)) / 60;
584 + secs = time - (mins * 60);
585 + if (hours < 10) hours = \"0\" + hours;
586 + if (mins < 10) mins = \"0\" + mins;
587 + if (secs < 10) secs = \"0\" + secs;
588 + title = \"Online time: \" + hours + \":\" + mins + \":\" + secs;
589 +
590 + if (mytimeleft) {
591 + title = \"Remaining time: \" + hours + \":\" + mins + \":\" + secs;
592 + }
593 +
594 + if (document.all || document.getElementById) {
595 + document.title = title;
596 + } else {
597 + self.status = title;
598 + }
599 +}
600 +
601 +function popUp(URL) {
602 + if (self.name != \"chillispot_popup\") {
603 + chillispot_popup = window.open(URL,'chillispot_popup','toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=375');
604 + }
605 +}
606 +
607 +function doOnLoad(result, URL, userurl, redirurl, timeleft) {
608 + if (timeleft) {
609 + mytimeleft = timeleft;
610 + }
611 +
612 + if ((result == 1) && (self.name == \"chillispot_popup\")) {
613 + doTime();
614 + }
615 +
616 + if ((result == 1) && (self.name != \"chillispot_popup\")) {
617 + chillispot_popup = window.open(URL,
618 +'chillispot_popup','toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=375');
619 + }
620 +
621 + if ((result == 2) || result == 5) {
622 + document.form1.UserName.focus()
623 + }
624 +
625 + if ((result == 2) && (self.name != \"chillispot_popup\")) {
626 + chillispot_popup = window.open('',
627 +'chillispot_popup','toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=400,height=200');
628 + chillispot_popup.close();
629 + }
630 +
631 + if ((result == 12) && (self.name == \"chillispot_popup\")) {
632 +
633 + doTime();
634 +
635 + if (redirurl) {
636 + opener.location = redirurl;
637 + } else if (opener.home) {
638 + opener.home();
639 + } else {
640 + opener.location = \"about:home\";
641 + }
642 +
643 + self.focus();
644 + blur = 0;
645 + }
646 +
647 +
648 + if ((result == 13) && (self.name == \"chillispot_popup\")) {
649 + self.focus();
650 + blur = 1;
651 + }
652 +}
653 +
654 +
655 +function doOnBlur(result) {
656 + if ((result == 12) && (self.name == \"chillispot_popup\")) {
657 + if (blur == 0) {
658 + blur = 1;
659 + self.focus();
660 + }
661 + }
662 +}
663 +
664 +
665 +
666 +
667 +
668 +
669 diff -Nur -x '*.orig' -x '*.rej' smeserver-coova-chilli-0.1/root/opt/chilli/lang/en.php mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli/lang/en.php
670 --- smeserver-coova-chilli-0.1/root/opt/chilli/lang/en.php 1970-01-01 01:00:00.000000000 +0100
671 +++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli/lang/en.php 2008-04-07 15:09:42.000000000 +0200
672 @@ -0,0 +1,26 @@
673 +<?php
674 +# daloRADIUS edition - fixed up variable definition through-out the code
675 +# as well as parted the code for the sake of modularity and ability to
676 +# to support templates and languages easier.
677 +# Copyright (C) Enginx and Liran Tal 2007, 2008
678 +
679 +$ChilliSpot="$domain HotSpot";
680 +$title="$ChilliSpot Login";
681 +$centerUsername="Username";
682 +$centerPassword="Password";
683 +$centerLogin="Login";
684 +$centerPleasewait="Please wait.......";
685 +$centerLogout="Logout";
686 +$h1Login="$ChilliSpot Login";
687 +$h1Failed="$ChilliSpot Login Failed";
688 +$h1Loggedin="Logged in to $ChilliSpot";
689 +$h1Loggingin="Logging in to $ChilliSpot";
690 +$h1Loggedout="Logged out from $ChilliSpot";
691 +$centerdaemon="Login must be performed through $ChilliSpot server";
692 +$centerencrypted="Login must use encrypted connection";
693 +
694 +$waitWhileAuth="<br/>Please wait while the server check your credentials<br/>This operation can take up to 30 seconds<br/>";
695 +$poweredBy="Powered By:<br><br>";
696 +$termsOfUse="Term of use";
697 +$remainingTime="Remaining Time";
698 +?>
699 diff -Nur -x '*.orig' -x '*.rej' smeserver-coova-chilli-0.1/root/opt/chilli/lang/fr.php mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli/lang/fr.php
700 --- smeserver-coova-chilli-0.1/root/opt/chilli/lang/fr.php 1970-01-01 01:00:00.000000000 +0100
701 +++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli/lang/fr.php 2008-04-07 15:07:22.000000000 +0200
702 @@ -0,0 +1,27 @@
703 +<?php
704 +# daloRADIUS edition - fixed up variable definition through-out the code
705 +# as well as parted the code for the sake of modularity and ability to
706 +# to support templates and languages easier.
707 +# Copyright (C) Enginx and Liran Tal 2007, 2008
708 +
709 +$ChilliSpot="Portail Captif $domain";
710 +$title="Identification sur le $ChilliSpot";
711 +$centerUsername="Nom d'utilisateur";
712 +$centerPassword="Mot de Passe";
713 +$centerLogin="Identification";
714 +$centerPleasewait="Veuillez patienter.......";
715 +$centerLogout="Déconnexion";
716 +$h1Login="Identification";
717 +$h1Failed="L'identification a échouée";
718 +$h1Loggedin="Identifié sur le $ChilliSpot";
719 +$h1Loggingin="Identification en cours";
720 +$h1Loggedout="Déconncté de $ChilliSpot";
721 +$centerdaemon="L'identification doit se faire par le $ChilliSpot";
722 +$centerencrypted="L'identification doit utiliser une connexion sécurisée";
723 +
724 +$waitWhileAuth="<br/>Veuillez patienter pendant que le serveur vérifie vos identifiants<br/>Cette opération peut durer jusqu'à 30 secondes.<br/>";
725 +$poweredBy="Propulsé par:<br><br>";
726 +$termsOfUse="Conditions d'utilisation";
727 +$remainingTime="temps restant";
728 +
729 +?>
730 diff -Nur -x '*.orig' -x '*.rej' smeserver-coova-chilli-0.1/root/opt/chilli/lang/main.php mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli/lang/main.php
731 --- smeserver-coova-chilli-0.1/root/opt/chilli/lang/main.php 1970-01-01 01:00:00.000000000 +0100
732 +++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli/lang/main.php 2008-04-07 09:45:38.000000000 +0200
733 @@ -0,0 +1,17 @@
734 +<?php
735 +
736 + $lang = "fr";
737 + switch($lang) {
738 +
739 + case "en":
740 + include ("lang/en.php");
741 + break;
742 + case "fr":
743 + include ("lang/fr.php");
744 + break;
745 + default:
746 + include ("lang/en.php");
747 + break;
748 + }
749 +
750 +?>
751 diff -Nur -x '*.orig' -x '*.rej' smeserver-coova-chilli-0.1/root/opt/chilli/template/css/style.css mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli/template/css/style.css
752 --- smeserver-coova-chilli-0.1/root/opt/chilli/template/css/style.css 1970-01-01 01:00:00.000000000 +0100
753 +++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli/template/css/style.css 2008-04-07 13:49:44.000000000 +0200
754 @@ -0,0 +1,143 @@
755 +/* CSS Document */
756 +
757 +body{
758 +background-color:#112231;
759 +color: #FAFAFA;
760 +font-family:Arial;
761 +}
762 +#wrap{
763 +text-align:center;
764 +margin:0 auto;
765 +}
766 +.header{
767 +background-image:url(../images/header.jpg);
768 +width:645px;
769 +height:160px;
770 +text-align:center;
771 +margin:0 auto;
772 +}
773 +
774 +.header p {
775 +font-size:24px;
776 +width:645px;
777 +height:120px;
778 +position:relative;
779 +top:105px;
780 +left:95px;
781 +text-align:left;
782 +}
783 +
784 +.header p span {
785 +color:#9bd0df;
786 +font-weight:bold;
787 +font-style:italic
788 +}
789 +
790 +.header p sup {
791 +font-size:9px;
792 +}
793 +.header a {
794 +text-decoration:none;
795 +color:#FFFFFF
796 +}
797 +
798 +#navigation{
799 +background-image:url(../images/navigation.jpg);
800 +width:647px;
801 +height:58px;
802 +text-align:center;
803 +margin:0 auto;
804 +}
805 +#body{
806 +background-color:#9ad1e0;
807 +width:643px;
808 +border-left:#49a5bf 2px solid;
809 +border-right:#49a5bf 2px solid;
810 +font-size:12px;
811 +text-align:center;
812 +margin:0 auto;
813 +text-shadow:#000000;
814 +}
815 +#body p{
816 +padding-left:20px;
817 +padding-right:20px;
818 +text-indent:30px;
819 +margin:0;
820 +padding-top:5px;
821 +text-align:left;
822 +}
823 +#body img {
824 +border:#FFFFFF 0px solid;
825 +text-align:center;
826 +margin-left:15px;
827 +}
828 +#body h1{
829 +font-family: Trebuchet MS;
830 +font-size:18px;
831 +text-align:left;
832 +padding-left:20px;
833 +margin:0;
834 +padding-top:5px;
835 +padding-bottom:5px;
836 +}
837 +#footer{
838 +font-family: Trebuchet MS;
839 +font-size:8px;
840 +padding-top:10px;
841 +background-image:url(../images/footer.jpg);
842 +width:647px;
843 +height:46px;
844 +text-align:center;
845 +margin:0 auto;
846 +color: #000;
847 +}
848 +
849 +.glossymenu{
850 + position: relative;
851 + padding-right:20px;
852 + padding-left:20px;
853 + margin: 0 auto 0 auto;
854 + background: url(../images/menur_bg.gif) repeat-x; /*tab background image path*/
855 + height: 46px;
856 + list-style: none;
857 + padding-top:10px;
858 +}
859 +
860 +.glossymenu li{
861 + float:left;
862 +}
863 +
864 +.glossymenu li a{
865 + float: left;
866 + display: block;
867 + color:#FFFFFF;
868 + text-decoration: none;
869 + font-family: Trebuchet MS;
870 + font-size: 12px;
871 + padding:0 0 0 16px; /*Padding to accomodate left tab image. Do not change*/
872 + height: 46px;
873 + line-height: 46px;
874 + text-align: center;
875 + cursor: pointer;
876 +}
877 +
878 +.glossymenu li a b{
879 + float: left;
880 + display: block;
881 + padding: 0 20px 0 8px; /*Padding of menu items*/
882 +}
883 +
884 +.glossymenu li.current a, .glossymenu li a:hover{
885 + color: #fff;
886 + background: url(../images/menur_hover_left.gif) no-repeat; /*left tab image path*/
887 + background-position: left;
888 +}
889 +
890 +.glossymenu li.current a b, .glossymenu li a:hover b{
891 + color: #fff;
892 + background: url(../images/menur_hover_right.gif) no-repeat right top; /*right tab image path*/
893 +}
894 +
895 +a {
896 + color:#fff;
897 +}
898 diff -Nur -x '*.orig' -x '*.rej' smeserver-coova-chilli-0.1/root/opt/chilli/template/license.txt mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli/template/license.txt
899 --- smeserver-coova-chilli-0.1/root/opt/chilli/template/license.txt 1970-01-01 01:00:00.000000000 +0100
900 +++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli/template/license.txt 2008-04-07 09:45:38.000000000 +0200
901 @@ -0,0 +1,86 @@
902 +Attribution 2.5 Canada
903 +CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OR USE OF THIS LICENCE DOES NOT CREATE A SOLICITOR-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE.
904 +
905 +Licence
906 +
907 +THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENCE (hereafter "LICENCE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENCE IS PROHIBITED.
908 +
909 +BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENCE. THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
910 +
911 + 1. Definitions.
912 + 1. "Collective Work" means a work, such as a dictionary, yearbook, encyclopedia, or a newspaper, review magazine or singular periodical and any work written in distinct parts by different authors, or in which works or parts of works of different authors are incorporated. A work that constitutes a Collective Work will not be considered a Derivative Work (as defined below) for the purposes of this licence.
913 + 2. "Derivative Work" means a work that produces or reproduces the Work or any substantial part thereof in any material form. Derivative works include:
914 + 1. Translations of the Work;
915 + 2. Where the Work is a dramatic work, conversions of the Work into a novel or other non-dramatic work;
916 + 3. Where the Work is a novel or other non-dramatic work or an artistic work, conversions of the Work into a dramatic work by way of performance in public or otherwise;
917 + 4. Where the Work is a literary or dramatic or musical work, making a sound recording, cinematograph film or other mechanical contrivance by means of which the Work may be mechanically reproduced or performed; and
918 + 5. Where the Work is a literary or dramatic or musical or artistic work, reproductions, adaptations or public presentations of the Work as a cinematographic work.
919 + A work that constitutes a Collective Work will not be considered a Derivative Work for the purpose of this Licence. Where the Work is a musical composition or sound recording, the synchronization of the Work in time-relation with a moving image (i.e. cinematographic work "synching") will be treated as a Derivative Work for the purpose of this Licence.
920 + 3. "Licence Elements" means the following high-level Licence attributes as selected by Licensor and indicated in the title of this Licence: Attribution, Noncommercial, NoDerivatives, ShareAlike.
921 + 4. "Licensor" means the individual or entity that offers the Work under the terms of this Licence.
922 + 5. "Moral Rights" means rights that an individual who creates a Work protected by copyright has concerning the integrity of the work, the attribution (or anonymity) of authorship, and the right not to be associated with a product, service, cause or institution, or rights of similar nature in the Work anywhere in the world.
923 + 6. "Musical Work" means any work of music or musical composition, with or without words, and includes any compilation thereof.
924 + 7. "Original Author" means the individual who created the Work.
925 + 8. "Use" means to exercise one or more of the rights set out below as granted by the Licence and includes the title thereof when such title is original and distinctive.
926 + 1. to produce or reproduce the work in any material form;
927 + 2. to perform the work in public;
928 + 3. if the work is unpublished, to publish the work;
929 + 4. to convert a dramatic work into a non-dramatic work;
930 + 5. to convert a non-dramatic work into a dramatic work;
931 + 6. to make a sound recording, cinematographic film or other contrivance by means of which the work may be mechanically reproduced or performed;
932 + 7. to reproduce, adapt and publicly present the work, as a cinematographic film;
933 + 8. to communicate the work to the public by telecommunication;
934 + 9. to present at a public exhibition, for a purpose other than sale or hire, an artistic work created after June 7, 1988, other than a map, chart or plan;
935 + 10. to rent a computer program;
936 + 11. to rent a sound recording embodying a musical work; and/or
937 + 12. to authorize such acts.
938 + 9. "Work" means the distinctive and original work of authorship offered under the terms of this Licence.
939 + 10. "You" means an individual or entity exercising rights under this Licence who has not previously violated the terms of this Licence with respect to the Work, or who has received express permission from the Licensor to exercise rights under this Licence despite a previous violation.
940 + 2. Fair Dealing Rights. Nothing in this licence is intended to reduce, limit, or restrict any rights accruing to fair dealing, and those exemptions afforded to individuals, educational institutions, libraries, archives, museums, computer programs, incidental inclusions and ephemeral recordings, or other limitations on the exclusive rights of the copyright owner under the Copyright Act.
941 + 3. Licence Grant. Subject to the terms and conditions of this Licence, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) Licence to exercise the rights in the Work as stated below:
942 + 1. to Use the Work, to incorporate the Work into one or more Collective Works, and to Use the Work as incorporated in the Collective Works; and
943 + 2. to create and reproduce Derivative Works.
944 +
945 + The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats.
946 +
947 + All rights not expressly granted by Licensor are hereby reserved.
948 +
949 + For the avoidance of doubt, where the Work is a musical composition, performer's performance or sound recording:
950 + 1. Performance Royalties Under Blanket Licences. Licensor waives the exclusive right to collect, whether individually or via a performance rights society, royalties for the public performance or public digital performance (e.g. webcast) of the musical Work, sound recording or performer's performance if that performance is primarily intended for or directed toward commercial advantage or private monetary compensation.
951 + 2. Mechanical Rights in Musical Works. Licensor waives the exclusive right to collect, whether individually or via a music rights agency, collective society, or designated agent, royalties for any soundrecording You create from the musical Work ("cover version") if Your Use of such cover version is primarily intended for or directed toward commercial advantage or private monetary compensation.
952 +
953 + Except as otherwise agreed by the Original Author, if You Use a Work or any Derivative Works or Collective Works in any material form, You must not do anything that would offend the Moral Rights of the Original Author, including but not limited to:
954 + 1. You must not falsely attribute the Work to someone other than the Original Author; and
955 + 2. If applicable, You must respect the Original Author's wish to remain anonymous or pseudonymous.
956 +
957 + All other moral rights are waived. This means the Original Author is not reserving the ability to prevent downstream creators from engaging in material distortion or modification of the work, including, but limited to, associating the Work with a particular product, service, cause or institution.
958 + 4. Restrictions. The licence granted in Section 3 above is expressly made subject to and limited by the following restrictions:
959 + 1. You may Use the Work only under the terms of this Licence, and You must include a copy of, or the Uniform Resource Identifier for, this Licence with every copy or soundrecordings of the Work You Use. You may not offer or impose any terms on the Work that alter or restrict the terms of this or the recipients' exercise of the rights granted hereunder. You may not sublicense the Work. You must keep intact all notices that refer to this Licence and to the disclaimer of warranties. You may not Use the Work with any technological measures that control access or use of the Work in a manner inconsistent with the terms of this Licence Agreement.
960 +
961 + The above applies to the Work as incorporated in a Collective Work, but this does not require the Collective Work apart from the Work itself to be made subject to the terms of this Licence.
962 +
963 + If You create a Collective Work, upon request from any Licensor You must, to the extent practicable, include or remove from the Collective Work any credit required by clause 4(b).
964 +
965 + If You create a Derivative Work, upon request from any Licensor You must, to the extent practicable, include or remove from the Derivative Work any credit required by clause 4(b).
966 + 2. If you Use the Work or any Derivative Works or Collective Works, You must keep intact all copyright notices for the Work and give credit reasonable to the medium or means You are utilizing to the (i) Original Author by using his, her or its name (or pseudonym) if supplied; and/or (ii) if the Original Author and/or Licensor designate another party or parties (eg. a sponsor institution, publishing entity, journal) for attribution in Licensor's copyright notice or terms of service or by other reasonable means, then to such party or parties; the title of the Work if supplied; to the extent reasonably practicable, the Uniform Resource Identifier, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and in the case of a Derivative Work, a credit identifying the use of the Work in the Derivative Work (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). Such credit may be implemented in any reasonable manner; provided, however, that in the case of a Derivative Work or Collective Work, at a minimum such credit will appear where any other comparable authorship credit appears and in a manner at least as prominent as such other comparable authorship credit.
967 + 5. Representations, Warranties and Disclaimer. UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
968 + 6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, AND EXCEPT FOR DAMAGES ARISING FROM LIABILITY TO A THIRD PARTY RESULTING FROM BREACH OF THE WARRANTIES IN SECTION 5, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENCE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
969 + 7. Termination.
970 + 1. This Licence and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this Licence. Individuals or entities who have received Derivative Works or Collective Works from You under this Licence, however, will not have their licences terminated provided such individuals or entities remain in full compliance with those licences. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this Licence.
971 + 2. Subject to the above terms and conditions, the licence granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different licence terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this Licence (or any other licence that has been, or is required to be, granted under the terms of this Licence), and this Licence will continue in full force and effect unless terminated as stated above.
972 + 8. Miscellaneous.
973 + 1. Each time You Use the Work or a Collective Work, the Licensor offers to the recipient a licence to the Work on the same terms and conditions as the licence granted to You under this Licence.
974 + 2. Each time You Use a Derivative Work, Licensor offers to the recipient a licence to the original Work on the same terms and conditions as the licence granted to You under this Licence.
975 + 3. If any provision of this Licence is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Licence, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
976 + 4. No term or provision of this Licence shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
977 + 5. This Licence constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This Licence may not be modified without the mutual written agreement of the Licensor and You.
978 + 6. You must abide the Licence during its term despite the expiry, initial invalidity or later invalidation of any intellectual property rights.
979 + 7. The construction, validity and performance of this Licence shall be governed by the laws in force in Canada and, where applicable, those of the province in which the Licensor normally resides.
980 +
981 +Creative Commons is not a party to this Licence, and makes no warranty whatsoever in connection with the Work. Creative Commons will not be liable to You or any party on any legal theory for any damages whatsoever, including without limitation any general, special, incidental or consequential damages arising in connection to this licence. Notwithstanding the foregoing two (2) sentences, if Creative Commons has expressly identified itself as the Licensor hereunder, it shall have all rights and obligations of Licensor.
982 +
983 +Except for the limited purpose of indicating to the public that the Work is licensed under this Licence, neither party will use the trademark "Creative Commons" or any related trademark or logo of Creative Commons without the prior written consent of Creative Commons. Any permitted use will be in compliance with Creative Commons' then-current trademark usage guidelines, as may be published on its website or otherwise made available upon request from time to time.
984 +
985 +Creative Commons may be contacted at http://creativecommons.org/.
986 +
987 +Creative Commons Canada may be contacted at http://creativecommons.ca/.
988 diff -Nur -x '*.orig' -x '*.rej' smeserver-coova-chilli-0.1/root/opt/chilli/template/loggingin.php mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli/template/loggingin.php
989 --- smeserver-coova-chilli-0.1/root/opt/chilli/template/loggingin.php 1970-01-01 01:00:00.000000000 +0100
990 +++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli/template/loggingin.php 2008-04-07 10:08:28.000000000 +0200
991 @@ -0,0 +1,39 @@
992 +<?php
993 +
994 +echo <<<END
995 +
996 +<div id="wrap">
997 +
998 + <div id="navigation">
999 + <ul class="glossymenu">
1000 + </ul>
1001 + </div>
1002 +
1003 + <div id="body">
1004 + <h1>$h1Loggingin</h1>
1005 + <p>
1006 + <br/>
1007 + $waitWhileAuth
1008 + </p>
1009 +
1010 + <br/><br/>
1011 + <br/><br/>
1012 + </div>
1013 +
1014 +
1015 +
1016 + <div id="footer">Enginx&copy;2008 All Rights Reserved &bull; Enginx and daloRADIUS Hotspot Systems <br/>
1017 + Design by <a href="http://templatefusion.org">TemplateFusion</a>
1018 + </div>
1019 +
1020 +
1021 +</div>
1022 +
1023 +</body>
1024 +</html>
1025 +
1026 +
1027 +END;
1028 +
1029 +
1030 +?>
1031 diff -Nur -x '*.orig' -x '*.rej' smeserver-coova-chilli-0.1/root/opt/chilli/template/loginform-footer.php mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli/template/loginform-footer.php
1032 --- smeserver-coova-chilli-0.1/root/opt/chilli/template/loginform-footer.php 1970-01-01 01:00:00.000000000 +0100
1033 +++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli/template/loginform-footer.php 2008-04-07 12:26:06.000000000 +0200
1034 @@ -0,0 +1,31 @@
1035 +<?php
1036 +
1037 +echo <<<END
1038 +
1039 + </p>
1040 +
1041 +
1042 + $poweredBy
1043 + <a href="http://smeserver.org"><img src="template/images/smeserver.png" alt="SME server" /></a>
1044 + <a href="http://coova.org"><img src="template/images/coova.png" alt="Coova-Chilli" /></a>
1045 + <a href="http://sourceforge.net/projects/daloradius"><img src="template/images/dalo.png" alt="DaloRadius" /></a>
1046 + <a href="http://www.firewall-services.com"><img src="template/images/firewallservices.png" alt="Firewall Services" /></a>
1047 + </div>
1048 +
1049 +
1050 +
1051 + <div id="footer">Enginx&copy;2008 All Rights Reserved &bull; Enginx and daloRADIUS Hotspot Systems <br/>
1052 + Design by <a href="http://templatefusion.org">TemplateFusion</a>
1053 + </div>
1054 +
1055 +
1056 +</div>
1057 +
1058 +</body>
1059 +</html>
1060 +
1061 +END;
1062 +
1063 +
1064 +
1065 +?>
1066 diff -Nur -x '*.orig' -x '*.rej' smeserver-coova-chilli-0.1/root/opt/chilli/template/loginform-header.php mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli/template/loginform-header.php
1067 --- smeserver-coova-chilli-0.1/root/opt/chilli/template/loginform-header.php 1970-01-01 01:00:00.000000000 +0100
1068 +++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli/template/loginform-header.php 2008-04-08 10:10:23.000000000 +0200
1069 @@ -0,0 +1,24 @@
1070 +<?php
1071 +
1072 +echo <<<END
1073 +
1074 +<div id="wrap">
1075 +
1076 + <div class="header"><p>SME <span>Spot</span></p>
1077 + </div>
1078 +
1079 + <div id="navigation">
1080 + <ul class="glossymenu">
1081 + <li><a href="#" class="current"><b>$centerLogin</b></a></li>
1082 + <li><a href="#"><b>$termsOfUse</b></a></li>
1083
1084 + </ul>
1085 + </div>
1086 +
1087 + <div id="body">
1088 + <h1><center>$title</center></h1>
1089 + <p>
1090 +
1091 +END;
1092 +
1093 +
1094 +?>
1095 diff -Nur -x '*.orig' -x '*.rej' smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/hotspotlogin-config.php mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/hotspotlogin-config.php
1096 --- smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/hotspotlogin-config.php 2008-04-07 09:45:38.000000000 +0200
1097 +++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/hotspotlogin-config.php 1970-01-01 01:00:00.000000000 +0100
1098 @@ -1,6 +0,0 @@
1099 -<?php
1100 -
1101 -$uamsecret = 'InhBpiz6MzCcUH5dd017xafSz8';
1102 -$userpassword=1;
1103 -
1104 -?>
1105 diff -Nur -x '*.orig' -x '*.rej' smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/hotspotlogin-loginform.php mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/hotspotlogin-loginform.php
1106 --- smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/hotspotlogin-loginform.php 2008-04-07 09:45:38.000000000 +0200
1107 +++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/hotspotlogin-loginform.php 1970-01-01 01:00:00.000000000 +0100
1108 @@ -1,41 +0,0 @@
1109 -<?php
1110 -# daloRADIUS edition - fixed up variable definition through-out the code
1111 -# as well as parted the code for the sake of modularity and ability to
1112 -# to support templates and languages easier.
1113 -# Copyright (C) Enginx and Liran Tal 2007, 2008
1114 -
1115 -echo "
1116 - <form name='form1' method='post' action='$loginpath'>
1117 - <input type='hidden' name='challenge' value='$challenge'>
1118 - <input type='hidden' name='uamip' value='$uamip'>
1119 - <input type='hidden' name='uamport' value='$uamport'>
1120 - <input type='hidden' name='userurl' value='$userurl'>
1121 -
1122 - <center>
1123 - <table border='0' cellpadding='5' cellspacing='0' style='width: 217px;'>
1124 - <tbody>
1125 - <tr>
1126 - <td align='right'>$centerUsername:</td>
1127 - <td><input style='font-family: Arial' type='text' name='UserName' size='20' maxlength='128'></td>
1128 - </tr>
1129 -
1130 - <tr>
1131 - <td align='right'>$centerPassword:</td>
1132 - <td><input style='font-family: Arial' type='password' name='Password' size='20' maxlength='128'></td>
1133 - </tr>
1134 -
1135 - <tr>
1136 - <td align='center' colspan='2' height='23'><input type='submit' name='button' value='Login'
1137 - onClick=\"javascript:popUp('$loginpath?res=popup1&uamip=$uamip&uamport=$uamport')\"></td>
1138 - </tr>
1139 -
1140 - </tbody>
1141 - </table>
1142 - </center>
1143 - </form>
1144 -</body>
1145 -</html>
1146 -";
1147 -
1148 -
1149 -?>
1150 diff -Nur -x '*.orig' -x '*.rej' smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/hotspotlogin-nonchilli.php mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/hotspotlogin-nonchilli.php
1151 --- smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/hotspotlogin-nonchilli.php 2008-04-07 12:54:34.000000000 +0200
1152 +++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/hotspotlogin-nonchilli.php 1970-01-01 01:00:00.000000000 +0100
1153 @@ -1,26 +0,0 @@
1154 -<?php
1155 -# daloRADIUS edition - fixed up variable definition through-out the code
1156 -# as well as parted the code for the sake of modularity and ability to
1157 -# to support templates and languages easier.
1158 -# Copyright (C) Enginx and Liran Tal 2007, 2008
1159 -
1160 -echo "
1161 -<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">
1162 -<html>
1163 -<head>
1164 - <title>$title</title>
1165 - <meta http-equiv=\"Cache-control\" content=\"no-cache\">
1166 - <meta http-equiv=\"Pragma\" content=\"no-cache\">
1167 - <link href=\"template/css/style.css\" rel=\"stylesheet\" type=\"text/css\" />
1168 -</head>
1169 -
1170 -<body bgColor = '#c0d8f4'>
1171 - <h1 style=\"text-align: center;\">$h1Failed</h1>
1172 - <center>
1173 - $centerdaemon
1174 - </center>
1175 -</body>
1176 -</html>
1177 -";
1178 -
1179 -?>
1180 diff -Nur -x '*.orig' -x '*.rej' smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/hotspotlogin-nonssl.php mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/hotspotlogin-nonssl.php
1181 --- smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/hotspotlogin-nonssl.php 2008-04-07 12:55:22.000000000 +0200
1182 +++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/hotspotlogin-nonssl.php 1970-01-01 01:00:00.000000000 +0100
1183 @@ -1,39 +0,0 @@
1184 -<?php
1185 -# daloRADIUS edition - fixed up variable definition through-out the code
1186 -# as well as parted the code for the sake of modularity and ability to
1187 -# to support templates and languages easier.
1188 -# Copyright (C) Enginx and Liran Tal 2007, 2008
1189 -
1190 -echo "
1191 -<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">
1192 -<html>
1193 -<head>
1194 - <title>$title</title>
1195 - <meta http-equiv=\"Cache-control\" content=\"no-cache\">
1196 - <meta http-equiv=\"Pragma\" content=\"no-cache\">
1197 - <link href=\"template/css/style.css\" rel=\"stylesheet\" type=\"text/css\" />
1198 -</head>
1199 -
1200 -<body bgColor = '#c0d8f4'>
1201 - <h1 style=\"text-align: center;\">$h1Failed</h1>
1202 - <center>
1203 - $centerencrypted
1204 - </center>
1205 -</body>
1206 -
1207 -<!--
1208 -<?xml version=\"1.0\" encoding=\"UTF-8\"?>
1209 -<WISPAccessGatewayParam
1210 - xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"
1211 - xsi:noNamespaceSchemaLocation=\"http://www.acmewisp.com/WISPAccessGatewayParam.xsd\">
1212 -<AuthenticationReply>
1213 -<MessageType>120</MessageType>
1214 -<ResponseCode>102</ResponseCode>
1215 -<ReplyMessage>Login must use encrypted connection</ReplyMessage>
1216 -</AuthenticationReply>
1217 -</WISPAccessGatewayParam>
1218 --->
1219 -</html>
1220 -";
1221 -
1222 -?>
1223 diff -Nur -x '*.orig' -x '*.rej' smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/hotspotlogin.php mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/hotspotlogin.php
1224 --- smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/hotspotlogin.php 2008-04-07 18:14:25.000000000 +0200
1225 +++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/hotspotlogin.php 1970-01-01 01:00:00.000000000 +0100
1226 @@ -1,424 +0,0 @@
1227 -<?php
1228 -#
1229 -# chilli - ChilliSpot.org. A Wireless LAN Access Point Controller
1230 -# Copyright (C) 2003, 2004 Mondru AB.
1231 -#
1232 -# The contents of this file may be used under the terms of the GNU
1233 -# General Public License Version 2, provided that the above copyright
1234 -# notice and this permission notice is included in all copies or
1235 -# substantial portions of the software.
1236 -#
1237 -# daloRADIUS edition - fixed up variable definition through-out the code
1238 -# as well as parted the code for the sake of modularity and ability to
1239 -# to support templates and languages easier.
1240 -# Copyright (C) Enginx and Liran Tal 2007, 2008
1241 -#
1242 -# Redirects from ChilliSpot daemon:
1243 -#
1244 -# Redirection when not yet or already authenticated
1245 -# notyet: ChilliSpot daemon redirects to login page.
1246 -# already: ChilliSpot daemon redirects to success status page.
1247 -#
1248 -# Response to login:
1249 -# already: Attempt to login when already logged in.
1250 -# failed: Login failed
1251 -# success: Login succeded
1252 -#
1253 -# logoff: Response to a logout
1254 -
1255 -
1256 -# Shared secret used to encrypt challenge with. Prevents dictionary attacks.
1257 -# You should change this to your own shared secret.
1258 -#$uamsecret = "InhBpiz6MzCcUH5dd017xafSz8";
1259 -
1260 -# Uncomment the following line if you want to use ordinary user-password
1261 -# for radius authentication. Must be used together with $uamsecret.
1262 -#$userpassword=1;
1263 -include('hotspotlogin-config.php');
1264 -
1265 -# Our own path
1266 -$loginpath = $_SERVER['PHP_SELF'];
1267 -
1268 -include('lang/main.php');
1269 -
1270 -/* if SSL was not used show an error */
1271 -if (!($_SERVER['HTTPS'] == 'on')) {
1272 - include('hotspotlogin-nonssl.php');
1273 - exit(0);
1274 -}
1275 -
1276 -# Read form parameters which we care about
1277 -if (isset($_POST['UserName']))
1278 - $username = $_POST['UserName'];
1279 -elseif (isset($_GET['UserName']))
1280 - $username = $_GET['UserName'];
1281 -else
1282 - $username = "";
1283 -
1284 -
1285 -if (isset($_POST['Password']))
1286 - $password = $_POST['Password'];
1287 -elseif (isset($_GET['Password']))
1288 - $password = $_GET['Password'];
1289 -else
1290 - $password = "";
1291 -
1292 -
1293 -if (isset($_POST['challenge']))
1294 - $challenge = $_POST['challenge'];
1295 -elseif (isset($_GET['challenge']))
1296 - $challenge = $_GET['challenge'];
1297 -else
1298 - $challenge = "";
1299 -
1300 -
1301 -if (isset($_POST['button']))
1302 - $button = $_POST['button'];
1303 -elseif (isset($_GET['button']))
1304 - $button = $_GET['button'];
1305 -else
1306 - $button = "";
1307 -
1308 -
1309 -if (isset($_POST['logout']))
1310 - $logout = $_POST['logout'];
1311 -elseif (isset($_GET['logout']))
1312 - $logout = $_GET['logout'];
1313 -else
1314 - $logout = "";
1315 -
1316 -
1317 -if (isset($_POST['prelogin']))
1318 - $prelogin = $_POST['prelogin'];
1319 -elseif (isset($_GET['prelogin']))
1320 - $prelogin = $_GET['prelogin'];
1321 -else
1322 - $prelogin = "";
1323 -
1324 -
1325 -if (isset($_POST['res']))
1326 - $res = $_POST['res'];
1327 -elseif (isset($_GET['res']))
1328 - $res = $_GET['res'];
1329 -else
1330 - $res = "";
1331 -
1332 -
1333 -if (isset($_POST['uamip']))
1334 - $uamip = $_POST['uamip'];
1335 -elseif (isset($_GET['uamip']))
1336 - $uamip = $_GET['uamip'];
1337 -else
1338 - $uamip = "";
1339 -
1340 -
1341 -if (isset($_POST['uamport']))
1342 - $uamport = $_POST['uamport'];
1343 -elseif (isset($_GET['uamport']))
1344 - $uamport = $_GET['uamport'];
1345 -else
1346 - $uamport = "";
1347 -
1348 -
1349 -if (isset($_POST['userurl']))
1350 - $userurl = $_POST['userurl'];
1351 -elseif (isset($_GET['userurl']))
1352 - $userurl = $_GET['userurl'];
1353 -else
1354 - $userurl = "";
1355 -
1356 -
1357 -if (isset($_POST['timeleft']))
1358 - $timeleft = $_POST['timeleft'];
1359 -elseif (isset($_GET['timeleft']))
1360 - $timeleft = $_GET['timeleft'];
1361 -else
1362 - $timeleft = "";
1363 -
1364 -
1365 -if (isset($_POST['redirurl']))
1366 - $redirurl = $_POST['redirurl'];
1367 -elseif (isset($_GET['redirurl']))
1368 - $redirurl = $_GET['redirurl'];
1369 -else
1370 - $redirurl = "";
1371 -
1372 -
1373 -(isset($_GET['reply'])) ? $reply = $_GET['reply'] : $reply = "";
1374 -
1375 -
1376 -$userurldecode = $userurl;
1377 -$redirurldecode = $redirurl;
1378 -
1379 -# If attempt to login
1380 -if ($button == 'Login') {
1381 - $hexchal = pack ("H32", $challenge);
1382 - if ($uamsecret) {
1383 - $newchal = pack ("H*", md5($hexchal . $uamsecret));
1384 - } else {
1385 - $newchal = $hexchal;
1386 - }
1387 - $response = md5("\0" . $password . $newchal);
1388 - $newpwd = pack("a32", $password);
1389 - $pappassword = implode ("", unpack("H32", ($newpwd ^ $newchal)));
1390 - echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">
1391 -<html>
1392 -<head>
1393 - <title>$title</title>
1394 - <meta http-equiv=\"Cache-control\" content=\"no-cache\">
1395 - <meta http-equiv=\"Pragma\" content=\"no-cache\">
1396 - <meta http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-1\" />
1397 - <link href=\"template/css/style.css\" rel=\"stylesheet\" type=\"text/css\" />
1398 - ";
1399 - if (isset($uamsecret) && isset($userpassword)) {
1400 - echo " <meta http-equiv=\"refresh\" content=\"0;url=http://$uamip:$uamport/logon?username=$username&password=$pappassword\">";
1401 - } else {
1402 - echo " <meta http-equiv=\"refresh\" content=\"0;url=http://$uamip:$uamport/logon?username=$username&response=$response&userurl=$userurl\">";
1403 - }
1404 -
1405 - include('template/loggingin.php');
1406 -
1407 -echo "
1408 -<!--
1409 -<?xml version=\"1.0\" encoding=\"UTF-8\"?>
1410 -<WISPAccessGatewayParam
1411 - xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"
1412 - xsi:noNamespaceSchemaLocation=\"http://www.acmewisp.com/WISPAccessGatewayParam.xsd\">
1413 -<AuthenticationReply>
1414 -<MessageType>120</MessageType>
1415 -<ResponseCode>201</ResponseCode>
1416 -";
1417 - if (isset($uamsecret) && isset($userpassword)) {
1418 - echo "<LoginResultsURL>http://$uamip:$uamport/logon?username=$username&password=$pappassword</LoginResultsURL>";
1419 - } else {
1420 - echo "<LoginResultsURL>http://$uamip:$uamport/logon?username=$username&response=$response&userurl=$userurl</LoginResultsURL>";
1421 - }
1422 - echo "</AuthenticationReply>
1423 -</WISPAccessGatewayParam>
1424 --->
1425 -</html>
1426 -";
1427 - exit(0);
1428 -}
1429 -
1430 -switch($res) {
1431 - case 'success': $result = 1; break; // If login successful
1432 - case 'failed': $result = 2; break; // If login failed
1433 - case 'logoff': $result = 3; break; // If logout successful
1434 - case 'already': $result = 4; break; // If tried to login while already logged in
1435 - case 'notyet': $result = 5; break; // If not logged in yet
1436 - case 'smartclient': $result = 6; break; // If login from smart client
1437 - case 'popup1': $result = 11; break; // If requested a logging in pop up window
1438 - case 'popup2': $result = 12; break; // If requested a success pop up window
1439 - case 'popup3': $result = 13; break; // If requested a logout pop up window
1440 - default: $result = 0; // Default: It was not a form request
1441 -}
1442 -
1443 -/* Otherwise it was not a form request
1444 - * Send out an error message
1445 - */
1446 -if ($result == 0) {
1447 - include('hotspotlogin-nonchilli.php');
1448 - exit(0);
1449 -}
1450 -
1451 -# Generate the output
1452 -#echo "Content-type: text/html\n\n";
1453 -echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">
1454 -<html>
1455 -<head>
1456 - <title>$title</title>
1457 - <meta http-equiv=\"Cache-control\" content=\"no-cache\">
1458 - <meta http-equiv=\"Pragma\" content=\"no-cache\">
1459 - <meta http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-1\" />
1460 - <link href=\"template/css/style.css\" rel=\"stylesheet\" type=\"text/css\" />
1461 - <SCRIPT LANGUAGE=\"JavaScript\">
1462 - var blur = 0;
1463 - var starttime = new Date();
1464 - var startclock = starttime.getTime();
1465 - var mytimeleft = 0;
1466 -
1467 - function doOnUnLoad(result) {
1468 - if ((result==12) && (self.name=='chillispot_popup')) {
1469 - document.location.href=('http://1.1.1.1/');
1470 - window.close();
1471 - }
1472 - }
1473 -
1474 - function doTime() {
1475 - window.setTimeout( \"doTime()\", 1000 );
1476 - t = new Date();
1477 - time = Math.round((t.getTime() - starttime.getTime())/1000);
1478 - if (mytimeleft) {
1479 - time = mytimeleft - time;
1480 - if (time <= 0) {
1481 - window.location = \"$loginpath?res=popup3&uamip=$uamip&uamport=$uamport\";
1482 - }
1483 - }
1484 - if (time < 0) time = 0;
1485 - hours = (time - (time % 3600)) / 3600;
1486 - time = time - (hours * 3600);
1487 - mins = (time - (time % 60)) / 60;
1488 - secs = time - (mins * 60);
1489 - if (hours < 10) hours = \"0\" + hours;
1490 - if (mins < 10) mins = \"0\" + mins;
1491 - if (secs < 10) secs = \"0\" + secs;
1492 - title = \"Online time: \" + hours + \":\" + mins + \":\" + secs;
1493 - if (mytimeleft) {
1494 - title = \"$remainingTime: \" + hours + \":\" + mins + \":\" + secs;
1495 - }
1496 - if(document.all || document.getElementById){
1497 - document.title = title;
1498 - }
1499 - else {
1500 - self.status = title;
1501 - }
1502 - }
1503 -
1504 - function popUp(URL) {
1505 - if (self.name != \"chillispot_popup\") {
1506 - chillispot_popup = window.open(URL, 'chillispot_popup', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=375');
1507 - }
1508 - }
1509 -
1510 - function doOnLoad(result, URL, userurl, redirurl, timeleft) {
1511 - if (timeleft) {
1512 - mytimeleft = timeleft;
1513 - }
1514 - if ((result == 1) && (self.name == \"chillispot_popup\")) {
1515 - doTime();
1516 - }
1517 - if ((result == 1) && (self.name != \"chillispot_popup\")) {
1518 - chillispot_popup = window.open(URL, 'chillispot_popup', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=375');
1519 - }
1520 - if ((result == 2) || result == 5) {
1521 - document.form1.UserName.focus()
1522 - }
1523 - if ((result == 2) && (self.name != \"chillispot_popup\")) {
1524 - chillispot_popup = window.open('', 'chillispot_popup', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=400,height=200');
1525 - chillispot_popup.close();
1526 - }
1527 - if ((result == 12) && (self.name == \"chillispot_popup\")) {
1528 - doTime();
1529 - if (redirurl) {
1530 - opener.location = redirurl;
1531 - }
1532 - else if (opener.home) {
1533 - opener.home();
1534 - }
1535 - else {
1536 - opener.location = \"about:home\";
1537 - }
1538 - self.focus();
1539 - blur = 0;
1540 - }
1541 - if ((result == 13) && (self.name == \"chillispot_popup\")) {
1542 - self.focus();
1543 - blur = 1;
1544 - }
1545 - }
1546 -
1547 - function doOnBlur(result) {
1548 - if ((result == 12) && (self.name == \"chillispot_popup\")) {
1549 - if (blur == 0) {
1550 - blur = 1;
1551 - self.focus();
1552 - }
1553 - }
1554 - }
1555 - </script>
1556 -</head>
1557 -<body onLoad=\"javascript:doOnLoad($result, '$loginpath?res=popup2&uamip=$uamip&uamport=$uamport&userurl=$userurl&redirurl=$redirurl&timeleft=$timeleft','$userurldecode', '$redirurldecode', '$timeleft')\" onBlur = 'javascript:doOnBlur($result)' onUnLoad=\"doOnUnLoad($result)\" bgColor = '#c0d8f4'>";
1558 -
1559 -if ($result == 2) {
1560 - echo "
1561 - <h1 style=\"text-align: center;\">$h1Failed</h1>";
1562 - if ($reply) {
1563 - echo "<center> $reply </BR></BR></center>";
1564 - }
1565 -}
1566 -
1567 -if ($result == 5) {
1568 -// chillispot header - login form
1569 -// echo "<h1 style=\"text-align: center;\">$h1Login</h1>";
1570 -}
1571 -
1572 -if ($result == 2 || $result == 5) {
1573 - //include('hotspotlogin-loginform.php');
1574 - include('template/loginform-header.php');
1575 -
1576 - echo "
1577 - <form name=\"form1\" method=\"get\" action=\"$loginpath\">
1578 - <input type=\"hidden\" name=\"challenge\" value=\"$challenge\">
1579 - <input type=\"hidden\" name=\"uamip\" value=\"$uamip\">
1580 - <input type=\"hidden\" name=\"uamport\" value=\"$uamport\">
1581 - <input type=\"hidden\" name=\"userurl\" value=\"$userurl\">
1582 - <center>
1583 - <table border=\"0\" cellpadding=\"5\" cellspacing=\"0\" style=\"width: 400px;\">
1584 - <tbody>
1585 - <tr>
1586 - <td align=\"right\">$centerUsername:</td>
1587 - <td><input style=\"font-family: Arial\" type=\"text\" name=\"UserName\" size=\"20\" maxlength=\"128\"></td>
1588 - </tr>
1589 - <tr>
1590 - <td align=\"right\">$centerPassword:</td>
1591 - <td><input style=\"font-family: Arial\" type=\"password\" name=\"Password\" size=\"20\" maxlength=\"128\"></td>
1592 - </tr>
1593 - <tr>
1594 - <td align=\"center\" colspan=\"2\" height=\"23\"><input type=\"submit\" name=\"button\" value=\"Login\"
1595 - onClick=\"javascript:popUp('$loginpath?res=popup1&uamip=$uamip&uamport=$uamport')\"></td>
1596 - </tr>
1597 - </tbody>
1598 - </table>
1599 - </center>
1600 - </form>
1601 -";
1602 -
1603 -
1604 - include('template/loginform-footer.php');
1605 -}
1606 -
1607 -if ($result == 1) {
1608 - echo "
1609 - <h1 style=\"text-align: center;\">$h1Loggedin</h1>";
1610 -
1611 - if ($reply) {
1612 - echo "<center> $reply </br></br></center>";
1613 - }
1614 -
1615 - echo "
1616 - <center>
1617 - <a href=\"http://$uamip:$uamport/logoff\">$centerLogout</a>
1618 - </center>
1619 -</body>
1620 -</html>";
1621 -}
1622 -
1623 -if (($result == 4) || ($result == 12)) {
1624 - echo "
1625 - <h1 style=\"text-align: center;\">$h1Loggedin</h1>
1626 - <center>
1627 - <a href=\"javascript:doOnUnLoad(12);\">$centerLogout</a>
1628 - </center>
1629 -</body>
1630 -</html>";
1631 -}
1632 -
1633 -
1634 -if ($result == 11) {
1635 - include('template/loggingin.php');
1636 -}
1637 -
1638 -
1639 -if (($result == 3) || ($result == 13)) {
1640 - echo "
1641 - <h1 style=\"text-align: center;\">$h1Loggedout</h1>
1642 - <center>
1643 - <a href=\"http://$uamip:$uamport/prelogin\">$centerLogin</a>
1644 - </center>
1645 -</body>
1646 -</html>";
1647 -}
1648 -
1649 -exit(0);
1650 -?>
1651 diff -Nur -x '*.orig' -x '*.rej' smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/js/hotspotlogin.js mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/js/hotspotlogin.js
1652 --- smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/js/hotspotlogin.js 2008-04-07 09:45:38.000000000 +0200
1653 +++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/js/hotspotlogin.js 1970-01-01 01:00:00.000000000 +0100
1654 @@ -1,108 +0,0 @@
1655 -var blur = 0;
1656 -var starttime = new Date();
1657 -var startclock = starttime.getTime();
1658 -var mytimeleft = 0;
1659 -
1660 -function doTime() {
1661 - window.setTimeout( \"doTime()\", 1000 );
1662 - t = new Date();
1663 - time = Math.round((t.getTime() - starttime.getTime())/1000);
1664 -
1665 - if (mytimeleft) {
1666 - time = mytimeleft - time;
1667 -
1668 - if (time <= 0) {
1669 - window.location = \"$loginpath?res=popup3&uamip=$uamip&uamport=$uamport\";
1670 - }
1671 - }
1672 -
1673 - if (time < 0) time = 0;
1674 -
1675 - hours = (time - (time % 3600)) / 3600;
1676 - time = time - (hours * 3600);
1677 - mins = (time - (time % 60)) / 60;
1678 - secs = time - (mins * 60);
1679 - if (hours < 10) hours = \"0\" + hours;
1680 - if (mins < 10) mins = \"0\" + mins;
1681 - if (secs < 10) secs = \"0\" + secs;
1682 - title = \"Online time: \" + hours + \":\" + mins + \":\" + secs;
1683 -
1684 - if (mytimeleft) {
1685 - title = \"Remaining time: \" + hours + \":\" + mins + \":\" + secs;
1686 - }
1687 -
1688 - if (document.all || document.getElementById) {
1689 - document.title = title;
1690 - } else {
1691 - self.status = title;
1692 - }
1693 -}
1694 -
1695 -function popUp(URL) {
1696 - if (self.name != \"chillispot_popup\") {
1697 - chillispot_popup = window.open(URL,'chillispot_popup','toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=375');
1698 - }
1699 -}
1700 -
1701 -function doOnLoad(result, URL, userurl, redirurl, timeleft) {
1702 - if (timeleft) {
1703 - mytimeleft = timeleft;
1704 - }
1705 -
1706 - if ((result == 1) && (self.name == \"chillispot_popup\")) {
1707 - doTime();
1708 - }
1709 -
1710 - if ((result == 1) && (self.name != \"chillispot_popup\")) {
1711 - chillispot_popup = window.open(URL,
1712 -'chillispot_popup','toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=375');
1713 - }
1714 -
1715 - if ((result == 2) || result == 5) {
1716 - document.form1.UserName.focus()
1717 - }
1718 -
1719 - if ((result == 2) && (self.name != \"chillispot_popup\")) {
1720 - chillispot_popup = window.open('',
1721 -'chillispot_popup','toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=400,height=200');
1722 - chillispot_popup.close();
1723 - }
1724 -
1725 - if ((result == 12) && (self.name == \"chillispot_popup\")) {
1726 -
1727 - doTime();
1728 -
1729 - if (redirurl) {
1730 - opener.location = redirurl;
1731 - } else if (opener.home) {
1732 - opener.home();
1733 - } else {
1734 - opener.location = \"about:home\";
1735 - }
1736 -
1737 - self.focus();
1738 - blur = 0;
1739 - }
1740 -
1741 -
1742 - if ((result == 13) && (self.name == \"chillispot_popup\")) {
1743 - self.focus();
1744 - blur = 1;
1745 - }
1746 -}
1747 -
1748 -
1749 -function doOnBlur(result) {
1750 - if ((result == 12) && (self.name == \"chillispot_popup\")) {
1751 - if (blur == 0) {
1752 - blur = 1;
1753 - self.focus();
1754 - }
1755 - }
1756 -}
1757 -
1758 -
1759 -
1760 -
1761 -
1762 -
1763 diff -Nur -x '*.orig' -x '*.rej' smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/lang/en.php mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/lang/en.php
1764 --- smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/lang/en.php 2008-04-07 15:09:42.000000000 +0200
1765 +++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/lang/en.php 1970-01-01 01:00:00.000000000 +0100
1766 @@ -1,26 +0,0 @@
1767 -<?php
1768 -# daloRADIUS edition - fixed up variable definition through-out the code
1769 -# as well as parted the code for the sake of modularity and ability to
1770 -# to support templates and languages easier.
1771 -# Copyright (C) Enginx and Liran Tal 2007, 2008
1772 -
1773 -$ChilliSpot="$domain HotSpot";
1774 -$title="$ChilliSpot Login";
1775 -$centerUsername="Username";
1776 -$centerPassword="Password";
1777 -$centerLogin="Login";
1778 -$centerPleasewait="Please wait.......";
1779 -$centerLogout="Logout";
1780 -$h1Login="$ChilliSpot Login";
1781 -$h1Failed="$ChilliSpot Login Failed";
1782 -$h1Loggedin="Logged in to $ChilliSpot";
1783 -$h1Loggingin="Logging in to $ChilliSpot";
1784 -$h1Loggedout="Logged out from $ChilliSpot";
1785 -$centerdaemon="Login must be performed through $ChilliSpot server";
1786 -$centerencrypted="Login must use encrypted connection";
1787 -
1788 -$waitWhileAuth="<br/>Please wait while the server check your credentials<br/>This operation can take up to 30 seconds<br/>";
1789 -$poweredBy="Powered By:<br><br>";
1790 -$termsOfUse="Term of use";
1791 -$remainingTime="Remaining Time";
1792 -?>
1793 diff -Nur -x '*.orig' -x '*.rej' smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/lang/fr.php mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/lang/fr.php
1794 --- smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/lang/fr.php 2008-04-07 15:07:22.000000000 +0200
1795 +++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/lang/fr.php 1970-01-01 01:00:00.000000000 +0100
1796 @@ -1,27 +0,0 @@
1797 -<?php
1798 -# daloRADIUS edition - fixed up variable definition through-out the code
1799 -# as well as parted the code for the sake of modularity and ability to
1800 -# to support templates and languages easier.
1801 -# Copyright (C) Enginx and Liran Tal 2007, 2008
1802 -
1803 -$ChilliSpot="Portail Captif $domain";
1804 -$title="Identification sur le $ChilliSpot";
1805 -$centerUsername="Nom d'utilisateur";
1806 -$centerPassword="Mot de Passe";
1807 -$centerLogin="Identification";
1808 -$centerPleasewait="Veuillez patienter.......";
1809 -$centerLogout="Déconnexion";
1810 -$h1Login="Identification";
1811 -$h1Failed="L'identification a échouée";
1812 -$h1Loggedin="Identifié sur le $ChilliSpot";
1813 -$h1Loggingin="Identification en cours";
1814 -$h1Loggedout="Déconncté de $ChilliSpot";
1815 -$centerdaemon="L'identification doit se faire par le $ChilliSpot";
1816 -$centerencrypted="L'identification doit utiliser une connexion sécurisée";
1817 -
1818 -$waitWhileAuth="<br/>Veuillez patienter pendant que le serveur vérifie vos identifiants<br/>Cette opération peut durer jusqu'à 30 secondes.<br/>";
1819 -$poweredBy="Propulsé par:<br><br>";
1820 -$termsOfUse="Conditions d'utilisation";
1821 -$remainingTime="temps restant";
1822 -
1823 -?>
1824 diff -Nur -x '*.orig' -x '*.rej' smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/lang/main.php mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/lang/main.php
1825 --- smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/lang/main.php 2008-04-07 09:45:38.000000000 +0200
1826 +++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/lang/main.php 1970-01-01 01:00:00.000000000 +0100
1827 @@ -1,17 +0,0 @@
1828 -<?php
1829 -
1830 - $lang = "fr";
1831 - switch($lang) {
1832 -
1833 - case "en":
1834 - include ("lang/en.php");
1835 - break;
1836 - case "fr":
1837 - include ("lang/fr.php");
1838 - break;
1839 - default:
1840 - include ("lang/en.php");
1841 - break;
1842 - }
1843 -
1844 -?>
1845 diff -Nur -x '*.orig' -x '*.rej' smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/template/css/style.css mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/template/css/style.css
1846 --- smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/template/css/style.css 2008-04-07 13:49:44.000000000 +0200
1847 +++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/template/css/style.css 1970-01-01 01:00:00.000000000 +0100
1848 @@ -1,143 +0,0 @@
1849 -/* CSS Document */
1850 -
1851 -body{
1852 -background-color:#112231;
1853 -color: #FAFAFA;
1854 -font-family:Arial;
1855 -}
1856 -#wrap{
1857 -text-align:center;
1858 -margin:0 auto;
1859 -}
1860 -.header{
1861 -background-image:url(../images/header.jpg);
1862 -width:645px;
1863 -height:160px;
1864 -text-align:center;
1865 -margin:0 auto;
1866 -}
1867 -
1868 -.header p {
1869 -font-size:24px;
1870 -width:645px;
1871 -height:120px;
1872 -position:relative;
1873 -top:105px;
1874 -left:95px;
1875 -text-align:left;
1876 -}
1877 -
1878 -.header p span {
1879 -color:#9bd0df;
1880 -font-weight:bold;
1881 -font-style:italic
1882 -}
1883 -
1884 -.header p sup {
1885 -font-size:9px;
1886 -}
1887 -.header a {
1888 -text-decoration:none;
1889 -color:#FFFFFF
1890 -}
1891 -
1892 -#navigation{
1893 -background-image:url(../images/navigation.jpg);
1894 -width:647px;
1895 -height:58px;
1896 -text-align:center;
1897 -margin:0 auto;
1898 -}
1899 -#body{
1900 -background-color:#9ad1e0;
1901 -width:643px;
1902 -border-left:#49a5bf 2px solid;
1903 -border-right:#49a5bf 2px solid;
1904 -font-size:12px;
1905 -text-align:center;
1906 -margin:0 auto;
1907 -text-shadow:#000000;
1908 -}
1909 -#body p{
1910 -padding-left:20px;
1911 -padding-right:20px;
1912 -text-indent:30px;
1913 -margin:0;
1914 -padding-top:5px;
1915 -text-align:left;
1916 -}
1917 -#body img {
1918 -border:#FFFFFF 0px solid;
1919 -text-align:center;
1920 -margin-left:15px;
1921 -}
1922 -#body h1{
1923 -font-family: Trebuchet MS;
1924 -font-size:18px;
1925 -text-align:left;
1926 -padding-left:20px;
1927 -margin:0;
1928 -padding-top:5px;
1929 -padding-bottom:5px;
1930 -}
1931 -#footer{
1932 -font-family: Trebuchet MS;
1933 -font-size:8px;
1934 -padding-top:10px;
1935 -background-image:url(../images/footer.jpg);
1936 -width:647px;
1937 -height:46px;
1938 -text-align:center;
1939 -margin:0 auto;
1940 -color: #000;
1941 -}
1942 -
1943 -.glossymenu{
1944 - position: relative;
1945 - padding-right:20px;
1946 - padding-left:20px;
1947 - margin: 0 auto 0 auto;
1948 - background: url(../images/menur_bg.gif) repeat-x; /*tab background image path*/
1949 - height: 46px;
1950 - list-style: none;
1951 - padding-top:10px;
1952 -}
1953 -
1954 -.glossymenu li{
1955 - float:left;
1956 -}
1957 -
1958 -.glossymenu li a{
1959 - float: left;
1960 - display: block;
1961 - color:#FFFFFF;
1962 - text-decoration: none;
1963 - font-family: Trebuchet MS;
1964 - font-size: 12px;
1965 - padding:0 0 0 16px; /*Padding to accomodate left tab image. Do not change*/
1966 - height: 46px;
1967 - line-height: 46px;
1968 - text-align: center;
1969 - cursor: pointer;
1970 -}
1971 -
1972 -.glossymenu li a b{
1973 - float: left;
1974 - display: block;
1975 - padding: 0 20px 0 8px; /*Padding of menu items*/
1976 -}
1977 -
1978 -.glossymenu li.current a, .glossymenu li a:hover{
1979 - color: #fff;
1980 - background: url(../images/menur_hover_left.gif) no-repeat; /*left tab image path*/
1981 - background-position: left;
1982 -}
1983 -
1984 -.glossymenu li.current a b, .glossymenu li a:hover b{
1985 - color: #fff;
1986 - background: url(../images/menur_hover_right.gif) no-repeat right top; /*right tab image path*/
1987 -}
1988 -
1989 -a {
1990 - color:#fff;
1991 -}
1992 diff -Nur -x '*.orig' -x '*.rej' smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/template/license.txt mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/template/license.txt
1993 --- smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/template/license.txt 2008-04-07 09:45:38.000000000 +0200
1994 +++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/template/license.txt 1970-01-01 01:00:00.000000000 +0100
1995 @@ -1,86 +0,0 @@
1996 -Attribution 2.5 Canada
1997 -CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OR USE OF THIS LICENCE DOES NOT CREATE A SOLICITOR-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE.
1998 -
1999 -Licence
2000 -
2001 -THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENCE (hereafter "LICENCE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENCE IS PROHIBITED.
2002 -
2003 -BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENCE. THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
2004 -
2005 - 1. Definitions.
2006 - 1. "Collective Work" means a work, such as a dictionary, yearbook, encyclopedia, or a newspaper, review magazine or singular periodical and any work written in distinct parts by different authors, or in which works or parts of works of different authors are incorporated. A work that constitutes a Collective Work will not be considered a Derivative Work (as defined below) for the purposes of this licence.
2007 - 2. "Derivative Work" means a work that produces or reproduces the Work or any substantial part thereof in any material form. Derivative works include:
2008 - 1. Translations of the Work;
2009 - 2. Where the Work is a dramatic work, conversions of the Work into a novel or other non-dramatic work;
2010 - 3. Where the Work is a novel or other non-dramatic work or an artistic work, conversions of the Work into a dramatic work by way of performance in public or otherwise;
2011 - 4. Where the Work is a literary or dramatic or musical work, making a sound recording, cinematograph film or other mechanical contrivance by means of which the Work may be mechanically reproduced or performed; and
2012 - 5. Where the Work is a literary or dramatic or musical or artistic work, reproductions, adaptations or public presentations of the Work as a cinematographic work.
2013 - A work that constitutes a Collective Work will not be considered a Derivative Work for the purpose of this Licence. Where the Work is a musical composition or sound recording, the synchronization of the Work in time-relation with a moving image (i.e. cinematographic work "synching") will be treated as a Derivative Work for the purpose of this Licence.
2014 - 3. "Licence Elements" means the following high-level Licence attributes as selected by Licensor and indicated in the title of this Licence: Attribution, Noncommercial, NoDerivatives, ShareAlike.
2015 - 4. "Licensor" means the individual or entity that offers the Work under the terms of this Licence.
2016 - 5. "Moral Rights" means rights that an individual who creates a Work protected by copyright has concerning the integrity of the work, the attribution (or anonymity) of authorship, and the right not to be associated with a product, service, cause or institution, or rights of similar nature in the Work anywhere in the world.
2017 - 6. "Musical Work" means any work of music or musical composition, with or without words, and includes any compilation thereof.
2018 - 7. "Original Author" means the individual who created the Work.
2019 - 8. "Use" means to exercise one or more of the rights set out below as granted by the Licence and includes the title thereof when such title is original and distinctive.
2020 - 1. to produce or reproduce the work in any material form;
2021 - 2. to perform the work in public;
2022 - 3. if the work is unpublished, to publish the work;
2023 - 4. to convert a dramatic work into a non-dramatic work;
2024 - 5. to convert a non-dramatic work into a dramatic work;
2025 - 6. to make a sound recording, cinematographic film or other contrivance by means of which the work may be mechanically reproduced or performed;
2026 - 7. to reproduce, adapt and publicly present the work, as a cinematographic film;
2027 - 8. to communicate the work to the public by telecommunication;
2028 - 9. to present at a public exhibition, for a purpose other than sale or hire, an artistic work created after June 7, 1988, other than a map, chart or plan;
2029 - 10. to rent a computer program;
2030 - 11. to rent a sound recording embodying a musical work; and/or
2031 - 12. to authorize such acts.
2032 - 9. "Work" means the distinctive and original work of authorship offered under the terms of this Licence.
2033 - 10. "You" means an individual or entity exercising rights under this Licence who has not previously violated the terms of this Licence with respect to the Work, or who has received express permission from the Licensor to exercise rights under this Licence despite a previous violation.
2034 - 2. Fair Dealing Rights. Nothing in this licence is intended to reduce, limit, or restrict any rights accruing to fair dealing, and those exemptions afforded to individuals, educational institutions, libraries, archives, museums, computer programs, incidental inclusions and ephemeral recordings, or other limitations on the exclusive rights of the copyright owner under the Copyright Act.
2035 - 3. Licence Grant. Subject to the terms and conditions of this Licence, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) Licence to exercise the rights in the Work as stated below:
2036 - 1. to Use the Work, to incorporate the Work into one or more Collective Works, and to Use the Work as incorporated in the Collective Works; and
2037 - 2. to create and reproduce Derivative Works.
2038 -
2039 - The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats.
2040 -
2041 - All rights not expressly granted by Licensor are hereby reserved.
2042 -
2043 - For the avoidance of doubt, where the Work is a musical composition, performer's performance or sound recording:
2044 - 1. Performance Royalties Under Blanket Licences. Licensor waives the exclusive right to collect, whether individually or via a performance rights society, royalties for the public performance or public digital performance (e.g. webcast) of the musical Work, sound recording or performer's performance if that performance is primarily intended for or directed toward commercial advantage or private monetary compensation.
2045 - 2. Mechanical Rights in Musical Works. Licensor waives the exclusive right to collect, whether individually or via a music rights agency, collective society, or designated agent, royalties for any soundrecording You create from the musical Work ("cover version") if Your Use of such cover version is primarily intended for or directed toward commercial advantage or private monetary compensation.
2046 -
2047 - Except as otherwise agreed by the Original Author, if You Use a Work or any Derivative Works or Collective Works in any material form, You must not do anything that would offend the Moral Rights of the Original Author, including but not limited to:
2048 - 1. You must not falsely attribute the Work to someone other than the Original Author; and
2049 - 2. If applicable, You must respect the Original Author's wish to remain anonymous or pseudonymous.
2050 -
2051 - All other moral rights are waived. This means the Original Author is not reserving the ability to prevent downstream creators from engaging in material distortion or modification of the work, including, but limited to, associating the Work with a particular product, service, cause or institution.
2052 - 4. Restrictions. The licence granted in Section 3 above is expressly made subject to and limited by the following restrictions:
2053 - 1. You may Use the Work only under the terms of this Licence, and You must include a copy of, or the Uniform Resource Identifier for, this Licence with every copy or soundrecordings of the Work You Use. You may not offer or impose any terms on the Work that alter or restrict the terms of this or the recipients' exercise of the rights granted hereunder. You may not sublicense the Work. You must keep intact all notices that refer to this Licence and to the disclaimer of warranties. You may not Use the Work with any technological measures that control access or use of the Work in a manner inconsistent with the terms of this Licence Agreement.
2054 -
2055 - The above applies to the Work as incorporated in a Collective Work, but this does not require the Collective Work apart from the Work itself to be made subject to the terms of this Licence.
2056 -
2057 - If You create a Collective Work, upon request from any Licensor You must, to the extent practicable, include or remove from the Collective Work any credit required by clause 4(b).
2058 -
2059 - If You create a Derivative Work, upon request from any Licensor You must, to the extent practicable, include or remove from the Derivative Work any credit required by clause 4(b).
2060 - 2. If you Use the Work or any Derivative Works or Collective Works, You must keep intact all copyright notices for the Work and give credit reasonable to the medium or means You are utilizing to the (i) Original Author by using his, her or its name (or pseudonym) if supplied; and/or (ii) if the Original Author and/or Licensor designate another party or parties (eg. a sponsor institution, publishing entity, journal) for attribution in Licensor's copyright notice or terms of service or by other reasonable means, then to such party or parties; the title of the Work if supplied; to the extent reasonably practicable, the Uniform Resource Identifier, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and in the case of a Derivative Work, a credit identifying the use of the Work in the Derivative Work (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). Such credit may be implemented in any reasonable manner; provided, however, that in the case of a Derivative Work or Collective Work, at a minimum such credit will appear where any other comparable authorship credit appears and in a manner at least as prominent as such other comparable authorship credit.
2061 - 5. Representations, Warranties and Disclaimer. UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
2062 - 6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, AND EXCEPT FOR DAMAGES ARISING FROM LIABILITY TO A THIRD PARTY RESULTING FROM BREACH OF THE WARRANTIES IN SECTION 5, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENCE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
2063 - 7. Termination.
2064 - 1. This Licence and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this Licence. Individuals or entities who have received Derivative Works or Collective Works from You under this Licence, however, will not have their licences terminated provided such individuals or entities remain in full compliance with those licences. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this Licence.
2065 - 2. Subject to the above terms and conditions, the licence granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different licence terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this Licence (or any other licence that has been, or is required to be, granted under the terms of this Licence), and this Licence will continue in full force and effect unless terminated as stated above.
2066 - 8. Miscellaneous.
2067 - 1. Each time You Use the Work or a Collective Work, the Licensor offers to the recipient a licence to the Work on the same terms and conditions as the licence granted to You under this Licence.
2068 - 2. Each time You Use a Derivative Work, Licensor offers to the recipient a licence to the original Work on the same terms and conditions as the licence granted to You under this Licence.
2069 - 3. If any provision of this Licence is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Licence, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
2070 - 4. No term or provision of this Licence shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
2071 - 5. This Licence constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This Licence may not be modified without the mutual written agreement of the Licensor and You.
2072 - 6. You must abide the Licence during its term despite the expiry, initial invalidity or later invalidation of any intellectual property rights.
2073 - 7. The construction, validity and performance of this Licence shall be governed by the laws in force in Canada and, where applicable, those of the province in which the Licensor normally resides.
2074 -
2075 -Creative Commons is not a party to this Licence, and makes no warranty whatsoever in connection with the Work. Creative Commons will not be liable to You or any party on any legal theory for any damages whatsoever, including without limitation any general, special, incidental or consequential damages arising in connection to this licence. Notwithstanding the foregoing two (2) sentences, if Creative Commons has expressly identified itself as the Licensor hereunder, it shall have all rights and obligations of Licensor.
2076 -
2077 -Except for the limited purpose of indicating to the public that the Work is licensed under this Licence, neither party will use the trademark "Creative Commons" or any related trademark or logo of Creative Commons without the prior written consent of Creative Commons. Any permitted use will be in compliance with Creative Commons' then-current trademark usage guidelines, as may be published on its website or otherwise made available upon request from time to time.
2078 -
2079 -Creative Commons may be contacted at http://creativecommons.org/.
2080 -
2081 -Creative Commons Canada may be contacted at http://creativecommons.ca/.
2082 diff -Nur -x '*.orig' -x '*.rej' smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/template/loggingin.php mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/template/loggingin.php
2083 --- smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/template/loggingin.php 2008-04-07 10:08:28.000000000 +0200
2084 +++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/template/loggingin.php 1970-01-01 01:00:00.000000000 +0100
2085 @@ -1,39 +0,0 @@
2086 -<?php
2087 -
2088 -echo <<<END
2089 -
2090 -<div id="wrap">
2091 -
2092 - <div id="navigation">
2093 - <ul class="glossymenu">
2094 - </ul>
2095 - </div>
2096 -
2097 - <div id="body">
2098 - <h1>$h1Loggingin</h1>
2099 - <p>
2100 - <br/>
2101 - $waitWhileAuth
2102 - </p>
2103 -
2104 - <br/><br/>
2105 - <br/><br/>
2106 - </div>
2107 -
2108 -
2109 -
2110 - <div id="footer">Enginx&copy;2008 All Rights Reserved &bull; Enginx and daloRADIUS Hotspot Systems <br/>
2111 - Design by <a href="http://templatefusion.org">TemplateFusion</a>
2112 - </div>
2113 -
2114 -
2115 -</div>
2116 -
2117 -</body>
2118 -</html>
2119 -
2120 -
2121 -END;
2122 -
2123 -
2124 -?>
2125 diff -Nur -x '*.orig' -x '*.rej' smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/template/loginform-footer.php mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/template/loginform-footer.php
2126 --- smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/template/loginform-footer.php 2008-04-07 12:26:06.000000000 +0200
2127 +++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/template/loginform-footer.php 1970-01-01 01:00:00.000000000 +0100
2128 @@ -1,31 +0,0 @@
2129 -<?php
2130 -
2131 -echo <<<END
2132 -
2133 - </p>
2134 -
2135 -
2136 - $poweredBy
2137 - <a href="http://smeserver.org"><img src="template/images/smeserver.png" alt="SME server" /></a>
2138 - <a href="http://coova.org"><img src="template/images/coova.png" alt="Coova-Chilli" /></a>
2139 - <a href="http://sourceforge.net/projects/daloradius"><img src="template/images/dalo.png" alt="DaloRadius" /></a>
2140 - <a href="http://www.firewall-services.com"><img src="template/images/firewallservices.png" alt="Firewall Services" /></a>
2141 - </div>
2142 -
2143 -
2144 -
2145 - <div id="footer">Enginx&copy;2008 All Rights Reserved &bull; Enginx and daloRADIUS Hotspot Systems <br/>
2146 - Design by <a href="http://templatefusion.org">TemplateFusion</a>
2147 - </div>
2148 -
2149 -
2150 -</div>
2151 -
2152 -</body>
2153 -</html>
2154 -
2155 -END;
2156 -
2157 -
2158 -
2159 -?>
2160 diff -Nur -x '*.orig' -x '*.rej' smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/template/loginform-header.php mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/template/loginform-header.php
2161 --- smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/template/loginform-header.php 2008-04-08 10:10:23.000000000 +0200
2162 +++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/template/loginform-header.php 1970-01-01 01:00:00.000000000 +0100
2163 @@ -1,24 +0,0 @@
2164 -<?php
2165 -
2166 -echo <<<END
2167 -
2168 -<div id="wrap">
2169 -
2170 - <div class="header"><p>SME <span>Spot</span></p>
2171 - </div>
2172 -
2173 - <div id="navigation">
2174 - <ul class="glossymenu">
2175 - <li><a href="#" class="current"><b>$centerLogin</b></a></li>
2176 - <li><a href="#"><b>$termsOfUse</b></a></li>
2177
2178 - </ul>
2179 - </div>
2180 -
2181 - <div id="body">
2182 - <h1><center>$title</center></h1>
2183 - <p>
2184 -
2185 -END;
2186 -
2187 -
2188 -?>

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed