Changeset 1152

Timestamp:

05/15/08 12:46:49 (2 months ago)

Author:

kilburn

Message:

* Fixed #1254: Admin level hosting plans option is not working

Files:

• trunk/CHANGELOG (modified) (1 diff)
• trunk/gui/admin/ahp.php (modified) (5 diffs)
• trunk/gui/admin/dhp.php (modified) (2 diffs)
• trunk/gui/admin/ehp.php (modified) (4 diffs)
• trunk/gui/admin/hp.php (modified) (9 diffs)
• trunk/gui/admin/manage_users.php (modified) (1 diff)
• trunk/gui/include/admin-functions.php (modified) (1 diff)
• trunk/gui/include/reseller-functions.php (modified) (1 diff)
• trunk/gui/reseller/ahp.php (modified) (2 diffs)
• trunk/gui/reseller/ehp.php (modified) (1 diff)
• trunk/gui/reseller/hp.php (modified) (10 diffs)
• trunk/gui/reseller/rau1.php (modified) (1 diff)
• trunk/gui/reseller/rau3.php (modified) (1 diff)
• trunk/gui/reseller/users.php (modified) (1 diff)
• trunk/gui/themes/omega_original/admin/ahp.tpl (modified) (1 diff)
• trunk/gui/themes/omega_original/admin/ehp.tpl (modified) (2 diffs)
• trunk/gui/themes/omega_original/admin/hp.tpl (modified) (1 diff)
• trunk/gui/themes/omega_original/admin/main_menu_general_information.tpl (modified) (1 diff)
• trunk/gui/themes/omega_original/admin/main_menu_manage_users.tpl (modified) (1 diff)
• trunk/gui/themes/omega_original/admin/main_menu_settings.tpl (modified) (1 diff)
• trunk/gui/themes/omega_original/admin/main_menu_statistics.tpl (modified) (1 diff)
• trunk/gui/themes/omega_original/admin/main_menu_support_system.tpl (modified) (1 diff)
• trunk/gui/themes/omega_original/admin/main_menu_system_tools.tpl (modified) (1 diff)
• trunk/gui/themes/omega_original/admin/manage_users.tpl (modified) (2 diffs)
• trunk/gui/themes/omega_original/reseller/edit_domain.tpl (modified) (1 diff)
• trunk/gui/themes/omega_original/reseller/ehp.tpl (modified) (1 diff)
• trunk/gui/themes/omega_original/reseller/menu_hp.tpl (modified) (2 diffs)

trunk/CHANGELOG

@@ -1 +1 @@
-ispCP ω 1.0.0 Changelog
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+2008-05-15 Marc Pujol
+        - GUI
+                * Fixed #1254: Admin level hosting plans are not working
-
-2008-05-13 Benedikt Heintel

trunk/gui/admin/ahp.php

@@ -23 +23 @@
-check_login(__FILE__);
-
-$cfg['HOSTING_PLANS_LEVEL'] != strtolower('admin')
+strtolower($cfg['HOSTING_PLANS_LEVEL']) != 'admin'
-        header("Location: index.php");
-        die();
@@ -31 +31 @@
-$tpl->define_dynamic('page', $cfg['ADMIN_TEMPLATE_PATH'] . '/ahp.tpl');
-$tpl->define_dynamic('page_message', 'page');
-
+
-$theme_color = $cfg['USER_INITIAL_THEME'];
-
@@ -123 +123 @@
-        $tpl->assign('MESSAGE', '');
-} // End of gen_empty_hp_page()
+
-// Show last entered data for new hp
-function gen_data_ahp_page(&$tpl) {
@@ -189 +190 @@
-                $price = 0;
-        } else {
-$_POST['hp_price']
+clean_input($_POST['hp_price'])
-        }
-        if (empty($_POST['hp_setupfee'])) {
-                $setup_fee = 0;
-        } else {
-$_POST['hp_setupfee']
+clean_input($_POST['hp_setupfee'])
-        }
-
@@ -207 +208 @@
-                $hp_cgi = $_POST['cgi'];;
-
-empty($hp_name)
+$hp_name == ''
-                $ahp_error = tr('Incorrect template name length!');
-        }
-
-empty($description)
+$description == ''
-                $ahp_error = tr('Incorrect template description length!');
-        }
-        if (!is_numeric($price)) {
-Incorrect price syntax
+Price must be a number
-        }
-
-        if (!is_numeric($setup_fee)) {
-Incorrect setup fee syntax
+Setup fee must be a number
-        }
-

trunk/gui/admin/dhp.php

@@ -22 +22 @@
-check_login(__FILE__);
-
-
+
+
+
+
+
-$theme_color = $cfg['USER_INITIAL_THEME'];
-
-if(isset($_GET['hpid']) && is_numeric($_GET['hpid']))
-        $hpid = $_GET['hpid'];
-
+ 
-        $_SESSION['hp_deleted'] = '_no_';
-        Header("Location: hp.php");
@@ -33 +37 @@
-}
-
+// Check if there is no order for this plan
+$res = exec_query($sql, "SELECT COUNT(id) FROM orders WHERE plan_id=?", array($hpid));
+$data = $res->FetchRow();
+if ($data['0'] > 0) {
+        $_SESSION['hp_deleted_ordererror'] = '_yes_';
+        header("Location: hp.php");
+        die();
+}
+
-// Try to delete hosting plan from db
-//
-$query = "delete from hosting_plans where id=?";
-$res = exec_query($sql, $query, array($hpid));

trunk/gui/admin/ehp.php

@@ -23 +23 @@
-check_login(__FILE__);
-
-$cfg['HOSTING_PLANS_LEVEL'] != strtolower('admin')
+strtolower($cfg['HOSTING_PLANS_LEVEL']) != 'admin'
-        header("Location: index.php");
-        die();
@@ -32 +32 @@
-$tpl->define_dynamic('page_message', 'page');
-
-global $cfg;
-$theme_color = $cfg['USER_INITIAL_THEME'];
-
@@ -72 +71 @@
-                        'TR_NO' => tr('no'),
-                        'TR_BILLING_PROPS' => tr('Billing Settings'),
-                        'TR_PRICE_STYLE' => tr('Price Style'),
-                        'TR_PRICE' => tr('Price'),
-                        'TR_SETUP_FEE' => tr('Setup fee'),
@@ -79 +77 @@
-                        'TR_STATUS' => tr('Available for purchasing'),
-                        'TR_TEMPLATE_DESCRIPTON' => tr('Description'),
-EL
+LE
-                        'TR_UPDATE_PLAN' => tr('Update plan')));
-

trunk/gui/admin/hp.php

@@ -24 +24 @@
-check_login(__FILE__);
-
-
-
-
+
+
-        die();
-}
@@ -33 +32 @@
-$tpl->define_dynamic('page', $cfg['ADMIN_TEMPLATE_PATH'] . '/hp.tpl');
-$tpl->define_dynamic('page_message', 'page');
-$tpl->define_dynamic('page_message', 'page');
-$tpl->define_dynamic('hosting_plans', 'page');
+
-// Table with hosting plans
-$tpl->define_dynamic('hp_table', 'page');
-$tpl->define_dynamic('hp_entry', 'hp_table');
+$tpl->define_dynamic('hp_delete', 'page');
+$tpl->define_dynamic('hp_menu_add', 'page');
-
-global $cfg;
-$theme_color = $cfg['USER_INITIAL_THEME'];
-
-
-
-
-
+
+
+
+
+
+
-
-/*
@@ -57 +59 @@
-gen_hp_table($tpl, $_SESSION['user_id']);
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-gen_hp_message();
-gen_page_message($tpl);
+
-$tpl->parse('PAGE', 'page');
-$tpl->prnt();
@@ -75 +81 @@
-function gen_hp_message () {
-        // global $externel_event, $hp_added, $hp_deleted, $hp_updated;
-
+
+
-        if (isset($_SESSION["hp_added"]) && $_SESSION["hp_added"] == '_yes_') {
-// 
+
-                set_page_message(tr('Hosting plan added!'));
-                unset($_SESSION["hp_added"]);
@@ -83 +90 @@
-                        unset($GLOBALS['hp_added']);
-        } else if (isset($_SESSION["hp_deleted"]) && $_SESSION["hp_deleted"] == '_yes_') {
-// 
+
-                set_page_message(tr('Hosting plan deleted!'));
-                unset($_SESSION["hp_deleted"]);
@@ -89 +96 @@
-                        unset($GLOBALS['hp_deleted']);
-        } else if (isset($_SESSION["hp_updated"]) && $_SESSION["hp_updated"] == '_yes_') {
-// 
+
-                set_page_message(tr('Hosting plan updated!'));
-                unset($_SESSION["hp_updated"]);
-                if (isset($GLOBALS['hp_updated']))
-                        unset($GLOBALS['hp_updated']);
+        } else if (isset($_SESSION["hp_deleted_ordererror"]) && $_SESSION["hp_deleted_ordererror"] == '_yes_') {
+                //$external_event = '_on_';
+                set_page_message(tr('Hosting plan can\'t be deleted, there are orders!'));
+                unset($_SESSION["hp_deleted_ordererror"]);
-        }
-} // End of gen_hp_message()
+
-// Extract and show data for hosting plans
-function gen_hp_table(&$tpl, $reseller_id) {
@@ -101 +113 @@
-
-        $query = <<<SQL_QUERY
-    
-    
+
+
-                        t2.admin_id, t2.admin_type
-    
-    
+
+
-                        admin AS t2
-    
-    
+
+
-                AND
-                        t1.reseller_id = t2.admin_id
-    
-    
+
+
-SQL_QUERY;
+
-        $rs = exec_query($sql, $query, array('admin'));
-        $tr_edit = tr('Edit');
@@ -123 +136 @@
-                $tpl->assign('HP_TABLE', '');
-        } else { // There are data for hosting plants :-)
-/*if ($GLOBALS['external_event']
+if (isset($external_event) && $external_event
-                        $tpl -> assign('HP_MESSAGE', '');
-*/
+
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-                $i = 1;
@@ -148 +163 @@
-                        }
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                        $tpl->parse('HP_ENTRY', '.hp_entry');
+
-                } // End  loop
+
-                $tpl->parse('HP_TABLE', 'hp_table');
-        }
-} // End of gen_hp_table()
+
-// ******************************
-// END OF FUNCTION DECLARE PATH

trunk/gui/admin/manage_users.php

@@ -106 +106 @@
-gen_admin_menu($tpl, $cfg['ADMIN_TEMPLATE_PATH'] . '/menu_manage_users.tpl');
-
+if (!isset($cfg['HOSTING_PLANS_LEVEL']) || strtolower($cfg['HOSTING_PLANS_LEVEL']) !== 'admin') {
+        $tpl->assign('EDIT_OPTION', '');
+}
+
-get_admin_manage_users($tpl, $sql);
-

trunk/gui/include/admin-functions.php

@@ -723 +723 @@
-                                                'URL_CHANGE_INTERFACE' => "change_user_interface.php?to_id=" . $rs->fields['domain_admin_id'],
-                                                'USR_USERNAME' => $rs->fields['domain_name'],
+                                                'TR_EDIT_DOMAIN' => tr('Edit domain'),
+                                                'TR_EDIT_USR' => tr('Edit user'),
-                                                )
-                                        );

trunk/gui/include/reseller-functions.php

@@ -195 +195 @@
-        if (!$cfg['ISPCP_SUPPORT_SYSTEM']) {
-                $tpl->assign('ISACTIVE_SUPPORT', '');
+        }
+        if (isset($cfg['HOSTING_PLANS_LEVEL']) && strtolower($cfg['HOSTING_PLANS_LEVEL']) === 'admin') {
+                $tpl->assign('HP_MENU_ADD', '');
-        }
-

trunk/gui/reseller/ahp.php

@@ -23 +23 @@
-check_login(__FILE__);
-
-$cfg['HOSTING_PLANS_LEVEL'] == strtolower('admin')
+strtolower($cfg['HOSTING_PLANS_LEVEL']) == 'admin'
-        Header("Location: hp.php");
-
-        die();
-}
@@ -302 +301 @@
-
-                                $_SESSION['hp_added'] = '_yes_';
-e
+
-                                die();
-                        }

trunk/gui/reseller/ehp.php

@@ -77 +77 @@
-                        'TR_STATUS' => tr('Available for purchasing'),
-                        'TR_TEMPLATE_DESCRIPTON' => tr('Description'),
-EL
+LE
-                        'TR_EDIT_HOSTING_PLAN' => tr('Update plan'),
-                        'TR_UPDATE_PLAN' => tr('Update plan')

trunk/gui/reseller/hp.php

@@ -12 +12 @@
- *   This program is free software; you can redistribute it and/or modify it under
- *   the terms of the MPL General Public License as published by the Free Software
-1
+2
- *   version.
- *   You should have received a copy of the MPL Mozilla Public License along with
@@ -28 +28 @@
-$tpl->define_dynamic('page_message', 'page');
-$tpl->define_dynamic('logged_from', 'page');
+
-// Table with hosting plans
-$tpl->define_dynamic('hp_table', 'page');
@@ -36 +37 @@
-$theme_color = $cfg['USER_INITIAL_THEME'];
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-/*
@@ -53 +52 @@
-gen_reseller_mainmenu($tpl, $cfg['RESELLER_TEMPLATE_PATH'] . '/main_menu_hp.tpl');
-gen_reseller_menu($tpl, $cfg['RESELLER_TEMPLATE_PATH'] . '/menu_hp.tpl');
-
-gen_logged_from($tpl);
-
-gen_hp_table($tpl, $_SESSION['user_id']);
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-gen_hp_message($tpl);
@@ -77 +72 @@
-$tpl->prnt();
-
-H
+
-
-function gen_hp_message (&$tpl) {
@@ -101 +96 @@
-                if (isset($GLOBALS['hp_updated']))
-                        unset($GLOBALS['hp_updated']);
-
-
+
-                //$external_event = '_on_';
-                set_page_message(tr('Hosting plan can\'t be deleted, there are orders!'));
@@ -113 +107 @@
-        global $sql, $cfg, $external_event;
-
-$cfg['HOSTING_PLANS_LEVEL']
+strtolower($cfg['HOSTING_PLANS_LEVEL'])
-                $query = <<<SQL_QUERY
-                SELECT
@@ -159 +153 @@
-                }
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-                $i = 1;
@@ -180 +176 @@
-                        }
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                        $tpl->parse('HP_ENTRY', '.hp_entry');
+
-                } // End  loop
+
-                $tpl->parse('HP_TABLE', 'hp_table');
-        }
@@ -196 +196 @@
-// END OF FUNCTION DECLARE PATH
-// *****************************
-
-
+
-
-unset_messages();

trunk/gui/reseller/rau1.php

@@ -115 +115 @@
-        }
-        // we have plans only for admins
-$cfg['HOSTING_PLANS_LEVEL']
+strtolower($cfg['HOSTING_PLANS_LEVEL'])
-                $dmn_pt = '_no_';
-        }

trunk/gui/reseller/rau3.php

@@ -214 +214 @@
-                unset($_SESSION["ch_hpprops"]);
-        } else {
-
-
+
+
+
+
+
+
+
-                $data = $res->FetchRow();
-                $props = $data['props'];

trunk/gui/reseller/users.php

@@ -122 +122 @@
-        );
-
-$cfg['HOSTING_PLANS_LEVEL']
+strtolower($cfg['HOSTING_PLANS_LEVEL'])
-        $tpl->assign('EDIT_OPTION', '');
-}

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

@@ -35 +35 @@
-</tr>
-        <tr>
-SUB_
+
-            <td colspan=2 style="vertical-align: top;"><table style="width: 100%; border-collapse: collapse;padding:0;margin:0;">
-                                <tr height="95";>

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

@@ -28 +28 @@
-</tr>
-        <tr>
-SUB_
+
-            <td colspan=2 style="vertical-align: top;"><table style="width: 100%; border-collapse: collapse;padding:0;margin:0;">
-                                <tr height="95";>
@@ -149 +149 @@
-                            <tr>
-                              <td>&nbsp;</td>
-CURRENCY
+VALUE
-                              <td class="content"><input name="hp_currency" {READONLY} type="text" class="textinput" id="hp_currency" style="width:100px" value="{HP_CURRENCY}">
-EL
+LE
-                            </tr>
-                            <tr>

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

@@ -28 +28 @@
-</tr>
-        <tr>
-SUB_
+
-            <td colspan=2 style="vertical-align: top;"><table style="width: 100%; border-collapse: collapse;padding:0;margin:0;">
-                                <tr height="95";>

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

@@ -15 +15 @@
-    <td class="menu"><div align="center"><a href="manage_users.php" class="menu_active" onMouseOver="MM_swapImage('manage_users','','{THEME_COLOR_PATH}/images/icons/manage_users_a.gif',1)" onMouseOut="MM_swapImgRestore()">{TR_MENU_MANAGE_USERS}</a></div></td>
-  </tr>
+<!-- BDP: hosting_plans -->
+</table></td>
+    <td width="30">&nbsp;</td>
+    <td><table width="100%" border="0" cellspacing="0" cellpadding="0">
+<tr>
+      <td class="menu"><div align="center"><a href="hp.php" onMouseOver="MM_swapImage('hosting_plans','','{THEME_COLOR_PATH}/images/icons/hosting_plans_a.gif',1)" onMouseOut="MM_swapImgRestore()"><img src="{THEME_COLOR_PATH}/images/icons/hosting_plans.gif" name="hosting_plans" width="47" height="46" border="0" id="hosting_plans" /></a></div></td>
+  </tr><tr>
+    <td class="menu"><div align="center"><a href="hp.php" class="menu_active" onMouseOver="MM_swapImage('hosting_plans','','{THEME_COLOR_PATH}/images/icons/hosting_plans_a.gif',1)" onMouseOut="MM_swapImgRestore()">{TR_MENU_HOSTING_PLANS}</a></div></td>
+  </tr>
+<!-- EDP: hosting_plans -->
-</table></td>
-    <td width="30">&nbsp;</td>

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

@@ -15 +15 @@
-    <td class="menu"><div align="center"><a href="manage_users.php" class="menu_active" onMouseOver="MM_swapImage('manage_users','','{THEME_COLOR_PATH}/images/icons/manage_users_a.gif',1)" onMouseOut="MM_swapImgRestore()">{TR_MENU_MANAGE_USERS}</a></div></td>
-  </tr>
+<!-- BDP: hosting_plans -->
+</table></td>
+    <td width="30">&nbsp;</td>
+    <td><table width="100%" border="0" cellspacing="0" cellpadding="0">
+<tr>
+      <td class="menu"><div align="center"><a href="hp.php" onMouseOver="MM_swapImage('hosting_plans','','{THEME_COLOR_PATH}/images/icons/hosting_plans_a.gif',1)" onMouseOut="MM_swapImgRestore()"><img src="{THEME_COLOR_PATH}/images/icons/hosting_plans.gif" name="hosting_plans" width="47" height="46" border="0" id="hosting_plans" /></a></div></td>
+  </tr><tr>
+    <td class="menu"><div align="center"><a href="hp.php" class="menu_active" onMouseOver="MM_swapImage('hosting_plans','','{THEME_COLOR_PATH}/images/icons/hosting_plans_a.gif',1)" onMouseOut="MM_swapImgRestore()">{TR_MENU_HOSTING_PLANS}</a></div></td>
+  </tr>
+<!-- EDP: hosting_plans -->
-</table></td>
-    <td width="30">&nbsp;</td>

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

@@ -15 +15 @@
-    <td class="menu"><div align="center"><a href="manage_users.php" class="menu_active" onMouseOver="MM_swapImage('manage_users','','{THEME_COLOR_PATH}/images/icons/manage_users_a.gif',1)" onMouseOut="MM_swapImgRestore()">{TR_MENU_MANAGE_USERS}</a></div></td>
-  </tr>
+<!-- BDP: hosting_plans -->
+</table></td>
+    <td width="30">&nbsp;</td>
+    <td><table width="100%" border="0" cellspacing="0" cellpadding="0">
+<tr>
+      <td class="menu"><div align="center"><a href="hp.php" onMouseOver="MM_swapImage('hosting_plans','','{THEME_COLOR_PATH}/images/icons/hosting_plans_a.gif',1)" onMouseOut="MM_swapImgRestore()"><img src="{THEME_COLOR_PATH}/images/icons/hosting_plans.gif" name="hosting_plans" width="47" height="46" border="0" id="hosting_plans" /></a></div></td>
+  </tr><tr>
+    <td class="menu"><div align="center"><a href="hp.php" class="menu_active" onMouseOver="MM_swapImage('hosting_plans','','{THEME_COLOR_PATH}/images/icons/hosting_plans_a.gif',1)" onMouseOut="MM_swapImgRestore()">{TR_MENU_HOSTING_PLANS}</a></div></td>
+  </tr>
+<!-- EDP: hosting_plans -->
-</table></td>
-    <td width="30">&nbsp;</td>

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

@@ -15 +15 @@
-    <td class="menu"><div align="center"><a href="manage_users.php" class="menu_active" onMouseOver="MM_swapImage('manage_users','','{THEME_COLOR_PATH}/images/icons/manage_users_a.gif',1)" onMouseOut="MM_swapImgRestore()">{TR_MENU_MANAGE_USERS}</a></div></td>
-  </tr>
+<!-- BDP: hosting_plans -->
+</table></td>
+    <td width="30">&nbsp;</td>
+    <td><table width="100%" border="0" cellspacing="0" cellpadding="0">
+<tr>
+      <td class="menu"><div align="center"><a href="hp.php" onMouseOver="MM_swapImage('hosting_plans','','{THEME_COLOR_PATH}/images/icons/hosting_plans_a.gif',1)" onMouseOut="MM_swapImgRestore()"><img src="{THEME_COLOR_PATH}/images/icons/hosting_plans.gif" name="hosting_plans" width="47" height="46" border="0" id="hosting_plans" /></a></div></td>
+  </tr><tr>
+    <td class="menu"><div align="center"><a href="hp.php" class="menu_active" onMouseOver="MM_swapImage('hosting_plans','','{THEME_COLOR_PATH}/images/icons/hosting_plans_a.gif',1)" onMouseOut="MM_swapImgRestore()">{TR_MENU_HOSTING_PLANS}</a></div></td>
+  </tr>
+<!-- EDP: hosting_plans -->
-</table></td>
-    <td width="30">&nbsp;</td>

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

@@ -15 +15 @@
-    <td class="menu"><div align="center"><a href="manage_users.php" class="menu_active" onMouseOver="MM_swapImage('manage_users','','{THEME_COLOR_PATH}/images/icons/manage_users_a.gif',1)" onMouseOut="MM_swapImgRestore()">{TR_MENU_MANAGE_USERS}</a></div></td>
-  </tr>
+<!-- BDP: hosting_plans -->
+</table></td>
+    <td width="30">&nbsp;</td>
+    <td><table width="100%" border="0" cellspacing="0" cellpadding="0">
+<tr>
+      <td class="menu"><div align="center"><a href="hp.php" onMouseOver="MM_swapImage('hosting_plans','','{THEME_COLOR_PATH}/images/icons/hosting_plans_a.gif',1)" onMouseOut="MM_swapImgRestore()"><img src="{THEME_COLOR_PATH}/images/icons/hosting_plans.gif" name="hosting_plans" width="47" height="46" border="0" id="hosting_plans" /></a></div></td>
+  </tr><tr>
+    <td class="menu"><div align="center"><a href="hp.php" class="menu_active" onMouseOver="MM_swapImage('hosting_plans','','{THEME_COLOR_PATH}/images/icons/hosting_plans_a.gif',1)" onMouseOut="MM_swapImgRestore()">{TR_MENU_HOSTING_PLANS}</a></div></td>
+  </tr>
+<!-- EDP: hosting_plans -->
-</table></td>
-    <td width="30">&nbsp;</td>

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

@@ -15 +15 @@
-    <td class="menu"><div align="center"><a href="manage_users.php" class="menu_active" onMouseOver="MM_swapImage('manage_users','','{THEME_COLOR_PATH}/images/icons/manage_users_a.gif',1)" onMouseOut="MM_swapImgRestore()">{TR_MENU_MANAGE_USERS}</a></div></td>
-  </tr>
+<!-- BDP: hosting_plans -->
+</table></td>
+    <td width="30">&nbsp;</td>
+    <td><table width="100%" border="0" cellspacing="0" cellpadding="0">
+<tr>
+      <td class="menu"><div align="center"><a href="hp.php" onMouseOver="MM_swapImage('hosting_plans','','{THEME_COLOR_PATH}/images/icons/hosting_plans_a.gif',1)" onMouseOut="MM_swapImgRestore()"><img src="{THEME_COLOR_PATH}/images/icons/hosting_plans.gif" name="hosting_plans" width="47" height="46" border="0" id="hosting_plans" /></a></div></td>
+  </tr><tr>
+    <td class="menu"><div align="center"><a href="hp.php" class="menu_active" onMouseOver="MM_swapImage('hosting_plans','','{THEME_COLOR_PATH}/images/icons/hosting_plans_a.gif',1)" onMouseOut="MM_swapImgRestore()">{TR_MENU_HOSTING_PLANS}</a></div></td>
+  </tr>
+<!-- EDP: hosting_plans -->
-</table></td>
-    <td width="30">&nbsp;</td>

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

@@ -222 +222 @@
-          <td width="100" align="center" class="content3"><b>{TR_CREATED_ON}</b></td>
-          <td width="100" align="center" class="content3"><b>{TR_USR_CREATED_BY}</b></td>
-4
+