Context Navigation

← Previous Changeset
Next Changeset →

Changeset 765

Timestamp:

08/23/07 20:49:54 (16 months ago)

Author:

raphael

Message:

Fixed #586: deleting domain-alias does not work when domain has ftp accounts
Fixed #589: wrong image names
Added comments support to the tr() function
Replaced all ISPCP with ispCP
Fixed #417: Add gender field
Fixed a missing double percent sign
Fixed #594: Blank page on Add Admin
Fixed #588: $rs not always defined
Added missing user_gui_props entry for primary administrator
Added postgrey, AMaViS and spamassassin to the server_ports list
Updated es_ES.po (thanks to Albert Garcia)

Location:

trunk

Files:

: 19 modified

CHANGELOG (modified) (1 diff)
configs/database/database.sql (modified) (1 diff)
engine/backup/ispcp-backup-all (modified) (2 diffs)
engine/ispcp-als-mngr (modified) (2 diffs)
engine/ispcp-htuser-mngr (modified) (2 diffs)
engine/ispcp-mbox-mngr (modified) (2 diffs)
engine/ispcp-serv-mngr (modified) (2 diffs)
engine/ispcp-sub-mngr (modified) (2 diffs)
engine/messager/ispcp-arpl-msgr (modified) (2 diffs)
engine/setup/ispcp-setup (modified) (1 diff)
engine/setup/vhcs2ispcp.pl (modified) (6 diffs)
engine/setup/vhcs2ispcp.sql (modified) (2 diffs)
engine/traffic/ispcp-srv-traff (modified) (2 diffs)
engine/traffic/ispcp-vrl-traff (modified) (2 diffs)
engine/traffic/ispcp-vrl-traff-SUSE (modified) (2 diffs)
engine/traffic/ispcp-vrl-traff-correction (modified) (2 diffs)
gui/include/i18n.php (modified) (4 diffs)
gui/index.php (modified) (2 diffs)
gui/lostpassword.php (modified) (4 diffs)

Legend:

: Unmodified
: Added
: Removed

trunk/CHANGELOG

r764	r765
6	6	\| * gui: disable stats-alias in client menu \|
7	7	\_________________________________________________________________/
	8
	9	2007-08-22 Raphael Geissert
	10	- GUI:
	11	* Fixed #586: deleting domain-alias does not work when domain has ftp accounts
	12	* Fixed #589: wrong image names
	13	* Added comments support to the tr() function
	14	* Replaced all ISPCP with ispCP
	15	* Fixed #417: Add gender field
	16	* Fixed a missing double percent sign
	17	* Fixed #594: Blank page on Add Admin
	18	- SETUP:
	19	* Fixed #588: $rs not always defined
	20	* Added missing user_gui_props entry for primary administrator
	21	- CONFIGS:
	22	* Added postgrey, AMaViS and spamassassin to the server_ports list
	23	- LANGUAGES:
	24	* Updated es_ES.po (thanks to Albert Garcia)
8	25
9	26	2007-08-21 Raphael Geissert

trunk/configs/database/database.sql

r747	r765
91	91	),(
92	92	'PORT_IMAP-SSL', '993;tcp;IMAP-SSL;1;0'
	93	),(
	94	'PORT_POSTGREY', '60000;tcp;POSTGREYL;1;1'
	95	),(
	96	'PORT_AMAVIS', '10024;tcp;AMaVis;1;1'
	97	),(
	98	'PORT_SPAMASSASSIN', '783;tcp;SPAMASSASSIN;1;1'
93	99	);
94	100

trunk/engine/backup/ispcp-backup-all

r762	r765
1	1	#!/usr/bin/perl
2	2
3		# ispCP Ï (OMEGA) a Virtual Hosting Control Panel
	3	# ispCP ω (OMEGA) a Virtual Hosting Control Panel
4	4	# Copyright (c) 2001-2006 by moleSoftware GmbH
5	5	# http://www.molesoftware.com
…	…
26	26	#
27	27	#
28		# The ispCP Ï Home Page is at:
	28	# The ispCP ω Home Page is at:
29	29	#
30	30	# http://isp-control.net

trunk/engine/ispcp-als-mngr

r762	r765
1	1	#!/usr/bin/perl
2	2
3		# ispCP Ï (OMEGA) a Virtual Hosting Control Panel
	3	# ispCP ω (OMEGA) a Virtual Hosting Control Panel
4	4	# Copyright (c) 2001-2006 by moleSoftware GmbH
5	5	# http://www.molesoftware.com
…	…
26	26	#
27	27	#
28		# The ISPCP Ï Home Page is at:
	28	# The ISPCP ω Home Page is at:
29	29	#
30	30	# http://isp-control.net

trunk/engine/ispcp-htuser-mngr

r762	r765
1	1	#!/usr/bin/perl
2	2
3		# ISPCP Ï (OMEGA) - Virtual Hosting Control System \| Omega Version
	3	# ISPCP ω (OMEGA) - Virtual Hosting Control System \| Omega Version
4	4	# Copyright (c) 2001-2006 by moleSoftware GmbH
5	5	# http://www.molesoftware.com
…	…
26	26	#
27	27	#
28		# The ISPCP Ï Home Page is at:
	28	# The ISPCP ω Home Page is at:
29	29	#
30	30	# http://isp-control.net

trunk/engine/ispcp-mbox-mngr

r762	r765
1	1	#!/usr/bin/perl
2	2
3		# ispCP Ï (OMEGA) a Virtual Hosting Control Panel
	3	# ispCP ω (OMEGA) a Virtual Hosting Control Panel
4	4	# Copyright (c) 2001-2006 by moleSoftware GmbH
5	5	# http://www.molesoftware.com
…	…
26	26	#
27	27	#
28		# The ISPCP Ï Home Page is at:
	28	# The ISPCP ω Home Page is at:
29	29	#
30	30	# http://isp-control.net

trunk/engine/ispcp-serv-mngr

r762	r765
1	1	#!/usr/bin/perl
2	2
3		# ispCP Ï (OMEGA) a Virtual Hosting Control Panel
	3	# ispCP ω (OMEGA) a Virtual Hosting Control Panel
4	4	# Copyright (c) 2001-2006 by moleSoftware GmbH
5	5	# http://www.molesoftware.com
…	…
26	26	#
27	27	#
28		# The ISPCP Ï Home Page is at:
	28	# The ISPCP ω Home Page is at:
29	29	#
30	30	# http://isp-control.net

trunk/engine/ispcp-sub-mngr

r762	r765
1	1	#!/usr/bin/perl
2	2
3		# ispCP Ï (OMEGA) a Virtual Hosting Control Panel
	3	# ispCP ω (OMEGA) a Virtual Hosting Control Panel
4	4	# Copyright (c) 2001-2006 by moleSoftware GmbH
5	5	# http://www.molesoftware.com
…	…
26	26	#
27	27	#
28		# The ISPCP Ï Home Page is at:
	28	# The ISPCP ω Home Page is at:
29	29	#
30	30	# http://isp-control.net

trunk/engine/messager/ispcp-arpl-msgr

r762	r765
1	1	#!/usr/bin/perl
2	2
3		# ispCP Ï (OMEGA) a Virtual Hosting Control Panel
	3	# ispCP ω (OMEGA) a Virtual Hosting Control Panel
4	4	# Copyright (c) 2001-2006 by moleSoftware GmbH
5	5	# http://www.molesoftware.com
…	…
26	26	#
27	27	#
28		# The ispCP Ï Home Page is at:
	28	# The ispCP ω Home Page is at:
29	29	#
30	30	# http://isp-control.net

trunk/engine/setup/ispcp-setup

r751	r765
1334	1334	return $rs if ($rs != 0);
1335	1335
	1336	$sql = "INSERT INTO user_gui_props (user_id) values (1)";
	1337
	1338	($rs, $rdata) = doSQL($sql);
	1339
	1340	return $rs if ($rs != 0);
	1341
1336	1342	$sql = "INSERT INTO server_ips VALUES (1, '$main::ua{'eth_ip'}', '$main::ua{'hostname'}', '$main::ua{'hostname'}');";
1337	1343

trunk/engine/setup/vhcs2ispcp.pl

r764	r765
114	114	sys_command("$main::cfg{'CMD_MTA'} restart");
115	115	sleep(2);
116		sys_command("$main::cfg{'CMD_NAMED'} restart");
117		sleep(2);
	116	if (-e "$main::cfg{'CMD_NAMED'}") {
	117	sys_command("$main::cfg{'CMD_NAMED'} restart");
	118	sleep(2);
	119	}
118	120	sys_command("$main::cfg{'CMD_POP'} restart");
119	121	sleep(2);
…	…
208	210	}
209	211
	212	my $rs = 0;
	213
210	214	my $welcome_message = <<MSG;
211	215
…	…
220	224
221	225	print STDOUT $welcome_message;
	226
	227	# Make sure we are in the right dir
	228	if ( ! -e "./ispcp-setup") {
	229	print STDOUT "Please first change to the directory where this script is";
	230	exit 1;
	231	}
222	232
223	233	print STDOUT "\tVHCS2 must first be partially removed from the system\n";
…	…
234	244	if ( $cont eq 'yes' ) {
235	245	# Remove unecessary VHCS2 stuff
236		my $rs = sys_command_rs("./vhcs2-remover.pl");
	246	$rs = sys_command_rs("./vhcs2-remover.pl");
237	247	exit_werror(undef, $rs) if ($rs != 0);
238	248	}
…	…
291	301	install_language();
292	302
293		if($main::cfg{'DATABASE_NAME'} ne 'ispcp') {
	303	if ($main::cfg{'DATABASE_NAME'} ne 'ispcp') {
294	304
295	305	print STDOUT "\nIMPORTANT: you have installed ispCP in a non-default database";
296	306	print STDOUT "\n\tThe migration script has converted your old VHCS database";
297	307	print STDOUT "\n\tin the new database called 'ispcp'; please rename this database";
298		print STDOUT "\n\twith the one you choose at ispCP install time: $main::cfg{'DATABASE_NAME'}\n";
	308	print STDOUT "\n\twith the one you chosen at ispCP install time: $main::cfg{'DATABASE_NAME'}\n";
	309	print STDOUT "\nAfter that you should run the requests manager: $main::cfg{'ROOT_DIR'}/engine/ispcp-rqst-mngr\n";
299	310
300	311	} else {
…	…
302	313	print STDOUT "\nRunning ispCP's requests manager...";
303	314
304		sys_command("$main::db{'ROOT_DIR'}/engine/ispcp-rqst-mngr");
	315	sys_command("$main::cfg{'ROOT_DIR'}/engine/ispcp-rqst-mngr");
305	316
306	317	print STDOUT "done\n";

trunk/engine/setup/vhcs2ispcp.sql

r764	r765
38	38	),(
39	39	'PORT_IMAP-SSL', '993;tcp;IMAP-SSL;1;0'
	40	),(
	41	'PORT_POSTGREY', '60000;tcp;POSTGREYL;1;1'
	42	),(
	43	'PORT_AMAVIS', '10024;tcp;AMaVis;1;1'
	44	),(
	45	'PORT_SPAMASSASSIN', '783;tcp;SPAMASSASSIN;1;1'
40	46	);
41	47
…	…
86	92	DROP TABLE IF EXISTS `lang_French`;
87	93	DROP TABLE IF EXISTS `lang_Russian`;
	94	DROP TABLE IF EXISTS `lang_Danish`;
88	95
89	96	-- Drop useless tables

trunk/engine/traffic/ispcp-srv-traff

r762	r765
1	1	#!/usr/bin/perl
2	2
3		# ispCP Ï (OMEGA) a Virtual Hosting Control Panel
	3	# ispCP ω (OMEGA) a Virtual Hosting Control Panel
4	4	# Copyright (c) 2001-2006 by moleSoftware GmbH
5	5	# http://www.molesoftware.com
…	…
26	26	#
27	27	#
28		# The ispCP Ï Home Page is at:
	28	# The ispCP ω Home Page is at:
29	29	#
30	30	# http://isp-control.net

trunk/engine/traffic/ispcp-vrl-traff

r762	r765
1	1	#!/usr/bin/perl
2	2
3		# ispCP Ï (OMEGA) a Virtual Hosting Control Panel
	3	# ispCP ω (OMEGA) a Virtual Hosting Control Panel
4	4	# Copyright (c) 2001-2006 by moleSoftware GmbH
5	5	# http://www.molesoftware.com
…	…
26	26	#
27	27	#
28		# The ispCP Ï Home Page is at:
	28	# The ispCP ω Home Page is at:
29	29	#
30	30	# http://isp-control.net

trunk/engine/traffic/ispcp-vrl-traff-SUSE

r762	r765
1	1	#!/usr/bin/perl
2	2
3		# ispCP Ï (OMEGA) a Virtual Hosting Control Panel
	3	# ispCP ω (OMEGA) a Virtual Hosting Control Panel
4	4	# Copyright (c) 2001-2006 by moleSoftware GmbH
5	5	# http://www.molesoftware.com
…	…
26	26	#
27	27	#
28		# The ispCP Ï Home Page is at:
	28	# The ispCP ω Home Page is at:
29	29	#
30	30	# http://isp-control.net

trunk/engine/traffic/ispcp-vrl-traff-correction

r762	r765
1	1	#!/usr/bin/perl
2	2
3		# ispCP Ï (OMEGA) a Virtual Hosting Control Panel
	3	# ispCP ω (OMEGA) a Virtual Hosting Control Panel
4	4	# Copyright (c) 2001-2006 by moleSoftware GmbH
5	5	# http://www.molesoftware.com
…	…
26	26	#
27	27	#
28		# The ispCP Ï Home Page is at:
	28	# The ispCP ω Home Page is at:
29	29	#
30	30	# http://isp-control.net

trunk/gui/include/i18n.php

r744	r765
47	47	* @access public
48	48	* @version 2.2
49		* @author ~~ISP~~CP Team, Benedikt Heintel (2007), 2007 Raphael Geissert
	49	* @author ispCP Team, Benedikt Heintel (2007), 2007 Raphael Geissert
50	50	*
51	51	* @param $msgid string to translate
…	…
81	81	}
82	82
83		if ($msgid == 'encoding' && $msgstr == ~~$msgid~~) {
	83	if ($msgid == 'encoding' && $msgstr == 'encoding') {
84	84	$msgstr = $encoding;
	85	}
	86
	87	// Detect comments and strip them if $msgid == $msgstr
	88	// e.g.
	89	// tr('_: This is just a comment\nReal message to translate here')
	90	if ($msgid == $msgstr && substr($msgid, 0, 3) == '_: ' && count($l = explode("\n", $msgid)) > 1) {
	91	unset($l[0]);
	92	$msgstr = implode("\n", $l);
85	93	}
86	94
…	…
111	119	* @access public
112	120	* @version 1.0
113		* @author ~~ISP~~CP Team, Benedikt Heintel (2007)
	121	* @author ispCP Team, Benedikt Heintel (2007)
114	122	*
115	123	* @param $string string to replace chars
…	…
117	125	**/
118	126	function replace_html($string) {
119
120	127	$pattern = array (
121		'~~=<b>=is~~',
122		'~~=</b>=is~~',
123		'~~=<i>=is~~',
124		'~~=</i>=is~~',
125		'~~=<br>=is~~'
	128	'#<[ ]b[ ]>#i',
	129	'#<[ ]/[ ]b[ ]*>#i',
	130	'#<[ ]i[ ]>#i',
	131	'#<[ ]/[ ]i[ ]*>#i',
	132	'#<[ ]br[ ](/\|)[ ]*>#i'
126	133	);
127	134

trunk/gui/index.php

r749	r765
66	66	'THEME_COLOR_PATH' => $cfg['LOGIN_TEMPLATE_PATH'],
67	67	'THEME_CHARSET' => tr('encoding'),
68		~~'TR_TIME' => gettimestr(),~~
69		~~'TR_DATE' => getdatestr(),~~
70	68	'TR_MESSAGE' => nl2br($cfg['SERVICEMODE_MESSAGE']),
71	69	'TR_ADMINLOGIN' => tr('Administrator login')
…	…
81	79	'THEME_COLOR_PATH' => $cfg['LOGIN_TEMPLATE_PATH'],
82	80	'THEME_CHARSET' => tr('encoding'),
83		~~'TR_TIME' => gettimestr(),~~
84		~~'TR_DATE' => getdatestr(),~~
85	81	'TR_LOGIN' => tr('Login'),
86	82	'TR_USERNAME' => tr('Username'),

trunk/gui/lostpassword.php

r743	r765
50	50	$tpl->define('page', $cfg['LOGIN_TEMPLATE_PATH'].'/lostpassword_message.tpl');
51	51	$tpl->assign(array(
52		'TR_MAIN_INDEX_PAGE_TITLE' => tr('~~ISP~~CP - Virtual Hosting Control System'),
	52	'TR_MAIN_INDEX_PAGE_TITLE' => tr('ispCP - Virtual Hosting Control System'),
53	53	'THEME_COLOR_PATH' => "themes/$theme_color",
54		'THEME_CHARSET' => tr('encoding'),
55		'TR_TIME' => gettimestr(),
56		'TR_DATE' => getdatestr()
	54	'THEME_CHARSET' => tr('encoding')
57	55	)
58	56	);
…	…
93	91	$tpl -> define('page', $cfg['LOGIN_TEMPLATE_PATH'].'/lostpassword_message.tpl');
94	92	$tpl -> assign(array(
95		'TR_MAIN_INDEX_PAGE_TITLE' => tr('~~ISP~~CP - Virtual Hosting Control System'),
	93	'TR_MAIN_INDEX_PAGE_TITLE' => tr('ispCP - Virtual Hosting Control System'),
96	94	'THEME_COLOR_PATH' => "themes/$theme_color",
97		'THEME_CHARSET' => tr('encoding'),
98		'TR_TIME' => gettimestr(),
99		'TR_DATE' => getdatestr()
	95	'THEME_CHARSET' => tr('encoding')
100	96	)
101	97	);
…	…
138	134	$tpl->assign(
139	135	array(
140		'TR_MAIN_INDEX_PAGE_TITLE' => tr('~~ISP~~CP - Virtual Hosting Control System'),
	136	'TR_MAIN_INDEX_PAGE_TITLE' => tr('ispCP - Virtual Hosting Control System'),
141	137	'THEME_COLOR_PATH' => $cfg['LOGIN_TEMPLATE_PATH'],
142	138	'THEME_CHARSET' => tr('encoding'),
…	…
146	142	'TR_USERNAME' => tr('Username'),
147	143	'TR_SEND' => tr('Request password'),
148		'TR_BACK' => tr('Back'),
149		'TR_TIME' => gettimestr(),
150		'TR_DATE' => getdatestr()
	144	'TR_BACK' => tr('Back')
151	145	)
152	146	);

Context Navigation

Changeset 765

Legend:

Download in other formats: