Changeset 1229

Timestamp:

06/17/08 12:37:54 (4 months ago)

Author:

rats

Message:

* Fixed #1231: Session conflict / redirection problem
* Fixed #1277: Adding CHECK_FOR_UPDATES in ispcp.conf
* Fixed #1351: Filemanager not work update RC4 -> RC5
* Fixed #1353: In admin/ispcp_debugger.php not all execute request are counted

Files:

• trunk/CHANGELOG (modified) (1 diff)
• trunk/gui/admin/index.php (modified) (2 diffs)
• trunk/gui/admin/ispcp_debugger.php (modified) (1 diff)
• trunk/gui/admin/ispcp_updates.php (modified) (5 diffs)
• trunk/gui/admin/settings.php (modified) (4 diffs)
• trunk/gui/client/add_mail_acc.php (modified) (1 diff)
• trunk/gui/include/ispcp-lib.php (modified) (1 diff)
• trunk/gui/include/login.php (modified) (1 diff)
• trunk/gui/themes/omega_original/admin/settings.tpl (modified) (1 diff)
• trunk/gui/tools/filemanager/LICENSE.txt (modified) (8 diffs)
• trunk/gui/tools/filemanager/index.php (modified) (3 diffs)
• trunk/gui/tools/filemanager/settings.inc.php (modified) (2 diffs)
• trunk/gui/tools/filemanager/settings_screens.inc.php (modified) (1 diff)
• trunk/gui/tools/filemanager/skins/omega/loginform.template.php (modified) (1 diff)

trunk/CHANGELOG

@@ -1 +1 @@
-ispCP ω 1.0.0 Changelog
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+2008-06-17 Benedikt Heintel
+        - GUI:
+                * Fixed #1231: Session conflict / redirection problem
+                * Fixed #1277: Adding CHECK_FOR_UPDATES in ispcp.conf
+                * Fixed #1351: Filemanager not work update RC4 -> RC5
+                * Fixed #1353: In admin/ispcp_debugger.php not all execute request are counted
-
-2008-06-15 Benedikt Heintel

trunk/gui/admin/index.php

@@ -72 +72 @@
-        global $cfg;
-
+        if (!$cfg['CHECK_FOR_UPDATES']) {
+                $tpl->assign(array('UPDATE' => tr('Update checking is disabled!')));
+                $tpl->parse('UPDATE_MESSAGE', 'update_message');
+                return false;
+        }
+
-        $last_update = "http://www.isp-control.net/latest.txt";
-        // Fake the browser type
@@ -164 +170 @@
-
-        $tpl->assign(
-
+
+
-                        'BAR_VALUE' => $bar_value,
-                        )

trunk/gui/admin/ispcp_debugger.php

@@ -26 +26 @@
-    global $cfg;
-
-$id_name FROM $table WHERE $id_name = ?
-$cfg['ITEM_CHANGE_STATUS']
+`$id_name` FROM `$table` WHERE `$id_name` NOT IN (?, ?, ?)
+array($cfg['ITEM_OK_STATUS'], $cfg['ITEM_DISABLED_STATUS'], $cfg['ITEM_ORDERED_STATUS'])
-    $count = $rs->RecordCount();
-    return $count;

trunk/gui/admin/ispcp_updates.php

@@ -23 +23 @@
-check_login(__FILE__);
-
+$theme_color = $cfg['USER_INITIAL_THEME'];
+
+$tpl = new pTemplate();
+$tpl->define_dynamic('page', $cfg['ADMIN_TEMPLATE_PATH'] . '/ispcp_updates.tpl');
+$tpl->define_dynamic('page_message', 'page');
+$tpl->define_dynamic('hosting_plans', 'page');
+$tpl->define_dynamic('update_message', 'page');
+$tpl->define_dynamic('update_infos', 'page');
+
+$tpl->assign(
+        array(
+                'TR_ADMIN_ISPCP_UPDATES_PAGE_TITLE' => tr('ispCP - Virtual Hosting Control System'),
+                'THEME_COLOR_PATH' => "../themes/$theme_color",
+                'THEME_CHARSET' => tr('encoding'),
+                'ISP_LOGO' => get_logo($_SESSION['user_id'])
+                )
+        );
+
+
-/* 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";
@@ -49 +81 @@
-        if ($current_version < $last_update_result) {
-                $tpl->assign(
-
+
+
-                                'UPDATE' => tr('New ispCP update is now available'),
-                                'INFOS' => tr('Get it at') . " <a href=\"" . $info_url . "\" class=\"link\" target=\"ispcp\">" . $info_url . "</a>"
@@ -62 +95 @@
-/* END system functions */
-
-$tpl = new pTemplate();
-$tpl->define_dynamic('page', $cfg['ADMIN_TEMPLATE_PATH'] . '/ispcp_updates.tpl');
-$tpl->define_dynamic('page_message', 'page');
-$tpl->define_dynamic('hosting_plans', 'page');
-$tpl->define_dynamic('update_message', 'page');
-$tpl->define_dynamic('update_infos', 'page');
-
-global $cfg;
-$theme_color = $cfg['USER_INITIAL_THEME'];
-
-$tpl->assign(
-        array('TR_ADMIN_ISPCP_UPDATES_PAGE_TITLE' => tr('ispCP - Virtual Hosting Control System'),
-                'THEME_COLOR_PATH' => "../themes/$theme_color",
-                'THEME_CHARSET' => tr('encoding'),
-                'ISP_LOGO' => get_logo($_SESSION['user_id'])
-                )
-        );
-
-/*
- *
@@ -89 +104 @@
-
-$tpl->assign(
-
+
+
-                'TR_AVAILABLE_UPDATES' => tr('Available ispCP updates'),
-                'TR_MESSAGE' => tr('No new ispCP updates available'),
-                'TR_UPDATE' => tr('Update'),
-
-
+
-                )
-        );
@@ -103 +118 @@
-
-$tpl->parse('PAGE', 'page');
-
-$tpl->prnt();
-
-
+
+
-
-unset_messages();

trunk/gui/admin/settings.php

@@ -55 +55 @@
-        $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']) {
@@ -95 +96 @@
-                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 !'));
-        }
@@ -175 +177 @@
-        $tpl->assign('HOSTING_PLANS_LEVEL_ADMIN', '');
-        $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"');
-}
-
@@ -245 +255 @@
-                'TR_E_USER_NOTICE' => tr('Notices, Warnings and Errors'),
-                'TR_E_USER_WARNING' => tr('Warnings and Errors'),
-
+
+
-                )
-        );

trunk/gui/client/add_mail_acc.php

@@ -371 +371 @@
-
-function check_mail_acc_data(&$sql, $dmn_id, $dmn_name) {
-
-
+
+
+
+
-
-        if (($mail_type_normal == false) && ($mail_type_forward == false)) {

trunk/gui/include/ispcp-lib.php

@@ -148 +148 @@
-$cfg['HARD_MAIL_SUSPENSION'] = true;
-
+// false: disable automatic serch for new version
+$cfg['CHECK_FOR_UPDATES'] = true;
+
-
-require_once(INCLUDEPATH.'/date-functions.php');

trunk/gui/include/login.php

@@ -195 +195 @@
-                if ($info['host'] != $_SERVER['HTTP_HOST'] || $info['host'] != $_SERVER['SERVER_NAME']) {
-                    set_page_message(tr('Request from foreign host was blocked!'));
+                if(!(substr($_SERVER['SCRIPT_FILENAME'], (int)-strlen($_SERVER['REDIRECT_URL']), strlen($_SERVER['REDIRECT_URL'])) === $_SERVER['REDIRECT_URL']))
-                    redirect_to_level_page();
-                }

trunk/gui/themes/omega_original/admin/settings.tpl

@@ -45 +45 @@
-                            <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>

trunk/gui/tools/filemanager/LICENSE.txt

@@ -26 +26 @@
-====================
-
- 
+
-By: Eric Mueller, Denis125 and Peter Listiak
-License: public domain
@@ -47 +47 @@
-====================
-
- 
+
-Website: http://www.holomind.de/phpnet/diff.php
-By: Daniel Unterberger <diff.phpnet@holomind.de>
@@ -122 +122 @@
-By: Mike Haller
-
- 
- 
+
+
-use of it on an unlimited number of servers.
-
@@ -135 +135 @@
-
-Website: http://swfupload.mammon.se/
-
-
+
-
-
@@ -211 +210 @@
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
+
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
@@ -266 +265 @@
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
+
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
@@ -324 +323 @@
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
+
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
@@ -381 +380 @@
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
+
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the

trunk/gui/tools/filemanager/index.php

@@ -2 +2 @@
-
-/*  Hi,
-
+
-    Thanks for downloading net2ftp!
-
+
-    This page shows how to integrate net2ftp in a generic PHP page.
-    It is quite easy:
-    1. Define the constants NET2FTP_APPLICATION_ROOTDIR and NET2FTP_APPLICATION_ROOTDIR_URL
-    2. Include the file main.inc.php
- 
+
-       code, print the HTML body, etc...
-    4. Check if an error occured to print out an error message.
-
+
-    Look in /integration for more elaborate examples.
-
+
-    Enjoy,
-
- 
+
+
-*/
-
@@ -33 +33 @@
-
-// ------------------------------------------------------------------------
- 
+
-//    be called once before the other net2ftp() calls!
-// ------------------------------------------------------------------------
@@ -61 +61 @@
-<?php
-// ------------------------------------------------------------------------
- 
+
-//    a template, or by accessing the $net2ftp_result variable directly.
-// ------------------------------------------------------------------------

trunk/gui/tools/filemanager/settings.inc.php

@@ -59 +59 @@
-
-// ----------------------------------------------------------------------------------
- 
- 
+
+
-// volume and script execution time), and checking the user's home directory
-// ----------------------------------------------------------------------------------
@@ -140 +140 @@
-$net2ftp_settings["net2ftpdotcom"] = "no";
-
- 
+
-// Not shown when using HTTPS to avoid warnings on each pageload
-$net2ftp_settings["show_google_ads"] = "no";

trunk/gui/tools/filemanager/settings_screens.inc.php

@@ -99 +99 @@
-$net2ftp_settings["functionuse_update"] = "no";
-
- 
+
-$net2ftp_settings["functionuse_open"] = "yes";
-

trunk/gui/tools/filemanager/skins/omega/loginform.template.php

@@ -58 +58 @@
-<?php /* ----- SSL ----- */ ?>
-<?php                                                   if ($sslconnect["inputType"] == "checkbox") { ?>
-yes
+no
-<?php                                                   } else { ?>
-                                                                <td></td>