smeserver-coova-chilli/contribs7/smeserver-coova-chilli-0.1-loginPageDir.patch

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
--- smeserver-coova-chilli-0.1/root/opt/chilli/hotspotlogin-config.php  1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli/hotspotlogin-config.php        2008-04-07 09:45:38.000000000 +0200
@@ -0,0 +1,6 @@
+<?php
+
+$uamsecret = 'InhBpiz6MzCcUH5dd017xafSz8';
+$userpassword=1;
+
+?>
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
--- smeserver-coova-chilli-0.1/root/opt/chilli/hotspotlogin-loginform.php       1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli/hotspotlogin-loginform.php     2008-04-07 09:45:38.000000000 +0200
@@ -0,0 +1,41 @@
+<?php
+# daloRADIUS edition - fixed up variable definition through-out the code
+# as well as parted the code for the sake of modularity and ability to 
+# to support templates and languages easier.
+# Copyright (C) Enginx and Liran Tal 2007, 2008
+
+echo "
+       <form name='form1' method='post' action='$loginpath'>
+               <input type='hidden' name='challenge' value='$challenge'>
+               <input type='hidden' name='uamip' value='$uamip'>
+               <input type='hidden' name='uamport' value='$uamport'>
+               <input type='hidden' name='userurl' value='$userurl'>
+
+               <center>
+               <table border='0' cellpadding='5' cellspacing='0' style='width: 217px;'>
+               <tbody>
+               <tr>
+                       <td align='right'>$centerUsername:</td>
+                       <td><input style='font-family: Arial' type='text' name='UserName' size='20' maxlength='128'></td>
+               </tr>
+
+               <tr>
+                       <td align='right'>$centerPassword:</td>
+                       <td><input style='font-family: Arial' type='password' name='Password' size='20' maxlength='128'></td>
+               </tr>
+
+               <tr>
+                       <td align='center' colspan='2' height='23'><input type='submit' name='button' value='Login' 
+                               onClick=\"javascript:popUp('$loginpath?res=popup1&uamip=$uamip&uamport=$uamport')\"></td> 
+               </tr>
+
+               </tbody>
+               </table>
+               </center>
+       </form>
+</body>
+</html>
+";
+
+
+?>
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
--- smeserver-coova-chilli-0.1/root/opt/chilli/hotspotlogin-nonchilli.php       1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli/hotspotlogin-nonchilli.php     2008-04-07 12:54:34.000000000 +0200
@@ -0,0 +1,26 @@
+<?php
+# daloRADIUS edition - fixed up variable definition through-out the code
+# as well as parted the code for the sake of modularity and ability to 
+# to support templates and languages easier.
+# Copyright (C) Enginx and Liran Tal 2007, 2008
+
+echo "
+<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">
+<html>
+<head>
+       <title>$title</title>
+       <meta http-equiv=\"Cache-control\" content=\"no-cache\">
+       <meta http-equiv=\"Pragma\" content=\"no-cache\">
+       <link href=\"template/css/style.css\" rel=\"stylesheet\" type=\"text/css\" />
+</head>
+
+<body bgColor = '#c0d8f4'>
+       <h1 style=\"text-align: center;\">$h1Failed</h1>
+       <center>
+               $centerdaemon
+       </center>
+</body>
+</html>
+";
+
+?>
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
--- smeserver-coova-chilli-0.1/root/opt/chilli/hotspotlogin-nonssl.php  1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli/hotspotlogin-nonssl.php        2008-04-07 12:55:22.000000000 +0200
@@ -0,0 +1,39 @@
+<?php
+# daloRADIUS edition - fixed up variable definition through-out the code
+# as well as parted the code for the sake of modularity and ability to 
+# to support templates and languages easier.
+# Copyright (C) Enginx and Liran Tal 2007, 2008
+
+echo "
+<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">
+<html>
+<head>
+       <title>$title</title>
+       <meta http-equiv=\"Cache-control\" content=\"no-cache\">
+       <meta http-equiv=\"Pragma\" content=\"no-cache\">
+       <link href=\"template/css/style.css\" rel=\"stylesheet\" type=\"text/css\" />
+</head>
+
+<body bgColor = '#c0d8f4'>
+       <h1 style=\"text-align: center;\">$h1Failed</h1>
+       <center>
+               $centerencrypted
+       </center>
+</body>
+
+<!--
+<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+<WISPAccessGatewayParam
+  xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"
+  xsi:noNamespaceSchemaLocation=\"http://www.acmewisp.com/WISPAccessGatewayParam.xsd\">
+<AuthenticationReply>
+<MessageType>120</MessageType>
+<ResponseCode>102</ResponseCode>
+<ReplyMessage>Login must use encrypted connection</ReplyMessage>
+</AuthenticationReply>
+</WISPAccessGatewayParam>
+-->
+</html>
+";  
+
+?>
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
--- smeserver-coova-chilli-0.1/root/opt/chilli/hotspotlogin.php 1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli/hotspotlogin.php       2008-04-07 18:14:25.000000000 +0200
@@ -0,0 +1,424 @@
+<?php
+#
+# chilli - ChilliSpot.org. A Wireless LAN Access Point Controller
+# Copyright (C) 2003, 2004 Mondru AB.
+#
+# The contents of this file may be used under the terms of the GNU
+# General Public License Version 2, provided that the above copyright
+# notice and this permission notice is included in all copies or
+# substantial portions of the software.
+#
+# daloRADIUS edition - fixed up variable definition through-out the code
+# as well as parted the code for the sake of modularity and ability to 
+# to support templates and languages easier.
+# Copyright (C) Enginx and Liran Tal 2007, 2008
+#
+# Redirects from ChilliSpot daemon:
+#
+# Redirection when not yet or already authenticated
+#   notyet:  ChilliSpot daemon redirects to login page.
+#  already: ChilliSpot daemon redirects to success status page.
+#
+# Response to login:
+#   already: Attempt to login when already logged in.
+#   failed:  Login failed
+#   success: Login succeded
+#
+# logoff:  Response to a logout
+
+
+# Shared secret used to encrypt challenge with. Prevents dictionary attacks.
+# You should change this to your own shared secret.
+#$uamsecret = "InhBpiz6MzCcUH5dd017xafSz8";
+
+# Uncomment the following line if you want to use ordinary user-password
+# for radius authentication. Must be used together with $uamsecret.
+#$userpassword=1;
+include('hotspotlogin-config.php');
+
+# Our own path
+$loginpath = $_SERVER['PHP_SELF'];
+
+include('lang/main.php');
+
+/* if SSL was not used show an error */
+if (!($_SERVER['HTTPS'] == 'on')) {
+       include('hotspotlogin-nonssl.php');
+       exit(0);
+}
+
+# Read form parameters which we care about
+if (isset($_POST['UserName']))    
+       $username    = $_POST['UserName'];
+elseif (isset($_GET['UserName']))
+       $username    = $_GET['UserName'];
+else
+       $username    = "";
+
+
+if (isset($_POST['Password']))    
+       $password    = $_POST['Password'];
+elseif (isset($_GET['Password']))
+       $password    = $_GET['Password'];
+else
+       $password    = "";
+
+
+if (isset($_POST['challenge']))    
+       $challenge    = $_POST['challenge'];
+elseif (isset($_GET['challenge']))    
+       $challenge    = $_GET['challenge'];
+else
+       $challenge    = "";
+
+
+if (isset($_POST['button']))
+    $button        = $_POST['button'];
+elseif (isset($_GET['button']))
+    $button        = $_GET['button'];
+else
+    $button        = "";
+
+
+if (isset($_POST['logout']))
+    $logout        = $_POST['logout'];
+elseif (isset($_GET['logout']))
+    $logout        = $_GET['logout'];
+else
+    $logout        = "";
+
+
+if (isset($_POST['prelogin']))    
+       $prelogin    = $_POST['prelogin'];
+elseif (isset($_GET['prelogin']))    
+       $prelogin    = $_GET['prelogin'];
+else
+       $prelogin    = "";
+
+
+if (isset($_POST['res']))    
+       $res        = $_POST['res'];
+elseif (isset($_GET['res']))    
+       $res        = $_GET['res'];
+else
+       $res        = "";
+
+
+if (isset($_POST['uamip']))
+    $uamip        = $_POST['uamip'];
+elseif (isset($_GET['uamip']))
+    $uamip        = $_GET['uamip'];
+else
+    $uamip        = "";
+
+
+if (isset($_POST['uamport']))
+    $uamport    = $_POST['uamport'];
+elseif (isset($_GET['uamport']))
+    $uamport    = $_GET['uamport'];
+else
+    $uamport    = "";
+
+
+if (isset($_POST['userurl']))
+    $userurl    = $_POST['userurl'];
+elseif (isset($_GET['userurl']))
+    $userurl    = $_GET['userurl'];
+else
+    $userurl    = "";
+
+
+if (isset($_POST['timeleft']))
+    $timeleft    = $_POST['timeleft'];
+elseif (isset($_GET['timeleft']))
+    $timeleft    = $_GET['timeleft'];
+else
+    $timeleft    = "";
+
+
+if (isset($_POST['redirurl']))
+    $redirurl    = $_POST['redirurl'];
+elseif (isset($_GET['redirurl']))
+    $redirurl    = $_GET['redirurl'];
+else
+    $redirurl    = "";
+
+
+(isset($_GET['reply']))      ? $reply        = $_GET['reply']       : $reply = "";
+
+
+$userurldecode = $userurl;
+$redirurldecode = $redirurl;
+
+# If attempt to login
+if ($button == 'Login') {
+  $hexchal = pack ("H32", $challenge);
+  if ($uamsecret) {
+    $newchal = pack ("H*", md5($hexchal . $uamsecret));
+  } else {
+    $newchal = $hexchal;
+  }
+  $response = md5("\0" . $password . $newchal);
+  $newpwd = pack("a32", $password);
+  $pappassword = implode ("", unpack("H32", ($newpwd ^ $newchal)));
+  echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">
+<html>
+<head>
+  <title>$title</title>
+  <meta http-equiv=\"Cache-control\" content=\"no-cache\">
+  <meta http-equiv=\"Pragma\" content=\"no-cache\">
+  <meta http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-1\" />
+  <link href=\"template/css/style.css\" rel=\"stylesheet\" type=\"text/css\" />
+  ";
+  if (isset($uamsecret) && isset($userpassword)) {
+    echo "  <meta http-equiv=\"refresh\" content=\"0;url=http://$uamip:$uamport/logon?username=$username&password=$pappassword\">";
+  } else {
+    echo "  <meta http-equiv=\"refresh\" content=\"0;url=http://$uamip:$uamport/logon?username=$username&response=$response&userurl=$userurl\">";
+  }
+
+       include('template/loggingin.php');
+
+echo "
+<!--
+<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+<WISPAccessGatewayParam 
+  xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"
+  xsi:noNamespaceSchemaLocation=\"http://www.acmewisp.com/WISPAccessGatewayParam.xsd\">
+<AuthenticationReply>
+<MessageType>120</MessageType>
+<ResponseCode>201</ResponseCode>
+";
+  if (isset($uamsecret) && isset($userpassword)) {
+    echo "<LoginResultsURL>http://$uamip:$uamport/logon?username=$username&password=$pappassword</LoginResultsURL>";
+  } else {
+    echo "<LoginResultsURL>http://$uamip:$uamport/logon?username=$username&response=$response&userurl=$userurl</LoginResultsURL>";
+  }
+  echo "</AuthenticationReply> 
+</WISPAccessGatewayParam>
+-->
+</html>
+";
+    exit(0);
+}
+
+switch($res) {
+  case 'success':     $result =  1; break; // If login successful
+  case 'failed':      $result =  2; break; // If login failed
+  case 'logoff':      $result =  3; break; // If logout successful
+  case 'already':     $result =  4; break; // If tried to login while already logged in
+  case 'notyet':      $result =  5; break; // If not logged in yet
+  case 'smartclient': $result =  6; break; // If login from smart client
+  case 'popup1':      $result = 11; break; // If requested a logging in pop up window
+  case 'popup2':      $result = 12; break; // If requested a success pop up window
+  case 'popup3':      $result = 13; break; // If requested a logout pop up window
+  default: $result = 0; // Default: It was not a form request
+}
+
+/* Otherwise it was not a form request
+ * Send out an error message
+ */
+if ($result == 0) {
+       include('hotspotlogin-nonchilli.php');
+       exit(0);
+}
+
+# Generate the output
+#echo "Content-type: text/html\n\n";
+echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">
+<html>
+<head>
+  <title>$title</title>
+  <meta http-equiv=\"Cache-control\" content=\"no-cache\">
+  <meta http-equiv=\"Pragma\" content=\"no-cache\">
+  <meta http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-1\" />
+  <link href=\"template/css/style.css\" rel=\"stylesheet\" type=\"text/css\" />
+  <SCRIPT LANGUAGE=\"JavaScript\">
+    var blur = 0;
+    var starttime = new Date();
+    var startclock = starttime.getTime();
+    var mytimeleft = 0;
+       
+    function doOnUnLoad(result) {
+       if ((result==12) && (self.name=='chillispot_popup')) {
+         document.location.href=('http://1.1.1.1/');
+        window.close();
+       }
+     }
+
+    function doTime() {
+      window.setTimeout( \"doTime()\", 1000 );
+      t = new Date();
+      time = Math.round((t.getTime() - starttime.getTime())/1000);
+      if (mytimeleft) {
+        time = mytimeleft - time;
+        if (time <= 0) {
+          window.location = \"$loginpath?res=popup3&uamip=$uamip&uamport=$uamport\";
+        }
+      }
+      if (time < 0) time = 0;
+      hours = (time - (time % 3600)) / 3600;
+      time = time - (hours * 3600);
+      mins = (time - (time % 60)) / 60;
+      secs = time - (mins * 60);
+      if (hours < 10) hours = \"0\" + hours;
+      if (mins < 10) mins = \"0\" + mins;
+      if (secs < 10) secs = \"0\" + secs;
+      title = \"Online time: \" + hours + \":\" + mins + \":\" + secs;
+      if (mytimeleft) {
+        title = \"$remainingTime: \" + hours + \":\" + mins + \":\" + secs;
+      }
+      if(document.all || document.getElementById){
+         document.title = title;
+      }
+      else {   
+        self.status = title;
+      }
+    }
+
+    function popUp(URL) {
+      if (self.name != \"chillispot_popup\") {
+        chillispot_popup = window.open(URL, 'chillispot_popup', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=375');
+      }
+    }
+
+    function doOnLoad(result, URL, userurl, redirurl, timeleft) {
+      if (timeleft) {
+        mytimeleft = timeleft;
+      }
+      if ((result == 1) && (self.name == \"chillispot_popup\")) {
+        doTime();
+      }
+      if ((result == 1) && (self.name != \"chillispot_popup\")) {
+        chillispot_popup = window.open(URL, 'chillispot_popup', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=375');
+      }
+      if ((result == 2) || result == 5) {
+        document.form1.UserName.focus()
+      }
+      if ((result == 2) && (self.name != \"chillispot_popup\")) {
+        chillispot_popup = window.open('', 'chillispot_popup', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=400,height=200');
+        chillispot_popup.close();
+      }
+      if ((result == 12) && (self.name == \"chillispot_popup\")) {
+        doTime();
+        if (redirurl) {
+          opener.location = redirurl;
+        }
+        else if (opener.home) {
+          opener.home();
+        }
+        else {
+          opener.location = \"about:home\";
+        }
+        self.focus();
+        blur = 0;
+      }
+      if ((result == 13) && (self.name == \"chillispot_popup\")) {
+        self.focus();
+        blur = 1;
+      }
+    }
+
+    function doOnBlur(result) {
+      if ((result == 12) && (self.name == \"chillispot_popup\")) {
+        if (blur == 0) {
+          blur = 1;
+          self.focus();
+        }
+      }
+    }
+  </script>
+</head>
+<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'>";
+
+if ($result == 2) {
+    echo "
+  <h1 style=\"text-align: center;\">$h1Failed</h1>";
+    if ($reply) {
+    echo "<center> $reply </BR></BR></center>";
+    }
+}
+
+if ($result == 5) {
+//     chillispot header - login form
+//     echo "<h1 style=\"text-align: center;\">$h1Login</h1>";
+}
+
+if ($result == 2 || $result == 5) {
+       //include('hotspotlogin-loginform.php');
+       include('template/loginform-header.php');
+
+  echo "
+  <form name=\"form1\" method=\"get\" action=\"$loginpath\">
+  <input type=\"hidden\" name=\"challenge\" value=\"$challenge\">
+  <input type=\"hidden\" name=\"uamip\" value=\"$uamip\">
+  <input type=\"hidden\" name=\"uamport\" value=\"$uamport\">
+  <input type=\"hidden\" name=\"userurl\" value=\"$userurl\">
+  <center>
+  <table border=\"0\" cellpadding=\"5\" cellspacing=\"0\" style=\"width: 400px;\">
+    <tbody>
+      <tr>
+        <td align=\"right\">$centerUsername:</td>
+        <td><input style=\"font-family: Arial\" type=\"text\" name=\"UserName\" size=\"20\" maxlength=\"128\"></td>
+      </tr>
+      <tr>
+        <td align=\"right\">$centerPassword:</td>
+        <td><input style=\"font-family: Arial\" type=\"password\" name=\"Password\" size=\"20\" maxlength=\"128\"></td>
+      </tr>
+      <tr>
+        <td align=\"center\" colspan=\"2\" height=\"23\"><input type=\"submit\" name=\"button\" value=\"Login\" 
+               onClick=\"javascript:popUp('$loginpath?res=popup1&uamip=$uamip&uamport=$uamport')\"></td> 
+      </tr>
+    </tbody>
+  </table>
+  </center>
+  </form>
+";
+
+
+       include('template/loginform-footer.php');
+}
+
+if ($result == 1) {
+  echo "
+  <h1 style=\"text-align: center;\">$h1Loggedin</h1>";
+
+  if ($reply) { 
+      echo "<center> $reply </br></br></center>";
+  }
+
+  echo "
+  <center>
+    <a href=\"http://$uamip:$uamport/logoff\">$centerLogout</a>
+  </center>
+</body>
+</html>";
+}
+
+if (($result == 4) || ($result == 12)) {
+  echo "
+  <h1 style=\"text-align: center;\">$h1Loggedin</h1>
+  <center>
+    <a href=\"javascript:doOnUnLoad(12);\">$centerLogout</a>
+  </center>
+</body>
+</html>";
+}
+
+
+if ($result == 11) {
+        include('template/loggingin.php');
+}
+
+
+if (($result == 3) || ($result == 13)) {
+  echo "
+  <h1 style=\"text-align: center;\">$h1Loggedout</h1>
+  <center>
+    <a href=\"http://$uamip:$uamport/prelogin\">$centerLogin</a>
+  </center>
+</body>
+</html>";
+}
+
+exit(0);
+?>
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
--- smeserver-coova-chilli-0.1/root/opt/chilli/js/hotspotlogin.js       1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli/js/hotspotlogin.js     2008-04-07 09:45:38.000000000 +0200
@@ -0,0 +1,108 @@
+var blur = 0;
+var starttime = new Date();
+var startclock = starttime.getTime();
+var mytimeleft = 0;
+
+function doTime() {
+       window.setTimeout( \"doTime()\", 1000 );
+       t = new Date();
+       time = Math.round((t.getTime() - starttime.getTime())/1000);
+
+       if (mytimeleft) {
+               time = mytimeleft - time;
+
+               if (time <= 0) {
+                 window.location = \"$loginpath?res=popup3&uamip=$uamip&uamport=$uamport\";
+               }
+       }
+
+       if (time < 0) time = 0;
+
+       hours = (time - (time % 3600)) / 3600;
+       time = time - (hours * 3600);
+       mins = (time - (time % 60)) / 60;
+       secs = time - (mins * 60);
+       if (hours < 10) hours = \"0\" + hours;
+       if (mins < 10) mins = \"0\" + mins;
+       if (secs < 10) secs = \"0\" + secs;
+       title = \"Online time: \" + hours + \":\" + mins + \":\" + secs;
+
+       if (mytimeleft) {
+               title = \"Remaining time: \" + hours + \":\" + mins + \":\" + secs;
+       }
+
+       if (document.all || document.getElementById) {
+               document.title = title;
+       } else {
+               self.status = title;
+       }
+}
+
+function popUp(URL) {
+       if (self.name != \"chillispot_popup\") {
+               chillispot_popup = window.open(URL,'chillispot_popup','toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=375');
+       }
+}
+
+function doOnLoad(result, URL, userurl, redirurl, timeleft) {
+       if (timeleft) {
+               mytimeleft = timeleft;
+       }
+
+       if ((result == 1) && (self.name == \"chillispot_popup\")) {
+               doTime();
+       }
+
+       if ((result == 1) && (self.name != \"chillispot_popup\")) {
+               chillispot_popup = window.open(URL,
+'chillispot_popup','toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=375');
+       }
+
+       if ((result == 2) || result == 5) {
+               document.form1.UserName.focus()
+       }
+
+       if ((result == 2) && (self.name != \"chillispot_popup\")) {
+               chillispot_popup = window.open('',
+'chillispot_popup','toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=400,height=200');
+               chillispot_popup.close();
+       }
+
+       if ((result == 12) && (self.name == \"chillispot_popup\")) {
+               
+               doTime();
+
+               if (redirurl) {
+                       opener.location = redirurl;
+               } else if (opener.home) {
+                       opener.home();
+               } else {
+                       opener.location = \"about:home\";
+               }
+
+               self.focus();
+               blur = 0;
+       }
+
+
+       if ((result == 13) && (self.name == \"chillispot_popup\")) {
+               self.focus();
+               blur = 1;
+       }
+}
+
+
+function doOnBlur(result) {
+       if ((result == 12) && (self.name == \"chillispot_popup\")) {
+               if (blur == 0) {
+                       blur = 1;
+                       self.focus();
+               }
+       }
+}
+
+
+
+
+
+
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
--- smeserver-coova-chilli-0.1/root/opt/chilli/lang/en.php      1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli/lang/en.php    2008-04-07 15:09:42.000000000 +0200
@@ -0,0 +1,26 @@
+<?php
+# daloRADIUS edition - fixed up variable definition through-out the code
+# as well as parted the code for the sake of modularity and ability to 
+# to support templates and languages easier.
+# Copyright (C) Enginx and Liran Tal 2007, 2008
+
+$ChilliSpot="$domain HotSpot";
+$title="$ChilliSpot Login";
+$centerUsername="Username";
+$centerPassword="Password";
+$centerLogin="Login";
+$centerPleasewait="Please wait.......";
+$centerLogout="Logout";
+$h1Login="$ChilliSpot Login";
+$h1Failed="$ChilliSpot Login Failed";  
+$h1Loggedin="Logged in to $ChilliSpot";
+$h1Loggingin="Logging in to $ChilliSpot";
+$h1Loggedout="Logged out from $ChilliSpot";
+$centerdaemon="Login must be performed through $ChilliSpot server";
+$centerencrypted="Login must use encrypted connection";
+
+$waitWhileAuth="<br/>Please wait while the server check your credentials<br/>This operation can take up to 30 seconds<br/>";
+$poweredBy="Powered By:<br><br>";
+$termsOfUse="Term of use";
+$remainingTime="Remaining Time";
+?>
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
--- smeserver-coova-chilli-0.1/root/opt/chilli/lang/fr.php      1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli/lang/fr.php    2008-04-07 15:07:22.000000000 +0200
@@ -0,0 +1,27 @@
+<?php
+# daloRADIUS edition - fixed up variable definition through-out the code
+# as well as parted the code for the sake of modularity and ability to 
+# to support templates and languages easier.
+# Copyright (C) Enginx and Liran Tal 2007, 2008
+
+$ChilliSpot="Portail Captif $domain";
+$title="Identification sur le $ChilliSpot";
+$centerUsername="Nom d'utilisateur";
+$centerPassword="Mot de Passe";
+$centerLogin="Identification";
+$centerPleasewait="Veuillez patienter.......";
+$centerLogout="Déconnexion";
+$h1Login="Identification";
+$h1Failed="L'identification a échouée";  
+$h1Loggedin="Identifié sur le $ChilliSpot";
+$h1Loggingin="Identification en cours";
+$h1Loggedout="Déconncté de $ChilliSpot";
+$centerdaemon="L'identification doit se faire par le $ChilliSpot";
+$centerencrypted="L'identification doit utiliser une connexion sécurisée";
+
+$waitWhileAuth="<br/>Veuillez patienter pendant que le serveur vérifie vos identifiants<br/>Cette opération peut durer jusqu'à 30 secondes.<br/>";
+$poweredBy="Propulsé par:<br><br>";
+$termsOfUse="Conditions d'utilisation";
+$remainingTime="temps restant";
+
+?>
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
--- smeserver-coova-chilli-0.1/root/opt/chilli/lang/main.php    1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli/lang/main.php  2008-04-07 09:45:38.000000000 +0200
@@ -0,0 +1,17 @@
+<?php
+
+       $lang = "fr";
+       switch($lang) {
+       
+               case "en":
+                       include ("lang/en.php");
+                       break;
+               case "fr":
+                       include ("lang/fr.php");
+                       break;
+               default:
+                       include ("lang/en.php");
+                       break;
+       }
+
+?>
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
--- smeserver-coova-chilli-0.1/root/opt/chilli/template/css/style.css   1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli/template/css/style.css 2008-04-07 13:49:44.000000000 +0200
@@ -0,0 +1,143 @@
+/* CSS Document */
+
+body{
+background-color:#112231;
+color: #FAFAFA;
+font-family:Arial;
+}
+#wrap{
+text-align:center;
+margin:0 auto;
+}
+.header{
+background-image:url(../images/header.jpg);
+width:645px;
+height:160px;
+text-align:center;
+margin:0 auto;
+}
+
+.header p {
+font-size:24px;
+width:645px;
+height:120px;
+position:relative;
+top:105px; 
+left:95px;
+text-align:left;
+}
+
+.header p span {
+color:#9bd0df;
+font-weight:bold;
+font-style:italic
+}
+
+.header p sup {
+font-size:9px;
+}
+.header a {
+text-decoration:none;
+color:#FFFFFF
+}
+
+#navigation{
+background-image:url(../images/navigation.jpg);
+width:647px;
+height:58px;
+text-align:center;
+margin:0 auto;
+}
+#body{
+background-color:#9ad1e0;
+width:643px;
+border-left:#49a5bf 2px solid;
+border-right:#49a5bf 2px solid;
+font-size:12px;
+text-align:center;
+margin:0 auto;
+text-shadow:#000000;
+}
+#body p{
+padding-left:20px;
+padding-right:20px;
+text-indent:30px;
+margin:0;
+padding-top:5px;
+text-align:left;
+}
+#body img {
+border:#FFFFFF 0px solid;
+text-align:center;
+margin-left:15px;
+}
+#body h1{
+font-family: Trebuchet MS;
+font-size:18px;
+text-align:left;
+padding-left:20px;
+margin:0;
+padding-top:5px;
+padding-bottom:5px;
+}
+#footer{
+font-family: Trebuchet MS;
+font-size:8px;
+padding-top:10px;
+background-image:url(../images/footer.jpg);
+width:647px;
+height:46px;
+text-align:center;
+margin:0 auto;
+color: #000;
+}
+  
+.glossymenu{
+       position: relative;
+       padding-right:20px;
+       padding-left:20px;
+       margin: 0 auto 0 auto;
+       background: url(../images/menur_bg.gif) repeat-x; /*tab background image path*/
+       height: 46px;
+       list-style: none;
+       padding-top:10px;
+}
+
+.glossymenu li{
+       float:left;
+}
+
+.glossymenu li a{
+       float: left;
+       display: block;
+       color:#FFFFFF;
+       text-decoration: none;
+       font-family: Trebuchet MS;
+       font-size: 12px;
+       padding:0 0 0 16px; /*Padding to accomodate left tab image. Do not change*/
+       height: 46px;
+       line-height: 46px;
+       text-align: center;
+       cursor: pointer;        
+}
+
+.glossymenu li a b{
+       float: left;
+       display: block;
+       padding: 0 20px 0 8px; /*Padding of menu items*/
+}
+
+.glossymenu li.current a, .glossymenu li a:hover{
+       color: #fff;
+       background: url(../images/menur_hover_left.gif) no-repeat; /*left tab image path*/
+       background-position: left;
+}
+
+.glossymenu li.current a b, .glossymenu li a:hover b{
+       color: #fff;
+       background: url(../images/menur_hover_right.gif) no-repeat right top; /*right tab image path*/
+}
+
+a {
+       color:#fff;
+}
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
--- smeserver-coova-chilli-0.1/root/opt/chilli/template/license.txt     1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli/template/license.txt   2008-04-07 09:45:38.000000000 +0200
@@ -0,0 +1,86 @@
+Attribution 2.5 Canada
+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.
+
+Licence
+
+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.
+
+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.
+
+   1. Definitions.
+         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.
+         2. "Derivative Work" means a work that produces or reproduces the Work or any substantial part thereof in any material form. Derivative works include:
+               1. Translations of the Work;
+               2. Where the Work is a dramatic work, conversions of the Work into a novel or other non-dramatic work;
+               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;
+               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
+               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.
+            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.
+         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.
+         4. "Licensor" means the individual or entity that offers the Work under the terms of this Licence.
+         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.
+         6. "Musical Work" means any work of music or musical composition, with or without words, and includes any compilation thereof.
+         7. "Original Author" means the individual who created the Work.
+         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.
+               1. to produce or reproduce the work in any material form;
+               2. to perform the work in public;
+               3. if the work is unpublished, to publish the work;
+               4. to convert a dramatic work into a non-dramatic work;
+               5. to convert a non-dramatic work into a dramatic work;
+               6. to make a sound recording, cinematographic film or other contrivance by means of which the work may be mechanically reproduced or performed;
+               7. to reproduce, adapt and publicly present the work, as a cinematographic film;
+               8. to communicate the work to the public by telecommunication;
+               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;
+              10. to rent a computer program;
+              11. to rent a sound recording embodying a musical work; and/or
+              12. to authorize such acts.
+         9. "Work" means the distinctive and original work of authorship offered under the terms of this Licence.
+        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.
+   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.
+   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:
+         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
+         2. to create and reproduce Derivative Works.
+
+      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.
+
+      All rights not expressly granted by Licensor are hereby reserved.
+
+      For the avoidance of doubt, where the Work is a musical composition, performer's performance or sound recording:
+         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.
+         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.
+
+      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:
+         1. You must not falsely attribute the Work to someone other than the Original Author; and
+         2. If applicable, You must respect the Original Author's wish to remain anonymous or pseudonymous.
+
+      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.
+   4. Restrictions. The licence granted in Section 3 above is expressly made subject to and limited by the following restrictions:
+         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.
+
+            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.
+
+            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).
+
+            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).
+         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.
+   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.
+   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.
+   7. Termination.
+         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.
+         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.
+   8. Miscellaneous.
+         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.
+         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.
+         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.
+         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.
+         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.
+         6. You must abide the Licence during its term despite the expiry, initial invalidity or later invalidation of any intellectual property rights.
+         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.
+
+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.
+
+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.
+
+Creative Commons may be contacted at http://creativecommons.org/.
+
+Creative Commons Canada may be contacted at http://creativecommons.ca/.
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
--- smeserver-coova-chilli-0.1/root/opt/chilli/template/loggingin.php   1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli/template/loggingin.php 2008-04-07 10:08:28.000000000 +0200
@@ -0,0 +1,39 @@
+<?php
+
+echo <<<END
+
+<div id="wrap">
+               
+       <div id="navigation">
+               <ul class="glossymenu">
+               </ul>
+       </div>
+               
+       <div id="body">
+               <h1>$h1Loggingin</h1>
+               <p>             
+                       <br/>
+                       $waitWhileAuth
+                </p>
+
+                       <br/><br/>
+                       <br/><br/>
+        </div>
+
+
+                
+        <div id="footer">Enginx&copy;2008 All Rights Reserved &bull; Enginx and daloRADIUS Hotspot Systems <br/>
+                Design by <a href="http://templatefusion.org">TemplateFusion</a>
+        </div>
+
+
+</div>
+
+</body>
+</html>
+
+
+END;
+
+
+?>
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
--- smeserver-coova-chilli-0.1/root/opt/chilli/template/loginform-footer.php    1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli/template/loginform-footer.php  2008-04-07 12:26:06.000000000 +0200
@@ -0,0 +1,31 @@
+<?php
+
+echo <<<END
+
+               </p>
+            
+
+               $poweredBy
+               <a href="http://smeserver.org"><img src="template/images/smeserver.png" alt="SME server" /></a>
+               <a href="http://coova.org"><img src="template/images/coova.png" alt="Coova-Chilli" /></a>
+               <a href="http://sourceforge.net/projects/daloradius"><img src="template/images/dalo.png" alt="DaloRadius" /></a>
+               <a href="http://www.firewall-services.com"><img src="template/images/firewallservices.png" alt="Firewall Services" /></a>
+       </div>
+
+
+               
+       <div id="footer">Enginx&copy;2008 All Rights Reserved &bull; Enginx and daloRADIUS Hotspot Systems <br/>
+               Design by <a href="http://templatefusion.org">TemplateFusion</a>
+       </div>
+
+
+</div>
+
+</body>
+</html>
+
+END;
+
+
+
+?>
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
--- smeserver-coova-chilli-0.1/root/opt/chilli/template/loginform-header.php    1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli/template/loginform-header.php  2008-04-08 10:10:23.000000000 +0200
@@ -0,0 +1,24 @@
+<?php
+
+echo <<<END
+
+<div id="wrap">
+
+               <div class="header"><p>SME <span>Spot</span></p>
+               </div>
+               
+       <div id="navigation">
+               <ul class="glossymenu">
+                       <li><a href="#" class="current"><b>$centerLogin</b></a></li>
+                       <li><a href="#"><b>$termsOfUse</b></a></li>     

+               </ul>
+       </div>
+               
+       <div id="body">
+               <h1><center>$title</center></h1>         
+               <p>             
+
+END;
+
+
+?>
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
--- smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/hotspotlogin-config.php   2008-04-07 09:45:38.000000000 +0200
+++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/hotspotlogin-config.php 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-<?php
-
-$uamsecret = 'InhBpiz6MzCcUH5dd017xafSz8';
-$userpassword=1;
-
-?>
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
--- smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/hotspotlogin-loginform.php        2008-04-07 09:45:38.000000000 +0200
+++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/hotspotlogin-loginform.php      1970-01-01 01:00:00.000000000 +0100
@@ -1,41 +0,0 @@
-<?php
-# daloRADIUS edition - fixed up variable definition through-out the code
-# as well as parted the code for the sake of modularity and ability to 
-# to support templates and languages easier.
-# Copyright (C) Enginx and Liran Tal 2007, 2008
-
-echo "
-       <form name='form1' method='post' action='$loginpath'>
-               <input type='hidden' name='challenge' value='$challenge'>
-               <input type='hidden' name='uamip' value='$uamip'>
-               <input type='hidden' name='uamport' value='$uamport'>
-               <input type='hidden' name='userurl' value='$userurl'>
-
-               <center>
-               <table border='0' cellpadding='5' cellspacing='0' style='width: 217px;'>
-               <tbody>
-               <tr>
-                       <td align='right'>$centerUsername:</td>
-                       <td><input style='font-family: Arial' type='text' name='UserName' size='20' maxlength='128'></td>
-               </tr>
-
-               <tr>
-                       <td align='right'>$centerPassword:</td>
-                       <td><input style='font-family: Arial' type='password' name='Password' size='20' maxlength='128'></td>
-               </tr>
-
-               <tr>
-                       <td align='center' colspan='2' height='23'><input type='submit' name='button' value='Login' 
-                               onClick=\"javascript:popUp('$loginpath?res=popup1&uamip=$uamip&uamport=$uamport')\"></td> 
-               </tr>
-
-               </tbody>
-               </table>
-               </center>
-       </form>
-</body>
-</html>
-";
-
-
-?>
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
--- smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/hotspotlogin-nonchilli.php        2008-04-07 12:54:34.000000000 +0200
+++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/hotspotlogin-nonchilli.php      1970-01-01 01:00:00.000000000 +0100
@@ -1,26 +0,0 @@
-<?php
-# daloRADIUS edition - fixed up variable definition through-out the code
-# as well as parted the code for the sake of modularity and ability to 
-# to support templates and languages easier.
-# Copyright (C) Enginx and Liran Tal 2007, 2008
-
-echo "
-<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">
-<html>
-<head>
-       <title>$title</title>
-       <meta http-equiv=\"Cache-control\" content=\"no-cache\">
-       <meta http-equiv=\"Pragma\" content=\"no-cache\">
-       <link href=\"template/css/style.css\" rel=\"stylesheet\" type=\"text/css\" />
-</head>
-
-<body bgColor = '#c0d8f4'>
-       <h1 style=\"text-align: center;\">$h1Failed</h1>
-       <center>
-               $centerdaemon
-       </center>
-</body>
-</html>
-";
-
-?>
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
--- smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/hotspotlogin-nonssl.php   2008-04-07 12:55:22.000000000 +0200
+++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/hotspotlogin-nonssl.php 1970-01-01 01:00:00.000000000 +0100
@@ -1,39 +0,0 @@
-<?php
-# daloRADIUS edition - fixed up variable definition through-out the code
-# as well as parted the code for the sake of modularity and ability to 
-# to support templates and languages easier.
-# Copyright (C) Enginx and Liran Tal 2007, 2008
-
-echo "
-<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">
-<html>
-<head>
-       <title>$title</title>
-       <meta http-equiv=\"Cache-control\" content=\"no-cache\">
-       <meta http-equiv=\"Pragma\" content=\"no-cache\">
-       <link href=\"template/css/style.css\" rel=\"stylesheet\" type=\"text/css\" />
-</head>
-
-<body bgColor = '#c0d8f4'>
-       <h1 style=\"text-align: center;\">$h1Failed</h1>
-       <center>
-               $centerencrypted
-       </center>
-</body>
-
-<!--
-<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-<WISPAccessGatewayParam
-  xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"
-  xsi:noNamespaceSchemaLocation=\"http://www.acmewisp.com/WISPAccessGatewayParam.xsd\">
-<AuthenticationReply>
-<MessageType>120</MessageType>
-<ResponseCode>102</ResponseCode>
-<ReplyMessage>Login must use encrypted connection</ReplyMessage>
-</AuthenticationReply>
-</WISPAccessGatewayParam>
--->
-</html>
-";  
-
-?>
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
--- smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/hotspotlogin.php  2008-04-07 18:14:25.000000000 +0200
+++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/hotspotlogin.php        1970-01-01 01:00:00.000000000 +0100
@@ -1,424 +0,0 @@
-<?php
-#
-# chilli - ChilliSpot.org. A Wireless LAN Access Point Controller
-# Copyright (C) 2003, 2004 Mondru AB.
-#
-# The contents of this file may be used under the terms of the GNU
-# General Public License Version 2, provided that the above copyright
-# notice and this permission notice is included in all copies or
-# substantial portions of the software.
-#
-# daloRADIUS edition - fixed up variable definition through-out the code
-# as well as parted the code for the sake of modularity and ability to 
-# to support templates and languages easier.
-# Copyright (C) Enginx and Liran Tal 2007, 2008
-#
-# Redirects from ChilliSpot daemon:
-#
-# Redirection when not yet or already authenticated
-#   notyet:  ChilliSpot daemon redirects to login page.
-#  already: ChilliSpot daemon redirects to success status page.
-#
-# Response to login:
-#   already: Attempt to login when already logged in.
-#   failed:  Login failed
-#   success: Login succeded
-#
-# logoff:  Response to a logout
-
-
-# Shared secret used to encrypt challenge with. Prevents dictionary attacks.
-# You should change this to your own shared secret.
-#$uamsecret = "InhBpiz6MzCcUH5dd017xafSz8";
-
-# Uncomment the following line if you want to use ordinary user-password
-# for radius authentication. Must be used together with $uamsecret.
-#$userpassword=1;
-include('hotspotlogin-config.php');
-
-# Our own path
-$loginpath = $_SERVER['PHP_SELF'];
-
-include('lang/main.php');
-
-/* if SSL was not used show an error */
-if (!($_SERVER['HTTPS'] == 'on')) {
-       include('hotspotlogin-nonssl.php');
-       exit(0);
-}
-
-# Read form parameters which we care about
-if (isset($_POST['UserName']))    
-       $username    = $_POST['UserName'];
-elseif (isset($_GET['UserName']))
-       $username    = $_GET['UserName'];
-else
-       $username    = "";
-
-
-if (isset($_POST['Password']))    
-       $password    = $_POST['Password'];
-elseif (isset($_GET['Password']))
-       $password    = $_GET['Password'];
-else
-       $password    = "";
-
-
-if (isset($_POST['challenge']))    
-       $challenge    = $_POST['challenge'];
-elseif (isset($_GET['challenge']))    
-       $challenge    = $_GET['challenge'];
-else
-       $challenge    = "";
-
-
-if (isset($_POST['button']))
-    $button        = $_POST['button'];
-elseif (isset($_GET['button']))
-    $button        = $_GET['button'];
-else
-    $button        = "";
-
-
-if (isset($_POST['logout']))
-    $logout        = $_POST['logout'];
-elseif (isset($_GET['logout']))
-    $logout        = $_GET['logout'];
-else
-    $logout        = "";
-
-
-if (isset($_POST['prelogin']))    
-       $prelogin    = $_POST['prelogin'];
-elseif (isset($_GET['prelogin']))    
-       $prelogin    = $_GET['prelogin'];
-else
-       $prelogin    = "";
-
-
-if (isset($_POST['res']))    
-       $res        = $_POST['res'];
-elseif (isset($_GET['res']))    
-       $res        = $_GET['res'];
-else
-       $res        = "";
-
-
-if (isset($_POST['uamip']))
-    $uamip        = $_POST['uamip'];
-elseif (isset($_GET['uamip']))
-    $uamip        = $_GET['uamip'];
-else
-    $uamip        = "";
-
-
-if (isset($_POST['uamport']))
-    $uamport    = $_POST['uamport'];
-elseif (isset($_GET['uamport']))
-    $uamport    = $_GET['uamport'];
-else
-    $uamport    = "";
-
-
-if (isset($_POST['userurl']))
-    $userurl    = $_POST['userurl'];
-elseif (isset($_GET['userurl']))
-    $userurl    = $_GET['userurl'];
-else
-    $userurl    = "";
-
-
-if (isset($_POST['timeleft']))
-    $timeleft    = $_POST['timeleft'];
-elseif (isset($_GET['timeleft']))
-    $timeleft    = $_GET['timeleft'];
-else
-    $timeleft    = "";
-
-
-if (isset($_POST['redirurl']))
-    $redirurl    = $_POST['redirurl'];
-elseif (isset($_GET['redirurl']))
-    $redirurl    = $_GET['redirurl'];
-else
-    $redirurl    = "";
-
-
-(isset($_GET['reply']))      ? $reply        = $_GET['reply']       : $reply = "";
-
-
-$userurldecode = $userurl;
-$redirurldecode = $redirurl;
-
-# If attempt to login
-if ($button == 'Login') {
-  $hexchal = pack ("H32", $challenge);
-  if ($uamsecret) {
-    $newchal = pack ("H*", md5($hexchal . $uamsecret));
-  } else {
-    $newchal = $hexchal;
-  }
-  $response = md5("\0" . $password . $newchal);
-  $newpwd = pack("a32", $password);
-  $pappassword = implode ("", unpack("H32", ($newpwd ^ $newchal)));
-  echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">
-<html>
-<head>
-  <title>$title</title>
-  <meta http-equiv=\"Cache-control\" content=\"no-cache\">
-  <meta http-equiv=\"Pragma\" content=\"no-cache\">
-  <meta http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-1\" />
-  <link href=\"template/css/style.css\" rel=\"stylesheet\" type=\"text/css\" />
-  ";
-  if (isset($uamsecret) && isset($userpassword)) {
-    echo "  <meta http-equiv=\"refresh\" content=\"0;url=http://$uamip:$uamport/logon?username=$username&password=$pappassword\">";
-  } else {
-    echo "  <meta http-equiv=\"refresh\" content=\"0;url=http://$uamip:$uamport/logon?username=$username&response=$response&userurl=$userurl\">";
-  }
-
-       include('template/loggingin.php');
-
-echo "
-<!--
-<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-<WISPAccessGatewayParam 
-  xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"
-  xsi:noNamespaceSchemaLocation=\"http://www.acmewisp.com/WISPAccessGatewayParam.xsd\">
-<AuthenticationReply>
-<MessageType>120</MessageType>
-<ResponseCode>201</ResponseCode>
-";
-  if (isset($uamsecret) && isset($userpassword)) {
-    echo "<LoginResultsURL>http://$uamip:$uamport/logon?username=$username&password=$pappassword</LoginResultsURL>";
-  } else {
-    echo "<LoginResultsURL>http://$uamip:$uamport/logon?username=$username&response=$response&userurl=$userurl</LoginResultsURL>";
-  }
-  echo "</AuthenticationReply> 
-</WISPAccessGatewayParam>
--->
-</html>
-";
-    exit(0);
-}
-
-switch($res) {
-  case 'success':     $result =  1; break; // If login successful
-  case 'failed':      $result =  2; break; // If login failed
-  case 'logoff':      $result =  3; break; // If logout successful
-  case 'already':     $result =  4; break; // If tried to login while already logged in
-  case 'notyet':      $result =  5; break; // If not logged in yet
-  case 'smartclient': $result =  6; break; // If login from smart client
-  case 'popup1':      $result = 11; break; // If requested a logging in pop up window
-  case 'popup2':      $result = 12; break; // If requested a success pop up window
-  case 'popup3':      $result = 13; break; // If requested a logout pop up window
-  default: $result = 0; // Default: It was not a form request
-}
-
-/* Otherwise it was not a form request
- * Send out an error message
- */
-if ($result == 0) {
-       include('hotspotlogin-nonchilli.php');
-       exit(0);
-}
-
-# Generate the output
-#echo "Content-type: text/html\n\n";
-echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">
-<html>
-<head>
-  <title>$title</title>
-  <meta http-equiv=\"Cache-control\" content=\"no-cache\">
-  <meta http-equiv=\"Pragma\" content=\"no-cache\">
-  <meta http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-1\" />
-  <link href=\"template/css/style.css\" rel=\"stylesheet\" type=\"text/css\" />
-  <SCRIPT LANGUAGE=\"JavaScript\">
-    var blur = 0;
-    var starttime = new Date();
-    var startclock = starttime.getTime();
-    var mytimeleft = 0;
-       
-    function doOnUnLoad(result) {
-       if ((result==12) && (self.name=='chillispot_popup')) {
-         document.location.href=('http://1.1.1.1/');
-        window.close();
-       }
-     }
-
-    function doTime() {
-      window.setTimeout( \"doTime()\", 1000 );
-      t = new Date();
-      time = Math.round((t.getTime() - starttime.getTime())/1000);
-      if (mytimeleft) {
-        time = mytimeleft - time;
-        if (time <= 0) {
-          window.location = \"$loginpath?res=popup3&uamip=$uamip&uamport=$uamport\";
-        }
-      }
-      if (time < 0) time = 0;
-      hours = (time - (time % 3600)) / 3600;
-      time = time - (hours * 3600);
-      mins = (time - (time % 60)) / 60;
-      secs = time - (mins * 60);
-      if (hours < 10) hours = \"0\" + hours;
-      if (mins < 10) mins = \"0\" + mins;
-      if (secs < 10) secs = \"0\" + secs;
-      title = \"Online time: \" + hours + \":\" + mins + \":\" + secs;
-      if (mytimeleft) {
-        title = \"$remainingTime: \" + hours + \":\" + mins + \":\" + secs;
-      }
-      if(document.all || document.getElementById){
-         document.title = title;
-      }
-      else {   
-        self.status = title;
-      }
-    }
-
-    function popUp(URL) {
-      if (self.name != \"chillispot_popup\") {
-        chillispot_popup = window.open(URL, 'chillispot_popup', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=375');
-      }
-    }
-
-    function doOnLoad(result, URL, userurl, redirurl, timeleft) {
-      if (timeleft) {
-        mytimeleft = timeleft;
-      }
-      if ((result == 1) && (self.name == \"chillispot_popup\")) {
-        doTime();
-      }
-      if ((result == 1) && (self.name != \"chillispot_popup\")) {
-        chillispot_popup = window.open(URL, 'chillispot_popup', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=375');
-      }
-      if ((result == 2) || result == 5) {
-        document.form1.UserName.focus()
-      }
-      if ((result == 2) && (self.name != \"chillispot_popup\")) {
-        chillispot_popup = window.open('', 'chillispot_popup', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=400,height=200');
-        chillispot_popup.close();
-      }
-      if ((result == 12) && (self.name == \"chillispot_popup\")) {
-        doTime();
-        if (redirurl) {
-          opener.location = redirurl;
-        }
-        else if (opener.home) {
-          opener.home();
-        }
-        else {
-          opener.location = \"about:home\";
-        }
-        self.focus();
-        blur = 0;
-      }
-      if ((result == 13) && (self.name == \"chillispot_popup\")) {
-        self.focus();
-        blur = 1;
-      }
-    }
-
-    function doOnBlur(result) {
-      if ((result == 12) && (self.name == \"chillispot_popup\")) {
-        if (blur == 0) {
-          blur = 1;
-          self.focus();
-        }
-      }
-    }
-  </script>
-</head>
-<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'>";
-
-if ($result == 2) {
-    echo "
-  <h1 style=\"text-align: center;\">$h1Failed</h1>";
-    if ($reply) {
-    echo "<center> $reply </BR></BR></center>";
-    }
-}
-
-if ($result == 5) {
-//     chillispot header - login form
-//     echo "<h1 style=\"text-align: center;\">$h1Login</h1>";
-}
-
-if ($result == 2 || $result == 5) {
-       //include('hotspotlogin-loginform.php');
-       include('template/loginform-header.php');
-
-  echo "
-  <form name=\"form1\" method=\"get\" action=\"$loginpath\">
-  <input type=\"hidden\" name=\"challenge\" value=\"$challenge\">
-  <input type=\"hidden\" name=\"uamip\" value=\"$uamip\">
-  <input type=\"hidden\" name=\"uamport\" value=\"$uamport\">
-  <input type=\"hidden\" name=\"userurl\" value=\"$userurl\">
-  <center>
-  <table border=\"0\" cellpadding=\"5\" cellspacing=\"0\" style=\"width: 400px;\">
-    <tbody>
-      <tr>
-        <td align=\"right\">$centerUsername:</td>
-        <td><input style=\"font-family: Arial\" type=\"text\" name=\"UserName\" size=\"20\" maxlength=\"128\"></td>
-      </tr>
-      <tr>
-        <td align=\"right\">$centerPassword:</td>
-        <td><input style=\"font-family: Arial\" type=\"password\" name=\"Password\" size=\"20\" maxlength=\"128\"></td>
-      </tr>
-      <tr>
-        <td align=\"center\" colspan=\"2\" height=\"23\"><input type=\"submit\" name=\"button\" value=\"Login\" 
-               onClick=\"javascript:popUp('$loginpath?res=popup1&uamip=$uamip&uamport=$uamport')\"></td> 
-      </tr>
-    </tbody>
-  </table>
-  </center>
-  </form>
-";
-
-
-       include('template/loginform-footer.php');
-}
-
-if ($result == 1) {
-  echo "
-  <h1 style=\"text-align: center;\">$h1Loggedin</h1>";
-
-  if ($reply) { 
-      echo "<center> $reply </br></br></center>";
-  }
-
-  echo "
-  <center>
-    <a href=\"http://$uamip:$uamport/logoff\">$centerLogout</a>
-  </center>
-</body>
-</html>";
-}
-
-if (($result == 4) || ($result == 12)) {
-  echo "
-  <h1 style=\"text-align: center;\">$h1Loggedin</h1>
-  <center>
-    <a href=\"javascript:doOnUnLoad(12);\">$centerLogout</a>
-  </center>
-</body>
-</html>";
-}
-
-
-if ($result == 11) {
-        include('template/loggingin.php');
-}
-
-
-if (($result == 3) || ($result == 13)) {
-  echo "
-  <h1 style=\"text-align: center;\">$h1Loggedout</h1>
-  <center>
-    <a href=\"http://$uamip:$uamport/prelogin\">$centerLogin</a>
-  </center>
-</body>
-</html>";
-}
-
-exit(0);
-?>
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
--- smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/js/hotspotlogin.js        2008-04-07 09:45:38.000000000 +0200
+++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/js/hotspotlogin.js      1970-01-01 01:00:00.000000000 +0100
@@ -1,108 +0,0 @@
-var blur = 0;
-var starttime = new Date();
-var startclock = starttime.getTime();
-var mytimeleft = 0;
-
-function doTime() {
-       window.setTimeout( \"doTime()\", 1000 );
-       t = new Date();
-       time = Math.round((t.getTime() - starttime.getTime())/1000);
-
-       if (mytimeleft) {
-               time = mytimeleft - time;
-
-               if (time <= 0) {
-                 window.location = \"$loginpath?res=popup3&uamip=$uamip&uamport=$uamport\";
-               }
-       }
-
-       if (time < 0) time = 0;
-
-       hours = (time - (time % 3600)) / 3600;
-       time = time - (hours * 3600);
-       mins = (time - (time % 60)) / 60;
-       secs = time - (mins * 60);
-       if (hours < 10) hours = \"0\" + hours;
-       if (mins < 10) mins = \"0\" + mins;
-       if (secs < 10) secs = \"0\" + secs;
-       title = \"Online time: \" + hours + \":\" + mins + \":\" + secs;
-
-       if (mytimeleft) {
-               title = \"Remaining time: \" + hours + \":\" + mins + \":\" + secs;
-       }
-
-       if (document.all || document.getElementById) {
-               document.title = title;
-       } else {
-               self.status = title;
-       }
-}
-
-function popUp(URL) {
-       if (self.name != \"chillispot_popup\") {
-               chillispot_popup = window.open(URL,'chillispot_popup','toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=375');
-       }
-}
-
-function doOnLoad(result, URL, userurl, redirurl, timeleft) {
-       if (timeleft) {
-               mytimeleft = timeleft;
-       }
-
-       if ((result == 1) && (self.name == \"chillispot_popup\")) {
-               doTime();
-       }
-
-       if ((result == 1) && (self.name != \"chillispot_popup\")) {
-               chillispot_popup = window.open(URL,
-'chillispot_popup','toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=375');
-       }
-
-       if ((result == 2) || result == 5) {
-               document.form1.UserName.focus()
-       }
-
-       if ((result == 2) && (self.name != \"chillispot_popup\")) {
-               chillispot_popup = window.open('',
-'chillispot_popup','toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=400,height=200');
-               chillispot_popup.close();
-       }
-
-       if ((result == 12) && (self.name == \"chillispot_popup\")) {
-               
-               doTime();
-
-               if (redirurl) {
-                       opener.location = redirurl;
-               } else if (opener.home) {
-                       opener.home();
-               } else {
-                       opener.location = \"about:home\";
-               }
-
-               self.focus();
-               blur = 0;
-       }
-
-
-       if ((result == 13) && (self.name == \"chillispot_popup\")) {
-               self.focus();
-               blur = 1;
-       }
-}
-
-
-function doOnBlur(result) {
-       if ((result == 12) && (self.name == \"chillispot_popup\")) {
-               if (blur == 0) {
-                       blur = 1;
-                       self.focus();
-               }
-       }
-}
-
-
-
-
-
-
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
--- smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/lang/en.php       2008-04-07 15:09:42.000000000 +0200
+++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/lang/en.php     1970-01-01 01:00:00.000000000 +0100
@@ -1,26 +0,0 @@
-<?php
-# daloRADIUS edition - fixed up variable definition through-out the code
-# as well as parted the code for the sake of modularity and ability to 
-# to support templates and languages easier.
-# Copyright (C) Enginx and Liran Tal 2007, 2008
-
-$ChilliSpot="$domain HotSpot";
-$title="$ChilliSpot Login";
-$centerUsername="Username";
-$centerPassword="Password";
-$centerLogin="Login";
-$centerPleasewait="Please wait.......";
-$centerLogout="Logout";
-$h1Login="$ChilliSpot Login";
-$h1Failed="$ChilliSpot Login Failed";  
-$h1Loggedin="Logged in to $ChilliSpot";
-$h1Loggingin="Logging in to $ChilliSpot";
-$h1Loggedout="Logged out from $ChilliSpot";
-$centerdaemon="Login must be performed through $ChilliSpot server";
-$centerencrypted="Login must use encrypted connection";
-
-$waitWhileAuth="<br/>Please wait while the server check your credentials<br/>This operation can take up to 30 seconds<br/>";
-$poweredBy="Powered By:<br><br>";
-$termsOfUse="Term of use";
-$remainingTime="Remaining Time";
-?>
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
--- smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/lang/fr.php       2008-04-07 15:07:22.000000000 +0200
+++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/lang/fr.php     1970-01-01 01:00:00.000000000 +0100
@@ -1,27 +0,0 @@
-<?php
-# daloRADIUS edition - fixed up variable definition through-out the code
-# as well as parted the code for the sake of modularity and ability to 
-# to support templates and languages easier.
-# Copyright (C) Enginx and Liran Tal 2007, 2008
-
-$ChilliSpot="Portail Captif $domain";
-$title="Identification sur le $ChilliSpot";
-$centerUsername="Nom d'utilisateur";
-$centerPassword="Mot de Passe";
-$centerLogin="Identification";
-$centerPleasewait="Veuillez patienter.......";
-$centerLogout="Déconnexion";
-$h1Login="Identification";
-$h1Failed="L'identification a échouée";  
-$h1Loggedin="Identifié sur le $ChilliSpot";
-$h1Loggingin="Identification en cours";
-$h1Loggedout="Déconncté de $ChilliSpot";
-$centerdaemon="L'identification doit se faire par le $ChilliSpot";
-$centerencrypted="L'identification doit utiliser une connexion sécurisée";
-
-$waitWhileAuth="<br/>Veuillez patienter pendant que le serveur vérifie vos identifiants<br/>Cette opération peut durer jusqu'à 30 secondes.<br/>";
-$poweredBy="Propulsé par:<br><br>";
-$termsOfUse="Conditions d'utilisation";
-$remainingTime="temps restant";
-
-?>
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
--- smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/lang/main.php     2008-04-07 09:45:38.000000000 +0200
+++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/lang/main.php   1970-01-01 01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
-<?php
-
-       $lang = "fr";
-       switch($lang) {
-       
-               case "en":
-                       include ("lang/en.php");
-                       break;
-               case "fr":
-                       include ("lang/fr.php");
-                       break;
-               default:
-                       include ("lang/en.php");
-                       break;
-       }
-
-?>
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
--- smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/template/css/style.css    2008-04-07 13:49:44.000000000 +0200
+++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/template/css/style.css  1970-01-01 01:00:00.000000000 +0100
@@ -1,143 +0,0 @@
-/* CSS Document */
-
-body{
-background-color:#112231;
-color: #FAFAFA;
-font-family:Arial;
-}
-#wrap{
-text-align:center;
-margin:0 auto;
-}
-.header{
-background-image:url(../images/header.jpg);
-width:645px;
-height:160px;
-text-align:center;
-margin:0 auto;
-}
-
-.header p {
-font-size:24px;
-width:645px;
-height:120px;
-position:relative;
-top:105px; 
-left:95px;
-text-align:left;
-}
-
-.header p span {
-color:#9bd0df;
-font-weight:bold;
-font-style:italic
-}
-
-.header p sup {
-font-size:9px;
-}
-.header a {
-text-decoration:none;
-color:#FFFFFF
-}
-
-#navigation{
-background-image:url(../images/navigation.jpg);
-width:647px;
-height:58px;
-text-align:center;
-margin:0 auto;
-}
-#body{
-background-color:#9ad1e0;
-width:643px;
-border-left:#49a5bf 2px solid;
-border-right:#49a5bf 2px solid;
-font-size:12px;
-text-align:center;
-margin:0 auto;
-text-shadow:#000000;
-}
-#body p{
-padding-left:20px;
-padding-right:20px;
-text-indent:30px;
-margin:0;
-padding-top:5px;
-text-align:left;
-}
-#body img {
-border:#FFFFFF 0px solid;
-text-align:center;
-margin-left:15px;
-}
-#body h1{
-font-family: Trebuchet MS;
-font-size:18px;
-text-align:left;
-padding-left:20px;
-margin:0;
-padding-top:5px;
-padding-bottom:5px;
-}
-#footer{
-font-family: Trebuchet MS;
-font-size:8px;
-padding-top:10px;
-background-image:url(../images/footer.jpg);
-width:647px;
-height:46px;
-text-align:center;
-margin:0 auto;
-color: #000;
-}
-  
-.glossymenu{
-       position: relative;
-       padding-right:20px;
-       padding-left:20px;
-       margin: 0 auto 0 auto;
-       background: url(../images/menur_bg.gif) repeat-x; /*tab background image path*/
-       height: 46px;
-       list-style: none;
-       padding-top:10px;
-}
-
-.glossymenu li{
-       float:left;
-}
-
-.glossymenu li a{
-       float: left;
-       display: block;
-       color:#FFFFFF;
-       text-decoration: none;
-       font-family: Trebuchet MS;
-       font-size: 12px;
-       padding:0 0 0 16px; /*Padding to accomodate left tab image. Do not change*/
-       height: 46px;
-       line-height: 46px;
-       text-align: center;
-       cursor: pointer;        
-}
-
-.glossymenu li a b{
-       float: left;
-       display: block;
-       padding: 0 20px 0 8px; /*Padding of menu items*/
-}
-
-.glossymenu li.current a, .glossymenu li a:hover{
-       color: #fff;
-       background: url(../images/menur_hover_left.gif) no-repeat; /*left tab image path*/
-       background-position: left;
-}
-
-.glossymenu li.current a b, .glossymenu li a:hover b{
-       color: #fff;
-       background: url(../images/menur_hover_right.gif) no-repeat right top; /*right tab image path*/
-}
-
-a {
-       color:#fff;
-}
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
--- smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/template/license.txt      2008-04-07 09:45:38.000000000 +0200
+++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/template/license.txt    1970-01-01 01:00:00.000000000 +0100
@@ -1,86 +0,0 @@
-Attribution 2.5 Canada
-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.
-
-Licence
-
-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.
-
-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.
-
-   1. Definitions.
-         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.
-         2. "Derivative Work" means a work that produces or reproduces the Work or any substantial part thereof in any material form. Derivative works include:
-               1. Translations of the Work;
-               2. Where the Work is a dramatic work, conversions of the Work into a novel or other non-dramatic work;
-               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;
-               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
-               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.
-            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.
-         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.
-         4. "Licensor" means the individual or entity that offers the Work under the terms of this Licence.
-         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.
-         6. "Musical Work" means any work of music or musical composition, with or without words, and includes any compilation thereof.
-         7. "Original Author" means the individual who created the Work.
-         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.
-               1. to produce or reproduce the work in any material form;
-               2. to perform the work in public;
-               3. if the work is unpublished, to publish the work;
-               4. to convert a dramatic work into a non-dramatic work;
-               5. to convert a non-dramatic work into a dramatic work;
-               6. to make a sound recording, cinematographic film or other contrivance by means of which the work may be mechanically reproduced or performed;
-               7. to reproduce, adapt and publicly present the work, as a cinematographic film;
-               8. to communicate the work to the public by telecommunication;
-               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;
-              10. to rent a computer program;
-              11. to rent a sound recording embodying a musical work; and/or
-              12. to authorize such acts.
-         9. "Work" means the distinctive and original work of authorship offered under the terms of this Licence.
-        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.
-   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.
-   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:
-         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
-         2. to create and reproduce Derivative Works.
-
-      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.
-
-      All rights not expressly granted by Licensor are hereby reserved.
-
-      For the avoidance of doubt, where the Work is a musical composition, performer's performance or sound recording:
-         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.
-         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.
-
-      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:
-         1. You must not falsely attribute the Work to someone other than the Original Author; and
-         2. If applicable, You must respect the Original Author's wish to remain anonymous or pseudonymous.
-
-      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.
-   4. Restrictions. The licence granted in Section 3 above is expressly made subject to and limited by the following restrictions:
-         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.
-
-            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.
-
-            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).
-
-            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).
-         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.
-   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.
-   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.
-   7. Termination.
-         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.
-         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.
-   8. Miscellaneous.
-         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.
-         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.
-         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.
-         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.
-         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.
-         6. You must abide the Licence during its term despite the expiry, initial invalidity or later invalidation of any intellectual property rights.
-         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.
-
-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.
-
-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.
-
-Creative Commons may be contacted at http://creativecommons.org/.
-
-Creative Commons Canada may be contacted at http://creativecommons.ca/.
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
--- smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/template/loggingin.php    2008-04-07 10:08:28.000000000 +0200
+++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/template/loggingin.php  1970-01-01 01:00:00.000000000 +0100
@@ -1,39 +0,0 @@
-<?php
-
-echo <<<END
-
-<div id="wrap">
-               
-       <div id="navigation">
-               <ul class="glossymenu">
-               </ul>
-       </div>
-               
-       <div id="body">
-               <h1>$h1Loggingin</h1>
-               <p>             
-                       <br/>
-                       $waitWhileAuth
-                </p>
-
-                       <br/><br/>
-                       <br/><br/>
-        </div>
-
-
-                
-        <div id="footer">Enginx&copy;2008 All Rights Reserved &bull; Enginx and daloRADIUS Hotspot Systems <br/>
-                Design by <a href="http://templatefusion.org">TemplateFusion</a>
-        </div>
-
-
-</div>
-
-</body>
-</html>
-
-
-END;
-
-
-?>
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
--- smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/template/loginform-footer.php     2008-04-07 12:26:06.000000000 +0200
+++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/template/loginform-footer.php   1970-01-01 01:00:00.000000000 +0100
@@ -1,31 +0,0 @@
-<?php
-
-echo <<<END
-
-               </p>
-            
-
-               $poweredBy
-               <a href="http://smeserver.org"><img src="template/images/smeserver.png" alt="SME server" /></a>
-               <a href="http://coova.org"><img src="template/images/coova.png" alt="Coova-Chilli" /></a>
-               <a href="http://sourceforge.net/projects/daloradius"><img src="template/images/dalo.png" alt="DaloRadius" /></a>
-               <a href="http://www.firewall-services.com"><img src="template/images/firewallservices.png" alt="Firewall Services" /></a>
-       </div>
-
-
-               
-       <div id="footer">Enginx&copy;2008 All Rights Reserved &bull; Enginx and daloRADIUS Hotspot Systems <br/>
-               Design by <a href="http://templatefusion.org">TemplateFusion</a>
-       </div>
-
-
-</div>
-
-</body>
-</html>
-
-END;
-
-
-
-?>
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
--- smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/template/loginform-header.php     2008-04-08 10:10:23.000000000 +0200
+++ mezzanine_patched_smeserver-coova-chilli-0.1/root/opt/chilli.rpmnew/template/loginform-header.php   1970-01-01 01:00:00.000000000 +0100
@@ -1,24 +0,0 @@
-<?php
-
-echo <<<END
-
-<div id="wrap">
-
-               <div class="header"><p>SME <span>Spot</span></p>
-               </div>
-               
-       <div id="navigation">
-               <ul class="glossymenu">
-                       <li><a href="#" class="current"><b>$centerLogin</b></a></li>
-                       <li><a href="#"><b>$termsOfUse</b></a></li>     

-               </ul>
-       </div>
-               
-       <div id="body">
-               <h1><center>$title</center></h1>         
-               <p>             
-
-END;
-
-
-?>