Changeset 1173

Timestamp:

05/27/08 11:06:53 (6 months ago)

Author:

rats

Message:

* Fixed #1291: reseller/ahp.php complains about already sent header
* Fixed #1293: in client/protect_it.php template variable {USER_SELECTED} is not set
* Fixed #1294: id has to be unique in the whole html file, but in the list in admin/settings_ports.php|.tpl are several unique id's
* Fixed #1299: there is a typo in the whole ispcp, cannot is wrongly written separated, but it is used to write it together

Files:

• trunk/CHANGELOG (modified) (3 diffs)
• trunk/engine/ispcp_common_methods.pl (modified) (2 diffs)
• trunk/gui/admin/edit_domain.php (modified) (8 diffs)
• trunk/gui/admin/edit_reseller.php (modified) (1 diff)
• trunk/gui/admin/manage_reseller_users.php (modified) (2 diffs)
• trunk/gui/admin/settings.php (modified) (1 diff)
• trunk/gui/admin/settings_ports.php (modified) (6 diffs)
• trunk/gui/client/add_ftp_acc.php (modified) (1 diff)
• trunk/gui/client/add_mail_acc.php (modified) (1 diff)
• trunk/gui/client/ftp_choose_dir.php (modified) (1 diff)
• trunk/gui/client/protect_it.php (modified) (15 diffs)
• trunk/gui/include/admin-functions.php (modified) (10 diffs)
• trunk/gui/include/client-functions.php (modified) (1 diff)
• trunk/gui/include/ispcp-lib.php (modified) (1 diff)
• trunk/gui/include/login.php (modified) (1 diff)
• trunk/gui/include/reseller-functions.php (modified) (9 diffs)
• trunk/gui/reseller/ahp.php (modified) (2 diffs)
• trunk/gui/reseller/edit_domain.php (modified) (8 diffs)
• trunk/gui/reseller/orders_update.php (modified) (8 diffs)
• trunk/gui/themes/omega_original/admin/settings_ports.tpl (modified) (1 diff)
• trunk/gui/themes/omega_original/client/protect_it.tpl (modified) (4 diffs)
• trunk/gui/tools/filemanager/plugins/tinymce/themes/advanced/docs/en/create_accessible_content.htm (modified) (1 diff)

trunk/CHANGELOG

@@ -2 +2 @@
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
+2008-05-27 Benedikt Heintel
+        - GUI:
+                * Fixed #1291: reseller/ahp.php complains about already sent header
+                * Fixed #1293: in client/protect_it.php template variable {USER_SELECTED} is not set
+                * Fixed #1294: id has to be unique in the whole html file, but in the list in admin/settings_ports.php|.tpl are several unique id's
+                * Fixed #1299: there is a typo in the whole ispcp, cannot is wrongly written separated, but it is used to write it together
+                * Fixed #1300: some html fixes; replaced <font> with external CSS class or span; webmail/pma theme css fixes - Part 7
+
-2008-05-26 Jochen Manz
-        - GUI:
@@ -15 +23 @@
-                * Fixed #1284: Some HTML, JS fixes, removed ugly/useless whitespace removed useles height="*" - Part 4
-                * Fixed #1275: TR_PHP_YES, TR_PHP_NO, TR_CGI_YES, TR_CGI_NO and TR_STATUS_YES aren't replaced correctly
-
+
-2008-05-23 Jochen Manz
-        - GUI:
@@ -26 +34 @@
-2008-05-22 Benedikt Heintel
-        - GUI:
- 
+
-                * Fixed #1273: some HTML fixes in the HTML templates - Part 1
-                * Fixed #1274: remove Disallow /ispcp/ from robots.txt

trunk/engine/ispcp_common_methods.pl

@@ -439 +439 @@
-
-    if ($res != 1) {
-Can 
+can
-        return -1;
-    }
@@ -446 +446 @@
-
-    if ($res != 1) {
-Can 
+can
-        return -1;
-

trunk/gui/admin/edit_domain.php

@@ -486 +486 @@
-                if ($data == -1) {
-                        if ($u > 0) {
- 
+
-                        } else {
-                                $umax = $data;
@@ -496 +496 @@
-                } else if ($data > 0) {
-                        if ($u > $data) {
- 
+
-                        } else {
-                                $umax = $data;
@@ -506 +506 @@
-                if ($data == -1) {
-                        if ($u > 0) {
- 
+
-                        } else {
-                                $r -= $umax;
@@ -518 +518 @@
-                } else if ($data > 0) {
-                        if ($u > $data) {
- 
+
-                        } else {
-                                if ($umax > $data) {
@@ -535 +535 @@
-                        return;
-                } else if ($data == 0) {
- 
+
-                        return;
-                } else if ($data > 0) {
-                        if ($r + $data > $rmax) {
- 
+
-                        } else {
-                                $r += $data;
@@ -560 +560 @@
-                if ($data == -1) {
-                        if ($u > 0) {
- 
+
-                        } else {
-                                $r -= $umax;
@@ -568 +568 @@
-                        return;
-                } else if ($data == 0) {
- 
+
-
-                        return;
-                } else if ($data > 0) {
-                        if ($u > $data) {
- 
+
-                        } else {
-                                if ($umax > $data) {
@@ -582 +582 @@
-
-                                        if ($r + $data_inc > $rmax) {
- 
+
-                                                return;
-                                        }

trunk/gui/admin/edit_reseller.php

@@ -829 +829 @@
-
-$tpl->parse('PAGE', 'page');
-
-$tpl->prnt();
-
-
+
+
-
-unset_messages();

trunk/gui/admin/manage_reseller_users.php

@@ -369 +369 @@
-                $err .= tr('<b>%1$s</b> has unlimited rights for a <b>%2$s</b> Service !<br>', $uname, $obj);
-
- 
+
-
-                return;
@@ -435 +435 @@
-                                $err = '';
-                        }
- not be managed from the destination reseller !<br>This user can 
+not be managed from the destination reseller !<br>This user can
-
-                        return false;

trunk/gui/admin/settings.php

@@ -118 +118 @@
-        $tpl->assign('LOSTPASSWORD_SELECTED_OFF', 'selected="selected"');
-}
-
-
-
-
-
-
+
+
+
+
+
+
+
-}
-

trunk/gui/admin/settings_ports.php

@@ -32 +32 @@
-
-$tpl->assign(
-
+
+
-                'THEME_COLOR_PATH' => "../themes/$theme_color",
-                'THEME_CHARSET' => tr('encoding'),
@@ -196 +197 @@
-                                $tpl->assign(array('SERVICE' => $name . "<input name=\"name[]\" type=\"hidden\" id=\"name\" value=\"" . $name . "\" />"));
-                                $tpl->assign(
-
+
+
-                                                'PROTOCOL_READONLY' => 'disabled',
-                                                'TR_DELETE' => '-',
-
+
+
-                                                )
-                                        );
@@ -206 +209 @@
-                                $tpl->assign(array('SERVICE' => "<input name=\"name[]\" type=\"text\" id=\"name\" value=\"" . $name . "\" class=\"textinput\" maxlength=\"25\" />"));
-                                $tpl->assign(
-
+
+
-                                                'PROTOCOL_READONLY' => '',
-                                                'TR_DELETE' => tr('Delete'),
-                                                'URL_DELETE' => 'settings_ports.php?delete=' . $rs->fields['name'],
-
+
+
-                                                )
-                                        );
@@ -217 +222 @@
-
-                        $tpl->assign(
-
+
+
-                                        'VAR_NAME' => $rs->fields['name'],
-                                        'PORT' => $port,
@@ -252 +258 @@
-
-$tpl->assign(
-
+
+
-                'TR_UDP' => tr('udp'),
-                'TR_TCP' => tr('tcp'),
@@ -274 +281 @@
-
-$tpl->parse('PAGE', 'page');
-
-$tpl->prnt();
-

trunk/gui/client/add_ftp_acc.php

@@ -451 +451 @@
-
-    if ($_POST['dmn_type'] === 'sub' && $_POST['sub_id'] === 'n/a') {
- 
+
-        return;
-    }
-
-    if ($_POST['dmn_type'] === 'als' && $_POST['als_id'] === 'n/a') {
- 
+
-        return;
-    }

trunk/gui/client/add_mail_acc.php

@@ -406 +406 @@
-
-    if ($_POST['dmn_type'] === 'sub' && !isset($_POST['sub_id'])) {
- 
+
-        return;
-    }
-
-    if ($_POST['dmn_type'] === 'als' && !isset($_POST['als_id'])) {
- 
+
-        return;
-    }

trunk/gui/client/ftp_choose_dir.php

@@ -44 +44 @@
-        $list = $vfs->ls($path);
-        if (!$list) {
-Can 
+can
-                return;
-        }

trunk/gui/client/protect_it.php

@@ -92 +92 @@
-                                $user_id .= $users[$i];
-                                if ($user_id == '-1' || $user_id == '') {
- 
+
-                                        return;
-                                }
@@ -105 +105 @@
-                                $group_id .= $groups[$i];
-                                if ($group_id == '-1' || $group_id == '') {
- 
+
-                                        return;
-                                }
@@ -117 +117 @@
-        $alt_path = $path . "/";
-        $query = <<<SQL_QUERY
-select
+SELECT
-            id
-from
+FROM
-            htaccess
-where
+WHERE
-             dmn_id = ?
-and
+AND
-                        (path = ?
-       or
+OR
-                        path = ?)
-SQL_QUERY;
@@ -136 +136 @@
-                $update_id = $rs->fields['id'];
-                $query = <<<SQL_QUERY
-
-
+
+
+
-                        user_id = ?,
-                        group_id = ?,
@@ -143 +144 @@
-                        path = ?,
-                        status = ?
-where
+WHERE
-                        id = '$update_id'
-SQL_QUERY;
@@ -153 +154 @@
-        } else {
-                $query = <<<SQL_QUERY
-
+
+
-            (dmn_id, user_id, group_id, auth_type, auth_name, path, status)
-values
+VALUES
-            (?, ?, ?, ?, ?, ?, ?)
-SQL_QUERY;
@@ -177 +179 @@
-                $group_id = 0;
-                $tpl->assign(
-
+
+
-                                'AREA_NAME' => '',
-                                'UNPROTECT_IT' => '',
@@ -190 +193 @@
-
-                $query = <<<SQL_QUERY
-select
+SELECT
-            *
-from
+FROM
-            htaccess
-where
+WHERE
-             dmn_id = ?
-and
+AND
-                        id = ?
-SQL_QUERY;
@@ -220 +223 @@
-
-                $tpl->assign(
-
+
+
-                                'AREA_NAME' => $auth_name,
-                                )
@@ -260 +264 @@
-
-        $query = <<<SQL_QUERY
-select
+SELECT
-            *
-from
+FROM
-            htaccess_users
-where
+WHERE
-             dmn_id = ?
-
-SQL_QUERY;
-
@@ -273 +276 @@
-        if ($rs->RecordCount() == 0) {
-                $tpl->assign(
-
-
+
+
+
+
-                                )
-                        );
@@ -293 +298 @@
-                                        array(
-                                                'USER_VALUE' => $rs->fields['id'],
-E
+A
-                                                'USER_SELECTED' => $usr_selected,
-                                                )
@@ -305 +310 @@
-
-        $query = <<<SQL_QUERY
-select
+SELECT
-            *
-from
+FROM
-            htaccess_groups
-where
+WHERE
-             dmn_id = ?
-
-SQL_QUERY;
-
@@ -320 +324 @@
-                                array(
-                                        'GROUP_VALUE' => "-1",
-
+
+
-                                        )
-                                );
@@ -339 +344 @@
-                                        array(
-                                                'GROUP_VALUE' => $rs->fields['id'],
-E
+A
-                                                'GROUP_SELECTED' => $grp_selected,
-                                                )

trunk/gui/include/admin-functions.php

@@ -951 +951 @@
-
-                if ($sub_max != -1) {
-
+
+
-
-                        $rsub_current += $sub_current;
@@ -958 +959 @@
-
-                if ($als_max != -1) {
-
+
+
-
-                        $rals_current += $als_current;
@@ -964 +966 @@
-                }
-
-
+
+
-
-                $rmail_current += $mail_current;
-                $rmail_max += $mail_max;
-
-
+
+
-
-                $rftp_current += $ftp_current;
@@ -975 +979 @@
-
-                if ($sql_db_max != -1) {
-
+
+
-
-                        $rsql_db_current += $sql_db_current;
@@ -982 +987 @@
-
-                if ($sql_user_max != -1) {
-
+
+
-
-                        $rsql_user_current += $sql_user_current;
@@ -988 +994 @@
-                }
-
-
+
+
-
-                $rtraff_current += $traff_current;
-                $rtraff_max += $traff_max;
-
-
+
+
-
-                $rdisk_current += $disk_current;
@@ -1040 +1048 @@
-        $als_current = records_count('alias_id', 'domain_aliasses', 'domain_id', $user_id);
-        $als_max = $rs->fields['domain_alias_limit'];
-4
+for
-        $mail_current = records_count('mail_id', 'mail_users', 'mail_type NOT RLIKE \'_catchall\' AND domain_id', $user_id);
-        $mail_max = $rs->fields['domain_mailacc_limit'];
-
-
-
-
+
+
-
-        $ftp_current += sub_records_rlike_count('subdomain_name', 'subdomain', 'domain_id', $user_id,
-
-
+
-
-        $ftp_current += sub_records_rlike_count('alias_name', 'domain_aliasses', 'domain_id', $user_id,
-
-
+
-
-        $ftp_max = $rs->fields['domain_ftpacc_limit'];
@@ -1061 +1066 @@
-        $sql_db_max = $rs->fields['domain_sqld_limit'];
-
-
-
-
+
+
-
-        $sql_user_max = $rs->fields['domain_sqlu_limit'];
@@ -1071 +1075 @@
-        $disk_max = $rs->fields['domain_disk_limit'];
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-}
-
@@ -2228 +2229 @@
-function gen_purchase_haf(&$tpl, &$sql, $user_id, $encode = false) {
-        global $cfg;
-
+
-        $query = <<<SQL_QUERY
-                        SELECT

trunk/gui/include/client-functions.php

@@ -831 +831 @@
-        // drop desired database;
-        $query = <<<SQL_QUERY
-
-
-
-
-
-
+
+
+
+
-
-        write_log($_SESSION['user_logged'] . ": delete SQL database: " . $db_name);

trunk/gui/include/ispcp-lib.php

@@ -77 +77 @@
-// the following variables are overriden via admin cp
-$cfg['DOMAIN_ROWS_PER_PAGE'] = 10;
- 
+
-// 'reseller' => hosting plans are available only in reseller level
-$cfg['HOSTING_PLANS_LEVEL'] = 'reseller';

trunk/gui/include/login.php

@@ -59 +59 @@
-
-            if (!is_userdomain_ok($uname)) {
- 
+
-                system_message(tr("%s's account status is not ok!", $uname));
-                return false;

trunk/gui/include/reseller-functions.php

@@ -1314 +1314 @@
-        if ($dmn_max != 0) {
-                if ($dmn_current + 1 > $dmn_max) {
- 
+
-                        $error = true;
-                }
@@ -1322 +1322 @@
-                if ($sub_new != -1) {
-                        if ($sub_new == 0) {
- 
+
-                                $error = true;
-                        } else if ($sub_current + $sub_new > $sub_max) {
@@ -1334 +1334 @@
-                if ($als_new != -1) {
-                        if ($als_new == 0) {
- 
+
-                                $error = true;
-                        } else if ($als_current + $als_new > $als_max) {
@@ -1345 +1345 @@
-        if ($mail_max != 0) {
-                if ($mail_new == 0) {
- 
+
-                        $error = true;
-                } else if ($mail_current + $mail_new > $mail_max) {
@@ -1354 +1354 @@
-        if ($ftp_max != 0) {
-                if ($ftp_new == 0) {
- 
+
-                        $error = true;
-                } else if ($ftp_current + $ftp_new > $ftp_max) {
@@ -1365 +1365 @@
-                if ($sql_db_new != -1) {
-                        if ($sql_db_new == 0) {
- 
+
-                                $error = true;
-                        } else if ($sql_db_current + $sql_db_new > $sql_db_max) {
@@ -1377 +1377 @@
-                if ($sql_user_new != -1) {
-                        if ($sql_user_new == 0) {
- 
+
-                                $error = true;
-                        } else if ($sql_db_new == -1) {
- 
+
-                                $error = true;
-                        } else if ($sql_user_current + $sql_user_new > $sql_user_max) {
@@ -1391 +1391 @@
-        if ($traff_max != 0) {
-                if ($traff_new == 0) {
- 
+
-                        $error = true;
-                } else if ($traff_current + $traff_new > $traff_max) {
@@ -1401 +1401 @@
-        if ($disk_max != 0) {
-                if ($disk_new == 0) {
- 
+
-      &