Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 2745 → Rev 2747

/CHANGELOG
8,6 → 8,7
- Add LDAPS (LDAP SSL) support.
- Add a global group named "default" for all users (the "ldap" group still exists for users authenticated through LDAP/A.D.).
- Add LDAP filter.
- responsive captive page (thx to Aurélien DUBOIS)
 
ACC
- Add LDAP configuration assistant.
/blacklist/ultrasurf_nodes
0,0 → 1,235
114.39.207.252
114.45.26.47
114.45.55.14
114.47.125.211
116.213.96.5
116.228.10.116
118.160.144.178
118.160.224.91
118.161.14.251
118.167.159.5
118.170.224.217
118.171.243.94
118.171.244.48
118.171.251.241
12.153.224.80
12.164.227.33
122.120.66.226
122.120.67.154
122.120.67.176
122.120.67.28
122.121.237.138
122.125.195.84
122.125.199.145
122.125.200.90
122.127.178.111
122.127.182.175
122.127.221.131
123.204.225.9
124.11.247.86
125.225.168.77
125.229.38.160
125.232.56.96
125.233.163.85
125.233.57.172
128.101.65.204
128.120.32.97
128.123.18.17
128.173.127.10
128.231.86.79
128.6.76.208
129.59.210.101
129.8.5.173
130.191.143.18
131.107.115.156
134.141.3.154
134.88.3.199
137.187.66.224
137.187.67.134
138.235.42.3
140.211.11.140
143.236.32.241
149.101.24.73
151.151.129.162
155.247.80.132
156.77.100.128
156.80.1.107
157.150.195.69
158.229.251.10
158.64.90.9
158.96.54.7
159.226.244.14
159.53.64.54
160.129.50.189
161.226.4.114
162.99.248.247
164.106.10.145
164.154.226.26
165.112.6.76
165.12.241.35
165.189.61.247
165.206.254.144
167.102.245.61
167.102.245.62
167.181.31.85
167.21.84.13
167.21.84.22
168.215.152.65
170.135.216.32
170.135.216.62
170.97.67.125
192.104.54.50
192.175.191.35
192.189.112.158
192.228.29.9
192.86.252.227
192.88.209.56
193.109.119.30
193.41.233.200
193.88.6.14
194.35.219.182
195.134.100.120
195.171.94.97
198.93.34.158
199.67.185.130
202.106.80.66
202.122.33.11
202.152.180.228
202.152.186.68
202.161.41.239
202.162.28.23
202.239.151.96
202.99.22.24
203.115.239.38
203.127.2.21
203.174.79.74
203.202.41.117
203.27.235.60
203.66.181.191
203.70.109.104
204.16.104.198
204.200.195.130
204.65.38.32
205.130.212.1
205.188.97.96
205.188.99.125
205.254.143.136
206.195.5.99
206.200.251.109
207.105.75.196
207.188.24.140
207.35.11.17
207.41.19.113
207.97.249.212
208.236.105.4
208.43.120.235
208.69.34.230
208.69.34.231
209.221.141.69
209.234.66.215
209.235.103.6
209.34.241.68
209.51.169.94
209.85.171.102
209.85.171.115
210.171.0.140
210.192.238.107
210.21.10.239
210.21.217.69
210.242.23.5
210.59.144.3
210.59.160.110
210.71.212.9
211.157.28.135
211.20.191.97
212.140.245.12
213.123.26.22
213.215.157.222
216.113.191.91
216.13.113.51
216.134.197.184
216.226.191.109
216.231.208.62
216.236.237.6
216.239.59.100
216.239.59.101
216.239.59.102
216.239.59.113
216.33.244.13
218.160.190.3
218.160.190.77
218.163.5.60
218.163.7.163
218.167.225.98
218.171.144.142
218.171.62.253
218.172.152.25
218.173.140.139
218.173.158.30
218.174.64.3
218.211.96.126
218.75.4.130
218.80.229.139
219.142.79.192
219.142.89.142
219.143.224.189
219.143.245.186
219.84.231.50
219.85.140.81
219.85.140.82
220.129.162.161
220.136.210.219
220.136.233.143
220.139.160.205
221.231.141.46
222.66.18.131
222.66.196.213
38.144.194.3
58.251.63.182
59.106.108.86
59.121.195.71
59.121.209.132
61.144.235.3
61.217.90.50
61.219.223.187
61.227.119.9
61.227.122.149
61.227.124.228
61.231.243.117
61.233.14.206
62.153.158.211
63.245.209.10
63.245.209.31
63.245.209.72
64.209.141.163
64.209.235.176
64.236.108.247
64.34.180.105
64.34.52.146
65.160.234.93
65.161.114.23
65.161.114.27
65.182.181.181
65.49.14.12
65.49.2.123
65.54.132.253
66.0.115.164
66.135.52.17
66.210.186.147
66.245.193.214
66.245.217.91
66.45.71.42
66.45.71.91
72.14.207.99
72.172.235.12
74.125.19.112
74.125.19.44
74.125.19.48
78.54.31.49
80.83.114.72
81.177.31.150
84.144.47.58
85.17.138.4
91.189.90.19
91.189.90.244
91.192.128.34
/web/css/style_intercept.css
111,37 → 111,77
 
/* placement et proportion de la boite de saisie et de l'aide */
/* pour desktop */
@media (min-width: 900px)
{
.mobile-only {
display: none;
}
#logon {
position: relative;
width: 620px;
top: 20px;
/* ombrage css3*/
-moz-box-shadow: 0px 0px 12px #000;
-webkit-box-shadow: 0px 0px 12px #000;
box-shadow: 0px 0px 12px #000;
}
#boite-logon {
background-image: linear-gradient(#efefef, #d5d5d5);
padding: 10px;
width: 420px;
height: 189px;
}
#boite-logon TD {
padding-top: 10px;
padding-left: 30px;
}
#boite-info {
border: 0px;
margin-top: 25px;
width: 580px;
padding-top: 10px;
}
.mobile-only {
display: none;
}
#logon {
position: relative;
width: 620px;
top: 20px;
/* ombrage css3*/
-moz-box-shadow: 0px 0px 12px #000;
-webkit-box-shadow: 0px 0px 12px #000;
box-shadow: 0px 0px 12px #000;
}
#boite-logon {
background-image: linear-gradient(#efefef, #d5d5d5);
padding: 10px;
width: 420px;
height: 189px;
}
#boite-logon TD {
padding-top: 10px;
padding-left: 30px;
}
#boite-info {
border: 0px;
margin-top: 25px;
width: 580px;
padding-top: 10px;
}
#username_input,
#password_input {
align: left;
}
/* hide placeholders for desktops */
::-webkit-input-placeholder {
/* WebKit browsers */
color: transparent;
}
:-moz-placeholder {
/* Mozilla Firefox 4 to 18 */
color: transparent;
}
::-moz-placeholder {
/* Mozilla Firefox 19+ */
color: transparent;
}
:-ms-input-placeholder {
/* Internet Explorer 10+ */
color: transparent;
}
input::placeholder {
color: transparent;
}
textarea::-webkit-input-placeholder {
/* WebKit browsers */
color: transparent;
}
textarea:-moz-placeholder {
/* Mozilla Firefox 4 to 18 */
color: transparent;
}
textarea::-moz-placeholder {
/* Mozilla Firefox 19+ */
color: transparent;
}
textarea:-ms-input-placeholder {
/* Internet Explorer 10+ */
color: transparent;
}
textarea::placeholder {
color: transparent;
}
/* pour mobile */
@media (max-width: 900px)
{
154,7 → 194,7
width: 100%;
top: 10px;
/* ombrage css3*/
-moz-box-shadow: 0px 0px 12px #000;
-moz-box-shadow: 0px 0px 12px #000;
-webkit-box-shadow: 0px 0px 12px #000;
box-shadow: 0px 0px 12px #000;
}
170,10 → 210,12
input[type="text"]
{
font-size:30px;
color: grey;
}
input[type="password"]
{
font-size:30px;
color: grey;
}
#boite-logon INPUT {
border: #666666 1px solid;
190,54 → 232,95
width: 580px;
padding-top: 10px;
}
#username_input,
#password_input {
align: center;
}
 
/* Placeholders */
::-webkit-input-placeholder {
/* WebKit browsers */
color: lightgrey;
}
:-moz-placeholder {
/* Mozilla Firefox 4 to 18 */
color: lightgrey;
}
::-moz-placeholder {
/* Mozilla Firefox 19+ */
color: lightgrey;
}
:-ms-input-placeholder {
/* Internet Explorer 10+ */
color: lightgrey;
}
input::placeholder {
color: lightgrey;
}
textarea::-webkit-input-placeholder {
/* WebKit browsers */
color: lightgrey;
}
textarea:-moz-placeholder {
/* Mozilla Firefox 4 to 18 */
color: lightgrey;
}
textarea::-moz-placeholder {
/* Mozilla Firefox 19+ */
color: lightgrey;
}
textarea:-ms-input-placeholder {
/* Internet Explorer 10+ */
color: lightgrey;
}
textarea::placeholder {
color: lightgrey;
}
}
/*boite de dialogue de deconnection*/
/* pour desktop */
@media (min-width: 900px)
{
.mobile-only {
display: none;
}
#contenu_acces {
position: relative;
width: 640px;
height: 400px;
top: -20px;
padding-top: 0px;
margin-left: auto;
margin-right: auto;
z-index: 1;
.mobile-only {
display: none;
}
#contenu_acces {
position: relative;
width: 640px;
height: 400px;
top: -20px;
padding-top: 0px;
margin-left: auto;
margin-right: auto;
z-index: 1;
 
/* ombrage CSS3 */
/* ombrage CSS3 */
 
-moz-box-shadow: 1px 1px 10px #000;
-webkit-box-shadow: 1px 1px 10px #000;
box-shadow: 1px 1px 10px #000;
}
#cadre_titre{
position: relative;
width: 730px;
height: 98px;
margin-top: 40px;
margin-left: auto;
margin-right: auto;
z-index: 2;
-moz-box-shadow: 1px 1px 10px #000;
-webkit-box-shadow: 1px 1px 10px #000;
box-shadow: 1px 1px 10px #000;
}
#cadre_titre{
position: relative;
width: 730px;
height: 98px;
margin-top: 40px;
margin-left: auto;
margin-right: auto;
z-index: 2;
 
/* ombrage css3 */
/* ombrage css3 */
 
-moz-box-shadow: 1px 4px 10px #000;
-webkit-box-shadow: 1px 4px 10px #000;
box-shadow: 1px 4px 10px #000;
}
#boite_logo{
position: absolute;
top: -30px;
left: -50px;
width: 150px;
height: 150px;
z-index: 2;
}
-moz-box-shadow: 1px 4px 10px #000;
-webkit-box-shadow: 1px 4px 10px #000;
box-shadow: 1px 4px 10px #000;
}
#boite_logo{
position: absolute;
top: -30px;
left: -50px;
width: 150px;
height: 150px;
z-index: 2;
}
/* pour mobile */
@media (max-width: 900px)
{
244,6 → 327,9
.desktop-only {
display: none;
}
.mobile-only {
display: inline;
}
#contenu_acces {
position: relative;
width: 90%;
256,7 → 342,7
 
/* ombrage CSS3 */
 
-moz-box-shadow: 1px 1px 10px #000;
-moz-box-shadow: 1px 1px 10px #000;
-webkit-box-shadow: 1px 1px 10px #000;
box-shadow: 1px 1px 10px #000;
}
271,7 → 357,7
 
/* ombrage css3 */
 
-moz-box-shadow: 1px 4px 10px #000;
-moz-box-shadow: 1px 4px 10px #000;
-webkit-box-shadow: 1px 4px 10px #000;
box-shadow: 1px 4px 10px #000;
}
311,7 → 397,7
 
/* ombrage css3*/
 
-moz-box-shadow: 0px 0px 6px #000;
-moz-box-shadow: 0px 0px 6px #000;
-webkit-box-shadow: 0px 0px 6px #000;
box-shadow: 0px 0px 6px #000;
}
363,7 → 449,7
 
/* ombrage CSS3 */
 
-moz-box-shadow: 1px 1px 10px #000;
-moz-box-shadow: 1px 1px 10px #000;
-webkit-box-shadow: 1px 1px 10px #000;
box-shadow: 1px 1px 10px #000;
}
441,7 → 527,7
background-repeat: repeat-x;
 
/* ombrage CSS3 */
-moz-box-shadow: 1px 1px 6px #666;
-moz-box-shadow: 1px 1px 6px #666;
-webkit-box-shadow: 1px 1px 6px #666;
box-shadow: 1px 1px 6px #666;
}
496,7 → 582,7
background-repeat: repeat-x;
 
/* ombrage CSS3 */
-moz-box-shadow: 0px 0px 0px #fff;
-moz-box-shadow: 0px 0px 0px #fff;
-webkit-box-shadow: 0px 0px 0px #fff;
box-shadow: 0px 0px 0px #fff;
}
518,7 → 604,7
background-repeat: repeat-x !important;
 
/* ombrage CSS3 */
-moz-box-shadow: 1px 1px 6px #666 !important;
-moz-box-shadow: 1px 1px 6px #666 !important;
-webkit-box-shadow: 1px 1px 6px #666 !important;
box-shadow: 1px 1px 6px #666 !important;
}
547,7 → 633,7
background-color: #efefef;
/* ombrage CSS3 */
-moz-box-shadow: 1px 1px 6px #666;
-moz-box-shadow: 1px 1px 6px #666;
-webkit-box-shadow: 1px 1px 6px #666;
box-shadow: 1px 1px 6px #666;
}
/web/intercept.php
565,15 → 565,11
<tr>
<td class="desktop-only" width="20%" rowspan="4"> <img id="logo-organ" src="/images/organisme.png"></td>
<td class="desktop-only" width="30%" align="right"><?= $l_user ?></td>
<td class="desktop-only" width="50%" align="left"><input type="text" maxLength="32" name="username" autocomplete="off"></td>
<td class="mobile-only" width="100%" align="center"><input type="text" maxLength="32" name="username" autocomplete="off" placeholder="<?= $l_user ?>"></td>
<td id="username_input" width="100%" align="center"><input type="text" maxLength="32" name="username" autocomplete="off" placeholder="<?= $l_user ?>"></td>
</tr>
<tr>
<td class="desktop-only" align="right"><?= $l_password ?></td>
<td class="desktop-only" align="left"><input maxLength="32" type="password" name="password" autocomplete="off"></td>
 
<td class="mobile-only" width="100%" align="center"><input maxLength="32" type="password" name="password" autocomplete="off" placeholder="<?= $l_password ?>"></td>
</tr>
<td id="password_input" width="100%" align="center"><input maxLength="32" type="password" name="password" autocomplete="off" placeholder="<?= $l_password ?>"></td>
<tr>
<td height="23" id="authenticate-button" align="center"><input value="<?= $l_boutonO ?>" type="submit" name="button"></td>
<?php if ($service_SMS_status): ?>