/[smecontribs]/rpms/smeserver-coova-chilli/contribs7/smeserver-coova-chilli-0.2-clean_cgi.patch
ViewVC logotype

Annotation of /rpms/smeserver-coova-chilli/contribs7/smeserver-coova-chilli-0.2-clean_cgi.patch

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

Revision 1.1 - (hide annotations) (download)
Thu Jul 29 15:11:07 2010 UTC (13 years, 9 months ago) by vip-ire
Branch: MAIN
CVS Tags: smeserver-coova-chilli-0_2-20_el4_sme, smeserver-coova-chilli-0_2-18_el4_sme, smeserver-coova-chilli-0_2-19_el4_sme, HEAD 
cvs add mising patches
1 vip-ire 1.1 diff -Nur -x '*.orig' -x '*.rej' smeserver-coova-chilli-0.2/root/etc/e-smith/templates/opt/chilli/hotspotlogin-conf.pl/all mezzanine_patched_smeserver-coova-chilli-0.2/root/etc/e-smith/templates/opt/chilli/hotspotlogin-conf.pl/all
2     --- smeserver-coova-chilli-0.2/root/etc/e-smith/templates/opt/chilli/hotspotlogin-conf.pl/all 2010-07-29 13:54:12.000000000 +0200
3     +++ mezzanine_patched_smeserver-coova-chilli-0.2/root/etc/e-smith/templates/opt/chilli/hotspotlogin-conf.pl/all 2010-07-29 13:53:43.000000000 +0200
4     @@ -1,4 +1,4 @@
5     -$conf\{companyname\} = "{"$DomainName";}";
6     +$conf\{domain\} = "{"$DomainName";}";
7     $conf\{contactinfo\} = "admin\@{"$DomainName";}";
8     $conf\{uamsecret\} = "{($chilli{'uamsecret'} || 'azerty');}";
9     $conf\{userpassword\} = 1;
10     diff -Nur -x '*.orig' -x '*.rej' smeserver-coova-chilli-0.2/root/opt/chilli/cgi-bin/hotspotlogin.cgi mezzanine_patched_smeserver-coova-chilli-0.2/root/opt/chilli/cgi-bin/hotspotlogin.cgi
11     --- smeserver-coova-chilli-0.2/root/opt/chilli/cgi-bin/hotspotlogin.cgi 2008-09-02 14:06:16.000000000 +0200
12     +++ mezzanine_patched_smeserver-coova-chilli-0.2/root/opt/chilli/cgi-bin/hotspotlogin.cgi 2010-07-29 13:51:59.000000000 +0200
13     @@ -37,12 +37,11 @@
14    
15     # Login page need https
16     if (!($ENV{HTTPS} =~ /^on$/)) {
17     -
18     print "Content-type: text/html\n\n
19     <!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">
20     <html>
21     <head>
22     -<title>$conf{companyname}/title>
23     +<title>$conf{domain}/title>
24     <meta http-equiv=\"Cache-control\" content=\"no-cache\">
25     <meta http-equiv=\"Pragma\" content=\"no-cache\">
26     <link rel=\"stylesheet\" type=\"text/css\" href=\"/chilli/css/sme.css\" />
27     @@ -55,25 +54,37 @@
28     }
29     $loginpath = $ENV{'SCRIPT_NAME'};
30    
31     -
32     -
33     # Make sure that the form parameters are clean
34     $OK_CHARS='-a-zA-Z0-9_.@&=%!';
35     -$| = 1;
36     -if ($ENV{'CONTENT_LENGTH'}) {
37     - read (STDIN, $_, $ENV{'CONTENT_LENGTH'});
38     -}
39     +$_ = (<STDIN> || '');
40     s/[^$OK_CHARS]/_/go;
41     $input = $_;
42    
43     # Make sure that the get query parameters are clean
44     $OK_CHARS='-a-zA-Z0-9_.@&=%!';
45     -$_ = $query=$ENV{'QUERY_STRING'};
46     +$_ = $query=$ENV{QUERY_STRING};
47     s/[^$OK_CHARS]/_/go;
48     $query = $_;
49    
50     +
51     +
52     +
53     +
54     #Read form parameters which we care about
55     @array = split('&',$input);
56     +$replyencoded = '';
57     +$username = '';
58     +$password = '';
59     +$challenge = '';
60     +$button = '';
61     +$res = '';
62     +$uamip = '';
63     +$uamport = '';
64     +$userurl = '';
65     +$timeleft = '';
66     +$redirurl = '';
67     +$mac = '';
68     +
69     foreach $var ( @array )
70     {
71     @array2 = split('=',$var);
72     @@ -81,8 +92,6 @@
73     if ($array2[0] =~ /^Password$/) { $password = $array2[1]; }
74     if ($array2[0] =~ /^challenge$/) { $challenge = $array2[1]; }
75     if ($array2[0] =~ /^button$/) { $button = $array2[1]; }
76     - if ($array2[0] =~ /^logout$/) { $logout = $array2[1]; }
77     - if ($array2[0] =~ /^prelogin$/) { $prelogin = $array2[1]; }
78     if ($array2[0] =~ /^res$/) { $res = $array2[1]; }
79     if ($array2[0] =~ /^uamip$/) { $uamip = $array2[1]; }
80     if ($array2[0] =~ /^uamport$/) { $uamport = $array2[1]; }
81     @@ -107,12 +116,10 @@
82    
83     # This should be changed in 'standard' cgi script also
84     if ($array2[0] =~ /^reply$/) { $replyencoded = $array2[1]; }
85     -
86     if ($array2[0] =~ /^userurl$/) { $userurl = $array2[1]; }
87     if ($array2[0] =~ /^timeleft$/) { $timeleft = $array2[1]; }
88     if ($array2[0] =~ /^redirurl$/) { $redirurl = $array2[1]; }
89     if ($array2[0] =~ /^mac$/) { $mac = $array2[1]; }
90     - if ($array2[0] =~ /^nasid$/) { $nasid = $array2[1]; }
91     }
92    
93     # This should be added to 'standard' cgi script also
94     @@ -338,7 +345,7 @@
95     function popUp(URL) {
96    
97     if (self.name != \"chillispot_popup\") {
98     - chillispot_popup = window.open(URL, 'chillispot_popup', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300');
99     + chillispot_popup = window.open(URL, 'chillispot_popup', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=310');
100     }
101     }
102    
103     @@ -394,15 +401,14 @@
104     }
105     function doOnBeforeUnLoad(result) {
106     if ((result==12) && (self.name=='chillispot_popup')) {
107     - document.location.href=('http://$uamip:$uamport/logoff');
108     + document.location.href=('http://$uamip:$uamport/logoff');
109     window.close();
110     }
111     }
112    
113     function fillGuestAccess() {
114     form1.UserName.value = 'guest';
115     - form1.Password.value='guest';
116     -
117     + form1.Password.value = 'guest';
118     }
119    
120     </script>
121     @@ -425,7 +431,7 @@
122     <INPUT TYPE=\"hidden\" NAME=\"userurl\" VALUE=\"$userurldecode\">
123     <INPUT TYPE=\"hidden\" NAME=\"mac\" VALUE=\"$mac\">
124    
125     - <table style=\"width: 170px;\">
126     + <table style=\"width: 570px;\">
127     <tr>
128     <td align=\"right\">$lang{username}:</td>
129     <td><input type=\"text\" name=\"UserName\" size=\"14\" maxlength=\"128\"></td>
130     @@ -446,7 +452,7 @@
131    
132     print " </table></form>";
133    
134     - if($lang{loginstring}) { print "<div style=\"width: 90%; height:365px; overflow:auto; padding-right : 12px; align:center; \"><table><td>$lang{loginstring}</td></table></div>"; }
135     + if($lang{loginstring}) { print "<div style=\"width: 90%; height:330px; overflow:auto; padding-right : 12px; align:center;\"><table><td>$lang{loginstring}</td></table></div>"; }
136     print "</center></body></html>";
137     }
138    
139     diff -Nur -x '*.orig' -x '*.rej' smeserver-coova-chilli-0.2/root/opt/chilli/lang/hotspotlogin.en.pl mezzanine_patched_smeserver-coova-chilli-0.2/root/opt/chilli/lang/hotspotlogin.en.pl
140     --- smeserver-coova-chilli-0.2/root/opt/chilli/lang/hotspotlogin.en.pl 2010-07-29 13:54:12.000000000 +0200
141     +++ mezzanine_patched_smeserver-coova-chilli-0.2/root/opt/chilli/lang/hotspotlogin.en.pl 2010-07-29 13:52:55.000000000 +0200
142     @@ -18,4 +18,4 @@
143     # Custom resource vars
144     $lang{loginstring} = "If you have any question, please contact <a href=mailto:$conf{contactinfo}>$conf{contactinfo}</a>";
145     $lang{loggedinstring} = "Welcome!<br>Closing this windows will disconnect you..";
146     -$lang{loggedoutstring} = "Thanks for using $conf{companyname}";
147     +$lang{loggedoutstring} = "Thanks for using $conf{domain} hotspot service";
148     diff -Nur -x '*.orig' -x '*.rej' smeserver-coova-chilli-0.2/root/opt/chilli/lang/hotspotlogin.fr.pl mezzanine_patched_smeserver-coova-chilli-0.2/root/opt/chilli/lang/hotspotlogin.fr.pl
149     --- smeserver-coova-chilli-0.2/root/opt/chilli/lang/hotspotlogin.fr.pl 2008-09-02 13:28:03.000000000 +0200
150     +++ mezzanine_patched_smeserver-coova-chilli-0.2/root/opt/chilli/lang/hotspotlogin.fr.pl 2010-07-29 13:52:36.000000000 +0200
151     @@ -19,4 +19,4 @@
152     $lang{loginstring} = "Pour toute question relative au fonctionnement de cet acc&egrave;s, vous pouvez contacter le responsable <a href=mailto:$conf{contactinfo}>$conf{contactinfo}</a>";
153    
154     $lang{loggedinstring} = "Bienvenue!<br>La fermeture de cette fen&ecirc;tre terminera votre session.";
155     -$lang{loggedoutstring} = "$conf{companyname} vous remercie";
156     +$lang{loggedoutstring} = "$conf{domain} vous remercie";
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed