Development

Navigation

← Previous Changeset
Next Changeset →

Changeset 1025

Timestamp:

02/26/08 23:16:05 (6 months ago)

Author:

rats

Message:

* Fixed #480: creating a folder as subfolder "[none]" doesn't work
* Fixed #939: Installation Error on Ubuntu Dapper 6.06.1 LTS
* Fixed #1069: Permission script engine/setup/set-engine-permissions.sh

Files:

trunk/CHANGELOG (modified) (5 diffs)
trunk/configs/apache/00_master.conf (modified) (2 diffs)
trunk/configs/dists/ubuntu/postfix/mta-cfg-setup.sh (modified) (2 diffs)
trunk/configs/postfix/mta-cfg-setup.sh (modified) (3 diffs)
trunk/engine/BSDmakefile (modified) (1 diff)
trunk/engine/messager/ispcp-arpl-msgr (modified) (3 diffs)
trunk/engine/setup/ispcp-setup-methods.pl (modified) (1 diff)
trunk/engine/setup/set-engine-permissions.sh (modified) (5 diffs)
trunk/engine/setup/set-gui-permissions.sh (modified) (2 diffs)
trunk/gui/tools/webmail/config/config_local.php (modified) (1 diff)
trunk/tools/daemon/BSDmakefile (modified) (1 diff)

Legend:

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

trunk/CHANGELOG

r1024	r1025
2	2	~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3	3
	4	2008-02-26 Benedikt Heintel
	5	- SETUP:
	6	* Fixed #939: Installation Error on Ubuntu Dapper 6.06.1 LTS
	7	* Fixed #1069: Permission script engine/setup/set-engine-permissions.sh dont work if vu2000 has changed
	8	- TOOLS:
	9	* Fixed #480: creating a folder as subfolder "[none]" doesn't work
4	10
5	11	2008-02-26 Jochen Manz
6		~~- Setup~~:
7		* Corrected the DATABASE_REVISION entry which is inserted when installing ispcp
	12	- SETUP:
	13	* Corrected the DATABASE_REVISION entry which is inserted when installing ispcp
8	14
9	15	2008-02-26 Christian Hernmarck
…	…
20	26	* Fixed #1052: postmaster email not created
21	27
	28	2008-02-25 Benedikt Heintel
	29	- CONFIGS:
	30	* Fixed #994: open_basedir settings: mod-php != php-fastcgi
	31	- SETUP:
	32	* Fixed #792: (ubuntu) errors in make
	33
22	34	2008-02-25 Christian Hernmarck
23	35	- GUI:
	36	* Fixed #747: use of unused field mail_addr in table mail_users
	37	* Fixed #1047: alias emails not deleted
24	38	* Fixed #1068: Patch to fix icon position in WebFTP
25		* Fixed #1047: alias emails not deleted
26		* Fixed #747: use of unused field mail_addr in table mail_users
27	39	* Some smaller fixes (FTP_SHELL->CMD_SHELL, TR_MENU... missing string)
28	40
29	41	2008-02-25 Jochen Manz
30	42	- GUI:
31		* Corrected some small issues and increased the speed of the db update
	43	* Corrected some small issues and increased the speed of the db update
32	44
33	45	2008-02-24 Christian Hernmarck
34	46	- GUI:
35	47	* Some small fixes: domain_statistics & some "remove this" messages
	48	- TOOLS:
	49	* Fixed #871: Small CSS error in Webmail
36	50
37	51	2008-02-24 Benedikt Heintel
…	…
48	62
49	63	2008-02-24 Jochen Manz
50		- ~~TOOLS~~:
51		* ~~Fixed #871: Small CSS error in Webmail~~
	64	- GUI:
	65	* Added: Database update function
52	66
53	67	2008-02-23 Benedikt Heintel
…	…
65	79	- TOOLS:
66	80	* Updated ADOdb to version 4.98
67
68	81
69	82	2008-02-21 Benedikt Heintel
…	…
2757	2770	( and including template tags)
2758	2771
2759		2006-10-20 Malte
	2772	2006-10-20 Malte Geierhos
2760	2773	- Recycled old VHCS-Code to be a base for our new hosting panel!

trunk/configs/apache/00_master.conf

r850	r1025
53	53	<IfModule mod_php4.c>
54	54	<Directory {ROOT_DIR}/gui>
55		php_admin_value open_basedir "{~~ROOT_DIR}/gui/:/etc/ispcp/:/proc/:{APACHE_WWW_DIR}/:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin~~"
	55	php_admin_value open_basedir "{WWW_DIR}/{DMN_NAME}/:{CONF_DIR}/:{MR_LOCK_FILE}:/proc/:/bin/df:/bin/mount:{RKHUNTER_LOG}:{CHKROOTKIT_LOG}:{PEAR_DIR}/{OTHER_ROOTKIT_LOG}"
56	56	php_admin_value session.save_path "{ROOT_DIR}/gui/phptmp/"
57	57	</Directory>
…	…
59	59	<IfModule mod_php5.c>
60	60	<Directory {ROOT_DIR}/gui>
61		php_admin_value open_basedir "{~~ROOT_DIR}/gui/:/etc/ispcp/:/proc/:{APACHE_WWW_DIR}/:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin~~"
	61	php_admin_value open_basedir "{WWW_DIR}/{DMN_NAME}/:{CONF_DIR}/:{MR_LOCK_FILE}:/proc/:/bin/df:/bin/mount:{RKHUNTER_LOG}:{CHKROOTKIT_LOG}:{PEAR_DIR}/{OTHER_ROOTKIT_LOG}"
62	62	php_admin_value session.save_path "{ROOT_DIR}/gui/phptmp/"
63	63	</Directory>

trunk/configs/dists/ubuntu/postfix/mta-cfg-setup.sh

r1016	r1025
1	1	#!/bin/sh
	2
	3	# ispCP ω (OMEGA) a Virtual Hosting Control Panel
	4	# Copyright (c) 2001-2006 by moleSoftware GmbH
	5	# http://www.molesoftware.com
	6	# Copyright (c) 2006-2007 by isp Control Panel
	7	# http://isp-control.net
	8	#
	9	#
	10	# License:
	11	# This program is free software; you can redistribute it and/or
	12	# modify it under the terms of the MPL Mozilla Public License
	13	# as published by the Free Software Foundation; either version 1.1
	14	# of the License, or (at your option) any later version.
	15	#
	16	# This program is distributed in the hope that it will be useful,
	17	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	18	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	19	# MPL Mozilla Public License for more details.
	20	#
	21	# You may have received a copy of the MPL Mozilla Public License
	22	# along with this program.
	23	#
	24	# An on-line copy of the MPL Mozilla Public License can be found
	25	# http://www.mozilla.org/MPL/MPL-1.1.html
	26	#
	27	#
	28	# The ispCP ω Home Page is at:
	29	#
	30	# http://isp-control.net
	31	#
2	32
3	33	MTA_CONF_DIR=/etc/postfix
…	…
23	53	${CMD_MKDIR} -p ${MTA_SYSTEM_CONF_DIR}
24	54
25		${CMD_CP} ./working/{aliases,domains,mailboxes,transport} ${MTA_SYSTEM_CONF_DIR}
	55	${CMD_CP} ./working/aliases ${MTA_SYSTEM_CONF_DIR}
	56	${CMD_CP} ./working/domains ${MTA_SYSTEM_CONF_DIR}
	57	${CMD_CP} ./working/mailboxes ${MTA_SYSTEM_CONF_DIR}
	58	${CMD_CP} ./working/sender-access ${MTA_SYSTEM_CONF_DIR}
	59	${CMD_CP} ./working/transport ${MTA_SYSTEM_CONF_DIR}
26	60
27		${CMD_POSTMAP} ${MTA_SYSTEM_CONF_DIR}/{aliases,domains,mailboxes,transport}
	61	${CMD_POSTMAP} ${MTA_SYSTEM_CONF_DIR}/aliases
	62	${CMD_POSTMAP} ${MTA_SYSTEM_CONF_DIR}/domains
	63	${CMD_POSTMAP} ${MTA_SYSTEM_CONF_DIR}/mailboxes
	64	${CMD_POSTMAP} ${MTA_SYSTEM_CONF_DIR}/sender-access
	65	${CMD_POSTMAP} ${MTA_SYSTEM_CONF_DIR}/transport
28	66
29	67	${CMD_NEWALIASES}

trunk/configs/postfix/mta-cfg-setup.sh

r473	r1025
1	1	#!/bin/bash
	2
	3	# ispCP ω (OMEGA) a Virtual Hosting Control Panel
	4	# Copyright (c) 2001-2006 by moleSoftware GmbH
	5	# http://www.molesoftware.com
	6	# Copyright (c) 2006-2007 by isp Control Panel
	7	# http://isp-control.net
	8	#
	9	#
	10	# License:
	11	# This program is free software; you can redistribute it and/or
	12	# modify it under the terms of the MPL Mozilla Public License
	13	# as published by the Free Software Foundation; either version 1.1
	14	# of the License, or (at your option) any later version.
	15	#
	16	# This program is distributed in the hope that it will be useful,
	17	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	18	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	19	# MPL Mozilla Public License for more details.
	20	#
	21	# You may have received a copy of the MPL Mozilla Public License
	22	# along with this program.
	23	#
	24	# An on-line copy of the MPL Mozilla Public License can be found
	25	# http://www.mozilla.org/MPL/MPL-1.1.html
	26	#
	27	#
	28	# The ispCP ω Home Page is at:
	29	#
	30	# http://isp-control.net
	31	#
2	32
3	33	MTA_CONF_DIR=/etc/postfix
4	34
5	35	MTA_SYSTEM_CONF_DIR=/etc/postfix/ispcp
6
7	36
8	37
…	…
16	45
17	46
18
19	47	${CMD_CP} ./main.cf ${MTA_CONF_DIR}
20	48
…	…
23	51	${CMD_MKDIR} -p ${MTA_SYSTEM_CONF_DIR}
24	52
25		${CMD_CP} ./working/{aliases,domains,mailboxes,transport} ${MTA_SYSTEM_CONF_DIR}
	53	${CMD_CP} ./working/aliases ${MTA_SYSTEM_CONF_DIR}
	54	${CMD_CP} ./working/domains ${MTA_SYSTEM_CONF_DIR}
	55	${CMD_CP} ./working/mailboxes ${MTA_SYSTEM_CONF_DIR}
	56	${CMD_CP} ./working/sender-access ${MTA_SYSTEM_CONF_DIR}
	57	${CMD_CP} ./working/transport ${MTA_SYSTEM_CONF_DIR}
26	58
27		${CMD_POSTMAP} ${MTA_SYSTEM_CONF_DIR}/{aliases,domains,mailboxes,transport}
	59	${CMD_POSTMAP} ${MTA_SYSTEM_CONF_DIR}/aliases
	60	${CMD_POSTMAP} ${MTA_SYSTEM_CONF_DIR}/domains
	61	${CMD_POSTMAP} ${MTA_SYSTEM_CONF_DIR}/mailboxes
	62	${CMD_POSTMAP} ${MTA_SYSTEM_CONF_DIR}/sender-access
	63	${CMD_POSTMAP} ${MTA_SYSTEM_CONF_DIR}/transport
28	64
29	65	${CMD_NEWALIASES}
30

trunk/engine/BSDmakefile

r1009	r1025
	1	# ispCP ω (OMEGA) a Virtual Hosting Control Panel
	2	# Copyright (c) 2001-2006 by moleSoftware GmbH
	3	# http://www.molesoftware.com
	4	# Copyright (c) 2006-2008 by isp Control Panel
	5	# http://isp-control.net
	6	#
	7	#
	8	# License:
	9	# This program is free software; you can redistribute it and/or
	10	# modify it under the terms of the MPL Mozilla Public License
	11	# as published by the Free Software Foundation; either version 1.1
	12	# of the License, or (at your option) any later version.
	13	#
	14	# This program is distributed in the hope that it will be useful,
	15	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	16	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	17	# MPL Mozilla Public License for more details.
	18	#
	19	# You may have received a copy of the MPL Mozilla Public License
	20	# along with this program.
	21	#
	22	# An on-line copy of the MPL Mozilla Public License can be found
	23	# http://www.mozilla.org/MPL/MPL-1.1.html
	24	#
	25	#
	26	# The ISPCP ω Home Page is at:
	27	#
	28	# http://isp-control.net
	29	#
	30
1	31	.ifdef $(OSTYPE)==FreeBSD
2	32	.include <../Makefile.fbsd>

trunk/engine/messager/ispcp-arpl-msgr

r1013	r1025
261	261	} else {
262	262
263		push_el(\@main::el, 'doSQL()', 'ERROR: Incrrect SQL Query -> '.$main::db -> errstr);
	263	push_el(\@main::el, 'doSQL()', 'ERROR: Incorrect SQL Query -> '.$main::db -> errstr);
264	264
265	265	return (-1, '');
…	…
768	768	if ($pt == 1) {
769	769
770		$sql = "select mail_auto_respond from mail_users LEFT JOIN domain ON mail_users.domain_id=domain.domain_id where mail_acc = '$user' and domain_name = '$edmn' and sub_id=0;";
771
772		}
	770	$sql = "select mail_auto_respond from mail_users LEFT JOIN domain ON mail_users.domain_id=domain.domain_id where mail_acc = '$user' and domain_name = '$edmn' and sub_id=0;";
	771
	772	}
773	773	elsif ($pt == 2) {
774	774
775		$sql = "select mail_auto_respond from mail_users LEFT JOIN domain_aliasses ON mail_users.sub_id=domain_aliasses.alias_id where mail_acc = '$user' and alias_name = '$edmn';";
	775	$sql = "select mail_auto_respond from mail_users LEFT JOIN domain_aliasses ON mail_users.sub_id=domain_aliasses.alias_id where mail_acc = '$user' and alias_name = '$edmn';";
776	776
777	777	}
…	…
779	779	elsif ($pt == 3) {
780	780
781		$sql = "select mail_auto_respond from mail_users LEFT JOIN subdomain ON mail_users.sub_id=subdomain.subdomain_id LEFT JOIN domain ON subdomain.domain_id=domain.domain_id where mail_acc = '$user' and (CONCAT(subdomain_name,'.',domain_name) = '$edmn');";
	781	$sql = "select mail_auto_respond from mail_users LEFT JOIN subdomain ON mail_users.sub_id=subdomain.subdomain_id LEFT JOIN domain ON subdomain.domain_id=domain.domain_id where mail_acc = '$user' and (CONCAT(subdomain_name,'.',domain_name) = '$edmn');";
782	782
783	783	}

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

r1012	r1025
1648	1648	#
1649	1649
1650		$rs = store_file("$main::cfg{'TRAFF_LOG_DIR'}/$main::cfg{'FTP_TRAFF_LOG'}", "\n", 'root', 'root', 0644);
	1650	$rs = store_file("$main::cfg{'TRAFF_LOG_DIR'}$main::cfg{'FTP_TRAFF_LOG'}", "\n", 'root', 'root', 0644);
1651	1651	return $rs if ($rs != 0);
1652	1652

trunk/engine/setup/set-engine-permissions.sh

r1016	r1025
4	4	# Copyright (c) 2001-2006 by moleSoftware GmbH
5	5	# http://www.molesoftware.com
6		# Copyright (c) 2006-2007 by isp Control Panel
	6	# Copyright (c) 2006-2008 by isp Control Panel
7	7	# http://isp-control.net
8	8	#
…	…
35	35
36	36	# read needed entries from ispcp.conf
37		for a in `cat /etc/ispcp/ispcp.conf \| grep -E '(ROOT_DIR\|MTA_MAILBOX_\|^LOG_DIR)' \| sed -e 's/ //g'`; do
	37	for a in `cat /etc/ispcp/ispcp.conf \| grep -E '(APACHE_\|ROOT_DIR\|MTA_MAILBOX_\|^LOG_DIR)' \| sed -e 's/ //g'`; do
38	38	export $a
39	39	done
…	…
43	43	#
44	44
45		echo -n " Setting Engine Permissions: ";
	45	echo -n "\tSetting Engine Permissions: ";
46	46
47	47	if [ $DEBUG -eq 1 ]; then
…	…
51	51	# Fix ispcp.conf perms
52	52	if [ $DEBUG -eq 1 ]; then
53		echo -e "\tug+r,u+w,o-r root:~~vu2000~~ /etc/ispcp/ispcp.conf";
	53	echo -e "\tug+r,u+w,o-r root:$APACHE_SUEXEC_USER_PREF$APACHE_SUEXEC_MIN_UID /etc/ispcp/ispcp.conf";
54	54	else
55	55	echo -n ".";
…	…
57	57
58	58	#chmod ug+r,u+w,o-r /etc/ispcp/ispcp.conf
59		chown root:~~vu2000~~ /etc/ispcp/ispcp.conf
	59	chown root:$APACHE_SUEXEC_USER_PREF$APACHE_SUEXEC_MIN_UID /etc/ispcp/ispcp.conf
60	60
61	61	for i in `find $ROOT_DIR/engine/`; do

trunk/engine/setup/set-gui-permissions.sh

r845	r1025
4	4	# Copyright (c) 2001-2006 by moleSoftware GmbH
5	5	# http://www.molesoftware.com
6		# Copyright (c) 2006-2007 by isp Control Panel
	6	# Copyright (c) 2006-2008 by isp Control Panel
7	7	# http://isp-control.net
8	8	#
…	…
42	42	echo "";
43	43	echo "";
44		echo -n " Setting GUI Permissions: ";
	44	echo -n "\tSetting GUI Permissions: ";
45	45
46	46	if [ $DEBUG -eq 1 ]; then

trunk/gui/tools/webmail/config/config_local.php

r821	r1025
15	15	*/
16	16
	17	/**
	18	* Possible IMAP servers are:
	19	* bincimap
	20	* courier
	21	* cyrus
	22	* dovecot
	23	* exchange
	24	* hmailserver
	25	* macosx
	26	* mercury32
	27	* uw
	28	*
	29	* others (for default)
	30	*/
	31
	32	$imap_server_type = "courier";
	33
	34
	35	/**
	36	* 'cyrus' settings
	37	*/
	38	if ($imap_server_type == "cyrus") {
	39	$default_folder_prefix = "";
	40	$trash_folder = "INBOX.Trash";
	41	$sent_folder = "INBOX.Sent";
	42	$draft_folder = "INBOX.Drafts";
	43	$show_prefix_option = false;
	44	$default_sub_of_inbox = true;
	45	$show_contain_subfolders_option = false;
	46	$optional_delimiter = ".";
	47	$delete_folder = true;
	48	$force_username_lowercase = false;
	49	}
	50	/**
	51	* 'courier' settings
	52	*/
	53	else if ($imap_server_type == "courier") {
	54	$default_folder_prefix = "INBOX.";
	55	$trash_folder = "Trash";
	56	$sent_folder = "Sent";
	57	$draft_folder = "Drafts";
	58	$show_prefix_option = false;
	59	$default_sub_of_inbox = false;
	60	$show_contain_subfolders_option = false;
	61	$optional_delimiter = ".";
	62	$delete_folder = true;
	63	$force_username_lowercase = false;
	64	}
	65	/**
	66	* 'dovecot' settings
	67	*/
	68	else if ($imap_server_type == "dovecot") {
	69	$default_folder_prefix = "";
	70	$trash_folder = "Trash";
	71	$sent_folder = "Sent";
	72	$draft_folder = "Drafts";
	73	$show_prefix_option = false;
	74	$default_sub_of_inbox = false;
	75	$show_contain_subfolders_option = false;
	76	$optional_delimiter = "detect";
	77	$delete_folder = false;
	78	$force_username_lowercase = true;
	79	}

trunk/tools/daemon/BSDmakefile

r1015 r1025

33 33 #else
34 34 CFLAGS += -O3
35 ~~endif~~
36 35 #endif
37 36

Development

Navigation

Changeset 1025

Legend:

Download in other formats: