Changeset 751

Timestamp:

08/19/07 06:18:24 (1 year ago)

Author:

raphael

Message:

Fixed #571: mod_cband's limit is not updated when limit is change in the GUI
Fixed some i18n issues
Fixed #562: Disable Named/Bind
Fixed #575: Update german translation with old submission at mailinglist
Merged French translation with Greg's

Files:

• trunk/CHANGELOG (modified) (1 diff)
• trunk/engine/ispcp-als-mngr (modified) (3 diffs)
• trunk/engine/ispcp-dmn-mngr (modified) (2 diffs)
• trunk/engine/ispcp-sub-mngr (modified) (3 diffs)
• trunk/engine/setup/ispcp-setup (modified) (3 diffs)
• trunk/gui/admin/index.php (modified) (1 diff)
• trunk/gui/admin/reseller_statistics.php (modified) (1 diff)
• trunk/gui/admin/reseller_user_statistics.php (modified) (4 diffs)
• trunk/gui/reseller/edit_domain.php (modified) (3 diffs)
• trunk/gui/reseller/index.php (modified) (3 diffs)
• trunk/gui/reseller/reseller_user_statistics.php (modified) (2 diffs)
• trunk/gui/themes/omega_original/admin/index.tpl (modified) (1 diff)
• trunk/gui/themes/omega_original/admin/reseller_statistics.tpl (modified) (2 diffs)
• trunk/gui/themes/omega_original/admin/reseller_user_statistics.tpl (modified) (2 diffs)
• trunk/gui/themes/omega_original/reseller/reseller_user_statistics.tpl (modified) (2 diffs)
• trunk/language-files/cs_CZ.po (modified) (8 diffs)
• trunk/language-files/da_DK.po (modified) (8 diffs)
• trunk/language-files/de_DE.po (modified) (28 diffs)
• trunk/language-files/en_GB.po (modified) (8 diffs)
• trunk/language-files/es_AR.po (modified) (8 diffs)
• trunk/language-files/es_ES.po (modified) (8 diffs)
• trunk/language-files/fr_FR.po (modified) (131 diffs)
• trunk/language-files/hu_HU.po (modified) (8 diffs)
• trunk/language-files/ispCP.pot (modified) (7 diffs)
• trunk/language-files/it_IT.po (modified) (8 diffs)
• trunk/language-files/ja_JP.po (modified) (8 diffs)
• trunk/language-files/nl_NL.po (modified) (8 diffs)
• trunk/language-files/pl_PL.po (modified) (8 diffs)
• trunk/language-files/pt_BR.po (modified) (8 diffs)
• trunk/language-files/ro_RO.po (modified) (8 diffs)
• trunk/language-files/ru_RU.po (modified) (8 diffs)
• trunk/language-files/sk_SK.po (modified) (8 diffs)
• trunk/language-files/th_TH.po (modified) (8 diffs)
• trunk/language-files/tr_TR.po (modified) (8 diffs)
• trunk/language-files/uk_UA.po (modified) (8 diffs)

trunk/CHANGELOG

@@ -8 +8 @@
-
-2007-08-18 Raphael Geissert
+    - GUI:
+        * Fixed #571: mod_cband's limit is not updated when limit is change in the GUI
+        * Fixed some i18n issues
-    - SETUP:
-        * Fixed #573: Local name server in /etc/resolv.conf allows hijacking
+        * Fixed #562: Disable Named/Bind
-    - CONFIGS:
-        * Fixed #578: ERROR 1170 (42000) at line 18: BLOB/TEXT column 'msgid' used in key specification without a key length
+    - ENGINE:
+        * Fixed #562: Disable Named/Bind
+    - LANGUAGES:
+        * Fixed #575: Update german translation with old submission at mailinglist
+        * Merged French translation with Greg's
-
-2007-08-17 Raphael Geissert

trunk/engine/ispcp-als-mngr

@@ -728 +728 @@
-    }
-
+    return 0 if ($main::cfg{'CMD_NAMED'} eq 'no');
+
-    $rs = als_add_named_cfg_data($als_data);
-
@@ -757 +759 @@
-    }
-
+    return 0 if ($main::cfg{'CMD_NAMED'} eq 'no');
+
-    $rs = als_add_named_data($als_data);
-
@@ -781 +785 @@
-
-    }
+
+    return 0 if ($main::cfg{'CMD_NAMED'} eq 'no');
-
-    $rs = als_del_named_cfg_data($als_data);

trunk/engine/ispcp-dmn-mngr

@@ -743 +743 @@
-    }
-
+    return 0 if ($main::cfg{'CMD_NAMED'} eq 'no');
+
-    $rs = dmn_add_named_cfg_data($dmn_data);
-
@@ -806 +808 @@
-
-    }
+
+    return 0 if ($main::cfg{'CMD_NAMED'} eq 'no');
-
-    $rs = dmn_del_named_cfg_data($dmn_data);

trunk/engine/ispcp-sub-mngr

@@ -533 +533 @@
-    }
-
+    return 0 if ($main::cfg{'CMD_NAMED'} eq 'no');
+
-    $rs = sub_add_named_cfg_data($sub_data);
-
@@ -559 +561 @@
-    }
-
+    return 0 if ($main::cfg{'CMD_NAMED'} eq 'no');
+
-    $rs = sub_add_named_cfg_data($sub_data);
-
@@ -584 +588 @@
-
-    }
+
+    return 0 if ($main::cfg{'CMD_NAMED'} eq 'no');
-
-    $rs = sub_del_named_cfg_data($sub_data);

trunk/engine/setup/ispcp-setup

@@ -576 +576 @@
-        my $vhost = "admin.$addr";
-
-
+where 
-
-        print STDOUT $qmsg;
@@ -1677 +1677 @@
-        my ($cfg_tpl, $cfg, $cmd) = (undef, undef, undef);
-
-
-
-
-
-
+
+
+
-
-        ($rs, $cfg_tpl) = get_file("$cfg_dir/named.conf");
@@ -1715 +1713 @@
-        return $rs if ($rs != 0);
-
-
-
-
-
-
+
-
-        push_el(\@main::el, 'setup_named()', 'Ending...');

trunk/gui/admin/index.php

@@ -171 +171 @@
-    $tpl -> assign(
-            array(
-
-
-
-
+
-                    'BAR_VALUE' => $bar_value,
-                    )

trunk/gui/admin/reseller_statistics.php

@@ -299 +299 @@
-                            'TRAFF_SHOW_PERCENT' => $traff_show_percent,
-                                                        'TRAFF_PERCENT' => $traff_percent,
-
-
-
+
+
+
+
-
-                            'DISK_SHOW_PERCENT' => $disk_show_percent,
-                                                        'DISK_PERCENT' => $disk_percent,
-
-CURRENT' => make_hr($rdisk_current),
-'DISK_MAX' => ($rdisk_max) ? make_hr($rdisk_max) : tr('unlimited'),
-
-
-CURRENT' => $rdmn_current,
-'DMN_MAX' => ($rdmn_max) ? $rdmn_max : tr('unlimited'),
-
-
-CURRENT' => $rsub_current,
-'SUB_MAX' => ($rsub_max) ? $rsub_max : tr('unlimited'),
-
-
-CURRENT' => $rals_current,
-'ALS_MAX' => ($rals_max) ? $rals_max : tr('unlimited'),
-
-
-CURRENT' => $rmail_current,
-'MAIL_MAX' => ($rmail_max) ? $rmail_max : tr('unlimited'),
-
-
-CURRENT' => $rftp_current,
-'FTP_MAX' => ($rftp_max) ? $rftp_max : tr('unlimited'),
-
-
-CURRENT' => $rsql_db_current,
-'SQL_DB_MAX' => ($rsql_db_max) ? $rsql_db_max : tr('unlimited'),
-'TR_OF' => tr('of'
-
-USED' => $usql_user_current,
-'SQL_USER_CURRENT' => $rsql_user_current,
-'SQL_USER_MAX' => ($rsql_user_max) ? $rsql_user_max : tr('unlimited'
+
+MSG' => ($rdisk_max) ?
+                tr('%1$d / %2$d <br/>of<br/> <b>%3$d</b>', make_hr($udisk_current), make_hr($rdisk_current), make_hr($rdisk_max)):
+
+
+MSG' => ($rdmn_max) ?
+                tr('%1$d / %2$d <br/>of<br/> <b>%3$d</b>', $udmn_current, $rdmn_current, $rdmn_max):
+
+
+MSG' => ($rsub_max) ?
+                tr('%1$d / %2$d <br/>of<br/> <b>%3$d</b>', $usub_current, $rsub_current, $rsub_max):
+
+
+MSG' => ($rals_max) ?
+                tr('%1$d / %2$d <br/>of<br/> <b>%3$d</b>', $uals_current, $rals_current, $rals_max):
+
+
+MSG' => ($rmail_max) ?
+                tr('%1$d / %2$d <br/>of<br/> <b>%3$d</b>', $umail_current, $rmail_current, $rmail_max):
+
+
+MSG' => ($rftp_max) ?
+                tr('%1$d / %2$d <br/>of<br/> <b>%3$d</b>', $uftp_current, $rftp_current, $rftp_max):
+
+
+MSG' => ($rsql_db_max) ?
+                tr('%1$d / %2$d <br/>of<br/> <b>%3$d</b>', $usql_db_current, $rsql_db_current, $rsql_db_max):
+                tr('%1$d / %2$d <br/>of<br/> <b>unlimited</b>', $usql_db_current, $rsql_db_current
+
+MSG' => ($rsql_user_max) ?
+                tr('%1$d / %2$d <br/>of<br/> <b>%3$d</b>', $usql_user_current, $rsql_user_current, $rsql_user_max):
+                tr('%1$d / %2$d <br/>of<br/> <b>unlimited</b>', $usql_user_current, $rsql_user_current
-
-                         )

trunk/gui/admin/reseller_user_statistics.php

@@ -343 +343 @@
-                    'TRAFF_RED' => $traff_red,
-                    'TRAFF_GREEN' => $traff_green,
-
-
+
+
+
+
-
-                    'DISK_SHOW_PERCENT' => $disk_show_percent,
@@ -350 +352 @@
-                    'DISK_RED' => $disk_red,
-                    'DISK_GREEN' => $disk_green,
-
-
+
+
+
+
-
-                    'WEB' => make_hr($web),
@@ -358 +362 @@
-                    'POP3' => make_hr($pop3),
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-                    )
@@ -410 +428 @@
-                            'TR_SQL_DB' => tr('SQL<br>database'),
-                            'TR_SQL_USER' => tr('SQL<br>user'),
-                            'TR_OF' => tr('of'),
-
-                            'VALUE_NAME' => $name,

trunk/gui/reseller/edit_domain.php

@@ -317 +317 @@
-
-
-// Function to update changes into db
-function update_data_in_db($hpid)
-{
-        global $domain_name, $domain_ip, $php_sup;
-        global $cgi_supp ,$sub, $als;
-        global $mail, $ftp, $sql_db;
-        global $sql_user, $traff, $disk;
-        global $username, $domain_php, $domain_cgi;
-
-        $user_props  = "$usub_current;$usub_max;";
-        $user_props .= "$uals_current;$uals_max;";
-        $user_props .= "$umail_current;$umail_max;";
-        $user_props .= "$uftp_current;$uftp_max;";
-        $user_props .= "$usql_db_current;$usql_db_max;";
-        $user_props .= "$usql_user_current;$usql_user_max;";
-        $user_props .= "$utraff_max;";
-        $user_props .= "$udisk_max;";
-        //$user_props .= "$domain_ip;";
-        $user_props .= "$domain_php;";
-        $user_props .= "$domain_cgi;";
-
-        update_user_props($user_id, $user_props);
-
-        $reseller_props  = "$rdmn_current;$rdmn_max;";
-        $reseller_props .= "$rsub_current;$rsub_max;";
-        $reseller_props .= "$rals_current;$rals_max;";
-        $reseller_props .= "$rmail_current;$rmail_max;";
-        $reseller_props .= "$rftp_current;$rftp_max;";
-        $reseller_props .= "$rsql_db_current;$rsql_db_max;";
-        $reseller_props .= "$rsql_user_current;$rsql_user_max;";
-        $reseller_props .= "$rtraff_current;$rtraff_max;";
-        $reseller_props .= "$rdisk_current;$rdisk_max;";
-
-        update_reseller_props($reseller_id, $reseller_props);
-
-        //$tpl -> assign('MESSAGE', tr('Domain properties updated successfully!'));
-
-        unset($_SESSION['edit_id']);
-        set_page_message(tr('Domain properties updated successfully!'));
-        Header("Location: users.php");
-        die();
-}// End of update_data_in_db()
-
-
-//Check input data
-function check_user_data ( &$tpl, &$sql, $reseller_id, $user_id) {
@@ -426 +382 @@
-           $usql_user_current, $usql_user_max,
-           $utraff_max, $udisk_max) = generate_user_props($user_id);
+
+    $previous_utraff_max = $utraff_max;
-
-    list (
@@ -503 +461 @@
-    if ($ed_error == '_off_') {
-
+        //
+        // Set domain's status to 'change' to update mod_cband's limit
+        //
+        if ($previous_utraff_max != $utraff_max) {
+            $query = "UPDATE domain SET domain_status = 'change' WHERE domain_id = ?";
+            exec_query($sql, $query, array($user_id));
+        }
+
-        $user_props  = "$usub_current;$usub_max;";
-        $user_props .= "$uals_current;$uals_max;";

trunk/gui/reseller/index.php

@@ -56 +56 @@
-        list($percent, $bars) = calc_bars($usage, $max_usage, $bars_max);
-                $max_usage = sizeit($max_usage);
+                $traffic_usage_data = tr('%1$s%% [%2$s of %3$s]', $percent, sizeit($usage), $max_usage);
-        }
-
@@ -61 +62 @@
-                $percent        = 0;
-                $bars           = 0;
-
-
-
-
+
+
-
-    $tpl -> assign(
@@ -147 +146 @@
-    gen_disk_usage($tpl, $udisk_current, $rdisk_max, 400);
-
-
-
-
-
+
+
-            $tpl -> assign(
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-        } else {
-            $tpl -> assign('TRAFF_WARN', '');
-        }
+
+    } else {
+        $tpl -> assign('TRAFF_WARN', '');
-    }
-
-
-        //warning HDD Usage
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-

trunk/gui/reseller/reseller_user_statistics.php

@@ -218 +218 @@
-                       'YEAR' => $crnt_year,
-                       'DOMAIN_ID' => $domain_id,
-
+
-                       'TRAFF_SHOW_PERCENT' => $traff_show_percent,
+                                           'TRAFF_PERCENT' => $traff_percent,
-                       'TRAFF_RED' => $traff_red,
-                       'TRAFF_GREEN' => $traff_green,
-
-
-
+
+
+
+
+
-                       'DISK_SHOW_PERCENT' => $disk_show_percent,
+                               'DISK_PERCENT' => $disk_percent,
-                       'DISK_RED' => $disk_red,
-                       'DISK_GREEN' => $disk_green,
-
-
+
+
+
+
+
-                       'WEB' => make_hr($web),
-                       'FTP' => make_hr($ftp),
-                       'SMTP' => make_hr($smtp),
-                       'POP3' => make_hr($pop3),
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -280 +308 @@
-                            'TR_SQL_DB' => tr('SQL<br>database'),
-                            'TR_SQL_USER' => tr('SQL<br>user'),
-                            'TR_OF' => tr('of'),
-
-                            'VALUE_NAME' => $name,

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

@@ -145 +145 @@
-      <tr>
-        <td width="25">&nbsp;</td>
-PERCENT} % [{VALUE} {TR_OF} {MAX_VALUE}]
+TRAFFIC_WARNING}
-      </tr>
-      <tr>

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

@@ -101 +101 @@
-                                </table>
-                                  <b>{TRAFF_SHOW_PERCENT}&nbsp;%</b><br />
-
-
-
+
-                              <td class="{ITEM_CLASS}" nowrap="nowrap" align="center" valign="top"><table width="100%" border="0" cellspacing="0" cellpadding="0">
-                                  <tr>
@@ -118 +116 @@
-                                </table>
-                                  <b>{DISK_SHOW_PERCENT}&nbsp;%</b><br />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-                            </tr>
-                            <!-- EDP: reseller_entry -->

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

@@ -109 +109 @@
-                                        </table>
-                                          <b>{TRAFF_SHOW_PERCENT}&nbsp;%</b><br />
-
-
-
+
-                                      <td class="{ITEM_CLASS}" nowrap="nowrap" align="center" valign="top"><table width="100%" border="0" cellspacing="0" cellpadding="0">
-                                          <tr>
@@ -126 +124 @@
-                                        </table>
-                                          <b>{DISK_SHOW_PERCENT}&nbsp;%</b><br />
-
-
-
+
-                                      <td class="{ITEM_CLASS}" nowrap="nowrap" align="center">{WEB}</td>
-                                      <td class="{ITEM_CLASS}" nowrap="nowrap" align="center">{FTP}</td>
-                                      <td class="{ITEM_CLASS}" nowrap="nowrap" align="center">{SMTP}</td>
-                                      <td class="{ITEM_CLASS}" nowrap="nowrap" align="center">{POP3}</td>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+