Ticket #1277: patch.txt

diff -urN /var/www/ispcp/gui/admin/index.php gui/admin/index.php
--- /var/www/ispcp/gui/admin/index.php  2008-06-16 23:52:01.000000000 +0300
+++ gui/admin/index.php 2008-06-16 23:21:08.000000000 +0300
@@ -71,6 +71,12 @@
 function get_ispcp_update_infos(&$tpl) {
        global $cfg;
 
+       if (!$cfg['CHECK_FOR_UPDATES']) {
+               $tpl->assign(array('UPDATE' => tr('Update checking is disabled!')));
+               $tpl->parse('UPDATE_MESSAGE', 'update_message');
+               return ;
+       }
+
        $last_update = "http://www.isp-control.net/latest.txt";
        // Fake the browser type
        ini_set('user_agent', 'Mozilla/5.0');
diff -urN /var/www/ispcp/gui/admin/ispcp_updates.php gui/admin/ispcp_updates.php
--- /var/www/ispcp/gui/admin/ispcp_updates.php  2008-06-16 23:52:01.000000000 +0300
+++ gui/admin/ispcp_updates.php 2008-06-16 23:47:45.000000000 +0300
@@ -25,7 +25,18 @@
 /* BEGIN common functions */
 function get_update_infos(&$tpl) {
        global $cfg;
-
+       
+       if (!$cfg['CHECK_FOR_UPDATES']) {
+               $tpl->assign(
+                       array('UPDATE_MESSAGE' => '',
+                               'UPDATE' => tr('Update checking is disabled!'),
+                               'INFOS' => tr('Enable update at') . " <a href=\"settings.php\">" . tr('Settings') . "</a>"
+                               )
+                       );
+               $tpl->parse('UPDATE_INFOS', 'update_infos');
+               return false;
+       }
+       
        $info_url = "http://www.isp-control.net/download.html";
        $last_update = "http://www.isp-control.net/latest.txt";
        // Fake the browser type
diff -urN /var/www/ispcp/gui/admin/settings.php gui/admin/settings.php
--- /var/www/ispcp/gui/admin/settings.php       2008-06-16 23:52:01.000000000 +0300
+++ gui/admin/settings.php      2008-06-16 23:19:48.000000000 +0300
@@ -38,22 +38,23 @@
        );
 
 if (isset($_POST['uaction']) && $_POST['uaction'] == 'apply') {
-       $lostpassword                                           = $_POST['lostpassword'];
+       $lostpassword                                   = $_POST['lostpassword'];
        $lostpassword_timeout                           = clean_input($_POST['lostpassword_timeout']);
-       $passwd_chars                                           = clean_input($_POST['passwd_chars']);
-       $passwd_strong                                          = $_POST['passwd_strong'];
-       $bruteforce                                             = $_POST['bruteforce'];
+       $passwd_chars                                   = clean_input($_POST['passwd_chars']);
+       $passwd_strong                                  = $_POST['passwd_strong'];
+       $bruteforce                                     = $_POST['bruteforce'];
        $bruteforce_between                             = $_POST['bruteforce_between'];
        $bruteforce_max_login                           = clean_input($_POST['bruteforce_max_login']);
        $bruteforce_block_time                          = clean_input($_POST['bruteforce_block_time']);
        $bruteforce_between_time                        = clean_input($_POST['bruteforce_between_time']);
        $bruteforce_max_capcha                          = clean_input($_POST['bruteforce_max_capcha']);
-       $create_default_email_addresses         = $_POST['create_default_email_addresses'];
+       $create_default_email_addresses                 = $_POST['create_default_email_addresses'];
        $hard_mail_suspension                           = $_POST['hard_mail_suspension'];
-       $user_initial_lang                                      = $_POST['def_language'];
-       $support_system                                         = $_POST['support_system'];
-       $hosting_plan_level                                     = $_POST['hosting_plan_level'];
+       $user_initial_lang                              = $_POST['def_language'];
+       $support_system                                 = $_POST['support_system'];
+       $hosting_plan_level                             = $_POST['hosting_plan_level'];
        $domain_rows_per_page                           = clean_input($_POST['domain_rows_per_page']);
+       $checkforupdate                                 = $_POST['checkforupdate'];
        // change Loglevel to constant:
        switch ($_POST['log_level']) {
                case "E_USER_NOTICE":
@@ -94,6 +95,7 @@
                setConfig_Value('HOSTING_PLANS_LEVEL', $hosting_plan_level);
                setConfig_Value('DOMAIN_ROWS_PER_PAGE', $domain_rows_per_page);
                setConfig_Value('LOG_LEVEL', $log_level);
+               setConfig_Value('CHECK_FOR_UPDATES', $checkforupdate);
                set_page_message(tr('Settings saved !'));
        }
 }
@@ -176,6 +178,14 @@
        $tpl->assign('HOSTING_PLANS_LEVEL_RESELLER', 'selected="selected"');
 }
 
+if ($cfg['CHECK_FOR_UPDATES']) {
+       $tpl->assign('CHECK_FOR_UPDATES_SELECTED_ON', 'selected="selected"');
+       $tpl->assign('CHECK_FOR_UPDATES_SELECTED_OFF', '');
+} else {
+       $tpl->assign('CHECK_FOR_UPDATES_SELECTED_ON', '');
+       $tpl->assign('CHECK_FOR_UPDATES_SELECTED_OFF', 'selected="selected"');
+}
+
 switch($cfg['LOG_LEVEL']){
        case E_USER_OFF:
                $tpl->assign('LOG_LEVEL_SELECTED_OFF', 'selected="selected"');
@@ -244,7 +254,8 @@
                'TR_E_USER_OFF' => tr('Disabled'),
                'TR_E_USER_NOTICE' => tr('Notices, Warnings and Errors'),
                'TR_E_USER_WARNING' => tr('Warnings and Errors'),
-               'TR_E_USER_ERROR' => tr('Errors')
+               'TR_E_USER_ERROR' => tr('Errors'),
+               'TR_CHECK_FOR_UPDATES' => tr('Check for update')
                )
        );
 
diff -urN /var/www/ispcp/gui/include/ispcp-lib.php gui/include/ispcp-lib.php
--- /var/www/ispcp/gui/include/ispcp-lib.php    2008-06-16 23:52:01.000000000 +0300
+++ gui/include/ispcp-lib.php   2008-06-16 23:20:34.000000000 +0300
@@ -147,6 +147,9 @@
 // false: email accounts are soft suspended (passwords are modified so user can't access the accounts)
 $cfg['HARD_MAIL_SUSPENSION'] = true;
 
+// false: disable automatic serch for new version
+$cfg['CHECK_FOR_UPDATES'] = true;
+
 
 require_once(INCLUDEPATH.'/date-functions.php');
 require_once(INCLUDEPATH.'/input-checks.php');
diff -urN /var/www/ispcp/gui/themes/omega_original/admin/settings.tpl gui/themes/omega_original/admin/settings.tpl
--- /var/www/ispcp/gui/themes/omega_original/admin/settings.tpl 2008-06-16 23:52:00.000000000 +0300
+++ gui/themes/omega_original/admin/settings.tpl        2008-06-16 23:20:31.000000000 +0300
@@ -44,6 +44,18 @@
                             <!-- EDP: page_message -->
                             <tr>
                               <td width="25">&nbsp;</td>
+                              <td colspan="2" class="content3"><strong>{TR_CHECK_FOR_UPDATES}</strong></td>
+                            </tr>
+                            <tr>
+                              <td>&nbsp;</td>
+                              <td width="200" class="content2">{TR_CHECK_FOR_UPDATES}</td>
+                              <td class="content"><select name="checkforupdate">
+                                  <option value="0" {CHECK_FOR_UPDATES_SELECTED_OFF}>{TR_DISABLED}</option>
+                                  <option value="1" {CHECK_FOR_UPDATES_SELECTED_ON}>{TR_ENABLED}</option>
+                              </select></td>
+                            </tr>
+                            <tr>
+                              <td width="25">&nbsp;</td>
                               <td colspan="2" class="content3"><strong>{TR_LOSTPASSWORD}</strong></td>
                             </tr>
                             <tr>