Development

Navigation

← Previous Changeset
Next Changeset →

Changeset 830

Timestamp:

10/06/07 17:34:58 (1 year ago)

Author:

rats

Message:

Fixed #738: ispcp.conf does not exist and other issues on /bin/sh use!

Files:

trunk/CHANGELOG (modified) (2 diffs)
trunk/Makefile.ubuntu (modified) (1 diff)
trunk/configs/Makefile (modified) (4 diffs)
trunk/configs/apache/Makefile (modified) (1 diff)
trunk/configs/dists/fedora/Makefile (modified) (2 diffs)
trunk/configs/dists/gentoo/Makefile (modified) (2 diffs)
trunk/configs/dists/redhat/Makefile (modified) (3 diffs)
trunk/configs/dists/sles9/Makefile (modified) (3 diffs)
trunk/configs/dists/suse10/Makefile (modified) (2 diffs)
trunk/configs/dists/ubuntu/Makefile (modified) (2 diffs)
trunk/configs/dists/ubuntu/apache/Makefile (modified) (1 diff)
trunk/configs/dists/ubuntu/proftpd/Makefile (modified) (1 diff)
trunk/configs/proftpd/Makefile (modified) (1 diff)
trunk/gui/admin/maintenancemode.php (modified) (4 diffs)
trunk/gui/include/layout-functions.php (modified) (6 diffs)
trunk/gui/index.php (modified) (2 diffs)
trunk/gui/tools/webmail/src/login.php (modified) (2 diffs)
trunk/gui/tools/webmail/src/signout.php (modified) (1 diff)
trunk/language-files/cs_CZ.po (modified) (34 diffs)
trunk/language-files/fr_FR.po (modified) (61 diffs)
trunk/language-files/french/french_france (modified) (27 diffs)

Legend:

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

trunk/CHANGELOG

r829	r830
7	7	\_________________________________________________________________/
8	8
	9	2007-10-06 Benedikt Heintel
	10	- SETUP:
	11	* Fixed #738: ispcp.conf does not exist and other issues on /bin/sh use!
	12
9	13	2007-10-05 Johannes Schobig
10	14	- GUI:
…	…
19	23	- GUI:
20	24	* Fixed #746: more relative path in the pma stylesheet
	25	- LANUGAGES:
	26	* Updated Czech translation (thanks to Josef Pinc)
	27	* Updated French translation (thanks to Grégory Marigot)
21	28
22	29	2007-10-04 Johannes Schobig

trunk/Makefile.ubuntu

r658	r830
43	43	$(SYSTEM_MAKE_DIRS) $(SYSTEM_APACHE_BACK_LOG)
44	44
45		cd ./configs && $(MAKE) install
	45	cd ./configs/dists/ubuntu && $(MAKE) install
46	46	cd ./engine && $(MAKE) install
47	47	cd ./gui && $(MAKE) install

trunk/configs/Makefile

r736	r830
4	4	install:
5	5
6		if ~~[ $(HOST_OS) == debian ]~~ ; then \
	6	if test $(HOST_OS) = debian ; then \
7	7	cp ./ispcp.conf $(SYSTEM_CONF) ; \
8	8	(cd ./apache && $(MAKE) install &); \
…	…
17	17	(cd ./proftpd && $(MAKE) install &); \
18	18	(cd ./logrotate && $(MAKE) install); \
19		elif ~~[ $(HOST_OS) == fedora ]~~ ; then \
	19	elif test $(HOST_OS) = fedora ; then \
20	20	cd ./dists/fedora && $(MAKE) install ; \
21		elif ~~[ $(HOST_OS) == gentoo ]~~ ; then \
	21	elif test $(HOST_OS) = gentoo ; then \
22	22	cd ./dists/gentoo && $(MAKE) install ; \
23		elif ~~[ $(HOST_OS) == redhat ]~~ ; then \
	23	elif test $(HOST_OS) = redhat ; then \
24	24	cd ./dists/redhat && $(MAKE) install ; \
25		elif ~~[ $(HOST_OS) == sles9 ]~~ ; then \
	25	elif test $(HOST_OS) = sles9 ; then \
26	26	cd ./dists/sles9 && $(MAKE) install ; \
27		elif ~~[ $(HOST_OS) == suse100 ]~~ ; then \
	27	elif test $(HOST_OS) = suse100 ; then \
28	28	cd ./dists/suse100 && $(MAKE) install ; \
29		elif ~~[ $(HOST_OS) == suse93 ]~~ ; then \
	29	elif test $(HOST_OS) = suse93 ; then \
30	30	cd ./dists/suse93 && $(MAKE) install ; \
31		elif ~~[ $(HOST_OS) == ubuntu ]~~ ; then \
	31	elif test $(HOST_OS) = ubuntu ; then \
32	32	cd ./dists/ubuntu && $(MAKE) install ; \
33	33	fi
…	…
35	35	uninstall:
36	36
37		if ~~[ $(HOST_OS) == debian ]~~ ; then \
	37	if test $(HOST_OS) = debian ; then \
38	38	rm -rf $(SYSTEM_CONF)/ispcp.conf ; \
39	39	(cd ./apache && $(MAKE) uninstall &); \
…	…
47	47	(cd ./proftpd && $(MAKE) uninstall &); \
48	48	(cd ./logrotate && $(MAKE) uninstall &); \
49		elif ~~[ $(HOST_OS) == fedora ]~~ ; then \
	49	elif test $(HOST_OS) = fedora ; then \
50	50	cd ./dists/fedora && $(MAKE) uninstall ; \
51		elif ~~[ $(HOST_OS) == gentoo ]~~ ; then \
	51	elif test $(HOST_OS) = gentoo ; then \
52	52	cd ./dists/gentoo && $(MAKE) uninstall ; \
53		elif ~~[ $(HOST_OS) == redhat ]~~ ; then \
	53	elif test $(HOST_OS) = redhat ; then \
54	54	cd ./dists/redhat && $(MAKE) uninstall ; \
55		elif ~~[ $(HOST_OS) == sles9 ]~~ ; then \
	55	elif test $(HOST_OS) = sles9 ; then \
56	56	cd ./dists/sles9 && $(MAKE) uninstall ; \
57		elif ~~[ $(HOST_OS) == suse93 ]~~ ; then \
	57	elif test $(HOST_OS) = suse93 ; then \
58	58	cd ./dists/suse93 && $(MAKE) uninstall ; \
59		elif ~~[ $(HOST_OS) == suse100 ]~~ ; then \
	59	elif test $(HOST_OS) = suse100 ; then \
60	60	cd ./dists/suse100 && $(MAKE) uninstall ; \
61		elif ~~[ $(HOST_OS) == ubuntu ]~~ ; then \
	61	elif test $(HOST_OS) = ubuntu ; then \
62	62	cd ./dists/ubuntu && $(MAKE) uninstall ; \
63	63	fi

trunk/configs/apache/Makefile

r746	r830
16	16
17	17	# Debian 4.0 "Etch"?
18		if [ ~~$(RELEASE) == '4.0' ] \|\| [ $(RELEASE) == 'lenny/sid'~~ ]; then \
	18	if [[ $(RELEASE) = '4.0' ]] \|\| [[ $(RELEASE) = 'lenny/sid' ]]; then \
19	19	cp ./fastcgi2.conf ./working/fastcgi_ispcp.conf ; \
20	20	else \

trunk/configs/dists/fedora/Makefile

r785	r830
4	4	install:
5	5
6		if ~~[[ $(HOST_OS) == fedora ]]~~ ; then \
	6	if test $(HOST_OS) = fedora ; then \
7	7	cp ./ispcp.conf $(SYSTEM_CONF) ; \
8	8	cd ./apache && $(MAKE) install ; cd .. ; \
…	…
21	21	uninstall:
22	22
23		if ~~[[ $(HOST_OS) == fedora ]]~~ ; then \
	23	if test $(HOST_OS) = fedora ; then \
24	24	rm -rf $(SYSTEM_CONF)/ispcp.conf ; \
25	25	cd ./apache && $(MAKE) uninstall ; cd .. ; \

trunk/configs/dists/gentoo/Makefile

r473	r830
4	4	install:
5	5
6		if ~~[[ $(HOST_OS) == gentoo ]]~~ ; then \
	6	if test $(HOST_OS) = gentoo ; then \
7	7	cp ./ispcp.conf $(SYSTEM_CONF) ; \
8	8	cd ./apache && $(MAKE) install ; cd .. ; \
…	…
22	22	uninstall:
23	23
24		if ~~[[ $(HOST_OS) == gentoo ]]~~ ; then \
	24	if test $(HOST_OS) = gentoo ; then \
25	25	rm -rf $(SYSTEM_CONF)/ispcp.conf ; \
26	26	cd ./apache && $(MAKE) uninstall ; cd .. ; \

trunk/configs/dists/redhat/Makefile

r785	r830
4	4	install:
5	5
6		if ~~[[ $(HOST_OS) == redhat ]]~~ ; then \
	6	if test $(HOST_OS) = redhat ; then \
7	7	cp ./ispcp.conf $(SYSTEM_CONF) ; \
8	8	cd ./apache && $(MAKE) install ; cd .. ; \
…	…
21	21	uninstall:
22	22
23		if ~~[[ $(HOST_OS) == redhat ]]~~ ; then \
	23	if test $(HOST_OS) = redhat ; then \
24	24	rm -rf $(SYSTEM_CONF)/ispcp.conf ; \
25	25	cd ./apache && $(MAKE) uninstall ; cd .. ; \
…	…
28	28	cd ./cron.d && $(MAKE) uninstall ; cd .. ; \
29	29	cd ./database && $(MAKE) uninstall ; cd .. ; \
	30	cd ./fcgi && $(MAKE) uninstall ; cd .. ; \
30	31	cd ./init.d && $(MAKE) uninstall ; cd .. ; \
31	32	cd ./postfix && $(MAKE) uninstall ; cd .. ; \

trunk/configs/dists/sles9/Makefile

r473	r830
1	1
2		export
	2	export
3	3
4	4	install:
5	5
6		if ~~[[ $(HOST_OS) == sles9 ]]~~ ; then \
	6	if test $(HOST_OS) = sles9 ; then \
7	7	cp ./ispcp.conf $(SYSTEM_CONF) ; \
8	8	cd ./apache && $(MAKE) install ; cd .. ; \
	9	cd ./awstats && $(MAKE) install ; cd .. ; \
9	10	cd ./bind && $(MAKE) install ; cd .. ; \
10		~~cd ./crontab && $(MAKE) install ; cd .. ; \~~
11	11	cd ./cron.d && $(MAKE) install ; cd .. ; \
12	12	cd ./database && $(MAKE) install ; cd .. ; \
	13	cd ./fcgi && $(MAKE) install ; cd .. ; \
13	14	cd ./init.d && $(MAKE) install ; cd .. ; \
14	15	cd ./postfix && $(MAKE) install ; cd .. ; \
…	…
17	18	cd ./logrotate && $(MAKE) install ; cd .. ; \
18	19	fi
19
	20
20	21	uninstall:
21	22
22		if ~~[[ $(HOST_OS) == sles9 ]]~~ ; then \
	23	if test $(HOST_OS) = sles9 ; then \
23	24	rm -rf $(SYSTEM_CONF)/ispcp.conf ; \
24	25	cd ./apache && $(MAKE) uninstall ; cd .. ; \
	26	cd ./awstats && $(MAKE) uninstall ; cd .. ; \
25	27	cd ./bind && $(MAKE) uninstall ; cd .. ; \
26	28	cd ./crontab && $(MAKE) uninstall ; cd .. ; \
27		~~cd ./cron.d && $(MAKE) uninstall ; cd .. ; \~~
28	29	cd ./database && $(MAKE) uninstall ; cd .. ; \
	30	cd ./fcgi && $(MAKE) uninstall ; cd .. ; \
29	31	cd ./init.d && $(MAKE) uninstall ; cd .. ; \
30	32	cd ./postfix && $(MAKE) uninstall ; cd .. ; \
…	…
33	35	cd ./logrotate && $(MAKE) uninstall ; cd .. ; \
34	36	fi
35
36	37
	38

trunk/configs/dists/suse10/Makefile

r785	r830
4	4	install:
5	5
6		if ~~[[ $(HOST_OS) == suse100 ]]~~ ; then \
	6	if test $(HOST_OS) = suse100 ; then \
7	7	cp ./ispcp.conf $(SYSTEM_CONF) ; \
8	8	cd ./apache && $(MAKE) install ; cd .. ; \
…	…
19	19	uninstall:
20	20
21		if ~~[[ $(HOST_OS) == suse100 ]]~~ ; then \
	21	if test $(HOST_OS) = suse100 ; then \
22	22	rm -rf $(SYSTEM_CONF)/ispcp.conf ; \
23	23	cd ./apache && $(MAKE) uninstall ; cd .. ; \

trunk/configs/dists/ubuntu/Makefile

r473	r830
5	5	install:
6	6
7		if ~~[[ $(HOST_OS) == ubuntu ]]~~ ; then \
	7	if test $(HOST_OS) = ubuntu ; then \
8	8	cp ./ispcp.conf $(SYSTEM_CONF) ; \
9	9	cd ./apache && $(MAKE) install ; cd .. ; \
…	…
23	23	uninstall:
24	24
25		if ~~[[ $(HOST_OS) == ubuntu ]]~~ ; then \
	25	if test $(HOST_OS) = ubuntu ; then \
26	26	rm -rf $(SYSTEM_CONF)/ispcp.conf ; \
27	27	cd ./apache && $(MAKE) uninstall ; cd .. ; \

trunk/configs/dists/ubuntu/apache/Makefile

r773	r830
16	16
17	17	# Ubuntu 7.04?
18		if [[ $(RELEASE) == 'testing/unstable' ]] ; then \
	18	if [[ $(RELEASE) = 'testing/unstable' ]] ; then \
19	19	cp ./fastcgi2.conf ./working/fastcgi_ispcp.conf ; \
20	20	else \

trunk/configs/dists/ubuntu/proftpd/Makefile

r509	r830
9	9
10	10	# Ubuntu 7.04?
11		if [[ $(RELEASE) == 'testing/unstable' ]] ; then \
	11	if [[ $(RELEASE) = 'testing/unstable' ]] ; then \
12	12	if [[ -e /etc/proftpd.conf ]] ; then \
13	13	mv /etc/proftpd.conf /etc/proftpd.conf.bak ; \

trunk/configs/proftpd/Makefile

r652	r830
9	9
10	10	# Debian 4.0 "Etch"?
11		if [ ~~$(RELEASE) == '4.0' ] \|\| [ $(RELEASE) == 'lenny/sid'~~ ]; then \
12		if [ ~~-e /etc/proftpd.conf~~ ] ; then \
	11	if [[ $(RELEASE) = '4.0' ]] \|\| [[ $(RELEASE) = 'lenny/sid' ]]; then \
	12	if [[ -e /etc/proftpd.conf ]] ; then \
13	13	mv /etc/proftpd.conf /etc/proftpd.conf.bak ; \
14	14	fi ; \

trunk/gui/admin/maintenancemode.php

r776	r830
1	1	<?php
2	2	/**
3		* ~~ispCP (OMEGA) - Virtual Hosting Control System \| Omega Version~~
	3	* ispCP ω (OMEGA) a Virtual Hosting Control System
4	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)
	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	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		**/
	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	19
20	20	require '../include/ispcp-lib.php';
…	…
23	23
24	24	$tpl = new pTemplate();
25
26		$tpl -> define_dynamic('page', $cfg['ADMIN_TEMPLATE_PATH'].'/maintenancemode.tpl');
	25	$tpl->define_dynamic('page', $cfg['ADMIN_TEMPLATE_PATH'] . '/maintenancemode.tpl');
27	26
28	27	$theme_color = $cfg['USER_INITIAL_THEME'];
29	28
30		$tpl -> assign(
31		array(
32		'TR_ADMIN_MAINTENANCEMODE_PAGE_TITLE' => tr('ispCP - Admin/Maintenance mode'),
33		'THEME_COLOR_PATH' => "../themes/$theme_color",
34		'THEME_CHARSET' => tr('encoding'),
35		'ISP_LOGO' => get_logo($_SESSION['user_id']),
36		'ISPCP_LICENSE' => $cfg['ISPCP_LICENSE']
37		)
38		);
	29	$tpl->assign(
	30	array(
	31	'TR_ADMIN_MAINTENANCEMODE_PAGE_TITLE' => tr('ispCP - Admin/Maintenance mode'),
	32	'THEME_COLOR_PATH' => "../themes/$theme_color",
	33	'THEME_CHARSET' => tr('encoding'),
	34	'ISP_LOGO' => get_logo($_SESSION['user_id']),
	35	'ISPCP_LICENSE' => $cfg['ISPCP_LICENSE']
	36	)
	37	);
39	38
40	39	$selected_on = '';
…	…
45	44
46	45	$maintenancemode = $_POST['maintenancemode'];
47
48	46	$maintenancemode_message = clean_input($_POST['maintenancemode_message']);
49	47
50	48	setConfig_Value('MAINTENANCEMODE', $maintenancemode);
51
52	49	setConfig_Value('MAINTENANCEMODE_MESSAGE', $maintenancemode_message);
53	50
54	51	set_page_message(tr('Settings saved !'));
55
56	52	}
57	53
…	…
67	63	*
68	64	*/
69		gen_admin_mainmenu($tpl, $cfg['ADMIN_TEMPLATE_PATH'].'/main_menu_system_tools.tpl');
70		gen_admin_menu($tpl, $cfg['ADMIN_TEMPLATE_PATH'].'/menu_system_tools.tpl');
	65	gen_admin_mainmenu($tpl, $cfg['ADMIN_TEMPLATE_PATH'] . '/main_menu_system_tools.tpl');
	66	gen_admin_menu($tpl, $cfg['ADMIN_TEMPLATE_PATH'] . '/menu_system_tools.tpl');
71	67
72		$tpl -> assign(
73		array(
74		'TR_MAINTENANCEMODE' => tr('Maintenance mode'),
75		'TR_MESSAGE_TEMPLATE_INFO' => tr('Under this mode only administrators can login'),
76		'TR_MESSAGE' => tr('Message'),
77		'MESSAGE_VALUE' => $cfg['MAINTENANCEMODE_MESSAGE'],
78		'SELECTED_ON' => $selected_on,
79		'SELECTED_OFF' => $selected_off,
80		'TR_ENABLED' => tr('Enabled'),
81		'TR_DISABLED' => tr('Disabled'),
82		'TR_APPLY_CHANGES' => tr('Apply changes')
83		)
84		);
85
	68	$tpl->assign(
	69	array(
	70	'TR_MAINTENANCEMODE' => tr('Maintenance mode'),
	71	'TR_MESSAGE_TEMPLATE_INFO' => tr('Under this mode only administrators can login'),
	72	'TR_MESSAGE' => tr('Message'),
	73	'MESSAGE_VALUE' => $cfg['MAINTENANCEMODE_MESSAGE'],
	74	'SELECTED_ON' => $selected_on,
	75	'SELECTED_OFF' => $selected_off,
	76	'TR_ENABLED' => tr('Enabled'),
	77	'TR_DISABLED' => tr('Disabled'),
	78	'TR_APPLY_CHANGES' => tr('Apply changes')
	79	)
	80	);
86	81
87	82	gen_page_message($tpl);
88	83
89		$tpl -> parse('PAGE', 'page');
	84	$tpl->parse('PAGE', 'page');
	85	$tpl->prnt();
90	86
91		$tpl -> prnt();
92
93		if ($cfg['DUMP_GUI_DEBUG']) dump_gui_debug();
	87	if ($cfg['DUMP_GUI_DEBUG'])
	88	dump_gui_debug();
94	89
95	90	unset_messages();
	91
96	92	?>

trunk/gui/include/layout-functions.php

r771	r830
1	1	<?php
2	2	/**
3		* ispCP ω (OMEGA) a Virtual Hosting Control System
	3	* ispCP ω (OMEGA) a Virtual Hosting Control System
4	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)
	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	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		**/
	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	*/
20	19
21		//
	20	if (isset($_SESSION['user_id'])) {
	21	if (!isset($_SESSION['logged_from']) && !isset($_SESSION['logged_from_id'])) {
	22	list($user_def_lang, $user_def_layout) = get_user_gui_props($sql, $_SESSION['user_id']);
	23
	24	$_SESSION['user_theme'] = $user_def_layout;
	25	$_SESSION['user_def_lang'] = $user_def_lang;
	26	}
	27	}
	28
22	29	// THEME_COLOR managment stuff.
23		//
24	30
25	31	function get_user_gui_props(&$sql, $user_id) {
	32	global $cfg;
26	33
27		global $cfg;
28
29		$query = <<<SQL_QUERY
	34	$query = <<<SQL_QUERY
30	35	select
31	36	lang, layout
…	…
36	41	SQL_QUERY;
37	42
38		$rs = exec_query($sql, $query, array($user_id));
	43	$rs = exec_query($sql, $query, array($user_id));
39	44
40		if ($rs->RecordCount() == 0 \|\| (empty($rs->fields['lang']) && empty($rs->fields['layout']))) {
41
42		// values for user id, some default stuff
43		return array($cfg['USER_INITIAL_LANG'], $cfg['USER_INITIAL_THEME']);
44
45		} else if (empty($rs->fields['lang'])) {
46
47		return array($cfg['USER_INITIAL_LANG'], $rs->fields['layout']);
48
49		} else if (empty($rs->fields['layout'])) {
50
51		return array($rs->fields['lang'], $cfg['USER_INITIAL_THEME']);
52
53		}
54
55		}
56
57		if (isset($_SESSION['user_id'])) {
58
59		if (!isset($_SESSION['logged_from']) && !isset($_SESSION['logged_from_id'])) {
60
61		list($user_def_lang, $user_def_layout) = get_user_gui_props($sql, $_SESSION['user_id']);
62
63		$_SESSION['user_theme'] = $user_def_layout;
64		$_SESSION['user_def_lang'] = $user_def_lang;
	45	if ($rs->RecordCount() == 0 \|\| (empty($rs->fields['lang']) && empty($rs->fields['layout']))) {
	46	// values for user id, some default stuff
	47	return array($cfg['USER_INITIAL_LANG'], $cfg['USER_INITIAL_THEME']);
	48	}
	49	else if (empty($rs->fields['lang'])) {
	50	return array($cfg['USER_INITIAL_LANG'], $rs->fields['layout']);
	51	}
	52	else if (empty($rs->fields['layout'])) {
	53	return array($rs->fields['lang'], $cfg['USER_INITIAL_THEME']);
	54	}
	55	else {
	56	return array($rs->fields['lang'], $rs->fields['layout']);
65	57	}
66	58	}
67	59
68	60	function gen_page_message(&$tpl) {
69
70		if (!isset($_SESSION['user_page_message'])) {
71		$tpl -> assign('PAGE_MESSAGE', '');
72		$tpl -> assign('MESSAGE', '');
73		} else {
74		$tpl -> assign('MESSAGE', $_SESSION['user_page_message']);
75		unset($_SESSION['user_page_message']);
76		}
77
	61	if (!isset($_SESSION['user_page_message'])) {
	62	$tpl->assign('PAGE_MESSAGE', '');
	63	$tpl->assign('MESSAGE', '');
	64	} else {
	65	$tpl->assign('MESSAGE', $_SESSION['user_page_message']);
	66	unset($_SESSION['user_page_message']);
	67	}
78	68	}
79	69
80	70	function check_language_exist($lang_table) {
81		global $sql;
	71	global $sql;
82	72
83		$tables = $sql->MetaTables();
84		$nlang = count($tables);
85		~~for ($i=~~0 ; $i < $nlang; $i++) {
86		~~$data~~= $tables[$i];
87		if ($data == $lang_table) {
88		return true;
89		}
90		}
91		return false;
	73	$tables = $sql->MetaTables();
	74	$nlang = count($tables);
	75	for ($i = 0 ; $i < $nlang; $i++) {
	76	$data = $tables[$i];
	77	if ($data == $lang_table) {
	78	return true;
	79	}
	80	}
	81	return false;
92	82	}
93	83
94	84	function set_page_message($message) {
95
96		if (isset($_SESSION['user_page_message']))
97		$_SESSION['user_page_message'] .= "<br><br>$message<br><br>";
98		else
99		$_SESSION['user_page_message'] = $message;
	85	if (isset($_SESSION['user_page_message']))
	86	$_SESSION['user_page_message'] .= "<br><br>$message<br><br>";
	87	else
	88	$_SESSION['user_page_message'] = $message;
100	89	}
101	90
…	…
116	105	$rs = exec_query($sql, $query, array($user_id));
117	106
118		$search = array();
	107	$search = array();
119	108	$replace = array();
120	109
…	…
124	113	$replace[] = $_SESSION['user_logged'];
125	114	$search [] = '{cid}';
126		$replace[] = $rs -> fields['customer_id'];
	115	$replace[] = $rs->fields['customer_id'];
127	116	$search [] = '{fname}';
128		$replace[] = $rs -> fields['fname'];
	117	$replace[] = $rs->fields['fname'];
129	118	$search [] = '{lname}';
130		$replace[] = $rs -> fields['lname'];
	119	$replace[] = $rs->fields['lname'];
131	120	$search [] = '{company}';
132		$replace[] = $rs -> fields['firm'];
	121	$replace[] = $rs->fields['firm'];
133	122	$search [] = '{zip}';
134		$replace[] = $rs -> fields['zip'];
	123	$replace[] = $rs->fields['zip'];
135	124	$search [] = '{city}';
136		$replace[] = $rs -> fields['city'];
	125	$replace[] = $rs->fields['city'];
137	126	$search [] = '{country}';
138		$replace[] = $rs -> fields['country'];
	127	$replace[] = $rs->fields['country'];
139	128	$search [] = '{email}';
140		$replace[] = $rs -> fields['email'];
	129	$replace[] = $rs->fields['email'];
141	130	$search [] = '{phone}';
142		$replace[] = $rs -> fields['phone'];
	131	$replace[] = $rs->fields['phone'];
143	132	$search [] = '{fax}';
144		$replace[] = $rs -> fields['fax'];
	133	$replace[] = $rs->fields['fax'];
145	134	$search [] = '{street1}';
146		$replace[] = $rs -> fields['street1'];
	135	$replace[] = $rs->fields['street1'];
147	136	$search [] = '{street2}';
148		$replace[] = $rs -> fields['street2'];
	137	$replace[] = $rs->fields['street2'];
149	138
150	139	$query = <<<SQL_QUERY
…	…
160	149
161	150	$search [] = '{domain_name}';
162		$replace[] = $rs -> fields['domain_name'];
	151	$replace[] = $rs->fields['domain_name'];
163	152
164	153	$menu_link = str_replace($search, $replace, $menu_link);
…	…
168	157	// curently not being used because there's only one layout/theme
169	158	function gen_def_layout(&$tpl, $user_def_layout) {
	159	$layouts = array('blue', 'green', 'red', 'yellow');
170	160
171		$layouts = array('blue', 'green', 'red', 'yellow');
	161	foreach ($layouts as $layout) {
	162	if ($layout === $user_def_layout) {
	163	$selected = 'selected';
	164	} else {
	165	$selected = '';
	166	}
172	167
173		foreach ($layouts as $layout) {
	168	$tpl->assign(
	169	array('LAYOUT_VALUE' => $layout,
	170	'LAYOUT_SELECTED' => $selected,
	171	'LAYOUT_NAME' => $layout
	172	)
	173	);
174	174
175		if ($layout === $user_def_layout) {
176
177		$selected = 'selected';
178
179		} else {
180
181		$selected = '';
182
183		}
184
185		$tpl -> assign(
186		array(
187		'LAYOUT_VALUE' => $layout,
188		'LAYOUT_SELECTED' => $selected,
189		'LAYOUT_NAME' => $layout
190		)
191		);
192
193		$tpl -> parse('DEF_LAYOUT', '.def_layout');
194		}
195
	175	$tpl->parse('DEF_LAYOUT', '.def_layout');
	176	}
196	177	}
197	178

trunk/gui/index.php

r804	r830
64	64	$tpl->define('page', $cfg['LOGIN_TEMPLATE_PATH'].'/maintenancemode.tpl');
65	65
66		$tpl->assign(array(
67		'TR_PAGE_TITLE' => tr('ispCP Omega a Virtual Hosting Control System'),
68		'THEME_COLOR_PATH' => $cfg['LOGIN_TEMPLATE_PATH'],
69		'THEME_CHARSET' => tr('encoding'),
70		'TR_MESSAGE' => nl2br($cfg['MAINTENANCEMODE_MESSAGE']),
71		'TR_ADMINLOGIN' => tr('Administrator login')
72		)
73		);
	66	$tpl->assign(
	67	array(
	68	'TR_PAGE_TITLE' => tr('ispCP Omega a Virtual Hosting Control System'),
	69	'THEME_COLOR_PATH' => $cfg['LOGIN_TEMPLATE_PATH'],
	70	'THEME_CHARSET' => tr('encoding'),
	71	'TR_MESSAGE' => nl2br($cfg['MAINTENANCEMODE_MESSAGE']),
	72	'TR_ADMINLOGIN' => tr('Administrator login')
	73	)
	74	);
74	75
75	76	} else {
…	…
77	78	$tpl->define('page', $cfg['LOGIN_TEMPLATE_PATH'].'/index.tpl');
78	79
79		$tpl->assign(array(
80		'TR_MAIN_INDEX_PAGE_TITLE' => tr('ispCP Omega a Virtual Hosting Control System'),
81		'THEME_COLOR_PATH' => $cfg['LOGIN_TEMPLATE_PATH'],
82		'THEME_CHARSET' => tr('encoding'),
83		'TR_LOGIN' => tr('Login'),
84		'TR_USERNAME' => tr('Username'),
85		'TR_PASSWORD' => tr('Password'),
86		'TR_LOGIN_INFO' => tr('Please enter your login information'),
87		// Please make this configurable by ispcp-lib
88		'TR_SSL_LINK' => isset($_SERVER['HTTPS']) ? 'http://'.$_SERVER['HTTP_HOST'] : 'https://'.$_SERVER['HTTP_HOST'],
89		'TR_SSL_IMAGE' => isset($_SERVER['HTTPS']) ? 'lock.png' : 'unlock.png',
90		'TR_SSL_DESCRIPTION' => !isset($_SERVER['HTTPS']) ? tr('Secure Connection') : tr('Normal Connection')
91		)
92		);
	80	$tpl->assign(
	81	array(
	82	'TR_MAIN_INDEX_PAGE_TITLE' => tr('ispCP Omega a Virtual Hosting Control System'),
	83	'THEME_COLOR_PATH' => $cfg['LOGIN_TEMPLATE_PATH'],
	84	'THEME_CHARSET' => tr('encoding'),
	85	'TR_LOGIN' => tr('Login'),
	86	'TR_USERNAME' => tr('Username'),
	87	'TR_PASSWORD' => tr('Password'),
	88	'TR_LOGIN_INFO' => tr('Please enter your login information'),
	89	// Please make this configurable by ispcp-lib
	90	'TR_SSL_LINK' => isset($_SERVER['HTTPS']) ? 'http://'.$_SERVER['HTTP_HOST'] : 'https://'.$_SERVER['HTTP_HOST'],
	91	'TR_SSL_IMAGE' => isset($_SERVER['HTTPS']) ? 'lock.png' : 'unlock.png',
	92	'TR_SSL_DESCRIPTION' => !isset($_SERVER['HTTPS']) ? tr('Secure Connection') : tr('Normal Connection')
	93	)
	94	);
93	95
94	96	}

trunk/gui/tools/webmail/src/login.php

r826	r830
101	101	body {
102	102	text-align: center;
103		~~background-image: url(../skins/omega/header_right_bg.png);~~
104	103	background-repeat: no-repeat;
105	104	margin: 0;
106	105	padding: 0;
107		background-color: #~~c0c0c0~~;
108		font-family:Geneva, Arial, Helvetica, sans-serif;
	106	background-color: #fffff;
	107	font-family: Geneva, Arial, Helvetica, sans-serif;
109	108	}
110	109
111	110	#container {
112		background-image: url(../images/bg.jpg);
	111	background-image: url(../images/bg.jpg);
113	112	background-repeat: no-repeat;
114	113	background-attachment: scroll;
…	…
219	218	margin: 3em 2em 0 15em;
220	219	}
221		-->
	220	//-->
222	221	</style>
223	222	CSS;

trunk/gui/tools/webmail/src/signout.php

r826	r830
70	70	<!--
71	71	body {
72
73		background-image: url(../skins/omega/header_right_bg.png);
74
	72	text-align: center;
75	73	background-repeat: no-repeat;
76
77		~~text-align: center;~~
78
79	74	margin: 0;
80
81	75	padding: 0;
82
83		background-color: #c0c0c0;
84
85		font-family: Verdana, Lucida, Helvetica;
86
	76	background-color: #ffffff;
	77	font-family: Geneva, Arial, Helvetica, sans-serif;
87	78	}
88	79
89	80	#container {
90
91		background-image: url(../images/bg.jpg);
92
	81	background-image: url(../images/bg.jpg);
93	82	background-repeat: no-repeat;
94
95	83	background-attachment: scroll;
96
97	84	background-position: center left;
98
99	85	margin: 8em auto;
100
101	86	width: 474px;
102
103	87	height: 273px;
104
105	88	position: relative;
106
107	89	}
108	90
109	91	#logo {
110
111	92	width: 140px;
112