Ticket #1277: patch-updates.txt

File patch-updates.txt, 6.0 kB (added by ispcomm, 6 months ago)

the check_for_updates patch

Line 
1 === configs/centos/ispcp.conf
2 ==================================================================
3 --- configs/centos/ispcp.conf   (revision 21)
4 +++ configs/centos/ispcp.conf   (local)
5 @@ -403,3 +403,12 @@
6  #
7  
8  DEBUG = 0
9 +
10 +# if strong, a letters+numbers are enforced in passwords
11 +PASSWD_STRONG = yes
12 +
13 +# There's a hardcoded minimum of 5 chars that cannot be lowered
14 +PASSWD_CHARS = 7
15 +
16 +# Check for update automatically on login at www.isp-conrol.net
17 +CHECK_FOR_UPDATES = yes
18 === configs/debian/ispcp.conf
19 ==================================================================
20 --- configs/debian/ispcp.conf   (revision 21)
21 +++ configs/debian/ispcp.conf   (local)
22 @@ -403,3 +403,12 @@
23  #
24  
25  DEBUG = 0
26 +
27 +# if strong, a letters+numbers are enforced in passwords
28 +PASSWD_STRONG = yes
29 +
30 +# There's a hardcoded minimum of 5 chars that cannot be lowered
31 +PASSWD_CHARS = 7
32 +
33 +# Check for update automatically on login at www.isp-conrol.net
34 +CHECK_FOR_UPDATES = yes
35 === configs/fedora/ispcp.conf
36 ==================================================================
37 --- configs/fedora/ispcp.conf   (revision 21)
38 +++ configs/fedora/ispcp.conf   (local)
39 @@ -403,3 +403,12 @@
40  #
41  
42  DEBUG = 0
43 +
44 +# if strong, a letters+numbers are enforced in passwords
45 +PASSWD_STRONG = yes
46 +
47 +# There's a hardcoded minimum of 5 chars that cannot be lowered
48 +PASSWD_CHARS = 7
49 +
50 +# Check for update automatically on login at www.isp-conrol.net
51 +CHECK_FOR_UPDATES = yes
52 === configs/freebsd/ispcp.conf
53 ==================================================================
54 --- configs/freebsd/ispcp.conf  (revision 21)
55 +++ configs/freebsd/ispcp.conf  (local)
56 @@ -403,3 +403,12 @@
57  #
58  
59  DEBUG = 0
60 +
61 +# if strong, a letters+numbers are enforced in passwords
62 +PASSWD_STRONG = yes
63 +
64 +# There's a hardcoded minimum of 5 chars that cannot be lowered
65 +PASSWD_CHARS = 7
66 +
67 +# Check for update automatically on login at www.isp-conrol.net
68 +CHECK_FOR_UPDATES = yes
69 === configs/gentoo/ispcp.conf
70 ==================================================================
71 --- configs/gentoo/ispcp.conf   (revision 21)
72 +++ configs/gentoo/ispcp.conf   (local)
73 @@ -406,3 +406,12 @@
74  #
75  
76  DEBUG = 0
77 +
78 +# if strong, a letters+numbers are enforced in passwords
79 +PASSWD_STRONG = yes
80 +
81 +# There's a hardcoded minimum of 5 chars that cannot be lowered
82 +PASSWD_CHARS = 7
83 +
84 +# Check for update automatically on login at www.isp-conrol.net
85 +CHECK_FOR_UPDATES = yes
86 === configs/openbsd/ispcp.conf
87 ==================================================================
88 --- configs/openbsd/ispcp.conf  (revision 21)
89 +++ configs/openbsd/ispcp.conf  (local)
90 @@ -403,3 +403,12 @@
91  #
92  
93  DEBUG = 0
94 +
95 +# if strong, a letters+numbers are enforced in passwords
96 +PASSWD_STRONG = yes
97 +
98 +# There's a hardcoded minimum of 5 chars that cannot be lowered
99 +PASSWD_CHARS = 7
100 +
101 +# Check for update automatically on login at www.isp-conrol.net
102 +CHECK_FOR_UPDATES = yes
103 === configs/opensuse/ispcp.conf
104 ==================================================================
105 --- configs/opensuse/ispcp.conf (revision 21)
106 +++ configs/opensuse/ispcp.conf (local)
107 @@ -403,3 +403,12 @@
108  #
109  
110  DEBUG = 0
111 +
112 +# if strong, a letters+numbers are enforced in passwords
113 +PASSWD_STRONG = yes
114 +
115 +# There's a hardcoded minimum of 5 chars that cannot be lowered
116 +PASSWD_CHARS = 7
117 +
118 +# Check for update automatically on login at www.isp-conrol.net
119 +CHECK_FOR_UPDATES = yes
120 === configs/redhat/ispcp.conf
121 ==================================================================
122 --- configs/redhat/ispcp.conf   (revision 21)
123 +++ configs/redhat/ispcp.conf   (local)
124 @@ -403,3 +403,12 @@
125  #
126  
127  DEBUG = 0
128 +
129 +# if strong, a letters+numbers are enforced in passwords
130 +PASSWD_STRONG = yes
131 +
132 +# There's a hardcoded minimum of 5 chars that cannot be lowered
133 +PASSWD_CHARS = 7
134 +
135 +# Check for update automatically on login at www.isp-conrol.net
136 +CHECK_FOR_UPDATES = yes
137 === configs/ubuntu/ispcp.conf
138 ==================================================================
139 --- configs/ubuntu/ispcp.conf   (revision 21)
140 +++ configs/ubuntu/ispcp.conf   (local)
141 @@ -403,3 +403,12 @@
142  #
143  
144  DEBUG = 0
145 +
146 +# if strong, a letters+numbers are enforced in passwords
147 +PASSWD_STRONG = yes
148 +
149 +# There's a hardcoded minimum of 5 chars that cannot be lowered
150 +PASSWD_CHARS = 7
151 +
152 +# Check for update automatically on login at www.isp-conrol.net
153 +CHECK_FOR_UPDATES = yes
154 === gui/admin/index.php
155 ==================================================================
156 --- gui/admin/index.php (revision 21)
157 +++ gui/admin/index.php (local)
158 @@ -71,6 +71,18 @@
159  function get_update_infos(&$tpl) {
160         global $cfg;
161  
162 +       if ( $cfg['CHECK_FOR_UPDATES'] == "no" ) {
163 +          $tpl->assign(array(
164 +                       'UPDATE'          => 'UPDATE CHECK DISABLED',
165 +                       'DATABASE_UPDATE' => 'DATABASE UPDATE CHECK DISABLED'
166 +                       )
167 +               );
168 +               $tpl->parse('UPDATE_MESSAGE', 'update_message');
169 +               $tpl->parse('DATABASE_UPDATE_MESSAGE', 'database_update_message');
170 +               return ;
171 +       }
172 +               
173 +
174         $last_update = "http://www.isp-control.net/latest.txt";
175         // Fake the browser type
176         ini_set('user_agent', 'Mozilla/5.0');
177 === gui/include/ispcp-config.php
178 ==================================================================
179 --- gui/include/ispcp-config.php        (revision 21)
180 +++ gui/include/ispcp-config.php        (local)
181 @@ -209,6 +209,9 @@
182                 'HTPASSWD_CMD' => null,
183                 'BACKUP_FILE_DIR' => null,
184                 'DEBUG' => null,
185 +               'CHECK_FOR_UPDATES' => "yes",
186 +               'PASSWD_STRONG' => "yes",
187 +               'PASSWD_CHARS' => '6',
188                 );
189         var $status;
190  
191 === gui/include/ispcp-lib.php
192 ==================================================================
193 --- gui/include/ispcp-lib.php   (revision 21)
194 +++ gui/include/ispcp-lib.php   (local)
195 @@ -124,11 +124,11 @@
196  curlang(null, true); //restore language auto detection
197  
198  // password chars
199 -$cfg['PASSWD_CHARS'] = 6;
200 +if ( !is_numeric($cfg['PASSWD_CHARS']))
201 +       $cfg['PASSWD_CHARS'] = 6;
202  // enable or disable strong passwords
203  // false = disable, true = enable
204 -$cfg['PASSWD_STRONG'] = true;
205 -
206 +$cfg['PASSWD_STRONG'] = (($cfg['PASSWD_STRONG'] == "yes") || ($cfg['PASSWD_STRONG'] == "1"));
207  // The virtual host file from Apache which contains our virtual host entries
208  $cfg['SERVER_VHOST_FILE'] = $cfg['APACHE_SITES_DIR'] . '/ispcp.conf';
209