Development

Navigation

← Previous Changeset
Next Changeset →

Changeset 1008

Timestamp:

02/18/08 15:09:13 (10 months ago)

Author:

rats

Message:

* Fixed #970: The uninstaller should not remove /var/www/virtual ...
* Fixed #982: Problem with autogenerated password
* Refactored menus for admin, reseller, client

Files:

trunk/CHANGELOG (modified) (1 diff)
trunk/configs/ispcp.conf (modified) (2 diffs)
trunk/engine/setup/ispcp-setup-methods.pl (modified) (2 diffs)
trunk/engine/setup/ispcp-uninstall (modified) (2 diffs)
trunk/gui/admin/server_statistic.php (modified) (5 diffs)
trunk/gui/include/admin-functions.php (modified) (5 diffs)
trunk/gui/include/client-functions.php (modified) (1 diff)
trunk/gui/include/ispcp-config.php (modified) (3 diffs)
trunk/gui/include/reseller-functions.php (modified) (3 diffs)
trunk/gui/themes/omega_original/admin/menu_general_information.tpl (modified) (1 diff)
trunk/gui/themes/omega_original/admin/menu_manage_users.tpl (modified) (2 diffs)
trunk/gui/themes/omega_original/admin/menu_settings.tpl (modified) (1 diff)
trunk/gui/themes/omega_original/admin/menu_statistics.tpl (modified) (1 diff)
trunk/gui/themes/omega_original/admin/menu_support_system.tpl (modified) (1 diff)
trunk/gui/themes/omega_original/admin/menu_system_tools.tpl (modified) (1 diff)
trunk/gui/themes/omega_original/client/menu_email_accounts.tpl (modified) (2 diffs)
trunk/gui/themes/omega_original/client/menu_ftp_accounts.tpl (modified) (2 diffs)
trunk/gui/themes/omega_original/client/menu_general_information.tpl (modified) (2 diffs)
trunk/gui/themes/omega_original/client/menu_manage_domains.tpl (modified) (2 diffs)
trunk/gui/themes/omega_original/client/menu_manage_sql.tpl (modified) (2 diffs)
trunk/gui/themes/omega_original/client/menu_statistics.tpl (modified) (2 diffs)
trunk/gui/themes/omega_original/client/menu_support_system.tpl (modified) (2 diffs)
trunk/gui/themes/omega_original/client/menu_webtools.tpl (modified) (2 diffs)
trunk/gui/themes/omega_original/reseller/menu_general_information.tpl (modified) (2 diffs)
trunk/gui/themes/omega_original/reseller/menu_hp.tpl (modified) (2 diffs)
trunk/gui/themes/omega_original/reseller/menu_manage_users.tpl (modified) (2 diffs)
trunk/gui/themes/omega_original/reseller/menu_orders.tpl (modified) (2 diffs)
trunk/gui/themes/omega_original/reseller/menu_statistics.tpl (modified) (2 diffs)
trunk/gui/themes/omega_original/reseller/menu_support_system.tpl (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/CHANGELOG

r1007	r1008
9	9	* Fixed #1035: Hide "Manage Domains"-icon
10	10	* Fixed #1053: awstats path doesnt work
	11	* Refactored menus for admin, reseller, client
	12	- SETUP:
	13	* Fixed #970: The uninstaller should not remove /var/www/virtual ...
	14	* Fixed #982: Problem with autogenerated password
11	15	- DISTS:
12	16	* Dropped support for SLES (9)

trunk/configs/ispcp.conf

r994	r1008
9	9	#
10	10
11		BuildDate = 20080207
	11	BuildDate = 20080218
12	12
13	13	Version = 1.0.0 RC4 OMEGA
14	14
15		~~VersionH = 1.0~~ Priamos
	15	CodeName = Priamos
16	16
17	17	DEFAULT_ADMIN_ADDRESS =
…	…
346	346	USER_INITIAL_THEME = omega_original
347	347
348		~~ISPCP_LICENSE = ispCP 1.0rc4 OMEGA<br />build: 2008-02-07<br />Priamos~~
349
350	348	FTP_USERNAME_SEPARATOR = @
351	349

trunk/engine/setup/ispcp-setup-methods.pl

r996	r1008
250	250	if (!defined($pass1) \|\| $pass1 eq '') {
251	251	$db_password = gen_sys_rand_num(18);
252		$db_password =~ s/~~'//g;~~;
	252	$db_password =~ s/('\|")//g;
253	253	$main::ua{'db_ftp_password'} = $db_password;
254	254	print STDOUT "\tispCP ftp SQL user password set to: $db_password\n";
…	…
490	490
491	491	$db_password = gen_sys_rand_num(18);
	492	$db_password =~ s/('\|")//g;
492	493	$main::ua{'db_pma_password'} = $db_password;
493	494	print STDOUT "\tphpMyAdmin Control user password set to: $db_password\n";

trunk/engine/setup/ispcp-uninstall

r849	r1008
309	309	push_el(\@main::el, 'uninstall_system_dirs()', 'Starting...');
310	310
311		$rs = del_dir($main::cfg{'APACHE_WWW_DIR'});
312
313		return $rs if ($rs != 0);
	311	// ask to delete directory
	312	$rdata = 'yes';
	313	my $qmsg = "\tDelete ".$main::cfg{'APACHE_WWW_DIR'}."? [yes]: ";
	314	print STDOUT $qmsg;
	315
	316	$rdata = readline(\*STDIN);
	317	chop($rdata);
	318
	319	if ($rdata eq 'yes' \|\| $rdata eq 'y') {
	320	$rs = del_dir($main::cfg{'APACHE_WWW_DIR'});
	321	return $rs if ($rs != 0);
	322	}
314	323
315	324	$rs = del_dir($main::cfg{'APACHE_USERS_LOG_DIR'});
316
317	325	return $rs if ($rs != 0);
318	326
319	327	$rs = del_dir($main::cfg{'APACHE_BACKUP_LOG_DIR'});
320
321	328	return $rs if ($rs != 0);
322	329
323	330	$rs = del_dir($main::cfg{'MTA_VIRTUAL_CONF_DIR'});
324
325	331	return $rs if ($rs != 0);
326	332
327	333	$rs = del_dir($main::cfg{'MTA_VIRTUAL_MAIL_DIR'});
328
329	334	return $rs if ($rs != 0);
330	335
331	336	$rs = del_dir($main::cfg{'LOG_DIR'});
332
333	337	return $rs if ($rs != 0);
334	338
335	339	$rs = del_dir($main::cfg{'PHP_STARTER_DIR'});
336
337	340	return $rs if ($rs != 0);
338	341
…	…
340	343
341	344	return 0;
342
343	345	}
344	346

trunk/gui/admin/server_statistic.php

r766	r1008
1	1	<?php
2	2	/**
3		* ispCP (OMEGA) - Virtual Hosting Control System \| Omega Version
4		*
5		* @copyright 2001-2006 by moleSoftware GmbH
6		* @copyright 2006-2007 by ispCP \| http://isp-control.net
7		* @link http://isp-control.net
8		* @author ispCP Team (2007)
9		*
10		* @license
11		* This program is free software; you can redistribute it and/or modify it under
12		* the terms of the MPL General Public License as published by the Free Software
13		* Foundation; either version 1.1 of the License, or (at your option) any later
14		* version.
15		* You should have received a copy of the MPL Mozilla Public License along with
16		* this program; if not, write to the Open Source Initiative (OSI)
17		* http://opensource.org \| osi@opensource.org
18		**/
19
20
	3	* ispCP ω (OMEGA) a Virtual Hosting Control System
	4	*
	5	* @copyright 2001-2006 by moleSoftware GmbH
	6	* @copyright 2006-2008 by ispCP \| http://isp-control.net
	7	* @version SVN: $ID$
	8	* @link http://isp-control.net
	9	* @author ispCP Team
	10	*
	11	* @license
	12	* This program is free software; you can redistribute it and/or modify it under
	13	* the terms of the MPL General Public License as published by the Free Software
	14	* Foundation; either version 1.1 of the License, or (at your option) any later
	15	* version.
	16	* You should have received a copy of the MPL Mozilla Public License along with
	17	* this program; if not, write to the Open Source Initiative (OSI)
	18	* http://opensource.org \| osi@opensource.org
	19	*/
21	20
22	21	require '../include/ispcp-lib.php';
…	…
25	24
26	25	$tpl = new pTemplate();
27		$tpl ~~-> define_dynamic('page', $cfg['ADMIN_TEMPLATE_PATH'].~~'/server_statistic.tpl');
28		$tpl -> define_dynamic('page_message', 'page');
29		$tpl -> define_dynamic('hosting_plans', 'page');
30		$tpl -> define_dynamic('month_list', 'page');
31		$tpl -> define_dynamic('year_list', 'page');
32		$tpl -> define_dynamic('day_list', 'page');
	26	$tpl->define_dynamic('page', $cfg['ADMIN_TEMPLATE_PATH'] . '/server_statistic.tpl');
	27	$tpl->define_dynamic('page_message', 'page');
	28	$tpl->define_dynamic('hosting_plans', 'page');
	29	$tpl->define_dynamic('month_list', 'page');
	30	$tpl->define_dynamic('year_list', 'page');
	31	$tpl->define_dynamic('day_list', 'page');
33	32
34	33	global $cfg;
35	34	$theme_color = $cfg['USER_INITIAL_THEME'];
36	35
37		$tpl -> assign(array('TR_ADMIN_SERVER_STATICSTICS_PAGE_TITLE' => tr('ispCP - Admin/Server statistics'),
38		'THEME_COLOR_PATH' => "../themes/$theme_color",
39		'THEME_CHARSET' => tr('encoding'),
40		'ISP_LOGO' => get_logo($_SESSION['user_id']),
41		'ISPCP_LICENSE' => $cfg['ISPCP_LICENSE']));
	36	$tpl->assign(
	37	array(
	38	'TR_ADMIN_SERVER_STATICSTICS_PAGE_TITLE' => tr('ispCP - Admin/Server statistics'),
	39	'THEME_COLOR_PATH' => "../themes/$theme_color",
	40	'THEME_CHARSET' => tr('encoding'),
	41	'ISP_LOGO' => get_logo($_SESSION['user_id']),
	42	'ISPCP_LICENSE' => $cfg['ISPCP_LICENSE']
	43	)
	44	);
42	45
43	46	global $month, $year;
44	47
45	48	if (isset($_GET['month']) && isset($_GET['year'])) {
46		~~$year~~ = intval($_GET['year']);
47		$month = intval($_GET['month']);
	49	$year = intval($_GET['year']);
	50	$month = intval($_GET['month']);
48	51	} else if (isset($_POST['month']) && isset($_POST['year'])) {
49		~~$year~~ = intval($_POST['year']);
50		$month = intval($_POST['month']);
	52	$year = intval($_POST['year']);
	53	$month = intval($_POST['month']);
51	54	} else {
52		$month = date("m");
53		~~$year~~ = date("Y");
	55	$month = date("m");
	56	$year = date("Y");
54	57	}
55	58
56		function get_server_trafic($from, $to)
57		{
58		global $sql;
59
60		$query = <<<SQL_QUERY
	59	function get_server_trafic($from, $to) {
	60	global $sql;
	61
	62	$query = <<<SQL_QUERY
61	63	select
62	64	IFNULL(sum(bytes_in), 0) as sbin,
…	…
74	76	SQL_QUERY;
75	77
76		$rs = exec_query($sql, $query, array($from, $to));
77
78		~~if($rs ->~~ RecordCount() == 0) {
79		~~return array(0,0,0,0,0, 0,0,0,0,~~0);
80		} else {
81		return array($rs->fields['swbin'], $rs->fields['swbout'],
82		$rs->fields['smbin'], $rs->fields['smbout'],
83		$rs->fields['spbin'], $rs->fields['spbout'],
84		$rs->fields['sbin'] - ($rs->fields['swbin'] + $rs->fields['smbin'] + $rs->fields['spbin']),
85		$rs->fields['sbout'] - ($rs->fields['swbout'] + $rs->fields['smbout'] + $rs->fields['spbout']),
86		$rs->fields['sbin'], $rs->fields['sbout']);
87		}
	78	$rs = exec_query($sql, $query, array($from, $to));
	79
	80	if ($rs->RecordCount() == 0) {
	81	return array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
	82	} else {
	83	return array($rs->fields['swbin'], $rs->fields['swbout'],
	84	$rs->fields['smbin'], $rs->fields['smbout'],
	85	$rs->fields['spbin'], $rs->fields['spbout'],
	86	$rs->fields['sbin'] - ($rs->fields['swbin'] + $rs->fields['smbin'] + $rs->fields['spbin']),
	87	$rs->fields['sbout'] - ($rs->fields['swbout'] + $rs->fields['smbout'] + $rs->fields['spbout']),
	88	$rs->fields['sbin'], $rs->fields['sbout']);
	89	}
88	90	}
89	91
90		function generate_page (&$tpl)
91		{
92		global $sql, $month,$year;
93
94		if ($month == date('m') && $year == date('Y')) {
95		$curday = date('j');
96		} else {
97		$tmp = mktime(1,0,0,$month+1,0,$year);
98		$curday = date('j',$tmp);
99		}
100
101		$curtimestamp = time();
102		$firsttimestamp = mktime(0,0,0,$month,1,$year);
103
104		$all[0] = 0;
105		$all[1] = 0;
106		$all[2] = 0;
107		$all[3] = 0;
108		$all[4] = 0;
109		$all[5] = 0;
110		$all[6] = 0;
111		$all[7] = 0;
112
113		for($i = 1; $i <= $curday; $i++) {
114		$ftm = mktime(0,0,0,$month,$i,$year);
115		$ltm = mktime(23,59,59,$month,$i,$year);
116
117		$query = <<<SQL_QUERY
	92	function generate_page (&$tpl) {
	93	global $sql, $month, $year;
	94
	95	if ($month == date('m') && $year == date('Y')) {
	96	$curday = date('j');
	97	} else {
	98	$tmp = mktime(1, 0, 0, $month + 1, 0, $year);
	99	$curday = date('j', $tmp);
	100	}
	101
	102	$curtimestamp = time();
	103	$firsttimestamp = mktime(0, 0, 0, $month, 1, $year);
	104
	105	$all[0] = 0;
	106	$all[1] = 0;
	107	$all[2] = 0;
	108	$all[3] = 0;
	109	$all[4] = 0;
	110	$all[5] = 0;
	111	$all[6] = 0;
	112	$all[7] = 0;
	113
	114	for($i = 1; $i <= $curday; $i++) {
	115	$ftm = mktime(0, 0, 0, $month, $i, $year);
	116	$ltm = mktime(23, 59, 59, $month, $i, $year);
	117
	118	$query = <<<SQL_QUERY
118	119	select
119	120	count(bytes_in) as cnt
…	…
124	125	SQL_QUERY;
125	126
126		$rs = exec_query($sql, $query, array($ftm, $ltm));
127		$has_data = false;
128
129		~~// if ($rs -> fields['cnt']~~ > 0) {
130		if ($rs->RecordCount() > 0) {
131		~~list($web_in~~,
132		~~$web_out~~,
133		~~$mail_in~~,
134		~~$mail_out~~,
135		~~$pop_in~~,
136		~~$pop_out~~,
137		~~$other_in~~,
138		~~$other_out~~,
139		$all_in,
140		$all_out) = get_server_trafic($ftm, $ltm);
141
142		$has_data = true;
143
144		if ($i % 2 == 0) {
145		$tpl -> assign('ITEM_CLASS', 'content');
146		} else {
147		$tpl -> assign('ITEM_CLASS', 'content2');
148		}
149
150		~~$tpl -> assign(array('DAY' => $i~~,
151		~~'YEAR' => $year~~,
152		~~'MONTH' => $month~~,
153		~~'WEB_IN' => sizeit($web_in~~),
154		~~'WEB_OUT' => sizeit($web_out~~),
155		~~'MAIL_IN' => sizeit($mail_in~~),
156		~~'MAIL_OUT' => sizeit($mail_out~~),
157		~~'POP_IN' => sizeit($pop_in~~),
158		~~'POP_OUT' => sizeit($pop_out~~),
159		~~'OTHER_IN' => sizeit($other_in~~),
160		~~'OTHER_OUT' => sizeit($other_out~~),
161		~~'ALL_IN' => sizeit($all_in~~),
162		'ALL_OUT' => sizeit($all_out),
163		~~'ALL' => sizeit($all_in + $all_out)))~~;
164		~~$all[0] = $all[0] + $web_in~~;
165		~~$all[1] = $all[1] + $web_out~~;
166		~~$all[2] = $all[2] + $mail_in~~;
167		~~$all[3] = $all[3] + $mail_out~~;
168		~~$all[4] = $all[4] + $pop_in~~;
169		~~$all[5] = $all[5] + $pop_out~~;
170		~~$all[6] = $all[6] + $all_in~~;
171		$all[7] = $all[7] + $all_out;
172
173		$tpl->parse('DAY_LIST','.day_list');
174
175		}// if count
176
177		}//for
178
179		if (!$has_data) {
180		~~$tpl->assign('DAY_LIST',''~~);
181		};
182
183		$all_other_in = $all[6] - ($all[0] + $all[2] + $all[4]);
184		$all_other_out = $all[7] - ($all[1] + $all[3] + $all[5]);
185
186		~~$tpl -> assign(array('WEB_IN_ALL' => sizeit($all[0~~]),
187		~~'WEB_OUT_ALL' => sizeit($all[1~~]),
188		~~'MAIL_IN_ALL' => sizeit($all[2~~]),
189		~~'MAIL_OUT_ALL' => sizeit($all[3~~]),
190		~~'POP_IN_ALL' => sizeit($all[4]~~),
191		~~'POP_OUT_ALL' => sizeit($all[5]~~),
192		~~'OTHER_IN_ALL' => sizeit($all_other_in~~),
193		~~'OTHER_OUT_ALL' => sizeit($all_other_out~~),
194		'ALL_IN_ALL' => sizeit($all[6]),
195		'ALL_OUT_ALL' => sizeit($all[7]),
196		~~'ALL_ALL' => sizeit($all[6] + $all[7]))~~);
	127	$rs = exec_query($sql, $query, array($ftm, $ltm));
	128	$has_data = false;
	129	// if ($rs -> fields['cnt'] > 0) {
	130	if ($rs->RecordCount() > 0) {
	131	list($web_in,
	132	$web_out,
	133	$mail_in,
	134	$mail_out,
	135	$pop_in,
	136	$pop_out,
	137	$other_in,
	138	$other_out,
	139	$all_in,
	140	$all_out) = get_server_trafic($ftm, $ltm);
	141
	142	$has_data = true;
	143
	144	if ($i % 2 == 0) {
	145	$tpl->assign('ITEM_CLASS', 'content');
	146	} else {
	147	$tpl->assign('ITEM_CLASS', 'content2');
	148	}
	149
	150	$tpl->assign(array('DAY' => $i,
	151	'YEAR' => $year,
	152	'MONTH' => $month,
	153	'WEB_IN' => sizeit($web_in),
	154	'WEB_OUT' => sizeit($web_out),
	155	'MAIL_IN' => sizeit($mail_in),
	156	'MAIL_OUT' => sizeit($mail_out),
	157	'POP_IN' => sizeit($pop_in),
	158	'POP_OUT' => sizeit($pop_out),
	159	'OTHER_IN' => sizeit($other_in),
	160	'OTHER_OUT' => sizeit($other_out),
	161	'ALL_IN' => sizeit($all_in),
	162	'ALL_OUT' => sizeit($all_out),
	163	'ALL' => sizeit($all_in + $all_out)));
	164	$all[0] = $all[0] + $web_in;
	165	$all[1] = $all[1] + $web_out;
	166	$all[2] = $all[2] + $mail_in;
	167	$all[3] = $all[3] + $mail_out;
	168	$all[4] = $all[4] + $pop_in;
	169	$all[5] = $all[5] + $pop_out;
	170	$all[6] = $all[6] + $all_in;
	171	$all[7] = $all[7] + $all_out;
	172
	173	$tpl->parse('DAY_LIST', '.day_list');
	174	} // if count
	175	} //for
	176	if (!$has_data) {
	177	$tpl->assign('DAY_LIST', '');
	178	} ;
	179
	180	$all_other_in = $all[6] - ($all[0] + $all[2] + $all[4]);
	181	$all_other_out = $all[7] - ($all[1] + $all[3] + $all[5]);
	182
	183	$tpl->assign(
	184	array(
	185	'WEB_IN_ALL' => sizeit($all[0]),
	186	'WEB_OUT_ALL' => sizeit($all[1]),
	187	'MAIL_IN_ALL' => sizeit($all[2]),
	188	'MAIL_OUT_ALL' => sizeit($all[3]),
	189	'POP_IN_ALL' => sizeit($all[4]),
	190	'POP_OUT_ALL' => sizeit($all[5]),
	191	'OTHER_IN_ALL' => sizeit($all_other_in),
	192	'OTHER_OUT_ALL' => sizeit($all_other_out),
	193	'ALL_IN_ALL' => sizeit($all[6]),
	194	'ALL_OUT_ALL' => sizeit($all[7]),
	195	'ALL_ALL' => sizeit($all[6] + $all[7])
	196	)
	197	);
197	198	}
198	199
199
200	200	/*
201	201	*
…	…
203	203	*
204	204	*/
205		gen_admin_mainmenu($tpl, $cfg['ADMIN_TEMPLATE_PATH'].'/main_menu_statistics.tpl');
206		gen_admin_menu($tpl, $cfg['ADMIN_TEMPLATE_PATH'].'/menu_statistics.tpl');
	205	gen_admin_mainmenu($tpl, $cfg['ADMIN_TEMPLATE_PATH'] . '/main_menu_statistics.tpl');
	206	gen_admin_menu($tpl, $cfg['ADMIN_TEMPLATE_PATH'] . '/menu_statistics.tpl');
207	207
208	208	gen_select_lists($tpl, $month, $year);
209	209
210		generate_page ($tpl);
211
212		$tpl->assign(array('TR_SERVER_STATISTICS' => tr('Server statistics'),
213		'TR_MONTH' => tr('Month'),
214		'TR_YEAR' => tr('Year'),
215		'TR_SHOW' => tr('Show'),
216		'TR_DAY' => tr('Day'),
217		'TR_WEB_IN' => tr('Web in'),
218		'TR_WEB_OUT' => tr('Web out'),
219		'TR_MAIL_IN' => tr('Mail in'),
220		'TR_MAIL_OUT' => tr('Mail out'),
221		'TR_POP_IN' => tr('Pop/IMAP in'),
222		'TR_POP_OUT' => tr('Pop/IMAP out'),
223		'TR_OTHER_IN' => tr('Other in'),
224		'TR_OTHER_OUT' => tr('Other out'),
225		'TR_ALL_IN' => tr('All in'),
226		'TR_ALL_OUT' => tr('All out'),
227		'TR_ALL' => tr('All')));
	210	generate_page($tpl);
	211
	212	$tpl->assign(
	213	array(
	214	'TR_SERVER_STATISTICS' => tr('Server statistics'),
	215	'TR_MONTH' => tr('Month'),
	216	'TR_YEAR' => tr('Year'),
	217	'TR_SHOW' => tr('Show'),
	218	'TR_DAY' => tr('Day'),
	219	'TR_WEB_IN' => tr('Web in'),
	220	'TR_WEB_OUT' => tr('Web out'),
	221	'TR_MAIL_IN' => tr('Mail in'),
	222	'TR_MAIL_OUT' => tr('Mail out'),
	223	'TR_POP_IN' => tr('Pop/IMAP in'),
	224	'TR_POP_OUT' => tr('Pop/IMAP out'),
	225	'TR_OTHER_IN' => tr('Other in'),
	226	'TR_OTHER_OUT' => tr('Other out'),
	227	'TR_ALL_IN' => tr('All in'),
	228	'TR_ALL_OUT' => tr('All out'),
	229	'TR_ALL' => tr('All')
	230	)
	231	);
228	232
229	233	gen_page_message($tpl);
230		$tpl -> parse('PAGE', 'page');
231		$tpl -> prnt();
232
233		if ($cfg['DUMP_GUI_DEBUG']) dump_gui_debug();
	234
	235	$tpl->parse('PAGE', 'page');
	236	$tpl->prnt();
	237
	238	if ($cfg['DUMP_GUI_DEBUG'])
	239	dump_gui_debug();
234	240
235	241	unset_messages();

trunk/gui/include/admin-functions.php

r981	r1008
4	4	*
5	5	* @copyright 2001-2006 by moleSoftware GmbH
6		* @copyright 2006-2007 by ispCP \| http://isp-control.net
	6	* @copyright 2006-2008 by ispCP \| http://isp-control.net
	7	* @version SVN: $ID$
7	8	* @link http://isp-control.net
8		* @author ispCP Team ~~(2007)~~
	9	* @author ispCP Team
9	10	*
10	11	* @license
…	…
16	17	* this program; if not, write to the Open Source Initiative (OSI)
17	18	* http://opensource.org \| osi@opensource.org
18		*/
19	19
20	20	/*
…	…
63	63	$tpl->define_dynamic('custom_buttons', 'menu');
64	64	$tpl->assign(
65		array('TR_MENU_GENERAL_INFORMATION' => tr('General information'),
	65	array(
	66	'TR_MENU_GENERAL_INFORMATION' => tr('General information'),
66	67	'TR_MENU_HOSTING_PLANS' => tr('Manage hosting plans'),
67	68	'TR_MENU_SYSTEM_TOOLS' => tr('System tools'),
…	…
169	170
170	171	$tpl->define_dynamic('menu', $menu_file);
171
172	172	$tpl->define_dynamic('custom_buttons', 'menu');
173	173
174	174	$tpl->assign(
175		array('TR_MENU_GENERAL_INFORMATION' => tr('General information'),
	175	array(
	176	'TR_MENU_GENERAL_INFORMATION' => tr('General information'),
176	177	'TR_MENU_CHANGE_PASSWORD' => tr('Change password'),
177	178	'TR_MENU_CHANGE_PERSONAL_DATA' => tr('Change personal data'),
…	…
212	213	'TR_MENU_SETTINGS' => tr('Settings'),
213	214	'TR_GENERAL_SETTINGS' => tr('General settings'),
214		'TR_SERVERPORTS' => tr('Server ports')
	215	'TR_SERVERPORTS' => tr('Server ports'),
	216	'VERSION' => $cfg['Version'],
	217	'BUILDDATE' => $cfg['BuildDate'],
	218	'CODENAME' => $cfg['CodeName']
215	219	)
216	220	);

trunk/gui/include/client-functions.php

r1007	r1008
524	524	'FILEMANAGER_PATH' => $cfg['FILEMANAGER_PATH'],
525	525	'FILEMANAGER_TARGET' => $cfg['FILEMANAGER_TARGET'],
	526	'VERSION' => $cfg['Version'],
	527	'BUILDDATE' => $cfg['BuildDate'],
	528	'CODENAME' => $cfg['CodeName']
526	529	)
527	530	);

trunk/gui/include/ispcp-config.php

r1003	r1008
5	5	* @copyright 2001-2006 by moleSoftware GmbH
6	6	* @copyright 2006-2008 by ispCP \| http://isp-control.net
7		* @version SVN: $ID$
	7	* @version SVN: $ID$
8	8	* @link http://isp-control.net
9	9	* @author ispCP Team
…	…
48	48	'BuildDate' => null,
49	49	'Version' => null,
50		'~~VersionH~~' => null,
	50	'CodeName' => null,
51	51	'DEFAULT_ADMIN_ADDRESS' => null,
52	52	'SERVER_HOSTNAME' => null,
…	…
181	181	'MAIL_LOG_INC_AMAVIS' => null,
182	182	'USER_INITIAL_THEME' => null,
183		~~'ISPCP_LICENSE' => null,~~
184	183	'FTP_USERNAME_SEPARATOR' => null,
185	184	'FTP_HOMEDIR' => null,

trunk/gui/include/reseller-functions.php

r1005	r1008
5	5	* @copyright 2001-2006 by moleSoftware GmbH
6	6	* @copyright 2006-2008 by ispCP \| http://isp-control.net
7		* @version ~~SVN:~~ $ID$
	7	* @version $ID$
8	8	* @link http://isp-control.net
9	9	* @author ispCP Team
…	…
112	112	$tpl->parse('MAIN_MENU', 'menu');
113	113	} // End of gen_reseller_menu()
	114
114	115	// Function to generate the manu data for reseller
115		function gen_reseller_menu(&$tpl, $menu_file)
116		{
	116	function gen_reseller_menu(&$tpl, $menu_file) {
117	117	global $sql, $cfg;
118	118
…	…
147	147	'TR_MENU_ORDER_EMAIL' => tr('Order email setup'),
148	148	'TR_MENU_LOSTPW_EMAIL' => tr('Lostpw email setup'),
	149	'VERSION' => $cfg['Version'],
	150	'BUILDDATE' => $cfg['BuildDate'],
	151	'CODENAME' => $cfg['CodeName']
149	152	)
150	153	);

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

r766	r1008
1		<table style="width: 100%; border-collapse: collapse;padding:0;margin:0;" height=100%>
2		<tr style="height: 53px;">
3		<td style="width: 100%; background-image: url({THEME_COLOR_PATH}/images/top/menu_top.jpg); padding-left:5px; vertical-align:middle;"><table width="100%" border="0" cellspacing="0" cellpadding="0">
4		<tr>
5		<td><img src="{THEME_COLOR_PATH}/images/icons/general_big.gif" width="32" height="33"></td>
6		<td><span class="titlemenu">{TR_MENU_GENERAL_INFORMATION}</span></td>
7		</tr>
8		</table>
9		</td>
10		</tr>
11		<tr height="*">
12		<td style="width: 100%; background-image: url({THEME_COLOR_PATH}/images/top/menu_bg.jpg); vertical-align: top;">
13		<table width="100%" border="0" cellspacing="0" cellpadding="0">
14		<tr>
15		<td><a href="index.php" class="submenu">{TR_MENU_OVERVIEW}</a></td>
16		</tr>
17		<tr>
18		<td height="3" width="193"><img src="{THEME_COLOR_PATH}/images/top/menu_separator.jpg" height="3" width="193" /></td>
19		</tr>
20		<tr>
21		<td><a href="change_password.php" class="submenu">{TR_MENU_CHANGE_PASSWORD}</a></td>
22		</tr>
23		<tr>
24		<td height="3" width="193"><img src="{THEME_COLOR_PATH}/images/top/menu_separator.jpg" height="3" width="193" /></td>
25		</tr>
26		<tr>
27		<td><a href="change_personal.php" class="submenu">{TR_MENU_CHANGE_PERSONAL_DATA}</a></td>
28		</tr>
29		<tr>
30		<td height="3" width="193"><img src="{THEME_COLOR_PATH}/images/top/menu_separator.jpg" height="3" width="193" /></td>
31		</tr>
32		<tr>
33		<td><a href="language.php" class="submenu">{TR_MENU_LANGUAGE}</a></td>
34		</tr>
35		<tr>
36		<td height="3" width="193"><img src="{THEME_COLOR_PATH}/images/top/menu_separator.jpg" height="3" width="193" /></td>
37		</tr>
38		<tr>
39		<td><a href="server_status.php" class="submenu">{TR_MENU_SERVER_STATUS}</a></td>
40		</tr>
41		<tr>
42		<td height="3" width="193"><img src="{THEME_COLOR_PATH}/images/top/menu_separator.jpg" height="3" width="193" /></td>
43		</tr>
44		<tr>
45		<td><a href="admin_log.php" class="submenu">{TR_MENU_ADMIN_LOG}</a></td>
46		</tr>
47		<tr>
48		<td height="3" width="193"><img src="{THEME_COLOR_PATH}/images/top/menu_separator.jpg" height="3" width="193" /></td>
49		</tr>
	1	<table style="width:100%;height:100%;border-collapse: collapse;padding:0;margin:0;">
	2	<tr style="height:53px;">
	3	<td style="width:100%; background-image:url({THEME_COLOR_PATH}/images/top/menu_top.jpg);padding-left:5px;vertical-align:middle;">
	4	<table width="100%" border="0" cellspacing="0" cellpadding="0">
50	5	<tr>
51		<td> </td>
52		</tr>
	6	<td><img src="{THEME_COLOR_PATH}/images/icons/general_big.gif" width="32" height="33"></td>
	7	<td><span class="titlemenu">{TR_MENU_GENERAL_INFORMATION}</span></td>
	8	</tr>
	9	</table>
	10	</td>
	11	</tr>
	12	<tr height="*">
	13	<td style="width:100%;background-image:url({THEME_COLOR_PATH}/images/top/menu_bg.jpg);vertical-align:top;">
	14	<table width="100%" border="0" cellspacing="0" cellpadding="0">
53	15	<tr>
54		~~<td> ~~</td>
	16	<td><a href="index.php" class="submenu">{TR_MENU_OVERVIEW}</a></td>
55	17	</tr>
56	18	<tr>
57		~~<td> ~~</td>
	19	<td height="3" width="193"><img src="{THEME_COLOR_PATH}/images/top/menu_separator.jpg" height="3" width="193" /></td>
58	20	</tr>
59	21	<tr>
60		<td class="logoutbutton"><a href="../index.php?logout"><img src="{THEME_COLOR_PATH}/images/icons/logout_interface.png" border="0" height="18" width="18" /></a><a href="../index.php?logout" class="logout">{TR_MENU_LOGOUT}</a></td>
	22	<td><a href="change_password.php" class="submenu">{TR_MENU_CHANGE_PASSWORD}</a></td>
61	23	</tr>
62	24	<tr>
63		~~<td> ~~</td>
	25	<td height="3" width="193"><img src="{THEME_COLOR_PATH}/images/top/menu_separator.jpg" height="3" width="193" /></td>
64	26	</tr>
65	27	<tr>
66		~~<td> ~~</td>
	28	<td><a href="change_personal.php" class="submenu">{TR_MENU_CHANGE_PERSONAL_DATA}</a></td>
67	29	</tr>
68	30	<tr>
69		~~<td> ~~</td>
	31	<td height="3" width="193"><img src="{THEME_COLOR_PATH}/images/top/menu_separator.jpg" height="3" width="193" /></td>
70	32	</tr>
71	33	<tr>
72		~~<td align="center"><img src="{ISP_LOGO}" /~~></td>
	34	<td><a href="language.php" class="submenu">{TR_MENU_LANGUAGE}</a></td>
73	35	</tr>
	36	<tr>
	37	<td height="3" width="193"><img src="{THEME_COLOR_PATH}/images/top/menu_separator.jpg" height="3" width="193" /></td>
	38	</tr>
	39	<tr>
	40	<td><a href="server_status.php" class="submenu">{TR_MENU_SERVER_STATUS}</a></td>
	41	</tr>
	42	<tr>
	43	<td height="3" width="193"><img src="{THEME_COLOR_PATH}/images/top/menu_separator.jpg" height="3" width="193" /></td>
	44	</tr>
	45	<tr>
	46	<td><a href="admin_log.php" class="submenu">{TR_MENU_ADMIN_LOG}</a></td>
	47	</tr>
	48	<tr>
	49	<td height="3" width="193"><img src="{THEME_COLOR_PATH}/images/top/menu_separator.jpg" height="3" width="193" /></td>
	50	</tr>
	51	<tr>
	52	<td> </td>
	53	</tr>
	54	<tr>
	55	<td> </td>
	56	</tr>
	57	<tr>
	58	<td> </td>
	59	</tr>
	60	<tr>
	61	<td class="logoutbutton"><a href="../index.php?logout"><img src="{THEME_COLOR_PATH}/images/icons/logout_interface.png" border="0" height="18" width="18" /></a><a href="../index.php?logout" class="logout">{TR_MENU_LOGOUT}</a></td>
	62	</tr>
	63	<tr>
	64	<td> </td>
	65	</tr>
	66	<tr>
	67	<td> </td>
	68	</tr>
	69	<tr>
	70	<td> </td>
	71	</tr>
	72	<tr>
	73	<td align="center"><img src="{ISP_LOGO}" /></td>
	74	</tr>
	75	</table>
	76	</td>
	77	</tr>
	78	<tr height="53" style="vertical-align: bottom;">
	79	<td class="bottom" align="center">ispCP {VERSION}<br />build: {BUILDDATE}<br />{CODENAME}</td>
	80	</tr>
74	81	</table>
75		~~</td>~~
76		~~</tr>~~
77		~~<tr height="53" style="vertical-align: bottom;">~~
78		~~<td class="bottom" align="center">{ISPCP_LICENSE}</td>~~
79		~~</tr>~~
80		~~</table>~~

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

r762	r1008
1		<table style="width: 100%; border-collapse: collapse;padding:0;margin:0;" height=100%>
2		<tr style="height: 53px;">
3		<td style="width: 100%; background-image: url({THEME_COLOR_PATH}/images/top/menu_top.jpg); padding-left:5px; vertical-align:middle;"><table width="100%" border="0" cellspacing="0" cellpadding="0">
4		<tr>
5		<td><img src="{THEME_COLOR_PATH}/images/icons/manage_users_big.gif" width="32" height="33"></td>
6		<td><span class="titlemenu">{TR_MENU_MANAGE_USERS}</span></td>
7		</tr>
8		</table>
9		</td>
10		</tr>
11		<tr height="*">
	1	<table style="width:100%;height:100%;border-collapse: collapse;padding:0;margin:0;">
	2	<tr style="height:53px;">
	3	<td style="width:100%; background-image:url({THEME_COLOR_PATH}/images/top/menu_top.jpg);padding-left:5px;vertical-align:middle;">
	4	<table width="100%" border="0" cellspacing="0" cellpadding="0">
	5	<tr>
	6	<td><img src="{THEME_COLOR_PATH}/images/icons/general_big.gif" width="32" height="33"></td>
	7	<td><span class="titlemenu">{TR_MENU_GENERAL_INFORMATION}</span></td>
	8	</tr>
	9	</table>
	10	</td>
	11	</tr>
	12	<tr height="*">
12	13	<td style="width: 100%; background-image: url({THEME_COLOR_PATH}/images/top/menu_bg.jpg); vertical-align: top;">
13	14	<table width="100%" border="0" cellspacing="0" cellpadding="0">
…	…
78	79	<td align="center"><img src="{ISP_LOGO}" /></td>
79	80	</tr>
	81	</table>
	82	</td>
	83	</tr>
	84	<tr height="53" style="vertical-align: bottom;">
	85	<td class="bottom" align="center">ispCP {VERSION}<br />build: {BUILDDATE}<br />{CODENAME}</td>