diff options
Diffstat (limited to 'syscp/patches')
189 files changed, 0 insertions, 11918 deletions
diff --git a/syscp/patches/gentoo-config-files/bind-ssl/etc_libnss-mysql-root.cfg b/syscp/patches/gentoo-config-files/bind-ssl/etc_libnss-mysql-root.cfg deleted file mode 100644 index 6498977..0000000 --- a/syscp/patches/gentoo-config-files/bind-ssl/etc_libnss-mysql-root.cfg +++ /dev/null @@ -1,2 +0,0 @@ -username <SQL_UNPRIVILEGED_USER> -password <SQL_UNPRIVILEGED_PASSWORD> diff --git a/syscp/patches/gentoo-config-files/bind-ssl/etc_libnss-mysql.cfg b/syscp/patches/gentoo-config-files/bind-ssl/etc_libnss-mysql.cfg deleted file mode 100644 index d284192..0000000 --- a/syscp/patches/gentoo-config-files/bind-ssl/etc_libnss-mysql.cfg +++ /dev/null @@ -1,38 +0,0 @@ -getpwnam SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ - FROM ftp_users \ - WHERE username='%1$s' \ - LIMIT 1 -getpwuid SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ - FROM ftp_users \ - WHERE uid='%1$u' \ - LIMIT 1 -getspnam SELECT username,password,UNIX_TIMESTAMP()-10,'1','2','7','-1','-1','0' \ - FROM ftp_users \ - WHERE username='%1$s' \ - LIMIT 1 -getpwent SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ - FROM ftp_users -getspent SELECT username,password,UNIX_TIMESTAMP()-10,'1','2','7','-1','-1','0' \ - FROM ftp_users -getgrnam SELECT groupname,'x',gid \ - FROM ftp_groups \ - WHERE groupname='%1$s' \ - LIMIT 1 -getgrgid SELECT groupname,'x',gid \ - FROM ftp_groups \ - WHERE gid='%1$u' \ - LIMIT 1 -getgrent SELECT groupname,'x',gid \ - FROM ftp_groups -memsbygid SELECT username \ - FROM ftp_users \ - WHERE gid='%1$u' -gidsbymem SELECT gid \ - FROM ftp_users \ - WHERE username='%1$s' - -host <SQL_HOST> -database <SQL_DB> -username <SQL_UNPRIVILEGED_USER> -password <SQL_UNPRIVILEGED_PASSWORD> -socket /var/run/mysqld/mysqld.sock diff --git a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/bind/etc_bind_default.zone b/syscp/patches/gentoo-config-files/bind-ssl/gentoo/bind/etc_bind_default.zone deleted file mode 100644 index 817b9bc..0000000 --- a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/bind/etc_bind_default.zone +++ /dev/null @@ -1,21 +0,0 @@ -$TTL 1W -@ IN SOA ns root ( - 2004060501 ; serial - 8H ; refresh - 2H ; retry - 1W ; expiry - 11h) ; minimum - - IN NS ns - IN MX 10 mail - - IN A <SERVERIP> - IN MX 10 mail - -* IN A <SERVERIP> - IN MX 10 mail - -ns IN A <SERVERIP> - -mail IN A <SERVERIP> - IN MX 10 mail diff --git a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/courier/etc_courier-imap_imapd b/syscp/patches/gentoo-config-files/bind-ssl/gentoo/courier/etc_courier-imap_imapd deleted file mode 100644 index f594e41..0000000 --- a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/courier/etc_courier-imap_imapd +++ /dev/null @@ -1,376 +0,0 @@ -##VERSION: $Id: imapd.dist.in,v 1.32 2004/11/25 04:57:04 mrsam Exp $ -# -# imapd created from imapd.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# Copyright 1998 - 2004 Double Precision, Inc. See COPYING for -# distribution information. -# -# This configuration file sets various options for the Courier-IMAP server -# when used with the couriertcpd server. -# A lot of the stuff here is documented in the manual page for couriertcpd. -# -# NOTE - do not use \ to split long variable contents on multiple lines. -# This will break the default imapd.rc script, which parses this file. -# -##NAME: ADDRESS:0 -# -# Address to listen on, can be set to a single IP address. -# -# ADDRESS=127.0.0.1 - -ADDRESS=0 - -##NAME: PORT:1 -# -# Port numbers that connections are accepted on. The default is 143, -# the standard IMAP port. -# -# Multiple port numbers can be separated by commas. When multiple port -# numbers are used it is possible to select a specific IP address for a -# given port as "ip.port". For example, "127.0.0.1.900,192.68.0.1.900" -# accepts connections on port 900 on IP addresses 127.0.0.1 and 192.68.0.1 -# The previous ADDRESS setting is a default for ports that do not have -# a specified IP address. - -PORT=143 - -##NAME: AUTHSERVICE:0 -# -# It's possible to authenticate using a different 'service' parameter -# depending on the connection's port. This only works with authentication -# modules that use the 'service' parameter, such as PAM. Example: -# -# AUTHSERVICE143=imap -# AUTHSERVICE993=imaps - -##NAME: MAXDAEMONS:0 -# -# Maximum number of IMAP servers started -# - -MAXDAEMONS=50 - -##NAME: MAXPERIP:0 -# -# Maximum number of connections to accept from the same IP address - -MAXPERIP=10 - -##NAME: PIDFILE:0 -# -# File where couriertcpd will save its process ID -# - -PIDFILE=/var/run/imapd.pid - -##NAME: TCPDOPTS:0 -# -# Miscellaneous couriertcpd options that shouldn't be changed. -# - -TCPDOPTS="-nodnslookup -noidentlookup" - -##NAME: IMAP_CAPABILITY:1 -# -# IMAP_CAPABILITY specifies what most of the response should be to the -# CAPABILITY command. -# -# If you have properly configured Courier to use CRAM-MD5 or CRAM-SHA1 -# authentication (see INSTALL), set IMAP_CAPABILITY as follows: -# -# IMAP_CAPABILITY="IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 IDLE" -# - -IMAP_CAPABILITY="IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA IDLE" - -##NAME: KEYWORDS_CAPABILITY:0 -# -# IMAP_KEYWORDS=1 enables custom IMAP keywords. Set this option to 0 to -# disable custom keywords. - -IMAP_KEYWORDS=1 - -##NAME: SMAP1_CAPABILITY:0 -# -# EXPERIMENTAL -# -# To enable the experimental "Simple Mail Access Protocol" extensions, -# uncomment the following setting. -# -# SMAP_CAPABILITY=SMAP1 - -##NAME: IMAP_CAPABILITY_ORIG:1 -# -# For use by webadmin - -IMAP_CAPABILITY_ORIG="IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 IDLE" - -##NAME: IMAP_PROXY:0 -# -# Enable proxying. See README.proxy - -IMAP_PROXY=0 - -##NAME: IMAP_PROXY_FOREIGN:0 -# -# Proxying to non-Courier servers. Re-sends the CAPABILITY command after -# logging in to the remote server. May not work with all IMAP clients. - -IMAP_PROXY_FOREIGN=0 - -##NAME: IMAP_IDLE_TIMEOUT:0 -# -# This setting controls how often -# the server polls for changes to the folder, in IDLE mode (in seconds). - -IMAP_IDLE_TIMEOUT=60 - -##NAME: IMAP_CAPABILITY_TLS:0 -# -# The following setting will advertise SASL PLAIN authentication after -# STARTTLS is established. If you want to allow SASL PLAIN authentication -# with or without TLS then just comment this out, and add AUTH=PLAIN to -# IMAP_CAPABILITY - -IMAP_CAPABILITY_TLS="$IMAP_CAPABILITY AUTH=PLAIN" - -##NAME: IMAP_TLS_ORIG:0 -# -# For use by webadmin - -IMAP_CAPABILITY_TLS_ORIG="$IMAP_CAPABILITY_ORIG AUTH=PLAIN" - -##NAME: IMAP_DISABLETHREADSORT:0 -# -# Set IMAP_DISABLETHREADSORT to disable the THREAD and SORT commands - -# server side sorting and threading. -# -# Those capabilities will still be advertised, but the server will reject -# them. Set this option if you want to disable all the extra load from -# server-side threading and sorting. Not advertising those capabilities -# will simply result in the clients reading the entire folder, and sorting -# it on the client side. That will still put some load on the server. -# advertising these capabilities, but rejecting the commands, will stop this -# silliness. -# - -IMAP_DISABLETHREADSORT=0 - -##NAME: IMAP_CHECK_ALL_FOLDERS:0 -# -# Set IMAP_CHECK_ALL_FOLDERS to 1 if you want the server to check for new -# mail in every folder. Not all IMAP clients use the IMAP's new mail -# indicator, but some do. Normally new mail is checked only in INBOX, -# because it is a comparatively time consuming operation, and it would be -# a complete waste of time unless mail filters are used to deliver -# mail directly to folders. -# -# When IMAP clients are used which support new mail indication, and when -# mail filters are used to sort incoming mail into folders, setting -# IMAP_CHECK_ALL_FOLDERS to 1 will allow IMAP clients to announce new -# mail in folders. Note that this will result in slightly more load on the -# server. -# - -IMAP_CHECK_ALL_FOLDERS=0 - -##NAME: IMAP_OBSOLETE_CLIENT:0 -# -# Set IMAP_OBSOLETE_CLIENT if your IMAP client expects \\NoInferiors to mean -# what \\HasNoChildren really means. - -IMAP_OBSOLETE_CLIENT=0 - -##NAME: IMAP_UMASK:0 -# -# IMAP_UMASK sets the umask of the server process. The value of IMAP_UMASK is -# simply passed to the "umask" command. The default value is 022. -# -# This feature is mostly useful for shared folders, where the file permissions -# of the messages may be important. - -IMAP_UMASK=027 - -##NAME: IMAP_ULIMITD:0 -# -# IMAP_ULIMITD sets the maximum size of the data segment of the server -# process. The value of IMAP_ULIMITD is simply passed to the "ulimit -d" -# command (or ulimit -v). The argument to ulimi sets the upper limit on the -# size of the data segment of the server process, in kilobytes. The default -# value of 65536 sets a very generous limit of 64 megabytes, which should -# be more than plenty for anyone. -# -# This feature is used as an additional safety check that should stop -# any potential denial-of-service attacks that exploit any kind of -# a memory leak to exhaust all the available memory on the server. -# It is theoretically possible that obscenely huge folders will also -# result in the server running out of memory when doing server-side -# sorting (by my calculations you have to have at least 100,000 messages -# in a single folder, for that to happen). - -IMAP_ULIMITD=65536 - -##NAME: IMAP_USELOCKS:0 -# -# Setting IMAP_USELOCKS to 1 will use dot-locking to support concurrent -# multiple access to the same folder. This incurs slight additional -# overhead. Concurrent multiple access will still work without this setting, -# however occasionally a minor race condition may result in an IMAP client -# downloading the same message twice, or a keyword update will fail. -# -# IMAP_USELOCKS=1 is strongly recommended when shared folders are used. - -IMAP_USELOCKS=1 - -##NAME: IMAP_SHAREDINDEXFILE:0 -# -# The index of all accessible folders. Do not change this setting unless -# you know what you're doing. See README.sharedfolders for additional -# information. - -IMAP_SHAREDINDEXFILE=/etc/courier-imap/shared/index - -##NAME: IMAP_ENHANCEDIDLE:0 -# -# If Courier was compiled with the File Alteration Monitor, setting -# IMAP_ENHANCEDIDLE to 1 enables enhanced IDLE mode, where multiple -# clients may open the same folder concurrently, and receive updates to -# folder contents in realtime. See the imapd(8) man page for additional -# information. -# -# IMPORTANT: IMAP_USELOCKS *MUST* also be set to 1, and IDLE must be included -# in the IMAP_CAPABILITY list. -# - -IMAP_ENHANCEDIDLE=0 - -##NAME: IMAP_TRASHFOLDERNAME:0 -# -# The name of the magic trash Folder. For MSOE compatibility, -# you can set IMAP_TRASHFOLDERNAME="Deleted Items". -# -# IMPORTANT: If you change this, you must also change IMAP_EMPTYTRASH - -IMAP_TRASHFOLDERNAME=Trash - -##NAME: IMAP_EMPTYTRASH:0 -# -# The following setting is optional, and causes messages from the given -# folder to be automatically deleted after the given number of days. -# IMAP_EMPTYTRASH is a comma-separated list of folder:days. The default -# setting, below, purges 7 day old messages from the Trash folder. -# Another useful setting would be: -# -# IMAP_EMPTYTRASH=Trash:7,Sent:30 -# -# This would also delete messages from the Sent folder (presumably copies -# of sent mail) after 30 days. This is a global setting that is applied to -# every mail account, and is probably useful in a controlled, corporate -# environment. -# -# Important: the purging is controlled by CTIME, not MTIME (the file time -# as shown by ls). It is perfectly ordinary to see stuff in Trash that's -# a year old. That's the file modification time, MTIME, that's displayed. -# This is generally when the message was originally delivered to this -# mailbox. Purging is controlled by a different timestamp, CTIME, which is -# changed when the file is moved to the Trash folder (and at other times too). -# -# You might want to disable this setting in certain situations - it results -# in a stat() of every file in each folder, at login and logout. -# - -IMAP_EMPTYTRASH=Trash:7 - -##NAME: IMAP_MOVE_EXPUNGE_TO_TRASH:0 -# -# Set IMAP_MOVE_EXPUNGE_TO_TRASH to move expunged messages to Trash. This -# effectively allows an undo of message deletion by fishing the deleted -# mail from trash. Trash can be manually expunged as usually, and mail -# will get automatically expunged from Trash according to IMAP_EMPTYTRASH. -# -# NOTE: shared folders are still expunged as usual. Shared folders are -# not affected. -# - -IMAP_MOVE_EXPUNGE_TO_TRASH=0 - - -##NAME: OUTBOX:0 -# -# The next set of options deal with the "Outbox" enhancement. -# Uncomment the following setting to create a special folder, named -# INBOX.Outbox -# -# OUTBOX=.Outbox - -##NAME: SENDMAIL:0 -# -# If OUTBOX is defined, mail can be sent via the IMAP connection by copying -# a message to the INBOX.Outbox folder. For all practical matters, -# INBOX.Outbox looks and behaves just like any other IMAP folder. If this -# folder doesn't exist it must be created by the IMAP mail client, just -# like any other IMAP folder. The kicker: any message copied or moved to -# this folder is will be E-mailed by the Courier-IMAP server, by running -# the SENDMAIL program. Therefore, messages copied or moved to this -# folder must be well-formed RFC-2822 messages, with the recipient list -# specified in the To:, Cc:, and Bcc: headers. Courier-IMAP relies on -# SENDMAIL to read the recipient list from these headers (and delete the Bcc: -# header) by running the command "$SENDMAIL -oi -t -f $SENDER", with the -# message piped on standard input. $SENDER will be the return address -# of the message, which is set by the authentication module. -# -# DO NOT MODIFY SENDMAIL, below, unless you know what you're doing. -# - -SENDMAIL=/usr/sbin/sendmail - -##NAME: HEADERFROM:0 -# -# For administrative and oversight purposes, the return address, $SENDER -# will also be saved in the X-IMAP-Sender mail header. This header gets -# added to the sent E-mail (but it doesn't get saved in the copy of the -# message that's saved in the folder) -# -# WARNING - By enabling OUTBOX above, *every* IMAP mail client will receive -# the magic OUTBOX treatment. Therefore advance LARTing is in order for -# _all_ of your lusers, until every one of them is aware of this. Otherwise if -# OUTBOX is left at its default setting - a folder name that might be used -# accidentally - some people may be in for a rude surprise. You can redefine -# the name of the magic folder by changing OUTBOX, above. You should do that -# and pick a less-obvious name. Perhaps brand it with your organizational -# name ( OUTBOX=.WidgetsAndSonsOutbox ) - -HEADERFROM=X-IMAP-Sender - -##NAME: IMAPDSTART:0 -# -# IMAPDSTART is not used directly. Rather, this is a convenient flag to -# be read by your system startup script in /etc/rc.d, like this: -# -# . /etc/courier-imap/imapd -# -# case x$IMAPDSTART in -# x[yY]*) -# /usr/lib/courier-imap/imapd.rc start -# ;; -# esac -# -# The default setting is going to be NO, so you'll have to manually flip -# it to yes. - -IMAPDSTART=YES - -##NAME: MAILDIRPATH:0 -# -# MAILDIRPATH - directory name of the maildir directory. -# -MAILDIRPATH=Maildir - -#Hardwire a value for ${MAILDIR} -MAILDIR=.maildir -MAILDIRPATH=.maildir -#Put any program for ${PRERUN} here -PRERUN= diff --git a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/courier/etc_courier-imap_imapd-ssl b/syscp/patches/gentoo-config-files/bind-ssl/gentoo/courier/etc_courier-imap_imapd-ssl deleted file mode 100644 index 76dbcf7..0000000 --- a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/courier/etc_courier-imap_imapd-ssl +++ /dev/null @@ -1,199 +0,0 @@ -##VERSION: $Id: imapd-ssl.dist.in,v 1.11 2004/10/21 00:45:35 mrsam Exp $ -# -# imapd-ssl created from imapd-ssl.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# Copyright 2000 - 2004 Double Precision, Inc. See COPYING for -# distribution information. -# -# This configuration file sets various options for the Courier-IMAP server -# when used to handle SSL IMAP connections. -# -# SSL and non-SSL connections are handled by a dedicated instance of the -# couriertcpd daemon. If you are accepting both SSL and non-SSL IMAP -# connections, you will start two instances of couriertcpd, one on the -# IMAP port 143, and another one on the IMAP-SSL port 993. -# -# Download OpenSSL from http://www.openssl.org/ -# -##NAME: SSLPORT:1 -# -# Options in the imapd-ssl configuration file AUGMENT the options in the -# imapd configuration file. First the imapd configuration file is read, -# then the imapd-ssl configuration file, so we do not have to redefine -# anything. -# -# However, some things do have to be redefined. The port number is -# specified by SSLPORT, instead of PORT. The default port is port 993. -# -# Multiple port numbers can be separated by commas. When multiple port -# numbers are used it is possibly to select a specific IP address for a -# given port as "ip.port". For example, "127.0.0.1.900,192.68.0.1.900" -# accepts connections on port 900 on IP addresses 127.0.0.1 and 192.68.0.1 -# The SSLADDRESS setting is a default for ports that do not have -# a specified IP address. - -SSLPORT=993 - -##NAME: SSLADDRESS:0 -# -# Address to listen on, can be set to a single IP address. -# -# SSLADDRESS=127.0.0.1 - -SSLADDRESS=0 - -##NAME: SSLPIDFILE:0 -# -# That's the SSL IMAP port we'll listen on. -# Feel free to redefine MAXDAEMONS, TCPDOPTS, and MAXPERIP. - -SSLPIDFILE=/var/run/imapd-ssl.pid - -##NAME: IMAPDSSLSTART:0 -# -# Different pid files, so that both instances of couriertcpd can coexist -# happily. -# -# You can also redefine IMAP_CAPABILITY, although I can't -# think of why you'd want to do that. -# -# -# Ok, the following settings are new to imapd-ssl: -# -# Whether or not to start IMAP over SSL on simap port: - -IMAPDSSLSTART=YES - -##NAME: IMAPDSTARTTLS:0 -# -# Whether or not to implement IMAP STARTTLS extension instead: - -IMAPDSTARTTLS=YES - -##NAME: IMAP_TLS_REQUIRED:1 -# -# Set IMAP_TLS_REQUIRED to 1 if you REQUIRE STARTTLS for everyone. -# (this option advertises the LOGINDISABLED IMAP capability, until STARTTLS -# is issued). - -IMAP_TLS_REQUIRED=0 - -######################################################################### -# -# The following variables configure IMAP over SSL. If OpenSSL is available -# during configuration, the couriertls helper gets compiled, and upon -# installation a dummy TLS_CERTFILE gets generated. courieresmtpd will -# automatically advertise the ESMTP STARTTLS extension if both TLS_CERTFILE -# and COURIERTLS exist. -# -# WARNING: Peer certificate verification has NOT yet been tested. Proceed -# at your own risk. Only the basic SSL/TLS functionality is known to be -# working. Keep this in mind as you play with the following variables. -# -##NAME: COURIERTLS:0 -# - -COURIERTLS=/usr/sbin/couriertls - -##NAME: TLS_PROTOCOL:0 -# -# TLS_PROTOCOL sets the protocol version. The possible versions are: -# -# SSL2 - SSLv2 -# SSL3 - SSLv3 -# TLS1 - TLS1 - -TLS_PROTOCOL=SSL3 - -##NAME: TLS_STARTTLS_PROTOCOL:0 -# -# TLS_STARTTLS_PROTOCOL is used instead of TLS_PROTOCOL for the IMAP STARTTLS -# extension, as opposed to IMAP over SSL on port 993. -# - -TLS_STARTTLS_PROTOCOL=TLS1 - -##NAME: TLS_CIPHER_LIST:0 -# -# TLS_CIPHER_LIST optionally sets the list of ciphers to be used by the -# OpenSSL library. In most situations you can leave TLS_CIPHER_LIST -# undefined -# -# TLS_CIPHER_LIST="ALL:!ADH:RC4+RSA:+SSLv2:@STRENGTH" - -##NAME: TLS_TIMEOUT:0 -# TLS_TIMEOUT is currently not implemented, and reserved for future use. -# This is supposed to be an inactivity timeout, but its not yet implemented. -# - -##NAME: TLS_DHCERTFILE:0 -# -# TLS_DHCERTFILE - PEM file that stores our Diffie-Hellman cipher pair. -# When OpenSSL is compiled to use Diffie-Hellman ciphers instead of RSA -# you must generate a DH pair that will be used. In most situations the -# DH pair is to be treated as confidential, and the file specified by -# TLS_DHCERTFILE must not be world-readable. -# -# TLS_DHCERTFILE= - -##NAME: TLS_CERTFILE:0 -# -# TLS_CERTFILE - certificate to use. TLS_CERTFILE is required for SSL/TLS -# servers, and is optional for SSL/TLS clients. TLS_CERTFILE is usually -# treated as confidential, and must not be world-readable. -# -TLS_CERTFILE=/etc/ssl/server/<SERVERNAME>.crt_and_key - -##NAME: TLS_TRUSTCERTS:0 -# -# TLS_TRUSTCERTS=pathname - load trusted certificates from pathname. -# pathname can be a file or a directory. If a file, the file should -# contain a list of trusted certificates, in PEM format. If a -# directory, the directory should contain the trusted certificates, -# in PEM format, one per file and hashed using OpenSSL's c_rehash -# script. TLS_TRUSTCERTS is used by SSL/TLS clients (by specifying -# the -domain option) and by SSL/TLS servers (TLS_VERIFYPEER is set -# to PEER or REQUIREPEER). -# -# -# TLS_TRUSTCERTS= - -##NAME: TLS_VERIFYPEER:0 -# -# TLS_VERIFYPEER - how to verify client certificates. The possible values of -# this setting are: -# -# NONE - do not verify anything -# -# PEER - verify the client certificate, if one's presented -# -# REQUIREPEER - require a client certificate, fail if one's not presented -# -# -TLS_VERIFYPEER=NONE - -##NAME: TLS_CACHE:0 -# -# A TLS/SSL session cache may slightly improve response for IMAP clients -# that open multiple SSL sessions to the server. TLS_CACHEFILE will be -# automatically created, TLS_CACHESIZE bytes long, and used as a cache -# buffer. -# -# This is an experimental feature and should be disabled if it causes -# problems with SSL clients. Disable SSL caching by commenting out the -# following settings: - -TLS_CACHEFILE=/var/lib/courier-imap/couriersslcache -TLS_CACHESIZE=524288 - -##NAME: MAILDIRPATH:0 -# -# MAILDIRPATH - directory name of the maildir directory. -# -MAILDIRPATH=Maildir - -#Hardwire a value for ${MAILDIR} -MAILDIRPATH=.maildir diff --git a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/courier/etc_courier-imap_pop3d b/syscp/patches/gentoo-config-files/bind-ssl/gentoo/courier/etc_courier-imap_pop3d deleted file mode 100644 index 71502ae..0000000 --- a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/courier/etc_courier-imap_pop3d +++ /dev/null @@ -1,127 +0,0 @@ -##VERSION: $Id: pop3d.dist.in,v 1.11 2004/10/30 15:39:38 mrsam Exp $ -# -# pop3d created from pop3d.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# Copyright 1998 - 2004 Double Precision, Inc. See COPYING for -# distribution information. -# -# Courier POP3 daemon configuration -# -##NAME: PIDFILE:0 -# - -PIDFILE=/var/run/pop3d.pid - -##NAME: MAXDAEMONS:0 -# -# Maximum number of POP3 servers started -# - -MAXDAEMONS=50 - -##NAME: MAXPERIP:4 -# -# Maximum number of connections to accept from the same IP address - -MAXPERIP=5 - -##NAME: POP3AUTH:1 -# -# To advertise the SASL capability, per RFC 2449, uncomment the POP3AUTH -# variable: -# -# POP3AUTH="LOGIN" -# -# If you have configured the CRAM-MD5 or CRAM-SHA1, set POP3AUTH to something -# like this: -# -# POP3AUTH="LOGIN CRAM-MD5 CRAM-SHA1" - -POP3AUTH="" - -##NAME: POP3AUTH_ORIG:0 -# -# For use by webadmin - -POP3AUTH_ORIG="LOGIN CRAM-MD5 CRAM-SHA1" - -##NAME: POP3AUTH_TLS:1 -# -# To also advertise SASL PLAIN if SSL is enabled, uncomment the -# POP3AUTH_TLS environment variable: -# -# POP3AUTH_TLS="LOGIN PLAIN" - -POP3AUTH_TLS="" - -##NAME: POP3AUTH_TLS_ORIG:0 -# -# For use by webadmin - -POP3AUTH_TLS_ORIG="LOGIN PLAIN" - -##NAME: POP3_PROXY:0 -# -# Enable proxying. See README.proxy - -POP3_PROXY=0 - -##NAME: PORT:1 -# -# Port to listen on for connections. The default is port 110. -# -# Multiple port numbers can be separated by commas. When multiple port -# numbers are used it is possibly to select a specific IP address for a -# given port as "ip.port". For example, "127.0.0.1.900,192.68.0.1.900" -# accepts connections on port 900 on IP addresses 127.0.0.1 and 192.68.0.1 -# The ADDRESS setting is a default for ports that do not have a specified -# IP address. - -PORT=110 - -##NAME: ADDRESS:0 -# -# IP address to listen on. 0 means all IP addresses. - -ADDRESS=0 - -##NAME: TCPDOPTS:0 -# -# Other couriertcpd(1) options. The following defaults should be fine. -# - -TCPDOPTS="-nodnslookup -noidentlookup" - -##NAME: POP3DSTART:0 -# -# POP3DSTART is not referenced anywhere in the standard Courier programs -# or scripts. Rather, this is a convenient flag to be read by your system -# startup script in /etc/rc.d, like this: -# -# . /etc/courier-imap/pop3d -# case x$POP3DSTART in -# x[yY]*) -# /usr/lib/courier-imap/pop3d.rc start -# ;; -# esac -# -# The default setting is going to be NO, until Courier is shipped by default -# with enough platforms so that people get annoyed with having to flip it to -# YES every time. - -POP3DSTART=YES - -##NAME: MAILDIRPATH:0 -# -# MAILDIRPATH - directory name of the maildir directory. -# -MAILDIRPATH=Maildir - -#Hardwire a value for ${MAILDIR} -MAILDIR=.maildir -MAILDIRPATH=.maildir -#Put any program for ${PRERUN} here -PRERUN= diff --git a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/courier/etc_courier-imap_pop3d-ssl b/syscp/patches/gentoo-config-files/bind-ssl/gentoo/courier/etc_courier-imap_pop3d-ssl deleted file mode 100644 index a0267a0..0000000 --- a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/courier/etc_courier-imap_pop3d-ssl +++ /dev/null @@ -1,186 +0,0 @@ -##VERSION: $Id: pop3d-ssl.dist.in,v 1.12 2004/10/21 00:45:35 mrsam Exp $ -# -# pop3d-ssl created from pop3d-ssl.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# Copyright 2000-2004 Double Precision, Inc. See COPYING for -# distribution information. -# -# This configuration file sets various options for the Courier-IMAP server -# when used to handle SSL POP3 connections. -# -# SSL and non-SSL connections are handled by a dedicated instance of the -# couriertcpd daemon. If you are accepting both SSL and non-SSL POP3 -# connections, you will start two instances of couriertcpd, one on the -# POP3 port 110, and another one on the POP3-SSL port 995. -# -# Download OpenSSL from http://www.openssl.org/ -# -##NAME: SSLPORT:0 -# -# Options in the pop3d-ssl configuration file AUGMENT the options in the -# pop3d configuration file. First the pop3d configuration file is read, -# then the pop3d-ssl configuration file, so we do not have to redefine -# anything. -# -# However, some things do have to be redefined. The port number is -# specified by SSLPORT, instead of PORT. The default port is port 995. -# -# Multiple port numbers can be separated by commas. When multiple port -# numbers are used it is possibly to select a specific IP address for a -# given port as "ip.port". For example, "127.0.0.1.900,192.68.0.1.900" -# accepts connections on port 900 on IP addresses 127.0.0.1 and 192.68.0.1 -# The SSLADDRESS setting is a default for ports that do not have -# a specified IP address. - -SSLPORT=995 - -##NAME: SSLADDRESS:0 -# -# Address to listen on, can be set to a single IP address. -# -# SSLADDRESS=127.0.0.1 - -SSLADDRESS=0 - -##NAME: SSLPIDFILE:0 -# -# -# - -SSLPIDFILE=/var/run/pop3d-ssl.pid - -##NAME: POP3DSSLSTART:0 -# -# Whether or not to start POP3 over SSL on spop3 port: - -POP3DSSLSTART=YES - -##NAME: POP3_STARTTLS:0 -# -# Whether or not to implement the POP3 STLS extension: - -POP3_STARTTLS=YES - -##NAME: POP3_TLS_REQUIRED:1 -# -# Set POP3_TLS_REQUIRED to 1 if you REQUIRE STARTTLS for everyone. -# (this option advertises the LOGINDISABLED POP3 capability, until STARTTLS -# is issued). - -POP3_TLS_REQUIRED=0 - -##NAME: COURIERTLS:0 -# -# The following variables configure POP3 over SSL. If OpenSSL is available -# during configuration, the couriertls helper gets compiled, and upon -# installation a dummy TLS_CERTFILE gets generated. courieresmtpd will -# automatically advertise the ESMTP STARTTLS extension if both TLS_CERTFILE -# and COURIERTLS exist. -# -# WARNING: Peer certificate verification has NOT yet been tested. Proceed -# at your own risk. Only the basic SSL/TLS functionality is known to be -# working. Keep this in mind as you play with the following variables. - -COURIERTLS=/usr/sbin/couriertls - -##NAME: TLS_PROTOCOL:0 -# -# TLS_PROTOCOL sets the protocol version. The possible versions are: -# -# SSL2 - SSLv2 -# SSL3 - SSLv3 -# TLS1 - TLS1 - -TLS_PROTOCOL=SSL3 - -##NAME: TLS_STARTTLS_PROTOCOL:0 -# -# TLS_STARTTLS_PROTOCOL is used instead of TLS_PROTOCOL for the POP3 STARTTLS -# extension, as opposed to POP3 over SSL on port 995. -# - -TLS_STARTTLS_PROTOCOL=TLS1 - -##NAME: TLS_CIPHER_LIST:0 -# -# TLS_CIPHER_LIST optionally sets the list of ciphers to be used by the -# OpenSSL library. In most situations you can leave TLS_CIPHER_LIST -# undefined -# -# TLS_CIPHER_LIST="ALL:!ADH:RC4+RSA:+SSLv2:@STRENGTH" - -##NAME: TLS_TIMEOUT:0 -# TLS_TIMEOUT is currently not implemented, and reserved for future use. -# This is supposed to be an inactivity timeout, but its not yet implemented. -# - -##NAME: TLS_DHCERTFILE:0 -# -# TLS_DHCERTFILE - PEM file that stores our Diffie-Hellman cipher pair. -# When OpenSSL is compiled to use Diffie-Hellman ciphers instead of RSA -# you must generate a DH pair that will be used. In most situations the -# DH pair is to be treated as confidential, and the file specified by -# TLS_DHCERTFILE must not be world-readable. -# -# TLS_DHCERTFILE= - -##NAME: TLS_CERTFILE:0 -# -# TLS_CERTFILE - certificate to use. TLS_CERTFILE is required for SSL/TLS -# servers, and is optional for SSL/TLS clients. TLS_CERTFILE is usually -# treated as confidential, and must not be world-readable. -# -TLS_CERTFILE=/etc/ssl/server/<SERVERNAME>.crt_and_key - -##NAME: TLS_TRUSTCERTS:0 -# -# TLS_TRUSTCERTS=pathname - load trusted certificates from pathname. -# pathname can be a file or a directory. If a file, the file should -# contain a list of trusted certificates, in PEM format. If a -# directory, the directory should contain the trusted certificates, -# in PEM format, one per file and hashed using OpenSSL's c_rehash -# script. TLS_TRUSTCERTS is used by SSL/TLS clients (by specifying -# the -domain option) and by SSL/TLS servers (TLS_VERIFYPEER is set -# to PEER or REQUIREPEER). -# -# -# TLS_TRUSTCERTS= - -##NAME: TLS_VERIFYPEER:0 -# -# TLS_VERIFYPEER - how to verify client certificates. The possible values of -# this setting are: -# -# NONE - do not verify anything -# -# PEER - verify the client certificate, if one's presented -# -# REQUIREPEER - require a client certificate, fail if one's not presented -# -# -TLS_VERIFYPEER=NONE - -##NAME: TLS_CACHE:0 -# -# A TLS/SSL session cache may slightly improve response for long-running -# POP3 clients. TLS_CACHEFILE will be automatically created, TLS_CACHESIZE -# bytes long, and used as a cache buffer. -# -# This is an experimental feature and should be disabled if it causes -# problems with SSL clients. Disable SSL caching by commenting out the -# following settings: - -TLS_CACHEFILE=/var/lib/courier-imap/couriersslcache -TLS_CACHESIZE=524288 - -##NAME: MAILDIRPATH:0 -# -# MAILDIRPATH - directory name of the maildir directory. -# -MAILDIRPATH=Maildir - -#Hardwire a value for ${MAILDIR} -MAILDIRPATH=.maildir diff --git a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/courier/etc_courier_authlib_authdaemonrc b/syscp/patches/gentoo-config-files/bind-ssl/gentoo/courier/etc_courier_authlib_authdaemonrc deleted file mode 100644 index 867a12d..0000000 --- a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/courier/etc_courier_authlib_authdaemonrc +++ /dev/null @@ -1,93 +0,0 @@ -##VERSION: $Id: authdaemonrc.in,v 1.12 2005/07/05 12:25:08 mrsam Exp $ -# -# Copyright 2000-2005 Double Precision, Inc. See COPYING for -# distribution information. -# -# authdaemonrc created from authdaemonrc.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# This file configures authdaemond, the resident authentication daemon. -# -# Comments in this file are ignored. Although this file is intended to -# be sourced as a shell script, authdaemond parses it manually, so -# the acceptable syntax is a bit limited. Multiline variable contents, -# with the \ continuation character, are not allowed. Everything must -# fit on one line. Do not use any additional whitespace for indentation, -# or anything else. - -##NAME: authmodulelist:2 -# -# The authentication modules that are linked into authdaemond. The -# default list is installed. You may selectively disable modules simply -# by removing them from the following list. The available modules you -# can use are: authuserdb authpam authshadow authmysql authcustom authpipe - -authmodulelist="authmysql" - -##NAME: authmodulelistorig:3 -# -# This setting is used by Courier's webadmin module, and should be left -# alone - -authmodulelistorig="authuserdb authpam authshadow authmysql authcustom authpipe" - -##NAME: daemons:0 -# -# The number of daemon processes that are started. authdaemon is typically -# installed where authentication modules are relatively expensive: such -# as authldap, or authmysql, so it's better to have a number of them running. -# PLEASE NOTE: Some platforms may experience a problem if there's more than -# one daemon. Specifically, SystemV derived platforms that use TLI with -# socket emulation. I'm suspicious of TLI's ability to handle multiple -# processes accepting connections on the same filesystem domain socket. -# -# You may need to increase daemons if as your system load increases. Symptoms -# include sporadic authentication failures. If you start getting -# authentication failures, increase daemons. However, the default of 5 -# SHOULD be sufficient. Bumping up daemon count is only a short-term -# solution. The permanent solution is to add more resources: RAM, faster -# disks, faster CPUs... - -daemons=5 - -##NAME: authdaemonvar:2 -# -# authdaemonvar is here, but is not used directly by authdaemond. It's -# used by various configuration and build scripts, so don't touch it! - -authdaemonvar=/var/lib/courier/authdaemon - -##NAME: DEBUG_LOGIN:0 -# -# Dump additional diagnostics to syslog -# -# DEBUG_LOGIN=0 - turn off debugging -# DEBUG_LOGIN=1 - turn on debugging -# DEBUG_LOGIN=2 - turn on debugging + log passwords too -# -# ** YES ** - DEBUG_LOGIN=2 places passwords into syslog. -# -# Note that most information is sent to syslog at level 'debug', so -# you may need to modify your /etc/syslog.conf to be able to see it. - -DEBUG_LOGIN=0 - -##NAME: DEFAULTOPTIONS:0 -# -# A comma-separated list of option=value pairs. Each option is applied -# to an account if the account does not have its own specific value for -# that option. So for example, you can set -# DEFAULTOPTIONS="disablewebmail=1,disableimap=1" -# and then enable webmail and/or imap on individual accounts by setting -# disablewebmail=0 and/or disableimap=0 on the account. - -DEFAULTOPTIONS="" - -##NAME: LOGGEROPTS:0 -# -# courierlogger(1) options, e.g. to set syslog facility -# - -LOGGEROPTS="" diff --git a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/courier/etc_courier_authlib_authmysqlrc b/syscp/patches/gentoo-config-files/bind-ssl/gentoo/courier/etc_courier_authlib_authmysqlrc deleted file mode 100644 index fec6508..0000000 --- a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/courier/etc_courier_authlib_authmysqlrc +++ /dev/null @@ -1,12 +0,0 @@ -MYSQL_SERVER <SQL_HOST> -MYSQL_USERNAME <SQL_UNPRIVILEGED_USER> -MYSQL_PASSWORD <SQL_UNPRIVILEGED_PASSWORD> -MYSQL_PORT 0 -MYSQL_DATABASE <SQL_DB> -MYSQL_USER_TABLE mail_users -MYSQL_CRYPT_PWFIELD password_enc -MYSQL_UID_FIELD <VIRTUAL_UID_MAPS> -MYSQL_GID_FIELD <VIRTUAL_GID_MAPS> -MYSQL_LOGIN_FIELD username -MYSQL_HOME_FIELD "<VIRTUAL_MAILBOX_BASE>" -MYSQL_MAILDIR_FIELD maildir diff --git a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/cron/etc_cron.d_syscp b/syscp/patches/gentoo-config-files/bind-ssl/gentoo/cron/etc_cron.d_syscp deleted file mode 100644 index 4afe408..0000000 --- a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/cron/etc_cron.d_syscp +++ /dev/null @@ -1,10 +0,0 @@ -# -# Set PATH, otherwise restart-scripts won't find start-stop-daemon -# -PATH=/sbin:/bin:/usr/sbin:/usr/bin -# -# Regular cron jobs for the syscp package -# -# Please check that all following paths are correct -# -*/5 * * * * root /usr/lib/php4/bin/php -q -c /etc/php/syscp-cronjob/php.ini /var/www/syscp/scripts/cronscript.php diff --git a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/cron/etc_php_syscp-cronjob_php.ini b/syscp/patches/gentoo-config-files/bind-ssl/gentoo/cron/etc_php_syscp-cronjob_php.ini deleted file mode 100644 index 74c8316..0000000 --- a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/cron/etc_php_syscp-cronjob_php.ini +++ /dev/null @@ -1,61 +0,0 @@ -short_open_tag = On -asp_tags = Off -precision = 14 -output_buffering = Off -allow_call_time_pass_reference = Off -safe_mode = Off -safe_mode_gid = Off -safe_mode_include_dir = "/usr/share/php/:/usr/share/php4/:/usr/share/php5/" -safe_mode_allowed_env_vars = PHP_ -safe_mode_protected_env_vars = LD_LIBRARY_PATH -open_basedir = -disable_functions = -disable_classes = -expose_php = Off -max_execution_time = 180 -max_input_time = 120 -memory_limit = 32M -post_max_size = 32M -error_reporting = E_ALL & ~E_NOTICE -display_errors = On -display_startup_errors = Off -log_errors = Off -log_errors_max_len = 1024 -ignore_repeated_errors = Off -ignore_repeated_source = Off -report_memleaks = On -track_errors = Off -html_errors = Off -variables_order = "GPCS" -register_globals = Off -register_argc_argv = Off -gpc_order = "GPC" -magic_quotes_gpc = Off -magic_quotes_runtime = Off -magic_quotes_sybase = Off -include_path = ".:/usr/share/php/:/usr/share/php4/:/usr/share/php5/" -enable_dl = Off -file_uploads = On -upload_tmp_dir = "/tmp/" -upload_max_filesize = 32M -allow_url_fopen = Off -session.save_handler = files -session.save_path = "/tmp/" -session.use_cookies = 1 -session.name = PHPSESSID -session.auto_start = 0 -session.cookie_lifetime = 0 -session.cookie_path = / -session.cookie_domain = -session.serialize_handler = php -session.gc_probability = 1 -session.gc_divisor = 1000 -session.gc_maxlifetime = 1440 -session.bug_compat_42 = 0 -session.bug_compat_warn = 1 -session.referer_check = -session.entropy_length = 16 -session.entropy_file = /dev/urandom -session.cache_limiter = nocache -session.cache_expire = 180 -session.use_trans_sid = 0 diff --git a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/cron/etc_php_syscp-vhost_php.ini b/syscp/patches/gentoo-config-files/bind-ssl/gentoo/cron/etc_php_syscp-vhost_php.ini deleted file mode 100644 index 048c26c..0000000 --- a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/cron/etc_php_syscp-vhost_php.ini +++ /dev/null @@ -1,61 +0,0 @@ -short_open_tag = On -asp_tags = Off -precision = 14 -output_buffering = 4096 -allow_call_time_pass_reference = Off -safe_mode = Off -safe_mode_gid = Off -safe_mode_include_dir = "/usr/share/php/:/usr/share/php4/:/usr/share/php5/" -safe_mode_allowed_env_vars = PHP_ -safe_mode_protected_env_vars = LD_LIBRARY_PATH -open_basedir = "/var/www/syscp/:/var/www/syscp-suphp/syscp/:/var/www/syscpwebs/:/usr/share/php/:/usr/share/php4/:/usr/share/php5/" -disable_functions = exec,passthru,shell_exec,system,proc_close,proc_get_status,proc_nice,proc_open,proc_terminate -disable_classes = -expose_php = Off -max_execution_time = 30 -max_input_time = 60 -memory_limit = 16M -post_max_size = 12M -error_reporting = E_ALL & ~E_NOTICE -display_errors = Off -display_startup_errors = Off -log_errors = On -log_errors_max_len = 1024 -ignore_repeated_errors = Off -ignore_repeated_source = Off -report_memleaks = On -track_errors = Off -html_errors = Off -variables_order = "GPCS" -register_globals = Off -register_argc_argv = Off -gpc_order = "GPC" -magic_quotes_gpc = Off -magic_quotes_runtime = Off -magic_quotes_sybase = Off -include_path = ".:/usr/share/php/:/usr/share/php4/:/usr/share/php5/" -enable_dl = Off -file_uploads = On -upload_tmp_dir = "/var/www/syscp-suphp/syscp/" -upload_max_filesize = 32M -allow_url_fopen = Off -session.save_handler = files -session.save_path = "/var/www/syscp-suphp/syscp/" -session.use_cookies = 1 -session.name = PHPSESSID -session.auto_start = 0 -session.cookie_lifetime = 0 -session.cookie_path = / -session.cookie_domain = -session.serialize_handler = php -session.gc_probability = 1 -session.gc_divisor = 1000 -session.gc_maxlifetime = 1440 -session.bug_compat_42 = 0 -session.bug_compat_warn = 1 -session.referer_check = -session.entropy_length = 16 -session.entropy_file = /dev/urandom -session.cache_limiter = nocache -session.cache_expire = 180 -session.use_trans_sid = 0 diff --git a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/postfix/etc_postfix_main.cf b/syscp/patches/gentoo-config-files/bind-ssl/gentoo/postfix/etc_postfix_main.cf deleted file mode 100644 index 97b10e0..0000000 --- a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/postfix/etc_postfix_main.cf +++ /dev/null @@ -1,65 +0,0 @@ -# Postfix directories settings -command_directory = /usr/sbin -daemon_directory = /usr/lib/postfix -queue_directory = /var/spool/postfix -sample_directory = /etc/postfix -manpage_directory = /usr/share/man -readme_directory = /usr/share/doc/postfix-2.1.5-r2/readme -html_directory = no - -# Postfix programs paths settings -mailq_path = /usr/bin/mailq -newaliases_path = /usr/bin/newaliases -sendmail_path = /usr/sbin/sendmail - -# General Postfix configuration -myhostname = <SERVERNAME> -mydestination = $myhostname, $mydomain, localhost.$myhostname, localhost.$mydomain, localhost -mynetworks = 127.0.0.0/8 -inet_interfaces = all -mail_owner = postfix -setgid_group = postdrop -smtpd_banner = $myhostname ESMTP Mailserver -smtpd_helo_required = yes -append_dot_mydomain = no -biff = no - -# Postfix Debugger configuration -debug_peer_level = 2 -debugger_command = - PATH=/bin:/usr/bin:/usr/local/bin; export PATH; (echo cont; - echo where) | gdb $daemon_directory/$process_name $process_id 2>&1 - >$config_directory/$process_name.$process_id.log & sleep 5 - -# Postfix performance settings -default_destination_concurrency_limit = 20 -local_destination_concurrency_limit = 2 - -# Virtual delivery settings -virtual_transport = virtual -virtual_mailbox_base = <VIRTUAL_MAILBOX_BASE> -virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf -virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf -virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf -virtual_uid_maps = static:<VIRTUAL_UID_MAPS> -virtual_gid_maps = static:<VIRTUAL_GID_MAPS> - -# Local delivery settings -local_transport = local -alias_database = hash:/etc/mail/aliases -alias_maps = $alias_database - -# SASL settings -smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination -smtpd_sasl_auth_enable = yes -smtpd_sasl_local_domain = $myhostname -smtpd_sasl_security_options = noanonymous -broken_sasl_auth_clients = yes - -# TLS settings -smtpd_use_tls = yes -smtpd_tls_cert_file = /etc/ssl/server/<SERVERNAME>.crt -smtpd_tls_key_file = /etc/ssl/server/<SERVERNAME>.key -smtpd_tls_auth_only = no -smtpd_tls_session_cache_timeout = 3600s -tls_random_source = dev:/dev/urandom diff --git a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/postfix/etc_postfix_mysql-virtual_alias_maps.cf b/syscp/patches/gentoo-config-files/bind-ssl/gentoo/postfix/etc_postfix_mysql-virtual_alias_maps.cf deleted file mode 100644 index c921e6f..0000000 --- a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/postfix/etc_postfix_mysql-virtual_alias_maps.cf +++ /dev/null @@ -1,8 +0,0 @@ -user = <SQL_UNPRIVILEGED_USER> -password = <SQL_UNPRIVILEGED_PASSWORD> -dbname = <SQL_DB> -table = mail_virtual -select_field = destination -where_field = email -additional_conditions = and destination <> '' and destination <> ' ' -hosts = <SQL_HOST> diff --git a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf b/syscp/patches/gentoo-config-files/bind-ssl/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf deleted file mode 100644 index 4484bee..0000000 --- a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf +++ /dev/null @@ -1,8 +0,0 @@ -user = <SQL_UNPRIVILEGED_USER> -password = <SQL_UNPRIVILEGED_PASSWORD> -dbname = <SQL_DB> -table = panel_domains -select_field = domain -where_field = domain -additional_conditions = and isemaildomain = '1' -hosts = <SQL_HOST> diff --git a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf b/syscp/patches/gentoo-config-files/bind-ssl/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf deleted file mode 100644 index 7e0f79a..0000000 --- a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf +++ /dev/null @@ -1,7 +0,0 @@ -user = <SQL_UNPRIVILEGED_USER> -password = <SQL_UNPRIVILEGED_PASSWORD> -dbname = <SQL_DB> -table = mail_users -select_field = maildir -where_field = email -hosts = <SQL_HOST> diff --git a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/postfix/etc_sasl2_smtpd.conf b/syscp/patches/gentoo-config-files/bind-ssl/gentoo/postfix/etc_sasl2_smtpd.conf deleted file mode 100644 index 2089cbb..0000000 --- a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/postfix/etc_sasl2_smtpd.conf +++ /dev/null @@ -1,12 +0,0 @@ -pwcheck_method: auxprop -auxprop_plugin: sql -allowanonymouslogin: no -allowplaintext: yes -mech_list: PLAIN LOGIN -password_format: crypt -sql_engine: mysql -sql_hostnames: <SQL_HOST> -sql_user: <SQL_UNPRIVILEGED_USER> -sql_passwd: <SQL_UNPRIVILEGED_PASSWORD> -sql_database: <SQL_DB> -sql_select: SELECT password_enc FROM mail_users where username='%u@%r' diff --git a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/proftpd/etc_proftpd_proftpd.conf b/syscp/patches/gentoo-config-files/bind-ssl/gentoo/proftpd/etc_proftpd_proftpd.conf deleted file mode 100644 index 1e04b6d..0000000 --- a/syscp/patches/gentoo-config-files/bind-ssl/gentoo/proftpd/etc_proftpd_proftpd.conf +++ /dev/null @@ -1,89 +0,0 @@ -# Server settings -ServerName "<SERVERNAME> FTP Server" -ServerType standalone -ServerIdent off -DefaultServer on -Port 21 -MaxInstances 50 - -# General settings -DeferWelcome on -MultilineRFC2228 on -ShowSymlinks on -AllowOverwrite on -AllowStoreRestart on -AllowRetrieveRestart on -UseReverseDNS off -IdentLookups off -ListOptions "-al" -DisplayFirstChdir .message - -# Modules settings -#DelayEngine off - -# Timeout settings -TimeoutLogin 120 -TimeoutNoTransfer 600 -TimeoutStalled 600 -TimeoutIdle 600 - -# Security settings -RootLogin off -RequireValidShell off -User syscpftpd -Group syscpftpd -Umask 133 022 -DefaultRoot ~ -DenyFilter \*.*/ - -# Per-Directory settings -<Directory /*> -Umask 133 022 -AllowOverwrite on -</Directory> - -# SQL settings -SQLAuthTypes Crypt -SQLAuthenticate users* groups* -SQLConnectInfo <SQL_DB>@<SQL_HOST> <SQL_UNPRIVILEGED_USER> <SQL_UNPRIVILEGED_PASSWORD> -SQLUserInfo ftp_users username password uid gid homedir shell -SQLGroupInfo ftp_groups groupname gid members -SQLUserWhereClause "login_enabled = 'y'" - -SQLLog PASS login -SQLNamedQuery login UPDATE "last_login=now(), login_count=login_count+1 WHERE username='%u'" ftp_users - -SQLLog RETR download -SQLNamedQuery download UPDATE "down_count=down_count+1, down_bytes=down_bytes+%b WHERE username='%u'" ftp_users - -SQLLog STOR upload -SQLNamedQuery upload UPDATE "up_count=up_count+1, up_bytes=up_bytes+%b WHERE username='%u'" ftp_users - -# TLS settings -<IfModule mod_tls.c> -TLSEngine on -TLSLog /var/log/proftpd-tls.log -TLSProtocol SSLv23 -TLSTimeoutHandshake 120 -# Really important for WinClients -TLSOptions NoCertRequest -TLSRSACertificateFile /etc/ssl/server/<SERVERNAME>.crt -TLSRSACertificateKeyFile /etc/ssl/server/<SERVERNAME>.key -# Authenticate client that want to use FTP over TLS? -TLSVerifyClient off -# Uncomment the following line to force tls login -TLSRequired off -</IfModule> - -# LOG settings -# Logging Formats -LogFormat default "%h %1 %u %t \"%r\" %s %b" -LogFormat auth "%v [%P] %h %t \"%r\" %s" -LogFormat write "%h %l %u %t \"%r\" %s %b" -# Activate Logging -# all logins -ExtendedLog /var/log/proftpd-auth.log AUTH auth -# file/dir access -ExtendedLog /var/log/proftpd-access.log WRITE,READ write -# everything (be careful, generates_ very_ big logfiles) -#ExtendedLog /var/log/proftpd-all.log ALL default diff --git a/syscp/patches/gentoo-config-files/bind-ssl/syscp-1.2.13-gentoo-admin_configfiles.php-bind-ssl b/syscp/patches/gentoo-config-files/bind-ssl/syscp-1.2.13-gentoo-admin_configfiles.php-bind-ssl deleted file mode 100644 index f13fd5a..0000000 --- a/syscp/patches/gentoo-config-files/bind-ssl/syscp-1.2.13-gentoo-admin_configfiles.php-bind-ssl +++ /dev/null @@ -1,290 +0,0 @@ -<?php -/** - * filename: $Source: /syscp/syscp/admin_configfiles.php,v $ - * begin: Wednesday, Sep 08, 2004 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. This program is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY; without even the - * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * @author Florian Lippert <flo@redenswert.de> - * @copyright (C) 2003-2004 Florian Lippert - * @package Panel - * @version $Id: admin_configfiles.php,v 1.9 2005/06/15 13:53:58 flo Exp $ - * Modified to reflect the Gentoo environment by Luca Longinotti <chtekk@gentoo.org> - */ - - define('AREA', 'admin'); - - /** - * Include our init.php, which manages Sessions, Language etc. - */ - require("./lib/init.php"); - - - $configfiles = Array - ( - 'gentoo' => Array - ( - 'label' => 'Gentoo', - 'daemons' => Array - ( - 'apache' => Array - ( - 'label' => 'Apache2 Webserver (HTTP)', - 'commands' => Array - ( - 'touch '.$settings['system']['apacheconf_directory'].'vhosts.d/99_syscp-vhosts.conf', - 'chown root:0 '.$settings['system']['apacheconf_directory'].'vhosts.d/99_syscp-vhosts.conf', - 'chmod 0600 '.$settings['system']['apacheconf_directory'].'vhosts.d/99_syscp-vhosts.conf', - 'echo "Include '.$settings['system']['apacheconf_directory'].'vhosts.d/99_syscp-vhosts.conf" >> /etc/apache2/httpd.conf', - 'mkdir -p '.$settings['system']['documentroot_prefix'], - 'mkdir -p '.$settings['system']['logfiles_directory'] - ), - 'restart' => Array - ( - 'rc-update add apache2 default', - '/etc/init.d/apache2 restart' - ) - ), - 'bind' => Array - ( - 'label' => 'Bind9 Nameserver (DNS)', - 'files' => Array - ( - 'etc_bind_default.zone' => '/etc/bind/default.zone' - ), - 'commands' => Array - ( - 'echo "include \"'.$settings['system']['bindconf_directory'].'syscp_bind.conf\";" >> /etc/bind/named.conf', - 'touch '.$settings['system']['bindconf_directory'].'syscp_bind.conf', - 'chown root:0 '.$settings['system']['bindconf_directory'].'syscp_bind.conf', - 'chmod 0600 '.$settings['system']['bindconf_directory'].'syscp_bind.conf' - ), - 'restart' => Array - ( - 'rc-update add named default', - '/etc/init.d/named restart' - ) - ), - 'courier' => Array - ( - 'label' => 'Courier-IMAP (POP3/IMAP)', - 'files' => Array - ( - 'etc_courier_authlib_authdaemonrc' => '/etc/courier/authlib/authdaemonrc', - 'etc_courier_authlib_authmysqlrc' => '/etc/courier/authlib/authmysqlrc', - 'etc_courier-imap_pop3d' => '/etc/courier-imap/pop3d', - 'etc_courier-imap_imapd' => '/etc/courier-imap/imapd', - 'etc_courier-imap_pop3d-ssl' => '/etc/courier-imap/pop3d-ssl', - 'etc_courier-imap_imapd-ssl' => '/etc/courier-imap/imapd-ssl' - ), - 'commands' => Array - ( - 'rm /etc/courier/authlib/authdaemonrc', - 'rm /etc/courier/authlib/authmysqlrc', - 'rm /etc/courier-imap/pop3d', - 'rm /etc/courier-imap/imapd', - 'rm /etc/courier-imap/pop3d-ssl', - 'rm /etc/courier-imap/imapd-ssl', - 'touch /etc/courier/authlib/authdaemonrc', - 'touch /etc/courier/authlib/authmysqlrc', - 'touch /etc/courier-imap/pop3d', - 'touch /etc/courier-imap/imapd', - 'touch /etc/courier-imap/pop3d-ssl', - 'touch /etc/courier-imap/imapd-ssl', - 'chown root:0 /etc/courier/authlib/authdaemonrc', - 'chown root:0 /etc/courier/authlib/authmysqlrc', - 'chown root:0 /etc/courier-imap/pop3d', - 'chown root:0 /etc/courier-imap/imapd', - 'chown root:0 /etc/courier-imap/pop3d-ssl', - 'chown root:0 /etc/courier-imap/imapd-ssl', - 'chmod 0600 /etc/courier/authlib/authdaemonrc', - 'chmod 0600 /etc/courier/authlib/authmysqlrc', - 'chmod 0600 /etc/courier-imap/pop3d', - 'chmod 0600 /etc/courier-imap/imapd', - 'chmod 0600 /etc/courier-imap/pop3d-ssl', - 'chmod 0600 /etc/courier-imap/imapd-ssl' - ), - 'restart' => Array - ( - 'rc-update add courier-authlib default', - 'rc-update add courier-pop3d default', - 'rc-update add courier-imapd default', - 'rc-update add courier-pop3d-ssl default', - 'rc-update add courier-imapd-ssl default', - '/etc/init.d/courier-authlib restart', - '/etc/init.d/courier-pop3d restart', - '/etc/init.d/courier-imapd restart', - '/etc/init.d/courier-pop3d-ssl restart', - '/etc/init.d/courier-imapd-ssl restart' - ) - ), - 'postfix' => Array - ( - 'label' => 'Postfix (MTA)', - 'files' => Array - ( - 'etc_postfix_main.cf' => '/etc/postfix/main.cf', - 'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf', - 'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf', - 'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf', - 'etc_sasl2_smtpd.conf' => '/etc/sasl2/smtpd.conf' - ), - 'commands' => Array - ( - 'mkdir -p '.$settings['system']['vmail_homedir'], - 'chown -R vmail:vmail '.$settings['system']['vmail_homedir'], - 'chmod 0750 '.$settings['system']['vmail_homedir'], - 'rm /etc/postfix/main.cf', - 'touch /etc/postfix/main.cf', - 'touch /etc/postfix/master.cf', - 'touch /etc/postfix/mysql-virtual_alias_maps.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'touch /etc/sasl2/smtpd.conf', - 'chown root:0 /etc/postfix/main.cf', - 'chown root:0 /etc/postfix/master.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_alias_maps.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'chown root:0 /etc/sasl2/smtpd.conf', - 'chmod 0600 /etc/postfix/main.cf', - 'chmod 0600 /etc/postfix/master.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_alias_maps.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'chmod 0600 /etc/sasl2/smtpd.conf' - ), - 'restart' => Array - ( - 'rc-update add postfix default', - '/etc/init.d/postfix restart' - ) - ), - 'proftpd' => Array - ( - 'label' => 'ProFTPd (FTP)', - 'files' => Array - ( - 'etc_proftpd_proftpd.conf' => '/etc/proftpd/proftpd.conf' - ), - 'commands' => Array - ( - 'touch /etc/proftpd/proftpd.conf', - 'chown root:0 /etc/proftpd/proftpd.conf', - 'chmod 0600 /etc/proftpd/proftpd.conf' - ), - 'restart' => Array - ( - 'rc-update add proftpd default', - '/etc/init.d/proftpd restart' - ) - ), - 'cron' => Array - ( - 'label' => 'Crond (cronscript)', - 'files' => Array - ( - 'etc_php_syscp-cronjob_php.ini' => '/etc/php/syscp-cronjob/php.ini', - 'etc_cron.d_syscp' => '/etc/cron.d/syscp' - ), - 'commands' => Array - ( - 'touch /etc/cron.d/syscp', - 'chown root:0 /etc/cron.d/syscp', - 'chmod 0640 /etc/cron.d/syscp', - 'mkdir -p /etc/php/syscp-cronjob', - 'touch /etc/php/syscp-cronjob/php.ini', - 'chown -R root:0 /etc/php/syscp-cronjob', - 'chmod 0750 /etc/php/syscp-cronjob', - 'chmod 0640 /etc/php/syscp-cronjob/php.ini' - ), - 'restart' => Array - ( - 'rc-update add vixie-cron default', - '/etc/init.d/vixie-cron restart' - ) - ) - ) - ) - ); - - /*echo '<pre>'; - print_r($configfiles); - echo '</pre>';*/ - - if( ($page == 'configfiles' || $page == 'overview') && $userinfo['change_serversettings'] == '1') - { - if(isset($_GET['distribution']) && $_GET['distribution']!='' && isset($configfiles[$_GET['distribution']]) && is_array($configfiles[$_GET['distribution']]) && - isset($_GET['daemon']) && $_GET['daemon']!='' && isset($configfiles[$_GET['distribution']]['daemons'][$_GET['daemon']]) && is_array($configfiles[$_GET['distribution']]['daemons'][$_GET['daemon']])) - { - $distribution = addslashes($_GET['distribution']); - $daemon = addslashes($_GET['daemon']); - - if(isset($configfiles[$distribution]['daemons'][$daemon]['commands']) && is_array($configfiles[$distribution]['daemons'][$daemon]['commands'])) - { - $commands = implode("\n", $configfiles[$distribution]['daemons'][$daemon]['commands']); - } - else - { - $commands = ''; - } - - $replace_arr = Array - ( - '<SQL_UNPRIVILEGED_USER>' => $sql['user'], - '<SQL_UNPRIVILEGED_PASSWORD>' => 'MYSQL_PASSWORD', - '<SQL_DB>' => $sql['db'], - '<SQL_HOST>' => $sql['host'], - '<SERVERNAME>' => $settings['system']['hostname'], - '<SERVERIP>' => $settings['system']['ipaddress'], - '<VIRTUAL_MAILBOX_BASE>' => $settings['system']['vmail_homedir'], - '<VIRTUAL_UID_MAPS>' => $settings['system']['vmail_uid'], - '<VIRTUAL_GID_MAPS>' => $settings['system']['vmail_gid'] - ); - $files = ''; - if(isset($configfiles[$distribution]['daemons'][$daemon]['files']) && is_array($configfiles[$distribution]['daemons'][$daemon]['files'])) - { - while(list($filename, $realname) = each($configfiles[$distribution]['daemons'][$daemon]['files'])) - { - $file_content = implode('', file('./templates/misc/configfiles/'.$distribution.'/'.$daemon.'/'.$filename)); - $file_content = strtr($file_content, $replace_arr); - $file_content = htmlspecialchars($file_content); - $numbrows = count(explode("\n", $file_content)); - eval("\$files.=\"".getTemplate("configfiles/configfiles_file")."\";"); - } - } - - if(isset($configfiles[$distribution]['daemons'][$daemon]['restart']) && is_array($configfiles[$distribution]['daemons'][$daemon]['restart'])) - { - $restart = implode("\n", $configfiles[$distribution]['daemons'][$daemon]['restart']); - } - else - { - $restart = ''; - } - - eval("echo \"".getTemplate("configfiles/configfiles")."\";"); - } - else - { - $distributions = ''; - while (list($distribution_name, $distribution_details) = each($configfiles)) - { - $daemons = ''; - while(list($daemon_name, $daemon_details) = each($distribution_details['daemons'])) - { - eval("\$daemons.=\"".getTemplate("configfiles/choose_daemon")."\";"); - } - eval("\$distributions.=\"".getTemplate("configfiles/choose_distribution")."\";"); - } - eval("echo \"".getTemplate("configfiles/choose")."\";"); - } - } - -?> diff --git a/syscp/patches/gentoo-config-files/bind-ssl/syscp-1.2.13-gentoo-config-bind-ssl-r2.tar.bz2 b/syscp/patches/gentoo-config-files/bind-ssl/syscp-1.2.13-gentoo-config-bind-ssl-r2.tar.bz2 Binary files differdeleted file mode 100644 index f799689..0000000 --- a/syscp/patches/gentoo-config-files/bind-ssl/syscp-1.2.13-gentoo-config-bind-ssl-r2.tar.bz2 +++ /dev/null diff --git a/syscp/patches/gentoo-config-files/bind/etc_libnss-mysql-root.cfg b/syscp/patches/gentoo-config-files/bind/etc_libnss-mysql-root.cfg deleted file mode 100644 index 6498977..0000000 --- a/syscp/patches/gentoo-config-files/bind/etc_libnss-mysql-root.cfg +++ /dev/null @@ -1,2 +0,0 @@ -username <SQL_UNPRIVILEGED_USER> -password <SQL_UNPRIVILEGED_PASSWORD> diff --git a/syscp/patches/gentoo-config-files/bind/etc_libnss-mysql.cfg b/syscp/patches/gentoo-config-files/bind/etc_libnss-mysql.cfg deleted file mode 100644 index d284192..0000000 --- a/syscp/patches/gentoo-config-files/bind/etc_libnss-mysql.cfg +++ /dev/null @@ -1,38 +0,0 @@ -getpwnam SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ - FROM ftp_users \ - WHERE username='%1$s' \ - LIMIT 1 -getpwuid SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ - FROM ftp_users \ - WHERE uid='%1$u' \ - LIMIT 1 -getspnam SELECT username,password,UNIX_TIMESTAMP()-10,'1','2','7','-1','-1','0' \ - FROM ftp_users \ - WHERE username='%1$s' \ - LIMIT 1 -getpwent SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ - FROM ftp_users -getspent SELECT username,password,UNIX_TIMESTAMP()-10,'1','2','7','-1','-1','0' \ - FROM ftp_users -getgrnam SELECT groupname,'x',gid \ - FROM ftp_groups \ - WHERE groupname='%1$s' \ - LIMIT 1 -getgrgid SELECT groupname,'x',gid \ - FROM ftp_groups \ - WHERE gid='%1$u' \ - LIMIT 1 -getgrent SELECT groupname,'x',gid \ - FROM ftp_groups -memsbygid SELECT username \ - FROM ftp_users \ - WHERE gid='%1$u' -gidsbymem SELECT gid \ - FROM ftp_users \ - WHERE username='%1$s' - -host <SQL_HOST> -database <SQL_DB> -username <SQL_UNPRIVILEGED_USER> -password <SQL_UNPRIVILEGED_PASSWORD> -socket /var/run/mysqld/mysqld.sock diff --git a/syscp/patches/gentoo-config-files/bind/gentoo/bind/etc_bind_default.zone b/syscp/patches/gentoo-config-files/bind/gentoo/bind/etc_bind_default.zone deleted file mode 100644 index 817b9bc..0000000 --- a/syscp/patches/gentoo-config-files/bind/gentoo/bind/etc_bind_default.zone +++ /dev/null @@ -1,21 +0,0 @@ -$TTL 1W -@ IN SOA ns root ( - 2004060501 ; serial - 8H ; refresh - 2H ; retry - 1W ; expiry - 11h) ; minimum - - IN NS ns - IN MX 10 mail - - IN A <SERVERIP> - IN MX 10 mail - -* IN A <SERVERIP> - IN MX 10 mail - -ns IN A <SERVERIP> - -mail IN A <SERVERIP> - IN MX 10 mail diff --git a/syscp/patches/gentoo-config-files/bind/gentoo/courier/etc_courier-imap_imapd b/syscp/patches/gentoo-config-files/bind/gentoo/courier/etc_courier-imap_imapd deleted file mode 100644 index f594e41..0000000 --- a/syscp/patches/gentoo-config-files/bind/gentoo/courier/etc_courier-imap_imapd +++ /dev/null @@ -1,376 +0,0 @@ -##VERSION: $Id: imapd.dist.in,v 1.32 2004/11/25 04:57:04 mrsam Exp $ -# -# imapd created from imapd.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# Copyright 1998 - 2004 Double Precision, Inc. See COPYING for -# distribution information. -# -# This configuration file sets various options for the Courier-IMAP server -# when used with the couriertcpd server. -# A lot of the stuff here is documented in the manual page for couriertcpd. -# -# NOTE - do not use \ to split long variable contents on multiple lines. -# This will break the default imapd.rc script, which parses this file. -# -##NAME: ADDRESS:0 -# -# Address to listen on, can be set to a single IP address. -# -# ADDRESS=127.0.0.1 - -ADDRESS=0 - -##NAME: PORT:1 -# -# Port numbers that connections are accepted on. The default is 143, -# the standard IMAP port. -# -# Multiple port numbers can be separated by commas. When multiple port -# numbers are used it is possible to select a specific IP address for a -# given port as "ip.port". For example, "127.0.0.1.900,192.68.0.1.900" -# accepts connections on port 900 on IP addresses 127.0.0.1 and 192.68.0.1 -# The previous ADDRESS setting is a default for ports that do not have -# a specified IP address. - -PORT=143 - -##NAME: AUTHSERVICE:0 -# -# It's possible to authenticate using a different 'service' parameter -# depending on the connection's port. This only works with authentication -# modules that use the 'service' parameter, such as PAM. Example: -# -# AUTHSERVICE143=imap -# AUTHSERVICE993=imaps - -##NAME: MAXDAEMONS:0 -# -# Maximum number of IMAP servers started -# - -MAXDAEMONS=50 - -##NAME: MAXPERIP:0 -# -# Maximum number of connections to accept from the same IP address - -MAXPERIP=10 - -##NAME: PIDFILE:0 -# -# File where couriertcpd will save its process ID -# - -PIDFILE=/var/run/imapd.pid - -##NAME: TCPDOPTS:0 -# -# Miscellaneous couriertcpd options that shouldn't be changed. -# - -TCPDOPTS="-nodnslookup -noidentlookup" - -##NAME: IMAP_CAPABILITY:1 -# -# IMAP_CAPABILITY specifies what most of the response should be to the -# CAPABILITY command. -# -# If you have properly configured Courier to use CRAM-MD5 or CRAM-SHA1 -# authentication (see INSTALL), set IMAP_CAPABILITY as follows: -# -# IMAP_CAPABILITY="IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 IDLE" -# - -IMAP_CAPABILITY="IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA IDLE" - -##NAME: KEYWORDS_CAPABILITY:0 -# -# IMAP_KEYWORDS=1 enables custom IMAP keywords. Set this option to 0 to -# disable custom keywords. - -IMAP_KEYWORDS=1 - -##NAME: SMAP1_CAPABILITY:0 -# -# EXPERIMENTAL -# -# To enable the experimental "Simple Mail Access Protocol" extensions, -# uncomment the following setting. -# -# SMAP_CAPABILITY=SMAP1 - -##NAME: IMAP_CAPABILITY_ORIG:1 -# -# For use by webadmin - -IMAP_CAPABILITY_ORIG="IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 IDLE" - -##NAME: IMAP_PROXY:0 -# -# Enable proxying. See README.proxy - -IMAP_PROXY=0 - -##NAME: IMAP_PROXY_FOREIGN:0 -# -# Proxying to non-Courier servers. Re-sends the CAPABILITY command after -# logging in to the remote server. May not work with all IMAP clients. - -IMAP_PROXY_FOREIGN=0 - -##NAME: IMAP_IDLE_TIMEOUT:0 -# -# This setting controls how often -# the server polls for changes to the folder, in IDLE mode (in seconds). - -IMAP_IDLE_TIMEOUT=60 - -##NAME: IMAP_CAPABILITY_TLS:0 -# -# The following setting will advertise SASL PLAIN authentication after -# STARTTLS is established. If you want to allow SASL PLAIN authentication -# with or without TLS then just comment this out, and add AUTH=PLAIN to -# IMAP_CAPABILITY - -IMAP_CAPABILITY_TLS="$IMAP_CAPABILITY AUTH=PLAIN" - -##NAME: IMAP_TLS_ORIG:0 -# -# For use by webadmin - -IMAP_CAPABILITY_TLS_ORIG="$IMAP_CAPABILITY_ORIG AUTH=PLAIN" - -##NAME: IMAP_DISABLETHREADSORT:0 -# -# Set IMAP_DISABLETHREADSORT to disable the THREAD and SORT commands - -# server side sorting and threading. -# -# Those capabilities will still be advertised, but the server will reject -# them. Set this option if you want to disable all the extra load from -# server-side threading and sorting. Not advertising those capabilities -# will simply result in the clients reading the entire folder, and sorting -# it on the client side. That will still put some load on the server. -# advertising these capabilities, but rejecting the commands, will stop this -# silliness. -# - -IMAP_DISABLETHREADSORT=0 - -##NAME: IMAP_CHECK_ALL_FOLDERS:0 -# -# Set IMAP_CHECK_ALL_FOLDERS to 1 if you want the server to check for new -# mail in every folder. Not all IMAP clients use the IMAP's new mail -# indicator, but some do. Normally new mail is checked only in INBOX, -# because it is a comparatively time consuming operation, and it would be -# a complete waste of time unless mail filters are used to deliver -# mail directly to folders. -# -# When IMAP clients are used which support new mail indication, and when -# mail filters are used to sort incoming mail into folders, setting -# IMAP_CHECK_ALL_FOLDERS to 1 will allow IMAP clients to announce new -# mail in folders. Note that this will result in slightly more load on the -# server. -# - -IMAP_CHECK_ALL_FOLDERS=0 - -##NAME: IMAP_OBSOLETE_CLIENT:0 -# -# Set IMAP_OBSOLETE_CLIENT if your IMAP client expects \\NoInferiors to mean -# what \\HasNoChildren really means. - -IMAP_OBSOLETE_CLIENT=0 - -##NAME: IMAP_UMASK:0 -# -# IMAP_UMASK sets the umask of the server process. The value of IMAP_UMASK is -# simply passed to the "umask" command. The default value is 022. -# -# This feature is mostly useful for shared folders, where the file permissions -# of the messages may be important. - -IMAP_UMASK=027 - -##NAME: IMAP_ULIMITD:0 -# -# IMAP_ULIMITD sets the maximum size of the data segment of the server -# process. The value of IMAP_ULIMITD is simply passed to the "ulimit -d" -# command (or ulimit -v). The argument to ulimi sets the upper limit on the -# size of the data segment of the server process, in kilobytes. The default -# value of 65536 sets a very generous limit of 64 megabytes, which should -# be more than plenty for anyone. -# -# This feature is used as an additional safety check that should stop -# any potential denial-of-service attacks that exploit any kind of -# a memory leak to exhaust all the available memory on the server. -# It is theoretically possible that obscenely huge folders will also -# result in the server running out of memory when doing server-side -# sorting (by my calculations you have to have at least 100,000 messages -# in a single folder, for that to happen). - -IMAP_ULIMITD=65536 - -##NAME: IMAP_USELOCKS:0 -# -# Setting IMAP_USELOCKS to 1 will use dot-locking to support concurrent -# multiple access to the same folder. This incurs slight additional -# overhead. Concurrent multiple access will still work without this setting, -# however occasionally a minor race condition may result in an IMAP client -# downloading the same message twice, or a keyword update will fail. -# -# IMAP_USELOCKS=1 is strongly recommended when shared folders are used. - -IMAP_USELOCKS=1 - -##NAME: IMAP_SHAREDINDEXFILE:0 -# -# The index of all accessible folders. Do not change this setting unless -# you know what you're doing. See README.sharedfolders for additional -# information. - -IMAP_SHAREDINDEXFILE=/etc/courier-imap/shared/index - -##NAME: IMAP_ENHANCEDIDLE:0 -# -# If Courier was compiled with the File Alteration Monitor, setting -# IMAP_ENHANCEDIDLE to 1 enables enhanced IDLE mode, where multiple -# clients may open the same folder concurrently, and receive updates to -# folder contents in realtime. See the imapd(8) man page for additional -# information. -# -# IMPORTANT: IMAP_USELOCKS *MUST* also be set to 1, and IDLE must be included -# in the IMAP_CAPABILITY list. -# - -IMAP_ENHANCEDIDLE=0 - -##NAME: IMAP_TRASHFOLDERNAME:0 -# -# The name of the magic trash Folder. For MSOE compatibility, -# you can set IMAP_TRASHFOLDERNAME="Deleted Items". -# -# IMPORTANT: If you change this, you must also change IMAP_EMPTYTRASH - -IMAP_TRASHFOLDERNAME=Trash - -##NAME: IMAP_EMPTYTRASH:0 -# -# The following setting is optional, and causes messages from the given -# folder to be automatically deleted after the given number of days. -# IMAP_EMPTYTRASH is a comma-separated list of folder:days. The default -# setting, below, purges 7 day old messages from the Trash folder. -# Another useful setting would be: -# -# IMAP_EMPTYTRASH=Trash:7,Sent:30 -# -# This would also delete messages from the Sent folder (presumably copies -# of sent mail) after 30 days. This is a global setting that is applied to -# every mail account, and is probably useful in a controlled, corporate -# environment. -# -# Important: the purging is controlled by CTIME, not MTIME (the file time -# as shown by ls). It is perfectly ordinary to see stuff in Trash that's -# a year old. That's the file modification time, MTIME, that's displayed. -# This is generally when the message was originally delivered to this -# mailbox. Purging is controlled by a different timestamp, CTIME, which is -# changed when the file is moved to the Trash folder (and at other times too). -# -# You might want to disable this setting in certain situations - it results -# in a stat() of every file in each folder, at login and logout. -# - -IMAP_EMPTYTRASH=Trash:7 - -##NAME: IMAP_MOVE_EXPUNGE_TO_TRASH:0 -# -# Set IMAP_MOVE_EXPUNGE_TO_TRASH to move expunged messages to Trash. This -# effectively allows an undo of message deletion by fishing the deleted -# mail from trash. Trash can be manually expunged as usually, and mail -# will get automatically expunged from Trash according to IMAP_EMPTYTRASH. -# -# NOTE: shared folders are still expunged as usual. Shared folders are -# not affected. -# - -IMAP_MOVE_EXPUNGE_TO_TRASH=0 - - -##NAME: OUTBOX:0 -# -# The next set of options deal with the "Outbox" enhancement. -# Uncomment the following setting to create a special folder, named -# INBOX.Outbox -# -# OUTBOX=.Outbox - -##NAME: SENDMAIL:0 -# -# If OUTBOX is defined, mail can be sent via the IMAP connection by copying -# a message to the INBOX.Outbox folder. For all practical matters, -# INBOX.Outbox looks and behaves just like any other IMAP folder. If this -# folder doesn't exist it must be created by the IMAP mail client, just -# like any other IMAP folder. The kicker: any message copied or moved to -# this folder is will be E-mailed by the Courier-IMAP server, by running -# the SENDMAIL program. Therefore, messages copied or moved to this -# folder must be well-formed RFC-2822 messages, with the recipient list -# specified in the To:, Cc:, and Bcc: headers. Courier-IMAP relies on -# SENDMAIL to read the recipient list from these headers (and delete the Bcc: -# header) by running the command "$SENDMAIL -oi -t -f $SENDER", with the -# message piped on standard input. $SENDER will be the return address -# of the message, which is set by the authentication module. -# -# DO NOT MODIFY SENDMAIL, below, unless you know what you're doing. -# - -SENDMAIL=/usr/sbin/sendmail - -##NAME: HEADERFROM:0 -# -# For administrative and oversight purposes, the return address, $SENDER -# will also be saved in the X-IMAP-Sender mail header. This header gets -# added to the sent E-mail (but it doesn't get saved in the copy of the -# message that's saved in the folder) -# -# WARNING - By enabling OUTBOX above, *every* IMAP mail client will receive -# the magic OUTBOX treatment. Therefore advance LARTing is in order for -# _all_ of your lusers, until every one of them is aware of this. Otherwise if -# OUTBOX is left at its default setting - a folder name that might be used -# accidentally - some people may be in for a rude surprise. You can redefine -# the name of the magic folder by changing OUTBOX, above. You should do that -# and pick a less-obvious name. Perhaps brand it with your organizational -# name ( OUTBOX=.WidgetsAndSonsOutbox ) - -HEADERFROM=X-IMAP-Sender - -##NAME: IMAPDSTART:0 -# -# IMAPDSTART is not used directly. Rather, this is a convenient flag to -# be read by your system startup script in /etc/rc.d, like this: -# -# . /etc/courier-imap/imapd -# -# case x$IMAPDSTART in -# x[yY]*) -# /usr/lib/courier-imap/imapd.rc start -# ;; -# esac -# -# The default setting is going to be NO, so you'll have to manually flip -# it to yes. - -IMAPDSTART=YES - -##NAME: MAILDIRPATH:0 -# -# MAILDIRPATH - directory name of the maildir directory. -# -MAILDIRPATH=Maildir - -#Hardwire a value for ${MAILDIR} -MAILDIR=.maildir -MAILDIRPATH=.maildir -#Put any program for ${PRERUN} here -PRERUN= diff --git a/syscp/patches/gentoo-config-files/bind/gentoo/courier/etc_courier-imap_imapd-ssl b/syscp/patches/gentoo-config-files/bind/gentoo/courier/etc_courier-imap_imapd-ssl deleted file mode 100644 index 76dbcf7..0000000 --- a/syscp/patches/gentoo-config-files/bind/gentoo/courier/etc_courier-imap_imapd-ssl +++ /dev/null @@ -1,199 +0,0 @@ -##VERSION: $Id: imapd-ssl.dist.in,v 1.11 2004/10/21 00:45:35 mrsam Exp $ -# -# imapd-ssl created from imapd-ssl.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# Copyright 2000 - 2004 Double Precision, Inc. See COPYING for -# distribution information. -# -# This configuration file sets various options for the Courier-IMAP server -# when used to handle SSL IMAP connections. -# -# SSL and non-SSL connections are handled by a dedicated instance of the -# couriertcpd daemon. If you are accepting both SSL and non-SSL IMAP -# connections, you will start two instances of couriertcpd, one on the -# IMAP port 143, and another one on the IMAP-SSL port 993. -# -# Download OpenSSL from http://www.openssl.org/ -# -##NAME: SSLPORT:1 -# -# Options in the imapd-ssl configuration file AUGMENT the options in the -# imapd configuration file. First the imapd configuration file is read, -# then the imapd-ssl configuration file, so we do not have to redefine -# anything. -# -# However, some things do have to be redefined. The port number is -# specified by SSLPORT, instead of PORT. The default port is port 993. -# -# Multiple port numbers can be separated by commas. When multiple port -# numbers are used it is possibly to select a specific IP address for a -# given port as "ip.port". For example, "127.0.0.1.900,192.68.0.1.900" -# accepts connections on port 900 on IP addresses 127.0.0.1 and 192.68.0.1 -# The SSLADDRESS setting is a default for ports that do not have -# a specified IP address. - -SSLPORT=993 - -##NAME: SSLADDRESS:0 -# -# Address to listen on, can be set to a single IP address. -# -# SSLADDRESS=127.0.0.1 - -SSLADDRESS=0 - -##NAME: SSLPIDFILE:0 -# -# That's the SSL IMAP port we'll listen on. -# Feel free to redefine MAXDAEMONS, TCPDOPTS, and MAXPERIP. - -SSLPIDFILE=/var/run/imapd-ssl.pid - -##NAME: IMAPDSSLSTART:0 -# -# Different pid files, so that both instances of couriertcpd can coexist -# happily. -# -# You can also redefine IMAP_CAPABILITY, although I can't -# think of why you'd want to do that. -# -# -# Ok, the following settings are new to imapd-ssl: -# -# Whether or not to start IMAP over SSL on simap port: - -IMAPDSSLSTART=YES - -##NAME: IMAPDSTARTTLS:0 -# -# Whether or not to implement IMAP STARTTLS extension instead: - -IMAPDSTARTTLS=YES - -##NAME: IMAP_TLS_REQUIRED:1 -# -# Set IMAP_TLS_REQUIRED to 1 if you REQUIRE STARTTLS for everyone. -# (this option advertises the LOGINDISABLED IMAP capability, until STARTTLS -# is issued). - -IMAP_TLS_REQUIRED=0 - -######################################################################### -# -# The following variables configure IMAP over SSL. If OpenSSL is available -# during configuration, the couriertls helper gets compiled, and upon -# installation a dummy TLS_CERTFILE gets generated. courieresmtpd will -# automatically advertise the ESMTP STARTTLS extension if both TLS_CERTFILE -# and COURIERTLS exist. -# -# WARNING: Peer certificate verification has NOT yet been tested. Proceed -# at your own risk. Only the basic SSL/TLS functionality is known to be -# working. Keep this in mind as you play with the following variables. -# -##NAME: COURIERTLS:0 -# - -COURIERTLS=/usr/sbin/couriertls - -##NAME: TLS_PROTOCOL:0 -# -# TLS_PROTOCOL sets the protocol version. The possible versions are: -# -# SSL2 - SSLv2 -# SSL3 - SSLv3 -# TLS1 - TLS1 - -TLS_PROTOCOL=SSL3 - -##NAME: TLS_STARTTLS_PROTOCOL:0 -# -# TLS_STARTTLS_PROTOCOL is used instead of TLS_PROTOCOL for the IMAP STARTTLS -# extension, as opposed to IMAP over SSL on port 993. -# - -TLS_STARTTLS_PROTOCOL=TLS1 - -##NAME: TLS_CIPHER_LIST:0 -# -# TLS_CIPHER_LIST optionally sets the list of ciphers to be used by the -# OpenSSL library. In most situations you can leave TLS_CIPHER_LIST -# undefined -# -# TLS_CIPHER_LIST="ALL:!ADH:RC4+RSA:+SSLv2:@STRENGTH" - -##NAME: TLS_TIMEOUT:0 -# TLS_TIMEOUT is currently not implemented, and reserved for future use. -# This is supposed to be an inactivity timeout, but its not yet implemented. -# - -##NAME: TLS_DHCERTFILE:0 -# -# TLS_DHCERTFILE - PEM file that stores our Diffie-Hellman cipher pair. -# When OpenSSL is compiled to use Diffie-Hellman ciphers instead of RSA -# you must generate a DH pair that will be used. In most situations the -# DH pair is to be treated as confidential, and the file specified by -# TLS_DHCERTFILE must not be world-readable. -# -# TLS_DHCERTFILE= - -##NAME: TLS_CERTFILE:0 -# -# TLS_CERTFILE - certificate to use. TLS_CERTFILE is required for SSL/TLS -# servers, and is optional for SSL/TLS clients. TLS_CERTFILE is usually -# treated as confidential, and must not be world-readable. -# -TLS_CERTFILE=/etc/ssl/server/<SERVERNAME>.crt_and_key - -##NAME: TLS_TRUSTCERTS:0 -# -# TLS_TRUSTCERTS=pathname - load trusted certificates from pathname. -# pathname can be a file or a directory. If a file, the file should -# contain a list of trusted certificates, in PEM format. If a -# directory, the directory should contain the trusted certificates, -# in PEM format, one per file and hashed using OpenSSL's c_rehash -# script. TLS_TRUSTCERTS is used by SSL/TLS clients (by specifying -# the -domain option) and by SSL/TLS servers (TLS_VERIFYPEER is set -# to PEER or REQUIREPEER). -# -# -# TLS_TRUSTCERTS= - -##NAME: TLS_VERIFYPEER:0 -# -# TLS_VERIFYPEER - how to verify client certificates. The possible values of -# this setting are: -# -# NONE - do not verify anything -# -# PEER - verify the client certificate, if one's presented -# -# REQUIREPEER - require a client certificate, fail if one's not presented -# -# -TLS_VERIFYPEER=NONE - -##NAME: TLS_CACHE:0 -# -# A TLS/SSL session cache may slightly improve response for IMAP clients -# that open multiple SSL sessions to the server. TLS_CACHEFILE will be -# automatically created, TLS_CACHESIZE bytes long, and used as a cache -# buffer. -# -# This is an experimental feature and should be disabled if it causes -# problems with SSL clients. Disable SSL caching by commenting out the -# following settings: - -TLS_CACHEFILE=/var/lib/courier-imap/couriersslcache -TLS_CACHESIZE=524288 - -##NAME: MAILDIRPATH:0 -# -# MAILDIRPATH - directory name of the maildir directory. -# -MAILDIRPATH=Maildir - -#Hardwire a value for ${MAILDIR} -MAILDIRPATH=.maildir diff --git a/syscp/patches/gentoo-config-files/bind/gentoo/courier/etc_courier-imap_pop3d b/syscp/patches/gentoo-config-files/bind/gentoo/courier/etc_courier-imap_pop3d deleted file mode 100644 index 71502ae..0000000 --- a/syscp/patches/gentoo-config-files/bind/gentoo/courier/etc_courier-imap_pop3d +++ /dev/null @@ -1,127 +0,0 @@ -##VERSION: $Id: pop3d.dist.in,v 1.11 2004/10/30 15:39:38 mrsam Exp $ -# -# pop3d created from pop3d.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# Copyright 1998 - 2004 Double Precision, Inc. See COPYING for -# distribution information. -# -# Courier POP3 daemon configuration -# -##NAME: PIDFILE:0 -# - -PIDFILE=/var/run/pop3d.pid - -##NAME: MAXDAEMONS:0 -# -# Maximum number of POP3 servers started -# - -MAXDAEMONS=50 - -##NAME: MAXPERIP:4 -# -# Maximum number of connections to accept from the same IP address - -MAXPERIP=5 - -##NAME: POP3AUTH:1 -# -# To advertise the SASL capability, per RFC 2449, uncomment the POP3AUTH -# variable: -# -# POP3AUTH="LOGIN" -# -# If you have configured the CRAM-MD5 or CRAM-SHA1, set POP3AUTH to something -# like this: -# -# POP3AUTH="LOGIN CRAM-MD5 CRAM-SHA1" - -POP3AUTH="" - -##NAME: POP3AUTH_ORIG:0 -# -# For use by webadmin - -POP3AUTH_ORIG="LOGIN CRAM-MD5 CRAM-SHA1" - -##NAME: POP3AUTH_TLS:1 -# -# To also advertise SASL PLAIN if SSL is enabled, uncomment the -# POP3AUTH_TLS environment variable: -# -# POP3AUTH_TLS="LOGIN PLAIN" - -POP3AUTH_TLS="" - -##NAME: POP3AUTH_TLS_ORIG:0 -# -# For use by webadmin - -POP3AUTH_TLS_ORIG="LOGIN PLAIN" - -##NAME: POP3_PROXY:0 -# -# Enable proxying. See README.proxy - -POP3_PROXY=0 - -##NAME: PORT:1 -# -# Port to listen on for connections. The default is port 110. -# -# Multiple port numbers can be separated by commas. When multiple port -# numbers are used it is possibly to select a specific IP address for a -# given port as "ip.port". For example, "127.0.0.1.900,192.68.0.1.900" -# accepts connections on port 900 on IP addresses 127.0.0.1 and 192.68.0.1 -# The ADDRESS setting is a default for ports that do not have a specified -# IP address. - -PORT=110 - -##NAME: ADDRESS:0 -# -# IP address to listen on. 0 means all IP addresses. - -ADDRESS=0 - -##NAME: TCPDOPTS:0 -# -# Other couriertcpd(1) options. The following defaults should be fine. -# - -TCPDOPTS="-nodnslookup -noidentlookup" - -##NAME: POP3DSTART:0 -# -# POP3DSTART is not referenced anywhere in the standard Courier programs -# or scripts. Rather, this is a convenient flag to be read by your system -# startup script in /etc/rc.d, like this: -# -# . /etc/courier-imap/pop3d -# case x$POP3DSTART in -# x[yY]*) -# /usr/lib/courier-imap/pop3d.rc start -# ;; -# esac -# -# The default setting is going to be NO, until Courier is shipped by default -# with enough platforms so that people get annoyed with having to flip it to -# YES every time. - -POP3DSTART=YES - -##NAME: MAILDIRPATH:0 -# -# MAILDIRPATH - directory name of the maildir directory. -# -MAILDIRPATH=Maildir - -#Hardwire a value for ${MAILDIR} -MAILDIR=.maildir -MAILDIRPATH=.maildir -#Put any program for ${PRERUN} here -PRERUN= diff --git a/syscp/patches/gentoo-config-files/bind/gentoo/courier/etc_courier-imap_pop3d-ssl b/syscp/patches/gentoo-config-files/bind/gentoo/courier/etc_courier-imap_pop3d-ssl deleted file mode 100644 index a0267a0..0000000 --- a/syscp/patches/gentoo-config-files/bind/gentoo/courier/etc_courier-imap_pop3d-ssl +++ /dev/null @@ -1,186 +0,0 @@ -##VERSION: $Id: pop3d-ssl.dist.in,v 1.12 2004/10/21 00:45:35 mrsam Exp $ -# -# pop3d-ssl created from pop3d-ssl.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# Copyright 2000-2004 Double Precision, Inc. See COPYING for -# distribution information. -# -# This configuration file sets various options for the Courier-IMAP server -# when used to handle SSL POP3 connections. -# -# SSL and non-SSL connections are handled by a dedicated instance of the -# couriertcpd daemon. If you are accepting both SSL and non-SSL POP3 -# connections, you will start two instances of couriertcpd, one on the -# POP3 port 110, and another one on the POP3-SSL port 995. -# -# Download OpenSSL from http://www.openssl.org/ -# -##NAME: SSLPORT:0 -# -# Options in the pop3d-ssl configuration file AUGMENT the options in the -# pop3d configuration file. First the pop3d configuration file is read, -# then the pop3d-ssl configuration file, so we do not have to redefine -# anything. -# -# However, some things do have to be redefined. The port number is -# specified by SSLPORT, instead of PORT. The default port is port 995. -# -# Multiple port numbers can be separated by commas. When multiple port -# numbers are used it is possibly to select a specific IP address for a -# given port as "ip.port". For example, "127.0.0.1.900,192.68.0.1.900" -# accepts connections on port 900 on IP addresses 127.0.0.1 and 192.68.0.1 -# The SSLADDRESS setting is a default for ports that do not have -# a specified IP address. - -SSLPORT=995 - -##NAME: SSLADDRESS:0 -# -# Address to listen on, can be set to a single IP address. -# -# SSLADDRESS=127.0.0.1 - -SSLADDRESS=0 - -##NAME: SSLPIDFILE:0 -# -# -# - -SSLPIDFILE=/var/run/pop3d-ssl.pid - -##NAME: POP3DSSLSTART:0 -# -# Whether or not to start POP3 over SSL on spop3 port: - -POP3DSSLSTART=YES - -##NAME: POP3_STARTTLS:0 -# -# Whether or not to implement the POP3 STLS extension: - -POP3_STARTTLS=YES - -##NAME: POP3_TLS_REQUIRED:1 -# -# Set POP3_TLS_REQUIRED to 1 if you REQUIRE STARTTLS for everyone. -# (this option advertises the LOGINDISABLED POP3 capability, until STARTTLS -# is issued). - -POP3_TLS_REQUIRED=0 - -##NAME: COURIERTLS:0 -# -# The following variables configure POP3 over SSL. If OpenSSL is available -# during configuration, the couriertls helper gets compiled, and upon -# installation a dummy TLS_CERTFILE gets generated. courieresmtpd will -# automatically advertise the ESMTP STARTTLS extension if both TLS_CERTFILE -# and COURIERTLS exist. -# -# WARNING: Peer certificate verification has NOT yet been tested. Proceed -# at your own risk. Only the basic SSL/TLS functionality is known to be -# working. Keep this in mind as you play with the following variables. - -COURIERTLS=/usr/sbin/couriertls - -##NAME: TLS_PROTOCOL:0 -# -# TLS_PROTOCOL sets the protocol version. The possible versions are: -# -# SSL2 - SSLv2 -# SSL3 - SSLv3 -# TLS1 - TLS1 - -TLS_PROTOCOL=SSL3 - -##NAME: TLS_STARTTLS_PROTOCOL:0 -# -# TLS_STARTTLS_PROTOCOL is used instead of TLS_PROTOCOL for the POP3 STARTTLS -# extension, as opposed to POP3 over SSL on port 995. -# - -TLS_STARTTLS_PROTOCOL=TLS1 - -##NAME: TLS_CIPHER_LIST:0 -# -# TLS_CIPHER_LIST optionally sets the list of ciphers to be used by the -# OpenSSL library. In most situations you can leave TLS_CIPHER_LIST -# undefined -# -# TLS_CIPHER_LIST="ALL:!ADH:RC4+RSA:+SSLv2:@STRENGTH" - -##NAME: TLS_TIMEOUT:0 -# TLS_TIMEOUT is currently not implemented, and reserved for future use. -# This is supposed to be an inactivity timeout, but its not yet implemented. -# - -##NAME: TLS_DHCERTFILE:0 -# -# TLS_DHCERTFILE - PEM file that stores our Diffie-Hellman cipher pair. -# When OpenSSL is compiled to use Diffie-Hellman ciphers instead of RSA -# you must generate a DH pair that will be used. In most situations the -# DH pair is to be treated as confidential, and the file specified by -# TLS_DHCERTFILE must not be world-readable. -# -# TLS_DHCERTFILE= - -##NAME: TLS_CERTFILE:0 -# -# TLS_CERTFILE - certificate to use. TLS_CERTFILE is required for SSL/TLS -# servers, and is optional for SSL/TLS clients. TLS_CERTFILE is usually -# treated as confidential, and must not be world-readable. -# -TLS_CERTFILE=/etc/ssl/server/<SERVERNAME>.crt_and_key - -##NAME: TLS_TRUSTCERTS:0 -# -# TLS_TRUSTCERTS=pathname - load trusted certificates from pathname. -# pathname can be a file or a directory. If a file, the file should -# contain a list of trusted certificates, in PEM format. If a -# directory, the directory should contain the trusted certificates, -# in PEM format, one per file and hashed using OpenSSL's c_rehash -# script. TLS_TRUSTCERTS is used by SSL/TLS clients (by specifying -# the -domain option) and by SSL/TLS servers (TLS_VERIFYPEER is set -# to PEER or REQUIREPEER). -# -# -# TLS_TRUSTCERTS= - -##NAME: TLS_VERIFYPEER:0 -# -# TLS_VERIFYPEER - how to verify client certificates. The possible values of -# this setting are: -# -# NONE - do not verify anything -# -# PEER - verify the client certificate, if one's presented -# -# REQUIREPEER - require a client certificate, fail if one's not presented -# -# -TLS_VERIFYPEER=NONE - -##NAME: TLS_CACHE:0 -# -# A TLS/SSL session cache may slightly improve response for long-running -# POP3 clients. TLS_CACHEFILE will be automatically created, TLS_CACHESIZE -# bytes long, and used as a cache buffer. -# -# This is an experimental feature and should be disabled if it causes -# problems with SSL clients. Disable SSL caching by commenting out the -# following settings: - -TLS_CACHEFILE=/var/lib/courier-imap/couriersslcache -TLS_CACHESIZE=524288 - -##NAME: MAILDIRPATH:0 -# -# MAILDIRPATH - directory name of the maildir directory. -# -MAILDIRPATH=Maildir - -#Hardwire a value for ${MAILDIR} -MAILDIRPATH=.maildir diff --git a/syscp/patches/gentoo-config-files/bind/gentoo/courier/etc_courier_authlib_authdaemonrc b/syscp/patches/gentoo-config-files/bind/gentoo/courier/etc_courier_authlib_authdaemonrc deleted file mode 100644 index 867a12d..0000000 --- a/syscp/patches/gentoo-config-files/bind/gentoo/courier/etc_courier_authlib_authdaemonrc +++ /dev/null @@ -1,93 +0,0 @@ -##VERSION: $Id: authdaemonrc.in,v 1.12 2005/07/05 12:25:08 mrsam Exp $ -# -# Copyright 2000-2005 Double Precision, Inc. See COPYING for -# distribution information. -# -# authdaemonrc created from authdaemonrc.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# This file configures authdaemond, the resident authentication daemon. -# -# Comments in this file are ignored. Although this file is intended to -# be sourced as a shell script, authdaemond parses it manually, so -# the acceptable syntax is a bit limited. Multiline variable contents, -# with the \ continuation character, are not allowed. Everything must -# fit on one line. Do not use any additional whitespace for indentation, -# or anything else. - -##NAME: authmodulelist:2 -# -# The authentication modules that are linked into authdaemond. The -# default list is installed. You may selectively disable modules simply -# by removing them from the following list. The available modules you -# can use are: authuserdb authpam authshadow authmysql authcustom authpipe - -authmodulelist="authmysql" - -##NAME: authmodulelistorig:3 -# -# This setting is used by Courier's webadmin module, and should be left -# alone - -authmodulelistorig="authuserdb authpam authshadow authmysql authcustom authpipe" - -##NAME: daemons:0 -# -# The number of daemon processes that are started. authdaemon is typically -# installed where authentication modules are relatively expensive: such -# as authldap, or authmysql, so it's better to have a number of them running. -# PLEASE NOTE: Some platforms may experience a problem if there's more than -# one daemon. Specifically, SystemV derived platforms that use TLI with -# socket emulation. I'm suspicious of TLI's ability to handle multiple -# processes accepting connections on the same filesystem domain socket. -# -# You may need to increase daemons if as your system load increases. Symptoms -# include sporadic authentication failures. If you start getting -# authentication failures, increase daemons. However, the default of 5 -# SHOULD be sufficient. Bumping up daemon count is only a short-term -# solution. The permanent solution is to add more resources: RAM, faster -# disks, faster CPUs... - -daemons=5 - -##NAME: authdaemonvar:2 -# -# authdaemonvar is here, but is not used directly by authdaemond. It's -# used by various configuration and build scripts, so don't touch it! - -authdaemonvar=/var/lib/courier/authdaemon - -##NAME: DEBUG_LOGIN:0 -# -# Dump additional diagnostics to syslog -# -# DEBUG_LOGIN=0 - turn off debugging -# DEBUG_LOGIN=1 - turn on debugging -# DEBUG_LOGIN=2 - turn on debugging + log passwords too -# -# ** YES ** - DEBUG_LOGIN=2 places passwords into syslog. -# -# Note that most information is sent to syslog at level 'debug', so -# you may need to modify your /etc/syslog.conf to be able to see it. - -DEBUG_LOGIN=0 - -##NAME: DEFAULTOPTIONS:0 -# -# A comma-separated list of option=value pairs. Each option is applied -# to an account if the account does not have its own specific value for -# that option. So for example, you can set -# DEFAULTOPTIONS="disablewebmail=1,disableimap=1" -# and then enable webmail and/or imap on individual accounts by setting -# disablewebmail=0 and/or disableimap=0 on the account. - -DEFAULTOPTIONS="" - -##NAME: LOGGEROPTS:0 -# -# courierlogger(1) options, e.g. to set syslog facility -# - -LOGGEROPTS="" diff --git a/syscp/patches/gentoo-config-files/bind/gentoo/courier/etc_courier_authlib_authmysqlrc b/syscp/patches/gentoo-config-files/bind/gentoo/courier/etc_courier_authlib_authmysqlrc deleted file mode 100644 index fec6508..0000000 --- a/syscp/patches/gentoo-config-files/bind/gentoo/courier/etc_courier_authlib_authmysqlrc +++ /dev/null @@ -1,12 +0,0 @@ -MYSQL_SERVER <SQL_HOST> -MYSQL_USERNAME <SQL_UNPRIVILEGED_USER> -MYSQL_PASSWORD <SQL_UNPRIVILEGED_PASSWORD> -MYSQL_PORT 0 -MYSQL_DATABASE <SQL_DB> -MYSQL_USER_TABLE mail_users -MYSQL_CRYPT_PWFIELD password_enc -MYSQL_UID_FIELD <VIRTUAL_UID_MAPS> -MYSQL_GID_FIELD <VIRTUAL_GID_MAPS> -MYSQL_LOGIN_FIELD username -MYSQL_HOME_FIELD "<VIRTUAL_MAILBOX_BASE>" -MYSQL_MAILDIR_FIELD maildir diff --git a/syscp/patches/gentoo-config-files/bind/gentoo/cron/etc_cron.d_syscp b/syscp/patches/gentoo-config-files/bind/gentoo/cron/etc_cron.d_syscp deleted file mode 100644 index 4afe408..0000000 --- a/syscp/patches/gentoo-config-files/bind/gentoo/cron/etc_cron.d_syscp +++ /dev/null @@ -1,10 +0,0 @@ -# -# Set PATH, otherwise restart-scripts won't find start-stop-daemon -# -PATH=/sbin:/bin:/usr/sbin:/usr/bin -# -# Regular cron jobs for the syscp package -# -# Please check that all following paths are correct -# -*/5 * * * * root /usr/lib/php4/bin/php -q -c /etc/php/syscp-cronjob/php.ini /var/www/syscp/scripts/cronscript.php diff --git a/syscp/patches/gentoo-config-files/bind/gentoo/cron/etc_php_syscp-cronjob_php.ini b/syscp/patches/gentoo-config-files/bind/gentoo/cron/etc_php_syscp-cronjob_php.ini deleted file mode 100644 index 74c8316..0000000 --- a/syscp/patches/gentoo-config-files/bind/gentoo/cron/etc_php_syscp-cronjob_php.ini +++ /dev/null @@ -1,61 +0,0 @@ -short_open_tag = On -asp_tags = Off -precision = 14 -output_buffering = Off -allow_call_time_pass_reference = Off -safe_mode = Off -safe_mode_gid = Off -safe_mode_include_dir = "/usr/share/php/:/usr/share/php4/:/usr/share/php5/" -safe_mode_allowed_env_vars = PHP_ -safe_mode_protected_env_vars = LD_LIBRARY_PATH -open_basedir = -disable_functions = -disable_classes = -expose_php = Off -max_execution_time = 180 -max_input_time = 120 -memory_limit = 32M -post_max_size = 32M -error_reporting = E_ALL & ~E_NOTICE -display_errors = On -display_startup_errors = Off -log_errors = Off -log_errors_max_len = 1024 -ignore_repeated_errors = Off -ignore_repeated_source = Off -report_memleaks = On -track_errors = Off -html_errors = Off -variables_order = "GPCS" -register_globals = Off -register_argc_argv = Off -gpc_order = "GPC" -magic_quotes_gpc = Off -magic_quotes_runtime = Off -magic_quotes_sybase = Off -include_path = ".:/usr/share/php/:/usr/share/php4/:/usr/share/php5/" -enable_dl = Off -file_uploads = On -upload_tmp_dir = "/tmp/" -upload_max_filesize = 32M -allow_url_fopen = Off -session.save_handler = files -session.save_path = "/tmp/" -session.use_cookies = 1 -session.name = PHPSESSID -session.auto_start = 0 -session.cookie_lifetime = 0 -session.cookie_path = / -session.cookie_domain = -session.serialize_handler = php -session.gc_probability = 1 -session.gc_divisor = 1000 -session.gc_maxlifetime = 1440 -session.bug_compat_42 = 0 -session.bug_compat_warn = 1 -session.referer_check = -session.entropy_length = 16 -session.entropy_file = /dev/urandom -session.cache_limiter = nocache -session.cache_expire = 180 -session.use_trans_sid = 0 diff --git a/syscp/patches/gentoo-config-files/bind/gentoo/cron/etc_php_syscp-vhost_php.ini b/syscp/patches/gentoo-config-files/bind/gentoo/cron/etc_php_syscp-vhost_php.ini deleted file mode 100644 index 048c26c..0000000 --- a/syscp/patches/gentoo-config-files/bind/gentoo/cron/etc_php_syscp-vhost_php.ini +++ /dev/null @@ -1,61 +0,0 @@ -short_open_tag = On -asp_tags = Off -precision = 14 -output_buffering = 4096 -allow_call_time_pass_reference = Off -safe_mode = Off -safe_mode_gid = Off -safe_mode_include_dir = "/usr/share/php/:/usr/share/php4/:/usr/share/php5/" -safe_mode_allowed_env_vars = PHP_ -safe_mode_protected_env_vars = LD_LIBRARY_PATH -open_basedir = "/var/www/syscp/:/var/www/syscp-suphp/syscp/:/var/www/syscpwebs/:/usr/share/php/:/usr/share/php4/:/usr/share/php5/" -disable_functions = exec,passthru,shell_exec,system,proc_close,proc_get_status,proc_nice,proc_open,proc_terminate -disable_classes = -expose_php = Off -max_execution_time = 30 -max_input_time = 60 -memory_limit = 16M -post_max_size = 12M -error_reporting = E_ALL & ~E_NOTICE -display_errors = Off -display_startup_errors = Off -log_errors = On -log_errors_max_len = 1024 -ignore_repeated_errors = Off -ignore_repeated_source = Off -report_memleaks = On -track_errors = Off -html_errors = Off -variables_order = "GPCS" -register_globals = Off -register_argc_argv = Off -gpc_order = "GPC" -magic_quotes_gpc = Off -magic_quotes_runtime = Off -magic_quotes_sybase = Off -include_path = ".:/usr/share/php/:/usr/share/php4/:/usr/share/php5/" -enable_dl = Off -file_uploads = On -upload_tmp_dir = "/var/www/syscp-suphp/syscp/" -upload_max_filesize = 32M -allow_url_fopen = Off -session.save_handler = files -session.save_path = "/var/www/syscp-suphp/syscp/" -session.use_cookies = 1 -session.name = PHPSESSID -session.auto_start = 0 -session.cookie_lifetime = 0 -session.cookie_path = / -session.cookie_domain = -session.serialize_handler = php -session.gc_probability = 1 -session.gc_divisor = 1000 -session.gc_maxlifetime = 1440 -session.bug_compat_42 = 0 -session.bug_compat_warn = 1 -session.referer_check = -session.entropy_length = 16 -session.entropy_file = /dev/urandom -session.cache_limiter = nocache -session.cache_expire = 180 -session.use_trans_sid = 0 diff --git a/syscp/patches/gentoo-config-files/bind/gentoo/postfix/etc_postfix_main.cf b/syscp/patches/gentoo-config-files/bind/gentoo/postfix/etc_postfix_main.cf deleted file mode 100644 index 9013dd6..0000000 --- a/syscp/patches/gentoo-config-files/bind/gentoo/postfix/etc_postfix_main.cf +++ /dev/null @@ -1,65 +0,0 @@ -# Postfix directories settings -command_directory = /usr/sbin -daemon_directory = /usr/lib/postfix -queue_directory = /var/spool/postfix -sample_directory = /etc/postfix -manpage_directory = /usr/share/man -readme_directory = /usr/share/doc/postfix-2.1.5-r2/readme -html_directory = no - -# Postfix programs paths settings -mailq_path = /usr/bin/mailq -newaliases_path = /usr/bin/newaliases -sendmail_path = /usr/sbin/sendmail - -# General Postfix configuration -myhostname = <SERVERNAME> -mydestination = $myhostname, $mydomain, localhost.$myhostname, localhost.$mydomain, localhost -mynetworks = 127.0.0.0/8 -inet_interfaces = all -mail_owner = postfix -setgid_group = postdrop -smtpd_banner = $myhostname ESMTP Mailserver -smtpd_helo_required = yes -append_dot_mydomain = no -biff = no - -# Postfix Debugger configuration -debug_peer_level = 2 -debugger_command = - PATH=/bin:/usr/bin:/usr/local/bin; export PATH; (echo cont; - echo where) | gdb $daemon_directory/$process_name $process_id 2>&1 - >$config_directory/$process_name.$process_id.log & sleep 5 - -# Postfix performance settings -default_destination_concurrency_limit = 20 -local_destination_concurrency_limit = 2 - -# Virtual delivery settings -virtual_transport = virtual -virtual_mailbox_base = <VIRTUAL_MAILBOX_BASE> -virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf -virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf -virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf -virtual_uid_maps = static:<VIRTUAL_UID_MAPS> -virtual_gid_maps = static:<VIRTUAL_GID_MAPS> - -# Local delivery settings -local_transport = local -alias_database = hash:/etc/mail/aliases -alias_maps = $alias_database - -# SASL settings -smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination -smtpd_sasl_auth_enable = yes -smtpd_sasl_local_domain = $myhostname -smtpd_sasl_security_options = noanonymous -broken_sasl_auth_clients = yes - -# TLS settings -#smtpd_use_tls = yes -#smtpd_tls_cert_file = /etc/ssl/server/<SERVERNAME>.crt -#smtpd_tls_key_file = /etc/ssl/server/<SERVERNAME>.key -#smtpd_tls_auth_only = no -#smtpd_tls_session_cache_timeout = 3600s -#tls_random_source = dev:/dev/urandom diff --git a/syscp/patches/gentoo-config-files/bind/gentoo/postfix/etc_postfix_mysql-virtual_alias_maps.cf b/syscp/patches/gentoo-config-files/bind/gentoo/postfix/etc_postfix_mysql-virtual_alias_maps.cf deleted file mode 100644 index c921e6f..0000000 --- a/syscp/patches/gentoo-config-files/bind/gentoo/postfix/etc_postfix_mysql-virtual_alias_maps.cf +++ /dev/null @@ -1,8 +0,0 @@ -user = <SQL_UNPRIVILEGED_USER> -password = <SQL_UNPRIVILEGED_PASSWORD> -dbname = <SQL_DB> -table = mail_virtual -select_field = destination -where_field = email -additional_conditions = and destination <> '' and destination <> ' ' -hosts = <SQL_HOST> diff --git a/syscp/patches/gentoo-config-files/bind/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf b/syscp/patches/gentoo-config-files/bind/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf deleted file mode 100644 index 4484bee..0000000 --- a/syscp/patches/gentoo-config-files/bind/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf +++ /dev/null @@ -1,8 +0,0 @@ -user = <SQL_UNPRIVILEGED_USER> -password = <SQL_UNPRIVILEGED_PASSWORD> -dbname = <SQL_DB> -table = panel_domains -select_field = domain -where_field = domain -additional_conditions = and isemaildomain = '1' -hosts = <SQL_HOST> diff --git a/syscp/patches/gentoo-config-files/bind/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf b/syscp/patches/gentoo-config-files/bind/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf deleted file mode 100644 index 7e0f79a..0000000 --- a/syscp/patches/gentoo-config-files/bind/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf +++ /dev/null @@ -1,7 +0,0 @@ -user = <SQL_UNPRIVILEGED_USER> -password = <SQL_UNPRIVILEGED_PASSWORD> -dbname = <SQL_DB> -table = mail_users -select_field = maildir -where_field = email -hosts = <SQL_HOST> diff --git a/syscp/patches/gentoo-config-files/bind/gentoo/postfix/etc_sasl2_smtpd.conf b/syscp/patches/gentoo-config-files/bind/gentoo/postfix/etc_sasl2_smtpd.conf deleted file mode 100644 index 2089cbb..0000000 --- a/syscp/patches/gentoo-config-files/bind/gentoo/postfix/etc_sasl2_smtpd.conf +++ /dev/null @@ -1,12 +0,0 @@ -pwcheck_method: auxprop -auxprop_plugin: sql -allowanonymouslogin: no -allowplaintext: yes -mech_list: PLAIN LOGIN -password_format: crypt -sql_engine: mysql -sql_hostnames: <SQL_HOST> -sql_user: <SQL_UNPRIVILEGED_USER> -sql_passwd: <SQL_UNPRIVILEGED_PASSWORD> -sql_database: <SQL_DB> -sql_select: SELECT password_enc FROM mail_users where username='%u@%r' diff --git a/syscp/patches/gentoo-config-files/bind/gentoo/proftpd/etc_proftpd_proftpd.conf b/syscp/patches/gentoo-config-files/bind/gentoo/proftpd/etc_proftpd_proftpd.conf deleted file mode 100644 index 5e56215..0000000 --- a/syscp/patches/gentoo-config-files/bind/gentoo/proftpd/etc_proftpd_proftpd.conf +++ /dev/null @@ -1,89 +0,0 @@ -# Server settings -ServerName "<SERVERNAME> FTP Server" -ServerType standalone -ServerIdent off -DefaultServer on -Port 21 -MaxInstances 50 - -# General settings -DeferWelcome on -MultilineRFC2228 on -ShowSymlinks on -AllowOverwrite on -AllowStoreRestart on -AllowRetrieveRestart on -UseReverseDNS off -IdentLookups off -ListOptions "-al" -DisplayFirstChdir .message - -# Modules settings -#DelayEngine off - -# Timeout settings -TimeoutLogin 120 -TimeoutNoTransfer 600 -TimeoutStalled 600 -TimeoutIdle 600 - -# Security settings -RootLogin off -RequireValidShell off -User syscpftpd -Group syscpftpd -Umask 133 022 -DefaultRoot ~ -DenyFilter \*.*/ - -# Per-Directory settings -<Directory /*> -Umask 133 022 -AllowOverwrite on -</Directory> - -# SQL settings -SQLAuthTypes Crypt -SQLAuthenticate users* groups* -SQLConnectInfo <SQL_DB>@<SQL_HOST> <SQL_UNPRIVILEGED_USER> <SQL_UNPRIVILEGED_PASSWORD> -SQLUserInfo ftp_users username password uid gid homedir shell -SQLGroupInfo ftp_groups groupname gid members -SQLUserWhereClause "login_enabled = 'y'" - -SQLLog PASS login -SQLNamedQuery login UPDATE "last_login=now(), login_count=login_count+1 WHERE username='%u'" ftp_users - -SQLLog RETR download -SQLNamedQuery download UPDATE "down_count=down_count+1, down_bytes=down_bytes+%b WHERE username='%u'" ftp_users - -SQLLog STOR upload -SQLNamedQuery upload UPDATE "up_count=up_count+1, up_bytes=up_bytes+%b WHERE username='%u'" ftp_users - -# TLS settings -#<IfModule mod_tls.c> -#TLSEngine on -#TLSLog /var/log/proftpd-tls.log -#TLSProtocol SSLv23 -#TLSTimeoutHandshake 120 -# Really important for WinClients -#TLSOptions NoCertRequest -#TLSRSACertificateFile /etc/ssl/server/<SERVERNAME>.crt -#TLSRSACertificateKeyFile /etc/ssl/server/<SERVERNAME>.key -# Authenticate client that want to use FTP over TLS? -#TLSVerifyClient off -# Uncomment the following line to force tls login -#TLSRequired off -#</IfModule> - -# LOG settings -# Logging Formats -LogFormat default "%h %1 %u %t \"%r\" %s %b" -LogFormat auth "%v [%P] %h %t \"%r\" %s" -LogFormat write "%h %l %u %t \"%r\" %s %b" -# Activate Logging -# all logins -ExtendedLog /var/log/proftpd-auth.log AUTH auth -# file/dir access -ExtendedLog /var/log/proftpd-access.log WRITE,READ write -# everything (be careful, generates_ very_ big logfiles) -#ExtendedLog /var/log/proftpd-all.log ALL default diff --git a/syscp/patches/gentoo-config-files/bind/syscp-1.2.13-gentoo-admin_configfiles.php-bind b/syscp/patches/gentoo-config-files/bind/syscp-1.2.13-gentoo-admin_configfiles.php-bind deleted file mode 100644 index ff64f20..0000000 --- a/syscp/patches/gentoo-config-files/bind/syscp-1.2.13-gentoo-admin_configfiles.php-bind +++ /dev/null @@ -1,286 +0,0 @@ -<?php -/** - * filename: $Source: /syscp/syscp/admin_configfiles.php,v $ - * begin: Wednesday, Sep 08, 2004 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. This program is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY; without even the - * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * @author Florian Lippert <flo@redenswert.de> - * @copyright (C) 2003-2004 Florian Lippert - * @package Panel - * @version $Id: admin_configfiles.php,v 1.9 2005/06/15 13:53:58 flo Exp $ - * Modified to reflect the Gentoo environment by Luca Longinotti <chtekk@gentoo.org> - */ - - define('AREA', 'admin'); - - /** - * Include our init.php, which manages Sessions, Language etc. - */ - require("./lib/init.php"); - - - $configfiles = Array - ( - 'gentoo' => Array - ( - 'label' => 'Gentoo', - 'daemons' => Array - ( - 'apache' => Array - ( - 'label' => 'Apache2 Webserver (HTTP)', - 'commands' => Array - ( - 'touch '.$settings['system']['apacheconf_directory'].'vhosts.d/99_syscp-vhosts.conf', - 'chown root:0 '.$settings['system']['apacheconf_directory'].'vhosts.d/99_syscp-vhosts.conf', - 'chmod 0600 '.$settings['system']['apacheconf_directory'].'vhosts.d/99_syscp-vhosts.conf', - 'echo "Include '.$settings['system']['apacheconf_directory'].'vhosts.d/99_syscp-vhosts.conf" >> /etc/apache2/httpd.conf', - 'mkdir -p '.$settings['system']['documentroot_prefix'], - 'mkdir -p '.$settings['system']['logfiles_directory'] - ), - 'restart' => Array - ( - 'rc-update add apache2 default', - '/etc/init.d/apache2 restart' - ) - ), - 'bind' => Array - ( - 'label' => 'Bind9 Nameserver (DNS)', - 'files' => Array - ( - 'etc_bind_default.zone' => '/etc/bind/default.zone' - ), - 'commands' => Array - ( - 'echo "include \"'.$settings['system']['bindconf_directory'].'syscp_bind.conf\";" >> /etc/bind/named.conf', - 'touch '.$settings['system']['bindconf_directory'].'syscp_bind.conf', - 'chown root:0 '.$settings['system']['bindconf_directory'].'syscp_bind.conf', - 'chmod 0600 '.$settings['system']['bindconf_directory'].'syscp_bind.conf' - ), - 'restart' => Array - ( - 'rc-update add named default', - '/etc/init.d/named restart' - ) - ), - 'courier' => Array - ( - 'label' => 'Courier-IMAP (POP3/IMAP)', - 'files' => Array - ( - 'etc_courier_authlib_authdaemonrc' => '/etc/courier/authlib/authdaemonrc', - 'etc_courier_authlib_authmysqlrc' => '/etc/courier/authlib/authmysqlrc', - 'etc_courier-imap_pop3d' => '/etc/courier-imap/pop3d', - 'etc_courier-imap_imapd' => '/etc/courier-imap/imapd', - 'etc_courier-imap_pop3d-ssl' => '/etc/courier-imap/pop3d-ssl', - 'etc_courier-imap_imapd-ssl' => '/etc/courier-imap/imapd-ssl' - ), - 'commands' => Array - ( - 'rm /etc/courier/authlib/authdaemonrc', - 'rm /etc/courier/authlib/authmysqlrc', - 'rm /etc/courier-imap/pop3d', - 'rm /etc/courier-imap/imapd', - 'rm /etc/courier-imap/pop3d-ssl', - 'rm /etc/courier-imap/imapd-ssl', - 'touch /etc/courier/authlib/authdaemonrc', - 'touch /etc/courier/authlib/authmysqlrc', - 'touch /etc/courier-imap/pop3d', - 'touch /etc/courier-imap/imapd', - 'touch /etc/courier-imap/pop3d-ssl', - 'touch /etc/courier-imap/imapd-ssl', - 'chown root:0 /etc/courier/authlib/authdaemonrc', - 'chown root:0 /etc/courier/authlib/authmysqlrc', - 'chown root:0 /etc/courier-imap/pop3d', - 'chown root:0 /etc/courier-imap/imapd', - 'chown root:0 /etc/courier-imap/pop3d-ssl', - 'chown root:0 /etc/courier-imap/imapd-ssl', - 'chmod 0600 /etc/courier/authlib/authdaemonrc', - 'chmod 0600 /etc/courier/authlib/authmysqlrc', - 'chmod 0600 /etc/courier-imap/pop3d', - 'chmod 0600 /etc/courier-imap/imapd', - 'chmod 0600 /etc/courier-imap/pop3d-ssl', - 'chmod 0600 /etc/courier-imap/imapd-ssl' - ), - 'restart' => Array - ( - 'rc-update add courier-authlib default', - 'rc-update add courier-pop3d default', - 'rc-update add courier-imapd default', - '/etc/init.d/courier-authlib restart', - '/etc/init.d/courier-pop3d restart', - '/etc/init.d/courier-imapd restart' - ) - ), - 'postfix' => Array - ( - 'label' => 'Postfix (MTA)', - 'files' => Array - ( - 'etc_postfix_main.cf' => '/etc/postfix/main.cf', - 'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf', - 'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf', - 'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf', - 'etc_sasl2_smtpd.conf' => '/etc/sasl2/smtpd.conf' - ), - 'commands' => Array - ( - 'mkdir -p '.$settings['system']['vmail_homedir'], - 'chown -R vmail:vmail '.$settings['system']['vmail_homedir'], - 'chmod 0750 '.$settings['system']['vmail_homedir'], - 'rm /etc/postfix/main.cf', - 'touch /etc/postfix/main.cf', - 'touch /etc/postfix/master.cf', - 'touch /etc/postfix/mysql-virtual_alias_maps.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'touch /etc/sasl2/smtpd.conf', - 'chown root:0 /etc/postfix/main.cf', - 'chown root:0 /etc/postfix/master.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_alias_maps.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'chown root:0 /etc/sasl2/smtpd.conf', - 'chmod 0600 /etc/postfix/main.cf', - 'chmod 0600 /etc/postfix/master.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_alias_maps.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'chmod 0600 /etc/sasl2/smtpd.conf' - ), - 'restart' => Array - ( - 'rc-update add postfix default', - '/etc/init.d/postfix restart' - ) - ), - 'proftpd' => Array - ( - 'label' => 'ProFTPd (FTP)', - 'files' => Array - ( - 'etc_proftpd_proftpd.conf' => '/etc/proftpd/proftpd.conf' - ), - 'commands' => Array - ( - 'touch /etc/proftpd/proftpd.conf', - 'chown root:0 /etc/proftpd/proftpd.conf', - 'chmod 0600 /etc/proftpd/proftpd.conf' - ), - 'restart' => Array - ( - 'rc-update add proftpd default', - '/etc/init.d/proftpd restart' - ) - ), - 'cron' => Array - ( - 'label' => 'Crond (cronscript)', - 'files' => Array - ( - 'etc_php_syscp-cronjob_php.ini' => '/etc/php/syscp-cronjob/php.ini', - 'etc_cron.d_syscp' => '/etc/cron.d/syscp' - ), - 'commands' => Array - ( - 'touch /etc/cron.d/syscp', - 'chown root:0 /etc/cron.d/syscp', - 'chmod 0640 /etc/cron.d/syscp', - 'mkdir -p /etc/php/syscp-cronjob', - 'touch /etc/php/syscp-cronjob/php.ini', - 'chown -R root:0 /etc/php/syscp-cronjob', - 'chmod 0750 /etc/php/syscp-cronjob', - 'chmod 0640 /etc/php/syscp-cronjob/php.ini' - ), - 'restart' => Array - ( - 'rc-update add vixie-cron default', - '/etc/init.d/vixie-cron restart' - ) - ) - ) - ) - ); - - /*echo '<pre>'; - print_r($configfiles); - echo '</pre>';*/ - - if( ($page == 'configfiles' || $page == 'overview') && $userinfo['change_serversettings'] == '1') - { - if(isset($_GET['distribution']) && $_GET['distribution']!='' && isset($configfiles[$_GET['distribution']]) && is_array($configfiles[$_GET['distribution']]) && - isset($_GET['daemon']) && $_GET['daemon']!='' && isset($configfiles[$_GET['distribution']]['daemons'][$_GET['daemon']]) && is_array($configfiles[$_GET['distribution']]['daemons'][$_GET['daemon']])) - { - $distribution = addslashes($_GET['distribution']); - $daemon = addslashes($_GET['daemon']); - - if(isset($configfiles[$distribution]['daemons'][$daemon]['commands']) && is_array($configfiles[$distribution]['daemons'][$daemon]['commands'])) - { - $commands = implode("\n", $configfiles[$distribution]['daemons'][$daemon]['commands']); - } - else - { - $commands = ''; - } - - $replace_arr = Array - ( - '<SQL_UNPRIVILEGED_USER>' => $sql['user'], - '<SQL_UNPRIVILEGED_PASSWORD>' => 'MYSQL_PASSWORD', - '<SQL_DB>' => $sql['db'], - '<SQL_HOST>' => $sql['host'], - '<SERVERNAME>' => $settings['system']['hostname'], - '<SERVERIP>' => $settings['system']['ipaddress'], - '<VIRTUAL_MAILBOX_BASE>' => $settings['system']['vmail_homedir'], - '<VIRTUAL_UID_MAPS>' => $settings['system']['vmail_uid'], - '<VIRTUAL_GID_MAPS>' => $settings['system']['vmail_gid'] - ); - $files = ''; - if(isset($configfiles[$distribution]['daemons'][$daemon]['files']) && is_array($configfiles[$distribution]['daemons'][$daemon]['files'])) - { - while(list($filename, $realname) = each($configfiles[$distribution]['daemons'][$daemon]['files'])) - { - $file_content = implode('', file('./templates/misc/configfiles/'.$distribution.'/'.$daemon.'/'.$filename)); - $file_content = strtr($file_content, $replace_arr); - $file_content = htmlspecialchars($file_content); - $numbrows = count(explode("\n", $file_content)); - eval("\$files.=\"".getTemplate("configfiles/configfiles_file")."\";"); - } - } - - if(isset($configfiles[$distribution]['daemons'][$daemon]['restart']) && is_array($configfiles[$distribution]['daemons'][$daemon]['restart'])) - { - $restart = implode("\n", $configfiles[$distribution]['daemons'][$daemon]['restart']); - } - else - { - $restart = ''; - } - - eval("echo \"".getTemplate("configfiles/configfiles")."\";"); - } - else - { - $distributions = ''; - while (list($distribution_name, $distribution_details) = each($configfiles)) - { - $daemons = ''; - while(list($daemon_name, $daemon_details) = each($distribution_details['daemons'])) - { - eval("\$daemons.=\"".getTemplate("configfiles/choose_daemon")."\";"); - } - eval("\$distributions.=\"".getTemplate("configfiles/choose_distribution")."\";"); - } - eval("echo \"".getTemplate("configfiles/choose")."\";"); - } - } - -?> diff --git a/syscp/patches/gentoo-config-files/bind/syscp-1.2.13-gentoo-config-bind-r2.tar.bz2 b/syscp/patches/gentoo-config-files/bind/syscp-1.2.13-gentoo-config-bind-r2.tar.bz2 Binary files differdeleted file mode 100644 index e859f7c..0000000 --- a/syscp/patches/gentoo-config-files/bind/syscp-1.2.13-gentoo-config-bind-r2.tar.bz2 +++ /dev/null diff --git a/syscp/patches/gentoo-config-files/nodns-ssl/etc_libnss-mysql-root.cfg b/syscp/patches/gentoo-config-files/nodns-ssl/etc_libnss-mysql-root.cfg deleted file mode 100644 index 6498977..0000000 --- a/syscp/patches/gentoo-config-files/nodns-ssl/etc_libnss-mysql-root.cfg +++ /dev/null @@ -1,2 +0,0 @@ -username <SQL_UNPRIVILEGED_USER> -password <SQL_UNPRIVILEGED_PASSWORD> diff --git a/syscp/patches/gentoo-config-files/nodns-ssl/etc_libnss-mysql.cfg b/syscp/patches/gentoo-config-files/nodns-ssl/etc_libnss-mysql.cfg deleted file mode 100644 index d284192..0000000 --- a/syscp/patches/gentoo-config-files/nodns-ssl/etc_libnss-mysql.cfg +++ /dev/null @@ -1,38 +0,0 @@ -getpwnam SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ - FROM ftp_users \ - WHERE username='%1$s' \ - LIMIT 1 -getpwuid SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ - FROM ftp_users \ - WHERE uid='%1$u' \ - LIMIT 1 -getspnam SELECT username,password,UNIX_TIMESTAMP()-10,'1','2','7','-1','-1','0' \ - FROM ftp_users \ - WHERE username='%1$s' \ - LIMIT 1 -getpwent SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ - FROM ftp_users -getspent SELECT username,password,UNIX_TIMESTAMP()-10,'1','2','7','-1','-1','0' \ - FROM ftp_users -getgrnam SELECT groupname,'x',gid \ - FROM ftp_groups \ - WHERE groupname='%1$s' \ - LIMIT 1 -getgrgid SELECT groupname,'x',gid \ - FROM ftp_groups \ - WHERE gid='%1$u' \ - LIMIT 1 -getgrent SELECT groupname,'x',gid \ - FROM ftp_groups -memsbygid SELECT username \ - FROM ftp_users \ - WHERE gid='%1$u' -gidsbymem SELECT gid \ - FROM ftp_users \ - WHERE username='%1$s' - -host <SQL_HOST> -database <SQL_DB> -username <SQL_UNPRIVILEGED_USER> -password <SQL_UNPRIVILEGED_PASSWORD> -socket /var/run/mysqld/mysqld.sock diff --git a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/courier/etc_courier-imap_imapd b/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/courier/etc_courier-imap_imapd deleted file mode 100644 index f594e41..0000000 --- a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/courier/etc_courier-imap_imapd +++ /dev/null @@ -1,376 +0,0 @@ -##VERSION: $Id: imapd.dist.in,v 1.32 2004/11/25 04:57:04 mrsam Exp $ -# -# imapd created from imapd.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# Copyright 1998 - 2004 Double Precision, Inc. See COPYING for -# distribution information. -# -# This configuration file sets various options for the Courier-IMAP server -# when used with the couriertcpd server. -# A lot of the stuff here is documented in the manual page for couriertcpd. -# -# NOTE - do not use \ to split long variable contents on multiple lines. -# This will break the default imapd.rc script, which parses this file. -# -##NAME: ADDRESS:0 -# -# Address to listen on, can be set to a single IP address. -# -# ADDRESS=127.0.0.1 - -ADDRESS=0 - -##NAME: PORT:1 -# -# Port numbers that connections are accepted on. The default is 143, -# the standard IMAP port. -# -# Multiple port numbers can be separated by commas. When multiple port -# numbers are used it is possible to select a specific IP address for a -# given port as "ip.port". For example, "127.0.0.1.900,192.68.0.1.900" -# accepts connections on port 900 on IP addresses 127.0.0.1 and 192.68.0.1 -# The previous ADDRESS setting is a default for ports that do not have -# a specified IP address. - -PORT=143 - -##NAME: AUTHSERVICE:0 -# -# It's possible to authenticate using a different 'service' parameter -# depending on the connection's port. This only works with authentication -# modules that use the 'service' parameter, such as PAM. Example: -# -# AUTHSERVICE143=imap -# AUTHSERVICE993=imaps - -##NAME: MAXDAEMONS:0 -# -# Maximum number of IMAP servers started -# - -MAXDAEMONS=50 - -##NAME: MAXPERIP:0 -# -# Maximum number of connections to accept from the same IP address - -MAXPERIP=10 - -##NAME: PIDFILE:0 -# -# File where couriertcpd will save its process ID -# - -PIDFILE=/var/run/imapd.pid - -##NAME: TCPDOPTS:0 -# -# Miscellaneous couriertcpd options that shouldn't be changed. -# - -TCPDOPTS="-nodnslookup -noidentlookup" - -##NAME: IMAP_CAPABILITY:1 -# -# IMAP_CAPABILITY specifies what most of the response should be to the -# CAPABILITY command. -# -# If you have properly configured Courier to use CRAM-MD5 or CRAM-SHA1 -# authentication (see INSTALL), set IMAP_CAPABILITY as follows: -# -# IMAP_CAPABILITY="IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 IDLE" -# - -IMAP_CAPABILITY="IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA IDLE" - -##NAME: KEYWORDS_CAPABILITY:0 -# -# IMAP_KEYWORDS=1 enables custom IMAP keywords. Set this option to 0 to -# disable custom keywords. - -IMAP_KEYWORDS=1 - -##NAME: SMAP1_CAPABILITY:0 -# -# EXPERIMENTAL -# -# To enable the experimental "Simple Mail Access Protocol" extensions, -# uncomment the following setting. -# -# SMAP_CAPABILITY=SMAP1 - -##NAME: IMAP_CAPABILITY_ORIG:1 -# -# For use by webadmin - -IMAP_CAPABILITY_ORIG="IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 IDLE" - -##NAME: IMAP_PROXY:0 -# -# Enable proxying. See README.proxy - -IMAP_PROXY=0 - -##NAME: IMAP_PROXY_FOREIGN:0 -# -# Proxying to non-Courier servers. Re-sends the CAPABILITY command after -# logging in to the remote server. May not work with all IMAP clients. - -IMAP_PROXY_FOREIGN=0 - -##NAME: IMAP_IDLE_TIMEOUT:0 -# -# This setting controls how often -# the server polls for changes to the folder, in IDLE mode (in seconds). - -IMAP_IDLE_TIMEOUT=60 - -##NAME: IMAP_CAPABILITY_TLS:0 -# -# The following setting will advertise SASL PLAIN authentication after -# STARTTLS is established. If you want to allow SASL PLAIN authentication -# with or without TLS then just comment this out, and add AUTH=PLAIN to -# IMAP_CAPABILITY - -IMAP_CAPABILITY_TLS="$IMAP_CAPABILITY AUTH=PLAIN" - -##NAME: IMAP_TLS_ORIG:0 -# -# For use by webadmin - -IMAP_CAPABILITY_TLS_ORIG="$IMAP_CAPABILITY_ORIG AUTH=PLAIN" - -##NAME: IMAP_DISABLETHREADSORT:0 -# -# Set IMAP_DISABLETHREADSORT to disable the THREAD and SORT commands - -# server side sorting and threading. -# -# Those capabilities will still be advertised, but the server will reject -# them. Set this option if you want to disable all the extra load from -# server-side threading and sorting. Not advertising those capabilities -# will simply result in the clients reading the entire folder, and sorting -# it on the client side. That will still put some load on the server. -# advertising these capabilities, but rejecting the commands, will stop this -# silliness. -# - -IMAP_DISABLETHREADSORT=0 - -##NAME: IMAP_CHECK_ALL_FOLDERS:0 -# -# Set IMAP_CHECK_ALL_FOLDERS to 1 if you want the server to check for new -# mail in every folder. Not all IMAP clients use the IMAP's new mail -# indicator, but some do. Normally new mail is checked only in INBOX, -# because it is a comparatively time consuming operation, and it would be -# a complete waste of time unless mail filters are used to deliver -# mail directly to folders. -# -# When IMAP clients are used which support new mail indication, and when -# mail filters are used to sort incoming mail into folders, setting -# IMAP_CHECK_ALL_FOLDERS to 1 will allow IMAP clients to announce new -# mail in folders. Note that this will result in slightly more load on the -# server. -# - -IMAP_CHECK_ALL_FOLDERS=0 - -##NAME: IMAP_OBSOLETE_CLIENT:0 -# -# Set IMAP_OBSOLETE_CLIENT if your IMAP client expects \\NoInferiors to mean -# what \\HasNoChildren really means. - -IMAP_OBSOLETE_CLIENT=0 - -##NAME: IMAP_UMASK:0 -# -# IMAP_UMASK sets the umask of the server process. The value of IMAP_UMASK is -# simply passed to the "umask" command. The default value is 022. -# -# This feature is mostly useful for shared folders, where the file permissions -# of the messages may be important. - -IMAP_UMASK=027 - -##NAME: IMAP_ULIMITD:0 -# -# IMAP_ULIMITD sets the maximum size of the data segment of the server -# process. The value of IMAP_ULIMITD is simply passed to the "ulimit -d" -# command (or ulimit -v). The argument to ulimi sets the upper limit on the -# size of the data segment of the server process, in kilobytes. The default -# value of 65536 sets a very generous limit of 64 megabytes, which should -# be more than plenty for anyone. -# -# This feature is used as an additional safety check that should stop -# any potential denial-of-service attacks that exploit any kind of -# a memory leak to exhaust all the available memory on the server. -# It is theoretically possible that obscenely huge folders will also -# result in the server running out of memory when doing server-side -# sorting (by my calculations you have to have at least 100,000 messages -# in a single folder, for that to happen). - -IMAP_ULIMITD=65536 - -##NAME: IMAP_USELOCKS:0 -# -# Setting IMAP_USELOCKS to 1 will use dot-locking to support concurrent -# multiple access to the same folder. This incurs slight additional -# overhead. Concurrent multiple access will still work without this setting, -# however occasionally a minor race condition may result in an IMAP client -# downloading the same message twice, or a keyword update will fail. -# -# IMAP_USELOCKS=1 is strongly recommended when shared folders are used. - -IMAP_USELOCKS=1 - -##NAME: IMAP_SHAREDINDEXFILE:0 -# -# The index of all accessible folders. Do not change this setting unless -# you know what you're doing. See README.sharedfolders for additional -# information. - -IMAP_SHAREDINDEXFILE=/etc/courier-imap/shared/index - -##NAME: IMAP_ENHANCEDIDLE:0 -# -# If Courier was compiled with the File Alteration Monitor, setting -# IMAP_ENHANCEDIDLE to 1 enables enhanced IDLE mode, where multiple -# clients may open the same folder concurrently, and receive updates to -# folder contents in realtime. See the imapd(8) man page for additional -# information. -# -# IMPORTANT: IMAP_USELOCKS *MUST* also be set to 1, and IDLE must be included -# in the IMAP_CAPABILITY list. -# - -IMAP_ENHANCEDIDLE=0 - -##NAME: IMAP_TRASHFOLDERNAME:0 -# -# The name of the magic trash Folder. For MSOE compatibility, -# you can set IMAP_TRASHFOLDERNAME="Deleted Items". -# -# IMPORTANT: If you change this, you must also change IMAP_EMPTYTRASH - -IMAP_TRASHFOLDERNAME=Trash - -##NAME: IMAP_EMPTYTRASH:0 -# -# The following setting is optional, and causes messages from the given -# folder to be automatically deleted after the given number of days. -# IMAP_EMPTYTRASH is a comma-separated list of folder:days. The default -# setting, below, purges 7 day old messages from the Trash folder. -# Another useful setting would be: -# -# IMAP_EMPTYTRASH=Trash:7,Sent:30 -# -# This would also delete messages from the Sent folder (presumably copies -# of sent mail) after 30 days. This is a global setting that is applied to -# every mail account, and is probably useful in a controlled, corporate -# environment. -# -# Important: the purging is controlled by CTIME, not MTIME (the file time -# as shown by ls). It is perfectly ordinary to see stuff in Trash that's -# a year old. That's the file modification time, MTIME, that's displayed. -# This is generally when the message was originally delivered to this -# mailbox. Purging is controlled by a different timestamp, CTIME, which is -# changed when the file is moved to the Trash folder (and at other times too). -# -# You might want to disable this setting in certain situations - it results -# in a stat() of every file in each folder, at login and logout. -# - -IMAP_EMPTYTRASH=Trash:7 - -##NAME: IMAP_MOVE_EXPUNGE_TO_TRASH:0 -# -# Set IMAP_MOVE_EXPUNGE_TO_TRASH to move expunged messages to Trash. This -# effectively allows an undo of message deletion by fishing the deleted -# mail from trash. Trash can be manually expunged as usually, and mail -# will get automatically expunged from Trash according to IMAP_EMPTYTRASH. -# -# NOTE: shared folders are still expunged as usual. Shared folders are -# not affected. -# - -IMAP_MOVE_EXPUNGE_TO_TRASH=0 - - -##NAME: OUTBOX:0 -# -# The next set of options deal with the "Outbox" enhancement. -# Uncomment the following setting to create a special folder, named -# INBOX.Outbox -# -# OUTBOX=.Outbox - -##NAME: SENDMAIL:0 -# -# If OUTBOX is defined, mail can be sent via the IMAP connection by copying -# a message to the INBOX.Outbox folder. For all practical matters, -# INBOX.Outbox looks and behaves just like any other IMAP folder. If this -# folder doesn't exist it must be created by the IMAP mail client, just -# like any other IMAP folder. The kicker: any message copied or moved to -# this folder is will be E-mailed by the Courier-IMAP server, by running -# the SENDMAIL program. Therefore, messages copied or moved to this -# folder must be well-formed RFC-2822 messages, with the recipient list -# specified in the To:, Cc:, and Bcc: headers. Courier-IMAP relies on -# SENDMAIL to read the recipient list from these headers (and delete the Bcc: -# header) by running the command "$SENDMAIL -oi -t -f $SENDER", with the -# message piped on standard input. $SENDER will be the return address -# of the message, which is set by the authentication module. -# -# DO NOT MODIFY SENDMAIL, below, unless you know what you're doing. -# - -SENDMAIL=/usr/sbin/sendmail - -##NAME: HEADERFROM:0 -# -# For administrative and oversight purposes, the return address, $SENDER -# will also be saved in the X-IMAP-Sender mail header. This header gets -# added to the sent E-mail (but it doesn't get saved in the copy of the -# message that's saved in the folder) -# -# WARNING - By enabling OUTBOX above, *every* IMAP mail client will receive -# the magic OUTBOX treatment. Therefore advance LARTing is in order for -# _all_ of your lusers, until every one of them is aware of this. Otherwise if -# OUTBOX is left at its default setting - a folder name that might be used -# accidentally - some people may be in for a rude surprise. You can redefine -# the name of the magic folder by changing OUTBOX, above. You should do that -# and pick a less-obvious name. Perhaps brand it with your organizational -# name ( OUTBOX=.WidgetsAndSonsOutbox ) - -HEADERFROM=X-IMAP-Sender - -##NAME: IMAPDSTART:0 -# -# IMAPDSTART is not used directly. Rather, this is a convenient flag to -# be read by your system startup script in /etc/rc.d, like this: -# -# . /etc/courier-imap/imapd -# -# case x$IMAPDSTART in -# x[yY]*) -# /usr/lib/courier-imap/imapd.rc start -# ;; -# esac -# -# The default setting is going to be NO, so you'll have to manually flip -# it to yes. - -IMAPDSTART=YES - -##NAME: MAILDIRPATH:0 -# -# MAILDIRPATH - directory name of the maildir directory. -# -MAILDIRPATH=Maildir - -#Hardwire a value for ${MAILDIR} -MAILDIR=.maildir -MAILDIRPATH=.maildir -#Put any program for ${PRERUN} here -PRERUN= diff --git a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/courier/etc_courier-imap_imapd-ssl b/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/courier/etc_courier-imap_imapd-ssl deleted file mode 100644 index 76dbcf7..0000000 --- a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/courier/etc_courier-imap_imapd-ssl +++ /dev/null @@ -1,199 +0,0 @@ -##VERSION: $Id: imapd-ssl.dist.in,v 1.11 2004/10/21 00:45:35 mrsam Exp $ -# -# imapd-ssl created from imapd-ssl.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# Copyright 2000 - 2004 Double Precision, Inc. See COPYING for -# distribution information. -# -# This configuration file sets various options for the Courier-IMAP server -# when used to handle SSL IMAP connections. -# -# SSL and non-SSL connections are handled by a dedicated instance of the -# couriertcpd daemon. If you are accepting both SSL and non-SSL IMAP -# connections, you will start two instances of couriertcpd, one on the -# IMAP port 143, and another one on the IMAP-SSL port 993. -# -# Download OpenSSL from http://www.openssl.org/ -# -##NAME: SSLPORT:1 -# -# Options in the imapd-ssl configuration file AUGMENT the options in the -# imapd configuration file. First the imapd configuration file is read, -# then the imapd-ssl configuration file, so we do not have to redefine -# anything. -# -# However, some things do have to be redefined. The port number is -# specified by SSLPORT, instead of PORT. The default port is port 993. -# -# Multiple port numbers can be separated by commas. When multiple port -# numbers are used it is possibly to select a specific IP address for a -# given port as "ip.port". For example, "127.0.0.1.900,192.68.0.1.900" -# accepts connections on port 900 on IP addresses 127.0.0.1 and 192.68.0.1 -# The SSLADDRESS setting is a default for ports that do not have -# a specified IP address. - -SSLPORT=993 - -##NAME: SSLADDRESS:0 -# -# Address to listen on, can be set to a single IP address. -# -# SSLADDRESS=127.0.0.1 - -SSLADDRESS=0 - -##NAME: SSLPIDFILE:0 -# -# That's the SSL IMAP port we'll listen on. -# Feel free to redefine MAXDAEMONS, TCPDOPTS, and MAXPERIP. - -SSLPIDFILE=/var/run/imapd-ssl.pid - -##NAME: IMAPDSSLSTART:0 -# -# Different pid files, so that both instances of couriertcpd can coexist -# happily. -# -# You can also redefine IMAP_CAPABILITY, although I can't -# think of why you'd want to do that. -# -# -# Ok, the following settings are new to imapd-ssl: -# -# Whether or not to start IMAP over SSL on simap port: - -IMAPDSSLSTART=YES - -##NAME: IMAPDSTARTTLS:0 -# -# Whether or not to implement IMAP STARTTLS extension instead: - -IMAPDSTARTTLS=YES - -##NAME: IMAP_TLS_REQUIRED:1 -# -# Set IMAP_TLS_REQUIRED to 1 if you REQUIRE STARTTLS for everyone. -# (this option advertises the LOGINDISABLED IMAP capability, until STARTTLS -# is issued). - -IMAP_TLS_REQUIRED=0 - -######################################################################### -# -# The following variables configure IMAP over SSL. If OpenSSL is available -# during configuration, the couriertls helper gets compiled, and upon -# installation a dummy TLS_CERTFILE gets generated. courieresmtpd will -# automatically advertise the ESMTP STARTTLS extension if both TLS_CERTFILE -# and COURIERTLS exist. -# -# WARNING: Peer certificate verification has NOT yet been tested. Proceed -# at your own risk. Only the basic SSL/TLS functionality is known to be -# working. Keep this in mind as you play with the following variables. -# -##NAME: COURIERTLS:0 -# - -COURIERTLS=/usr/sbin/couriertls - -##NAME: TLS_PROTOCOL:0 -# -# TLS_PROTOCOL sets the protocol version. The possible versions are: -# -# SSL2 - SSLv2 -# SSL3 - SSLv3 -# TLS1 - TLS1 - -TLS_PROTOCOL=SSL3 - -##NAME: TLS_STARTTLS_PROTOCOL:0 -# -# TLS_STARTTLS_PROTOCOL is used instead of TLS_PROTOCOL for the IMAP STARTTLS -# extension, as opposed to IMAP over SSL on port 993. -# - -TLS_STARTTLS_PROTOCOL=TLS1 - -##NAME: TLS_CIPHER_LIST:0 -# -# TLS_CIPHER_LIST optionally sets the list of ciphers to be used by the -# OpenSSL library. In most situations you can leave TLS_CIPHER_LIST -# undefined -# -# TLS_CIPHER_LIST="ALL:!ADH:RC4+RSA:+SSLv2:@STRENGTH" - -##NAME: TLS_TIMEOUT:0 -# TLS_TIMEOUT is currently not implemented, and reserved for future use. -# This is supposed to be an inactivity timeout, but its not yet implemented. -# - -##NAME: TLS_DHCERTFILE:0 -# -# TLS_DHCERTFILE - PEM file that stores our Diffie-Hellman cipher pair. -# When OpenSSL is compiled to use Diffie-Hellman ciphers instead of RSA -# you must generate a DH pair that will be used. In most situations the -# DH pair is to be treated as confidential, and the file specified by -# TLS_DHCERTFILE must not be world-readable. -# -# TLS_DHCERTFILE= - -##NAME: TLS_CERTFILE:0 -# -# TLS_CERTFILE - certificate to use. TLS_CERTFILE is required for SSL/TLS -# servers, and is optional for SSL/TLS clients. TLS_CERTFILE is usually -# treated as confidential, and must not be world-readable. -# -TLS_CERTFILE=/etc/ssl/server/<SERVERNAME>.crt_and_key - -##NAME: TLS_TRUSTCERTS:0 -# -# TLS_TRUSTCERTS=pathname - load trusted certificates from pathname. -# pathname can be a file or a directory. If a file, the file should -# contain a list of trusted certificates, in PEM format. If a -# directory, the directory should contain the trusted certificates, -# in PEM format, one per file and hashed using OpenSSL's c_rehash -# script. TLS_TRUSTCERTS is used by SSL/TLS clients (by specifying -# the -domain option) and by SSL/TLS servers (TLS_VERIFYPEER is set -# to PEER or REQUIREPEER). -# -# -# TLS_TRUSTCERTS= - -##NAME: TLS_VERIFYPEER:0 -# -# TLS_VERIFYPEER - how to verify client certificates. The possible values of -# this setting are: -# -# NONE - do not verify anything -# -# PEER - verify the client certificate, if one's presented -# -# REQUIREPEER - require a client certificate, fail if one's not presented -# -# -TLS_VERIFYPEER=NONE - -##NAME: TLS_CACHE:0 -# -# A TLS/SSL session cache may slightly improve response for IMAP clients -# that open multiple SSL sessions to the server. TLS_CACHEFILE will be -# automatically created, TLS_CACHESIZE bytes long, and used as a cache -# buffer. -# -# This is an experimental feature and should be disabled if it causes -# problems with SSL clients. Disable SSL caching by commenting out the -# following settings: - -TLS_CACHEFILE=/var/lib/courier-imap/couriersslcache -TLS_CACHESIZE=524288 - -##NAME: MAILDIRPATH:0 -# -# MAILDIRPATH - directory name of the maildir directory. -# -MAILDIRPATH=Maildir - -#Hardwire a value for ${MAILDIR} -MAILDIRPATH=.maildir diff --git a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/courier/etc_courier-imap_pop3d b/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/courier/etc_courier-imap_pop3d deleted file mode 100644 index 71502ae..0000000 --- a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/courier/etc_courier-imap_pop3d +++ /dev/null @@ -1,127 +0,0 @@ -##VERSION: $Id: pop3d.dist.in,v 1.11 2004/10/30 15:39:38 mrsam Exp $ -# -# pop3d created from pop3d.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# Copyright 1998 - 2004 Double Precision, Inc. See COPYING for -# distribution information. -# -# Courier POP3 daemon configuration -# -##NAME: PIDFILE:0 -# - -PIDFILE=/var/run/pop3d.pid - -##NAME: MAXDAEMONS:0 -# -# Maximum number of POP3 servers started -# - -MAXDAEMONS=50 - -##NAME: MAXPERIP:4 -# -# Maximum number of connections to accept from the same IP address - -MAXPERIP=5 - -##NAME: POP3AUTH:1 -# -# To advertise the SASL capability, per RFC 2449, uncomment the POP3AUTH -# variable: -# -# POP3AUTH="LOGIN" -# -# If you have configured the CRAM-MD5 or CRAM-SHA1, set POP3AUTH to something -# like this: -# -# POP3AUTH="LOGIN CRAM-MD5 CRAM-SHA1" - -POP3AUTH="" - -##NAME: POP3AUTH_ORIG:0 -# -# For use by webadmin - -POP3AUTH_ORIG="LOGIN CRAM-MD5 CRAM-SHA1" - -##NAME: POP3AUTH_TLS:1 -# -# To also advertise SASL PLAIN if SSL is enabled, uncomment the -# POP3AUTH_TLS environment variable: -# -# POP3AUTH_TLS="LOGIN PLAIN" - -POP3AUTH_TLS="" - -##NAME: POP3AUTH_TLS_ORIG:0 -# -# For use by webadmin - -POP3AUTH_TLS_ORIG="LOGIN PLAIN" - -##NAME: POP3_PROXY:0 -# -# Enable proxying. See README.proxy - -POP3_PROXY=0 - -##NAME: PORT:1 -# -# Port to listen on for connections. The default is port 110. -# -# Multiple port numbers can be separated by commas. When multiple port -# numbers are used it is possibly to select a specific IP address for a -# given port as "ip.port". For example, "127.0.0.1.900,192.68.0.1.900" -# accepts connections on port 900 on IP addresses 127.0.0.1 and 192.68.0.1 -# The ADDRESS setting is a default for ports that do not have a specified -# IP address. - -PORT=110 - -##NAME: ADDRESS:0 -# -# IP address to listen on. 0 means all IP addresses. - -ADDRESS=0 - -##NAME: TCPDOPTS:0 -# -# Other couriertcpd(1) options. The following defaults should be fine. -# - -TCPDOPTS="-nodnslookup -noidentlookup" - -##NAME: POP3DSTART:0 -# -# POP3DSTART is not referenced anywhere in the standard Courier programs -# or scripts. Rather, this is a convenient flag to be read by your system -# startup script in /etc/rc.d, like this: -# -# . /etc/courier-imap/pop3d -# case x$POP3DSTART in -# x[yY]*) -# /usr/lib/courier-imap/pop3d.rc start -# ;; -# esac -# -# The default setting is going to be NO, until Courier is shipped by default -# with enough platforms so that people get annoyed with having to flip it to -# YES every time. - -POP3DSTART=YES - -##NAME: MAILDIRPATH:0 -# -# MAILDIRPATH - directory name of the maildir directory. -# -MAILDIRPATH=Maildir - -#Hardwire a value for ${MAILDIR} -MAILDIR=.maildir -MAILDIRPATH=.maildir -#Put any program for ${PRERUN} here -PRERUN= diff --git a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/courier/etc_courier-imap_pop3d-ssl b/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/courier/etc_courier-imap_pop3d-ssl deleted file mode 100644 index a0267a0..0000000 --- a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/courier/etc_courier-imap_pop3d-ssl +++ /dev/null @@ -1,186 +0,0 @@ -##VERSION: $Id: pop3d-ssl.dist.in,v 1.12 2004/10/21 00:45:35 mrsam Exp $ -# -# pop3d-ssl created from pop3d-ssl.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# Copyright 2000-2004 Double Precision, Inc. See COPYING for -# distribution information. -# -# This configuration file sets various options for the Courier-IMAP server -# when used to handle SSL POP3 connections. -# -# SSL and non-SSL connections are handled by a dedicated instance of the -# couriertcpd daemon. If you are accepting both SSL and non-SSL POP3 -# connections, you will start two instances of couriertcpd, one on the -# POP3 port 110, and another one on the POP3-SSL port 995. -# -# Download OpenSSL from http://www.openssl.org/ -# -##NAME: SSLPORT:0 -# -# Options in the pop3d-ssl configuration file AUGMENT the options in the -# pop3d configuration file. First the pop3d configuration file is read, -# then the pop3d-ssl configuration file, so we do not have to redefine -# anything. -# -# However, some things do have to be redefined. The port number is -# specified by SSLPORT, instead of PORT. The default port is port 995. -# -# Multiple port numbers can be separated by commas. When multiple port -# numbers are used it is possibly to select a specific IP address for a -# given port as "ip.port". For example, "127.0.0.1.900,192.68.0.1.900" -# accepts connections on port 900 on IP addresses 127.0.0.1 and 192.68.0.1 -# The SSLADDRESS setting is a default for ports that do not have -# a specified IP address. - -SSLPORT=995 - -##NAME: SSLADDRESS:0 -# -# Address to listen on, can be set to a single IP address. -# -# SSLADDRESS=127.0.0.1 - -SSLADDRESS=0 - -##NAME: SSLPIDFILE:0 -# -# -# - -SSLPIDFILE=/var/run/pop3d-ssl.pid - -##NAME: POP3DSSLSTART:0 -# -# Whether or not to start POP3 over SSL on spop3 port: - -POP3DSSLSTART=YES - -##NAME: POP3_STARTTLS:0 -# -# Whether or not to implement the POP3 STLS extension: - -POP3_STARTTLS=YES - -##NAME: POP3_TLS_REQUIRED:1 -# -# Set POP3_TLS_REQUIRED to 1 if you REQUIRE STARTTLS for everyone. -# (this option advertises the LOGINDISABLED POP3 capability, until STARTTLS -# is issued). - -POP3_TLS_REQUIRED=0 - -##NAME: COURIERTLS:0 -# -# The following variables configure POP3 over SSL. If OpenSSL is available -# during configuration, the couriertls helper gets compiled, and upon -# installation a dummy TLS_CERTFILE gets generated. courieresmtpd will -# automatically advertise the ESMTP STARTTLS extension if both TLS_CERTFILE -# and COURIERTLS exist. -# -# WARNING: Peer certificate verification has NOT yet been tested. Proceed -# at your own risk. Only the basic SSL/TLS functionality is known to be -# working. Keep this in mind as you play with the following variables. - -COURIERTLS=/usr/sbin/couriertls - -##NAME: TLS_PROTOCOL:0 -# -# TLS_PROTOCOL sets the protocol version. The possible versions are: -# -# SSL2 - SSLv2 -# SSL3 - SSLv3 -# TLS1 - TLS1 - -TLS_PROTOCOL=SSL3 - -##NAME: TLS_STARTTLS_PROTOCOL:0 -# -# TLS_STARTTLS_PROTOCOL is used instead of TLS_PROTOCOL for the POP3 STARTTLS -# extension, as opposed to POP3 over SSL on port 995. -# - -TLS_STARTTLS_PROTOCOL=TLS1 - -##NAME: TLS_CIPHER_LIST:0 -# -# TLS_CIPHER_LIST optionally sets the list of ciphers to be used by the -# OpenSSL library. In most situations you can leave TLS_CIPHER_LIST -# undefined -# -# TLS_CIPHER_LIST="ALL:!ADH:RC4+RSA:+SSLv2:@STRENGTH" - -##NAME: TLS_TIMEOUT:0 -# TLS_TIMEOUT is currently not implemented, and reserved for future use. -# This is supposed to be an inactivity timeout, but its not yet implemented. -# - -##NAME: TLS_DHCERTFILE:0 -# -# TLS_DHCERTFILE - PEM file that stores our Diffie-Hellman cipher pair. -# When OpenSSL is compiled to use Diffie-Hellman ciphers instead of RSA -# you must generate a DH pair that will be used. In most situations the -# DH pair is to be treated as confidential, and the file specified by -# TLS_DHCERTFILE must not be world-readable. -# -# TLS_DHCERTFILE= - -##NAME: TLS_CERTFILE:0 -# -# TLS_CERTFILE - certificate to use. TLS_CERTFILE is required for SSL/TLS -# servers, and is optional for SSL/TLS clients. TLS_CERTFILE is usually -# treated as confidential, and must not be world-readable. -# -TLS_CERTFILE=/etc/ssl/server/<SERVERNAME>.crt_and_key - -##NAME: TLS_TRUSTCERTS:0 -# -# TLS_TRUSTCERTS=pathname - load trusted certificates from pathname. -# pathname can be a file or a directory. If a file, the file should -# contain a list of trusted certificates, in PEM format. If a -# directory, the directory should contain the trusted certificates, -# in PEM format, one per file and hashed using OpenSSL's c_rehash -# script. TLS_TRUSTCERTS is used by SSL/TLS clients (by specifying -# the -domain option) and by SSL/TLS servers (TLS_VERIFYPEER is set -# to PEER or REQUIREPEER). -# -# -# TLS_TRUSTCERTS= - -##NAME: TLS_VERIFYPEER:0 -# -# TLS_VERIFYPEER - how to verify client certificates. The possible values of -# this setting are: -# -# NONE - do not verify anything -# -# PEER - verify the client certificate, if one's presented -# -# REQUIREPEER - require a client certificate, fail if one's not presented -# -# -TLS_VERIFYPEER=NONE - -##NAME: TLS_CACHE:0 -# -# A TLS/SSL session cache may slightly improve response for long-running -# POP3 clients. TLS_CACHEFILE will be automatically created, TLS_CACHESIZE -# bytes long, and used as a cache buffer. -# -# This is an experimental feature and should be disabled if it causes -# problems with SSL clients. Disable SSL caching by commenting out the -# following settings: - -TLS_CACHEFILE=/var/lib/courier-imap/couriersslcache -TLS_CACHESIZE=524288 - -##NAME: MAILDIRPATH:0 -# -# MAILDIRPATH - directory name of the maildir directory. -# -MAILDIRPATH=Maildir - -#Hardwire a value for ${MAILDIR} -MAILDIRPATH=.maildir diff --git a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/courier/etc_courier_authlib_authdaemonrc b/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/courier/etc_courier_authlib_authdaemonrc deleted file mode 100644 index 867a12d..0000000 --- a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/courier/etc_courier_authlib_authdaemonrc +++ /dev/null @@ -1,93 +0,0 @@ -##VERSION: $Id: authdaemonrc.in,v 1.12 2005/07/05 12:25:08 mrsam Exp $ -# -# Copyright 2000-2005 Double Precision, Inc. See COPYING for -# distribution information. -# -# authdaemonrc created from authdaemonrc.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# This file configures authdaemond, the resident authentication daemon. -# -# Comments in this file are ignored. Although this file is intended to -# be sourced as a shell script, authdaemond parses it manually, so -# the acceptable syntax is a bit limited. Multiline variable contents, -# with the \ continuation character, are not allowed. Everything must -# fit on one line. Do not use any additional whitespace for indentation, -# or anything else. - -##NAME: authmodulelist:2 -# -# The authentication modules that are linked into authdaemond. The -# default list is installed. You may selectively disable modules simply -# by removing them from the following list. The available modules you -# can use are: authuserdb authpam authshadow authmysql authcustom authpipe - -authmodulelist="authmysql" - -##NAME: authmodulelistorig:3 -# -# This setting is used by Courier's webadmin module, and should be left -# alone - -authmodulelistorig="authuserdb authpam authshadow authmysql authcustom authpipe" - -##NAME: daemons:0 -# -# The number of daemon processes that are started. authdaemon is typically -# installed where authentication modules are relatively expensive: such -# as authldap, or authmysql, so it's better to have a number of them running. -# PLEASE NOTE: Some platforms may experience a problem if there's more than -# one daemon. Specifically, SystemV derived platforms that use TLI with -# socket emulation. I'm suspicious of TLI's ability to handle multiple -# processes accepting connections on the same filesystem domain socket. -# -# You may need to increase daemons if as your system load increases. Symptoms -# include sporadic authentication failures. If you start getting -# authentication failures, increase daemons. However, the default of 5 -# SHOULD be sufficient. Bumping up daemon count is only a short-term -# solution. The permanent solution is to add more resources: RAM, faster -# disks, faster CPUs... - -daemons=5 - -##NAME: authdaemonvar:2 -# -# authdaemonvar is here, but is not used directly by authdaemond. It's -# used by various configuration and build scripts, so don't touch it! - -authdaemonvar=/var/lib/courier/authdaemon - -##NAME: DEBUG_LOGIN:0 -# -# Dump additional diagnostics to syslog -# -# DEBUG_LOGIN=0 - turn off debugging -# DEBUG_LOGIN=1 - turn on debugging -# DEBUG_LOGIN=2 - turn on debugging + log passwords too -# -# ** YES ** - DEBUG_LOGIN=2 places passwords into syslog. -# -# Note that most information is sent to syslog at level 'debug', so -# you may need to modify your /etc/syslog.conf to be able to see it. - -DEBUG_LOGIN=0 - -##NAME: DEFAULTOPTIONS:0 -# -# A comma-separated list of option=value pairs. Each option is applied -# to an account if the account does not have its own specific value for -# that option. So for example, you can set -# DEFAULTOPTIONS="disablewebmail=1,disableimap=1" -# and then enable webmail and/or imap on individual accounts by setting -# disablewebmail=0 and/or disableimap=0 on the account. - -DEFAULTOPTIONS="" - -##NAME: LOGGEROPTS:0 -# -# courierlogger(1) options, e.g. to set syslog facility -# - -LOGGEROPTS="" diff --git a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/courier/etc_courier_authlib_authmysqlrc b/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/courier/etc_courier_authlib_authmysqlrc deleted file mode 100644 index fec6508..0000000 --- a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/courier/etc_courier_authlib_authmysqlrc +++ /dev/null @@ -1,12 +0,0 @@ -MYSQL_SERVER <SQL_HOST> -MYSQL_USERNAME <SQL_UNPRIVILEGED_USER> -MYSQL_PASSWORD <SQL_UNPRIVILEGED_PASSWORD> -MYSQL_PORT 0 -MYSQL_DATABASE <SQL_DB> -MYSQL_USER_TABLE mail_users -MYSQL_CRYPT_PWFIELD password_enc -MYSQL_UID_FIELD <VIRTUAL_UID_MAPS> -MYSQL_GID_FIELD <VIRTUAL_GID_MAPS> -MYSQL_LOGIN_FIELD username -MYSQL_HOME_FIELD "<VIRTUAL_MAILBOX_BASE>" -MYSQL_MAILDIR_FIELD maildir diff --git a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/cron/etc_cron.d_syscp b/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/cron/etc_cron.d_syscp deleted file mode 100644 index 4afe408..0000000 --- a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/cron/etc_cron.d_syscp +++ /dev/null @@ -1,10 +0,0 @@ -# -# Set PATH, otherwise restart-scripts won't find start-stop-daemon -# -PATH=/sbin:/bin:/usr/sbin:/usr/bin -# -# Regular cron jobs for the syscp package -# -# Please check that all following paths are correct -# -*/5 * * * * root /usr/lib/php4/bin/php -q -c /etc/php/syscp-cronjob/php.ini /var/www/syscp/scripts/cronscript.php diff --git a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/cron/etc_php_syscp-cronjob_php.ini b/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/cron/etc_php_syscp-cronjob_php.ini deleted file mode 100644 index 74c8316..0000000 --- a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/cron/etc_php_syscp-cronjob_php.ini +++ /dev/null @@ -1,61 +0,0 @@ -short_open_tag = On -asp_tags = Off -precision = 14 -output_buffering = Off -allow_call_time_pass_reference = Off -safe_mode = Off -safe_mode_gid = Off -safe_mode_include_dir = "/usr/share/php/:/usr/share/php4/:/usr/share/php5/" -safe_mode_allowed_env_vars = PHP_ -safe_mode_protected_env_vars = LD_LIBRARY_PATH -open_basedir = -disable_functions = -disable_classes = -expose_php = Off -max_execution_time = 180 -max_input_time = 120 -memory_limit = 32M -post_max_size = 32M -error_reporting = E_ALL & ~E_NOTICE -display_errors = On -display_startup_errors = Off -log_errors = Off -log_errors_max_len = 1024 -ignore_repeated_errors = Off -ignore_repeated_source = Off -report_memleaks = On -track_errors = Off -html_errors = Off -variables_order = "GPCS" -register_globals = Off -register_argc_argv = Off -gpc_order = "GPC" -magic_quotes_gpc = Off -magic_quotes_runtime = Off -magic_quotes_sybase = Off -include_path = ".:/usr/share/php/:/usr/share/php4/:/usr/share/php5/" -enable_dl = Off -file_uploads = On -upload_tmp_dir = "/tmp/" -upload_max_filesize = 32M -allow_url_fopen = Off -session.save_handler = files -session.save_path = "/tmp/" -session.use_cookies = 1 -session.name = PHPSESSID -session.auto_start = 0 -session.cookie_lifetime = 0 -session.cookie_path = / -session.cookie_domain = -session.serialize_handler = php -session.gc_probability = 1 -session.gc_divisor = 1000 -session.gc_maxlifetime = 1440 -session.bug_compat_42 = 0 -session.bug_compat_warn = 1 -session.referer_check = -session.entropy_length = 16 -session.entropy_file = /dev/urandom -session.cache_limiter = nocache -session.cache_expire = 180 -session.use_trans_sid = 0 diff --git a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/cron/etc_php_syscp-vhost_php.ini b/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/cron/etc_php_syscp-vhost_php.ini deleted file mode 100644 index 048c26c..0000000 --- a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/cron/etc_php_syscp-vhost_php.ini +++ /dev/null @@ -1,61 +0,0 @@ -short_open_tag = On -asp_tags = Off -precision = 14 -output_buffering = 4096 -allow_call_time_pass_reference = Off -safe_mode = Off -safe_mode_gid = Off -safe_mode_include_dir = "/usr/share/php/:/usr/share/php4/:/usr/share/php5/" -safe_mode_allowed_env_vars = PHP_ -safe_mode_protected_env_vars = LD_LIBRARY_PATH -open_basedir = "/var/www/syscp/:/var/www/syscp-suphp/syscp/:/var/www/syscpwebs/:/usr/share/php/:/usr/share/php4/:/usr/share/php5/" -disable_functions = exec,passthru,shell_exec,system,proc_close,proc_get_status,proc_nice,proc_open,proc_terminate -disable_classes = -expose_php = Off -max_execution_time = 30 -max_input_time = 60 -memory_limit = 16M -post_max_size = 12M -error_reporting = E_ALL & ~E_NOTICE -display_errors = Off -display_startup_errors = Off -log_errors = On -log_errors_max_len = 1024 -ignore_repeated_errors = Off -ignore_repeated_source = Off -report_memleaks = On -track_errors = Off -html_errors = Off -variables_order = "GPCS" -register_globals = Off -register_argc_argv = Off -gpc_order = "GPC" -magic_quotes_gpc = Off -magic_quotes_runtime = Off -magic_quotes_sybase = Off -include_path = ".:/usr/share/php/:/usr/share/php4/:/usr/share/php5/" -enable_dl = Off -file_uploads = On -upload_tmp_dir = "/var/www/syscp-suphp/syscp/" -upload_max_filesize = 32M -allow_url_fopen = Off -session.save_handler = files -session.save_path = "/var/www/syscp-suphp/syscp/" -session.use_cookies = 1 -session.name = PHPSESSID -session.auto_start = 0 -session.cookie_lifetime = 0 -session.cookie_path = / -session.cookie_domain = -session.serialize_handler = php -session.gc_probability = 1 -session.gc_divisor = 1000 -session.gc_maxlifetime = 1440 -session.bug_compat_42 = 0 -session.bug_compat_warn = 1 -session.referer_check = -session.entropy_length = 16 -session.entropy_file = /dev/urandom -session.cache_limiter = nocache -session.cache_expire = 180 -session.use_trans_sid = 0 diff --git a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/postfix/etc_postfix_main.cf b/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/postfix/etc_postfix_main.cf deleted file mode 100644 index 97b10e0..0000000 --- a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/postfix/etc_postfix_main.cf +++ /dev/null @@ -1,65 +0,0 @@ -# Postfix directories settings -command_directory = /usr/sbin -daemon_directory = /usr/lib/postfix -queue_directory = /var/spool/postfix -sample_directory = /etc/postfix -manpage_directory = /usr/share/man -readme_directory = /usr/share/doc/postfix-2.1.5-r2/readme -html_directory = no - -# Postfix programs paths settings -mailq_path = /usr/bin/mailq -newaliases_path = /usr/bin/newaliases -sendmail_path = /usr/sbin/sendmail - -# General Postfix configuration -myhostname = <SERVERNAME> -mydestination = $myhostname, $mydomain, localhost.$myhostname, localhost.$mydomain, localhost -mynetworks = 127.0.0.0/8 -inet_interfaces = all -mail_owner = postfix -setgid_group = postdrop -smtpd_banner = $myhostname ESMTP Mailserver -smtpd_helo_required = yes -append_dot_mydomain = no -biff = no - -# Postfix Debugger configuration -debug_peer_level = 2 -debugger_command = - PATH=/bin:/usr/bin:/usr/local/bin; export PATH; (echo cont; - echo where) | gdb $daemon_directory/$process_name $process_id 2>&1 - >$config_directory/$process_name.$process_id.log & sleep 5 - -# Postfix performance settings -default_destination_concurrency_limit = 20 -local_destination_concurrency_limit = 2 - -# Virtual delivery settings -virtual_transport = virtual -virtual_mailbox_base = <VIRTUAL_MAILBOX_BASE> -virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf -virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf -virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf -virtual_uid_maps = static:<VIRTUAL_UID_MAPS> -virtual_gid_maps = static:<VIRTUAL_GID_MAPS> - -# Local delivery settings -local_transport = local -alias_database = hash:/etc/mail/aliases -alias_maps = $alias_database - -# SASL settings -smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination -smtpd_sasl_auth_enable = yes -smtpd_sasl_local_domain = $myhostname -smtpd_sasl_security_options = noanonymous -broken_sasl_auth_clients = yes - -# TLS settings -smtpd_use_tls = yes -smtpd_tls_cert_file = /etc/ssl/server/<SERVERNAME>.crt -smtpd_tls_key_file = /etc/ssl/server/<SERVERNAME>.key -smtpd_tls_auth_only = no -smtpd_tls_session_cache_timeout = 3600s -tls_random_source = dev:/dev/urandom diff --git a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/postfix/etc_postfix_mysql-virtual_alias_maps.cf b/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/postfix/etc_postfix_mysql-virtual_alias_maps.cf deleted file mode 100644 index c921e6f..0000000 --- a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/postfix/etc_postfix_mysql-virtual_alias_maps.cf +++ /dev/null @@ -1,8 +0,0 @@ -user = <SQL_UNPRIVILEGED_USER> -password = <SQL_UNPRIVILEGED_PASSWORD> -dbname = <SQL_DB> -table = mail_virtual -select_field = destination -where_field = email -additional_conditions = and destination <> '' and destination <> ' ' -hosts = <SQL_HOST> diff --git a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf b/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf deleted file mode 100644 index 4484bee..0000000 --- a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf +++ /dev/null @@ -1,8 +0,0 @@ -user = <SQL_UNPRIVILEGED_USER> -password = <SQL_UNPRIVILEGED_PASSWORD> -dbname = <SQL_DB> -table = panel_domains -select_field = domain -where_field = domain -additional_conditions = and isemaildomain = '1' -hosts = <SQL_HOST> diff --git a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf b/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf deleted file mode 100644 index 7e0f79a..0000000 --- a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf +++ /dev/null @@ -1,7 +0,0 @@ -user = <SQL_UNPRIVILEGED_USER> -password = <SQL_UNPRIVILEGED_PASSWORD> -dbname = <SQL_DB> -table = mail_users -select_field = maildir -where_field = email -hosts = <SQL_HOST> diff --git a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/postfix/etc_sasl2_smtpd.conf b/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/postfix/etc_sasl2_smtpd.conf deleted file mode 100644 index 2089cbb..0000000 --- a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/postfix/etc_sasl2_smtpd.conf +++ /dev/null @@ -1,12 +0,0 @@ -pwcheck_method: auxprop -auxprop_plugin: sql -allowanonymouslogin: no -allowplaintext: yes -mech_list: PLAIN LOGIN -password_format: crypt -sql_engine: mysql -sql_hostnames: <SQL_HOST> -sql_user: <SQL_UNPRIVILEGED_USER> -sql_passwd: <SQL_UNPRIVILEGED_PASSWORD> -sql_database: <SQL_DB> -sql_select: SELECT password_enc FROM mail_users where username='%u@%r' diff --git a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/proftpd/etc_proftpd_proftpd.conf b/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/proftpd/etc_proftpd_proftpd.conf deleted file mode 100644 index 1e04b6d..0000000 --- a/syscp/patches/gentoo-config-files/nodns-ssl/gentoo/proftpd/etc_proftpd_proftpd.conf +++ /dev/null @@ -1,89 +0,0 @@ -# Server settings -ServerName "<SERVERNAME> FTP Server" -ServerType standalone -ServerIdent off -DefaultServer on -Port 21 -MaxInstances 50 - -# General settings -DeferWelcome on -MultilineRFC2228 on -ShowSymlinks on -AllowOverwrite on -AllowStoreRestart on -AllowRetrieveRestart on -UseReverseDNS off -IdentLookups off -ListOptions "-al" -DisplayFirstChdir .message - -# Modules settings -#DelayEngine off - -# Timeout settings -TimeoutLogin 120 -TimeoutNoTransfer 600 -TimeoutStalled 600 -TimeoutIdle 600 - -# Security settings -RootLogin off -RequireValidShell off -User syscpftpd -Group syscpftpd -Umask 133 022 -DefaultRoot ~ -DenyFilter \*.*/ - -# Per-Directory settings -<Directory /*> -Umask 133 022 -AllowOverwrite on -</Directory> - -# SQL settings -SQLAuthTypes Crypt -SQLAuthenticate users* groups* -SQLConnectInfo <SQL_DB>@<SQL_HOST> <SQL_UNPRIVILEGED_USER> <SQL_UNPRIVILEGED_PASSWORD> -SQLUserInfo ftp_users username password uid gid homedir shell -SQLGroupInfo ftp_groups groupname gid members -SQLUserWhereClause "login_enabled = 'y'" - -SQLLog PASS login -SQLNamedQuery login UPDATE "last_login=now(), login_count=login_count+1 WHERE username='%u'" ftp_users - -SQLLog RETR download -SQLNamedQuery download UPDATE "down_count=down_count+1, down_bytes=down_bytes+%b WHERE username='%u'" ftp_users - -SQLLog STOR upload -SQLNamedQuery upload UPDATE "up_count=up_count+1, up_bytes=up_bytes+%b WHERE username='%u'" ftp_users - -# TLS settings -<IfModule mod_tls.c> -TLSEngine on -TLSLog /var/log/proftpd-tls.log -TLSProtocol SSLv23 -TLSTimeoutHandshake 120 -# Really important for WinClients -TLSOptions NoCertRequest -TLSRSACertificateFile /etc/ssl/server/<SERVERNAME>.crt -TLSRSACertificateKeyFile /etc/ssl/server/<SERVERNAME>.key -# Authenticate client that want to use FTP over TLS? -TLSVerifyClient off -# Uncomment the following line to force tls login -TLSRequired off -</IfModule> - -# LOG settings -# Logging Formats -LogFormat default "%h %1 %u %t \"%r\" %s %b" -LogFormat auth "%v [%P] %h %t \"%r\" %s" -LogFormat write "%h %l %u %t \"%r\" %s %b" -# Activate Logging -# all logins -ExtendedLog /var/log/proftpd-auth.log AUTH auth -# file/dir access -ExtendedLog /var/log/proftpd-access.log WRITE,READ write -# everything (be careful, generates_ very_ big logfiles) -#ExtendedLog /var/log/proftpd-all.log ALL default diff --git a/syscp/patches/gentoo-config-files/nodns-ssl/syscp-1.2.13-gentoo-admin_configfiles.php-nodns-ssl b/syscp/patches/gentoo-config-files/nodns-ssl/syscp-1.2.13-gentoo-admin_configfiles.php-nodns-ssl deleted file mode 100644 index 83565e4..0000000 --- a/syscp/patches/gentoo-config-files/nodns-ssl/syscp-1.2.13-gentoo-admin_configfiles.php-nodns-ssl +++ /dev/null @@ -1,270 +0,0 @@ -<?php -/** - * filename: $Source: /syscp/syscp/admin_configfiles.php,v $ - * begin: Wednesday, Sep 08, 2004 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. This program is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY; without even the - * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * @author Florian Lippert <flo@redenswert.de> - * @copyright (C) 2003-2004 Florian Lippert - * @package Panel - * @version $Id: admin_configfiles.php,v 1.9 2005/06/15 13:53:58 flo Exp $ - * Modified to reflect the Gentoo environment by Luca Longinotti <chtekk@gentoo.org> - */ - - define('AREA', 'admin'); - - /** - * Include our init.php, which manages Sessions, Language etc. - */ - require("./lib/init.php"); - - - $configfiles = Array - ( - 'gentoo' => Array - ( - 'label' => 'Gentoo', - 'daemons' => Array - ( - 'apache' => Array - ( - 'label' => 'Apache2 Webserver (HTTP)', - 'commands' => Array - ( - 'touch '.$settings['system']['apacheconf_directory'].'vhosts.d/99_syscp-vhosts.conf', - 'chown root:0 '.$settings['system']['apacheconf_directory'].'vhosts.d/99_syscp-vhosts.conf', - 'chmod 0600 '.$settings['system']['apacheconf_directory'].'vhosts.d/99_syscp-vhosts.conf', - 'echo "Include '.$settings['system']['apacheconf_directory'].'vhosts.d/99_syscp-vhosts.conf" >> /etc/apache2/httpd.conf', - 'mkdir -p '.$settings['system']['documentroot_prefix'], - 'mkdir -p '.$settings['system']['logfiles_directory'] - ), - 'restart' => Array - ( - 'rc-update add apache2 default', - '/etc/init.d/apache2 restart' - ) - ), - 'courier' => Array - ( - 'label' => 'Courier-IMAP (POP3/IMAP)', - 'files' => Array - ( - 'etc_courier_authlib_authdaemonrc' => '/etc/courier/authlib/authdaemonrc', - 'etc_courier_authlib_authmysqlrc' => '/etc/courier/authlib/authmysqlrc', - 'etc_courier-imap_pop3d' => '/etc/courier-imap/pop3d', - 'etc_courier-imap_imapd' => '/etc/courier-imap/imapd', - 'etc_courier-imap_pop3d-ssl' => '/etc/courier-imap/pop3d-ssl', - 'etc_courier-imap_imapd-ssl' => '/etc/courier-imap/imapd-ssl' - ), - 'commands' => Array - ( - 'rm /etc/courier/authlib/authdaemonrc', - 'rm /etc/courier/authlib/authmysqlrc', - 'rm /etc/courier-imap/pop3d', - 'rm /etc/courier-imap/imapd', - 'rm /etc/courier-imap/pop3d-ssl', - 'rm /etc/courier-imap/imapd-ssl', - 'touch /etc/courier/authlib/authdaemonrc', - 'touch /etc/courier/authlib/authmysqlrc', - 'touch /etc/courier-imap/pop3d', - 'touch /etc/courier-imap/imapd', - 'touch /etc/courier-imap/pop3d-ssl', - 'touch /etc/courier-imap/imapd-ssl', - 'chown root:0 /etc/courier/authlib/authdaemonrc', - 'chown root:0 /etc/courier/authlib/authmysqlrc', - 'chown root:0 /etc/courier-imap/pop3d', - 'chown root:0 /etc/courier-imap/imapd', - 'chown root:0 /etc/courier-imap/pop3d-ssl', - 'chown root:0 /etc/courier-imap/imapd-ssl', - 'chmod 0600 /etc/courier/authlib/authdaemonrc', - 'chmod 0600 /etc/courier/authlib/authmysqlrc', - 'chmod 0600 /etc/courier-imap/pop3d', - 'chmod 0600 /etc/courier-imap/imapd', - 'chmod 0600 /etc/courier-imap/pop3d-ssl', - 'chmod 0600 /etc/courier-imap/imapd-ssl' - ), - 'restart' => Array - ( - 'rc-update add courier-authlib default', - 'rc-update add courier-pop3d default', - 'rc-update add courier-imapd default', - 'rc-update add courier-pop3d-ssl default', - 'rc-update add courier-imapd-ssl default', - '/etc/init.d/courier-authlib restart', - '/etc/init.d/courier-pop3d restart', - '/etc/init.d/courier-imapd restart', - '/etc/init.d/courier-pop3d-ssl restart', - '/etc/init.d/courier-imapd-ssl restart' - ) - ), - 'postfix' => Array - ( - 'label' => 'Postfix (MTA)', - 'files' => Array - ( - 'etc_postfix_main.cf' => '/etc/postfix/main.cf', - 'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf', - 'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf', - 'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf', - 'etc_sasl2_smtpd.conf' => '/etc/sasl2/smtpd.conf' - ), - 'commands' => Array - ( - 'mkdir -p '.$settings['system']['vmail_homedir'], - 'chown -R vmail:vmail '.$settings['system']['vmail_homedir'], - 'chmod 0750 '.$settings['system']['vmail_homedir'], - 'rm /etc/postfix/main.cf', - 'touch /etc/postfix/main.cf', - 'touch /etc/postfix/master.cf', - 'touch /etc/postfix/mysql-virtual_alias_maps.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'touch /etc/sasl2/smtpd.conf', - 'chown root:0 /etc/postfix/main.cf', - 'chown root:0 /etc/postfix/master.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_alias_maps.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'chown root:0 /etc/sasl2/smtpd.conf', - 'chmod 0600 /etc/postfix/main.cf', - 'chmod 0600 /etc/postfix/master.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_alias_maps.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'chmod 0600 /etc/sasl2/smtpd.conf' - ), - 'restart' => Array - ( - 'rc-update add postfix default', - '/etc/init.d/postfix restart' - ) - ), - 'proftpd' => Array - ( - 'label' => 'ProFTPd (FTP)', - 'files' => Array - ( - 'etc_proftpd_proftpd.conf' => '/etc/proftpd/proftpd.conf' - ), - 'commands' => Array - ( - 'touch /etc/proftpd/proftpd.conf', - 'chown root:0 /etc/proftpd/proftpd.conf', - 'chmod 0600 /etc/proftpd/proftpd.conf' - ), - 'restart' => Array - ( - 'rc-update add proftpd default', - '/etc/init.d/proftpd restart' - ) - ), - 'cron' => Array - ( - 'label' => 'Crond (cronscript)', - 'files' => Array - ( - 'etc_php_syscp-cronjob_php.ini' => '/etc/php/syscp-cronjob/php.ini', - 'etc_cron.d_syscp' => '/etc/cron.d/syscp' - ), - 'commands' => Array - ( - 'touch /etc/cron.d/syscp', - 'chown root:0 /etc/cron.d/syscp', - 'chmod 0640 /etc/cron.d/syscp', - 'mkdir -p /etc/php/syscp-cronjob', - 'touch /etc/php/syscp-cronjob/php.ini', - 'chown -R root:0 /etc/php/syscp-cronjob', - 'chmod 0750 /etc/php/syscp-cronjob', - 'chmod 0640 /etc/php/syscp-cronjob/php.ini' - ), - 'restart' => Array - ( - 'rc-update add vixie-cron default', - '/etc/init.d/vixie-cron restart' - ) - ) - ) - ) - ); - - /*echo '<pre>'; - print_r($configfiles); - echo '</pre>';*/ - - if( ($page == 'configfiles' || $page == 'overview') && $userinfo['change_serversettings'] == '1') - { - if(isset($_GET['distribution']) && $_GET['distribution']!='' && isset($configfiles[$_GET['distribution']]) && is_array($configfiles[$_GET['distribution']]) && - isset($_GET['daemon']) && $_GET['daemon']!='' && isset($configfiles[$_GET['distribution']]['daemons'][$_GET['daemon']]) && is_array($configfiles[$_GET['distribution']]['daemons'][$_GET['daemon']])) - { - $distribution = addslashes($_GET['distribution']); - $daemon = addslashes($_GET['daemon']); - - if(isset($configfiles[$distribution]['daemons'][$daemon]['commands']) && is_array($configfiles[$distribution]['daemons'][$daemon]['commands'])) - { - $commands = implode("\n", $configfiles[$distribution]['daemons'][$daemon]['commands']); - } - else - { - $commands = ''; - } - - $replace_arr = Array - ( - '<SQL_UNPRIVILEGED_USER>' => $sql['user'], - '<SQL_UNPRIVILEGED_PASSWORD>' => 'MYSQL_PASSWORD', - '<SQL_DB>' => $sql['db'], - '<SQL_HOST>' => $sql['host'], - '<SERVERNAME>' => $settings['system']['hostname'], - '<SERVERIP>' => $settings['system']['ipaddress'], - '<VIRTUAL_MAILBOX_BASE>' => $settings['system']['vmail_homedir'], - '<VIRTUAL_UID_MAPS>' => $settings['system']['vmail_uid'], - '<VIRTUAL_GID_MAPS>' => $settings['system']['vmail_gid'] - ); - $files = ''; - if(isset($configfiles[$distribution]['daemons'][$daemon]['files']) && is_array($configfiles[$distribution]['daemons'][$daemon]['files'])) - { - while(list($filename, $realname) = each($configfiles[$distribution]['daemons'][$daemon]['files'])) - { - $file_content = implode('', file('./templates/misc/configfiles/'.$distribution.'/'.$daemon.'/'.$filename)); - $file_content = strtr($file_content, $replace_arr); - $file_content = htmlspecialchars($file_content); - $numbrows = count(explode("\n", $file_content)); - eval("\$files.=\"".getTemplate("configfiles/configfiles_file")."\";"); - } - } - - if(isset($configfiles[$distribution]['daemons'][$daemon]['restart']) && is_array($configfiles[$distribution]['daemons'][$daemon]['restart'])) - { - $restart = implode("\n", $configfiles[$distribution]['daemons'][$daemon]['restart']); - } - else - { - $restart = ''; - } - - eval("echo \"".getTemplate("configfiles/configfiles")."\";"); - } - else - { - $distributions = ''; - while (list($distribution_name, $distribution_details) = each($configfiles)) - { - $daemons = ''; - while(list($daemon_name, $daemon_details) = each($distribution_details['daemons'])) - { - eval("\$daemons.=\"".getTemplate("configfiles/choose_daemon")."\";"); - } - eval("\$distributions.=\"".getTemplate("configfiles/choose_distribution")."\";"); - } - eval("echo \"".getTemplate("configfiles/choose")."\";"); - } - } - -?> diff --git a/syscp/patches/gentoo-config-files/nodns-ssl/syscp-1.2.13-gentoo-config-nodns-ssl-r2.tar.bz2 b/syscp/patches/gentoo-config-files/nodns-ssl/syscp-1.2.13-gentoo-config-nodns-ssl-r2.tar.bz2 Binary files differdeleted file mode 100644 index b81c77e..0000000 --- a/syscp/patches/gentoo-config-files/nodns-ssl/syscp-1.2.13-gentoo-config-nodns-ssl-r2.tar.bz2 +++ /dev/null diff --git a/syscp/patches/gentoo-config-files/nodns/etc_libnss-mysql-root.cfg b/syscp/patches/gentoo-config-files/nodns/etc_libnss-mysql-root.cfg deleted file mode 100644 index 6498977..0000000 --- a/syscp/patches/gentoo-config-files/nodns/etc_libnss-mysql-root.cfg +++ /dev/null @@ -1,2 +0,0 @@ -username <SQL_UNPRIVILEGED_USER> -password <SQL_UNPRIVILEGED_PASSWORD> diff --git a/syscp/patches/gentoo-config-files/nodns/etc_libnss-mysql.cfg b/syscp/patches/gentoo-config-files/nodns/etc_libnss-mysql.cfg deleted file mode 100644 index d284192..0000000 --- a/syscp/patches/gentoo-config-files/nodns/etc_libnss-mysql.cfg +++ /dev/null @@ -1,38 +0,0 @@ -getpwnam SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ - FROM ftp_users \ - WHERE username='%1$s' \ - LIMIT 1 -getpwuid SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ - FROM ftp_users \ - WHERE uid='%1$u' \ - LIMIT 1 -getspnam SELECT username,password,UNIX_TIMESTAMP()-10,'1','2','7','-1','-1','0' \ - FROM ftp_users \ - WHERE username='%1$s' \ - LIMIT 1 -getpwent SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ - FROM ftp_users -getspent SELECT username,password,UNIX_TIMESTAMP()-10,'1','2','7','-1','-1','0' \ - FROM ftp_users -getgrnam SELECT groupname,'x',gid \ - FROM ftp_groups \ - WHERE groupname='%1$s' \ - LIMIT 1 -getgrgid SELECT groupname,'x',gid \ - FROM ftp_groups \ - WHERE gid='%1$u' \ - LIMIT 1 -getgrent SELECT groupname,'x',gid \ - FROM ftp_groups -memsbygid SELECT username \ - FROM ftp_users \ - WHERE gid='%1$u' -gidsbymem SELECT gid \ - FROM ftp_users \ - WHERE username='%1$s' - -host <SQL_HOST> -database <SQL_DB> -username <SQL_UNPRIVILEGED_USER> -password <SQL_UNPRIVILEGED_PASSWORD> -socket /var/run/mysqld/mysqld.sock diff --git a/syscp/patches/gentoo-config-files/nodns/gentoo/courier/etc_courier-imap_imapd b/syscp/patches/gentoo-config-files/nodns/gentoo/courier/etc_courier-imap_imapd deleted file mode 100644 index f594e41..0000000 --- a/syscp/patches/gentoo-config-files/nodns/gentoo/courier/etc_courier-imap_imapd +++ /dev/null @@ -1,376 +0,0 @@ -##VERSION: $Id: imapd.dist.in,v 1.32 2004/11/25 04:57:04 mrsam Exp $ -# -# imapd created from imapd.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# Copyright 1998 - 2004 Double Precision, Inc. See COPYING for -# distribution information. -# -# This configuration file sets various options for the Courier-IMAP server -# when used with the couriertcpd server. -# A lot of the stuff here is documented in the manual page for couriertcpd. -# -# NOTE - do not use \ to split long variable contents on multiple lines. -# This will break the default imapd.rc script, which parses this file. -# -##NAME: ADDRESS:0 -# -# Address to listen on, can be set to a single IP address. -# -# ADDRESS=127.0.0.1 - -ADDRESS=0 - -##NAME: PORT:1 -# -# Port numbers that connections are accepted on. The default is 143, -# the standard IMAP port. -# -# Multiple port numbers can be separated by commas. When multiple port -# numbers are used it is possible to select a specific IP address for a -# given port as "ip.port". For example, "127.0.0.1.900,192.68.0.1.900" -# accepts connections on port 900 on IP addresses 127.0.0.1 and 192.68.0.1 -# The previous ADDRESS setting is a default for ports that do not have -# a specified IP address. - -PORT=143 - -##NAME: AUTHSERVICE:0 -# -# It's possible to authenticate using a different 'service' parameter -# depending on the connection's port. This only works with authentication -# modules that use the 'service' parameter, such as PAM. Example: -# -# AUTHSERVICE143=imap -# AUTHSERVICE993=imaps - -##NAME: MAXDAEMONS:0 -# -# Maximum number of IMAP servers started -# - -MAXDAEMONS=50 - -##NAME: MAXPERIP:0 -# -# Maximum number of connections to accept from the same IP address - -MAXPERIP=10 - -##NAME: PIDFILE:0 -# -# File where couriertcpd will save its process ID -# - -PIDFILE=/var/run/imapd.pid - -##NAME: TCPDOPTS:0 -# -# Miscellaneous couriertcpd options that shouldn't be changed. -# - -TCPDOPTS="-nodnslookup -noidentlookup" - -##NAME: IMAP_CAPABILITY:1 -# -# IMAP_CAPABILITY specifies what most of the response should be to the -# CAPABILITY command. -# -# If you have properly configured Courier to use CRAM-MD5 or CRAM-SHA1 -# authentication (see INSTALL), set IMAP_CAPABILITY as follows: -# -# IMAP_CAPABILITY="IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 IDLE" -# - -IMAP_CAPABILITY="IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA IDLE" - -##NAME: KEYWORDS_CAPABILITY:0 -# -# IMAP_KEYWORDS=1 enables custom IMAP keywords. Set this option to 0 to -# disable custom keywords. - -IMAP_KEYWORDS=1 - -##NAME: SMAP1_CAPABILITY:0 -# -# EXPERIMENTAL -# -# To enable the experimental "Simple Mail Access Protocol" extensions, -# uncomment the following setting. -# -# SMAP_CAPABILITY=SMAP1 - -##NAME: IMAP_CAPABILITY_ORIG:1 -# -# For use by webadmin - -IMAP_CAPABILITY_ORIG="IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 IDLE" - -##NAME: IMAP_PROXY:0 -# -# Enable proxying. See README.proxy - -IMAP_PROXY=0 - -##NAME: IMAP_PROXY_FOREIGN:0 -# -# Proxying to non-Courier servers. Re-sends the CAPABILITY command after -# logging in to the remote server. May not work with all IMAP clients. - -IMAP_PROXY_FOREIGN=0 - -##NAME: IMAP_IDLE_TIMEOUT:0 -# -# This setting controls how often -# the server polls for changes to the folder, in IDLE mode (in seconds). - -IMAP_IDLE_TIMEOUT=60 - -##NAME: IMAP_CAPABILITY_TLS:0 -# -# The following setting will advertise SASL PLAIN authentication after -# STARTTLS is established. If you want to allow SASL PLAIN authentication -# with or without TLS then just comment this out, and add AUTH=PLAIN to -# IMAP_CAPABILITY - -IMAP_CAPABILITY_TLS="$IMAP_CAPABILITY AUTH=PLAIN" - -##NAME: IMAP_TLS_ORIG:0 -# -# For use by webadmin - -IMAP_CAPABILITY_TLS_ORIG="$IMAP_CAPABILITY_ORIG AUTH=PLAIN" - -##NAME: IMAP_DISABLETHREADSORT:0 -# -# Set IMAP_DISABLETHREADSORT to disable the THREAD and SORT commands - -# server side sorting and threading. -# -# Those capabilities will still be advertised, but the server will reject -# them. Set this option if you want to disable all the extra load from -# server-side threading and sorting. Not advertising those capabilities -# will simply result in the clients reading the entire folder, and sorting -# it on the client side. That will still put some load on the server. -# advertising these capabilities, but rejecting the commands, will stop this -# silliness. -# - -IMAP_DISABLETHREADSORT=0 - -##NAME: IMAP_CHECK_ALL_FOLDERS:0 -# -# Set IMAP_CHECK_ALL_FOLDERS to 1 if you want the server to check for new -# mail in every folder. Not all IMAP clients use the IMAP's new mail -# indicator, but some do. Normally new mail is checked only in INBOX, -# because it is a comparatively time consuming operation, and it would be -# a complete waste of time unless mail filters are used to deliver -# mail directly to folders. -# -# When IMAP clients are used which support new mail indication, and when -# mail filters are used to sort incoming mail into folders, setting -# IMAP_CHECK_ALL_FOLDERS to 1 will allow IMAP clients to announce new -# mail in folders. Note that this will result in slightly more load on the -# server. -# - -IMAP_CHECK_ALL_FOLDERS=0 - -##NAME: IMAP_OBSOLETE_CLIENT:0 -# -# Set IMAP_OBSOLETE_CLIENT if your IMAP client expects \\NoInferiors to mean -# what \\HasNoChildren really means. - -IMAP_OBSOLETE_CLIENT=0 - -##NAME: IMAP_UMASK:0 -# -# IMAP_UMASK sets the umask of the server process. The value of IMAP_UMASK is -# simply passed to the "umask" command. The default value is 022. -# -# This feature is mostly useful for shared folders, where the file permissions -# of the messages may be important. - -IMAP_UMASK=027 - -##NAME: IMAP_ULIMITD:0 -# -# IMAP_ULIMITD sets the maximum size of the data segment of the server -# process. The value of IMAP_ULIMITD is simply passed to the "ulimit -d" -# command (or ulimit -v). The argument to ulimi sets the upper limit on the -# size of the data segment of the server process, in kilobytes. The default -# value of 65536 sets a very generous limit of 64 megabytes, which should -# be more than plenty for anyone. -# -# This feature is used as an additional safety check that should stop -# any potential denial-of-service attacks that exploit any kind of -# a memory leak to exhaust all the available memory on the server. -# It is theoretically possible that obscenely huge folders will also -# result in the server running out of memory when doing server-side -# sorting (by my calculations you have to have at least 100,000 messages -# in a single folder, for that to happen). - -IMAP_ULIMITD=65536 - -##NAME: IMAP_USELOCKS:0 -# -# Setting IMAP_USELOCKS to 1 will use dot-locking to support concurrent -# multiple access to the same folder. This incurs slight additional -# overhead. Concurrent multiple access will still work without this setting, -# however occasionally a minor race condition may result in an IMAP client -# downloading the same message twice, or a keyword update will fail. -# -# IMAP_USELOCKS=1 is strongly recommended when shared folders are used. - -IMAP_USELOCKS=1 - -##NAME: IMAP_SHAREDINDEXFILE:0 -# -# The index of all accessible folders. Do not change this setting unless -# you know what you're doing. See README.sharedfolders for additional -# information. - -IMAP_SHAREDINDEXFILE=/etc/courier-imap/shared/index - -##NAME: IMAP_ENHANCEDIDLE:0 -# -# If Courier was compiled with the File Alteration Monitor, setting -# IMAP_ENHANCEDIDLE to 1 enables enhanced IDLE mode, where multiple -# clients may open the same folder concurrently, and receive updates to -# folder contents in realtime. See the imapd(8) man page for additional -# information. -# -# IMPORTANT: IMAP_USELOCKS *MUST* also be set to 1, and IDLE must be included -# in the IMAP_CAPABILITY list. -# - -IMAP_ENHANCEDIDLE=0 - -##NAME: IMAP_TRASHFOLDERNAME:0 -# -# The name of the magic trash Folder. For MSOE compatibility, -# you can set IMAP_TRASHFOLDERNAME="Deleted Items". -# -# IMPORTANT: If you change this, you must also change IMAP_EMPTYTRASH - -IMAP_TRASHFOLDERNAME=Trash - -##NAME: IMAP_EMPTYTRASH:0 -# -# The following setting is optional, and causes messages from the given -# folder to be automatically deleted after the given number of days. -# IMAP_EMPTYTRASH is a comma-separated list of folder:days. The default -# setting, below, purges 7 day old messages from the Trash folder. -# Another useful setting would be: -# -# IMAP_EMPTYTRASH=Trash:7,Sent:30 -# -# This would also delete messages from the Sent folder (presumably copies -# of sent mail) after 30 days. This is a global setting that is applied to -# every mail account, and is probably useful in a controlled, corporate -# environment. -# -# Important: the purging is controlled by CTIME, not MTIME (the file time -# as shown by ls). It is perfectly ordinary to see stuff in Trash that's -# a year old. That's the file modification time, MTIME, that's displayed. -# This is generally when the message was originally delivered to this -# mailbox. Purging is controlled by a different timestamp, CTIME, which is -# changed when the file is moved to the Trash folder (and at other times too). -# -# You might want to disable this setting in certain situations - it results -# in a stat() of every file in each folder, at login and logout. -# - -IMAP_EMPTYTRASH=Trash:7 - -##NAME: IMAP_MOVE_EXPUNGE_TO_TRASH:0 -# -# Set IMAP_MOVE_EXPUNGE_TO_TRASH to move expunged messages to Trash. This -# effectively allows an undo of message deletion by fishing the deleted -# mail from trash. Trash can be manually expunged as usually, and mail -# will get automatically expunged from Trash according to IMAP_EMPTYTRASH. -# -# NOTE: shared folders are still expunged as usual. Shared folders are -# not affected. -# - -IMAP_MOVE_EXPUNGE_TO_TRASH=0 - - -##NAME: OUTBOX:0 -# -# The next set of options deal with the "Outbox" enhancement. -# Uncomment the following setting to create a special folder, named -# INBOX.Outbox -# -# OUTBOX=.Outbox - -##NAME: SENDMAIL:0 -# -# If OUTBOX is defined, mail can be sent via the IMAP connection by copying -# a message to the INBOX.Outbox folder. For all practical matters, -# INBOX.Outbox looks and behaves just like any other IMAP folder. If this -# folder doesn't exist it must be created by the IMAP mail client, just -# like any other IMAP folder. The kicker: any message copied or moved to -# this folder is will be E-mailed by the Courier-IMAP server, by running -# the SENDMAIL program. Therefore, messages copied or moved to this -# folder must be well-formed RFC-2822 messages, with the recipient list -# specified in the To:, Cc:, and Bcc: headers. Courier-IMAP relies on -# SENDMAIL to read the recipient list from these headers (and delete the Bcc: -# header) by running the command "$SENDMAIL -oi -t -f $SENDER", with the -# message piped on standard input. $SENDER will be the return address -# of the message, which is set by the authentication module. -# -# DO NOT MODIFY SENDMAIL, below, unless you know what you're doing. -# - -SENDMAIL=/usr/sbin/sendmail - -##NAME: HEADERFROM:0 -# -# For administrative and oversight purposes, the return address, $SENDER -# will also be saved in the X-IMAP-Sender mail header. This header gets -# added to the sent E-mail (but it doesn't get saved in the copy of the -# message that's saved in the folder) -# -# WARNING - By enabling OUTBOX above, *every* IMAP mail client will receive -# the magic OUTBOX treatment. Therefore advance LARTing is in order for -# _all_ of your lusers, until every one of them is aware of this. Otherwise if -# OUTBOX is left at its default setting - a folder name that might be used -# accidentally - some people may be in for a rude surprise. You can redefine -# the name of the magic folder by changing OUTBOX, above. You should do that -# and pick a less-obvious name. Perhaps brand it with your organizational -# name ( OUTBOX=.WidgetsAndSonsOutbox ) - -HEADERFROM=X-IMAP-Sender - -##NAME: IMAPDSTART:0 -# -# IMAPDSTART is not used directly. Rather, this is a convenient flag to -# be read by your system startup script in /etc/rc.d, like this: -# -# . /etc/courier-imap/imapd -# -# case x$IMAPDSTART in -# x[yY]*) -# /usr/lib/courier-imap/imapd.rc start -# ;; -# esac -# -# The default setting is going to be NO, so you'll have to manually flip -# it to yes. - -IMAPDSTART=YES - -##NAME: MAILDIRPATH:0 -# -# MAILDIRPATH - directory name of the maildir directory. -# -MAILDIRPATH=Maildir - -#Hardwire a value for ${MAILDIR} -MAILDIR=.maildir -MAILDIRPATH=.maildir -#Put any program for ${PRERUN} here -PRERUN= diff --git a/syscp/patches/gentoo-config-files/nodns/gentoo/courier/etc_courier-imap_imapd-ssl b/syscp/patches/gentoo-config-files/nodns/gentoo/courier/etc_courier-imap_imapd-ssl deleted file mode 100644 index 76dbcf7..0000000 --- a/syscp/patches/gentoo-config-files/nodns/gentoo/courier/etc_courier-imap_imapd-ssl +++ /dev/null @@ -1,199 +0,0 @@ -##VERSION: $Id: imapd-ssl.dist.in,v 1.11 2004/10/21 00:45:35 mrsam Exp $ -# -# imapd-ssl created from imapd-ssl.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# Copyright 2000 - 2004 Double Precision, Inc. See COPYING for -# distribution information. -# -# This configuration file sets various options for the Courier-IMAP server -# when used to handle SSL IMAP connections. -# -# SSL and non-SSL connections are handled by a dedicated instance of the -# couriertcpd daemon. If you are accepting both SSL and non-SSL IMAP -# connections, you will start two instances of couriertcpd, one on the -# IMAP port 143, and another one on the IMAP-SSL port 993. -# -# Download OpenSSL from http://www.openssl.org/ -# -##NAME: SSLPORT:1 -# -# Options in the imapd-ssl configuration file AUGMENT the options in the -# imapd configuration file. First the imapd configuration file is read, -# then the imapd-ssl configuration file, so we do not have to redefine -# anything. -# -# However, some things do have to be redefined. The port number is -# specified by SSLPORT, instead of PORT. The default port is port 993. -# -# Multiple port numbers can be separated by commas. When multiple port -# numbers are used it is possibly to select a specific IP address for a -# given port as "ip.port". For example, "127.0.0.1.900,192.68.0.1.900" -# accepts connections on port 900 on IP addresses 127.0.0.1 and 192.68.0.1 -# The SSLADDRESS setting is a default for ports that do not have -# a specified IP address. - -SSLPORT=993 - -##NAME: SSLADDRESS:0 -# -# Address to listen on, can be set to a single IP address. -# -# SSLADDRESS=127.0.0.1 - -SSLADDRESS=0 - -##NAME: SSLPIDFILE:0 -# -# That's the SSL IMAP port we'll listen on. -# Feel free to redefine MAXDAEMONS, TCPDOPTS, and MAXPERIP. - -SSLPIDFILE=/var/run/imapd-ssl.pid - -##NAME: IMAPDSSLSTART:0 -# -# Different pid files, so that both instances of couriertcpd can coexist -# happily. -# -# You can also redefine IMAP_CAPABILITY, although I can't -# think of why you'd want to do that. -# -# -# Ok, the following settings are new to imapd-ssl: -# -# Whether or not to start IMAP over SSL on simap port: - -IMAPDSSLSTART=YES - -##NAME: IMAPDSTARTTLS:0 -# -# Whether or not to implement IMAP STARTTLS extension instead: - -IMAPDSTARTTLS=YES - -##NAME: IMAP_TLS_REQUIRED:1 -# -# Set IMAP_TLS_REQUIRED to 1 if you REQUIRE STARTTLS for everyone. -# (this option advertises the LOGINDISABLED IMAP capability, until STARTTLS -# is issued). - -IMAP_TLS_REQUIRED=0 - -######################################################################### -# -# The following variables configure IMAP over SSL. If OpenSSL is available -# during configuration, the couriertls helper gets compiled, and upon -# installation a dummy TLS_CERTFILE gets generated. courieresmtpd will -# automatically advertise the ESMTP STARTTLS extension if both TLS_CERTFILE -# and COURIERTLS exist. -# -# WARNING: Peer certificate verification has NOT yet been tested. Proceed -# at your own risk. Only the basic SSL/TLS functionality is known to be -# working. Keep this in mind as you play with the following variables. -# -##NAME: COURIERTLS:0 -# - -COURIERTLS=/usr/sbin/couriertls - -##NAME: TLS_PROTOCOL:0 -# -# TLS_PROTOCOL sets the protocol version. The possible versions are: -# -# SSL2 - SSLv2 -# SSL3 - SSLv3 -# TLS1 - TLS1 - -TLS_PROTOCOL=SSL3 - -##NAME: TLS_STARTTLS_PROTOCOL:0 -# -# TLS_STARTTLS_PROTOCOL is used instead of TLS_PROTOCOL for the IMAP STARTTLS -# extension, as opposed to IMAP over SSL on port 993. -# - -TLS_STARTTLS_PROTOCOL=TLS1 - -##NAME: TLS_CIPHER_LIST:0 -# -# TLS_CIPHER_LIST optionally sets the list of ciphers to be used by the -# OpenSSL library. In most situations you can leave TLS_CIPHER_LIST -# undefined -# -# TLS_CIPHER_LIST="ALL:!ADH:RC4+RSA:+SSLv2:@STRENGTH" - -##NAME: TLS_TIMEOUT:0 -# TLS_TIMEOUT is currently not implemented, and reserved for future use. -# This is supposed to be an inactivity timeout, but its not yet implemented. -# - -##NAME: TLS_DHCERTFILE:0 -# -# TLS_DHCERTFILE - PEM file that stores our Diffie-Hellman cipher pair. -# When OpenSSL is compiled to use Diffie-Hellman ciphers instead of RSA -# you must generate a DH pair that will be used. In most situations the -# DH pair is to be treated as confidential, and the file specified by -# TLS_DHCERTFILE must not be world-readable. -# -# TLS_DHCERTFILE= - -##NAME: TLS_CERTFILE:0 -# -# TLS_CERTFILE - certificate to use. TLS_CERTFILE is required for SSL/TLS -# servers, and is optional for SSL/TLS clients. TLS_CERTFILE is usually -# treated as confidential, and must not be world-readable. -# -TLS_CERTFILE=/etc/ssl/server/<SERVERNAME>.crt_and_key - -##NAME: TLS_TRUSTCERTS:0 -# -# TLS_TRUSTCERTS=pathname - load trusted certificates from pathname. -# pathname can be a file or a directory. If a file, the file should -# contain a list of trusted certificates, in PEM format. If a -# directory, the directory should contain the trusted certificates, -# in PEM format, one per file and hashed using OpenSSL's c_rehash -# script. TLS_TRUSTCERTS is used by SSL/TLS clients (by specifying -# the -domain option) and by SSL/TLS servers (TLS_VERIFYPEER is set -# to PEER or REQUIREPEER). -# -# -# TLS_TRUSTCERTS= - -##NAME: TLS_VERIFYPEER:0 -# -# TLS_VERIFYPEER - how to verify client certificates. The possible values of -# this setting are: -# -# NONE - do not verify anything -# -# PEER - verify the client certificate, if one's presented -# -# REQUIREPEER - require a client certificate, fail if one's not presented -# -# -TLS_VERIFYPEER=NONE - -##NAME: TLS_CACHE:0 -# -# A TLS/SSL session cache may slightly improve response for IMAP clients -# that open multiple SSL sessions to the server. TLS_CACHEFILE will be -# automatically created, TLS_CACHESIZE bytes long, and used as a cache -# buffer. -# -# This is an experimental feature and should be disabled if it causes -# problems with SSL clients. Disable SSL caching by commenting out the -# following settings: - -TLS_CACHEFILE=/var/lib/courier-imap/couriersslcache -TLS_CACHESIZE=524288 - -##NAME: MAILDIRPATH:0 -# -# MAILDIRPATH - directory name of the maildir directory. -# -MAILDIRPATH=Maildir - -#Hardwire a value for ${MAILDIR} -MAILDIRPATH=.maildir diff --git a/syscp/patches/gentoo-config-files/nodns/gentoo/courier/etc_courier-imap_pop3d b/syscp/patches/gentoo-config-files/nodns/gentoo/courier/etc_courier-imap_pop3d deleted file mode 100644 index 71502ae..0000000 --- a/syscp/patches/gentoo-config-files/nodns/gentoo/courier/etc_courier-imap_pop3d +++ /dev/null @@ -1,127 +0,0 @@ -##VERSION: $Id: pop3d.dist.in,v 1.11 2004/10/30 15:39:38 mrsam Exp $ -# -# pop3d created from pop3d.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# Copyright 1998 - 2004 Double Precision, Inc. See COPYING for -# distribution information. -# -# Courier POP3 daemon configuration -# -##NAME: PIDFILE:0 -# - -PIDFILE=/var/run/pop3d.pid - -##NAME: MAXDAEMONS:0 -# -# Maximum number of POP3 servers started -# - -MAXDAEMONS=50 - -##NAME: MAXPERIP:4 -# -# Maximum number of connections to accept from the same IP address - -MAXPERIP=5 - -##NAME: POP3AUTH:1 -# -# To advertise the SASL capability, per RFC 2449, uncomment the POP3AUTH -# variable: -# -# POP3AUTH="LOGIN" -# -# If you have configured the CRAM-MD5 or CRAM-SHA1, set POP3AUTH to something -# like this: -# -# POP3AUTH="LOGIN CRAM-MD5 CRAM-SHA1" - -POP3AUTH="" - -##NAME: POP3AUTH_ORIG:0 -# -# For use by webadmin - -POP3AUTH_ORIG="LOGIN CRAM-MD5 CRAM-SHA1" - -##NAME: POP3AUTH_TLS:1 -# -# To also advertise SASL PLAIN if SSL is enabled, uncomment the -# POP3AUTH_TLS environment variable: -# -# POP3AUTH_TLS="LOGIN PLAIN" - -POP3AUTH_TLS="" - -##NAME: POP3AUTH_TLS_ORIG:0 -# -# For use by webadmin - -POP3AUTH_TLS_ORIG="LOGIN PLAIN" - -##NAME: POP3_PROXY:0 -# -# Enable proxying. See README.proxy - -POP3_PROXY=0 - -##NAME: PORT:1 -# -# Port to listen on for connections. The default is port 110. -# -# Multiple port numbers can be separated by commas. When multiple port -# numbers are used it is possibly to select a specific IP address for a -# given port as "ip.port". For example, "127.0.0.1.900,192.68.0.1.900" -# accepts connections on port 900 on IP addresses 127.0.0.1 and 192.68.0.1 -# The ADDRESS setting is a default for ports that do not have a specified -# IP address. - -PORT=110 - -##NAME: ADDRESS:0 -# -# IP address to listen on. 0 means all IP addresses. - -ADDRESS=0 - -##NAME: TCPDOPTS:0 -# -# Other couriertcpd(1) options. The following defaults should be fine. -# - -TCPDOPTS="-nodnslookup -noidentlookup" - -##NAME: POP3DSTART:0 -# -# POP3DSTART is not referenced anywhere in the standard Courier programs -# or scripts. Rather, this is a convenient flag to be read by your system -# startup script in /etc/rc.d, like this: -# -# . /etc/courier-imap/pop3d -# case x$POP3DSTART in -# x[yY]*) -# /usr/lib/courier-imap/pop3d.rc start -# ;; -# esac -# -# The default setting is going to be NO, until Courier is shipped by default -# with enough platforms so that people get annoyed with having to flip it to -# YES every time. - -POP3DSTART=YES - -##NAME: MAILDIRPATH:0 -# -# MAILDIRPATH - directory name of the maildir directory. -# -MAILDIRPATH=Maildir - -#Hardwire a value for ${MAILDIR} -MAILDIR=.maildir -MAILDIRPATH=.maildir -#Put any program for ${PRERUN} here -PRERUN= diff --git a/syscp/patches/gentoo-config-files/nodns/gentoo/courier/etc_courier-imap_pop3d-ssl b/syscp/patches/gentoo-config-files/nodns/gentoo/courier/etc_courier-imap_pop3d-ssl deleted file mode 100644 index a0267a0..0000000 --- a/syscp/patches/gentoo-config-files/nodns/gentoo/courier/etc_courier-imap_pop3d-ssl +++ /dev/null @@ -1,186 +0,0 @@ -##VERSION: $Id: pop3d-ssl.dist.in,v 1.12 2004/10/21 00:45:35 mrsam Exp $ -# -# pop3d-ssl created from pop3d-ssl.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# Copyright 2000-2004 Double Precision, Inc. See COPYING for -# distribution information. -# -# This configuration file sets various options for the Courier-IMAP server -# when used to handle SSL POP3 connections. -# -# SSL and non-SSL connections are handled by a dedicated instance of the -# couriertcpd daemon. If you are accepting both SSL and non-SSL POP3 -# connections, you will start two instances of couriertcpd, one on the -# POP3 port 110, and another one on the POP3-SSL port 995. -# -# Download OpenSSL from http://www.openssl.org/ -# -##NAME: SSLPORT:0 -# -# Options in the pop3d-ssl configuration file AUGMENT the options in the -# pop3d configuration file. First the pop3d configuration file is read, -# then the pop3d-ssl configuration file, so we do not have to redefine -# anything. -# -# However, some things do have to be redefined. The port number is -# specified by SSLPORT, instead of PORT. The default port is port 995. -# -# Multiple port numbers can be separated by commas. When multiple port -# numbers are used it is possibly to select a specific IP address for a -# given port as "ip.port". For example, "127.0.0.1.900,192.68.0.1.900" -# accepts connections on port 900 on IP addresses 127.0.0.1 and 192.68.0.1 -# The SSLADDRESS setting is a default for ports that do not have -# a specified IP address. - -SSLPORT=995 - -##NAME: SSLADDRESS:0 -# -# Address to listen on, can be set to a single IP address. -# -# SSLADDRESS=127.0.0.1 - -SSLADDRESS=0 - -##NAME: SSLPIDFILE:0 -# -# -# - -SSLPIDFILE=/var/run/pop3d-ssl.pid - -##NAME: POP3DSSLSTART:0 -# -# Whether or not to start POP3 over SSL on spop3 port: - -POP3DSSLSTART=YES - -##NAME: POP3_STARTTLS:0 -# -# Whether or not to implement the POP3 STLS extension: - -POP3_STARTTLS=YES - -##NAME: POP3_TLS_REQUIRED:1 -# -# Set POP3_TLS_REQUIRED to 1 if you REQUIRE STARTTLS for everyone. -# (this option advertises the LOGINDISABLED POP3 capability, until STARTTLS -# is issued). - -POP3_TLS_REQUIRED=0 - -##NAME: COURIERTLS:0 -# -# The following variables configure POP3 over SSL. If OpenSSL is available -# during configuration, the couriertls helper gets compiled, and upon -# installation a dummy TLS_CERTFILE gets generated. courieresmtpd will -# automatically advertise the ESMTP STARTTLS extension if both TLS_CERTFILE -# and COURIERTLS exist. -# -# WARNING: Peer certificate verification has NOT yet been tested. Proceed -# at your own risk. Only the basic SSL/TLS functionality is known to be -# working. Keep this in mind as you play with the following variables. - -COURIERTLS=/usr/sbin/couriertls - -##NAME: TLS_PROTOCOL:0 -# -# TLS_PROTOCOL sets the protocol version. The possible versions are: -# -# SSL2 - SSLv2 -# SSL3 - SSLv3 -# TLS1 - TLS1 - -TLS_PROTOCOL=SSL3 - -##NAME: TLS_STARTTLS_PROTOCOL:0 -# -# TLS_STARTTLS_PROTOCOL is used instead of TLS_PROTOCOL for the POP3 STARTTLS -# extension, as opposed to POP3 over SSL on port 995. -# - -TLS_STARTTLS_PROTOCOL=TLS1 - -##NAME: TLS_CIPHER_LIST:0 -# -# TLS_CIPHER_LIST optionally sets the list of ciphers to be used by the -# OpenSSL library. In most situations you can leave TLS_CIPHER_LIST -# undefined -# -# TLS_CIPHER_LIST="ALL:!ADH:RC4+RSA:+SSLv2:@STRENGTH" - -##NAME: TLS_TIMEOUT:0 -# TLS_TIMEOUT is currently not implemented, and reserved for future use. -# This is supposed to be an inactivity timeout, but its not yet implemented. -# - -##NAME: TLS_DHCERTFILE:0 -# -# TLS_DHCERTFILE - PEM file that stores our Diffie-Hellman cipher pair. -# When OpenSSL is compiled to use Diffie-Hellman ciphers instead of RSA -# you must generate a DH pair that will be used. In most situations the -# DH pair is to be treated as confidential, and the file specified by -# TLS_DHCERTFILE must not be world-readable. -# -# TLS_DHCERTFILE= - -##NAME: TLS_CERTFILE:0 -# -# TLS_CERTFILE - certificate to use. TLS_CERTFILE is required for SSL/TLS -# servers, and is optional for SSL/TLS clients. TLS_CERTFILE is usually -# treated as confidential, and must not be world-readable. -# -TLS_CERTFILE=/etc/ssl/server/<SERVERNAME>.crt_and_key - -##NAME: TLS_TRUSTCERTS:0 -# -# TLS_TRUSTCERTS=pathname - load trusted certificates from pathname. -# pathname can be a file or a directory. If a file, the file should -# contain a list of trusted certificates, in PEM format. If a -# directory, the directory should contain the trusted certificates, -# in PEM format, one per file and hashed using OpenSSL's c_rehash -# script. TLS_TRUSTCERTS is used by SSL/TLS clients (by specifying -# the -domain option) and by SSL/TLS servers (TLS_VERIFYPEER is set -# to PEER or REQUIREPEER). -# -# -# TLS_TRUSTCERTS= - -##NAME: TLS_VERIFYPEER:0 -# -# TLS_VERIFYPEER - how to verify client certificates. The possible values of -# this setting are: -# -# NONE - do not verify anything -# -# PEER - verify the client certificate, if one's presented -# -# REQUIREPEER - require a client certificate, fail if one's not presented -# -# -TLS_VERIFYPEER=NONE - -##NAME: TLS_CACHE:0 -# -# A TLS/SSL session cache may slightly improve response for long-running -# POP3 clients. TLS_CACHEFILE will be automatically created, TLS_CACHESIZE -# bytes long, and used as a cache buffer. -# -# This is an experimental feature and should be disabled if it causes -# problems with SSL clients. Disable SSL caching by commenting out the -# following settings: - -TLS_CACHEFILE=/var/lib/courier-imap/couriersslcache -TLS_CACHESIZE=524288 - -##NAME: MAILDIRPATH:0 -# -# MAILDIRPATH - directory name of the maildir directory. -# -MAILDIRPATH=Maildir - -#Hardwire a value for ${MAILDIR} -MAILDIRPATH=.maildir diff --git a/syscp/patches/gentoo-config-files/nodns/gentoo/courier/etc_courier_authlib_authdaemonrc b/syscp/patches/gentoo-config-files/nodns/gentoo/courier/etc_courier_authlib_authdaemonrc deleted file mode 100644 index 867a12d..0000000 --- a/syscp/patches/gentoo-config-files/nodns/gentoo/courier/etc_courier_authlib_authdaemonrc +++ /dev/null @@ -1,93 +0,0 @@ -##VERSION: $Id: authdaemonrc.in,v 1.12 2005/07/05 12:25:08 mrsam Exp $ -# -# Copyright 2000-2005 Double Precision, Inc. See COPYING for -# distribution information. -# -# authdaemonrc created from authdaemonrc.dist by sysconftool -# -# Do not alter lines that begin with ##, they are used when upgrading -# this configuration. -# -# This file configures authdaemond, the resident authentication daemon. -# -# Comments in this file are ignored. Although this file is intended to -# be sourced as a shell script, authdaemond parses it manually, so -# the acceptable syntax is a bit limited. Multiline variable contents, -# with the \ continuation character, are not allowed. Everything must -# fit on one line. Do not use any additional whitespace for indentation, -# or anything else. - -##NAME: authmodulelist:2 -# -# The authentication modules that are linked into authdaemond. The -# default list is installed. You may selectively disable modules simply -# by removing them from the following list. The available modules you -# can use are: authuserdb authpam authshadow authmysql authcustom authpipe - -authmodulelist="authmysql" - -##NAME: authmodulelistorig:3 -# -# This setting is used by Courier's webadmin module, and should be left -# alone - -authmodulelistorig="authuserdb authpam authshadow authmysql authcustom authpipe" - -##NAME: daemons:0 -# -# The number of daemon processes that are started. authdaemon is typically -# installed where authentication modules are relatively expensive: such -# as authldap, or authmysql, so it's better to have a number of them running. -# PLEASE NOTE: Some platforms may experience a problem if there's more than -# one daemon. Specifically, SystemV derived platforms that use TLI with -# socket emulation. I'm suspicious of TLI's ability to handle multiple -# processes accepting connections on the same filesystem domain socket. -# -# You may need to increase daemons if as your system load increases. Symptoms -# include sporadic authentication failures. If you start getting -# authentication failures, increase daemons. However, the default of 5 -# SHOULD be sufficient. Bumping up daemon count is only a short-term -# solution. The permanent solution is to add more resources: RAM, faster -# disks, faster CPUs... - -daemons=5 - -##NAME: authdaemonvar:2 -# -# authdaemonvar is here, but is not used directly by authdaemond. It's -# used by various configuration and build scripts, so don't touch it! - -authdaemonvar=/var/lib/courier/authdaemon - -##NAME: DEBUG_LOGIN:0 -# -# Dump additional diagnostics to syslog -# -# DEBUG_LOGIN=0 - turn off debugging -# DEBUG_LOGIN=1 - turn on debugging -# DEBUG_LOGIN=2 - turn on debugging + log passwords too -# -# ** YES ** - DEBUG_LOGIN=2 places passwords into syslog. -# -# Note that most information is sent to syslog at level 'debug', so -# you may need to modify your /etc/syslog.conf to be able to see it. - -DEBUG_LOGIN=0 - -##NAME: DEFAULTOPTIONS:0 -# -# A comma-separated list of option=value pairs. Each option is applied -# to an account if the account does not have its own specific value for -# that option. So for example, you can set -# DEFAULTOPTIONS="disablewebmail=1,disableimap=1" -# and then enable webmail and/or imap on individual accounts by setting -# disablewebmail=0 and/or disableimap=0 on the account. - -DEFAULTOPTIONS="" - -##NAME: LOGGEROPTS:0 -# -# courierlogger(1) options, e.g. to set syslog facility -# - -LOGGEROPTS="" diff --git a/syscp/patches/gentoo-config-files/nodns/gentoo/courier/etc_courier_authlib_authmysqlrc b/syscp/patches/gentoo-config-files/nodns/gentoo/courier/etc_courier_authlib_authmysqlrc deleted file mode 100644 index fec6508..0000000 --- a/syscp/patches/gentoo-config-files/nodns/gentoo/courier/etc_courier_authlib_authmysqlrc +++ /dev/null @@ -1,12 +0,0 @@ -MYSQL_SERVER <SQL_HOST> -MYSQL_USERNAME <SQL_UNPRIVILEGED_USER> -MYSQL_PASSWORD <SQL_UNPRIVILEGED_PASSWORD> -MYSQL_PORT 0 -MYSQL_DATABASE <SQL_DB> -MYSQL_USER_TABLE mail_users -MYSQL_CRYPT_PWFIELD password_enc -MYSQL_UID_FIELD <VIRTUAL_UID_MAPS> -MYSQL_GID_FIELD <VIRTUAL_GID_MAPS> -MYSQL_LOGIN_FIELD username -MYSQL_HOME_FIELD "<VIRTUAL_MAILBOX_BASE>" -MYSQL_MAILDIR_FIELD maildir diff --git a/syscp/patches/gentoo-config-files/nodns/gentoo/cron/etc_cron.d_syscp b/syscp/patches/gentoo-config-files/nodns/gentoo/cron/etc_cron.d_syscp deleted file mode 100644 index 4afe408..0000000 --- a/syscp/patches/gentoo-config-files/nodns/gentoo/cron/etc_cron.d_syscp +++ /dev/null @@ -1,10 +0,0 @@ -# -# Set PATH, otherwise restart-scripts won't find start-stop-daemon -# -PATH=/sbin:/bin:/usr/sbin:/usr/bin -# -# Regular cron jobs for the syscp package -# -# Please check that all following paths are correct -# -*/5 * * * * root /usr/lib/php4/bin/php -q -c /etc/php/syscp-cronjob/php.ini /var/www/syscp/scripts/cronscript.php diff --git a/syscp/patches/gentoo-config-files/nodns/gentoo/cron/etc_php_syscp-cronjob_php.ini b/syscp/patches/gentoo-config-files/nodns/gentoo/cron/etc_php_syscp-cronjob_php.ini deleted file mode 100644 index 74c8316..0000000 --- a/syscp/patches/gentoo-config-files/nodns/gentoo/cron/etc_php_syscp-cronjob_php.ini +++ /dev/null @@ -1,61 +0,0 @@ -short_open_tag = On -asp_tags = Off -precision = 14 -output_buffering = Off -allow_call_time_pass_reference = Off -safe_mode = Off -safe_mode_gid = Off -safe_mode_include_dir = "/usr/share/php/:/usr/share/php4/:/usr/share/php5/" -safe_mode_allowed_env_vars = PHP_ -safe_mode_protected_env_vars = LD_LIBRARY_PATH -open_basedir = -disable_functions = -disable_classes = -expose_php = Off -max_execution_time = 180 -max_input_time = 120 -memory_limit = 32M -post_max_size = 32M -error_reporting = E_ALL & ~E_NOTICE -display_errors = On -display_startup_errors = Off -log_errors = Off -log_errors_max_len = 1024 -ignore_repeated_errors = Off -ignore_repeated_source = Off -report_memleaks = On -track_errors = Off -html_errors = Off -variables_order = "GPCS" -register_globals = Off -register_argc_argv = Off -gpc_order = "GPC" -magic_quotes_gpc = Off -magic_quotes_runtime = Off -magic_quotes_sybase = Off -include_path = ".:/usr/share/php/:/usr/share/php4/:/usr/share/php5/" -enable_dl = Off -file_uploads = On -upload_tmp_dir = "/tmp/" -upload_max_filesize = 32M -allow_url_fopen = Off -session.save_handler = files -session.save_path = "/tmp/" -session.use_cookies = 1 -session.name = PHPSESSID -session.auto_start = 0 -session.cookie_lifetime = 0 -session.cookie_path = / -session.cookie_domain = -session.serialize_handler = php -session.gc_probability = 1 -session.gc_divisor = 1000 -session.gc_maxlifetime = 1440 -session.bug_compat_42 = 0 -session.bug_compat_warn = 1 -session.referer_check = -session.entropy_length = 16 -session.entropy_file = /dev/urandom -session.cache_limiter = nocache -session.cache_expire = 180 -session.use_trans_sid = 0 diff --git a/syscp/patches/gentoo-config-files/nodns/gentoo/cron/etc_php_syscp-vhost_php.ini b/syscp/patches/gentoo-config-files/nodns/gentoo/cron/etc_php_syscp-vhost_php.ini deleted file mode 100644 index 048c26c..0000000 --- a/syscp/patches/gentoo-config-files/nodns/gentoo/cron/etc_php_syscp-vhost_php.ini +++ /dev/null @@ -1,61 +0,0 @@ -short_open_tag = On -asp_tags = Off -precision = 14 -output_buffering = 4096 -allow_call_time_pass_reference = Off -safe_mode = Off -safe_mode_gid = Off -safe_mode_include_dir = "/usr/share/php/:/usr/share/php4/:/usr/share/php5/" -safe_mode_allowed_env_vars = PHP_ -safe_mode_protected_env_vars = LD_LIBRARY_PATH -open_basedir = "/var/www/syscp/:/var/www/syscp-suphp/syscp/:/var/www/syscpwebs/:/usr/share/php/:/usr/share/php4/:/usr/share/php5/" -disable_functions = exec,passthru,shell_exec,system,proc_close,proc_get_status,proc_nice,proc_open,proc_terminate -disable_classes = -expose_php = Off -max_execution_time = 30 -max_input_time = 60 -memory_limit = 16M -post_max_size = 12M -error_reporting = E_ALL & ~E_NOTICE -display_errors = Off -display_startup_errors = Off -log_errors = On -log_errors_max_len = 1024 -ignore_repeated_errors = Off -ignore_repeated_source = Off -report_memleaks = On -track_errors = Off -html_errors = Off -variables_order = "GPCS" -register_globals = Off -register_argc_argv = Off -gpc_order = "GPC" -magic_quotes_gpc = Off -magic_quotes_runtime = Off -magic_quotes_sybase = Off -include_path = ".:/usr/share/php/:/usr/share/php4/:/usr/share/php5/" -enable_dl = Off -file_uploads = On -upload_tmp_dir = "/var/www/syscp-suphp/syscp/" -upload_max_filesize = 32M -allow_url_fopen = Off -session.save_handler = files -session.save_path = "/var/www/syscp-suphp/syscp/" -session.use_cookies = 1 -session.name = PHPSESSID -session.auto_start = 0 -session.cookie_lifetime = 0 -session.cookie_path = / -session.cookie_domain = -session.serialize_handler = php -session.gc_probability = 1 -session.gc_divisor = 1000 -session.gc_maxlifetime = 1440 -session.bug_compat_42 = 0 -session.bug_compat_warn = 1 -session.referer_check = -session.entropy_length = 16 -session.entropy_file = /dev/urandom -session.cache_limiter = nocache -session.cache_expire = 180 -session.use_trans_sid = 0 diff --git a/syscp/patches/gentoo-config-files/nodns/gentoo/postfix/etc_postfix_main.cf b/syscp/patches/gentoo-config-files/nodns/gentoo/postfix/etc_postfix_main.cf deleted file mode 100644 index 9013dd6..0000000 --- a/syscp/patches/gentoo-config-files/nodns/gentoo/postfix/etc_postfix_main.cf +++ /dev/null @@ -1,65 +0,0 @@ -# Postfix directories settings -command_directory = /usr/sbin -daemon_directory = /usr/lib/postfix -queue_directory = /var/spool/postfix -sample_directory = /etc/postfix -manpage_directory = /usr/share/man -readme_directory = /usr/share/doc/postfix-2.1.5-r2/readme -html_directory = no - -# Postfix programs paths settings -mailq_path = /usr/bin/mailq -newaliases_path = /usr/bin/newaliases -sendmail_path = /usr/sbin/sendmail - -# General Postfix configuration -myhostname = <SERVERNAME> -mydestination = $myhostname, $mydomain, localhost.$myhostname, localhost.$mydomain, localhost -mynetworks = 127.0.0.0/8 -inet_interfaces = all -mail_owner = postfix -setgid_group = postdrop -smtpd_banner = $myhostname ESMTP Mailserver -smtpd_helo_required = yes -append_dot_mydomain = no -biff = no - -# Postfix Debugger configuration -debug_peer_level = 2 -debugger_command = - PATH=/bin:/usr/bin:/usr/local/bin; export PATH; (echo cont; - echo where) | gdb $daemon_directory/$process_name $process_id 2>&1 - >$config_directory/$process_name.$process_id.log & sleep 5 - -# Postfix performance settings -default_destination_concurrency_limit = 20 -local_destination_concurrency_limit = 2 - -# Virtual delivery settings -virtual_transport = virtual -virtual_mailbox_base = <VIRTUAL_MAILBOX_BASE> -virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf -virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf -virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf -virtual_uid_maps = static:<VIRTUAL_UID_MAPS> -virtual_gid_maps = static:<VIRTUAL_GID_MAPS> - -# Local delivery settings -local_transport = local -alias_database = hash:/etc/mail/aliases -alias_maps = $alias_database - -# SASL settings -smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination -smtpd_sasl_auth_enable = yes -smtpd_sasl_local_domain = $myhostname -smtpd_sasl_security_options = noanonymous -broken_sasl_auth_clients = yes - -# TLS settings -#smtpd_use_tls = yes -#smtpd_tls_cert_file = /etc/ssl/server/<SERVERNAME>.crt -#smtpd_tls_key_file = /etc/ssl/server/<SERVERNAME>.key -#smtpd_tls_auth_only = no -#smtpd_tls_session_cache_timeout = 3600s -#tls_random_source = dev:/dev/urandom diff --git a/syscp/patches/gentoo-config-files/nodns/gentoo/postfix/etc_postfix_mysql-virtual_alias_maps.cf b/syscp/patches/gentoo-config-files/nodns/gentoo/postfix/etc_postfix_mysql-virtual_alias_maps.cf deleted file mode 100644 index c921e6f..0000000 --- a/syscp/patches/gentoo-config-files/nodns/gentoo/postfix/etc_postfix_mysql-virtual_alias_maps.cf +++ /dev/null @@ -1,8 +0,0 @@ -user = <SQL_UNPRIVILEGED_USER> -password = <SQL_UNPRIVILEGED_PASSWORD> -dbname = <SQL_DB> -table = mail_virtual -select_field = destination -where_field = email -additional_conditions = and destination <> '' and destination <> ' ' -hosts = <SQL_HOST> diff --git a/syscp/patches/gentoo-config-files/nodns/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf b/syscp/patches/gentoo-config-files/nodns/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf deleted file mode 100644 index 4484bee..0000000 --- a/syscp/patches/gentoo-config-files/nodns/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf +++ /dev/null @@ -1,8 +0,0 @@ -user = <SQL_UNPRIVILEGED_USER> -password = <SQL_UNPRIVILEGED_PASSWORD> -dbname = <SQL_DB> -table = panel_domains -select_field = domain -where_field = domain -additional_conditions = and isemaildomain = '1' -hosts = <SQL_HOST> diff --git a/syscp/patches/gentoo-config-files/nodns/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf b/syscp/patches/gentoo-config-files/nodns/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf deleted file mode 100644 index 7e0f79a..0000000 --- a/syscp/patches/gentoo-config-files/nodns/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf +++ /dev/null @@ -1,7 +0,0 @@ -user = <SQL_UNPRIVILEGED_USER> -password = <SQL_UNPRIVILEGED_PASSWORD> -dbname = <SQL_DB> -table = mail_users -select_field = maildir -where_field = email -hosts = <SQL_HOST> diff --git a/syscp/patches/gentoo-config-files/nodns/gentoo/postfix/etc_sasl2_smtpd.conf b/syscp/patches/gentoo-config-files/nodns/gentoo/postfix/etc_sasl2_smtpd.conf deleted file mode 100644 index 2089cbb..0000000 --- a/syscp/patches/gentoo-config-files/nodns/gentoo/postfix/etc_sasl2_smtpd.conf +++ /dev/null @@ -1,12 +0,0 @@ -pwcheck_method: auxprop -auxprop_plugin: sql -allowanonymouslogin: no -allowplaintext: yes -mech_list: PLAIN LOGIN -password_format: crypt -sql_engine: mysql -sql_hostnames: <SQL_HOST> -sql_user: <SQL_UNPRIVILEGED_USER> -sql_passwd: <SQL_UNPRIVILEGED_PASSWORD> -sql_database: <SQL_DB> -sql_select: SELECT password_enc FROM mail_users where username='%u@%r' diff --git a/syscp/patches/gentoo-config-files/nodns/gentoo/proftpd/etc_proftpd_proftpd.conf b/syscp/patches/gentoo-config-files/nodns/gentoo/proftpd/etc_proftpd_proftpd.conf deleted file mode 100644 index 5e56215..0000000 --- a/syscp/patches/gentoo-config-files/nodns/gentoo/proftpd/etc_proftpd_proftpd.conf +++ /dev/null @@ -1,89 +0,0 @@ -# Server settings -ServerName "<SERVERNAME> FTP Server" -ServerType standalone -ServerIdent off -DefaultServer on -Port 21 -MaxInstances 50 - -# General settings -DeferWelcome on -MultilineRFC2228 on -ShowSymlinks on -AllowOverwrite on -AllowStoreRestart on -AllowRetrieveRestart on -UseReverseDNS off -IdentLookups off -ListOptions "-al" -DisplayFirstChdir .message - -# Modules settings -#DelayEngine off - -# Timeout settings -TimeoutLogin 120 -TimeoutNoTransfer 600 -TimeoutStalled 600 -TimeoutIdle 600 - -# Security settings -RootLogin off -RequireValidShell off -User syscpftpd -Group syscpftpd -Umask 133 022 -DefaultRoot ~ -DenyFilter \*.*/ - -# Per-Directory settings -<Directory /*> -Umask 133 022 -AllowOverwrite on -</Directory> - -# SQL settings -SQLAuthTypes Crypt -SQLAuthenticate users* groups* -SQLConnectInfo <SQL_DB>@<SQL_HOST> <SQL_UNPRIVILEGED_USER> <SQL_UNPRIVILEGED_PASSWORD> -SQLUserInfo ftp_users username password uid gid homedir shell -SQLGroupInfo ftp_groups groupname gid members -SQLUserWhereClause "login_enabled = 'y'" - -SQLLog PASS login -SQLNamedQuery login UPDATE "last_login=now(), login_count=login_count+1 WHERE username='%u'" ftp_users - -SQLLog RETR download -SQLNamedQuery download UPDATE "down_count=down_count+1, down_bytes=down_bytes+%b WHERE username='%u'" ftp_users - -SQLLog STOR upload -SQLNamedQuery upload UPDATE "up_count=up_count+1, up_bytes=up_bytes+%b WHERE username='%u'" ftp_users - -# TLS settings -#<IfModule mod_tls.c> -#TLSEngine on -#TLSLog /var/log/proftpd-tls.log -#TLSProtocol SSLv23 -#TLSTimeoutHandshake 120 -# Really important for WinClients -#TLSOptions NoCertRequest -#TLSRSACertificateFile /etc/ssl/server/<SERVERNAME>.crt -#TLSRSACertificateKeyFile /etc/ssl/server/<SERVERNAME>.key -# Authenticate client that want to use FTP over TLS? -#TLSVerifyClient off -# Uncomment the following line to force tls login -#TLSRequired off -#</IfModule> - -# LOG settings -# Logging Formats -LogFormat default "%h %1 %u %t \"%r\" %s %b" -LogFormat auth "%v [%P] %h %t \"%r\" %s" -LogFormat write "%h %l %u %t \"%r\" %s %b" -# Activate Logging -# all logins -ExtendedLog /var/log/proftpd-auth.log AUTH auth -# file/dir access -ExtendedLog /var/log/proftpd-access.log WRITE,READ write -# everything (be careful, generates_ very_ big logfiles) -#ExtendedLog /var/log/proftpd-all.log ALL default diff --git a/syscp/patches/gentoo-config-files/nodns/syscp-1.2.13-gentoo-admin_configfiles.php-nodns b/syscp/patches/gentoo-config-files/nodns/syscp-1.2.13-gentoo-admin_configfiles.php-nodns deleted file mode 100644 index 1541fa8..0000000 --- a/syscp/patches/gentoo-config-files/nodns/syscp-1.2.13-gentoo-admin_configfiles.php-nodns +++ /dev/null @@ -1,266 +0,0 @@ -<?php -/** - * filename: $Source: /syscp/syscp/admin_configfiles.php,v $ - * begin: Wednesday, Sep 08, 2004 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. This program is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY; without even the - * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * @author Florian Lippert <flo@redenswert.de> - * @copyright (C) 2003-2004 Florian Lippert - * @package Panel - * @version $Id: admin_configfiles.php,v 1.9 2005/06/15 13:53:58 flo Exp $ - * Modified to reflect the Gentoo environment by Luca Longinotti <chtekk@gentoo.org> - */ - - define('AREA', 'admin'); - - /** - * Include our init.php, which manages Sessions, Language etc. - */ - require("./lib/init.php"); - - - $configfiles = Array - ( - 'gentoo' => Array - ( - 'label' => 'Gentoo', - 'daemons' => Array - ( - 'apache' => Array - ( - 'label' => 'Apache2 Webserver (HTTP)', - 'commands' => Array - ( - 'touch '.$settings['system']['apacheconf_directory'].'vhosts.d/99_syscp-vhosts.conf', - 'chown root:0 '.$settings['system']['apacheconf_directory'].'vhosts.d/99_syscp-vhosts.conf', - 'chmod 0600 '.$settings['system']['apacheconf_directory'].'vhosts.d/99_syscp-vhosts.conf', - 'echo "Include '.$settings['system']['apacheconf_directory'].'vhosts.d/99_syscp-vhosts.conf" >> /etc/apache2/httpd.conf', - 'mkdir -p '.$settings['system']['documentroot_prefix'], - 'mkdir -p '.$settings['system']['logfiles_directory'] - ), - 'restart' => Array - ( - 'rc-update add apache2 default', - '/etc/init.d/apache2 restart' - ) - ), - 'courier' => Array - ( - 'label' => 'Courier-IMAP (POP3/IMAP)', - 'files' => Array - ( - 'etc_courier_authlib_authdaemonrc' => '/etc/courier/authlib/authdaemonrc', - 'etc_courier_authlib_authmysqlrc' => '/etc/courier/authlib/authmysqlrc', - 'etc_courier-imap_pop3d' => '/etc/courier-imap/pop3d', - 'etc_courier-imap_imapd' => '/etc/courier-imap/imapd', - 'etc_courier-imap_pop3d-ssl' => '/etc/courier-imap/pop3d-ssl', - 'etc_courier-imap_imapd-ssl' => '/etc/courier-imap/imapd-ssl' - ), - 'commands' => Array - ( - 'rm /etc/courier/authlib/authdaemonrc', - 'rm /etc/courier/authlib/authmysqlrc', - 'rm /etc/courier-imap/pop3d', - 'rm /etc/courier-imap/imapd', - 'rm /etc/courier-imap/pop3d-ssl', - 'rm /etc/courier-imap/imapd-ssl', - 'touch /etc/courier/authlib/authdaemonrc', - 'touch /etc/courier/authlib/authmysqlrc', - 'touch /etc/courier-imap/pop3d', - 'touch /etc/courier-imap/imapd', - 'touch /etc/courier-imap/pop3d-ssl', - 'touch /etc/courier-imap/imapd-ssl', - 'chown root:0 /etc/courier/authlib/authdaemonrc', - 'chown root:0 /etc/courier/authlib/authmysqlrc', - 'chown root:0 /etc/courier-imap/pop3d', - 'chown root:0 /etc/courier-imap/imapd', - 'chown root:0 /etc/courier-imap/pop3d-ssl', - 'chown root:0 /etc/courier-imap/imapd-ssl', - 'chmod 0600 /etc/courier/authlib/authdaemonrc', - 'chmod 0600 /etc/courier/authlib/authmysqlrc', - 'chmod 0600 /etc/courier-imap/pop3d', - 'chmod 0600 /etc/courier-imap/imapd', - 'chmod 0600 /etc/courier-imap/pop3d-ssl', - 'chmod 0600 /etc/courier-imap/imapd-ssl' - ), - 'restart' => Array - ( - 'rc-update add courier-authlib default', - 'rc-update add courier-pop3d default', - 'rc-update add courier-imapd default', - '/etc/init.d/courier-authlib restart', - '/etc/init.d/courier-pop3d restart', - '/etc/init.d/courier-imapd restart' - ) - ), - 'postfix' => Array - ( - 'label' => 'Postfix (MTA)', - 'files' => Array - ( - 'etc_postfix_main.cf' => '/etc/postfix/main.cf', - 'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf', - 'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf', - 'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf', - 'etc_sasl2_smtpd.conf' => '/etc/sasl2/smtpd.conf' - ), - 'commands' => Array - ( - 'mkdir -p '.$settings['system']['vmail_homedir'], - 'chown -R vmail:vmail '.$settings['system']['vmail_homedir'], - 'chmod 0750 '.$settings['system']['vmail_homedir'], - 'rm /etc/postfix/main.cf', - 'touch /etc/postfix/main.cf', - 'touch /etc/postfix/master.cf', - 'touch /etc/postfix/mysql-virtual_alias_maps.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'touch /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'touch /etc/sasl2/smtpd.conf', - 'chown root:0 /etc/postfix/main.cf', - 'chown root:0 /etc/postfix/master.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_alias_maps.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'chown root:0 /etc/sasl2/smtpd.conf', - 'chmod 0600 /etc/postfix/main.cf', - 'chmod 0600 /etc/postfix/master.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_alias_maps.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_domains.cf', - 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'chmod 0600 /etc/sasl2/smtpd.conf' - ), - 'restart' => Array - ( - 'rc-update add postfix default', - '/etc/init.d/postfix restart' - ) - ), - 'proftpd' => Array - ( - 'label' => 'ProFTPd (FTP)', - 'files' => Array - ( - 'etc_proftpd_proftpd.conf' => '/etc/proftpd/proftpd.conf' - ), - 'commands' => Array - ( - 'touch /etc/proftpd/proftpd.conf', - 'chown root:0 /etc/proftpd/proftpd.conf', - 'chmod 0600 /etc/proftpd/proftpd.conf' - ), - 'restart' => Array - ( - 'rc-update add proftpd default', - '/etc/init.d/proftpd restart' - ) - ), - 'cron' => Array - ( - 'label' => 'Crond (cronscript)', - 'files' => Array - ( - 'etc_php_syscp-cronjob_php.ini' => '/etc/php/syscp-cronjob/php.ini', - 'etc_cron.d_syscp' => '/etc/cron.d/syscp' - ), - 'commands' => Array - ( - 'touch /etc/cron.d/syscp', - 'chown root:0 /etc/cron.d/syscp', - 'chmod 0640 /etc/cron.d/syscp', - 'mkdir -p /etc/php/syscp-cronjob', - 'touch /etc/php/syscp-cronjob/php.ini', - 'chown -R root:0 /etc/php/syscp-cronjob', - 'chmod 0750 /etc/php/syscp-cronjob', - 'chmod 0640 /etc/php/syscp-cronjob/php.ini' - ), - 'restart' => Array - ( - 'rc-update add vixie-cron default', - '/etc/init.d/vixie-cron restart' - ) - ) - ) - ) - ); - - /*echo '<pre>'; - print_r($configfiles); - echo '</pre>';*/ - - if( ($page == 'configfiles' || $page == 'overview') && $userinfo['change_serversettings'] == '1') - { - if(isset($_GET['distribution']) && $_GET['distribution']!='' && isset($configfiles[$_GET['distribution']]) && is_array($configfiles[$_GET['distribution']]) && - isset($_GET['daemon']) && $_GET['daemon']!='' && isset($configfiles[$_GET['distribution']]['daemons'][$_GET['daemon']]) && is_array($configfiles[$_GET['distribution']]['daemons'][$_GET['daemon']])) - { - $distribution = addslashes($_GET['distribution']); - $daemon = addslashes($_GET['daemon']); - - if(isset($configfiles[$distribution]['daemons'][$daemon]['commands']) && is_array($configfiles[$distribution]['daemons'][$daemon]['commands'])) - { - $commands = implode("\n", $configfiles[$distribution]['daemons'][$daemon]['commands']); - } - else - { - $commands = ''; - } - - $replace_arr = Array - ( - '<SQL_UNPRIVILEGED_USER>' => $sql['user'], - '<SQL_UNPRIVILEGED_PASSWORD>' => 'MYSQL_PASSWORD', - '<SQL_DB>' => $sql['db'], - '<SQL_HOST>' => $sql['host'], - '<SERVERNAME>' => $settings['system']['hostname'], - '<SERVERIP>' => $settings['system']['ipaddress'], - '<VIRTUAL_MAILBOX_BASE>' => $settings['system']['vmail_homedir'], - '<VIRTUAL_UID_MAPS>' => $settings['system']['vmail_uid'], - '<VIRTUAL_GID_MAPS>' => $settings['system']['vmail_gid'] - ); - $files = ''; - if(isset($configfiles[$distribution]['daemons'][$daemon]['files']) && is_array($configfiles[$distribution]['daemons'][$daemon]['files'])) - { - while(list($filename, $realname) = each($configfiles[$distribution]['daemons'][$daemon]['files'])) - { - $file_content = implode('', file('./templates/misc/configfiles/'.$distribution.'/'.$daemon.'/'.$filename)); - $file_content = strtr($file_content, $replace_arr); - $file_content = htmlspecialchars($file_content); - $numbrows = count(explode("\n", $file_content)); - eval("\$files.=\"".getTemplate("configfiles/configfiles_file")."\";"); - } - } - - if(isset($configfiles[$distribution]['daemons'][$daemon]['restart']) && is_array($configfiles[$distribution]['daemons'][$daemon]['restart'])) - { - $restart = implode("\n", $configfiles[$distribution]['daemons'][$daemon]['restart']); - } - else - { - $restart = ''; - } - - eval("echo \"".getTemplate("configfiles/configfiles")."\";"); - } - else - { - $distributions = ''; - while (list($distribution_name, $distribution_details) = each($configfiles)) - { - $daemons = ''; - while(list($daemon_name, $daemon_details) = each($distribution_details['daemons'])) - { - eval("\$daemons.=\"".getTemplate("configfiles/choose_daemon")."\";"); - } - eval("\$distributions.=\"".getTemplate("configfiles/choose_distribution")."\";"); - } - eval("echo \"".getTemplate("configfiles/choose")."\";"); - } - } - -?> diff --git a/syscp/patches/gentoo-config-files/nodns/syscp-1.2.13-gentoo-config-nodns-r2.tar.bz2 b/syscp/patches/gentoo-config-files/nodns/syscp-1.2.13-gentoo-config-nodns-r2.tar.bz2 Binary files differdeleted file mode 100644 index 92af781..0000000 --- a/syscp/patches/gentoo-config-files/nodns/syscp-1.2.13-gentoo-config-nodns-r2.tar.bz2 +++ /dev/null diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/ball.gif b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/ball.gif Binary files differdeleted file mode 100644 index 2a681e4..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/ball.gif +++ /dev/null diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/cambialingua.gif b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/cambialingua.gif Binary files differdeleted file mode 100644 index a9baccf..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/cambialingua.gif +++ /dev/null diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/errore.gif b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/errore.gif Binary files differdeleted file mode 100644 index 694a789..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/errore.gif +++ /dev/null diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/finesezione.gif b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/finesezione.gif Binary files differdeleted file mode 100644 index 5e26ce7..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/finesezione.gif +++ /dev/null diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/footer.gif b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/footer.gif Binary files differdeleted file mode 100644 index ab1a51a..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/footer.gif +++ /dev/null diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/header.gif b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/header.gif Binary files differdeleted file mode 100644 index 7737ca0..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/header.gif +++ /dev/null diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/header_r.gif b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/header_r.gif Binary files differdeleted file mode 100644 index 16a8ee2..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/header_r.gif +++ /dev/null diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/login.gif b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/login.gif Binary files differdeleted file mode 100644 index 07c8014..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/login.gif +++ /dev/null diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/logininterno.gif b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/logininterno.gif Binary files differdeleted file mode 100644 index 4a368c3..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/logininterno.gif +++ /dev/null diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/ombra.gif b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/ombra.gif Binary files differdeleted file mode 100644 index 7805f7f..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/ombra.gif +++ /dev/null diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/order_asc.gif b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/order_asc.gif Binary files differdeleted file mode 100644 index 470e978..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/order_asc.gif +++ /dev/null diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/order_desc.gif b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/order_desc.gif Binary files differdeleted file mode 100644 index a2d17da..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/order_desc.gif +++ /dev/null diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/sezione.gif b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/sezione.gif Binary files differdeleted file mode 100644 index bd67ead..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/sezione.gif +++ /dev/null diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/sottosezione.gif b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/sottosezione.gif Binary files differdeleted file mode 100644 index 1396bc3..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/sottosezione.gif +++ /dev/null diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/titolo.gif b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/titolo.gif Binary files differdeleted file mode 100644 index c686057..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/titolo.gif +++ /dev/null diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/valid-xhtml10 b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/valid-xhtml10 Binary files differdeleted file mode 100644 index 2275ee6..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/valid-xhtml10 +++ /dev/null diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/vcss b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/vcss Binary files differdeleted file mode 100644 index 020c75a..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/images/vcss +++ /dev/null diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/admins/admins.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/admins/admins.tpl deleted file mode 100644 index d411bff..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/admins/admins.tpl +++ /dev/null @@ -1,29 +0,0 @@ -$header - <table cellpadding="5" cellspacing="0" border="0" align="center" class="install_tabella"> - <tr> - <td colspan="9" class="install_titolo"><b><img src="../images/titolo.gif" alt="" /> {$lng['admin']['admins']}</b></td> - </tr> - <tr> - <td class="campodisplay_bordosx">ID <a href="admin_admins.php?page=admins&sortby=loginname&sortorder=desc&s=$s"><img src="../images/order_desc.gif" border="0" alt="" /></a><a href="admin_admins.php?page=admins&sortby=loginname&sortorder=asc&s=$s"><img src="../images/order_asc.gif" border="0" alt="" /></a></td> - <td class="campodisplay">{$lng['customer']['name']} <a href="admin_admins.php?page=admins&sortby=name&sortorder=desc&s=$s"><img src="../images/order_desc.gif" border="0" alt="" /></a><a href="admin_admins.php?page=admins&sortby=name&sortorder=asc&s=$s"><img src="../images/order_asc.gif" border="0" alt="" /></a></td> - <td class="campodisplay">{$lng['admin']['customers']}<br />{$lng['admin']['domains']}</td> - <td class="campodisplay">Space<br />Traffic</td> - <td class="campodisplay">MySQL<br />FTP</td> - <td class="campodisplay">eMails<br />Subdomains</td> - <td class="campodisplay">Accounts<br />Forwarders</td> - <td class="campodisplay">Active <a href="admin_admins.php?page=admins&sortby=deactivated&sortorder=desc&s=$s"><img src="../images/order_desc.gif" border="0" alt="" /></a><a href="admin_admins.php?page=admins&sortby=deactivated&sortorder=asc&s=$s"><img src="../images/order_asc.gif" border="0" alt="" /></a></td> - <td class="campodisplay"> </td> - </tr> - $admins - <if 0 < $pages> - <tr> - <td colspan="9" class="campodisplay">{$paging}</td> - </tr> - </if> - <tr> - <td colspan="9" class="campodisplay_bordosx"><a href="$filename?page=$page&action=add&s=$s">{$lng['admin']['admin_add']}</a></td> - </tr> - </table> - <br /> - <br /> -$footer diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/admins/admins_add.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/admins/admins_add.tpl deleted file mode 100644 index 112e6b1..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/admins/admins_add.tpl +++ /dev/null @@ -1,89 +0,0 @@ -$header - <form method="post" action="$filename"> - <input type="hidden" name="s" value="$s" /> - <input type="hidden" name="page" value="$page" /> - <input type="hidden" name="action" value="$action" /> - <table cellpadding="5" cellspacing="4" border="0" align="center" class="install_tabella_60"> - <tr> - <td class="install_titolo" colspan="2"><b><img src="../images/titolo.gif" alt="" /> {$lng['admin']['admin_add']}</b></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['login']['username']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="loginname" value="" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['name']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="name" value="" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['email']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="email" value="" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['login']['language']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><select class="tendina_nobordo" name="def_language">$language_options</select></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['admin']['change_serversettings']}</td> - <td class="install_campodisplay" nowrap="nowrap">$change_serversettings</td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['admin']['customers']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="customers" value="0" maxlength="9" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['admin']['customers_see_all']}</td> - <td class="install_campodisplay" nowrap="nowrap">$customers_see_all</td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['admin']['domains']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="domains" value="0" maxlength="9" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['admin']['domains_see_all']}</td> - <td class="install_campodisplay" nowrap="nowrap">$domains_see_all</td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['diskspace']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="diskspace" value="0" maxlength="6" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['traffic']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="traffic" value="0" maxlength="3" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['subdomains']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="subdomains" value="0" maxlength="9" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['emails']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="emails" value="0" maxlength="9" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['accounts']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="email_accounts" value="0" maxlength="9" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['forwarders']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="email_forwarders" value="0" maxlength="9" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['ftps']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="ftps" value="0" maxlength="9" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['mysqls']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="mysqls" value="0" maxlength="9" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['login']['password']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="password" name="password" value="" /></td> - </tr> - <tr> - <td class="install_confermacampo" colspan="2"><input type="hidden" name="send" value="send" /><input class="bottone" type="submit" value="{$lng['panel']['save']}" /></td> - </tr> - </table> - </form> - <br /> - <br /> -$footer
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/admins/admins_admin.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/admins/admins_admin.tpl deleted file mode 100644 index dd42ebf..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/admins/admins_admin.tpl +++ /dev/null @@ -1,11 +0,0 @@ -<tr> - <td class="nomecampo_bordosx">{$row['loginname']}</td> - <td class="nomecampo">{$row['name']}</td> - <td class="nomecampo"><b><font color="green">{$row['customers_used']}</font></b>/<b><font color="#FD6204">{$row['customers']}</font></b><br /><b><font color="green">{$row['domains_used']}</font></b>/<b><font color="#FD6204">{$row['domains']}</font></b></td> - <td class="nomecampo"><b><font color="green">{$row['diskspace_used']}</font></b>/<b><font color="#FD6204">{$row['diskspace']}</font></b> (MB)<br /><b><font color="green">{$row['traffic_used']}</font></b>/<b><font color="#FD6204">{$row['traffic']}</font></b> (GB)</td> - <td class="nomecampo"><b><font color="green">{$row['mysqls_used']}</font></b>/<b><font color="#FD6204">{$row['mysqls']}</font></b><br /><b><font color="green">{$row['ftps_used']}</font></b>/<b><font color="#FD6204">{$row['ftps']}</font></b></td> - <td class="nomecampo"><b><font color="green">{$row['emails_used']}</font></b>/<b><font color="#FD6204">{$row['emails']}</font></b><br /><b><font color="green">{$row['subdomains_used']}</font></b>/<b><font color="#FD6204">{$row['subdomains']}</font></b></td> - <td class="nomecampo"><b><font color="green">{$row['email_accounts_used']}</font></b>/<b><font color="#FD6204">{$row['email_accounts']}</font></b><br /><b><font color="green">{$row['email_forwarders_used']}</font></b>/<b><font color="#FD6204">{$row['email_forwarders']}</font></b></td> - <td class="nomecampo">{$row['deactivated']}</td> - <td class="nomecampo"><a href="$filename?s=$s&page=$page&action=delete&id={$row['adminid']}">{$lng['panel']['delete']}</a><br /><a href="$filename?s=$s&page=$page&action=edit&id={$row['adminid']}">{$lng['panel']['edit']}</a></td> -</tr>
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/admins/admins_edit.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/admins/admins_edit.tpl deleted file mode 100644 index 245f6c9..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/admins/admins_edit.tpl +++ /dev/null @@ -1,94 +0,0 @@ -$header - <form method="post" action="$filename"> - <input type="hidden" name="s" value="$s" /> - <input type="hidden" name="page" value="$page" /> - <input type="hidden" name="action" value="$action" /> - <input type="hidden" name="id" value="$id" /> - <table cellpadding="5" cellspacing="4" border="0" align="center" class="install_tabella_60"> - <tr> - <td class="install_titolo" colspan="2"><b><img src="../images/titolo.gif" alt="" /> {$lng['admin']['admin_edit']}</b></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['login']['username']}:</td> - <td class="install_campodisplay" nowrap="nowrap">{$result['loginname']}</td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['name']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="name" value="{$result['name']}" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['email']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="email" value="{$result['email']}" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['login']['language']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><select class="tendina_nobordo" name="def_language">$language_options</select></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['admin']['change_serversettings']}</td> - <td class="install_campodisplay" nowrap="nowrap">$change_serversettings</td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['admin']['customers']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="customers" value="{$result['customers']}" maxlength="9" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['admin']['customers_see_all']}</td> - <td class="install_campodisplay" nowrap="nowrap">$customers_see_all</td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['admin']['domains']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="domains" value="{$result['domains']}" maxlength="9" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['admin']['domains_see_all']}</td> - <td class="install_campodisplay" nowrap="nowrap">$domains_see_all</td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['diskspace']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="diskspace" value="{$result['diskspace']}" maxlength="6" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['traffic']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="traffic" value="{$result['traffic']}" maxlength="3" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['subdomains']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="subdomains" value="{$result['subdomains']}" maxlength="9" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['emails']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="emails" value="{$result['emails']}" maxlength="9" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['accounts']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="email_accounts" value="{$result['email_accounts']}" maxlength="9" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['forwarders']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="email_forwarders" value="{$result['email_forwarders']}" maxlength="9" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['ftps']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="ftps" value="{$result['ftps']}" maxlength="9" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['mysqls']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="mysqls" value="{$result['mysqls']}" maxlength="9" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['admin']['deactivated_user']}?</td> - <td class="install_campodisplay" nowrap="nowrap">$deactivated</td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['login']['password']} ({$lng['panel']['emptyfornochanges']}):</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="password" name="newpassword" value="" /></td> - </tr> - <tr> - <td class="install_confermacampo" colspan="2"><input type="hidden" name="send" value="send" /><input class="bottone" type="submit" value="{$lng['panel']['save']}" /></td> - </tr> - </table> - </form> - <br /> - <br /> -$footer
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/configfiles/choose.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/configfiles/choose.tpl deleted file mode 100644 index 1bb6450..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/configfiles/choose.tpl +++ /dev/null @@ -1,10 +0,0 @@ -$header - <table cellpadding="5" cellspacing="0" border="0" align="center" class="install_tabella_40"> - <tr> - <td class="install_titolo"><b><img src="../images/titolo.gif" alt="" /> {$lng['admin']['configfiles']['serverconfiguration']}</b></td> - </tr> - $distributions - </table> - <br /> - <br /> -$footer
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/configfiles/choose_daemon.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/configfiles/choose_daemon.tpl deleted file mode 100644 index bc0d257..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/configfiles/choose_daemon.tpl +++ /dev/null @@ -1,2 +0,0 @@ - » <a href="$filename?distribution=$distribution_name&daemon=$daemon_name&s=$s">{$daemon_details['label']}</a> -<br />
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/configfiles/choose_distribution.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/configfiles/choose_distribution.tpl deleted file mode 100644 index cfb64d6..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/configfiles/choose_distribution.tpl +++ /dev/null @@ -1,12 +0,0 @@ -<tr> - <td class="campodisplay_bordosx"> - <table cellpadding="5" cellspacing="0" border="0" align="center"> - <tr> - <td class="install_titolo">» {$distribution_details['label']}</td> - </tr> - <tr> - <td class="nomecampo_bordosx">$daemons</td> - </tr> - </table> - </td> -</tr>
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/configfiles/configfiles.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/configfiles/configfiles.tpl deleted file mode 100644 index 27360f7..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/configfiles/configfiles.tpl +++ /dev/null @@ -1,24 +0,0 @@ -$header - <table cellpadding="5" cellspacing="0" border="0" align="center" class="install_tabella_60"> - <tr> - <td class="install_titolo"><b><img src="../images/titolo.gif" alt="" /> {$configfiles[$distribution]['daemons'][$daemon]['label']}</b></td> - </tr> - <if $commands != ''> - <tr> - <td class="campodisplay_bordosx">{$lng['admin']['configfiles']['commands']}<br /><br /><textarea class="textarea_bordo" rows="6" cols="70" readonly="readonly">$commands</textarea></td> - </tr> - </if> - <if $files != ''> - <tr> - <td class="campodisplay_bordosx">{$lng['admin']['configfiles']['files']}<br />{$files}</td> - </tr> - </if> - <if $restart != ''> - <tr> - <td class="campodisplay_bordosx">{$lng['admin']['configfiles']['restart']}<br /><br /><textarea class="textarea_bordo" rows="3" cols="70" readonly="readonly">$restart</textarea></td> - </tr> - </if> - </table> - <br /> - <br /> -$footer
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/configfiles/configfiles_file.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/configfiles/configfiles_file.tpl deleted file mode 100644 index 1d57e10..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/configfiles/configfiles_file.tpl +++ /dev/null @@ -1 +0,0 @@ -<p><b>$realname:</b><br /><textarea class="textarea_bordo" rows="<if $numbrows <= 8 >{$numbrows}</if><if 8 < $numbrows >8</if>" cols="70" readonly="readonly">$file_content</textarea></p>
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/customers/customers.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/customers/customers.tpl deleted file mode 100644 index 2851d7f..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/customers/customers.tpl +++ /dev/null @@ -1,39 +0,0 @@ -$header - <table cellpadding="5" cellspacing="0" border="0" align="center" class="install_tabella"> - <tr> - <td colspan="10" class="install_titolo"><b><img src="../images/titolo.gif" alt="" /> {$lng['admin']['customers']}</b></td> - </tr> - <if ($userinfo['customers_used'] < $userinfo['customers'] || $userinfo['customers'] == '-1') && 15 < $userinfo['customers_used']> - <tr> - <td colspan="10" class="campodisplay_bordosx"><a href="$filename?page=$page&action=add&s=$s">{$lng['admin']['customer_add']}</a></td> - </tr> - </if> - <tr> - <td class="campodisplay_bordosx">ID <a href="admin_customers.php?page=customers&sortby=loginname&sortorder=desc&s=$s"><img src="../images/order_desc.gif" border="0" alt="" /></a><a href="admin_customers.php?page=customers&sortby=loginname&sortorder=asc&s=$s"><img src="../images/order_asc.gif" border="0" alt="" /></a></td> - <if $userinfo['customers_see_all']> - <td class="campodisplay">{$lng['admin']['admin']} <a href="admin_customers.php?page=customers&sortby=adminid&sortorder=desc&s=$s"><img src="../images/order_desc.gif" border="0" alt="" /></a><a href="admin_customers.php?page=customers&sortby=adminid&sortorder=asc&s=$s"><img src="../images/order_asc.gif" border="0" alt="" /></a></td> - </if> - <td class="campodisplay">{$lng['customer']['name']}</td> - <td class="campodisplay">Domains</td> - <td class="campodisplay">Space Traffic</td> - <td class="campodisplay">MySQL<br />FTP</td> - <td class="campodisplay">eMails<br />Subdomains</td> - <td class="campodisplay">Accounts<br />Forwarders</td> - <td class="campodisplay">Active <a href="admin_customers.php?page=customers&sortby=deactivated&sortorder=desc&s=$s"><img src="../images/order_desc.gif" border="0" alt="" /></a><a href="admin_customers.php?page=customers&sortby=deactivated&sortorder=asc&s=$s"><img src="../images/order_asc.gif" border="0" alt="" /></a></td> - <td class="campodisplay"> </td> - </tr> - $customers - <if 0 < $pages> - <tr> - <td colspan="10" class="campodisplay">{$paging}</td> - </tr> - </if> - <if $userinfo['customers_used'] < $userinfo['customers'] || $userinfo['customers'] == '-1'> - <tr> - <td colspan="10" class="campodisplay_bordosx"><a href="$filename?page=$page&action=add&s=$s">{$lng['admin']['customer_add']}</a></td> - </tr> - </if> - </table> - <br /> - <br /> -$footer diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/customers/customers_add.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/customers/customers_add.tpl deleted file mode 100644 index 977ae7e..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/customers/customers_add.tpl +++ /dev/null @@ -1,109 +0,0 @@ -$header - <form method="post" action="$filename"> - <input type="hidden" name="s" value="$s" /> - <input type="hidden" name="page" value="$page" /> - <input type="hidden" name="action" value="$action" /> - <table cellpadding="5" cellspacing="4" border="0" align="center" class="install_tabella_60"> - <tr> - <td class="install_titolo" colspan="2"><b><img src="../images/titolo.gif" alt="" /> {$lng['admin']['customer_add']}</b></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['login']['username']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="loginname" value="" maxlength="10" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['name']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="name" value="" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['firstname']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="firstname" value="" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['company']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="company" value="" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['street']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="street" value="" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['zipcode']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="zipcode" value="" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['city']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="city" value="" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['phone']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="phone" value="" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['fax']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="fax" value="" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['email']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="email" value="" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['customernumber']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="customernumber" value="" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['login']['language']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><select class="tendina_nobordo" name="def_language">$language_options</select></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['diskspace']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="diskspace" value="0" maxlength="6" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['traffic']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="traffic" value="0" maxlength="3" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['subdomains']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="subdomains" value="0" maxlength="9" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['emails']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="emails" value="0" maxlength="9" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['accounts']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="email_accounts" value="0" maxlength="9" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['forwarders']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="email_forwarders" value="0" maxlength="9" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['ftps']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="ftps" value="0" maxlength="9" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['mysqls']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="mysqls" value="0" maxlength="9" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['admin']['stdsubdomain_add']}?</td> - <td class="install_campodisplay" nowrap="nowrap">$createstdsubdomain</td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['login']['password']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="password" name="password" value="" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['admin']['sendpassword']}?</td> - <td class="install_campodisplay" nowrap="nowrap">$sendpassword</td> - </tr> - <tr> - <td class="install_confermacampo" colspan="2"><input type="hidden" name="send" value="send" /><input class="bottone" type="submit" value="{$lng['panel']['save']}" /></td> - </tr> - </table> - </form> - <br /> - <br /> -$footer
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/customers/customers_customer.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/customers/customers_customer.tpl deleted file mode 100644 index 9233b0e..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/customers/customers_customer.tpl +++ /dev/null @@ -1,18 +0,0 @@ -<tr> - <td class="nomecampo_bordosx"><a href="$filename?s=$s&page=$page&action=su&id={$row['customerid']}" target="_blank">{$row['loginname']}</a></td> - <if $userinfo['customers_see_all']> - <td class="nomecampo">{$row['adminname']}</td> - </if> - <td class="nomecampo">{$row['name']}<br />{$row['firstname']}</td> - <td class="nomecampo">{$row['domains']}</td> - <td class="nomecampo"> - <span<if $row['diskspace'] < $row['diskspace_used'] && $row['diskspace'] != 'UL'> style="color:red"</if><if $row['diskspace_used'] < $row['diskspace'] || $row['diskspace'] == 'UL'> style="color:green"</if>><b>{$row['diskspace_used']}</b>/<b><font color="#FD6204">{$row['diskspace']}</font></b></span> (MB) - <br /> - <span<if $row['traffic'] < $row['traffic_used'] && $row['traffic'] != 'UL'> style="color:red"</if><if $row['traffic_used'] < $row['traffic'] || $row['traffic'] == 'UL'> style="color:green"</if>><b>{$row['traffic_used']}</b>/<b><font color="#FD6204">{$row['traffic']}</font></b></span> (GB) - </td> - <td class="nomecampo"><b><font color="green">{$row['mysqls_used']}</font></b>/<b><font color="#FD6204">{$row['mysqls']}</font></b><br /><b><font color="green">{$row['ftps_used']}</font></b>/<b><font color="#FD6204">{$row['ftps']}</font></b></td> - <td class="nomecampo"><b><font color="green">{$row['emails_used']}</font></b>/<b><font color="#FD6204">{$row['emails']}</font></b><br /><b><font color="green">{$row['subdomains_used']}</font></b>/<b><font color="#FD6204">{$row['subdomains']}</font></b></td> - <td class="nomecampo"><b><font color="green">{$row['email_accounts_used']}</font></b>/<b><font color="#FD6204">{$row['email_accounts']}</font></b><br /><b><font color="green">{$row['email_forwarders_used']}</font></b>/<b><font color="#FD6204">{$row['email_forwarders']}</font></b></td> - <td class="nomecampo"><center>{$row['deactivated']}</center></td> - <td class="nomecampo"><a href="$filename?s=$s&page=$page&action=delete&id={$row['customerid']}">{$lng['panel']['delete']}</a><br /><a href="$filename?s=$s&page=$page&action=edit&id={$row['customerid']}">{$lng['panel']['edit']}</a></td> -</tr> diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/customers/customers_edit.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/customers/customers_edit.tpl deleted file mode 100644 index 297b966..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/customers/customers_edit.tpl +++ /dev/null @@ -1,114 +0,0 @@ -$header - <form method="post" action="$filename"> - <input type="hidden" name="s" value="$s" /> - <input type="hidden" name="page" value="$page" /> - <input type="hidden" name="action" value="$action" /> - <input type="hidden" name="id" value="$id" /> - <table cellpadding="5" cellspacing="4" border="0" align="center" class="install_tabella_60"> - <tr> - <td class="install_titolo" colspan="2"><b><img src="../images/titolo.gif" alt="" /> {$lng['admin']['customer_edit']}</b></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['login']['username']}:</td> - <td class="install_campodisplay" nowrap="nowrap">{$result['loginname']}</td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['documentroot']}:</td> - <td class="install_campodisplay" nowrap="nowrap">{$result['documentroot']}</td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['name']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="name" value="{$result['name']}" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['firstname']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="firstname" value="{$result['firstname']}" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['company']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="company" value="{$result['company']}" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['street']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="street" value="{$result['street']}" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['zipcode']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="zipcode" value="{$result['zipcode']}" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['city']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="city" value="{$result['city']}" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['phone']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="phone" value="{$result['phone']}" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['fax']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="fax" value="{$result['fax']}" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['email']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="email" value="{$result['email']}" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['customernumber']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="customernumber" value="{$result['customernumber']}" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['login']['language']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><select class="tendina_nobordo" name="def_language">$language_options</select></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['diskspace']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="diskspace" value="{$result['diskspace']}" maxlength="6" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['traffic']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="traffic" value="{$result['traffic']}" maxlength="3" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['subdomains']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="subdomains" value="{$result['subdomains']}" maxlength="9" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['emails']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="emails" value="{$result['emails']}" maxlength="9" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['accounts']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="email_accounts" value="{$result['email_accounts']}" maxlength="9" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['forwarders']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="email_forwarders" value="{$result['email_forwarders']}" maxlength="9" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['ftps']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="ftps" value="{$result['ftps']}" maxlength="9" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['mysqls']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="mysqls" value="{$result['mysqls']}" maxlength="9" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['admin']['stdsubdomain_add']}?<br />({$result['loginname']}.{$settings['system']['hostname']})</td> - <td class="install_campodisplay" nowrap="nowrap">$createstdsubdomain</td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['admin']['deactivated_user']}?</td> - <td class="install_campodisplay" nowrap="nowrap">$deactivated</td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['login']['password']} ({$lng['panel']['emptyfornochanges']}):</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="password" name="newpassword" value="" /></td> - </tr> - <tr> - <td class="install_confermacampo" colspan="2"><input type="hidden" name="send" value="send" /><input class="bottone" type="submit" value="{$lng['panel']['save']}" /></td> - </tr> - </table> - </form> - <br /> - <br /> -$footer
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/domains/domains.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/domains/domains.tpl deleted file mode 100644 index d2ac311..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/domains/domains.tpl +++ /dev/null @@ -1,32 +0,0 @@ -$header - <table cellpadding="5" cellspacing="0" border="0" align="center" class="install_tabella"> - <tr> - <td class="install_titolo" colspan="6"><b><img src="../images/titolo.gif" alt="" /> {$lng['admin']['domains']}</b></td> - </tr> - <if ($userinfo['domains_used'] < $userinfo['domains'] || $userinfo['domains'] == '-1') && 15 < $userinfo['domains_used']> - <tr> - <td class="campodisplay_bordosx" colspan="6"><a href="$filename?page=$page&action=add&s=$s">{$lng['admin']['domain_add']}</a></td> - </tr> - </if> - <tr> - <td class="campodisplay_bordosx">ID <a href="admin_domains.php?page=domains&sortby=id&sortorder=desc&s=$s"><img src="../images/order_desc.gif" border="0" alt="" /></a><a href="admin_domains.php?page=domains&sortby=id&sortorder=asc&s=$s"><img src="../images/order_asc.gif" border="0" alt="" /></a></td> - <td class="campodisplay">Domain <a href="admin_domains.php?page=domains&sortby=domain&sortorder=desc&s=$s"><img src="../images/order_desc.gif" border="0" alt="" /></a><a href="admin_domains.php?page=domains&sortby=domain&sortorder=asc&s=$s"><img src="../images/order_asc.gif" border="0" alt="" /></a></td> - <td class="campodisplay">{$lng['admin']['ipsandports']['ip']} <a href="admin_domains.php?page=domains&sortby=ip&sortorder=desc&s=$s"><img src="../images/order_desc.gif" border="0" alt="" /></a><a href="admin_domains.php?page=domains&sortby=ip&sortorder=asc&s=$s"><img src="../images/order_asc.gif" border="0" alt="" /></a></td> - <td class="campodisplay">{$lng['admin']['customer']} <a href="admin_domains.php?page=domains&sortby=loginname&sortorder=desc&s=$s"><img src="../images/order_desc.gif" border="0" alt="" /></a><a href="admin_domains.php?page=domains&sortby=loginname&sortorder=asc&s=$s"><img src="../images/order_asc.gif" border="0" alt="" /></a></td> - <td class="campodisplay" colspan="2"> </td> - </tr> - $domains - <if 0 < $pages> - <tr> - <td colspan="6" class="campodisplay">{$paging}</td> - </tr> - </if> - <if $userinfo['domains_used'] < $userinfo['domains'] || $userinfo['domains'] == '-1'> - <tr> - <td class="campodisplay_bordosx" colspan="6"><a href="$filename?page=$page&action=add&s=$s">{$lng['admin']['domain_add']}</a></td> - </tr> - </if> - </table> - <br /> - <br /> -$footer diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/domains/domains_add.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/domains/domains_add.tpl deleted file mode 100644 index ee29269..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/domains/domains_add.tpl +++ /dev/null @@ -1,77 +0,0 @@ -$header - <form method="post" action="$filename"> - <input type="hidden" name="s" value="$s" /> - <input type="hidden" name="page" value="$page" /> - <input type="hidden" name="action" value="$action" /> - <table cellpadding="5" cellspacing="4" border="0" align="center" class="install_tabella"> - <tr> - <td class="install_titolo" colspan="2"><b><img src="../images/titolo.gif" alt="" /> {$lng['admin']['domain_add']}</b></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['admin']['customer']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><select class="tendina_nobordo" name="customerid">$customers</select></td> - </tr> - <tr> - <td class="install_nomecampo">Domain:</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="domain" value="" size="60" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['domains']['aliasdomain']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><select class="tendina_nobordo" name="alias">$domains</select></td> - </tr> - <if $userinfo['change_serversettings'] == '1'> - <tr> - <td class="install_nomecampo">DocumentRoot:<br />({$lng['panel']['emptyfordefault']})</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="documentroot" value="" size="60" /></td> - </tr> - <tr> - <td class="install_nomecampo">IP/Port:</td> - <td class="install_campodisplay" nowrap="nowrap"><select name="ipandport">$ipsandports</select></td> - </tr> - <tr> - <td class="install_nomecampo">Nameserver:</td> - <td class="install_campodisplay" nowrap="nowrap">$isbinddomain</td> - </tr> - <tr> - <td class="install_nomecampo">Zonefile:<br />({$lng['panel']['emptyfordefault']})</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="zonefile" value="" size="60" /></td> - </tr> - </if> - <tr> - <td class="install_nomecampo">Emaildomain:</td> - <td class="install_campodisplay" nowrap="nowrap">$isemaildomain</td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['admin']['subdomainforemail']}:</td> - <td class="install_campodisplay" nowrap="nowrap">$subcanemaildomain</td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['admin']['domain_edit']}:</td> - <td class="install_campodisplay" nowrap="nowrap">$caneditdomain</td> - </tr> - <if $userinfo['change_serversettings'] == '1'> - <tr> - <td class="install_nomecampo">OpenBasedir:</td> - <td class="install_campodisplay" nowrap="nowrap">$openbasedir</td> - </tr> - <tr> - <td class="install_nomecampo">Safemode:</td> - <td class="install_campodisplay" nowrap="nowrap">$safemode</td> - </tr> - <tr> - <td class="install_nomecampo">Speciallogfile:</td> - <td class="install_campodisplay" nowrap="nowrap">$speciallogfile</td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['admin']['ownvhostsettings']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><textarea class="textarea_nobordo" rows="12" cols="60" name="specialsettings"></textarea></td> - </tr> - </if> - <tr> - <td class="install_confermacampo" colspan="2"><input type="hidden" name="send" value="send" /><input class="bottone" type="submit" value="{$lng['panel']['save']}" /></td> - </tr> - </table> - </form> - <br /> - <br /> -$footer diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/domains/domains_domain.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/domains/domains_domain.tpl deleted file mode 100644 index 156d25b..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/domains/domains_domain.tpl +++ /dev/null @@ -1,8 +0,0 @@ -<tr> - <td class="nomecampo_bordosx"><font size="-1">{$row['id']}</font></td> - <td class="nomecampo"><font size="-1">{$row['domain']}</font></td> - <td class="nomecampo"><font size="-1">{$row['ipandport']}</font></td> - <td class="nomecampo"><font size="-1">{$row['name']} {$row['firstname']} ({$row['loginname']})</font></td> - <td class="nomecampo"><if (!$standardsubdomain && !$aliasdomain)><a href="$filename?s=$s&page=$page&action=delete&id={$row['id']}">{$lng['panel']['delete']}</a></if> </td> - <td class="nomecampo"><a href="$filename?s=$s&page=$page&action=edit&id={$row['id']}">{$lng['panel']['edit']}</a></td> -</tr> diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/domains/domains_edit.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/domains/domains_edit.tpl deleted file mode 100644 index 894d188..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/domains/domains_edit.tpl +++ /dev/null @@ -1,80 +0,0 @@ -$header - <form method="post" action="$filename"> - <input type="hidden" name="s" value="$s" /> - <input type="hidden" name="page" value="$page" /> - <input type="hidden" name="action" value="$action" /> - <input type="hidden" name="id" value="$id" /> - <table cellpadding="5" cellspacing="4" border="0" align="center" class="install_tabella"> - <tr> - <td class="install_titolo" colspan="2"><b><img src="../images/titolo.gif" alt="" /> {$lng['admin']['domain_edit']}</b></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['admin']['customer']}:</td> - <td class="install_campodisplay" nowrap="nowrap">{$result['name']} {$result['firstname']} ({$result['loginname']})</td> - </tr> - <tr> - <td class="install_nomecampo">Domain:</td> - <td class="install_campodisplay" nowrap="nowrap">{$result['domain']}</td> - </tr> - <if $alias_check == '0'> - <tr> - <td class="install_nomecampo">{$lng['domains']['aliasdomain']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><select class="tendina_nobordo" name="alias">$domains</select></td> - </tr> - </if> - <if $userinfo['change_serversettings'] == '1'> - <tr> - <td class="install_nomecampo">DocumentRoot:<br />({$lng['panel']['emptyfordefault']})</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="documentroot" value="{$result['documentroot']}" size="60" /></td> - </tr> - <tr> - <td class="install_nomecampo">IP/Port:</td> - <td class="install_campodisplay" nowrap="nowrap"><select name="ipandport">$ipsandports</select></td> - </tr> - <tr> - <td class="install_nomecampo">Nameserver:</td> - <td class="install_campodisplay" nowrap="nowrap">$isbinddomain</td> - </tr> - <tr> - <td class="install_nomecampo">Zonefile:<br />({$lng['panel']['emptyfordefault']})</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="zonefile" value="{$result['zonefile']}" size="60" /></td> - </tr> - </if> - <tr> - <td class="install_nomecampo">Emaildomain:</td> - <td class="install_campodisplay" nowrap="nowrap">$isemaildomain</td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['admin']['subdomainforemail']}:</td> - <td class="install_campodisplay" nowrap="nowrap">$subcanemaildomain</td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['admin']['domain_edit']}:</td> - <td class="install_campodisplay" nowrap="nowrap">$caneditdomain</td> - </tr> - <if $userinfo['change_serversettings'] == '1'> - <tr> - <td class="install_nomecampo">OpenBasedir:</td> - <td class="install_campodisplay" nowrap="nowrap">$openbasedir</td> - </tr> - <tr> - <td class="install_nomecampo">Safemode:</td> - <td class="install_campodisplay" nowrap="nowrap">$safemode</td> - </tr> - <tr> - <td class="install_nomecampo">Speciallogfile:</td> - <td class="install_campodisplay" nowrap="nowrap"><b>$speciallogfile</b></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['admin']['ownvhostsettings']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><textarea class="textarea_nobordo" rows="12" cols="60" name="specialsettings">{$result['specialsettings']}</textarea></td> - </tr> - </if> - <tr> - <td class="install_confermacampo" colspan="2"><input type="hidden" name="send" value="send" /><input class="bottone" type="submit" value="{$lng['panel']['save']}" /></td> - </tr> - </table> - </form> - <br /> - <br /> -$footer diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/index/change_language.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/index/change_language.tpl deleted file mode 100644 index c2c45d9..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/index/change_language.tpl +++ /dev/null @@ -1,23 +0,0 @@ -$header - <form method="post" action="$filename"> - <input type="hidden" name="s" value="$s" /> - <input type="hidden" name="page" value="$page" /> - <table cellpadding="5" cellspacing="4" border="0" align="center" class="install_tabella_60"> - <tr> - <td class="none" rowspan="4"><img src="../images/cambialingua.gif" alt="" /></td> - </tr> - <tr> - <td class="install_titolo" colspan="2"><b><img src="../images/titolo.gif" alt="" /> {$lng['menue']['main']['changelanguage']}</b></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['login']['language']}</td> - <td class="install_campodisplay" nowrap="nowrap"><select class="tendina_nobordo" name="def_language">$language_options</select></td> - </tr> - <tr> - <td class="install_confermacampo" colspan="2"><input type="hidden" name="send" value="send" /><input class="bottone" type="submit" value="{$lng['menue']['main']['changelanguage']}" /></td> - </tr> - </table> - </form> - <br /> - <br /> -$footer
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/index/change_password.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/index/change_password.tpl deleted file mode 100644 index c4a2aa2..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/index/change_password.tpl +++ /dev/null @@ -1,31 +0,0 @@ -$header - <form method="post" action="$filename"> - <input type="hidden" name="s" value="$s" /> - <input type="hidden" name="page" value="$page" /> - <table cellpadding="5" cellspacing="4" border="0" align="center" class="install_tabella_60"> - <tr> - <td class="none" rowspan="6"><img src="../images/logininterno.gif" alt="" /></td> - </tr> - <tr> - <td class="install_titolo" colspan="2"><b><img src="../images/titolo.gif" alt="" /> {$lng['menue']['main']['changepassword']}</b></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['changepassword']['old_password']}</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="password" name="old_password" maxlength="50" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['changepassword']['new_password']}</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="password" name="new_password" maxlength="50" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['changepassword']['new_password_confirm']}</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="password" name="new_password_confirm" maxlength="50" /></td> - </tr> - <tr> - <td class="install_confermacampo" colspan="2"><input type="hidden" name="send" value="send" /><input class="bottone" type="submit" value="{$lng['menue']['main']['changepassword']}" /></td> - </tr> - </table> - </form> - <br /> - <br /> -$footer
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/index/index.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/index/index.tpl deleted file mode 100644 index d0c0937..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/index/index.tpl +++ /dev/null @@ -1,91 +0,0 @@ -$header - <table cellpadding="5" cellspacing="4" border="0" align="center" class="install_tabella"> - <tr> - <td colspan="2" class="install_titolo"><b><img src="../images/titolo.gif" alt="" /> {$lng['admin']['ressourcedetails']}</b></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['admin']['customers']}:</td> - <td class="install_campodisplay">{$overview['number_customers']} ({$userinfo['customers']})</td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['domains']}:</td> - <td class="install_campodisplay">{$overview['number_domains']} ({$userinfo['domains']})</td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['diskspace']}:</td> - <td class="install_campodisplay">{$overview['diskspace_used']} ({$userinfo['diskspace_used']}/{$userinfo['diskspace']})</td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['traffic']}:</td> - <td class="install_campodisplay">{$overview['traffic_used']} ({$userinfo['traffic_used']}/{$userinfo['traffic']})</td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['mysqls']}:</td> - <td class="install_campodisplay">{$overview['mysqls_used']} ({$userinfo['mysqls_used']}/{$userinfo['mysqls']})</td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['emails']}:</td> - <td class="install_campodisplay">{$overview['emails_used']} ({$userinfo['emails_used']}/{$userinfo['emails']})</td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['accounts']}:</td> - <td class="install_campodisplay">{$overview['email_accounts_used']} ({$userinfo['email_accounts_used']}/{$userinfo['email_accounts']})</td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['forwarders']}:</td> - <td class="install_campodisplay">{$overview['email_forwarders_used']} ({$userinfo['email_forwarders_used']}/{$userinfo['email_forwarders']})</td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['ftps']}:</td> - <td class="install_campodisplay">{$overview['ftps_used']} ({$userinfo['ftps_used']}/{$userinfo['ftps']})</td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['customer']['subdomains']}:</td> - <td class="install_campodisplay">{$overview['subdomains_used']} ({$userinfo['subdomains_used']}/{$userinfo['subdomains']})</td> - </tr> - <tr> - <td colspan="2" class="install_titolo"><b><img src="../images/titolo.gif" alt="" /> {$lng['admin']['systemdetails']}</b></td> - </tr> - <tr> - <td class="install_nomecampo">Serversoftware:</td> - <td class="install_campodisplay">{$_SERVER['SERVER_SOFTWARE']}</td> - </tr> - <tr> - <td class="install_nomecampo">PHP-Version:</td> - <td class="install_campodisplay">$phpversion</td> - </tr> - <tr> - <td class="install_nomecampo">PHP-Memory-Limit:</td> - <td class="install_campodisplay">$phpmemorylimit</td> - </tr> - <tr> - <td class="install_nomecampo">MySQL Server Version:</td> - <td class="install_campodisplay">$mysqlserverversion</td> - </tr> - <tr> - <td class="install_nomecampo">MySQL Client Version:</td> - <td class="install_campodisplay">$mysqlclientversion</td> - </tr> - <tr> - <td class="install_nomecampo">Webserver Interface:</td> - <td class="install_campodisplay">$webserverinterface</td> - </tr> - <tr> - <td colspan="2" class="install_titolo"><b><img src="../images/titolo.gif" alt="" /> {$lng['admin']['syscpdetails']}</b></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['admin']['cronlastrun']}:</td> - <td class="install_campodisplay">$cronlastrun</td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['admin']['installedversion']}:</td> - <td class="install_campodisplay">$version</td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['admin']['latestversion']}:</td> - <td class="install_campodisplay"><a href="$lookfornewversion_link">$lookfornewversion_lable</a></td> - </tr> - </table> - <br /> - <br /> -$footer diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/ipsandports/ipsandports.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/ipsandports/ipsandports.tpl deleted file mode 100644 index 8237d55..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/ipsandports/ipsandports.tpl +++ /dev/null @@ -1,30 +0,0 @@ -$header - <table cellpadding="5" cellspacing="0" border="0" align="center" class="install_tabella_60"> - <tr> - <td class="install_titolo" colspan="4"><b><img src="../images/titolo.gif" alt="" /> {$lng['admin']['ipsandports']['ipsandports']}</b></td> - </tr> - <tr> - <td class="install_confermacampo" colspan="4" nowrap="nowrap"> - <form method="post" action="$filename"> - <input type="hidden" name="s" value="$s" /> - <input type="hidden" name="page" value="$page" /> - <input type="hidden" name="action" value="$action" /> - {$lng['admin']['ipsandports']['default']}: - <select name="defaultipandport">$ipsandports_default</select> - <input type="hidden" name="send" value="send" /><input class="bottone" type="submit" value="{$lng['panel']['save']}" /> - </form> - </td> - </tr> - <tr> - <td class="campodisplay_bordosx">ID</td> - <td class="campodisplay">{$lng['admin']['ipsandports']['ipandport']}</td> - <td class="campodisplay" colspan="2"> </td> - </tr> - $ipsandports - <tr> - <td class="campodisplay_bordosx" colspan="4"><a href="$filename?page=$page&action=add&s=$s">{$lng['admin']['ipsandports']['add']}</a></td> - </tr> - </table> - <br /> - <br /> -$footer diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/ipsandports/ipsandports_add.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/ipsandports/ipsandports_add.tpl deleted file mode 100644 index 47595f9..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/ipsandports/ipsandports_add.tpl +++ /dev/null @@ -1,25 +0,0 @@ -$header - <form method="post" action="$filename"> - <input type="hidden" name="s" value="$s" /> - <input type="hidden" name="page" value="$page" /> - <input type="hidden" name="action" value="$action" /> - <table cellpadding="5" cellspacing="4" border="0" align="center" class="install_tabella_40"> - <tr> - <td class="install_titolo" colspan="2"><b><img src="../images/titolo.gif" alt="" /> {$lng['admin']['ipsandports']['add']}</b></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['admin']['ipsandports']['ip']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="ip" value="" size="15" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['admin']['ipsandports']['port']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="port" value="" size="5" /></td> - </tr> - <tr> - <td class="install_confermacampo" colspan="2"><input type="hidden" name="send" value="send" /><input class="bottone" type="submit" value="{$lng['panel']['save']}" /></td> - </tr> - </table> - </form> - <br /> - <br /> -$footer diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/ipsandports/ipsandports_edit.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/ipsandports/ipsandports_edit.tpl deleted file mode 100644 index 0fe5ab8..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/ipsandports/ipsandports_edit.tpl +++ /dev/null @@ -1,26 +0,0 @@ -$header - <form method="post" action="$filename"> - <input type="hidden" name="s" value="$s" /> - <input type="hidden" name="page" value="$page" /> - <input type="hidden" name="action" value="$action" /> - <input type="hidden" name="id" value="$id" /> - <table cellpadding="5" cellspacing="4" border="0" align="center" class="install_tabella_40"> - <tr> - <td class="install_titolo" colspan="2"><b><img src="../images/titolo.gif" alt="" /> {$lng['admin']['ipsandports']['edit']}</b></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['admin']['ipsandports']['ip']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="ip" value="{$result['ip']}" size="15" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['admin']['ipsandports']['port']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="port" value="{$result['port']}" size="5" /></td> - </tr> - <tr> - <td class="install_confermacampo" colspan="2"><input type="hidden" name="send" value="send" /><input class="bottone" type="submit" value="{$lng['panel']['save']}" /></td> - </tr> - </table> - </form> - <br /> - <br /> -$footer diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/ipsandports/ipsandports_ipandport.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/ipsandports/ipsandports_ipandport.tpl deleted file mode 100644 index c61f8bc..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/ipsandports/ipsandports_ipandport.tpl +++ /dev/null @@ -1,6 +0,0 @@ -<tr> - <td class="nomecampo_bordosx"><font size="-1">{$row['id']}</font></td> - <td class="nomecampo"><font size="-1">{$row['ip']}:{$row['port']}</font></td> - <td class="nomecampo"><a href="$filename?s=$s&page=$page&action=delete&id={$row['id']}">{$lng['panel']['delete']}</a></td> - <td class="nomecampo"><a href="$filename?s=$s&page=$page&action=edit&id={$row['id']}">{$lng['panel']['edit']}</a></td> -</tr> diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/settings/settings.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/settings/settings.tpl deleted file mode 100644 index 343d8f4..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/settings/settings.tpl +++ /dev/null @@ -1,121 +0,0 @@ -$header - <form method="post" action="$filename"> - <input type="hidden" name="s" value="$s" /> - <input type="hidden" name="page" value="$page" /> - <input type="hidden" name="action" value="$action" /> - <table cellpadding="5" cellspacing="4" border="0" align="center" class="install_tabella"> - <tr> - <td class="install_titolo" colspan="2"><b><img src="../images/titolo.gif" alt="" /> {$lng['admin']['serversettings']} {$lng['panel']['edit']}</b></td> - </tr> - <tr> - <td class="install_nomecampo"><b>{$lng['serversettings']['session_timeout']['title']}:</b><br />{$lng['serversettings']['session_timeout']['description']}</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="session_sessiontimeout" value="{$settings['session']['sessiontimeout']}" /></td> - </tr> - <tr> - <td class="install_nomecampo"><b>{$lng['serversettings']['maxloginattempts']['title']}:</b><br />{$lng['serversettings']['maxloginattempts']['description']}</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="login_maxloginattempts" value="{$settings['login']['maxloginattempts']}" /></td> - </tr> - <tr> - <td class="install_nomecampo"><b>{$lng['serversettings']['deactivatetime']['title']}:</b><br />{$lng['serversettings']['deactivatetime']['description']}</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="login_deactivatetime" value="{$settings['login']['deactivatetime']}" /></td> - </tr> - <tr> - <td class="install_nomecampo"><b>{$lng['serversettings']['accountprefix']['title']}:</b><br />{$lng['serversettings']['accountprefix']['description']}</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="customer_accountprefix" value="{$settings['customer']['accountprefix']}" /></td> - </tr> - <tr> - <td class="install_nomecampo"><b>{$lng['serversettings']['mysqlprefix']['title']}:</b><br />{$lng['serversettings']['mysqlprefix']['description']} ({$settings['customer']['accountprefix']}X{$settings['customer']['mysqlprefix']}Y)</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="customer_mysqlprefix" value="{$settings['customer']['mysqlprefix']}" /></td> - </tr> - <tr> - <td class="install_nomecampo"><b>{$lng['serversettings']['ftpprefix']['title']}:</b><br />{$lng['serversettings']['ftpprefix']['description']} ({$settings['customer']['accountprefix']}X{$settings['customer']['ftpprefix']}Y)</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="customer_ftpprefix" value="{$settings['customer']['ftpprefix']}" /></td> - </tr> - <tr> - <td class="install_nomecampo"><b>{$lng['serversettings']['documentroot_prefix']['title']}:</b><br />{$lng['serversettings']['documentroot_prefix']['description']}</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="system_documentroot_prefix" value="{$settings['system']['documentroot_prefix']}" /></td> - </tr> - <tr> - <td class="install_nomecampo"><b>{$lng['serversettings']['logfiles_directory']['title']}:</b><br />{$lng['serversettings']['logfiles_directory']['description']}</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="system_logfiles_directory" value="{$settings['system']['logfiles_directory']}" /></td> - </tr> - <tr> - <td class="install_nomecampo"><b>{$lng['serversettings']['ipaddress']['title']}:</b><br />{$lng['serversettings']['ipaddress']['description']}</td> - <td class="install_campodisplay" nowrap="nowrap"><select name="system_ipaddress">$system_ipaddress</select></td> - </tr> - <tr> - <td class="install_nomecampo"><b>{$lng['serversettings']['hostname']['title']}:</b><br />{$lng['serversettings']['hostname']['description']}</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="system_hostname" value="{$settings['system']['hostname']}" /></td> - </tr> - <tr> - <td class="install_nomecampo"><b>{$lng['serversettings']['apacheconf_directory']['title']}:</b><br />{$lng['serversettings']['apacheconf_directory']['description']}</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="system_apacheconf_directory" value="{$settings['system']['apacheconf_directory']}" /></td> - </tr> - <tr> - <td class="install_nomecampo"><b>{$lng['serversettings']['apacheconf_filename']['title']}:</b><br />{$lng['serversettings']['apacheconf_filename']['description']}</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="system_apacheconf_filename" value="{$settings['system']['apacheconf_filename']}" /></td> - </tr> - <tr> - <td class="install_nomecampo"><b>{$lng['serversettings']['apachereload_command']['title']}:</b><br />{$lng['serversettings']['apachereload_command']['description']}</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="system_apachereload_command" value="{$settings['system']['apachereload_command']}" /></td> - </tr> - <tr> - <td class="install_nomecampo"><b>{$lng['serversettings']['bindconf_directory']['title']}:</b><br />{$lng['serversettings']['bindconf_directory']['description']}</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="system_bindconf_directory" value="{$settings['system']['bindconf_directory']}" /></td> - </tr> - <tr> - <td class="install_nomecampo"><b>{$lng['serversettings']['bindreload_command']['title']}:</b><br />{$lng['serversettings']['bindreload_command']['description']}</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="system_bindreload_command" value="{$settings['system']['bindreload_command']}" /></td> - </tr> - <tr> - <td class="install_nomecampo"><b>{$lng['serversettings']['binddefaultzone']['title']}:</b><br />{$lng['serversettings']['binddefaultzone']['description']}</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="system_binddefaultzone" value="{$settings['system']['binddefaultzone']}" /></td> - </tr> - <tr> - <td class="install_nomecampo"><b>{$lng['serversettings']['vmail_uid']['title']}:</b><br />{$lng['serversettings']['vmail_uid']['description']}</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="system_vmail_uid" value="{$settings['system']['vmail_uid']}" maxlength="5" /></td> - </tr> - <tr> - <td class="install_nomecampo"><b>{$lng['serversettings']['vmail_gid']['title']}:</b><br />{$lng['serversettings']['vmail_gid']['description']}</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="system_vmail_gid" value="{$settings['system']['vmail_gid']}" maxlength="5" /></td> - </tr> - <tr> - <td class="install_nomecampo"><b>{$lng['serversettings']['vmail_homedir']['title']}:</b><br />{$lng['serversettings']['vmail_homedir']['description']}</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="system_vmail_homedir" value="{$settings['system']['vmail_homedir']}" /></td> - </tr> - <tr> - <td class="install_nomecampo"><b>{$lng['serversettings']['adminmail']['title']}:</b><br />{$lng['serversettings']['adminmail']['description']}</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="panel_adminmail" value="{$settings['panel']['adminmail']}" /></td> - </tr> - <tr> - <td class="install_nomecampo"><b>{$lng['serversettings']['paging']['title']}:</b><br />{$lng['serversettings']['paging']['description']}</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="panel_paging" value="{$settings['panel']['paging']}" /></td> - </tr> - <tr> - <td class="install_nomecampo"><b>{$lng['login']['language']}:</b><br />{$lng['serversettings']['language']['description']}</td> - <td class="install_campodisplay" nowrap="nowrap"><select class="tendina_nobordo" name="panel_standardlanguage">$languages2</select></td> - </tr> - <tr> - <td class="install_nomecampo"><b>{$lng['serversettings']['pathedit']['title']}:</b><br />{$lng['serversettings']['pathedit']['description']}</td> - <td class="install_campodisplay" nowrap="nowrap"><select class="tendina_nobordo" name="panel_pathedit">$pathedit</select></td> - </tr> - <tr> - <td class="install_nomecampo"><b>{$lng['serversettings']['phpmyadmin_url']['title']}:</b><br />{$lng['serversettings']['phpmyadmin_url']['description']}</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="panel_phpmyadmin_url" value="{$settings['panel']['phpmyadmin_url']}" /></td> - </tr> - <tr> - <td class="install_nomecampo"><b>{$lng['serversettings']['webmail_url']['title']}:</b><br />{$lng['serversettings']['webmail_url']['description']}</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="panel_webmail_url" value="{$settings['panel']['webmail_url']}" /></td> - </tr> - <tr> - <td class="install_nomecampo"><b>{$lng['serversettings']['webftp_url']['title']}:</b><br />{$lng['serversettings']['webftp_url']['description']}</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="panel_webftp_url" value="{$settings['panel']['webftp_url']}" /></td> - </tr> - <tr> - <td class="install_confermacampo" colspan="2"><input type="hidden" name="send" value="send" /><input class="bottone" type="submit" value="{$lng['panel']['save']}" /></td> - </tr> - </table> - </form> - <br /> - <br /> -$footer diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/templates/templates.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/templates/templates.tpl deleted file mode 100644 index 8b202c7..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/templates/templates.tpl +++ /dev/null @@ -1,20 +0,0 @@ -$header - <table cellpadding="5" cellspacing="0" border="0" align="center" class="install_tabella"> - <tr> - <td colspan="4" class="install_titolo"><b><img src="../images/titolo.gif" alt="" /> {$lng['admin']['templates']['templates']}</b></td> - </tr> - <tr> - <td class="campodisplay_bordosx">{$lng['login']['language']}</td> - <td class="campodisplay">{$lng['admin']['templates']['action']}</td> - <td class="campodisplay" colspan="2"> </td> - </tr> - $templates - <if $add> - <tr> - <td colspan="4" class="campodisplay_bordosx"><a href="$filename?page=$page&action=add&s=$s">{$lng['admin']['templates']['template_add']}</a></td> - </tr> - </if> - </table> - <br /> - <br /> -$footer
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/templates/templates_add_1.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/templates/templates_add_1.tpl deleted file mode 100644 index ff6c74d..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/templates/templates_add_1.tpl +++ /dev/null @@ -1,21 +0,0 @@ -$header - <form method="post" action="$filename"> - <input type="hidden" name="s" value="$s" /> - <input type="hidden" name="page" value="$page" /> - <input type="hidden" name="action" value="$action" /> - <table cellpadding="5" cellspacing="4" border="0" align="center" class="install_tabella_40"> - <tr> - <td class="install_titolo" colspan="2"><b><img src="../images/titolo.gif" alt="" /> {$lng['admin']['templates']['template_add']}</b></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['login']['language']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><select class="tendina_nobordo" name="language">$language_options</select></td> - </tr> - <tr> - <td class="install_confermacampo" colspan="2"><input type="hidden" name="prepare" value="prepare" /><input class="bottone" type="submit" value="{$lng['panel']['next']}" /></td> - </tr> - </table> - </form> - <br /> - <br /> -$footer
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/templates/templates_add_2.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/templates/templates_add_2.tpl deleted file mode 100644 index c23e688..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/templates/templates_add_2.tpl +++ /dev/null @@ -1,66 +0,0 @@ -$header - <form method="post" action="$filename"> - <input type="hidden" name="s" value="$s" /> - <input type="hidden" name="page" value="$page" /> - <input type="hidden" name="action" value="$action" /> - <table cellpadding="5" cellspacing="4" border="0" align="center" class="install_tabella"> - <tr> - <td class="install_titolo" colspan="2"><b><img src="../images/titolo.gif" alt="" /> {$lng['admin']['templates']['template_add']}</b></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['login']['language']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><b>$language</b><input type="hidden" name="language" value="$language" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['admin']['templates']['action']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><select class="tendina_nobordo" name="template">$template_options</select></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['admin']['templates']['subject']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="subject" value="" maxlength="255" size="100" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['admin']['templates']['mailbody']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><textarea class="textarea_nobordo" name="mailbody" rows="20" cols="75"></textarea></td> - </tr> - <tr> - <td class="install_confermacampo" colspan="2"><input type="hidden" name="send" value="send" /><input class="bottone" type="submit" value="{$lng['panel']['save']}" /></td> - </tr> - </table> - <br /> - <br /> - <table cellpadding="5" cellspacing="0" border="0" align="center" class="install_tabella"> - <tr> - <td class="install_titolo" colspan="2"><b> <img src="../images/titolo.gif" alt="" /> {$lng['admin']['templates']['template_replace_vars']}</b></td> - </tr> - <tr> - <td class="campodisplay_bordosx" colspan="2"><b>{$lng['admin']['templates']['createcustomer']}</b></td> - </tr> - <tr> - <td class="nomecampo_bordosx"><i>{FIRSTNAME}</i>:</td> - <td class="nomecampo">{$lng['admin']['templates']['FIRSTNAME']}</td> - </tr> - <tr> - <td class="nomecampo_bordosx"><i>{NAME}</i>:</td> - <td class="nomecampo">{$lng['admin']['templates']['NAME']}</td> - </tr> - <tr> - <td class="nomecampo_bordosx"><i>{USERNAME}</i>:</td> - <td class="nomecampo">{$lng['admin']['templates']['USERNAME']}</td> - </tr> - <tr> - <td class="nomecampo_bordosx"><i>{PASSWORD}</i>:</td> - <td class="nomecampo">{$lng['admin']['templates']['PASSWORD']}</td> - </tr> - <tr> - <td class="campodisplay_bordosx" colspan="2"><b>{$lng['admin']['templates']['pop_success']}</b></td> - </tr> - <tr> - <td class="nomecampo_bordosx"><i>{EMAIL}</i>:</td> - <td class="nomecampo">{$lng['admin']['templates']['EMAIL']}</td> - </tr> - </table> - </form> - <br /> - <br /> -$footer
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/templates/templates_edit.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/templates/templates_edit.tpl deleted file mode 100644 index 34f3778..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/templates/templates_edit.tpl +++ /dev/null @@ -1,68 +0,0 @@ -$header - <form method="post" action="$filename"> - <input type="hidden" name="s" value="$s" /> - <input type="hidden" name="page" value="$page" /> - <input type="hidden" name="action" value="$action" /> - <input type="hidden" name="subjectid" value="$subjectid" /> - <input type="hidden" name="mailbodyid" value="$mailbodyid" /> - <table cellpadding="5" cellspacing="4" border="0" align="center" class="install_tabella"> - <tr> - <td class="install_titolo" colspan="2"><b><img src="../images/titolo.gif" alt="" /> {$lng['admin']['templates']['template_edit']}</b></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['login']['language']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><b>{$result['language']}</b></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['admin']['templates']['action']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><b>$template</b></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['admin']['templates']['subject']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="subject" value="$subject" maxlength="255" size="100" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['admin']['templates']['mailbody']}: *</td> - <td class="install_campodisplay" nowrap="nowrap"><textarea class="textarea_nobordo" name="mailbody" rows="20" cols="75">$mailbody</textarea></td> - </tr> - <tr> - <td class="install_confermacampo" colspan="2"><input type="hidden" name="send" value="send" /><input class="bottone" type="submit" value="{$lng['panel']['save']}" /></td> - </tr> - </table> - <br /> - <br /> - <table cellpadding="5" cellspacing="0" border="0" align="center" class="install_tabella"> - <tr> - <td class="install_titolo" colspan="2"><b> <img src="../images/titolo.gif" alt="" /> {$lng['admin']['templates']['template_replace_vars']}</b></td> - </tr> - <tr> - <td class="campodisplay_bordosx" colspan="2"><b>{$lng['admin']['templates']['createcustomer']}</b></td> - </tr> - <tr> - <td class="nomecampo_bordosx"><i>{FIRSTNAME}</i>:</td> - <td class="nomecampo">{$lng['admin']['templates']['FIRSTNAME']}</td> - </tr> - <tr> - <td class="nomecampo_bordosx"><i>{NAME}</i>:</td> - <td class="nomecampo">{$lng['admin']['templates']['NAME']}</td> - </tr> - <tr> - <td class="nomecampo_bordosx"><i>{USERNAME}</i>:</td> - <td class="nomecampo">{$lng['admin']['templates']['USERNAME']}</td> - </tr> - <tr> - <td class="nomecampo_bordosx"><i>{PASSWORD}</i>:</td> - <td class="nomecampo">{$lng['admin']['templates']['PASSWORD']}</td> - </tr> - <tr> - <td class="campodisplay_bordosx" colspan="2"><b>{$lng['admin']['templates']['pop_success']}</b></td> - </tr> - <tr> - <td class="nomecampo_bordosx"><i>{EMAIL}</i>:</td> - <td class="nomecampo">{$lng['admin']['templates']['EMAIL']}</td> - </tr> - </table> - </form> -<br /> -<br /> -$footer
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/templates/templates_template.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/templates/templates_template.tpl deleted file mode 100644 index a5e0c2b..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/admin/templates/templates_template.tpl +++ /dev/null @@ -1,6 +0,0 @@ -<tr> - <td class="nomecampo_bordosx">{$language}</td> - <td class="nomecampo">{$template}</td> - <td class="nomecampo"><a href="$filename?s=$s&page=$page&action=delete&subjectid=$subjectid&mailbodyid=$mailbodyid">{$lng['panel']['delete']}</a></td> - <td class="nomecampo"><a href="$filename?s=$s&page=$page&action=edit&subjectid=$subjectid&mailbodyid=$mailbodyid">{$lng['panel']['edit']}</a></td> -</tr>
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/domains/domainlist.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/domains/domainlist.tpl deleted file mode 100644 index e31e042..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/domains/domainlist.tpl +++ /dev/null @@ -1,30 +0,0 @@ -$header - <table cellpadding="5" cellspacing="0" border="0" align="center" class="install_tabella"> - <tr> - <td class="install_titolo" colspan="4"><b><img src="../images/titolo.gif" alt="" /> {$lng['domains']['domainsettings']}</b></td> - </tr> - <tr> - <td class="campodisplay_bordosx">{$lng['domains']['domainname']}</td> - <td class="campodisplay">{$lng['panel']['path']}</td> - <td class="campodisplay" colspan="2"> </td> - </tr> - <if ($userinfo['subdomains_used'] < $userinfo['subdomains'] || $userinfo['subdomains'] == '-1') && 15 < $domains_count && $parentdomains_count != 0 > - <tr> - <td class="campodisplay_bordosx" colspan="4"><a href="$filename?page=domains&action=add&s=$s">{$lng['domains']['subdomain_add']}</a></td> - </tr> - </if> - $domains - <if 0 < $pages> - <tr> - <td colspan="4" class="campodisplay">{$paging}</td> - </tr> - </if> - <if ($userinfo['subdomains_used'] < $userinfo['subdomains'] || $userinfo['subdomains'] == '-1') && $parentdomains_count != 0 > - <tr> - <td class="campodisplay_bordosx" colspan="4"><a href="$filename?page=domains&action=add&s=$s">{$lng['domains']['subdomain_add']}</a></td> - </tr> - </if> - </table> - <br /> - <br /> -$footer diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/domains/domains.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/domains/domains.tpl deleted file mode 100644 index fed081b..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/domains/domains.tpl +++ /dev/null @@ -1,12 +0,0 @@ -$header - <table cellpadding="5" cellspacing="0" border="0" align="center" class="install_tabella"> - <tr> - <td class="install_titolo"><b><img src="../images/titolo.gif" alt="" /> {$lng['menue']['domains']['domains']}</b></td> - </tr> - <tr> - <td class="nomecampo_bordosx">{$lng['domains']['description']}</td> - </tr> - </table> - <br /> - <br /> -$footer
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/domains/domains_add.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/domains/domains_add.tpl deleted file mode 100644 index a75f21e..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/domains/domains_add.tpl +++ /dev/null @@ -1,29 +0,0 @@ -$header - <form method="post" action="$filename"> - <input type="hidden" name="s" value="$s" /> - <input type="hidden" name="page" value="$page" /> - <input type="hidden" name="action" value="$action" /> - <table cellpadding="5" cellspacing="4" border="0" align="center" class="install_tabella_60"> - <tr> - <td class="install_titolo" colspan="2"><b><img src="../images/titolo.gif" alt="" /> {$lng['domains']['subdomain_add']}</b></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['domains']['domainname']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="subdomain" value="" size="15" maxlength="50" /> <b>.</b> <select class="tendina_nobordo" name="domain">$domains</select></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['domains']['aliasdomain']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><select class="tendina_nobordo" name="alias">$aliasdomains</select></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['panel']['path']}:</td> - <td class="install_campodisplay" nowrap="nowrap">{$pathSelect}</td> - </tr> - <tr> - <td class="install_confermacampo" colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottone" value="{$lng['domains']['subdomain_add']}" /></td> - </tr> - </table> - </form> - <br /> - <br /> -$footer
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/domains/domains_delimiter.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/domains/domains_delimiter.tpl deleted file mode 100644 index dd3e5ba..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/domains/domains_delimiter.tpl +++ /dev/null @@ -1,3 +0,0 @@ -<tr> - <td class="titolo" colspan="4"> <b>{$row['domain']}</b></td> -</tr>
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/domains/domains_domain.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/domains/domains_domain.tpl deleted file mode 100644 index 8df2e43..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/domains/domains_domain.tpl +++ /dev/null @@ -1,6 +0,0 @@ -<tr> - <td class="nomecampo_bordosx">{$row['domain']}</td> - <td class="nomecampo"><if $row['aliasdomain'] == ''>{$row['documentroot']}</if><if $row['aliasdomain'] != ''>{$lng['domains']['aliasdomain']} {$row['aliasdomain']}</if></td> - <td class="nomecampo"><if $row['caneditdomain'] == '1'><a href="$filename?page=domains&action=edit&id={$row['id']}&s=$s">{$lng['panel']['edit']}</a></if></td> - <td class="nomecampo"><if $row['parentdomainid'] != '0' && !$aliasdomain><a href="$filename?page=domains&action=delete&id={$row['id']}&s=$s">{$lng['panel']['delete']}</a></if></td> -</tr>
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/domains/domains_edit.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/domains/domains_edit.tpl deleted file mode 100644 index 4c31697..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/domains/domains_edit.tpl +++ /dev/null @@ -1,44 +0,0 @@ -$header - <form method="post" action="$filename"> - <input type="hidden" name="s" value="$s" /> - <input type="hidden" name="page" value="$page" /> - <input type="hidden" name="action" value="$action" /> - <input type="hidden" name="id" value="$id" /> - <table cellpadding="5" cellspacing="4" border="0" align="center" class="install_tabella_60"> - <tr> - <td class="install_titolo" colspan="2"><b><img src="../images/titolo.gif" alt="" /> {$lng['domains']['subdomain_edit']}</b></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['domains']['domainname']}:</td> - <td class="install_campodisplay" nowrap="nowrap">{$result['domain']}</td> - </tr> - <if $alias_check == '0'> - <tr> - <td class="install_nomecampo">{$lng['domains']['aliasdomain']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><select class="tendina_nobordo" name="alias">$domains</select></td> - </tr> - </if> - <tr> - <td class="install_nomecampo">{$lng['panel']['path']}:</td> - <td class="install_campodisplay" nowrap="nowrap">{$pathSelect}</td> - </tr> - <if $result['parentdomainid'] == '0' && $userinfo['subdomains'] != '0' > - <tr> - <td class="install_nomecampo">{$lng['domains']['wildcarddomain']}</td> - <td class="install_campodisplay" nowrap="nowrap">$iswildcarddomain</td> - </tr> - </if> - <if $result['subcanemaildomain'] == '1' && $result['parentdomainid'] != '0' > - <tr> - <td class="install_nomecampo">Emaildomain:</td> - <td class="install_campodisplay" nowrap="nowrap">$isemaildomain</td> - </tr> - </if> - <tr> - <td class="install_confermacampo" colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottone" value="{$lng['panel']['save']}" /></td> - </tr> - </table> - </form> - <br /> - <br /> -$footer
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/account_add.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/account_add.tpl deleted file mode 100644 index 56e366c..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/account_add.tpl +++ /dev/null @@ -1,26 +0,0 @@ -$header - <form method="post" action="$filename"> - <input type="hidden" name="s" value="$s" /> - <input type="hidden" name="page" value="$page" /> - <input type="hidden" name="action" value="$action" /> - <input type="hidden" name="id" value="$id" /> - <table cellpadding="5" cellspacing="4" border="0" align="center" class="install_tabella_60"> - <tr> - <td class="install_titolo" colspan="2"><b><img src="../images/titolo.gif" alt="" /> {$lng['emails']['account_add']}</b></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['emails']['emailaddress']}:</td> - <td class="install_campodisplay" nowrap="nowrap">{$result['email_full']}</td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['login']['password']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="password" name="password" maxlength="50" /></td> - </tr> - <tr> - <td class="install_confermacampo" colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottone" value="{$lng['emails']['account_add']}" /></td> - </tr> - </table> - </form> - <br /> - <br /> -$footer
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/account_changepw.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/account_changepw.tpl deleted file mode 100644 index b2f3b10..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/account_changepw.tpl +++ /dev/null @@ -1,26 +0,0 @@ -$header - <form method="post" action="$filename"> - <input type="hidden" name="s" value="$s" /> - <input type="hidden" name="page" value="$page" /> - <input type="hidden" name="action" value="$action" /> - <input type="hidden" name="id" value="$id" /> - <table cellpadding="5" cellspacing="4" border="0" align="center" class="install_tabella_60"> - <tr> - <td class="install_titolo" colspan="2"><b><img src="../images/titolo.gif" alt="" /> {$lng['menue']['main']['changepassword']}</b></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['emails']['emailaddress']}:</td> - <td class="install_campodisplay" nowrap="nowrap">{$result['email_full']}</td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['login']['password']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="password" name="password" maxlength="50" /></td> - </tr> - <tr> - <td class="install_confermacampo" colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottone" value="{$lng['menue']['main']['changepassword']}" /></td> - </tr> - </table> - </form> - <br /> - <br /> -$footer
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/email.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/email.tpl deleted file mode 100644 index f49a7a0..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/email.tpl +++ /dev/null @@ -1,12 +0,0 @@ -$header - <table cellpadding="5" cellspacing="0" border="0" align="center" class="install_tabella"> - <tr> - <td class="install_titolo"><b><img src="../images/titolo.gif" alt="" /> {$lng['menue']['email']['email']}</b></td> - </tr> - <tr> - <td class="nomecampo_bordosx">{$lng['emails']['description']}</td> - </tr> - </table> - <br /> - <br /> -$footer
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/emails.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/emails.tpl deleted file mode 100644 index 69dd6e2..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/emails.tpl +++ /dev/null @@ -1,27 +0,0 @@ -$header - <table cellpadding="5" cellspacing="0" border="0" align="center" class="install_tabella"> - <tr> - <td class="install_titolo" colspan="6"><b><img src="../images/titolo.gif" alt="" /> {$lng['menue']['email']['emails']}</b></td> - </tr> - <tr> - <td class="campodisplay_bordosx">{$lng['emails']['emailaddress']}</td> - <td class="campodisplay">{$lng['emails']['forwarders']}</td> - <td class="campodisplay">{$lng['emails']['account']}</td> - <td class="campodisplay">{$lng['emails']['catchall']}</td> - <td class="campodisplay" colspan="2"> </td> - </tr> - <if ($userinfo['emails_used'] < $userinfo['emails'] || $userinfo['emails'] == '-1') && 15 < $emails_count && $emaildomains_count !=0 > - <tr> - <td class="campodisplay_bordosx" colspan="6"><a href="$filename?page={$page}&action=add&s=$s">{$lng['emails']['emails_add']}</a></td> - </tr> - </if> - $accounts - <if ($userinfo['emails_used'] < $userinfo['emails'] || $userinfo['emails'] == '-1') && $emaildomains_count !=0 > - <tr> - <td class="campodisplay_bordosx" colspan="6"><a href="$filename?page={$page}&action=add&s=$s">{$lng['emails']['emails_add']}</a></td> - </tr> - </if> - </table> - <br /> - <br /> -$footer
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/emails_add.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/emails_add.tpl deleted file mode 100644 index 4c8636e..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/emails_add.tpl +++ /dev/null @@ -1,25 +0,0 @@ -$header - <form method="post" action="$filename"> - <input type="hidden" name="s" value="$s" /> - <input type="hidden" name="page" value="$page" /> - <input type="hidden" name="action" value="$action" /> - <table cellpadding="5" cellspacing="4" border="0" align="center" class="install_tabella"> - <tr> - <td class="install_titolo" colspan="2"><b><img src="../images/titolo.gif" alt="" /> {$lng['emails']['emails_add']}</b></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['emails']['emailaddress']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="email_part" value="" size="15" /> @ <select class="tendina_nobordo" name="domain">$domains</select></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['emails']['iscatchall']}</td> - <td class="install_campodisplay" nowrap="nowrap">$iscatchall</td> - </tr> - <tr> - <td class="install_confermacampo" colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottone" value="{$lng['emails']['emails_add']}" /></td> - </tr> - </table> - </form> - <br /> - <br /> -$footer
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/emails_domain.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/emails_domain.tpl deleted file mode 100644 index 3c01c0b..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/emails_domain.tpl +++ /dev/null @@ -1,3 +0,0 @@ -<tr> - <td class="titolo" colspan="6"> <b>{$domainname}</b></td> -</tr>
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/emails_edit.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/emails_edit.tpl deleted file mode 100644 index e5c5853..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/emails_edit.tpl +++ /dev/null @@ -1,40 +0,0 @@ -$header - <table cellpadding="5" cellspacing="0" border="0" align="center" class="install_tabella_60"> - <tr> - <td class="install_titolo" colspan="2"><b><img src="../images/titolo.gif" alt="" /> {$lng['emails']['emails_edit']}</b></td> - </tr> - <tr> - <td class="campodisplay_bordosx">{$lng['emails']['emailaddress']}:</td> - <td class="nomecampo" nowrap="nowrap">{$result['email_full']}</td> - </tr> - <tr> - <td class="campodisplay_bordosx">{$lng['emails']['account']}:</td> - <td class="nomecampo" nowrap="nowrap"> - <if $result['popaccountid'] != 0> - {$lng['panel']['yes']} [<a href="$filename?page=accounts&action=changepw&id={$result['id']}&s=$s">{$lng['menue']['main']['changepassword']}</a>] [<a href="$filename?page=accounts&action=delete&id={$result['id']}&s=$s">{$lng['emails']['account_delete']}</a>] - </if> - <if $result['popaccountid'] == 0> - {$lng['panel']['no']} [<a href="$filename?page=accounts&action=add&id={$result['id']}&s=$s">{$lng['emails']['account_add']}</a>] - </if> - </td> - </tr> - <tr> - <td class="campodisplay_bordosx">{$lng['emails']['catchall']}:</td> - <td class="nomecampo" nowrap="nowrap"> - <if $result['iscatchall'] != 0> - {$lng['panel']['yes']} - </if> - <if $result['iscatchall'] == 0> - {$lng['panel']['no']} - </if> - [<a href="$filename?page=$page&action=togglecatchall&id={$result['id']}&s=$s">{$lng['panel']['toggle']}</a>] - </td> - </tr> - <tr> - <td class="campodisplay_bordosx">{$lng['emails']['forwarders']} ({$forwarders_count}):</td> - <td class="nomecampo">$forwarders<a href="$filename?page=forwarders&action=add&id={$result['id']}&s=$s">{$lng['emails']['forwarder_add']}</a></td> - </tr> - </table> - <br /> - <br /> -$footer
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/emails_edit_forwarder.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/emails_edit_forwarder.tpl deleted file mode 100644 index 3800fd6..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/emails_edit_forwarder.tpl +++ /dev/null @@ -1,2 +0,0 @@ -$destination [<a href="$filename?page=forwarders&action=delete&id={$result['id']}&forwarderid={$forwarderid}&s=$s">{$lng['panel']['delete']}</a>] -<br />
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/emails_email.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/emails_email.tpl deleted file mode 100644 index 4c74758..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/emails_email.tpl +++ /dev/null @@ -1,8 +0,0 @@ -<tr> - <td class="nomecampo_bordosx">{$row['email_full']}</td> - <td class="nomecampo">{$row['destination']}</td> - <td class="nomecampo"><if $row['popaccountid'] != 0>{$lng['panel']['yes']}</if><if $row['popaccountid'] == 0>{$lng['panel']['no']}</if></td> - <td class="nomecampo"><if $row['iscatchall'] != 0>{$lng['panel']['yes']}</if><if $row['iscatchall'] == 0>{$lng['panel']['no']}</if></td> - <td class="nomecampo"><a href="$filename?page={$page}&action=edit&id={$row['id']}&s=$s">{$lng['panel']['edit']}</a></td> - <td class="nomecampo"><a href="$filename?page={$page}&action=delete&id={$row['id']}&s=$s">{$lng['panel']['delete']}</a></td> -</tr>
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/forwarder_add.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/forwarder_add.tpl deleted file mode 100644 index 7410d14..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/email/forwarder_add.tpl +++ /dev/null @@ -1,26 +0,0 @@ -$header - <form method="post" action="$filename"> - <input type="hidden" name="s" value="$s" /> - <input type="hidden" name="page" value="$page" /> - <input type="hidden" name="action" value="$action" /> - <input type="hidden" name="id" value="$id" /> - <table cellpadding="5" cellspacing="4" border="0" align="center" class="install_tabella_60"> - <tr> - <td class="install_titolo" colspan="2"><b><img src="../images/titolo.gif" alt="" /> {$lng['emails']['forwarder_add']}</b></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['emails']['from']}:</td> - <td class="install_campodisplay" nowrap="nowrap">{$result['email_full']}</td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['emails']['to']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="destination" size="30" /></td> - </tr> - <tr> - <td class="install_confermacampo" colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottone" value="{$lng['emails']['forwarder_add']}" /></td> - </tr> - </table> - </form> - <br /> - <br /> -$footer
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/extras.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/extras.tpl deleted file mode 100644 index 0fa7bf4..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/extras.tpl +++ /dev/null @@ -1,12 +0,0 @@ -$header - <table cellpadding="5" cellspacing="0" border="0" align="center" class="install_tabella"> - <tr> - <td class="install_titolo"><b><img src="../images/titolo.gif" alt="" /> {$lng['menue']['extras']['extras']}</b></td> - </tr> - <tr> - <td class="nomecampo_bordosx">{$lng['extras']['description']}</td> - </tr> - </table> - <br /> - <br /> -$footer
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htaccess.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htaccess.tpl deleted file mode 100644 index 03e776f..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htaccess.tpl +++ /dev/null @@ -1,21 +0,0 @@ -$header - <table cellpadding="5" cellspacing="0" border="0" align="center" class="install_tabella"> - <tr> - <td class="install_titolo" colspan="7"><b><img src="../images/titolo.gif" alt="" /> {$lng['menue']['extras']['pathoptions']}</b></td> - </tr> - <tr> - <td class="campodisplay_bordosx">{$lng['panel']['path']}</td> - <td class="campodisplay">{$lng['extras']['view_directory']}</td> - <td class="campodisplay">{$lng['extras']['error404path']}</td> - <td class="campodisplay">{$lng['extras']['error403path']}</td> - <td class="campodisplay">{$lng['extras']['error500path']}</td> - <td class="campodisplay" colspan="2"> </td> - </tr> - $htaccess - <tr> - <td class="campodisplay_bordosx" colspan="7"><a href="$filename?page=htaccess&action=add&s=$s">{$lng['extras']['pathoptions_add']}</a></td> - </tr> - </table> - <br /> - <br /> -$footer
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htaccess_add.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htaccess_add.tpl deleted file mode 100644 index 93f3ca3..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htaccess_add.tpl +++ /dev/null @@ -1,37 +0,0 @@ -$header - <form method="post" action="$filename"> - <input type="hidden" name="s" value="$s" /> - <input type="hidden" name="page" value="$page" /> - <input type="hidden" name="action" value="$action" /> - <table cellpadding="5" cellspacing="4" border="0" align="center" class="install_tabella_60"> - <tr> - <td class="install_titolo" colspan="2"><b><img src="../images/titolo.gif" alt="" /> {$lng['extras']['pathoptions_add']}</b></td> - </tr> - <tr> - <td class="install_nomecampo"><b>{$lng['panel']['path']}:</b></td> - <td class="install_campodisplay" nowrap="nowrap">{$pathSelect}</td> - </tr> - <tr> - <td class="install_nomecampo"><b>{$lng['extras']['directory_browsing']}:</b></td> - <td class="install_campodisplay" nowrap="nowrap">$options_indexes</td> - </tr> - <tr> - <td class="install_nomecampo"><b>{$lng['extras']['errordocument404path']}:</b><br />{$lng['panel']['emptyfordefault']}</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="error404path" value="" maxlength="50" /></td> - </tr> - <tr> - <td class="install_nomecampo"><b>{$lng['extras']['errordocument403path']}:</b><br />{$lng['panel']['emptyfordefault']}</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="error403path" value="" maxlength="50" /></td> - </tr> - <tr> - <td class="install_nomecampo"><b>{$lng['extras']['errordocument500path']}:</b><br />{$lng['panel']['emptyfordefault']}</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="error500path" value="" maxlength="50" /></td> - </tr> - <tr> - <td class="install_confermacampo" colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottone" value="{$lng['extras']['pathoptions_add']}" /></td> - </tr> - </table> - </form> - <br /> - <br /> -$footer
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htaccess_edit.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htaccess_edit.tpl deleted file mode 100644 index 5f0e3b7..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htaccess_edit.tpl +++ /dev/null @@ -1,38 +0,0 @@ -$header - <form method="post" action="$filename"> - <input type="hidden" name="s" value="$s" /> - <input type="hidden" name="page" value="$page" /> - <input type="hidden" name="action" value="$action" /> - <input type="hidden" name="id" value="$id" /> - <table cellpadding="5" cellspacing="4" border="0" align="center" class="install_tabella_60"> - <tr> - <td class="install_titolo" colspan="2"><b><img src="../images/titolo.gif" alt="" /> {$lng['extras']['pathoptions_edit']}</b></td> - </tr> - <tr> - <td class="install_nomecampo"><b>{$lng['panel']['path']}:</b></td> - <td class="install_campodisplay" nowrap="nowrap">{$result['path']}</td> - </tr> - <tr> - <td class="install_nomecampo"><b>{$lng['extras']['directory_browsing']}:</b></td> - <td class="install_campodisplay" nowrap="nowrap">$options_indexes</td> - </tr> - <tr> - <td class="install_nomecampo"><b>{$lng['extras']['errordocument404path']}:</b><br />{$lng['panel']['emptyfordefault']}</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="error404path" value="{$result['error404path']}" maxlength="50" /></td> - </tr> - <tr> - <td class="install_nomecampo"><b>{$lng['extras']['errordocument403path']}:</b><br />{$lng['panel']['emptyfordefault']}</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="error403path" value="{$result['error403path']}" maxlength="50" /></td> - </tr> - <tr> - <td class="install_nomecampo"><b>{$lng['extras']['errordocument500path']}:</b><br />{$lng['panel']['emptyfordefault']}</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="error500path" value="{$result['error500path']}" maxlength="50" /></td> - </tr> - <tr> - <td class="install_confermacampo" colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottone" value="{$lng['extras']['pathoptions_edit']}" /></td> - </tr> - </table> - </form> - <br /> - <br /> -$footer
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htaccess_htaccess.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htaccess_htaccess.tpl deleted file mode 100644 index 3577809..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htaccess_htaccess.tpl +++ /dev/null @@ -1,9 +0,0 @@ -<tr> - <td class="nomecampo_bordosx">{$row['path']}</td> - <td class="nomecampo">{$row['options_indexes']}</td> - <td class="nomecampo">{$row['error404path']}</td> - <td class="nomecampo">{$row['error403path']}</td> - <td class="nomecampo">{$row['error500path']}</td> - <td class="nomecampo"><a href="$filename?page=htaccess&action=edit&id={$row['id']}&s=$s">{$lng['panel']['edit']}</a></td> - <td class="nomecampo"><a href="$filename?page=htaccess&action=delete&id={$row['id']}&s=$s">{$lng['panel']['delete']}</a></td> -</tr>
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htpasswds.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htpasswds.tpl deleted file mode 100644 index 0899db9..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htpasswds.tpl +++ /dev/null @@ -1,18 +0,0 @@ -$header - <table cellpadding="5" cellspacing="0" border="0" align="center" class="install_tabella"> - <tr> - <td class="install_titolo" colspan="4"><b><img src="../images/titolo.gif" alt="" /> {$lng['menue']['extras']['directoryprotection']}</b></td> - </tr> - <tr> - <td class="campodisplay_bordosx">{$lng['login']['username']}</td> - <td class="campodisplay">{$lng['panel']['path']}</td> - <td class="campodisplay" colspan="2"> </td> - </tr> - $htpasswds - <tr> - <td class="campodisplay_bordosx" colspan="4"><a href="$filename?page=htpasswds&action=add&s=$s">{$lng['extras']['directoryprotection_add']}</a></td> - </tr> - </table> - <br /> - <br /> -$footer
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htpasswds_add.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htpasswds_add.tpl deleted file mode 100644 index bab5063..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htpasswds_add.tpl +++ /dev/null @@ -1,29 +0,0 @@ -$header - <form method="post" action="$filename"> - <input type="hidden" name="s" value="$s" /> - <input type="hidden" name="page" value="$page" /> - <input type="hidden" name="action" value="$action" /> - <table cellpadding="5" cellspacing="4" border="0" align="center" class="install_tabella_60"> - <tr> - <td class="install_titolo" colspan="2"><b><img src="../images/titolo.gif" alt="" /> {$lng['extras']['directoryprotection_add']}</b></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['panel']['path']}:</td> - <td class="install_campodisplay" nowrap="nowrap">{$pathSelect}</td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['login']['username']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="username" size="30" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['login']['password']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="password" name="password" size="30" /></td> - </tr> - <tr> - <td class="install_confermacampo" colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottone" value="{$lng['extras']['directoryprotection_add']}" /></td> - </tr> - </table> - </form> - <br /> - <br /> -$footer
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htpasswds_edit.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htpasswds_edit.tpl deleted file mode 100644 index 39bbbb9..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htpasswds_edit.tpl +++ /dev/null @@ -1,30 +0,0 @@ -$header - <form method="post" action="$filename"> - <input type="hidden" name="s" value="$s" /> - <input type="hidden" name="page" value="$page" /> - <input type="hidden" name="action" value="$action" /> - <input type="hidden" name="id" value="$id" /> - <table cellpadding="5" cellspacing="4" border="0" align="center" class="install_tabella_60"> - <tr> - <td class="install_titolo" colspan="2"><b><img src="../images/titolo.gif" alt="" /> {$lng['menue']['main']['changepassword']}</b></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['panel']['path']}:</td> - <td class="install_campodisplay" nowrap="nowrap">{$result['path']}</td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['login']['username']}:</td> - <td class="install_campodisplay" nowrap="nowrap">{$result['username']}</td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['login']['password']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="password" name="password" maxlength="50" /></td> - </tr> - <tr> - <td class="install_confermacampo" colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottone" value="{$lng['menue']['main']['changepassword']}" /></td> - </tr> - </table> - </form> - <br /> - <br /> -$footer
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htpasswds_htpasswd.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htpasswds_htpasswd.tpl deleted file mode 100644 index fb9b004..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/extras/htpasswds_htpasswd.tpl +++ /dev/null @@ -1,6 +0,0 @@ -<tr> - <td class="nomecampo_bordosx">{$row['username']}</td> - <td class="nomecampo">{$row['path']}</td> - <td class="nomecampo"><a href="$filename?page=htpasswds&action=edit&id={$row['id']}&s=$s">{$lng['menue']['main']['changepassword']}</a></td> - <td class="nomecampo"><a href="$filename?page=htpasswds&action=delete&id={$row['id']}&s=$s">{$lng['panel']['delete']}</a></td> -</tr>
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/ftp/accounts.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/ftp/accounts.tpl deleted file mode 100644 index 3502729..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/ftp/accounts.tpl +++ /dev/null @@ -1,30 +0,0 @@ -$header - <table cellpadding="5" cellspacing="0" border="0" align="center" class="install_tabella"> - <tr> - <td class="install_titolo" colspan="4"><b><img src="../images/titolo.gif" alt="" /> {$lng['menue']['ftp']['accounts']}</b></td> - </tr> - <tr> - <td class="campodisplay_bordosx">{$lng['login']['username']}</td> - <td class="campodisplay">{$lng['panel']['path']}</td> - <td class="campodisplay" colspan="2"> </td> - </tr> - <if ($userinfo['ftps_used'] < $userinfo['ftps'] || $userinfo['ftps'] == '-1') && 15 < $ftps_count > - <tr> - <td class="campodisplay_bordosx" colspan="4"><a href="$filename?page=accounts&action=add&s=$s">{$lng['ftp']['account_add']}</a></td> - </tr> - </if> - $accounts - <if 0 < $pages> - <tr> - <td colspan="4" class="campodisplay">{$paging}</td> - </tr> - </if> - <if ($userinfo['ftps_used'] < $userinfo['ftps'] || $userinfo['ftps'] == '-1') > - <tr> - <td class="campodisplay_bordosx" colspan="4"><a href="$filename?page=accounts&action=add&s=$s">{$lng['ftp']['account_add']}</a></td> - </tr> - </if> - </table> - <br /> - <br /> -$footer diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/ftp/accounts_account.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/ftp/accounts_account.tpl deleted file mode 100644 index 5c637cd..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/ftp/accounts_account.tpl +++ /dev/null @@ -1,6 +0,0 @@ -<tr> - <td class="nomecampo_bordosx">{$row['username']}</td> - <td class="nomecampo">{$row['documentroot']}</td> - <td class="nomecampo"><a href="$filename?page=accounts&action=edit&id={$row['id']}&s=$s">{$lng['menue']['main']['changepassword']}</a></td> - <td class="nomecampo"><a href="$filename?page=accounts&action=delete&id={$row['id']}&s=$s">{$lng['panel']['delete']}</a></td> -</tr>
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/ftp/accounts_add.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/ftp/accounts_add.tpl deleted file mode 100644 index 24d6cf8..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/ftp/accounts_add.tpl +++ /dev/null @@ -1,25 +0,0 @@ -$header - <form method="post" action="$filename"> - <input type="hidden" name="s" value="$s" /> - <input type="hidden" name="page" value="$page" /> - <input type="hidden" name="action" value="$action" /> - <table cellpadding="5" cellspacing="4" border="0" align="center" class="install_tabella_60"> - <tr> - <td class="install_titolo" colspan="2"><b><img src="../images/titolo.gif" alt="" /> {$lng['ftp']['account_add']}</b></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['panel']['path']}:</td> - <td class="install_campodisplay" nowrap="nowrap">{$pathSelect}</td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['login']['password']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="password" name="password" size="30" /></td> - </tr> - <tr> - <td class="install_confermacampo" colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottone" value="{$lng['ftp']['account_add']}" /></td> - </tr> - </table> - </form> - <br /> - <br /> -$footer diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/ftp/accounts_edit.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/ftp/accounts_edit.tpl deleted file mode 100644 index ffc75de..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/ftp/accounts_edit.tpl +++ /dev/null @@ -1,26 +0,0 @@ -$header - <form method="post" action="$filename"> - <input type="hidden" name="s" value="$s" /> - <input type="hidden" name="page" value="$page" /> - <input type="hidden" name="action" value="$action" /> - <input type="hidden" name="id" value="$id" /> - <table cellpadding="5" cellspacing="4" border="0" align="center" class="install_tabella_60"> - <tr> - <td class="install_titolo" colspan="2"><b><img src="../images/titolo.gif" alt="" /> {$lng['menue']['main']['changepassword']}</b></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['login']['username']}:</td> - <td class="install_campodisplay" nowrap="nowrap">{$result['username']}</td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['login']['password']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="password" name="password" maxlength="50" /></td> - </tr> - <tr> - <td class="install_confermacampo" colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottone" value="{$lng['menue']['main']['changepassword']}" /></td> - </tr> - </table> - </form> - <br /> - <br /> -$footer
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/ftp/ftp.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/ftp/ftp.tpl deleted file mode 100644 index 4ea0215..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/ftp/ftp.tpl +++ /dev/null @@ -1,12 +0,0 @@ -$header - <table cellpadding="5" cellspacing="0" border="0" align="center" class="install_tabella"> - <tr> - <td class="install_titolo"><b><img src="../images/titolo.gif" alt="" /> {$lng['menue']['ftp']['ftp']}</b></td> - </tr> - <tr> - <td class="nomecampo_bordosx">{$lng['ftp']['description']}</td> - </tr> - </table> - <br /> - <br /> -$footer
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/index/change_language.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/index/change_language.tpl deleted file mode 100644 index c2c45d9..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/index/change_language.tpl +++ /dev/null @@ -1,23 +0,0 @@ -$header - <form method="post" action="$filename"> - <input type="hidden" name="s" value="$s" /> - <input type="hidden" name="page" value="$page" /> - <table cellpadding="5" cellspacing="4" border="0" align="center" class="install_tabella_60"> - <tr> - <td class="none" rowspan="4"><img src="../images/cambialingua.gif" alt="" /></td> - </tr> - <tr> - <td class="install_titolo" colspan="2"><b><img src="../images/titolo.gif" alt="" /> {$lng['menue']['main']['changelanguage']}</b></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['login']['language']}</td> - <td class="install_campodisplay" nowrap="nowrap"><select class="tendina_nobordo" name="def_language">$language_options</select></td> - </tr> - <tr> - <td class="install_confermacampo" colspan="2"><input type="hidden" name="send" value="send" /><input class="bottone" type="submit" value="{$lng['menue']['main']['changelanguage']}" /></td> - </tr> - </table> - </form> - <br /> - <br /> -$footer
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/index/change_password.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/index/change_password.tpl deleted file mode 100644 index 7aeebde..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/index/change_password.tpl +++ /dev/null @@ -1,34 +0,0 @@ -$header - <form method="post" action="$filename"> - <input type="hidden" name="s" value="$s" /> - <input type="hidden" name="page" value="$page" /> - <table cellpadding="5" cellspacing="4" border="0" align="center" class="install_tabella_60"> - <tr> - <td class="none" rowspan="7"><img src="../images/logininterno.gif" alt="" /></td> - </tr> - <tr> - <td class="install_titolo" colspan="2"><b><img src="../images/titolo.gif" alt="" /> {$lng['menue']['main']['changepassword']}</b></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['changepassword']['old_password']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="password" name="old_password" maxlength="50" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['changepassword']['new_password']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="password" name="new_password" maxlength="50" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['changepassword']['new_password_confirm']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="password" name="new_password_confirm" maxlength="50" /></td> - </tr> - <tr> - <td class="install_nomecampo" colspan="2"><input type="checkbox" name="change_main_ftp" value="true" />{$lng['changepassword']['also_change_ftp']}</td> - </tr> - <tr> - <td class="install_confermacampo" colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottone" value="{$lng['menue']['main']['changepassword']}" /></td> - </tr> - </table> - </form> - <br /> - <br /> -$footer
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/index/index.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/index/index.tpl deleted file mode 100644 index 22bb133..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/index/index.tpl +++ /dev/null @@ -1,76 +0,0 @@ -$header - <table cellpadding="5" cellspacing="0" border="0" align="center" class="install_tabella"> - <tr> - <td class="install_titolo" colspan="2"><b><img src="../images/titolo.gif" alt="" /> {$lng['index']['customerdetails']}</b></td> - </tr> - <tr> - <td class="nomecampo_bordosx">{$lng['customer']['name']}:</td> - <td class="campodisplay">{$userinfo['firstname']} {$userinfo['name']}</td> - </tr> - <tr> - <td class="nomecampo_bordosx">{$lng['customer']['company']}:</td> - <td class="campodisplay">{$userinfo['company']}</td> - </tr> - <tr> - <td class="nomecampo_bordosx">{$lng['customer']['street']}:</td> - <td class="campodisplay">{$userinfo['street']}</td> - </tr> - <tr> - <td class="nomecampo_bordosx">{$lng['customer']['zipcode']}/{$lng['customer']['city']}:</td> - <td class="campodisplay">{$userinfo['zipcode']} {$userinfo['city']}</td> - </tr> - <tr> - <td class="nomecampo_bordosx">{$lng['customer']['email']}:</td> - <td class="campodisplay">{$userinfo['email']}</td> - </tr> - <tr> - <td class="nomecampo_nobordobasso">{$lng['customer']['customernumber']}:</td> - <td class="campodisplay_nobordobasso">{$userinfo['customernumber']}</td> - </tr> - <tr> - <td class="install_titolo" colspan="2"><b><img src="../images/titolo.gif" alt="" /> {$lng['index']['accountdetails']}</b></td> - </tr> - <tr> - <td class="nomecampo_bordosx">{$lng['login']['username']}:</td> - <td class="campodisplay">{$userinfo['loginname']}</td> - </tr> - <tr> - <td class="nomecampo_bordosx">{$lng['customer']['domains']}:</td> - <td class="campodisplay">$domains</td> - </tr> - <tr> - <td class="nomecampo_bordosx">{$lng['customer']['subdomains']}:</td> - <td class="campodisplay">{$userinfo['subdomains_used']} ({$userinfo['subdomains']})</td> - </tr> - <tr> - <td class="nomecampo_bordosx">{$lng['customer']['diskspace']}:</td> - <td class="campodisplay">{$userinfo['diskspace_used']} ({$userinfo['diskspace']})</td> - </tr> - <tr> - <td class="nomecampo_bordosx">{$lng['customer']['traffic']} ($month):</td> - <td class="campodisplay">{$userinfo['traffic_used']} ({$userinfo['traffic']})</td> - </tr> - <tr> - <td class="nomecampo_bordosx">{$lng['customer']['emails']}:</td> - <td class="campodisplay">{$userinfo['emails_used']} ({$userinfo['emails']})</td> - </tr> - <tr> - <td class="nomecampo_bordosx">{$lng['customer']['accounts']}:</td> - <td class="campodisplay">{$userinfo['email_accounts_used']} ({$userinfo['email_accounts']})</td> - </tr> - <tr> - <td class="nomecampo_bordosx">{$lng['customer']['forwarders']}:</td> - <td class="campodisplay">{$userinfo['email_forwarders_used']} ({$userinfo['email_forwarders']})</td> - </tr> - <tr> - <td class="nomecampo_bordosx">{$lng['customer']['mysqls']}:</td> - <td class="campodisplay">{$userinfo['mysqls_used']} ({$userinfo['mysqls']})</td> - </tr> - <tr> - <td class="nomecampo_bordosx">{$lng['customer']['ftps']}:</td> - <td class="campodisplay">{$userinfo['ftps_used']} ({$userinfo['ftps']})</td> - </tr> - </table> - <br /> - <br /> -$footer
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/mysql/mysql.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/mysql/mysql.tpl deleted file mode 100644 index 29bcfeb..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/mysql/mysql.tpl +++ /dev/null @@ -1,12 +0,0 @@ -$header - <table cellpadding="5" cellspacing="0" border="0" align="center" class="install_tabella"> - <tr> - <td class="install_titolo"><b><img src="../images/titolo.gif" alt="" /> {$lng['menue']['mysql']['mysql']}</b></td> - </tr> - <tr> - <td class="nomecampo_bordosx">{$lng['mysql']['description']}</td> - </tr> - </table> - <br /> - <br /> -$footer
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/mysql/mysqls.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/mysql/mysqls.tpl deleted file mode 100644 index ffa7c27..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/mysql/mysqls.tpl +++ /dev/null @@ -1,25 +0,0 @@ -$header - <table cellpadding="5" cellspacing="0" border="0" align="center" class="install_tabella"> - <tr> - <td class="install_titolo" colspan="4"><b><img src="../images/titolo.gif" alt="" /> {$lng['menue']['mysql']['databases']}</b></td> - </tr> - <tr> - <td class="campodisplay_bordosx">{$lng['mysql']['databasename']}</td> - <td class="campodisplay">{$lng['mysql']['databasedescription']}</td> - <td class="campodisplay" colspan="2"> </td> - </tr> - <if ($userinfo['mysqls_used'] < $userinfo['mysqls'] || $userinfo['mysqls'] == '-1') && 15 < $mysqls_count > - <tr> - <td class="campodisplay_bordosx" colspan="4"><a href="$filename?page=mysqls&action=add&s=$s">{$lng['mysql']['database_create']}</a></td> - </tr> - </if> - $mysqls - <if ($userinfo['mysqls_used'] < $userinfo['mysqls'] || $userinfo['mysqls'] == '-1') > - <tr> - <td class="campodisplay_bordosx" colspan="4"><a href="$filename?page=mysqls&action=add&s=$s">{$lng['mysql']['database_create']}</a></td> - </tr> - </if> - </table> - <br /> - <br /> -$footer
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/mysql/mysqls_add.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/mysql/mysqls_add.tpl deleted file mode 100644 index c046a8f..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/mysql/mysqls_add.tpl +++ /dev/null @@ -1,25 +0,0 @@ -$header - <form method="post" action="$filename"> - <input type="hidden" name="s" value="$s" /> - <input type="hidden" name="page" value="$page" /> - <input type="hidden" name="action" value="$action" /> - <table cellpadding="5" cellspacing="4" border="0" align="center" class="install_tabella_60"> - <tr> - <td class="install_titolo" colspan="2"><b><img src="../images/titolo.gif" alt="" /> {$lng['mysql']['database_create']}</b></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['mysql']['databasedescription']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="description" maxlength="100" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['login']['password']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="password" name="password" maxlength="50" /></td> - </tr> - <tr> - <td class="install_confermacampo" colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottone" value="{$lng['mysql']['database_create']}" /></td> - </tr> - </table> - </form> - <br /> - <br /> -$footer
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/mysql/mysqls_database.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/mysql/mysqls_database.tpl deleted file mode 100644 index a0d13f3..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/mysql/mysqls_database.tpl +++ /dev/null @@ -1,6 +0,0 @@ -<tr> - <td class="nomecampo_bordosx">{$row['databasename']}</td> - <td class="nomecampo">{$row['description']}</td> - <td class="nomecampo"><a href="$filename?page=mysqls&action=edit&id={$row['id']}&s=$s">{$lng['panel']['edit']}</a></td> - <td class="nomecampo"><a href="$filename?page=mysqls&action=delete&id={$row['id']}&s=$s">{$lng['panel']['delete']}</a></td> -</tr>
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/mysql/mysqls_edit.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/mysql/mysqls_edit.tpl deleted file mode 100644 index 5f100de..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/customer/mysql/mysqls_edit.tpl +++ /dev/null @@ -1,30 +0,0 @@ -$header - <form method="post" action="$filename"> - <input type="hidden" name="s" value="$s" /> - <input type="hidden" name="page" value="$page" /> - <input type="hidden" name="action" value="$action" /> - <input type="hidden" name="id" value="$id" /> - <table cellpadding="5" cellspacing="4" border="0" align="center" class="install_tabella_60"> - <tr> - <td class="install_titolo" colspan="2"><b><img src="../images/titolo.gif" alt="" /> {$lng['menue']['main']['changepassword']}</b></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['mysql']['databasename']}:</td> - <td class="install_campodisplay" nowrap="nowrap">{$result['databasename']}</td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['mysql']['databasedescription']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="description" maxlength="100" value="{$result['description']}" /></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['changepassword']['new_password_ifnotempty']}:</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="password" name="password" maxlength="50" /></td> - </tr> - <tr> - <td class="install_confermacampo" colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottone" value="{$lng['panel']['save']}" /></td> - </tr> - </table> - </form> - <br /> - <br /> -$footer
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/footer.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/footer.tpl deleted file mode 100644 index 0c539c0..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/footer.tpl +++ /dev/null @@ -1,16 +0,0 @@ - </td> - </tr> - </table> - <table cellspacing="0" cellpadding="0" border="0" width="100%"> - <tr> - <td width="100%" class="footer"> - <br />SysCP $version © 2003-2006 by <a href="http://www.syscp.org/" target="_blank">the SysCP Team</a> - <br />Templates by <a href="mailto:info@havanastudio.ch">Luca Piona</a> & <a href="mailto:chtekk@gentoo.org">Luca Longinotti</a> - <br /> - <br /><a href="http://validator.w3.org/check?uri=referer" target="_blank"><img src="../images/valid-xhtml10" alt="Valid XHTML 1.0 Transitional" height="31" width="88" border="0" /></a> <a href="http://jigsaw.w3.org/css-validator/" target="_blank"><img style="border:0;width:88px;height:31px" src="../images/vcss" alt="Valid CSS!" border="0" /></a> - <br /> - </td> - </tr> - </table> - </body> -</html> diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/header.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/header.tpl deleted file mode 100644 index 4d70ce6..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/header.tpl +++ /dev/null @@ -1,28 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> - <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type" /> - <link rel="stylesheet" href="templates/maincss.css" type="text/css" /> - <title>SysCP</title> -</head> -<body style="margin: 0; padding: 0;" onload="document.loginform.loginname.focus()"> -<!-- - We request you retain the full copyright notice below including the link to www.syscp.org. - This not only gives respect to the large amount of time given freely by the developers - but also helps build interest, traffic and use of SysCP. If you refuse - to include even this then support on our forums may be affected. - The SysCP Team : 2003-2006 -// --> -<table cellspacing="0" cellpadding="0" border="0" width="100%"> - <tr> - <td width="800"><img src="../images/header.gif" width="800" height="90" alt="" /></td> - <td class="header"> </td> - </tr> -</table> -<table cellspacing="0" cellpadding="0" border="0" width="100%"> - <tr> - <td width="240" valign="top" bgcolor="#EBECF5">$navigation<br /></td> - <td width="15" class="linea_ombra"> </td> - <td valign="top" bgcolor="#FFFFFF"> - <br /> - <br /> diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/login/login.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/login/login.tpl deleted file mode 100644 index 97ac4d8..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/login/login.tpl +++ /dev/null @@ -1,33 +0,0 @@ -$header - <br /> - <br /> - <br /> - <form method="post" action="$filename" name="loginform"> - <table cellpadding="5" cellspacing="0" border="0" align="center" class="install_tabella_40"> - <tr> - <td class="install_titolo" colspan="3"><b><img src="../images/titolo.gif" alt="" /> SysCP - Login</b></td> - </tr> - <tr> - <td rowspan="3" class="nomecampo_acenter"><img src="../images/login.gif" alt="" /></td> - <td class="nomecampo"><font size="-1">{$lng['login']['username']}:</font></td> - <td class="campodisplay"><input type="text" name="loginname" value="" maxlength="50" /></td> - </tr> - <tr> - <td class="nomecampo"><font size="-1">{$lng['login']['password']}:</font></td> - <td class="campodisplay"><input type="password" name="password" maxlength="50" /></td> - </tr> - <tr> - <td class="nomecampo"><font size="-1">{$lng['login']['language']}:</font></td> - <td class="campodisplay"><select class="tendina_nobordo" name="language">$language_options</select></td> - </tr> - <tr> - <td class="nomecampo_acenter" colspan="3"><input type="hidden" name="send" value="send" /><input type="submit" class="bottone" value="{$lng['login']['login']}" /></td> - </tr> - </table> - </form> - <br /> - <br /> - <br /> - <br /> - <br /> -$footer diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/maincss.css b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/maincss.css deleted file mode 100644 index 6b71d74..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/maincss.css +++ /dev/null @@ -1,244 +0,0 @@ -body { - color : #000000; - font-family : Verdana, Arial, Helvetica, sans-serif; - font-size : 12px; -} - -.header { - background-image : url( '../images/header_r.gif' ); - background-repeat : repeat-x; -} - -.footer { - text-align : center; - border-color : #EBECF5; - border-style : solid; - border-width : 1px; - border-right : none; - border-left : none; - background-image : url( '../images/footer.gif' ); - background-repeat : repeat-y; -} - -.linea_ombra { - background-image : url( '../images/ombra.gif' ); - background-repeat : repeat-y; - background-position : top left; -} - -.sezione { - height : 25px; - background-image : url( '../images/sezione.gif' ); -} - -.sottosezione { - height : 25px; - background-image : url( '../images/sottosezione.gif' ); -} - -.finesezione { - height : 25px; - background-image : url( '../images/finesezione.gif' ); -} - -a,a:visited,a:active { - color : #000000; - text-decoration : underline; -} - -a:hover { - color : #F89826; - text-decoration : none; -} - -select,textarea { - color : black; - text-decoration : none; - font-family : Verdana, Arial, Helvetica, sans-serif; - font-size : 12px; - font-weight : bold; - border : 1px solid #B7B7B7; - background-color : #C6DEFF; -} - -select.tendina_nobordo { - color : black; - text-decoration : none; - font-family : Verdana, Arial, Helvetica, sans-serif; - font-size : 12px; - font-weight : bold; - border : 0px solid #B7B7B7; - background-color : #C6DEFF; -} - -textarea.textarea_nobordo { - color : black; - text-decoration : none; - font-family : Verdana, Arial, Helvetica, sans-serif; - font-size : 12px; - font-weight : bold; - border : 0px solid #B7B7B7; - background-color : #C6DEFF; -} - -textarea.textarea_bordo { - color : black; - text-decoration : none; - font-family : Verdana, Arial, Helvetica, sans-serif; - font-size : 12px; - font-weight : bold; - border : 1px solid #B7B7B7; - background-color : #C6DEFF; -} - -input { - color : black; - text-decoration : none; - font-family : Verdana, Arial, Helvetica, sans-serif; - font-size : 12px; - font-weight : bold; - border : 0px solid #B7B7B7; - background-color : #C6DEFF; -} - -input.bottone { - color : black; - text-decoration : none; - font-family : Verdana, Arial, Helvetica, sans-serif; - font-size : 12px; - font-weight : bold; - border : 1px solid #000000; - background-color : #C6DEFF; -} - -.install_tabella { - width : 90%; -} - -.install_tabella_60 { - width : 60%; -} - -.install_tabella_40 { - width : 40%; -} - -.install_titolo { - width : 90%; - background-color : #ABC9E8; - border-color : #000000; - border-style : solid; - border-width : 1px; - text-align : left; -} - -.titolo { - background-color : #ABC9E8; - border-color : #B7B7B7; - border-style : solid; - border-width : 1px; - border-top : none; - text-align : left; -} - -.install_nomecampo { - width : 84%; - background-color : #EBECF5; - border-color : #B7B7B7; - border-style : solid; - border-width : 1px; - text-align : left; -} - -.install_confermacampo { - width : 84%; - background-color : #EBECF5; - border-color : #B7B7B7; - border-style : solid; - border-width : 1px; - text-align : right; -} - -.nomecampo { - background-color : #EBECF5; - border-color : #B7B7B7; - border-style : solid; - border-width : 1px; - text-align : left; - border-top : none; - border-left : none; -} - -.nomecampo_nobordobasso { - background-color : #EBECF5; - border-color : #B7B7B7; - border-style : solid; - border-width : 1px; - text-align : left; - border-top : none; - border-bottom : none; -} - -.nomecampo_acenter { - background-color : #EBECF5; - border-color : #B7B7B7; - border-style : solid; - border-width : 1px; - text-align : center; - border-top : none; -} - -.nomecampo_acenter_nobordo { - height : 30px; - background-color : #EBECF5; - border-color : #B7B7B7; - border-style : solid; - border-width : 1px; - text-align : center; - border-top : none; - border-right : none; -} - -.nomecampo_bordosx { - background-color : #EBECF5; - border-color : #B7B7B7; - border-style : solid; - border-width : 1px; - text-align : left; - border-top : none; -} - -.install_campodisplay { - width : 6%; - background-color : #C6DEFF; - border-color : #B7B7B7; - border-style : solid; - border-width : 1px; -} - -.campodisplay { - background-color : #C6DEFF; - border-color : #B7B7B7; - border-style : solid; - border-width : 1px; - border-top : none; - border-left : none; -} - -.campodisplay_bordosx { - background-color : #C6DEFF; - border-color : #B7B7B7; - border-style : solid; - border-width : 1px; - border-top : none; -} - -.campodisplay_nobordobasso { - background-color : #C6DEFF; - border-color : #B7B7B7; - border-style : solid; - border-width : 1px; - border-top : none; - border-left : none; - border-bottom : none; -} diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/misc/error.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/misc/error.tpl deleted file mode 100644 index 60f95f3..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/misc/error.tpl +++ /dev/null @@ -1,13 +0,0 @@ -$header - <table cellpadding="5" cellspacing="0" border="0" align="center" class="install_tabella_60"> - <tr> - <td class="install_titolo" colspan="2"><b> <img src="../images/titolo.gif" alt="" /> {$lng['error']['error']}</b></td> - </tr> - <tr> - <td class="nomecampo_acenter_nobordo"><img src="../images/errore.gif" alt="" /></td> - <td class="nomecampo">$error</td> - </tr> - </table> - <br /> - <br /> -$footer
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/misc/question_yesno.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/misc/question_yesno.tpl deleted file mode 100644 index a0f3511..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/misc/question_yesno.tpl +++ /dev/null @@ -1,18 +0,0 @@ -$header - <form action="$yesfile" method="post"> - <input type="hidden" name="s" value="$s" /> - <input type="hidden" name="send" value="send" /> - $hiddenparams - <table cellpadding="5" cellspacing="0" border="0" align="center" class="install_tabella_60"> - <tr> - <td class="install_titolo" colspan="2"><b> <img src="../images/titolo.gif" alt="" /> {$lng['question']['question']}</b></td> - </tr> - <tr> - <td class="nomecampo_bordosx">$text</td> - <td class="nomecampo" nowrap="nowrap"><input type="submit" class="bottone" name="submitbutton" value="{$lng['panel']['yes']}" /> <input type="button" class="bottone" value="{$lng['panel']['no']}" onclick="history.back();" /></td> - </tr> - </table> - </form> - <br /> - <br /> -$footer
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/misc/standardcustomer/index.html b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/misc/standardcustomer/index.html deleted file mode 100644 index 82e2710..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/misc/standardcustomer/index.html +++ /dev/null @@ -1,11 +0,0 @@ -<html> -<head> - <title>Gentoo-SysCP Defaultpage</title> -</head> -<body> - <p align="center" style="font-family: Verdana,Helvetica,sans-serif; font-size: 14px;"> - <br />This domain was created using Gentoo-SysCP. - <br />There is no content on this domain yet. - </p> -</body> -</html>
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/navigation_element.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/navigation_element.tpl deleted file mode 100644 index 26e1904..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/navigation_element.tpl +++ /dev/null @@ -1,12 +0,0 @@ -<br /> -<table cellspacing="0" cellpadding="0" border="0" width="200" align="center"> - <tr> - <td class="sezione"><b> <img src="../images/titolo.gif" alt="" /> $completeLink_ElementTitle</b></td> - </tr> - <tr> - <td class="sottosezione"><br />$navigation_links</td> - </tr> - <tr> - <td class="finesezione"> </td> - </tr> -</table>
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/navigation_link.tpl b/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/navigation_link.tpl deleted file mode 100644 index fded1da..0000000 --- a/syscp/patches/gentoo-syscp-design/gentoo-syscp-design/templates/navigation_link.tpl +++ /dev/null @@ -1,2 +0,0 @@ - <img src="../images/ball.gif" alt="" /> {$completeLink} -<br />
\ No newline at end of file diff --git a/syscp/patches/gentoo-syscp-design/syscp-1.2.13-gentoo-syscp-design-r3.tar.bz2 b/syscp/patches/gentoo-syscp-design/syscp-1.2.13-gentoo-syscp-design-r3.tar.bz2 Binary files differdeleted file mode 100644 index 0994344..0000000 --- a/syscp/patches/gentoo-syscp-design/syscp-1.2.13-gentoo-syscp-design-r3.tar.bz2 +++ /dev/null diff --git a/syscp/patches/italian-lang/italian.lng.php b/syscp/patches/italian-lang/italian.lng.php deleted file mode 100644 index 1021e11..0000000 --- a/syscp/patches/italian-lang/italian.lng.php +++ /dev/null @@ -1,407 +0,0 @@ -<?php
-/**
- * filename: $Source: /cvsroot/syscp/syscp/lng/italian.lng.php,v $
- * begin: Friday, Dec 02, 2005
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version. This program is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * @author Luca Piona <info@havanastudio.ch> & Luca Longinotti <chtekk@gentoo.org>
- * @copyright (C) 2005 Luca Piona & Luca Longinotti
- * @package Language
- * @version $Id: $
- */
-
-
-/**
- * Global
- */
-$lng['panel']['edit'] = 'Modifica';
-$lng['panel']['delete'] = 'Cancella';
-$lng['panel']['create'] = 'Crea';
-$lng['panel']['save'] = 'Salva';
-$lng['panel']['yes'] = 'Si';
-$lng['panel']['no'] = 'No';
-$lng['panel']['emptyfornochanges'] = 'lasciare vuoto se non si vuole cambiare';
-$lng['panel']['emptyfordefault'] = 'lasciare vuoto per l\'impostazione di default';
-$lng['panel']['path'] = 'Percorso';
-$lng['panel']['toggle'] = 'Cambia';
-$lng['panel']['next'] = 'Prossimo';
-$lng['panel']['dirsmissing'] = 'Impossibile trovare o leggere la directory!';
-
-/**
- * Login
- */
-$lng['login']['username'] = 'Nome Utente';
-$lng['login']['password'] = 'Password';
-$lng['login']['language'] = 'Lingua';
-$lng['login']['login'] = 'Login';
-$lng['login']['logout'] = 'Logout';
-$lng['login']['profile_lng'] = 'Scegli la lingua';
-
-/**
- * Customer
- */
-$lng['customer']['documentroot'] = 'Cartella Principale';
-$lng['customer']['name'] = 'Cognome';
-$lng['customer']['firstname'] = 'Nome';
-$lng['customer']['company'] = 'Ditta';
-$lng['customer']['street'] = 'Via';
-$lng['customer']['zipcode'] = 'CAP';
-$lng['customer']['city'] = 'Città';
-$lng['customer']['phone'] = 'Telefono';
-$lng['customer']['fax'] = 'Fax';
-$lng['customer']['email'] = 'Email';
-$lng['customer']['customernumber'] = 'ID Cliente';
-$lng['customer']['diskspace'] = 'Spazio Web (MB)';
-$lng['customer']['traffic'] = 'Traffico (GB)';
-$lng['customer']['mysqls'] = 'Database MySQL';
-$lng['customer']['emails'] = 'Indirizzi Email';
-$lng['customer']['accounts'] = 'Account Email';
-$lng['customer']['forwarders'] = 'Reindirizzamenti Email';
-$lng['customer']['ftps'] = 'Account FTP';
-$lng['customer']['subdomains'] = 'Sottodomini';
-$lng['customer']['domains'] = 'Domini';
-$lng['customer']['unlimited'] = 'illimitati';
-
-/**
- * Customermenue
- */
-$lng['menue']['main']['main'] = 'Principale';
-$lng['menue']['main']['changepassword'] = 'Cambia la password';
-$lng['menue']['main']['changelanguage'] = 'Cambia la lingua';
-$lng['menue']['email']['email'] = 'Email';
-$lng['menue']['email']['emails'] = 'Indirizzi';
-$lng['menue']['email']['webmail'] = 'WebMail';
-$lng['menue']['mysql']['mysql'] = 'MySQL';
-$lng['menue']['mysql']['databases'] = 'Database';
-$lng['menue']['mysql']['phpmyadmin'] = 'phpMyAdmin';
-$lng['menue']['domains']['domains'] = 'Domini';
-$lng['menue']['domains']['settings'] = 'Opzioni';
-$lng['menue']['ftp']['ftp'] = 'FTP';
-$lng['menue']['ftp']['accounts'] = 'Account';
-$lng['menue']['ftp']['webftp'] = 'WebFTP';
-$lng['menue']['extras']['extras'] = 'Extra';
-$lng['menue']['extras']['directoryprotection'] = 'Cartelle Protette';
-$lng['menue']['extras']['pathoptions'] = 'Opzioni Cartelle';
-
-/**
- * Index
- */
-$lng['index']['customerdetails'] = 'Dettagli Cliente';
-$lng['index']['accountdetails'] = 'Dettagli Account';
-
-/**
- * Change Password
- */
-$lng['changepassword']['old_password'] = 'Vecchia password';
-$lng['changepassword']['new_password'] = 'Nuova password';
-$lng['changepassword']['new_password_confirm'] = 'Nuova password (verifica)';
-$lng['changepassword']['new_password_ifnotempty'] = 'Nuova password (vuota = non cambia)';
-$lng['changepassword']['also_change_ftp'] = ' cambia la password dell\'account FTP principale?';
-
-/**
- * Domains
- */
-$lng['domains']['description'] = 'Qui puoi creare (sotto)domini e cambiare il loro percorso.<br />Il sistema, dopo ogni cambiamento, necessita di un po\' di tempo per applicare le nuove impostazioni.';
-$lng['domains']['domainsettings'] = 'Opzioni del dominio';
-$lng['domains']['domainname'] = 'Nome del dominio';
-$lng['domains']['subdomain_add'] = 'Crea sottodominio';
-$lng['domains']['subdomain_edit'] = 'Modifica il (sotto)dominio';
-$lng['domains']['wildcarddomain'] = 'Crea una wildcarddomain?';
-$lng['domains']['aliasdomain'] = 'Alias per questo dominio';
-$lng['domains']['noaliasdomain'] = 'Nessun alias per il dominio';
-
-/**
- * eMails
- */
-$lng['emails']['description'] = 'Qui puoi creare e cambiare i tuoi indirizzi Email.<br />Un account è come la bucalettere davanti a casa tua. Se qualcuno ti manda un\'Email, essa sarà recapitata all\'interno del tuo account.<br /><br />Per scaricare le tue Email usa le seguenti impostazioni nel tuo programma di posta elettronica: (I dati scritti in <i>corsivo</i> vanno cambiati con i tuoi!)<br />Hostname: <b><i>Nome del dominio</i></b><br />Username: <b><i>Nome dell\'account / Indirizzo Email</i></b><br />Password: <b><i>La password scelta</i></b>';
-$lng['emails']['emailaddress'] = 'Indirizzo Email';
-$lng['emails']['emails_add'] = 'Crea indirizzo Email';
-$lng['emails']['emails_edit'] = 'Modifica indirizzo Email';
-$lng['emails']['catchall'] = 'Catch-all';
-$lng['emails']['iscatchall'] = 'Definisci come indirizzo catch-all?';
-$lng['emails']['account'] = 'Account';
-$lng['emails']['account_add'] = 'Crea account';
-$lng['emails']['account_delete'] = 'Cancella account';
-$lng['emails']['from'] = 'Da';
-$lng['emails']['to'] = 'Per';
-$lng['emails']['forwarders'] = 'Reindirizzamenti';
-$lng['emails']['forwarder_add'] = 'Crea reindirizzamento';
-
-/**
- * FTP
- */
-$lng['ftp']['description'] = 'Qui puoi creare e modificare i tuoi account FTP.<br />I cambiamenti sono effettuati in tempo reale e gli account si possono usare immediatamente.';
-$lng['ftp']['account_add'] = 'Crea account';
-
-/**
- * MySQL
- */
-$lng['mysql']['description'] = 'Qui puoi creare e modificare i tuoi database MySQL.<br />I cambiamenti sono effettuati in tempo reale e i databases si possono usare immediatamente.<br />Nel menù di sinistra trovi il tool phpMyAdmin con il quale potrai comodamente amministrare i tuoi databases attraverso il tuo web-browser.<br /><br />Per utilizzare i database nei vostri script PHP, utilizzate le seguenti impostazioni: (I dati scritti in <i>corsivo</i> vanno cambiati con i tuoi!)<br />Hostname: <b>localhost</b><br />Username: <b><i>L\'username scelto</i></b><br />Password: <b><i>La password scelta per quell\'username</i></b><br />Database: <b><i>Nome del database</i></b>';
-$lng['mysql']['databasename'] = 'Nome database';
-$lng['mysql']['databasedescription'] = 'Descrizione database';
-$lng['mysql']['database_create'] = 'Crea database';
-
-/**
- * Extras
- */
-$lng['extras']['description'] = 'Qui puoi aggiungere alcune opzioni extra, per esempio impostare delle cartelle protette.<br />Il sistema, dopo ogni cambiamento, necessita di un po\' di tempo per applicare le nuove impostazioni.';
-$lng['extras']['directoryprotection_add'] = 'Aggiungi protezione cartella';
-$lng['extras']['view_directory'] = 'Mostra protezione cartella';
-$lng['extras']['pathoptions_add'] = 'Aggiungi opzioni cartella';
-$lng['extras']['directory_browsing'] = 'Visualizza file e cartelle';
-$lng['extras']['pathoptions_edit'] = 'Modifica opzioni cartella';
-$lng['extras']['error404path'] = '404';
-$lng['extras']['error403path'] = '403';
-$lng['extras']['error500path'] = '500';
-$lng['extras']['error401path'] = '401';
-$lng['extras']['errordocument404path'] = 'URL to ErrorDocument 404';
-$lng['extras']['errordocument403path'] = 'URL to ErrorDocument 403';
-$lng['extras']['errordocument500path'] = 'URL to ErrorDocument 500';
-$lng['extras']['errordocument401path'] = 'URL to ErrorDocument 401';
-
-/**
- * Errors
- */
-$lng['error']['error'] = 'Errore';
-$lng['error']['directorymustexist'] = 'La cartella %s deve esistere. Per favore creala tramite il tuo client FTP.';
-$lng['error']['filemustexist'] = 'Il file %s deve esistere.';
-$lng['error']['allresourcesused'] = 'Hai già usato tutte le tue risorse.';
-$lng['error']['domains_cantdeletemaindomain'] = 'Non puoi cancellare un dominio usato come dominio Email.';
-$lng['error']['domains_canteditdomain'] = 'Non puoi modificare questo dominio. La funzione è stata disabilitata dall\'admin.';
-$lng['error']['domains_cantdeletedomainwithemail'] = 'Non puoi cancellare un dominio usato come dominio Email. Cancella prima tutti gli indirizzi Email che lo utilizzano.';
-$lng['error']['firstdeleteallsubdomains'] = 'Prima di creare un dominio wildcard, cancella tutti i sottodomini presenti per quel dominio.';
-$lng['error']['youhavealreadyacatchallforthisdomain'] = 'Hai già definito un catchall per questo dominio.';
-$lng['error']['ftp_cantdeletemainaccount'] = 'Non puoi cancellare il tuo account FTP principale.';
-$lng['error']['login'] = 'Il nome utente o la password da te immessi sono incorretti. Per favore riprova!';
-$lng['error']['login_blocked'] = 'Questo account è stato sospeso per i troppi tentativi di login falliti. <br />Riprovi tra '.$settings['login']['deactivatetime'].' secondi.';
-$lng['error']['notallreqfieldsorerrors'] = 'Alcuni campi sono stati lasciati vuoti o sono stati riempiti incorrettamente.';
-$lng['error']['oldpasswordnotcorrect'] = 'La vecchia password non è corretta.';
-$lng['error']['youcantallocatemorethanyouhave'] = 'Non puoi assegnare più risorse di quante ne possieda tu stesso.';
-$lng['error']['youcantdeletechangemainadmin'] = 'Non puoi cancellare o modificare l\'admin principale per ragioni di sicurezza.';
-$lng['error']['mustbeurl'] = 'Non hai inserito un\'indirizzo valido o completo (per es. http://qualchedominio.com/errore404.htm).';
-$lng['error']['invalidpath'] = 'Non hai scelto un\'indirizzo valido.';
-$lng['error']['stringisempty'] ='Manca il dato nel campo.';
-$lng['error']['stringiswrong'] ='Dato incorretto.';
-$lng['error']['myloginname'] = '\''.$lng['login']['username'].'\'';
-$lng['error']['mypassword'] = '\''.$lng['login']['password'].'\'';
-$lng['error']['oldpassword'] = '\''.$lng['changepassword']['old_password'].'\'';
-$lng['error']['newpassword'] = '\''.$lng['changepassword']['new_password'].'\'';
-$lng['error']['newpasswordconfirm']= '\''.$lng['changepassword']['new_password_confirm'].'\'';
-$lng['error']['newpasswordconfirmerror']='La nuova password non corrisponde a quella vecchia.';
-$lng['error']['myname'] = '\''.$lng['customer']['name'].'\'';
-$lng['error']['myfirstname'] = '\''.$lng['customer']['firstname'].'\'';
-$lng['error']['emailadd'] = '\''.$lng['customer']['email'].'\'';
-$lng['error']['mydomain'] = '\'Dominio\'';
-$lng['error']['mydocumentroot'] = '\'Documentroot\'';
-$lng['error']['loginnameexists']= 'Il login %s esiste già.';
-$lng['error']['emailiswrong']= 'L\'indirizzo Email %s contiene caratteri invalidi o è incompleto.';
-$lng['error']['loginnameiswrong']= 'Il login %s contiene caratteri invalidi.';
-$lng['error']['userpathcombinationdupe']='La combinazione tra nome utente e percorso esiste già.';
-$lng['error']['patherror']='Errore! Il percorso non può essere vuoto.';
-$lng['error']['errordocpathdupe']='Le opzioni per la cartella %s esistono già.';
-$lng['error']['adduserfirst']='Per favore crea prima un utente ...';
-$lng['error']['domainalreadyexists']= 'Il dominio %s è già assegnato ad un cliente.';
-$lng['error']['nolanguageselect']='Nessuna lingua selezionata.';
-$lng['error']['nosubjectcreate']='Devi definire un titolo per questo template Email.';
-$lng['error']['nomailbodycreate']='Devi definiro un testo per questo template Email.';
-$lng['error']['templatenotfound']='Il template non è stato trovato.';
-$lng['error']['alltemplatesdefined']='Non puoi definire altri template, tutte le lingue sono già definite.';
-$lng['error']['wwwnotallowed']='www non è ammesso come sottodominio.';
-$lng['error']['subdomainiswrong']='Il sottodominio %s contiene caratteri invalidi.';
-$lng['error']['domaincantbeempty']='Il nome dominio non può essere vuoto.';
-$lng['error']['domainexistalready']='Il dominio %s esiste già.';
-$lng['error']['domainisaliasorothercustomer']='Il dominio alias selezionato è a sua volta un dominio alias o appartiene ad un altro cliente.';
-$lng['error']['emailexistalready']='L\'indirizzo Email %s esiste già.';
-$lng['error']['maindomainnonexist']='Il dominio principale %s non esiste.';
-$lng['error']['destinationnonexist']='Per favore crea il tuo reindirizzamento nel campo \'Destinazione\'.';
-$lng['error']['destinationalreadyexistasmail']='Il reindirizzamento a %s esiste già come indirizzo Email attivo.';
-$lng['error']['destinationalreadyexist']='Hai già definito un reindirizzamento per %s .';
-$lng['error']['destinationiswrong']= 'Il reindirizzamento %s contiene caratteri invalidi o è incompleto.';
-$lng['error']['domainname']=$lng['domains']['domainname'];
-
-/**
- * Questions
- */
-$lng['question']['question'] = 'Domanda di sicurezza';
-$lng['question']['admin_customer_reallydelete'] = 'Sei sicuro di voler cancellare il cliente %s? Quest\'azione non potrà essere annullata!';
-$lng['question']['admin_domain_reallydelete'] = 'Sei sicuro di voler cancellare il dominio %s?';
-$lng['question']['admin_domain_reallydisablesecuritysetting'] = 'Sei sicuro di voler disattivare queste opzioni di sicurezza (OpenBasedir e/o SafeMode)?';
-$lng['question']['admin_admin_reallydelete'] = 'Sei sicuro di voler cancellare l\'admin %s? Tutti i clienti e i domini saranno affidati all\'amministratore principale.';
-$lng['question']['admin_template_reallydelete'] = 'Sei sicuro di voler cancellare il template \'%s\'?';
-$lng['question']['domains_reallydelete'] = 'Sei sicuro di voler cancellare il dominio %s?';
-$lng['question']['email_reallydelete'] = 'Sei sicuro di voler cancellare l\'indirizzo Email %s?';
-$lng['question']['email_reallydelete_account'] = 'Sei sicuro di voler cancellare l\'account Email di %s?';
-$lng['question']['email_reallydelete_forwarder'] = 'Sei sicuro di voler cancellare il reindirizzamento a %s?';
-$lng['question']['extras_reallydelete'] = 'Sei sicuro di voler cancellare la protezione per la cartella %s?';
-$lng['question']['extras_reallydelete_pathoptions'] = 'Sei sicuro di voler cancellare le opzioni cartella per %s?';
-$lng['question']['ftp_reallydelete'] = 'Sei sicuro di voler cancellare l\'account FTP %s?';
-$lng['question']['mysql_reallydelete'] = 'Sei sicuro di voler cancellare il database %s? Quest\'azione non potrà essere annullata!';
-$lng['question']['admin_configs_reallyrebuild'] = 'Sei sicuro di voler rigenerare i file di configurazione per Apache e Bind?';
-
-/**
- * Mails
- */
-$lng['mails']['pop_success']['mailbody'] = 'Salve,\n\nil tuo indirizzo Email {EMAIL}\nè stato configurato con successo.\n\nQuesta è un\'Email creata automaticamente,\n per favore non rispondere!\n\nCordiali saluti, SysCP-Team.';
-$lng['mails']['pop_success']['subject'] = 'Indirizzo Email configurato con successo';
-$lng['mails']['createcustomer']['mailbody'] = 'Salve {FIRSTNAME} {NAME},\n\nqueste sono le informazioni per il tuo account:\n\nNome Utente: {USERNAME}\nPassword: {PASSWORD}\n\nGrazie,\nSysCP-Team.';
-$lng['mails']['createcustomer']['subject'] = 'Informazioni account';
-
-/**
- * Admin
- */
-$lng['admin']['overview'] = 'Visione d\'insieme';
-$lng['admin']['ressourcedetails'] = 'Risorse utilizzate';
-$lng['admin']['systemdetails'] = 'Dettagli sistema';
-$lng['admin']['syscpdetails'] = 'Dettagli SysCP';
-$lng['admin']['installedversion'] = 'Versione installata';
-$lng['admin']['latestversion'] = 'Ultima versione disponibile';
-$lng['admin']['lookfornewversion']['clickhere'] = 'Cerca sul web';
-$lng['admin']['lookfornewversion']['error'] = 'Errore durante la lettura';
-$lng['admin']['resources'] = 'Risorse';
-$lng['admin']['customer'] = 'Cliente';
-$lng['admin']['customers'] = 'Clienti';
-$lng['admin']['customer_add'] = 'Crea cliente';
-$lng['admin']['customer_edit'] = 'Modifica cliente';
-$lng['admin']['domains'] = 'Domini';
-$lng['admin']['domain_add'] = 'Crea dominio';
-$lng['admin']['domain_edit'] = 'Modifica dominio';
-$lng['admin']['subdomainforemail'] = 'Sottodominio utilizzabile come dominio Email';
-$lng['admin']['admin'] = 'Admin';
-$lng['admin']['admins'] = 'Admin';
-$lng['admin']['admin_add'] = 'Crea admin';
-$lng['admin']['admin_edit'] = 'Modifica admin';
-$lng['admin']['customers_see_all'] = 'Può vedere tutti i clienti?';
-$lng['admin']['domains_see_all'] = 'Può vedere tutti i domini?';
-$lng['admin']['change_serversettings'] = 'Può cambiare le impostazioni del server?';
-$lng['admin']['server'] = 'Server';
-$lng['admin']['serversettings'] = 'Opzioni';
-$lng['admin']['rebuildconf'] = 'Rigenera file di configurazione';
-$lng['admin']['stdsubdomain'] = 'Sottodominio standard';
-$lng['admin']['stdsubdomain_add'] = 'Crea sottodominio standard';
-$lng['admin']['deactivated'] = 'Disattiva';
-$lng['admin']['deactivated_user'] = 'Disattiva utente';
-$lng['admin']['sendpassword'] = 'Invia password';
-$lng['admin']['ownvhostsettings'] = 'Impostazioni vHost speciali';
-$lng['admin']['configfiles']['serverconfiguration'] = 'Configurazione servizi';
-$lng['admin']['configfiles']['files'] = '<b>File di configurazione:</b> Per favore cambia questi file o creali<br />se non esistono, con il seguente contenuto.<br /><b>NOTA:</b> La password di MySQL non è stata rimpiazzata per ragioni di sicurezza.<br />Per favore rimpiazza "MYSQL_PASSWORD" con la password MySQL dell\'utente syscp. Se hai dimenticato la password per MySQL<br />la trovi in "lib/userdata.inc.php".';
-$lng['admin']['configfiles']['commands'] = '<b>Comandi:</b> Per favore esegui i seguenti comandi in una shell.';
-$lng['admin']['configfiles']['restart'] = '<b>Ricarica:</b> Per favore esegui i seguenti comandi (in ordine) in una shell per ricaricare la configurazione.';
-$lng['admin']['templates']['templates'] = 'Template';
-$lng['admin']['templates']['template_add'] = 'Aggiungi template';
-$lng['admin']['templates']['template_edit'] = 'Modifica template';
-$lng['admin']['templates']['action'] = 'Azione';
-$lng['admin']['templates']['email'] = 'Email';
-$lng['admin']['templates']['subject'] = 'Soggetto:';
-$lng['admin']['templates']['mailbody'] = 'Testo dell\'Email';
-$lng['admin']['templates']['createcustomer'] = 'Email di benvenuto per i nuovi clienti';
-$lng['admin']['templates']['pop_success'] = 'Benevenuto per ogni nuovo account Email';
-$lng['admin']['templates']['template_replace_vars'] = 'Variabili da cambiare nel template:';
-$lng['admin']['templates']['FIRSTNAME'] = 'Rimpiazzato con il nome del cliente.';
-$lng['admin']['templates']['NAME'] = 'Rimpiazzato con il cognome del cliente.';
-$lng['admin']['templates']['USERNAME'] = 'Rimpiazzato con il nome utente dell\'account.';
-$lng['admin']['templates']['PASSWORD'] = 'Rimpiazzato con la password dell\'account.';
-$lng['admin']['templates']['EMAIL'] = 'Rimapiazzato con l\'indirizzo dell\'account.';
-
-/**
- * Serversettings
- */
-$lng['serversettings']['session_timeout']['title'] = 'Timeout della sessione';
-$lng['serversettings']['session_timeout']['description'] = 'Quanto tempo un utente deve rimanere inattivo prima che la sessione diventi invalida (secondi)?';
-$lng['serversettings']['accountprefix']['title'] = 'Prefisso Cliente';
-$lng['serversettings']['accountprefix']['description'] = 'Che prefisso dovrebbero avere gli account dei clienti?';
-$lng['serversettings']['mysqlprefix']['title'] = 'Prefisso SQL';
-$lng['serversettings']['mysqlprefix']['description'] = 'Che prefisso dovrebbero avere i database SQL?';
-$lng['serversettings']['ftpprefix']['title'] = 'Prefisso FTP';
-$lng['serversettings']['ftpprefix']['description'] = 'Che prefisso dovrebbero avere gli account FTP?';
-$lng['serversettings']['documentroot_prefix']['title'] = 'Cartella dati web';
-$lng['serversettings']['documentroot_prefix']['description'] = 'Dove devono essere immagazzinati tutti i dati web?';
-$lng['serversettings']['logfiles_directory']['title'] = 'Cartella logfiles';
-$lng['serversettings']['logfiles_directory']['description'] = 'Dove devono essere immagazzinati tutti i log?';
-$lng['serversettings']['ipaddress']['title'] = 'Indirizzo IP';
-$lng['serversettings']['ipaddress']['description'] = 'Qual\'è l\'indirizzo IP di questo server?';
-$lng['serversettings']['hostname']['title'] = 'Hostname';
-$lng['serversettings']['hostname']['description'] = 'QUal\'è l\'hostname di questo server?';
-$lng['serversettings']['apacheconf_directory']['title'] = 'Cartella configurazione Apache';
-$lng['serversettings']['apacheconf_directory']['description'] = 'Dove sono i file di configurazione per Apache?';
-$lng['serversettings']['apachereload_command']['title'] = 'Comando riavvio Apache';
-$lng['serversettings']['apachereload_command']['description'] = 'Qual\'è il comando per riavviare Apache?';
-$lng['serversettings']['bindconf_directory']['title'] = 'Cartella configurazione Bind';
-$lng['serversettings']['bindconf_directory']['description'] = 'Dove sono i file di configurazione per Bind?';
-$lng['serversettings']['bindreload_command']['title'] = 'Comando riavvio Bind';
-$lng['serversettings']['bindreload_command']['description'] = 'Qual\'è il comando per riavviare Bind?';
-$lng['serversettings']['binddefaultzone']['title'] = 'Zona di default Bind';
-$lng['serversettings']['binddefaultzone']['description'] = 'Qual\'è il nome della zona di default Bind?';
-$lng['serversettings']['vmail_uid']['title'] = 'UID Email';
-$lng['serversettings']['vmail_uid']['description'] = 'Che UserID dovrebbe avere l\'utente che gestisce le Email?';
-$lng['serversettings']['vmail_gid']['title'] = 'GID Email';
-$lng['serversettings']['vmail_gid']['description'] = 'Che GroupID dovrebbe avere l\'utente che gestisce le Email?';
-$lng['serversettings']['vmail_homedir']['title'] = 'Cartella Email';
-$lng['serversettings']['vmail_homedir']['description'] = 'Dove devono essere immagazzinate tutte le Email?';
-$lng['serversettings']['adminmail']['title'] = 'Mittente';
-$lng['serversettings']['adminmail']['description'] = 'Qual\'è l\'indirizzo del mittente delle Email provenienti dal pannello?';
-$lng['serversettings']['phpmyadmin_url']['title'] = 'URL phpMyAdmin';
-$lng['serversettings']['phpmyadmin_url']['description'] = 'Qual\'è l\'URL di phpMyAdmin? (deve cominciare per http://)';
-$lng['serversettings']['webmail_url']['title'] = 'URL WebMail';
-$lng['serversettings']['webmail_url']['description'] = 'Qual\'è l\'URL della WebMail? (deve cominciare per http://)';
-$lng['serversettings']['webftp_url']['title'] = 'URL WebFTP';
-$lng['serversettings']['webftp_url']['description'] = 'Qual\'è l\'URL del WebFTP? (deve cominciare per http://)';
-$lng['serversettings']['language']['description'] = 'Qual\'è la lingua standard del tuo server?';
-$lng['serversettings']['maxloginattempts']['title'] = 'Numero massimo tentativi login';
-$lng['serversettings']['maxloginattempts']['description'] = 'Numero massimo di tentativi di login prima che l\'account sia disattivato.';
-$lng['serversettings']['deactivatetime']['title'] = 'Durata disattivamento';
-$lng['serversettings']['deactivatetime']['description'] = 'Tempo (sec.) di disattivazione dell\'account dopo troppi tentativi di login.';
-$lng['serversettings']['pathedit']['title'] = 'Modalità di scelta percorsi/cartelle';
-$lng['serversettings']['pathedit']['description'] = 'Un percorso/cartella andrà scelto attraverso un menu a tendina o inserendolo a mano?';
-
-/**
- * New strings
- */
-$lng['admin']['cronlastrun'] = 'Ultimo Cronjob';
-$lng['serversettings']['apacheconf_filename']['title'] = 'Nome file configurazione Apache';
-$lng['serversettings']['apacheconf_filename']['description'] = 'Come dovrebbe chiamarsi il file di configurazione di Apache?';
-$lng['serversettings']['paging']['title'] = 'Elementi da visualizzare per pagina';
-$lng['serversettings']['paging']['description'] = 'Quanti elementi dovrebbero essere visualizzati su una pagina? (0 = disattiva impaginazione)';
-$lng['error']['ipstillhasdomains']= 'La combinazione IP/Porta che vuoi eliminare ha ancora dei domini assegnati, per favore riassegna questi domini ad altre combinazioni IP/Porta prima di eliminare questa.';
-$lng['error']['cantdeletedefaultip'] = 'Non puoi eliminare la combinazione IP/Porta default dei rivenditori, per favore imposta un\'altra combinazione IP/Porta come default dei rivenditori prima di eliminare questa.';
-$lng['error']['cantdeletesystemip'] = 'Non puoi eliminare l\'ultima IP di sistema, crea un\'altra combinazione IP/Porta per l\'IP di sistema o cambia l\'IP di sistema.';
-$lng['error']['myipaddress'] = '\'IP\'';
-$lng['error']['myport'] = '\'Porta\'';
-$lng['error']['myipdefault'] = 'Devi selezionare una combinazione IP/Porta che diventerà default.';
-$lng['error']['myipnotdouble'] = 'Questa combinazione IP/Porta esiste già.';
-$lng['question']['admin_ip_reallydelete'] = 'Vuoi veramente eliminare l\'indirizzo IP %s?';
-$lng['admin']['ipsandports']['ipsandports'] = 'IP e Porte';
-$lng['admin']['ipsandports']['add'] = 'Aggiungi IP/Porta';
-$lng['admin']['ipsandports']['edit'] = 'Modifica IP/Porta';
-$lng['admin']['ipsandports']['ipandport'] = 'IP/Porta';
-$lng['admin']['ipsandports']['ip'] = 'IP';
-$lng['admin']['ipsandports']['port'] = 'Porta';
-$lng['admin']['ipsandports']['default'] = 'IP/Porta default dei rivenditori';
-$lng['error']['cantchangesystemip'] = 'Non puoi cambiare l\'ultima IP di sistema, crea un\'altra combinazione IP/Porta per l\'IP di sistema o cambia l\'IP di sistema.';
-$lng['question']['admin_domain_reallydocrootoutofcustomerroot'] = 'Sei sicuro di volere la cartella base dei dati web di questo dominio al di fuori della cartella base del cliente?';
-$lng['menue']['mysql']['users'] = 'Utenti';
-$lng['mysql']['databaseuser'] = 'Utente database';
-$lng['mysql']['databasesuffix'] = 'Suffisso database';
-$lng['mysql']['password_confirm'] = 'Password (conferma)';
-$lng['mysql']['database_create_user'] = 'Crea utente';
-$lng['mysql']['database_change'] = 'Cambia impostazioni database';
-$lng['mysql']['database_change_user'] = 'Cambia impostazioni utente';
-$lng['error']['passwordnomatch'] = 'Le password inserite non corrispondono.';
-$lng['error']['missingdbuser'] = 'Devi selezionare un utente per il database!';
-$lng['error']['nodbuseryet'] = 'Devi prima creare un utente database!';
-$lng['error']['dbuserstillhasdb'] = 'Non puoi eliminare questo utente database, ha ancora dei database assegnati!<br />Per favore prima riassegna od elimina tutti i database assegnati a questo utente.';
-$lng['question']['mysql_reallydelete_user'] = 'Vuoi veramente eliminare l\'utente %s? Quest\'azione non potrà essere annullata!';
-$lng['ftp']['ftpsuffix'] = 'Suffisso account';
-$lng['extras']['view_execcgi'] = 'Permetti esecuzione CGI';
-$lng['extras']['directory_execcgi'] = 'Esegui script CGI';
-$lng['extras']['php4'] = 'PHP4';
-$lng['extras']['php5'] = 'PHP5';
-$lng['extras']['view_phpversionselect'] = 'Versione PHP';
-$lng['extras']['directory_phpversionselect'] = 'Versione PHP abilitata';
-?>
\ No newline at end of file diff --git a/syscp/patches/mysql-ftp-patch/syscp-1.2.13-mysql-ftp-patch-r3.tar.bz2 b/syscp/patches/mysql-ftp-patch/syscp-1.2.13-mysql-ftp-patch-r3.tar.bz2 Binary files differdeleted file mode 100644 index 7f76972..0000000 --- a/syscp/patches/mysql-ftp-patch/syscp-1.2.13-mysql-ftp-patch-r3.tar.bz2 +++ /dev/null diff --git a/syscp/patches/mysql-ftp-patch/syscp-1.2.13-mysqli-ftpi.patch b/syscp/patches/mysql-ftp-patch/syscp-1.2.13-mysqli-ftpi.patch deleted file mode 100644 index eeaf12e..0000000 --- a/syscp/patches/mysql-ftp-patch/syscp-1.2.13-mysqli-ftpi.patch +++ /dev/null @@ -1,712 +0,0 @@ -diff -Nru syscp-gentoo-comp/admin_customers.php syscp-mysql-ftp-imp/admin_customers.php ---- syscp-gentoo-comp/admin_customers.php 2006-03-26 00:52:39.000000000 +0100 -+++ syscp-mysql-ftp-imp/admin_customers.php 2006-03-26 00:54:43.000000000 +0100 -@@ -158,20 +158,24 @@ - if(isset($_POST['send']) && $_POST['send']=='send') - { - $databases=$db->query("SELECT * FROM ".TABLE_PANEL_DATABASES." WHERE customerid='$id'"); -+ $databasesusers=$db->query("SELECT * FROM ".TABLE_PANEL_DATABASES_USERS." WHERE customerid='$id'"); - $db_root=new db($sql['host'],$sql['root_user'],$sql['root_password'],''); - unset($db_root->password); - while($row_database=$db->fetch_array($databases)) - { -- $db_root->query( 'REVOKE ALL PRIVILEGES ON * . * FROM `' . $row_database['databasename'] . '`@' . $settings['system']['mysql_access_host'] . ';' ); -- $db_root->query( 'REVOKE ALL PRIVILEGES ON `' . str_replace ( '_' , '\_' , $row_database['databasename'] ) . '` . * FROM `' . $row_database['databasename'] . '`@' . $settings['system']['mysql_access_host'] . ';' ); -- $db_root->query( 'DELETE FROM `mysql`.`user` WHERE `User` = "' . $row_database['databasename'] . '" AND `Host` = "' . $settings['system']['mysql_access_host'] . '"' ); - $db_root->query( 'DROP DATABASE IF EXISTS `' . $row_database['databasename'] . '`' ); - } -+ while($row_databaseuser=$db->fetch_array($databasesusers)) -+ { -+ $db_root->query( 'REVOKE ALL PRIVILEGES ON * . * FROM `' . $row_databaseuser['databaseuser'] . '`@' . $settings['system']['mysql_access_host'] . ';' ); -+ $db_root->query( 'DELETE FROM `mysql`.`user` WHERE `User` = "' . $row_databaseuser['databaseuser'] . '" AND `Host` = "' . $settings['system']['mysql_access_host'] . '"' ); -+ } - $db_root->query('FLUSH PRIVILEGES;'); - $db_root->close(); - - $db->query("DELETE FROM `".TABLE_PANEL_CUSTOMERS."` WHERE `customerid`='$id'"); - $db->query("DELETE FROM `".TABLE_PANEL_DATABASES."` WHERE `customerid`='$id'"); -+ $db->query("DELETE FROM `".TABLE_PANEL_DATABASES_USERS."` WHERE `customerid`='$id'"); - $db->query("DELETE FROM `".TABLE_PANEL_DOMAINS."` WHERE `customerid`='$id'"); - $domains_deleted = $db->affected_rows(); - $db->query("DELETE FROM `".TABLE_PANEL_HTPASSWDS."` WHERE `customerid`='$id'"); -diff -Nru syscp-gentoo-comp/admin_settings.php syscp-mysql-ftp-imp/admin_settings.php ---- syscp-gentoo-comp/admin_settings.php 2006-03-26 00:52:22.000000000 +0100 -+++ syscp-mysql-ftp-imp/admin_settings.php 2006-03-26 00:54:43.000000000 +0100 -@@ -111,10 +111,10 @@ - $update_users = '"' . $sql['user'] . '", "' . $sql['root_user'] . '"' ; - - // Update all customer databases -- $databases = $db->query('SELECT `databasename` FROM `' . TABLE_PANEL_DATABASES . '`;'); -+ $databases = $db->query('SELECT `databaseuser` FROM `' . TABLE_PANEL_DATABASES_USERS . '`;'); - while ( $database = $db->fetch_array ( $databases ) ) - { -- $update_users .= ', "' . $database['databasename'] .'"' ; -+ $update_users .= ', "' . $database['databaseuser'] .'"' ; - } - - // Do the update -diff -Nru syscp-gentoo-comp/customer_ftp.php syscp-mysql-ftp-imp/customer_ftp.php ---- syscp-gentoo-comp/customer_ftp.php 2006-03-26 00:52:22.000000000 +0100 -+++ syscp-mysql-ftp-imp/customer_ftp.php 2006-03-26 00:54:43.000000000 +0100 -@@ -162,10 +162,17 @@ - { - standard_error('patherror'); - } -- - else - { -- $username=$userinfo['loginname'].$settings['customer']['ftpprefix'].(intval($userinfo['ftp_lastaccountnumber'])+1); -+ $usernamesuffix=addslashes($_POST['usernamesuffix']); -+ if($usernamesuffix=='') -+ { -+ $username=$userinfo['loginname'].$settings['customer']['ftpprefix'].(intval($userinfo['ftp_lastaccountnumber'])+1); -+ } -+ else -+ { -+ $username=$userinfo['loginname'].$settings['customer']['ftpprefix'].(intval($userinfo['ftp_lastaccountnumber'])+1).'_'.$usernamesuffix; -+ } - $db->query("INSERT INTO `".TABLE_FTP_USERS."` (`customerid`, `username`, `password`, `homedir`, `login_enabled`, `uid`, `gid`) VALUES ('".$userinfo['customerid']."', '$username', ENCRYPT('$password'), '$path', 'y', '".$userinfo['guid']."', '".$userinfo['guid']."')"); - $db->query("UPDATE `".TABLE_FTP_GROUPS."` SET `members`=CONCAT_WS(',',`members`,'".$username."') WHERE `customerid`='".$userinfo['customerid']."' AND `gid`='".$userinfo['guid']."'"); - // $db->query("INSERT INTO `".TABLE_FTP_GROUPS."` (`customerid`, `groupname`, `gid`, `members`) VALUES ('".$userinfo['customerid']."', '$username', '$uid', '$username')"); -diff -Nru syscp-gentoo-comp/customer_mysql.php syscp-mysql-ftp-imp/customer_mysql.php ---- syscp-gentoo-comp/customer_mysql.php 2006-03-26 00:52:22.000000000 +0100 -+++ syscp-mysql-ftp-imp/customer_mysql.php 2006-03-26 00:54:43.000000000 +0100 -@@ -11,8 +11,9 @@ - * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * -- * @author Florian Lippert <flo@redenswert.de> -+ * @author Florian Lippert <flo@redenswert.de>, Luca Longinotti <chtekk@gentoo.org> - * @copyright (C) 2003-2004 Florian Lippert -+ * @copyright (C) 2006 Luca Longinotti - * @package Panel - * @version $Id: customer_mysql.php 213 2005-08-11 21:28:10Z flo $ - */ -@@ -42,7 +43,7 @@ - { - if($action=='') - { -- $result=$db->query( "SELECT `id`, `databasename`, `description` FROM `" . TABLE_PANEL_DATABASES . "` WHERE `customerid`='" . $userinfo['customerid'] . "' ORDER BY `databasename` ASC" ); -+ $result=$db->query( 'SELECT `id`, `databaseuser`, `databasename`, `description` FROM `' . TABLE_PANEL_DATABASES . '` WHERE `customerid`="' . $userinfo['customerid'] . '" ORDER BY `databasename` ASC' ); - $mysqls=''; - while($row=$db->fetch_array($result)) - { -@@ -50,13 +51,177 @@ - } - $mysqls_count = $db->num_rows($result); - -+ $result2=$db->query( 'SELECT `id`, `databaseuser` FROM `' . TABLE_PANEL_DATABASES_USERS . '` WHERE `customerid`="' . $userinfo['customerid'] . '" ORDER BY `databaseuser` ASC' ); -+ $mysqlsusers=''; -+ while($row=$db->fetch_array($result2)) -+ { -+ eval("\$mysqlsusers.=\"".getTemplate("mysql/mysqls_database_user")."\";"); -+ } -+ $mysqls_count_users = $db->num_rows($result2); -+ - eval("echo \"".getTemplate("mysql/mysqls")."\";"); - } - -+ elseif($action=='adduser') -+ { -+ if($userinfo['mysqls_used_users'] < $userinfo['mysqls'] || $userinfo['mysqls'] == '-1') -+ { -+ if(isset($_POST['send']) && $_POST['send']=='send') -+ { -+ $password=addslashes($_POST['password']); -+ $passwordconfirm=addslashes($_POST['passwordconfirm']); -+ if($password=='' || $passwordconfirm=='') -+ { -+ standard_error(array('stringisempty','mypassword')); -+ } -+ elseif($password != $passwordconfirm) -+ { -+ standard_error('passwordnomatch'); -+ } -+ else -+ { -+ $username=$userinfo['loginname'].$settings['customer']['mysqlprefix'].(intval($userinfo['mysql_lastusernumber'])+1); -+ -+ // Begin root-session -+ $db_root=new db($sql['host'],$sql['root_user'],$sql['root_password'],''); -+ unset($db_root->password); -+ -+ $db_root->query( 'GRANT USAGE ON *.* TO `' . $username . '`@' . $settings['system']['mysql_access_host'] ); -+ $db_root->query( 'SET PASSWORD FOR `' . $username . '`@' . $settings['system']['mysql_access_host'] . ' = PASSWORD(\'' . $password . '\')' ); -+ $db_root->query( 'FLUSH PRIVILEGES' ); -+ -+ $db_root->close(); -+ // End root-session -+ -+ $result=$db->query( 'INSERT INTO `' . TABLE_PANEL_DATABASES_USERS . '` (`customerid`, `databaseuser`) VALUES ("' . $userinfo['customerid'] . '", "' . $username . '")' ); -+ $result=$db->query( 'UPDATE `' . TABLE_PANEL_CUSTOMERS . '` SET `mysqls_used_users`=`mysqls_used_users`+1, `mysql_lastusernumber`=`mysql_lastusernumber`+1 WHERE `customerid`="' . $userinfo['customerid'] . '"' ); -+ -+ redirectTo ( $filename , Array ( 'page' => $page , 's' => $s ) ) ; -+ } -+ } -+ else -+ { -+ eval("echo \"".getTemplate("mysql/mysqls_add_user")."\";"); -+ } -+ } -+ } -+ -+ elseif($action=='add') -+ { -+ if($userinfo['mysqls_used'] < $userinfo['mysqls'] || $userinfo['mysqls'] == '-1') -+ { -+ if(isset($_POST['send']) && $_POST['send']=='send') -+ { -+ $databaseuser=addslashes($_POST['databaseuser']); -+ if($databaseuser=='') -+ { -+ standard_error('missingdbuser'); -+ } -+ else -+ { -+ $databasesuffix=addslashes($_POST['databasesuffix']); -+ if($databasesuffix=='') -+ { -+ $databasename=$userinfo['loginname'].$settings['customer']['mysqlprefix'].(intval($userinfo['mysql_lastaccountnumber'])+1); -+ } -+ else -+ { -+ $databasename=$userinfo['loginname'].$settings['customer']['mysqlprefix'].(intval($userinfo['mysql_lastaccountnumber'])+1).'_'.$databasesuffix; -+ } -+ -+ // Begin root-session -+ $db_root=new db($sql['host'],$sql['root_user'],$sql['root_password'],''); -+ unset($db_root->password); -+ -+ $db_root->query( 'CREATE DATABASE `' . $databasename . '`' ); -+ $db_root->query( 'GRANT ALL PRIVILEGES ON `' . str_replace ( '_' , '\_' , $databasename ) . '`.* TO `' . $databaseuser . '`@' . $settings['system']['mysql_access_host'] . ';' ); -+ $db_root->query( 'FLUSH PRIVILEGES' ); -+ -+ $db_root->close(); -+ // End root-session -+ -+ $databasedescription=addslashes($_POST['description']); -+ $result=$db->query( 'INSERT INTO `' . TABLE_PANEL_DATABASES . '` (`customerid`, `databaseuser`, `databasename`, `description`) VALUES ("' . $userinfo['customerid'] . '", "' . $databaseuser . '", "' . $databasename . '", "' . $databasedescription . '")' ); -+ $result=$db->query( 'UPDATE `' . TABLE_PANEL_CUSTOMERS . '` SET `mysqls_used`=`mysqls_used`+1, `mysql_lastaccountnumber`=`mysql_lastaccountnumber`+1 WHERE `customerid`="' . $userinfo['customerid'] . '"' ); -+ -+ redirectTo ( $filename , Array ( 'page' => $page , 's' => $s ) ) ; -+ } -+ } -+ else -+ { -+ $result=$db->query_first( 'SELECT `id`, `databaseuser` FROM `' . TABLE_PANEL_DATABASES_USERS . '` WHERE `customerid`="' . $userinfo['customerid'] . '" ORDER BY `databaseuser` ASC' ); -+ if(isset($result['databaseuser']) && $result['databaseuser'] != '') -+ { -+ $result2=$db->query( 'SELECT `id`, `databaseuser` FROM `' . TABLE_PANEL_DATABASES_USERS . '` WHERE `customerid`="' . $userinfo['customerid'] . '" ORDER BY `databaseuser` ASC' ); -+ $databaseuser=''; -+ while($row=$db->fetch_array($result2)) -+ { -+ $databaseuser.=makeoption($row['databaseuser'],$row['databaseuser']); -+ } -+ -+ eval("echo \"".getTemplate("mysql/mysqls_add")."\";"); -+ } -+ else -+ { -+ standard_error('nodbuseryet'); -+ } -+ -+ } -+ } -+ } -+ -+ elseif($action=='deleteuser' && $id!=0) -+ { -+ $result=$db->query_first( 'SELECT `id`, `databaseuser` FROM `' . TABLE_PANEL_DATABASES_USERS . '` WHERE `customerid`="' . $userinfo['customerid'] . '" AND `id`="' . $id . '"' ); -+ if(isset($result['databaseuser']) && $result['databaseuser'] != '') -+ { -+ if(isset($_POST['send']) && $_POST['send']=='send') -+ { -+ $result2=$db->query_first( 'SELECT `id`, `databasename` FROM `' . TABLE_PANEL_DATABASES . '` WHERE `customerid`="' . $userinfo['customerid'] . '" AND `databaseuser`="' . $result['databaseuser'] . '"' ); -+ if(isset($result2['databasename']) && $result2['databasename'] != '') -+ { -+ standard_error('dbuserstillhasdb'); -+ } -+ else -+ { -+ // Begin root-session -+ $db_root=new db($sql['host'],$sql['root_user'],$sql['root_password'],''); -+ unset($db_root->password); -+ -+ $db_root->query( 'REVOKE ALL PRIVILEGES ON * . * FROM `' . $result['databaseuser'] . '`@' . $settings['system']['mysql_access_host'] . ';' ); -+ $db_root->query( 'DELETE FROM `mysql`.`user` WHERE `User` = "' . $result['databaseuser'] . '" AND `Host` = "' . $settings['system']['mysql_access_host'] . '"' ); -+ $db_root->query( 'FLUSH PRIVILEGES' ); -+ -+ $db_root->close(); -+ // End root-session -+ -+ $result=$db->query( 'DELETE FROM `' . TABLE_PANEL_DATABASES_USERS . '` WHERE `customerid`="' . $userinfo['customerid'] . '" AND `databaseuser`="' . $result['databaseuser'] . '"' ); -+ -+ if($userinfo['mysqls_used_users']=='1') -+ { -+ $resetusrnumber=" , `mysql_lastusernumber`='0' "; -+ } -+ else -+ { -+ $resetusrnumber=''; -+ } -+ -+ $result=$db->query( 'UPDATE `' . TABLE_PANEL_CUSTOMERS . '` SET `mysqls_used_users`=`mysqls_used_users`-1 ' . $resetusrnumber . 'WHERE `customerid`="' . $userinfo['customerid'] .'"' ); -+ -+ redirectTo ( $filename , Array ( 'page' => $page , 's' => $s ) ) ; -+ } -+ } -+ else -+ { -+ ask_yesno('mysql_reallydelete_user', $filename, "id=$id;page=$page;action=$action", $result['databaseuser']); -+ } -+ } -+ } -+ - elseif($action=='delete' && $id!=0) - { -- $result=$db->query_first( 'SELECT `id`, `databasename` FROM `' . TABLE_PANEL_DATABASES . '` WHERE `customerid`="' . $userinfo['customerid'] . '" AND `id`="' . $id . '"' ); -- if(isset($result['databasename']) && $result['databasename'] != '') -+ $result=$db->query_first( 'SELECT `id`, `databasename`, `databaseuser` FROM `' . TABLE_PANEL_DATABASES . '` WHERE `customerid`="' . $userinfo['customerid'] . '" AND `id`="' . $id . '"' ); -+ if(isset($result['databasename']) && $result['databasename'] != '' && isset($result['databaseuser']) && $result['databaseuser'] != '') - { - if(isset($_POST['send']) && $_POST['send']=='send') - { -@@ -64,16 +229,14 @@ - $db_root=new db($sql['host'],$sql['root_user'],$sql['root_password'],''); - unset($db_root->password); - -- $db_root->query( 'REVOKE ALL PRIVILEGES ON * . * FROM `' . $result['databasename'] . '`@' . $settings['system']['mysql_access_host'] . ';' ); -- $db_root->query( 'REVOKE ALL PRIVILEGES ON `' . str_replace ( '_' , '\_' , $result['databasename'] ) . '` . * FROM `' . $result['databasename'] . '`@' . $settings['system']['mysql_access_host'] . ';' ); -- $db_root->query( 'DELETE FROM `mysql`.`user` WHERE `User` = "' . $result['databasename'] . '" AND `Host` = "' . $settings['system']['mysql_access_host'] . '"' ); -+ $db_root->query( 'REVOKE ALL PRIVILEGES ON `' . str_replace ( '_' , '\_' , $result['databasename'] ) . '` . * FROM `' . $result['databaseuser'] . '`@' . $settings['system']['mysql_access_host'] . ';' ); - $db_root->query( 'DROP DATABASE IF EXISTS `' . $result['databasename'] . '`' ); - $db_root->query( 'FLUSH PRIVILEGES' ); - - $db_root->close(); - // End root-session -- -- $db->query( 'DELETE FROM `' . TABLE_PANEL_DATABASES . '` WHERE `customerid`="' . $userinfo['customerid'] . '" AND `id`="' . $id . '"' ); -+ -+ $result=$db->query( 'DELETE FROM `' . TABLE_PANEL_DATABASES . '` WHERE `customerid`="' . $userinfo['customerid'] . '" AND `databasename`="' . $result['databasename'] . '"' ); - - if($userinfo['mysqls_used']=='1') - { -@@ -88,89 +251,97 @@ - - redirectTo ( $filename , Array ( 'page' => $page , 's' => $s ) ) ; - } -- else -+ else - { - ask_yesno('mysql_reallydelete', $filename, "id=$id;page=$page;action=$action", $result['databasename']); - } - } - } - -- elseif($action=='add') -+ elseif($action=='edituser' && $id!=0) - { -- if($userinfo['mysqls_used'] < $userinfo['mysqls'] || $userinfo['mysqls'] == '-1') -+ $result=$db->query_first( 'SELECT `id`, `databaseuser` FROM `' . TABLE_PANEL_DATABASES_USERS . '` WHERE `customerid`="' . $userinfo['customerid'] . '" AND `id`="' . $id . '"' ); -+ if(isset($result['databaseuser']) && $result['databaseuser'] != '') - { - if(isset($_POST['send']) && $_POST['send']=='send') - { - $password=addslashes($_POST['password']); -- if($password=='') -+ $passwordconfirm=addslashes($_POST['passwordconfirm']); -+ if($password=='' || $passwordconfirm=='') - { - standard_error(array('stringisempty','mypassword')); - } -+ elseif($password != $passwordconfirm) -+ { -+ standard_error('passwordnomatch'); -+ } - else - { -- $username=$userinfo['loginname'].$settings['customer']['mysqlprefix'].(intval($userinfo['mysql_lastaccountnumber'])+1); -- - // Begin root-session - $db_root=new db($sql['host'],$sql['root_user'],$sql['root_password'],''); - unset($db_root->password); - -- $db_root->query( 'CREATE DATABASE `' . $username . '`' ); -- $db_root->query( 'GRANT ALL PRIVILEGES ON `' . str_replace ( '_' , '\_' , $username ) . '`.* TO `' . $username . '`@' . $settings['system']['mysql_access_host'] . ' IDENTIFIED BY \'password\'' ); -- $db_root->query( 'SET PASSWORD FOR `' . $username .'`@' . $settings['system']['mysql_access_host'] . ' = PASSWORD(\'' . $password . '\')' ); -- $db_root->query( 'FLUSH PRIVILEGES' ); -+ $db_root->query('SET PASSWORD FOR `' . $result['databaseuser'] . '`@' . $settings['system']['mysql_access_host'] . ' = PASSWORD(\'' . $password .'\')'); -+ $db_root->query('FLUSH PRIVILEGES'); - - $db_root->close(); - // End root-session -- -- // Statement modifyed for Database description -- PH 2004-11-29 -- $databasedescription=addslashes($_POST['description']); -- $result=$db->query( 'INSERT INTO `' . TABLE_PANEL_DATABASES . '` (`customerid`, `databasename`, `description`) VALUES ("' . $userinfo['customerid'] .'", "' . $username .'", "' . $databasedescription .'")' ); -- $result=$db->query( 'UPDATE `' . TABLE_PANEL_CUSTOMERS . '` SET `mysqls_used`=`mysqls_used`+1, `mysql_lastaccountnumber`=`mysql_lastaccountnumber`+1 WHERE `customerid`="' . $userinfo['customerid'] . '"' ); -- -- redirectTo ( $filename , Array ( 'page' => $page , 's' => $s ) ) ; - } -+ -+ redirectTo ( $filename , Array ( 'page' => $page , 's' => $s ) ) ; - } -- else -+ else - { -- eval("echo \"".getTemplate("mysql/mysqls_add")."\";"); -+ eval("echo \"".getTemplate("mysql/mysqls_edit_user")."\";"); - } - } - } - - elseif($action=='edit' && $id!=0) - { -- $result=$db->query_first( 'SELECT `id`, `databasename`, `description` FROM `' . TABLE_PANEL_DATABASES . '` WHERE `customerid`="' . $userinfo['customerid'] . '" AND `id`="' . $id . '"' ); -- if(isset($result['databasename']) && $result['databasename'] != '') -+ $result=$db->query_first( 'SELECT `id`, `databasename`, `databaseuser`, `description` FROM `' . TABLE_PANEL_DATABASES . '` WHERE `customerid`="' . $userinfo['customerid'] . '" AND `id`="' . $id . '"' ); -+ if(isset($result['databasename']) && $result['databasename'] != '' && isset($result['databaseuser']) && $result['databaseuser'] != '') - { - if(isset($_POST['send']) && $_POST['send']=='send') - { -- // Only change Password if it is set, do nothing if it is empty! -- PH 2004-11-29 -- $password=addslashes($_POST['password']); -- if($password!='') -+ $databaseuser=addslashes($_POST['databaseuser']); -+ if($databaseuser=='') -+ { -+ standard_error('missingdbuser'); -+ } -+ else - { - // Begin root-session - $db_root=new db($sql['host'],$sql['root_user'],$sql['root_password'],''); - unset($db_root->password); - -- $db_root->query('SET PASSWORD FOR `'.$result['databasename'].'`@' . $settings['system']['mysql_access_host'] . ' = PASSWORD(\'' . $password .'\')'); -- $db_root->query('FLUSH PRIVILEGES'); -+ $db_root->query( 'REVOKE ALL PRIVILEGES ON `' . str_replace ( '_' , '\_' , $result['databasename'] ) . '` . * FROM `' . $result['databaseuser'] . '`@' . $settings['system']['mysql_access_host'] . ';' ); -+ $db_root->query( 'GRANT ALL PRIVILEGES ON `' . str_replace ( '_' , '\_' , $result['databasename'] ) . '`.* TO `' . $databaseuser . '`@' . $settings['system']['mysql_access_host'] . ';' ); -+ $db_root->query( 'FLUSH PRIVILEGES' ); - - $db_root->close(); - // End root-session -+ -+ $result=$db->query( 'UPDATE `' . TABLE_PANEL_DATABASES . '` SET `databaseuser`="' . $databaseuser . '" WHERE `customerid`="' . $userinfo['customerid'] . '" AND `id`="' . $id . '"'); - } - -- // Update the Database description -- PH 2004-11-29 - $databasedescription=addslashes($_POST['description']); - $result=$db->query( 'UPDATE `' . TABLE_PANEL_DATABASES . '` SET `description`="' . $databasedescription . '" WHERE `customerid`="' . $userinfo['customerid'] . '" AND `id`="' . $id . '"'); - -- redirectTo ( $filename , Array ( 'page' => $page , 's' => $s ) ) ; -+ redirectTo ( $filename , Array ( 'page' => $page , 's' => $s ) ) ; - } -- else -+ else - { -+ $result2=$db->query( 'SELECT `id`, `databaseuser` FROM `' . TABLE_PANEL_DATABASES_USERS . '` WHERE `customerid`="' . $userinfo['customerid'] . '" ORDER BY `databaseuser` ASC' ); -+ $databaseuser=''; -+ while($row=$db->fetch_array($result2)) -+ { -+ $databaseuser.=makeoption($row['databaseuser'],$row['databaseuser'],$result['databaseuser']); -+ } -+ - eval("echo \"".getTemplate("mysql/mysqls_edit")."\";"); - } - } - } - } -- - ?> -\ No newline at end of file -diff -Nru syscp-gentoo-comp/lib/functions.php syscp-mysql-ftp-imp/lib/functions.php ---- syscp-gentoo-comp/lib/functions.php 2006-03-26 00:52:22.000000000 +0100 -+++ syscp-mysql-ftp-imp/lib/functions.php 2006-03-26 00:54:43.000000000 +0100 -@@ -650,6 +650,12 @@ - 'FROM `'.TABLE_PANEL_DATABASES.'` ' . - 'WHERE `customerid` = "'.$customer['customerid'].'"' - ); -+ -+ $customer_mysqls_users = $db->query_first( -+ 'SELECT COUNT(*) AS `number_mysqls_users` ' . -+ 'FROM `'.TABLE_PANEL_DATABASES_USERS.'` ' . -+ 'WHERE `customerid` = "'.$customer['customerid'].'"' -+ ); - - $customer_emails = $db->query_first( - 'SELECT COUNT(*) AS `number_emails` ' . -@@ -695,6 +701,7 @@ - $db->query( - 'UPDATE `'.TABLE_PANEL_CUSTOMERS.'` ' . - 'SET `mysqls_used` = "'.$customer_mysqls['number_mysqls'].'", ' . -+ ' `mysqls_used_users` = "'.$customer_mysqls_users['number_mysqls_users'].'", ' . - ' `emails_used` = "'.$customer_emails['number_emails'].'", ' . - ' `email_accounts_used` = "'.$customer_email_accounts.'", ' . - ' `email_forwarders_used` = "'.$customer_email_forwarders.'", ' . -diff -Nru syscp-gentoo-comp/lib/tables.inc.php syscp-mysql-ftp-imp/lib/tables.inc.php ---- syscp-gentoo-comp/lib/tables.inc.php 2006-03-26 00:52:22.000000000 +0100 -+++ syscp-mysql-ftp-imp/lib/tables.inc.php 2006-03-26 00:54:43.000000000 +0100 -@@ -24,6 +24,7 @@ - define('TABLE_PANEL_ADMINS','panel_admins'); - define('TABLE_PANEL_CUSTOMERS','panel_customers'); - define('TABLE_PANEL_DATABASES','panel_databases'); -+define('TABLE_PANEL_DATABASES_USERS','panel_databases_users'); - define('TABLE_PANEL_DOMAINS','panel_domains'); - define('TABLE_PANEL_HTACCESS','panel_htaccess'); - define('TABLE_PANEL_HTPASSWDS','panel_htpasswds'); -diff -Nru syscp-gentoo-comp/lng/english.lng.php syscp-mysql-ftp-imp/lng/english.lng.php ---- syscp-gentoo-comp/lng/english.lng.php 2006-03-26 00:52:22.000000000 +0100 -+++ syscp-mysql-ftp-imp/lng/english.lng.php 2006-03-26 01:00:45.000000000 +0100 -@@ -143,8 +143,6 @@ - /** - * MySQL - */ --$lng['mysql']['databasename'] = 'user/database name'; --$lng['mysql']['databasedescription'] = 'database description'; - $lng['mysql']['database_create'] = 'Create database'; - - /** -@@ -363,7 +361,6 @@ - /** - * CHANGED BETWEEN 1.2.12 and 1.2.13 - */ --$lng['mysql']['description'] = 'Here you can create and change your MySQL-Databases.<br />The changes are made instantly and the database can be used immediately.<br />At the menu on the left side you find the tool phpMyAdmin with which you can easily administer your database.<br /><br />To use your databases in your own php-scripts use the following settings: (The data in <i>italics</i> have to be changed into the equivalents you typed in!)<br />Hostname: <b>localhost</b><br />Username: <b><i>Databasename</i></b><br />Password: <b><i>the password you\'ve chosen</i></b><br />Database: <b><i>Databasename</i></b>'; - - /** - * ADDED BETWEEN 1.2.12 and 1.2.13 -@@ -392,4 +389,28 @@ - // ADDED IN 1.2.13-rc3 - $lng['error']['cantchangesystemip'] = 'You cannot change the last system IP, either create another new IP/Port combination for the system IP or change the system IP.'; - $lng['question']['admin_domain_reallydocrootoutofcustomerroot'] = 'Are you sure, you want the document root for this domain, not being within the customerroot of the customer?'; -+ -+/** -+ * CHANGED FOR MYSQL/FTP IMPROVED PATCH -+ */ -+$lng['mysql']['description'] = 'Here you can create and change your MySQL databases.<br />The changes are made instantly and the databases can be used immediately.<br />At the menu on the left side you\'ll find the tool phpMyAdmin with which you can easily administer your databases.<br /><br />To use your databases in your own PHP scripts use the following settings: (The data in <i>italics</i> have to be changed into the equivalents you typed in!)<br />Hostname: <b>localhost</b><br />Username: <b><i>the username you\'ve chosen for that database</i></b><br />Password: <b><i>the password you\'ve chosen for that user</i></b><br />Database: <b><i>the name of the database</i></b>'; -+$lng['mysql']['databasename'] = 'Database name'; -+$lng['mysql']['databasedescription'] = 'Database description'; -+ -+/** -+ * ADDED FOR MYSQL/FTP IMPROVED PATCH -+ */ -+$lng['menue']['mysql']['users'] = 'Users'; -+$lng['mysql']['databaseuser'] = 'Database user'; -+$lng['mysql']['databasesuffix'] = 'Database suffix'; -+$lng['mysql']['password_confirm'] = 'Password (confirm)'; -+$lng['mysql']['database_create_user'] = 'Create user'; -+$lng['mysql']['database_change'] = 'Change database settings'; -+$lng['mysql']['database_change_user'] = 'Change user settings'; -+$lng['error']['passwordnomatch'] = 'The passwords you inserted do not match.'; -+$lng['error']['missingdbuser'] = 'You need to select an user for the database.'; -+$lng['error']['nodbuseryet'] = 'You need to create a database user first!'; -+$lng['error']['dbuserstillhasdb'] = 'You cannot delete this database user, databases are still assigned to it!<br />Please reassign or delete all databases assigned to this user first.'; -+$lng['question']['mysql_reallydelete_user'] = 'Do you really want to delete the user %s? This cannot be undone!'; -+$lng['ftp']['ftpsuffix'] = 'Account suffix'; - ?> -\ No newline at end of file -diff -Nru syscp-gentoo-comp/templates/customer/ftp/accounts_add.tpl syscp-mysql-ftp-imp/templates/customer/ftp/accounts_add.tpl ---- syscp-gentoo-comp/templates/customer/ftp/accounts_add.tpl 2006-03-26 00:54:10.000000000 +0100 -+++ syscp-mysql-ftp-imp/templates/customer/ftp/accounts_add.tpl 2006-03-26 00:54:43.000000000 +0100 -@@ -13,7 +13,11 @@ - </tr> - <tr> - <td class="install_nomecampo">{$lng['login']['password']}:</td> -- <td class="install_campodisplay" nowrap="nowrap"><input type="password" name="password" size="30" /></td> -+ <td class="install_campodisplay" nowrap="nowrap"><input type="password" name="password" size="30" maxlength="50" /></td> -+ </tr> -+ <tr> -+ <td class="install_nomecampo">{$lng['ftp']['ftpsuffix']}:<br />({$lng['panel']['emptyfordefault']})</td> -+ <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="usernamesuffix" size="30" maxlength="50" /></td> - </tr> - <tr> - <td class="install_confermacampo" colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottone" value="{$lng['ftp']['account_add']}" /></td> -diff -Nru syscp-gentoo-comp/templates/customer/mysql/mysqls_add.tpl syscp-mysql-ftp-imp/templates/customer/mysql/mysqls_add.tpl ---- syscp-gentoo-comp/templates/customer/mysql/mysqls_add.tpl 2006-03-26 00:54:10.000000000 +0100 -+++ syscp-mysql-ftp-imp/templates/customer/mysql/mysqls_add.tpl 2006-03-26 00:54:43.000000000 +0100 -@@ -8,12 +8,16 @@ - <td class="install_titolo" colspan="2"><b><img src="../images/titolo.gif" alt="" /> {$lng['mysql']['database_create']}</b></td> - </tr> - <tr> -- <td class="install_nomecampo">{$lng['mysql']['databasedescription']}:</td> -- <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="description" maxlength="100" /></td> -+ <td class="install_nomecampo">{$lng['mysql']['databasesuffix']}:<br />({$lng['panel']['emptyfordefault']})</td> -+ <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="databasesuffix" maxlength="50" /></td> -+ </tr> -+ <tr> -+ <td class="install_nomecampo">{$lng['login']['username']}:</td> -+ <td class="install_campodisplay" nowrap="nowrap"><select name="databaseuser">$databaseuser</select></td> - </tr> - <tr> -- <td class="install_nomecampo">{$lng['login']['password']}:</td> -- <td class="install_campodisplay" nowrap="nowrap"><input type="password" name="password" maxlength="50" /></td> -+ <td class="install_nomecampo">{$lng['mysql']['databasedescription']}:</td> -+ <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="description" maxlength="100" /></td> - </tr> - <tr> - <td class="install_confermacampo" colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottone" value="{$lng['mysql']['database_create']}" /></td> -diff -Nru syscp-gentoo-comp/templates/customer/mysql/mysqls_add_user.tpl syscp-mysql-ftp-imp/templates/customer/mysql/mysqls_add_user.tpl ---- syscp-gentoo-comp/templates/customer/mysql/mysqls_add_user.tpl 1970-01-01 01:00:00.000000000 +0100 -+++ syscp-mysql-ftp-imp/templates/customer/mysql/mysqls_add_user.tpl 2006-03-26 00:54:43.000000000 +0100 -@@ -0,0 +1,25 @@ -+$header -+ <form method="post" action="$filename"> -+ <input type="hidden" name="s" value="$s" /> -+ <input type="hidden" name="page" value="$page" /> -+ <input type="hidden" name="action" value="$action" /> -+ <table cellpadding="5" cellspacing="4" border="0" align="center" class="install_tabella_60"> -+ <tr> -+ <td class="install_titolo" colspan="2"><b><img src="../images/titolo.gif" alt="" /> {$lng['mysql']['database_create_user']}</b></td> -+ </tr> -+ <tr> -+ <td class="install_nomecampo">{$lng['login']['password']}:</td> -+ <td class="install_campodisplay" nowrap="nowrap"><input type="password" name="password" maxlength="50" /></td> -+ </tr> -+ <tr> -+ <td class="install_nomecampo">{$lng['mysql']['password_confirm']}:</td> -+ <td class="install_campodisplay" nowrap="nowrap"><input type="password" name="passwordconfirm" maxlength="50" /></td> -+ </tr> -+ <tr> -+ <td class="install_confermacampo" colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottone" value="{$lng['mysql']['database_create_user']}" /></td> -+ </tr> -+ </table> -+ </form> -+ <br /> -+ <br /> -+$footer -\ No newline at end of file -diff -Nru syscp-gentoo-comp/templates/customer/mysql/mysqls_database.tpl syscp-mysql-ftp-imp/templates/customer/mysql/mysqls_database.tpl ---- syscp-gentoo-comp/templates/customer/mysql/mysqls_database.tpl 2006-03-26 00:54:10.000000000 +0100 -+++ syscp-mysql-ftp-imp/templates/customer/mysql/mysqls_database.tpl 2006-03-26 00:54:43.000000000 +0100 -@@ -1,5 +1,6 @@ - <tr> - <td class="nomecampo_bordosx">{$row['databasename']}</td> -+ <td class="nomecampo">{$row['databaseuser']}</td> - <td class="nomecampo">{$row['description']}</td> - <td class="nomecampo"><a href="$filename?page=mysqls&action=edit&id={$row['id']}&s=$s">{$lng['panel']['edit']}</a></td> - <td class="nomecampo"><a href="$filename?page=mysqls&action=delete&id={$row['id']}&s=$s">{$lng['panel']['delete']}</a></td> -diff -Nru syscp-gentoo-comp/templates/customer/mysql/mysqls_database_user.tpl syscp-mysql-ftp-imp/templates/customer/mysql/mysqls_database_user.tpl ---- syscp-gentoo-comp/templates/customer/mysql/mysqls_database_user.tpl 1970-01-01 01:00:00.000000000 +0100 -+++ syscp-mysql-ftp-imp/templates/customer/mysql/mysqls_database_user.tpl 2006-03-26 00:54:43.000000000 +0100 -@@ -0,0 +1,5 @@ -+<tr> -+ <td class="nomecampo_bordosx">{$row['databaseuser']}</td> -+ <td class="nomecampo"><a href="$filename?page=mysqls&action=edituser&id={$row['id']}&s=$s">{$lng['panel']['edit']}</a></td> -+ <td class="nomecampo"><a href="$filename?page=mysqls&action=deleteuser&id={$row['id']}&s=$s">{$lng['panel']['delete']}</a></td> -+</tr> -\ No newline at end of file -diff -Nru syscp-gentoo-comp/templates/customer/mysql/mysqls_edit.tpl syscp-mysql-ftp-imp/templates/customer/mysql/mysqls_edit.tpl ---- syscp-gentoo-comp/templates/customer/mysql/mysqls_edit.tpl 2006-03-26 00:54:10.000000000 +0100 -+++ syscp-mysql-ftp-imp/templates/customer/mysql/mysqls_edit.tpl 2006-03-26 00:54:43.000000000 +0100 -@@ -6,19 +6,19 @@ - <input type="hidden" name="id" value="$id" /> - <table cellpadding="5" cellspacing="4" border="0" align="center" class="install_tabella_60"> - <tr> -- <td class="install_titolo" colspan="2"><b><img src="../images/titolo.gif" alt="" /> {$lng['menue']['main']['changepassword']}</b></td> -+ <td class="install_titolo" colspan="2"><b><img src="../images/titolo.gif" alt="" /> {$lng['mysql']['database_change']}</b></td> - </tr> - <tr> - <td class="install_nomecampo">{$lng['mysql']['databasename']}:</td> - <td class="install_campodisplay" nowrap="nowrap">{$result['databasename']}</td> - </tr> - <tr> -- <td class="install_nomecampo">{$lng['mysql']['databasedescription']}:</td> -- <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="description" maxlength="100" value="{$result['description']}" /></td> -+ <td class="install_nomecampo">{$lng['login']['username']}:</td> -+ <td class="install_campodisplay" nowrap="nowrap"><select name="databaseuser">$databaseuser</select></td> - </tr> - <tr> -- <td class="install_nomecampo">{$lng['changepassword']['new_password_ifnotempty']}:</td> -- <td class="install_campodisplay" nowrap="nowrap"><input type="password" name="password" maxlength="50" /></td> -+ <td class="install_nomecampo">{$lng['mysql']['databasedescription']}:</td> -+ <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="description" maxlength="100" value="{$result['description']}" /></td> - </tr> - <tr> - <td class="install_confermacampo" colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottone" value="{$lng['panel']['save']}" /></td> -diff -Nru syscp-gentoo-comp/templates/customer/mysql/mysqls_edit_user.tpl syscp-mysql-ftp-imp/templates/customer/mysql/mysqls_edit_user.tpl ---- syscp-gentoo-comp/templates/customer/mysql/mysqls_edit_user.tpl 1970-01-01 01:00:00.000000000 +0100 -+++ syscp-mysql-ftp-imp/templates/customer/mysql/mysqls_edit_user.tpl 2006-03-26 00:54:43.000000000 +0100 -@@ -0,0 +1,30 @@ -+$header -+ <form method="post" action="$filename"> -+ <input type="hidden" name="s" value="$s" /> -+ <input type="hidden" name="page" value="$page" /> -+ <input type="hidden" name="action" value="$action" /> -+ <input type="hidden" name="id" value="$id" /> -+ <table cellpadding="5" cellspacing="4" border="0" align="center" class="install_tabella_60"> -+ <tr> -+ <td class="install_titolo" colspan="2"><b><img src="../images/titolo.gif" alt="" /> {$lng['mysql']['database_change_user']}</b></td> -+ </tr> -+ <tr> -+ <td class="install_nomecampo">{$lng['mysql']['databaseuser']}:</td> -+ <td class="install_campodisplay" nowrap="nowrap">{$result['databaseuser']}</td> -+ </tr> -+ <tr> -+ <td class="install_nomecampo">{$lng['login']['password']}:</td> -+ <td class="install_campodisplay" nowrap="nowrap"><input type="password" name="password" maxlength="50" /></td> -+ </tr> -+ <tr> -+ <td class="install_nomecampo">{$lng['mysql']['password_confirm']}:</td> -+ <td class="install_campodisplay" nowrap="nowrap"><input type="password" name="passwordconfirm" maxlength="50" /></td> -+ </tr> -+ <tr> -+ <td class="install_confermacampo" colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottone" value="{$lng['panel']['save']}" /></td> -+ </tr> -+ </table> -+ </form> -+ <br /> -+ <br /> -+$footer -\ No newline at end of file -diff -Nru syscp-gentoo-comp/templates/customer/mysql/mysqls.tpl syscp-mysql-ftp-imp/templates/customer/mysql/mysqls.tpl ---- syscp-gentoo-comp/templates/customer/mysql/mysqls.tpl 2006-03-26 00:54:10.000000000 +0100 -+++ syscp-mysql-ftp-imp/templates/customer/mysql/mysqls.tpl 2006-03-26 00:54:43.000000000 +0100 -@@ -1,22 +1,45 @@ - $header - <table cellpadding="5" cellspacing="0" border="0" align="center" class="install_tabella"> - <tr> -- <td class="install_titolo" colspan="4"><b><img src="../images/titolo.gif" alt="" /> {$lng['menue']['mysql']['databases']}</b></td> -+ <td class="install_titolo" colspan="5"><b><img src="../images/titolo.gif" alt="" /> {$lng['menue']['mysql']['databases']}</b></td> - </tr> - <tr> - <td class="campodisplay_bordosx">{$lng['mysql']['databasename']}</td> -+ <td class="campodisplay">{$lng['mysql']['databaseuser']}</td> - <td class="campodisplay">{$lng['mysql']['databasedescription']}</td> - <td class="campodisplay" colspan="2"> </td> - </tr> - <if ($userinfo['mysqls_used'] < $userinfo['mysqls'] || $userinfo['mysqls'] == '-1') && 15 < $mysqls_count > - <tr> -- <td class="campodisplay_bordosx" colspan="4"><a href="$filename?page=mysqls&action=add&s=$s">{$lng['mysql']['database_create']}</a></td> -+ <td class="campodisplay_bordosx" colspan="5"><a href="$filename?page=mysqls&action=add&s=$s">{$lng['mysql']['database_create']}</a></td> - </tr> - </if> - $mysqls - <if ($userinfo['mysqls_used'] < $userinfo['mysqls'] || $userinfo['mysqls'] == '-1') > - <tr> -- <td class="campodisplay_bordosx" colspan="4"><a href="$filename?page=mysqls&action=add&s=$s">{$lng['mysql']['database_create']}</a></td> -+ <td class="campodisplay_bordosx" colspan="5"><a href="$filename?page=mysqls&action=add&s=$s">{$lng['mysql']['database_create']}</a></td> -+ </tr> -+ </if> -+ </table> -+ <br /> -+ <br /> -+ <table cellpadding="5" cellspacing="0" border="0" align="center" class="install_tabella_40"> -+ <tr> -+ <td class="install_titolo" colspan="3"><b><img src="../images/titolo.gif" alt="" /> {$lng['menue']['mysql']['users']}</b></td> -+ </tr> -+ <tr> -+ <td class="campodisplay_bordosx">{$lng['mysql']['databaseuser']}</td> -+ <td class="campodisplay" colspan="2"> </td> -+ </tr> -+ <if ($userinfo['mysqls_used_users'] < $userinfo['mysqls'] || $userinfo['mysqls'] == '-1') && 15 < $mysqls_count_users > -+ <tr> -+ <td class="campodisplay_bordosx" colspan="3"><a href="$filename?page=mysqls&action=adduser&s=$s">{$lng['mysql']['database_create_user']}</a></td> -+ </tr> -+ </if> -+ $mysqlsusers -+ <if ($userinfo['mysqls_used_users'] < $userinfo['mysqls'] || $userinfo['mysqls'] == '-1') > -+ <tr> -+ <td class="campodisplay_bordosx" colspan="3"><a href="$filename?page=mysqls&action=adduser&s=$s">{$lng['mysql']['database_create_user']}</a></td> - </tr> - </if> - </table> diff --git a/syscp/patches/options-patch/syscp-1.2.13-moreoptions.patch b/syscp/patches/options-patch/syscp-1.2.13-moreoptions.patch deleted file mode 100644 index d2768f8..0000000 --- a/syscp/patches/options-patch/syscp-1.2.13-moreoptions.patch +++ /dev/null @@ -1,585 +0,0 @@ -diff -Nru syscp-mysql-ftp-imp/admin_customers.php syscp-options/admin_customers.php ---- syscp-mysql-ftp-imp/admin_customers.php 2006-03-26 01:05:47.000000000 +0100 -+++ syscp-options/admin_customers.php 2006-03-26 01:06:22.000000000 +0100 -@@ -424,8 +424,8 @@ - - $db->query( - "INSERT INTO `".TABLE_PANEL_DOMAINS."` " . -- "(`domain`, `customerid`, `adminid`, `parentdomainid`, `documentroot`, `zonefile`, `isemaildomain`, `caneditdomain`, `openbasedir`, `safemode`, `speciallogfile`, `specialsettings`) " . -- "VALUES ('$loginname.{$settings['system']['hostname']}', '$customerid', '{$userinfo['adminid']}', '-1', '$documentroot', '', '1', '1', '1', '1', '0', '')" -+ "(`domain`, `customerid`, `adminid`, `parentdomainid`, `documentroot`, `zonefile`, `isemaildomain`, `caneditdomain`, `ssi_includes`, `php_engine`, `openbasedir`, `safemode`, `php_errordisplay`, `speciallogfile`, `specialsettings`) " . -+ "VALUES ('$loginname.{$settings['system']['hostname']}', '$customerid', '{$userinfo['adminid']}', '-1', '$documentroot', '', '1', '1', '0', '1', '1', '1', '0', '0', '')" - ); - $domainid=$db->insert_id(); - $db->query( -@@ -555,8 +555,8 @@ - { - $db->query( - "INSERT INTO `".TABLE_PANEL_DOMAINS."` " . -- "(`domain`, `customerid`, `adminid`, `documentroot`, `zonefile`, `isemaildomain`, `caneditdomain`, `openbasedir`, `safemode`, `speciallogfile`, `specialsettings`) " . -- "VALUES ('{$result['loginname']}.{$settings['system']['hostname']}', '{$result['customerid']}', '{$userinfo['adminid']}', '{$result['documentroot']}', '', '1', '1', '1', '1', '0', '')" -+ "(`domain`, `customerid`, `adminid`, `documentroot`, `zonefile`, `isemaildomain`, `caneditdomain`, `ssi_includes`, `php_engine`, `openbasedir`, `safemode`, `php_errordisplay`, `speciallogfile`, `specialsettings`) " . -+ "VALUES ('{$result['loginname']}.{$settings['system']['hostname']}', '{$result['customerid']}', '{$userinfo['adminid']}', '{$result['documentroot']}', '', '1', '1', '0', '1', '1', '1', '0', '0', '')" - ); - $domainid=$db->insert_id(); - $db->query( -diff -Nru syscp-mysql-ftp-imp/admin_domains.php syscp-options/admin_domains.php ---- syscp-mysql-ftp-imp/admin_domains.php 2006-03-26 01:05:34.000000000 +0100 -+++ syscp-options/admin_domains.php 2006-03-26 01:12:53.000000000 +0100 -@@ -56,7 +56,7 @@ - - $domains=''; - $result=$db->query( -- "SELECT `d`.`id`, `d`.`domain`, `d`.`customerid`, `d`.`documentroot`, CONCAT(`ip`.`ip`,':',`ip`.`port`) AS `ipandport`, `d`.`zonefile`, `d`.`openbasedir`, `d`.`safemode`, `d`.`isemaildomain`, `d`.`parentdomainid`, `c`.`loginname`, `c`.`name`, `c`.`firstname`, `ad`.`domain` AS `alias` " . -+ "SELECT `d`.`id`, `d`.`domain`, `d`.`customerid`, `d`.`documentroot`, CONCAT(`ip`.`ip`,':',`ip`.`port`) AS `ipandport`, `d`.`zonefile`, `d`.`ssi_includes`, `d`.`php_engine`, `d`.`openbasedir`, `d`.`safemode`, `d`.`php_errordisplay`, `d`.`isemaildomain`, `d`.`parentdomainid`, `c`.`loginname`, `c`.`name`, `c`.`firstname`, `ad`.`domain` AS `alias` " . - "FROM `".TABLE_PANEL_DOMAINS."` `d` " . - "LEFT JOIN `".TABLE_PANEL_CUSTOMERS."` `c` USING(`customerid`) " . - "LEFT JOIN `".TABLE_PANEL_DOMAINS."` `ad` ON `d`.`aliasdomain`=`ad`.`id` " . -@@ -93,7 +93,7 @@ - } - $pagestart = ($pageno - 1) * $settings['panel']['paging']; - $result=$db->query( -- "SELECT `d`.`id`, `d`.`domain`, `d`.`customerid`, `d`.`documentroot`, CONCAT(`ip`.`ip`,':',`ip`.`port`) AS `ipandport`, `d`.`zonefile`, `d`.`openbasedir`, `d`.`safemode`, `d`.`isemaildomain`, `d`.`parentdomainid`, `c`.`loginname`, `c`.`name`, `c`.`firstname`, `ad`.`domain` AS `alias` " . -+ "SELECT `d`.`id`, `d`.`domain`, `d`.`customerid`, `d`.`documentroot`, CONCAT(`ip`.`ip`,':',`ip`.`port`) AS `ipandport`, `d`.`zonefile`, `d`.`ssi_includes`, `d`.`php_engine`, `d`.`openbasedir`, `d`.`safemode`, `d`.`php_errordisplay`, `d`.`isemaildomain`, `d`.`parentdomainid`, `c`.`loginname`, `c`.`name`, `c`.`firstname`, `ad`.`domain` AS `alias` " . - "FROM `".TABLE_PANEL_DOMAINS."` `d` " . - "LEFT JOIN `".TABLE_PANEL_CUSTOMERS."` `c` USING(`customerid`) " . - "LEFT JOIN `".TABLE_PANEL_DOMAINS."` `ad` ON `d`.`aliasdomain`=`ad`.`id` " . -@@ -214,6 +214,9 @@ - $aliasdomain = intval($_POST['alias']); - $customer = $db->query_first("SELECT `documentroot` FROM `".TABLE_PANEL_CUSTOMERS."` WHERE `customerid`='$customerid'"); - $documentroot = $customer['documentroot']; -+ $ssi_includes = intval($_POST['ssi_includes']); -+ $php_engine = intval($_POST['php_engine']); -+ $php_errordisplay = intval($_POST['php_errordisplay']); - if($userinfo['change_serversettings'] == '1') - { - $isbinddomain = $_POST['isbinddomain']; -@@ -260,6 +263,14 @@ - $aliasdomain_check = $db->query_first('SELECT `id` FROM `'.TABLE_PANEL_DOMAINS.'` `d`,`'.TABLE_PANEL_CUSTOMERS.'` `c` WHERE `d`.`customerid`=\''.$customerid.'\' AND `d`.`aliasdomain` IS NULL AND `d`.`id`<>`c`.`standardsubdomain` AND `c`.`customerid`=\''.$customerid.'\' AND `d`.`id`=\''.$aliasdomain.'\''); - } - -+ if($ssi_includes != '1') -+ { -+ $ssi_includes = '0'; -+ } -+ if($php_engine != '1') -+ { -+ $php_engine = '0'; -+ } - if($openbasedir != '1') - { - $openbasedir = '0'; -@@ -268,6 +279,10 @@ - { - $safemode = '0'; - } -+ if($php_errordisplay != '1') -+ { -+ $php_errordisplay = '0'; -+ } - if($speciallogfile != '1') - { - $speciallogfile = '0'; -@@ -321,7 +336,7 @@ - && (!isset($_POST['reallydoit']) - || $_POST['reallydoit'] != 'reallydoit') ) - { -- ask_yesno('admin_domain_reallydisablesecuritysetting', $filename, "page=$page;action=$action;domain=$domain;documentroot=$documentroot;customerid=$customerid;alias=$aliasdomain;isbinddomain=$isbinddomain;isemaildomain=$isemaildomain;subcanemaildomain=$subcanemaildomain;caneditdomain=$caneditdomain;zonefile=$zonefile;speciallogfile=$speciallogfile;openbasedir=$openbasedir;ipandport=$ipandport;safemode=$safemode;specialsettings=".urlencode($specialsettings).";reallydoit=reallydoit"); -+ ask_yesno('admin_domain_reallydisablesecuritysetting', $filename, "page=$page;action=$action;domain=$domain;documentroot=$documentroot;customerid=$customerid;alias=$aliasdomain;isbinddomain=$isbinddomain;isemaildomain=$isemaildomain;subcanemaildomain=$subcanemaildomain;caneditdomain=$caneditdomain;zonefile=$zonefile;speciallogfile=$speciallogfile;ssi_includes=$ssi_includes;php_engine=$php_engine;openbasedir=$openbasedir;ipandport=$ipandport;safemode=$safemode;php_errordisplay=$php_errordisplay;specialsettings=".urlencode($specialsettings).";reallydoit=reallydoit"); - exit; - } - $pattern = sprintf('^%s', $customer['documentroot']); -@@ -329,7 +344,7 @@ - && ( !isset($_POST['reallydocroot'] ) - || $_POST['reallydocroot'] != 'reallydocroot') ) - { -- $params = "page=$page;action=$action;domain=$domain;documentroot=$documentroot;customerid=$customerid;alias=$aliasdomain;isbinddomain=$isbinddomain;isemaildomain=$isemaildomain;subcanemaildomain=$subcanemaildomain;caneditdomain=$caneditdomain;zonefile=$zonefile;speciallogfile=$speciallogfile;openbasedir=$openbasedir;ipandport=$ipandport;safemode=$safemode;specialsettings=".urlencode($specialsettings).';reallydocroot=reallydocroot'; -+ $params = "page=$page;action=$action;domain=$domain;documentroot=$documentroot;customerid=$customerid;alias=$aliasdomain;isbinddomain=$isbinddomain;isemaildomain=$isemaildomain;subcanemaildomain=$subcanemaildomain;caneditdomain=$caneditdomain;zonefile=$zonefile;speciallogfile=$speciallogfile;ssi_includes=$ssi_includes;php_engine=$php_engine;openbasedir=$openbasedir;ipandport=$ipandport;safemode=$safemode;php_errordisplay=$php_errordisplay;specialsettings=".urlencode($specialsettings).';reallydocroot=reallydocroot'; - if ( isset($_POST['reallydoit']) ) - { - $params .= ';reallydoit=reallydoit'; -@@ -345,7 +360,7 @@ - } - - $specialsettings = addslashes($specialsettings); -- $db->query("INSERT INTO `".TABLE_PANEL_DOMAINS."` (`domain`, `customerid`, `adminid`, `documentroot`, `ipandport`, `aliasdomain`, `zonefile`, `isbinddomain`, `isemaildomain`, `subcanemaildomain`, `caneditdomain`, `openbasedir`, `safemode`, `speciallogfile`, `specialsettings`) VALUES ('$domain', '$customerid', '{$userinfo['adminid']}', '$documentroot', '$ipandport', ".(($aliasdomain!=0) ? '\''.$aliasdomain.'\'' : 'NULL').", '$zonefile', '$isbinddomain', '$isemaildomain', '$subcanemaildomain', '$caneditdomain', '$openbasedir', '$safemode', '$speciallogfile', '$specialsettings')"); -+ $db->query("INSERT INTO `".TABLE_PANEL_DOMAINS."` (`domain`, `customerid`, `adminid`, `documentroot`, `ipandport`, `aliasdomain`, `zonefile`, `isbinddomain`, `isemaildomain`, `subcanemaildomain`, `caneditdomain`, `ssi_includes`, `php_engine`, `openbasedir`, `safemode`, `php_errordisplay`, `speciallogfile`, `specialsettings`) VALUES ('$domain', '$customerid', '{$userinfo['adminid']}', '$documentroot', '$ipandport', ".(($aliasdomain!=0) ? '\''.$aliasdomain.'\'' : 'NULL').", '$zonefile', '$isbinddomain', '$isemaildomain', '$subcanemaildomain', '$caneditdomain', '$ssi_includes', '$php_engine', '$openbasedir', '$safemode', '$php_errordisplay', '$speciallogfile', '$specialsettings')"); - $domainid=$db->insert_id(); - $db->query("UPDATE `".TABLE_PANEL_ADMINS."` SET `domains_used` = `domains_used` + 1 WHERE `adminid` = '{$userinfo['adminid']}'"); - -@@ -394,8 +409,11 @@ - $isemaildomain=makeyesno('isemaildomain', '1', '0', '1'); - $subcanemaildomain=makeyesno('subcanemaildomain', '1', '0', '1'); - $caneditdomain=makeyesno('caneditdomain', '1', '0', '1'); -+ $ssi_includes=makeyesno('ssi_includes', '1', '0', '0'); -+ $php_engine=makeyesno('php_engine', '1', '0', '1'); - $openbasedir=makeyesno('openbasedir', '1', '0', '1'); - $safemode=makeyesno('safemode', '1', '0', '1'); -+ $php_errordisplay=makeyesno('php_errordisplay', '1', '0', '0'); - $speciallogfile=makeyesno('speciallogfile', '1', '0', '0'); - eval("echo \"".getTemplate("domains/domains_add")."\";"); - } -@@ -405,7 +423,7 @@ - elseif($action=='edit' && $id!=0) - { - $result=$db->query_first( -- "SELECT `d`.`id`, `d`.`domain`, `d`.`customerid`, `d`.`documentroot`, `d`.`ipandport`, `d`.`aliasdomain`, `d`.`isbinddomain`, `d`.`isemaildomain`, `d`.`subcanemaildomain`, `d`.`caneditdomain`, `d`.`zonefile`, `d`.`openbasedir`, `d`.`safemode`, `d`.`speciallogfile`, `d`.`specialsettings`, `c`.`loginname`, `c`.`name`, `c`.`firstname` " . -+ "SELECT `d`.`id`, `d`.`domain`, `d`.`customerid`, `d`.`documentroot`, `d`.`ipandport`, `d`.`aliasdomain`, `d`.`isbinddomain`, `d`.`isemaildomain`, `d`.`subcanemaildomain`, `d`.`caneditdomain`, `d`.`zonefile`, `d`.`ssi_includes`, `d`.`php_engine`, `d`.`openbasedir`, `d`.`safemode`, `d`.`php_errordisplay`, `d`.`speciallogfile`, `d`.`specialsettings`, `c`.`loginname`, `c`.`name`, `c`.`firstname` " . - "FROM `".TABLE_PANEL_DOMAINS."` `d` " . - "LEFT JOIN `".TABLE_PANEL_CUSTOMERS."` `c` USING(`customerid`) " . - "WHERE `d`.`parentdomainid`='0' AND `d`.`id`='$id'".( $userinfo['customers_see_all'] ? '' : " AND `d`.`adminid` = '{$userinfo['adminid']}' ") -@@ -422,6 +440,9 @@ - $isemaildomain = intval($_POST['isemaildomain']); - $subcanemaildomain = intval($_POST['subcanemaildomain']); - $caneditdomain = intval($_POST['caneditdomain']); -+ $ssi_includes = intval($_POST['ssi_includes']); -+ $php_engine = intval($_POST['php_engine']); -+ $php_errordisplay = intval($_POST['php_errordisplay']); - if($userinfo['change_serversettings'] == '1') - { - $isbinddomain = $_POST['isbinddomain']; -@@ -452,6 +473,14 @@ - $documentroot = makeCorrectDir($documentroot); - } - -+ if($ssi_includes != '1') -+ { -+ $ssi_includes = '0'; -+ } -+ if($php_engine != '1') -+ { -+ $php_engine = '0'; -+ } - if($openbasedir != '1') - { - $openbasedir = '0'; -@@ -460,6 +489,10 @@ - { - $safemode = '0'; - } -+ if($php_errordisplay != '1') -+ { -+ $php_errordisplay = '0'; -+ } - if($isbinddomain != '1') - { - $isbinddomain = '0'; -@@ -489,7 +522,7 @@ - - if(($openbasedir == '0' || $safemode == '0') && (!isset($_POST['reallydoit']) || $_POST['reallydoit'] != 'reallydoit') && $userinfo['change_serversettings'] == '1') - { -- ask_yesno('admin_domain_reallydisablesecuritysetting', $filename, "id=$id;page=$page;action=$action;documentroot=$documentroot;alias=$aliasdomain;isbinddomain=$isbinddomain;isemaildomain=$isemaildomain;subcanemaildomain=$subcanemaildomain;caneditdomain=$caneditdomain;zonefile=$zonefile;openbasedir=$openbasedir;ipandport=$ipandport;safemode=$safemode;specialsettings=".urlencode($specialsettings).";reallydoit=reallydoit"); -+ ask_yesno('admin_domain_reallydisablesecuritysetting', $filename, "id=$id;page=$page;action=$action;documentroot=$documentroot;alias=$aliasdomain;isbinddomain=$isbinddomain;isemaildomain=$isemaildomain;subcanemaildomain=$subcanemaildomain;caneditdomain=$caneditdomain;zonefile=$zonefile;ssi_includes=$ssi_includes;php_engine=$php_engine;openbasedir=$openbasedir;ipandport=$ipandport;safemode=$safemode;php_errordisplay=$php_errordisplay;specialsettings=".urlencode($specialsettings).";reallydoit=reallydoit"); - exit; - } - $pattern = sprintf('^%s', $customer['documentroot']); -@@ -497,7 +530,7 @@ - && ( !isset($_POST['reallydocroot'] ) - || $_POST['reallydocroot'] != 'reallydocroot') ) - { -- $params = "id=$id;page=$page;action=$action;documentroot=$documentroot;alias=$aliasdomain;isbinddomain=$isbinddomain;isemaildomain=$isemaildomain;subcanemaildomain=$subcanemaildomain;caneditdomain=$caneditdomain;zonefile=$zonefile;openbasedir=$openbasedir;ipandport=$ipandport;safemode=$safemode;specialsettings=".urlencode($specialsettings).';reallydocroot=reallydocroot'; -+ $params = "id=$id;page=$page;action=$action;documentroot=$documentroot;alias=$aliasdomain;isbinddomain=$isbinddomain;isemaildomain=$isemaildomain;subcanemaildomain=$subcanemaildomain;caneditdomain=$caneditdomain;zonefile=$zonefile;ssi_includes=$ssi_includes;php_engine=$php_engine;openbasedir=$openbasedir;ipandport=$ipandport;safemode=$safemode;php_errordisplay=$php_errordisplay;specialsettings=".urlencode($specialsettings).';reallydocroot=reallydocroot'; - if ( isset($_POST['reallydoit']) ) - { - $params .= ';reallydoit=reallydoit'; -@@ -513,7 +546,7 @@ - $specialsettings = urldecode($specialsettings); - } - -- if($documentroot != $result['documentroot'] || $ipandport != $result['ipandport'] || $openbasedir != $result['openbasedir'] || $safemode != $result['safemode'] || $specialsettings != $result['specialsettings']) -+ if($documentroot != $result['documentroot'] || $ipandport != $result['ipandport'] || $ssi_includes != $result['ssi_includes'] || $php_engine != $result['php_engine'] || $openbasedir != $result['openbasedir'] || $safemode != $result['safemode'] || $php_errordisplay != $result['php_errordisplay'] || $specialsettings != $result['specialsettings']) - { - inserttask('1'); - } -@@ -528,8 +561,8 @@ - } - - $specialsettings = addslashes($specialsettings); -- $result=$db->query("UPDATE `".TABLE_PANEL_DOMAINS."` SET `documentroot`='$documentroot', `ipandport`='$ipandport', `aliasdomain`=".(($aliasdomain!=0 && $alias_check==0) ? '\''.$aliasdomain.'\'' : 'NULL').", `isbinddomain`='$isbinddomain', `isemaildomain`='$isemaildomain', `subcanemaildomain`='$subcanemaildomain', `caneditdomain`='$caneditdomain', `zonefile`='$zonefile', `openbasedir`='$openbasedir', `safemode`='$safemode', `specialsettings`='$specialsettings' WHERE `id`='$id'"); -- $result=$db->query("UPDATE `".TABLE_PANEL_DOMAINS."` SET `ipandport`='$ipandport', `openbasedir`='$openbasedir', `safemode`='$safemode', `specialsettings`='$specialsettings' WHERE `parentdomainid`='$id'"); -+ $result=$db->query("UPDATE `".TABLE_PANEL_DOMAINS."` SET `documentroot`='$documentroot', `ipandport`='$ipandport', `aliasdomain`=".(($aliasdomain!=0 && $alias_check==0) ? '\''.$aliasdomain.'\'' : 'NULL').", `isbinddomain`='$isbinddomain', `isemaildomain`='$isemaildomain', `subcanemaildomain`='$subcanemaildomain', `caneditdomain`='$caneditdomain', `zonefile`='$zonefile', `ssi_includes`='$ssi_includes', `php_engine`='$php_engine', `openbasedir`='$openbasedir', `safemode`='$safemode', `php_errordisplay`='$php_errordisplay', `specialsettings`='$specialsettings' WHERE `id`='$id'"); -+ $result=$db->query("UPDATE `".TABLE_PANEL_DOMAINS."` SET `ipandport`='$ipandport', `ssi_includes`='$ssi_includes', `php_engine`='$php_engine', `openbasedir`='$openbasedir', `safemode`='$safemode', `php_errordisplay`='$php_errordisplay', `specialsettings`='$specialsettings' WHERE `parentdomainid`='$id'"); - - redirectTo ( $filename , Array ( 'page' => $page , 's' => $s ) ) ; - } -@@ -553,8 +586,11 @@ - $isemaildomain=makeyesno('isemaildomain', '1', '0', $result['isemaildomain']); - $subcanemaildomain=makeyesno('subcanemaildomain', '1', '0', $result['subcanemaildomain']); - $caneditdomain=makeyesno('caneditdomain', '1', '0', $result['caneditdomain']); -+ $ssi_includes=makeyesno('ssi_includes', '1', '0', $result['ssi_includes']); -+ $php_engine=makeyesno('php_engine', '1', '0', $result['php_engine']); - $openbasedir=makeyesno('openbasedir', '1', '0', $result['openbasedir']); - $safemode=makeyesno('safemode', '1', '0', $result['safemode']); -+ $php_errordisplay=makeyesno('php_errordisplay', '1', '0', $result['php_errordisplay']); - $speciallogfile=($result['speciallogfile'] == 1 ? $lng['panel']['yes'] : $lng['panel']['no']); - eval("echo \"".getTemplate("domains/domains_edit")."\";"); - } -@@ -562,4 +598,4 @@ - } - } - --?> -+?> -\ No newline at end of file -diff -Nru syscp-mysql-ftp-imp/customer_domains.php syscp-options/customer_domains.php ---- syscp-mysql-ftp-imp/customer_domains.php 2006-03-26 01:05:34.000000000 +0100 -+++ syscp-options/customer_domains.php 2006-03-26 01:06:22.000000000 +0100 -@@ -224,7 +224,7 @@ - { - $subdomain = $idna_convert->encode(preg_replace(Array('/\:(\d)+$/','/^https?\:\/\//'),'',addslashes($_POST['subdomain']))); - $domain=$idna_convert->encode(addslashes($_POST['domain'])); -- $domain_check=$db->query_first("SELECT `id`, `customerid`, `domain`, `documentroot`, `isemaildomain`, `openbasedir`, `safemode`, `speciallogfile`, `specialsettings` FROM `".TABLE_PANEL_DOMAINS."` WHERE `domain`='$domain' AND `customerid`='".$userinfo['customerid']."' AND `parentdomainid`='0' AND `iswildcarddomain`='0' AND `caneditdomain`='1' "); -+ $domain_check=$db->query_first("SELECT `id`, `customerid`, `domain`, `documentroot`, `isemaildomain`, `ssi_includes`, `php_engine`, `openbasedir`, `safemode`, `php_errordisplay`, `speciallogfile`, `specialsettings` FROM `".TABLE_PANEL_DOMAINS."` WHERE `domain`='$domain' AND `customerid`='".$userinfo['customerid']."' AND `parentdomainid`='0' AND `iswildcarddomain`='0' AND `caneditdomain`='1' "); - $completedomain=$subdomain.'.'.$domain; - $completedomain_check=$db->query_first("SELECT `id`, `customerid`, `domain`, `documentroot`, `isemaildomain` FROM `".TABLE_PANEL_DOMAINS."` WHERE `domain`='$completedomain' AND `customerid`='".$userinfo['customerid']."' AND `caneditdomain` = '1'"); - $aliasdomain = intval($_POST['alias']); -@@ -283,7 +283,7 @@ - - else - { -- $result=$db->query("INSERT INTO `".TABLE_PANEL_DOMAINS."` (`customerid`, `domain`, `documentroot`, `aliasdomain`, `parentdomainid`, `isemaildomain`, `openbasedir`, `safemode`, `speciallogfile`, `specialsettings`) VALUES ('".$userinfo['customerid']."', '$completedomain', '$path', ".(($aliasdomain != 0) ? "'".$aliasdomain."'" : "NULL").", '".$domain_check['id']."', '0', '".$domain_check['openbasedir']."', '".$domain_check['safemode']."', '".$domain_check['speciallogfile']."', '".$domain_check['specialsettings']."')"); -+ $result=$db->query("INSERT INTO `".TABLE_PANEL_DOMAINS."` (`customerid`, `domain`, `documentroot`, `aliasdomain`, `parentdomainid`, `isemaildomain`, `ssi_includes`, `php_engine`, `openbasedir`, `safemode`, `php_errordisplay`, `speciallogfile`, `specialsettings`) VALUES ('".$userinfo['customerid']."', '$completedomain', '$path', ".(($aliasdomain != 0) ? "'".$aliasdomain."'" : "NULL").", '".$domain_check['id']."', '0', '".$domain_check['ssi_includes']."', '".$domain_check['php_engine']."', '".$domain_check['openbasedir']."', '".$domain_check['safemode']."', '".$domain_check['php_errordisplay']."', '".$domain_check['speciallogfile']."', '".$domain_check['specialsettings']."')"); - $result=$db->query("UPDATE `".TABLE_PANEL_CUSTOMERS."` SET `subdomains_used`=`subdomains_used`+1 WHERE `customerid`='".$userinfo['customerid']."'"); - inserttask('1'); - redirectTo ( $filename , Array ( 'page' => $page , 's' => $s ) ) ; -@@ -312,7 +312,7 @@ - - elseif($action=='edit' && $id!=0) - { -- $result=$db->query_first("SELECT `d`.`id`, `d`.`customerid`, `d`.`domain`, `d`.`documentroot`, `d`.`isemaildomain`, `d`.`iswildcarddomain`, `d`.`parentdomainid`, `d`.`aliasdomain`, `pd`.`subcanemaildomain` FROM `".TABLE_PANEL_DOMAINS."` `d`, `".TABLE_PANEL_DOMAINS."` `pd` WHERE `d`.`customerid`='".$userinfo['customerid']."' AND `d`.`id`='$id' AND ((`d`.`parentdomainid`!='0' AND `pd`.`id`=`d`.`parentdomainid`) OR (`d`.`parentdomainid`='0' AND `pd`.`id`=`d`.`id`)) AND `d`.`caneditdomain`='1'"); -+ $result=$db->query_first("SELECT `d`.`id`, `d`.`customerid`, `d`.`domain`, `d`.`documentroot`, `d`.`isemaildomain`, `d`.`php_errordisplay`, `d`.`iswildcarddomain`, `d`.`parentdomainid`, `d`.`aliasdomain`, `pd`.`subcanemaildomain` FROM `".TABLE_PANEL_DOMAINS."` `d`, `".TABLE_PANEL_DOMAINS."` `pd` WHERE `d`.`customerid`='".$userinfo['customerid']."' AND `d`.`id`='$id' AND ((`d`.`parentdomainid`!='0' AND `pd`.`id`=`d`.`parentdomainid`) OR (`d`.`parentdomainid`='0' AND `pd`.`id`=`d`.`id`)) AND `d`.`caneditdomain`='1'"); - $alias_check=$db->query_first('SELECT COUNT(`id`) AS count FROM `'.TABLE_PANEL_DOMAINS.'` WHERE `aliasdomain`=\''.$result['id'].'\''); - $alias_check=$alias_check['count']; - -@@ -358,6 +358,12 @@ - $isemaildomain = $result['isemaildomain']; - } - -+ $php_errordisplay = intval($_POST['php_errordisplay']); -+ if($php_errordisplay != '1') -+ { -+ $php_errordisplay = '0'; -+ } -+ - $aliasdomain_check=array('id' => 0); - if($aliasdomain!=0) - { -@@ -380,10 +386,10 @@ - $db->query("DELETE FROM `".TABLE_MAIL_USERS."` WHERE `customerid`='".$userinfo['customerid']."' AND `domainid`='$id'"); - $db->query("DELETE FROM `".TABLE_MAIL_VIRTUAL."` WHERE `customerid`='".$userinfo['customerid']."' AND `domainid`='$id'"); - } -- if($path != $result['documentroot'] || $isemaildomain != $result['isemaildomain'] || $iswildcarddomain != $result['iswildcarddomain'] || $aliasdomain != $result['aliasdomain']) -+ if($path != $result['documentroot'] || $isemaildomain != $result['isemaildomain'] || $php_errordisplay != $result['php_errordisplay'] || $iswildcarddomain != $result['iswildcarddomain'] || $aliasdomain != $result['aliasdomain']) - { - inserttask('1'); -- $result=$db->query("UPDATE `".TABLE_PANEL_DOMAINS."` SET `documentroot`='$path', `isemaildomain`='$isemaildomain', `iswildcarddomain`='$iswildcarddomain', `aliasdomain`=".(($aliasdomain!=0 && $alias_check==0) ? '\''.$aliasdomain.'\'' : 'NULL')." WHERE `customerid`='".$userinfo['customerid']."' AND `id`='$id'"); -+ $result=$db->query("UPDATE `".TABLE_PANEL_DOMAINS."` SET `documentroot`='$path', `isemaildomain`='$isemaildomain', `php_errordisplay`='$php_errordisplay', `iswildcarddomain`='$iswildcarddomain', `aliasdomain`=".(($aliasdomain!=0 && $alias_check==0) ? '\''.$aliasdomain.'\'' : 'NULL')." WHERE `customerid`='".$userinfo['customerid']."' AND `id`='$id'"); - } - redirectTo ( $filename , Array ( 'page' => $page , 's' => $s ) ) ; - } -@@ -403,6 +409,7 @@ - // $result['documentroot']=str_replace($userinfo['documentroot'],'',$result['documentroot']); - $iswildcarddomain=makeyesno('iswildcarddomain', '1', '0', $result['iswildcarddomain']); - $isemaildomain=makeyesno('isemaildomain', '1', '0', $result['isemaildomain']); -+ $php_errordisplay=makeyesno('php_errordisplay', '1', '0', $result['php_errordisplay']); - eval("echo \"".getTemplate("domains/domains_edit")."\";"); - } - } -diff -Nru syscp-mysql-ftp-imp/customer_extras.php syscp-options/customer_extras.php ---- syscp-mysql-ftp-imp/customer_extras.php 2006-03-26 01:05:34.000000000 +0100 -+++ syscp-options/customer_extras.php 2006-03-26 01:06:22.000000000 +0100 -@@ -176,6 +176,8 @@ - $row['path']=str_replace($userinfo['documentroot'],'',$row['path']); - $row['options_indexes'] = str_replace('1', $lng['panel']['yes'], $row['options_indexes']); - $row['options_indexes'] = str_replace('0', $lng['panel']['no'], $row['options_indexes']); -+ $row['options_execcgi'] = str_replace('1', $lng['panel']['yes'], $row['options_execcgi']); -+ $row['options_execcgi'] = str_replace('0', $lng['panel']['no'], $row['options_execcgi']); - eval("\$htaccess.=\"".getTemplate("extras/htaccess_htaccess")."\";"); - } - eval("echo \"".getTemplate("extras/htaccess")."\";"); -@@ -270,6 +272,7 @@ - ' (`customerid`, ' . - ' `path`, ' . - ' `options_indexes`, ' . -+ ' `options_execcgi`, ' . - ' `error404path`, ' . - ' `error403path`, ' . - // ' `error401path`, ' . -@@ -278,6 +281,7 @@ - 'VALUES ("'.$userinfo['customerid'].'", ' . - ' "'.$path.'", ' . - ' "'.$_POST['options_indexes'].'", ' . -+ ' "'.$_POST['options_execcgi'].'", ' . - ' "'.$error404path.'", ' . - ' "'.$error403path.'", ' . - // ' "'.$error401path.'", ' . -@@ -293,6 +297,7 @@ - $pathSelect = makePathfield( $userinfo['documentroot'], $userinfo['guid'], - $userinfo['guid'], $settings['panel']['pathedit'] ); - $options_indexes = makeyesno('options_indexes','1','0','1'); -+ $options_execcgi = makeyesno('options_execcgi','1','0','0'); - eval("echo \"".getTemplate("extras/htaccess_add")."\";"); - } - } -@@ -317,6 +322,11 @@ - { - $option_indexes = '0'; - } -+ $option_execcgi = intval($_POST['options_execcgi']); -+ if ($option_execcgi != '1') -+ { -+ $option_execcgi = '0'; -+ } - if ( ($_POST['error404path'] == '') - || (preg_match('/^https?\:\/\//', $_POST['error404path']) ) - ) -@@ -359,6 +369,7 @@ - // } - - if ( ($option_indexes != $result['options_indexes']) -+ || ($option_execcgi != $result['options_execcgi']) - || ($error404path != $result['error404path']) - || ($error403path != $result['error403path']) - // || ($error401path != $result['error401path']) -@@ -369,6 +380,7 @@ - $db->query( - 'UPDATE `'.TABLE_PANEL_HTACCESS.'` ' . - 'SET `options_indexes` = "'.$option_indexes.'",' . -+ ' `options_execcgi` = "'.$option_execcgi.'",' . - ' `error404path` = "'.$error404path.'", ' . - ' `error403path` = "'.$error403path.'", ' . - // ' `error401path` = "'.$error401path.'", ' . -@@ -387,6 +399,7 @@ - // $result['error401path'] = $result['error401path']; - $result['error500path'] = $result['error500path']; - $options_indexes = makeyesno('options_indexes', '1', '0', $result['options_indexes']); -+ $options_execcgi = makeyesno('options_execcgi', '1', '0', $result['options_execcgi']); - eval("echo \"".getTemplate("extras/htaccess_edit")."\";"); - } - } -diff -Nru syscp-mysql-ftp-imp/lng/english.lng.php syscp-options/lng/english.lng.php ---- syscp-mysql-ftp-imp/lng/english.lng.php 2006-03-26 01:05:47.000000000 +0100 -+++ syscp-options/lng/english.lng.php 2006-03-26 01:06:22.000000000 +0100 -@@ -413,4 +413,14 @@ - $lng['error']['dbuserstillhasdb'] = 'You cannot delete this database user, databases are still assigned to it!<br />Please reassign or delete all databases assigned to this user first.'; - $lng['question']['mysql_reallydelete_user'] = 'Do you really want to delete the user %s? This cannot be undone!'; - $lng['ftp']['ftpsuffix'] = 'Account suffix'; -+ -+/** -+ * CHANGED FOR MOREOPTIONS PATCH -+ */ -+ -+/** -+ * ADDED FOR MOREOPTIONS PATCH -+ */ -+$lng['extras']['view_execcgi'] = 'permit CGI execution'; -+$lng['extras']['directory_execcgi'] = 'execute CGI scripts'; - ?> -\ No newline at end of file -diff -Nru syscp-mysql-ftp-imp/scripts/cron_tasks.php syscp-options/scripts/cron_tasks.php ---- syscp-mysql-ftp-imp/scripts/cron_tasks.php 2006-03-26 01:05:34.000000000 +0100 -+++ syscp-options/scripts/cron_tasks.php 2006-03-26 01:06:22.000000000 +0100 -@@ -75,7 +75,7 @@ - // $vhosts_file.='ServerName '.$settings['system']['hostname']."\n"; - // $vhosts_file.='</VirtualHost>'."\n"."\n"; - -- $result_domains=$db->query("SELECT `d`.`id`, `d`.`domain`, `d`.`customerid`, `d`.`documentroot`, CONCAT(`ip`.`ip`,':',`ip`.`port`) AS `ipandport`, `d`.`parentdomainid`, `d`.`isemaildomain`, `d`.`iswildcarddomain`, `d`.`openbasedir`, `d`.`safemode`, `d`.`speciallogfile`, `d`.`specialsettings`, `pd`.`domain` AS `parentdomain`, `c`.`loginname`, `c`.`guid`, `c`.`email`, `c`.`documentroot` AS `customerroot` FROM `".TABLE_PANEL_DOMAINS."` `d` LEFT JOIN `".TABLE_PANEL_CUSTOMERS."` `c` USING(`customerid`) LEFT JOIN `".TABLE_PANEL_DOMAINS."` `pd` ON (`pd`.`id` = `d`.`parentdomainid`) LEFT JOIN `".TABLE_PANEL_IPSANDPORTS."` `ip` ON (`d`.`ipandport` = `ip`.`id`) WHERE `d`.`deactivated` <> '1' AND `d`.`aliasdomain` IS NULL ORDER BY `d`.`iswildcarddomain`, `d`.`domain` ASC"); -+ $result_domains=$db->query("SELECT `d`.`id`, `d`.`domain`, `d`.`customerid`, `d`.`documentroot`, CONCAT(`ip`.`ip`,':',`ip`.`port`) AS `ipandport`, `d`.`parentdomainid`, `d`.`isemaildomain`, `d`.`iswildcarddomain`, `d`.`ssi_includes`, `d`.`php_engine`, `d`.`openbasedir`, `d`.`safemode`, `d`.`php_errordisplay`, `d`.`speciallogfile`, `d`.`specialsettings`, `pd`.`domain` AS `parentdomain`, `c`.`loginname`, `c`.`guid`, `c`.`email`, `c`.`documentroot` AS `customerroot` FROM `".TABLE_PANEL_DOMAINS."` `d` LEFT JOIN `".TABLE_PANEL_CUSTOMERS."` `c` USING(`customerid`) LEFT JOIN `".TABLE_PANEL_DOMAINS."` `pd` ON (`pd`.`id` = `d`.`parentdomainid`) LEFT JOIN `".TABLE_PANEL_IPSANDPORTS."` `ip` ON (`d`.`ipandport` = `ip`.`id`) WHERE `d`.`deactivated` <> '1' AND `d`.`aliasdomain` IS NULL ORDER BY `d`.`iswildcarddomain`, `d`.`domain` ASC"); - while($domain=$db->fetch_array($result_domains)) - { - fwrite( $debugHandler, ' cron_tasks: Task1 - Writing Domain '.$domain['id'].'::'.$domain['domain']); -@@ -108,19 +108,43 @@ - { - $domain['documentroot'] = makeCorrectDir ($domain['documentroot']); - $vhosts_file.=' DocumentRoot "'.$domain['documentroot']."\"\n"; -- if($domain['openbasedir'] == '1') -- { -- $vhosts_file.=' php_admin_value open_basedir "'.$domain['documentroot']."\"\n"; -- } -- if($domain['safemode'] == '1') -- { -- $vhosts_file.=' php_admin_flag safe_mode On '."\n"; -- } -- if($domain['safemode'] == '0') -+ if($domain['ssi_includes'] == '1') - { -- $vhosts_file.=' php_admin_flag safe_mode Off '."\n"; -+ $vhosts_file.=' Options +Includes'."\n"; - } -- -+ if($domain['ssi_includes'] == '0') -+ { -+ $vhosts_file.=' Options -Includes'."\n"; -+ } -+ if($domain['php_engine'] == '1') -+ { -+ $vhosts_file.=' php_admin_flag engine On'."\n"; -+ if($domain['openbasedir'] == '1') -+ { -+ $vhosts_file.=' php_admin_value open_basedir "'.$domain['documentroot']."\"\n"; -+ } -+ if($domain['safemode'] == '1') -+ { -+ $vhosts_file.=' php_admin_flag safe_mode On '."\n"; -+ } -+ if($domain['safemode'] == '0') -+ { -+ $vhosts_file.=' php_admin_flag safe_mode Off '."\n"; -+ } -+ if($domain['php_errordisplay'] == '1') -+ { -+ $vhosts_file.=' php_admin_flag display_errors On '."\n"; -+ } -+ if($domain['php_errordisplay'] == '0') -+ { -+ $vhosts_file.=' php_admin_flag display_errors Off '."\n"; -+ } -+ } -+ if($domain['php_engine'] == '0') -+ { -+ $vhosts_file.=' php_admin_flag engine Off'."\n"; -+ } -+ - if(!is_dir($domain['documentroot'])) - { - safe_exec('mkdir -p "'.$domain['documentroot'].'"'); -@@ -238,6 +262,16 @@ - $diroptions_file .= ' Options -Indexes'."\n"; - fwrite( $debugHandler, ' cron_tasks: Task3 - Setting Options -Indexes'); - } -+ if ( isset ( $row_diroptions['options_execcgi'] ) && $row_diroptions['options_execcgi'] == '1' ) -+ { -+ $diroptions_file .= ' Options +ExecCGI'."\n"; -+ fwrite( $debugHandler, ' cron_tasks: Task3 - Setting Options +ExecCGI'); -+ } -+ if ( isset ( $row_diroptions['options_execcgi'] ) && $row_diroptions['options_execcgi'] == '0' ) -+ { -+ $diroptions_file .= ' Options -ExecCGI'."\n"; -+ fwrite( $debugHandler, ' cron_tasks: Task3 - Setting Options -ExecCGI'); -+ } - if ( isset ( $row_diroptions['error404path'] ) && $row_diroptions['error404path'] != '') - { - $diroptions_file .= ' ErrorDocument 404 "'.$row_diroptions['error404path']."\"\n"; -diff -Nru syscp-mysql-ftp-imp/templates/admin/domains/domains_add.tpl syscp-options/templates/admin/domains/domains_add.tpl ---- syscp-mysql-ftp-imp/templates/admin/domains/domains_add.tpl 2006-03-26 01:05:34.000000000 +0100 -+++ syscp-options/templates/admin/domains/domains_add.tpl 2006-03-26 01:06:22.000000000 +0100 -@@ -49,6 +49,18 @@ - <td class="install_nomecampo">{$lng['admin']['domain_edit']}:</td> - <td class="install_campodisplay" nowrap="nowrap">$caneditdomain</td> - </tr> -+ <tr> -+ <td class="install_nomecampo">ServerSideIncludes:</td> -+ <td class="install_campodisplay" nowrap="nowrap">$ssi_includes</td> -+ </tr> -+ <tr> -+ <td class="install_nomecampo">PHP Engine:</td> -+ <td class="install_campodisplay" nowrap="nowrap">$php_engine</td> -+ </tr> -+ <tr> -+ <td class="install_nomecampo">PHP Error Display:</td> -+ <td class="install_campodisplay" nowrap="nowrap">$php_errordisplay</td> -+ </tr> - <if $userinfo['change_serversettings'] == '1'> - <tr> - <td class="install_nomecampo">OpenBasedir:</td> -diff -Nru syscp-mysql-ftp-imp/templates/admin/domains/domains_edit.tpl syscp-options/templates/admin/domains/domains_edit.tpl ---- syscp-mysql-ftp-imp/templates/admin/domains/domains_edit.tpl 2006-03-26 01:05:34.000000000 +0100 -+++ syscp-options/templates/admin/domains/domains_edit.tpl 2006-03-26 01:06:22.000000000 +0100 -@@ -52,6 +52,18 @@ - <td class="install_nomecampo">{$lng['admin']['domain_edit']}:</td> - <td class="install_campodisplay" nowrap="nowrap">$caneditdomain</td> - </tr> -+ <tr> -+ <td class="install_nomecampo">ServerSideIncludes:</td> -+ <td class="install_campodisplay" nowrap="nowrap">$ssi_includes</td> -+ </tr> -+ <tr> -+ <td class="install_nomecampo">PHP Engine:</td> -+ <td class="install_campodisplay" nowrap="nowrap">$php_engine</td> -+ </tr> -+ <tr> -+ <td class="install_nomecampo">PHP Error Display:</td> -+ <td class="install_campodisplay" nowrap="nowrap">$php_errordisplay</td> -+ </tr> - <if $userinfo['change_serversettings'] == '1'> - <tr> - <td class="install_nomecampo">OpenBasedir:</td> -diff -Nru syscp-mysql-ftp-imp/templates/customer/domains/domains_edit.tpl syscp-options/templates/customer/domains/domains_edit.tpl ---- syscp-mysql-ftp-imp/templates/customer/domains/domains_edit.tpl 2006-03-26 01:05:34.000000000 +0100 -+++ syscp-options/templates/customer/domains/domains_edit.tpl 2006-03-26 01:06:22.000000000 +0100 -@@ -35,6 +35,10 @@ - </tr> - </if> - <tr> -+ <td class="install_nomecampo">PHP Error Display:</td> -+ <td class="install_campodisplay" nowrap="nowrap">$php_errordisplay</td> -+ </tr> -+ <tr> - <td class="install_confermacampo" colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottone" value="{$lng['panel']['save']}" /></td> - </tr> - </table> -diff -Nru syscp-mysql-ftp-imp/templates/customer/extras/htaccess_add.tpl syscp-options/templates/customer/extras/htaccess_add.tpl ---- syscp-mysql-ftp-imp/templates/customer/extras/htaccess_add.tpl 2006-03-26 01:05:34.000000000 +0100 -+++ syscp-options/templates/customer/extras/htaccess_add.tpl 2006-03-26 01:06:22.000000000 +0100 -@@ -16,6 +16,10 @@ - <td class="install_campodisplay" nowrap="nowrap">$options_indexes</td> - </tr> - <tr> -+ <td class="install_nomecampo"><b>{$lng['extras']['directory_execcgi']}:</b></td> -+ <td class="install_campodisplay" nowrap="nowrap">$options_execcgi</td> -+ </tr> -+ <tr> - <td class="install_nomecampo"><b>{$lng['extras']['errordocument404path']}:</b><br />{$lng['panel']['emptyfordefault']}</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="error404path" value="" maxlength="50" /></td> - </tr> -diff -Nru syscp-mysql-ftp-imp/templates/customer/extras/htaccess_edit.tpl syscp-options/templates/customer/extras/htaccess_edit.tpl ---- syscp-mysql-ftp-imp/templates/customer/extras/htaccess_edit.tpl 2006-03-26 01:05:34.000000000 +0100 -+++ syscp-options/templates/customer/extras/htaccess_edit.tpl 2006-03-26 01:06:22.000000000 +0100 -@@ -17,6 +17,10 @@ - <td class="install_campodisplay" nowrap="nowrap">$options_indexes</td> - </tr> - <tr> -+ <td class="install_nomecampo"><b>{$lng['extras']['directory_execcgi']}:</b></td> -+ <td class="install_campodisplay" nowrap="nowrap">$options_execcgi</td> -+ </tr> -+ <tr> - <td class="install_nomecampo"><b>{$lng['extras']['errordocument404path']}:</b><br />{$lng['panel']['emptyfordefault']}</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="error404path" value="{$result['error404path']}" maxlength="50" /></td> - </tr> -diff -Nru syscp-mysql-ftp-imp/templates/customer/extras/htaccess_htaccess.tpl syscp-options/templates/customer/extras/htaccess_htaccess.tpl ---- syscp-mysql-ftp-imp/templates/customer/extras/htaccess_htaccess.tpl 2006-03-26 01:05:34.000000000 +0100 -+++ syscp-options/templates/customer/extras/htaccess_htaccess.tpl 2006-03-26 01:06:22.000000000 +0100 -@@ -1,6 +1,7 @@ - <tr> - <td class="nomecampo_bordosx">{$row['path']}</td> - <td class="nomecampo">{$row['options_indexes']}</td> -+ <td class="nomecampo">{$row['options_execcgi']}</td> - <td class="nomecampo">{$row['error404path']}</td> - <td class="nomecampo">{$row['error403path']}</td> - <td class="nomecampo">{$row['error500path']}</td> -diff -Nru syscp-mysql-ftp-imp/templates/customer/extras/htaccess.tpl syscp-options/templates/customer/extras/htaccess.tpl ---- syscp-mysql-ftp-imp/templates/customer/extras/htaccess.tpl 2006-03-26 01:05:34.000000000 +0100 -+++ syscp-options/templates/customer/extras/htaccess.tpl 2006-03-26 01:06:22.000000000 +0100 -@@ -1,11 +1,12 @@ - $header - <table cellpadding="5" cellspacing="0" border="0" align="center" class="install_tabella"> - <tr> -- <td class="install_titolo" colspan="7"><b><img src="../images/titolo.gif" alt="" /> {$lng['menue']['extras']['pathoptions']}</b></td> -+ <td class="install_titolo" colspan="8"><b><img src="../images/titolo.gif" alt="" /> {$lng['menue']['extras']['pathoptions']}</b></td> - </tr> - <tr> - <td class="campodisplay_bordosx">{$lng['panel']['path']}</td> - <td class="campodisplay">{$lng['extras']['view_directory']}</td> -+ <td class="campodisplay">{$lng['extras']['view_execcgi']}</td> - <td class="campodisplay">{$lng['extras']['error404path']}</td> - <td class="campodisplay">{$lng['extras']['error403path']}</td> - <td class="campodisplay">{$lng['extras']['error500path']}</td> -@@ -13,7 +14,7 @@ - </tr> - $htaccess - <tr> -- <td class="campodisplay_bordosx" colspan="7"><a href="$filename?page=htaccess&action=add&s=$s">{$lng['extras']['pathoptions_add']}</a></td> -+ <td class="campodisplay_bordosx" colspan="8"><a href="$filename?page=htaccess&action=add&s=$s">{$lng['extras']['pathoptions_add']}</a></td> - </tr> - </table> - <br /> diff --git a/syscp/patches/options-patch/syscp-1.2.13-options-patch-r3.tar.bz2 b/syscp/patches/options-patch/syscp-1.2.13-options-patch-r3.tar.bz2 Binary files differdeleted file mode 100644 index 9187e3e..0000000 --- a/syscp/patches/options-patch/syscp-1.2.13-options-patch-r3.tar.bz2 +++ /dev/null diff --git a/syscp/patches/suexec-patch/syscp-1.2.13-suexec-patch-r3.tar.bz2 b/syscp/patches/suexec-patch/syscp-1.2.13-suexec-patch-r3.tar.bz2 Binary files differdeleted file mode 100644 index cd9aae1..0000000 --- a/syscp/patches/suexec-patch/syscp-1.2.13-suexec-patch-r3.tar.bz2 +++ /dev/null diff --git a/syscp/patches/suexec-patch/syscp-1.2.13-suexec-support.patch b/syscp/patches/suexec-patch/syscp-1.2.13-suexec-support.patch deleted file mode 100644 index 3cd7424..0000000 --- a/syscp/patches/suexec-patch/syscp-1.2.13-suexec-support.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nru syscp-options/scripts/cron_tasks.php syscp-suexec/scripts/cron_tasks.php ---- syscp-options/scripts/cron_tasks.php 2006-03-26 01:24:58.000000000 +0100 -+++ syscp-suexec/scripts/cron_tasks.php 2006-03-26 04:09:01.000000000 +0200 -@@ -108,6 +108,7 @@ - { - $domain['documentroot'] = makeCorrectDir ($domain['documentroot']); - $vhosts_file.=' DocumentRoot "'.$domain['documentroot']."\"\n"; -+ $vhosts_file.=' SuexecUserGroup '.$domain['loginname'].' '.$domain['loginname']."\n"; - if($domain['ssi_includes'] == '1') - { - $vhosts_file.=' Options +Includes'."\n"; diff --git a/syscp/patches/suphp-patch/syscp-1.2.13-suphp-patch-r3.tar.bz2 b/syscp/patches/suphp-patch/syscp-1.2.13-suphp-patch-r3.tar.bz2 Binary files differdeleted file mode 100644 index 81add91..0000000 --- a/syscp/patches/suphp-patch/syscp-1.2.13-suphp-patch-r3.tar.bz2 +++ /dev/null diff --git a/syscp/patches/suphp-patch/syscp-1.2.13-suphp-support.patch b/syscp/patches/suphp-patch/syscp-1.2.13-suphp-support.patch deleted file mode 100644 index b2f7b06..0000000 --- a/syscp/patches/suphp-patch/syscp-1.2.13-suphp-support.patch +++ /dev/null @@ -1,370 +0,0 @@ -diff -Nru syscp-suexec/customer_extras.php syscp-suphp/customer_extras.php ---- syscp-suexec/customer_extras.php 2006-03-26 04:08:39.000000000 +0200 -+++ syscp-suphp/customer_extras.php 2006-03-26 04:11:22.000000000 +0200 -@@ -178,6 +178,8 @@ - $row['options_indexes'] = str_replace('0', $lng['panel']['no'], $row['options_indexes']); - $row['options_execcgi'] = str_replace('1', $lng['panel']['yes'], $row['options_execcgi']); - $row['options_execcgi'] = str_replace('0', $lng['panel']['no'], $row['options_execcgi']); -+ $row['options_phpversionselect'] = str_replace('4', $lng['extras']['php4'], $row['options_phpversionselect']); -+ $row['options_phpversionselect'] = str_replace('5', $lng['extras']['php5'], $row['options_phpversionselect']); - eval("\$htaccess.=\"".getTemplate("extras/htaccess_htaccess")."\";"); - } - eval("echo \"".getTemplate("extras/htaccess")."\";"); -@@ -273,6 +275,7 @@ - ' `path`, ' . - ' `options_indexes`, ' . - ' `options_execcgi`, ' . -+ ' `options_phpversionselect`, ' . - ' `error404path`, ' . - ' `error403path`, ' . - // ' `error401path`, ' . -@@ -282,6 +285,7 @@ - ' "'.$path.'", ' . - ' "'.$_POST['options_indexes'].'", ' . - ' "'.$_POST['options_execcgi'].'", ' . -+ ' "'.$_POST['options_phpversionselect'].'", ' . - ' "'.$error404path.'", ' . - ' "'.$error403path.'", ' . - // ' "'.$error401path.'", ' . -@@ -298,6 +302,7 @@ - $userinfo['guid'], $settings['panel']['pathedit'] ); - $options_indexes = makeyesno('options_indexes','1','0','1'); - $options_execcgi = makeyesno('options_execcgi','1','0','0'); -+ $options_phpversionselect = "<b>".$lng['extras']['php4']."</b><input type=\"radio\" name=\"options_phpversionselect\" value=\"4\" checked=\"checked\" /> \n<b>".$lng['extras']['php5']."</b><input type=\"radio\" name=\"options_phpversionselect\" value=\"5\" />"; - eval("echo \"".getTemplate("extras/htaccess_add")."\";"); - } - } -@@ -327,6 +332,11 @@ - { - $option_execcgi = '0'; - } -+ $option_phpversionselect = intval($_POST['options_phpversionselect']); -+ if ($option_phpversionselect != '5') -+ { -+ $option_phpversionselect = '4'; -+ } - if ( ($_POST['error404path'] == '') - || (preg_match('/^https?\:\/\//', $_POST['error404path']) ) - ) -@@ -370,6 +380,7 @@ - - if ( ($option_indexes != $result['options_indexes']) - || ($option_execcgi != $result['options_execcgi']) -+ || ($option_phpversionselect != $result['options_phpversionselect']) - || ($error404path != $result['error404path']) - || ($error403path != $result['error403path']) - // || ($error401path != $result['error401path']) -@@ -381,6 +392,7 @@ - 'UPDATE `'.TABLE_PANEL_HTACCESS.'` ' . - 'SET `options_indexes` = "'.$option_indexes.'",' . - ' `options_execcgi` = "'.$option_execcgi.'",' . -+ ' `options_phpversionselect` = "'.$option_phpversionselect.'",' . - ' `error404path` = "'.$error404path.'", ' . - ' `error403path` = "'.$error403path.'", ' . - // ' `error401path` = "'.$error401path.'", ' . -@@ -400,6 +412,14 @@ - $result['error500path'] = $result['error500path']; - $options_indexes = makeyesno('options_indexes', '1', '0', $result['options_indexes']); - $options_execcgi = makeyesno('options_execcgi', '1', '0', $result['options_execcgi']); -+ if($result['options_phpversionselect'] == '5') -+ { -+ $options_phpversionselect = "<b>".$lng['extras']['php4']."</b><input type=\"radio\" name=\"options_phpversionselect\" value=\"4\" /> \n<b>".$lng['extras']['php5']."</b><input type=\"radio\" name=\"options_phpversionselect\" value=\"5\" checked=\"checked\" />"; -+ } -+ else -+ { -+ $options_phpversionselect = "<b>".$lng['extras']['php4']."</b><input type=\"radio\" name=\"options_phpversionselect\" value=\"4\" checked=\"checked\" /> \n<b>".$lng['extras']['php5']."</b><input type=\"radio\" name=\"options_phpversionselect\" value=\"5\" />"; -+ } - eval("echo \"".getTemplate("extras/htaccess_edit")."\";"); - } - } -diff -Nru syscp-suexec/lng/english.lng.php syscp-suphp/lng/english.lng.php ---- syscp-suexec/lng/english.lng.php 2006-03-26 04:08:39.000000000 +0200 -+++ syscp-suphp/lng/english.lng.php 2006-03-26 04:11:22.000000000 +0200 -@@ -423,4 +423,16 @@ - */ - $lng['extras']['view_execcgi'] = 'permit CGI execution'; - $lng['extras']['directory_execcgi'] = 'execute CGI scripts'; -+ -+/** -+ * CHANGED FOR SUPHP PATCH -+ */ -+ -+/** -+ * ADDED FOR SUPHP PATCH -+ */ -+$lng['extras']['php4'] = 'PHP4'; -+$lng['extras']['php5'] = 'PHP5'; -+$lng['extras']['view_phpversionselect'] = 'PHP version'; -+$lng['extras']['directory_phpversionselect'] = 'enabled PHP version'; - ?> -\ No newline at end of file -diff -Nru syscp-suexec/scripts/create_suphp_inis.php syscp-suphp/scripts/create_suphp_inis.php ---- syscp-suexec/scripts/create_suphp_inis.php 1970-01-01 01:00:00.000000000 +0100 -+++ syscp-suphp/scripts/create_suphp_inis.php 2006-03-26 04:11:22.000000000 +0200 -@@ -0,0 +1,129 @@ -+<?php -+/* -+ * This script creates the php.ini's used by mod_suPHP+php-cgi -+ */ -+ if(@php_sapi_name() != 'cli' && @php_sapi_name() != 'cgi' && @php_sapi_name() != 'cgi-fcgi') -+ { -+ die('This script only works in the shell.'); -+ } -+ -+ $baseconfigdir = '/var/www/syscp-suphp/config'; -+ $basetmpdir = '/var/www/syscp-suphp/tmp'; -+ $peardir = '/usr/share/php/:/usr/share/php4/:/usr/share/php5/'; -+ -+ $configdir = $baseconfigdir.'/'.$domain['loginname'].'/'.$domain['domain'].'/'; -+ $tmpdir = $basetmpdir.'/'.$domain['loginname'].'/'; -+ -+ if($domain['openbasedir'] == '1') -+ { -+ $openbasedircomm = ''; -+ $openbasedir = $domain['documentroot'].':'.$tmpdir.':'.$peardir; -+ } -+ if($domain['openbasedir'] == '0') -+ { -+ $openbasedircomm = ';'; -+ $openbasedir = ''; -+ } -+ -+ if($domain['safemode'] == '1') -+ { -+ $safemode = 'On'; -+ } -+ if($domain['safemode'] == '0') -+ { -+ $safemode = 'Off'; -+ } -+ -+ if($domain['php_errordisplay'] == '1') -+ { -+ $phperrordisplay = 'On'; -+ } -+ if($domain['php_errordisplay'] == '0') -+ { -+ $phperrordisplay = 'Off'; -+ } -+ -+ // create config dir if necessary -+ if(!is_dir($configdir)) -+ { -+ safe_exec('mkdir -p "'.$configdir.'"'); -+ } -+ -+ // create tmp dir if necessary -+ if(!is_dir($tmpdir)) -+ { -+ safe_exec('mkdir -p "'.$tmpdir.'"'); -+ safe_exec('chown -R '.$domain['guid'].':'.$domain['guid'].' "'.$tmpdir.'"'); -+ safe_exec('chmod 0750 "'.$tmpdir.'"'); -+ } -+ -+// define the php.ini -+$config_file_php_ini = 'short_open_tag = On -+asp_tags = Off -+precision = 14 -+output_buffering = 4096 -+allow_call_time_pass_reference = Off -+safe_mode = '.$safemode.' -+safe_mode_gid = Off -+safe_mode_include_dir = "'.$peardir.'" -+safe_mode_allowed_env_vars = PHP_ -+safe_mode_protected_env_vars = LD_LIBRARY_PATH -+'.$openbasedircomm.'open_basedir = "'.$openbasedir.'" -+disable_functions = exec,passthru,shell_exec,system,proc_close,proc_get_status,proc_nice,proc_open,proc_terminate -+disable_classes = -+expose_php = Off -+max_execution_time = 30 -+max_input_time = 60 -+memory_limit = 8M -+post_max_size = 8M -+error_reporting = E_ALL -+display_errors = '.$phperrordisplay.' -+display_startup_errors = Off -+log_errors = On -+log_errors_max_len = 1024 -+ignore_repeated_errors = Off -+ignore_repeated_source = Off -+report_memleaks = On -+track_errors = Off -+html_errors = Off -+variables_order = "GPCS" -+register_globals = Off -+register_argc_argv = Off -+gpc_order = "GPC" -+magic_quotes_gpc = Off -+magic_quotes_runtime = Off -+magic_quotes_sybase = Off -+include_path = ".:'.$peardir.'" -+enable_dl = Off -+file_uploads = On -+upload_tmp_dir = "'.$tmpdir.'" -+upload_max_filesize = 32M -+allow_url_fopen = Off -+sendmail_path = "/usr/sbin/sendmail -t -f '.$domain['email'].'" -+session.save_handler = files -+session.save_path = "'.$tmpdir.'" -+session.use_cookies = 1 -+session.name = PHPSESSID -+session.auto_start = 0 -+session.cookie_lifetime = 0 -+session.cookie_path = / -+session.cookie_domain = -+session.serialize_handler = php -+session.gc_probability = 1 -+session.gc_divisor = 1000 -+session.gc_maxlifetime = 1440 -+session.bug_compat_42 = 0 -+session.bug_compat_warn = 1 -+session.referer_check = -+session.entropy_length = 16 -+session.entropy_file = /dev/urandom -+session.cache_limiter = nocache -+session.cache_expire = 180 -+session.use_trans_sid = 0'; -+ -+$config_file_handler = fopen($configdir.'php.ini', 'w'); -+fwrite($config_file_handler, $config_file_php_ini); -+fclose($config_file_handler); -+safe_exec('chown root:0 "'.$configdir.'php.ini"'); -+safe_exec('chmod 0644 "'.$configdir.'php.ini"'); -+?> -\ No newline at end of file -diff -Nru syscp-suexec/scripts/cron_tasks.php syscp-suphp/scripts/cron_tasks.php ---- syscp-suexec/scripts/cron_tasks.php 2006-03-26 04:09:01.000000000 +0200 -+++ syscp-suphp/scripts/cron_tasks.php 2006-03-26 04:11:22.000000000 +0200 -@@ -119,31 +119,14 @@ - } - if($domain['php_engine'] == '1') - { -- $vhosts_file.=' php_admin_flag engine On'."\n"; -- if($domain['openbasedir'] == '1') -- { -- $vhosts_file.=' php_admin_value open_basedir "'.$domain['documentroot']."\"\n"; -- } -- if($domain['safemode'] == '1') -- { -- $vhosts_file.=' php_admin_flag safe_mode On '."\n"; -- } -- if($domain['safemode'] == '0') -- { -- $vhosts_file.=' php_admin_flag safe_mode Off '."\n"; -- } -- if($domain['php_errordisplay'] == '1') -- { -- $vhosts_file.=' php_admin_flag display_errors On '."\n"; -- } -- if($domain['php_errordisplay'] == '0') -- { -- $vhosts_file.=' php_admin_flag display_errors Off '."\n"; -- } -+ $vhosts_file.=' suPHP_Engine On'."\n"; -+ $vhosts_file.=' suPHP_UserGroup '.$domain['loginname'].' '.$domain['loginname']."\n"; -+ include 'create_suphp_inis.php'; -+ $vhosts_file.=' suPHP_ConfigPath "'.$configdir."\"\n"; - } - if($domain['php_engine'] == '0') - { -- $vhosts_file.=' php_admin_flag engine Off'."\n"; -+ $vhosts_file.=' suPHP_Engine Off'."\n"; - } - - if(!is_dir($domain['documentroot'])) -@@ -198,6 +181,8 @@ - safe_exec('chown -R '.$row['data']['uid'].':'.$row['data']['gid'].' "'.$settings['system']['documentroot_prefix'].$row['data']['loginname'].'"'); - safe_exec('chown -R '.$settings['system']['vmail_uid'].':'.$settings['system']['vmail_gid'].' "'.$settings['system']['vmail_homedir'].$row['data']['loginname'].'"'); - safe_exec('chmod 0750 "'.$settings['system']['vmail_homedir'].$row['data']['loginname'].'"'); -+ safe_exec('chown '.$row['data']['uid'].':apache "'.$settings['system']['documentroot_prefix'].$row['data']['loginname'].'"'); -+ safe_exec('chmod 0750 "'.$settings['system']['documentroot_prefix'].$row['data']['loginname'].'"'); - } - } - -@@ -273,6 +258,20 @@ - $diroptions_file .= ' Options -ExecCGI'."\n"; - fwrite( $debugHandler, ' cron_tasks: Task3 - Setting Options -ExecCGI'); - } -+ if ( isset ( $row_diroptions['options_phpversionselect'] ) && $row_diroptions['options_phpversionselect'] == '5' ) -+ { -+ $diroptions_file .= ' AddType application/x-httpd-php5 .php .php5 .php4 .php3 .phtml'."\n"; -+ $diroptions_file .= ' AddHandler x-httpd-php5 .php .php5 .php4 .php3 .phtml'."\n"; -+ $diroptions_file .= ' suPHP_AddHandler x-httpd-php5'."\n"; -+ fwrite( $debugHandler, ' cron_tasks: Task3 - Setting PHP version to 5'); -+ } -+ if ( isset ( $row_diroptions['options_phpversionselect'] ) && $row_diroptions['options_phpversionselect'] == '4' ) -+ { -+ $diroptions_file .= ' AddType application/x-httpd-php4 .php .php5 .php4 .php3 .phtml'."\n"; -+ $diroptions_file .= ' AddHandler x-httpd-php4 .php .php5 .php4 .php3 .phtml'."\n"; -+ $diroptions_file .= ' suPHP_AddHandler x-httpd-php4'."\n"; -+ fwrite( $debugHandler, ' cron_tasks: Task3 - Setting PHP version to 4'); -+ } - if ( isset ( $row_diroptions['error404path'] ) && $row_diroptions['error404path'] != '') - { - $diroptions_file .= ' ErrorDocument 404 "'.$row_diroptions['error404path']."\"\n"; -diff -Nru syscp-suexec/templates/customer/extras/htaccess_add.tpl syscp-suphp/templates/customer/extras/htaccess_add.tpl ---- syscp-suexec/templates/customer/extras/htaccess_add.tpl 2006-03-26 04:08:39.000000000 +0200 -+++ syscp-suphp/templates/customer/extras/htaccess_add.tpl 2006-03-26 04:11:22.000000000 +0200 -@@ -20,6 +20,10 @@ - <td class="install_campodisplay" nowrap="nowrap">$options_execcgi</td> - </tr> - <tr> -+ <td class="install_nomecampo"><b>{$lng['extras']['directory_phpversionselect']}:</b></td> -+ <td class="install_campodisplay" nowrap="nowrap">$options_phpversionselect</td> -+ </tr> -+ <tr> - <td class="install_nomecampo"><b>{$lng['extras']['errordocument404path']}:</b><br />{$lng['panel']['emptyfordefault']}</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="error404path" value="" maxlength="50" /></td> - </tr> -diff -Nru syscp-suexec/templates/customer/extras/htaccess_edit.tpl syscp-suphp/templates/customer/extras/htaccess_edit.tpl ---- syscp-suexec/templates/customer/extras/htaccess_edit.tpl 2006-03-26 04:08:39.000000000 +0200 -+++ syscp-suphp/templates/customer/extras/htaccess_edit.tpl 2006-03-26 04:11:22.000000000 +0200 -@@ -21,6 +21,10 @@ - <td class="install_campodisplay" nowrap="nowrap">$options_execcgi</td> - </tr> - <tr> -+ <td class="install_nomecampo"><b>{$lng['extras']['directory_phpversionselect']}:</b></td> -+ <td class="install_campodisplay" nowrap="nowrap">$options_phpversionselect</td> -+ </tr> -+ <tr> - <td class="install_nomecampo"><b>{$lng['extras']['errordocument404path']}:</b><br />{$lng['panel']['emptyfordefault']}</td> - <td class="install_campodisplay" nowrap="nowrap"><input type="text" name="error404path" value="{$result['error404path']}" maxlength="50" /></td> - </tr> -diff -Nru syscp-suexec/templates/customer/extras/htaccess_htaccess.tpl syscp-suphp/templates/customer/extras/htaccess_htaccess.tpl ---- syscp-suexec/templates/customer/extras/htaccess_htaccess.tpl 2006-03-26 04:08:39.000000000 +0200 -+++ syscp-suphp/templates/customer/extras/htaccess_htaccess.tpl 2006-03-26 04:11:22.000000000 +0200 -@@ -2,6 +2,7 @@ - <td class="nomecampo_bordosx">{$row['path']}</td> - <td class="nomecampo">{$row['options_indexes']}</td> - <td class="nomecampo">{$row['options_execcgi']}</td> -+ <td class="nomecampo">{$row['options_phpversionselect']}</td> - <td class="nomecampo">{$row['error404path']}</td> - <td class="nomecampo">{$row['error403path']}</td> - <td class="nomecampo">{$row['error500path']}</td> -diff -Nru syscp-suexec/templates/customer/extras/htaccess.tpl syscp-suphp/templates/customer/extras/htaccess.tpl ---- syscp-suexec/templates/customer/extras/htaccess.tpl 2006-03-26 04:08:39.000000000 +0200 -+++ syscp-suphp/templates/customer/extras/htaccess.tpl 2006-03-26 04:11:22.000000000 +0200 -@@ -1,12 +1,13 @@ - $header - <table cellpadding="5" cellspacing="0" border="0" align="center" class="install_tabella"> - <tr> -- <td class="install_titolo" colspan="8"><b><img src="../images/titolo.gif" alt="" /> {$lng['menue']['extras']['pathoptions']}</b></td> -+ <td class="install_titolo" colspan="9"><b><img src="../images/titolo.gif" alt="" /> {$lng['menue']['extras']['pathoptions']}</b></td> - </tr> - <tr> - <td class="campodisplay_bordosx">{$lng['panel']['path']}</td> - <td class="campodisplay">{$lng['extras']['view_directory']}</td> - <td class="campodisplay">{$lng['extras']['view_execcgi']}</td> -+ <td class="campodisplay">{$lng['extras']['view_phpversionselect']}</td> - <td class="campodisplay">{$lng['extras']['error404path']}</td> - <td class="campodisplay">{$lng['extras']['error403path']}</td> - <td class="campodisplay">{$lng['extras']['error500path']}</td> -@@ -14,7 +15,7 @@ - </tr> - $htaccess - <tr> -- <td class="campodisplay_bordosx" colspan="8"><a href="$filename?page=htaccess&action=add&s=$s">{$lng['extras']['pathoptions_add']}</a></td> -+ <td class="campodisplay_bordosx" colspan="9"><a href="$filename?page=htaccess&action=add&s=$s">{$lng['extras']['pathoptions_add']}</a></td> - </tr> - </table> - <br /> diff --git a/syscp/patches/syscp-patches/syscp-1.2.13-gentoo-compatibility.patch b/syscp/patches/syscp-patches/syscp-1.2.13-gentoo-compatibility.patch deleted file mode 100644 index 288f2a6..0000000 --- a/syscp/patches/syscp-patches/syscp-1.2.13-gentoo-compatibility.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff -Nru syscp/admin_customers.php syscp-gentoo-comp/admin_customers.php ---- syscp/admin_customers.php 2006-03-25 23:38:00.000000000 +0100 -+++ syscp-gentoo-comp/admin_customers.php 2006-03-26 00:39:05.000000000 +0100 -@@ -421,7 +421,7 @@ - $db->query( - "INSERT INTO `".TABLE_PANEL_DOMAINS."` " . - "(`domain`, `customerid`, `adminid`, `parentdomainid`, `documentroot`, `zonefile`, `isemaildomain`, `caneditdomain`, `openbasedir`, `safemode`, `speciallogfile`, `specialsettings`) " . -- "VALUES ('$loginname.{$settings['system']['hostname']}', '$customerid', '{$userinfo['adminid']}', '-1', '$documentroot', '', '0', '0', '1', '1', '0', '')" -+ "VALUES ('$loginname.{$settings['system']['hostname']}', '$customerid', '{$userinfo['adminid']}', '-1', '$documentroot', '', '1', '1', '1', '1', '0', '')" - ); - $domainid=$db->insert_id(); - $db->query( -@@ -552,7 +552,7 @@ - $db->query( - "INSERT INTO `".TABLE_PANEL_DOMAINS."` " . - "(`domain`, `customerid`, `adminid`, `documentroot`, `zonefile`, `isemaildomain`, `caneditdomain`, `openbasedir`, `safemode`, `speciallogfile`, `specialsettings`) " . -- "VALUES ('{$result['loginname']}.{$settings['system']['hostname']}', '{$result['customerid']}', '{$userinfo['adminid']}', '{$result['documentroot']}', '', '0', '0', '1', '1', '0', '')" -+ "VALUES ('{$result['loginname']}.{$settings['system']['hostname']}', '{$result['customerid']}', '{$userinfo['adminid']}', '{$result['documentroot']}', '', '1', '1', '1', '1', '0', '')" - ); - $domainid=$db->insert_id(); - $db->query( -diff -Nru syscp/admin_domains.php syscp-gentoo-comp/admin_domains.php ---- syscp/admin_domains.php 2006-03-25 23:38:00.000000000 +0100 -+++ syscp-gentoo-comp/admin_domains.php 2006-03-26 00:39:05.000000000 +0100 -@@ -390,9 +390,9 @@ - { - $domains.=makeoption($idna_convert->decode($row_domain['domain']).' ('.$row_domain['loginname'].')',$row_domain['id']); - } -- $isbinddomain=makeyesno('isbinddomain', '1', '0', '1'); -+ $isbinddomain=makeyesno('isbinddomain', '1', '0', '0'); - $isemaildomain=makeyesno('isemaildomain', '1', '0', '1'); -- $subcanemaildomain=makeyesno('subcanemaildomain', '1', '0', '0'); -+ $subcanemaildomain=makeyesno('subcanemaildomain', '1', '0', '1'); - $caneditdomain=makeyesno('caneditdomain', '1', '0', '1'); - $openbasedir=makeyesno('openbasedir', '1', '0', '1'); - $safemode=makeyesno('safemode', '1', '0', '1'); -diff -Nru syscp/customer_email.php syscp-gentoo-comp/customer_email.php ---- syscp/customer_email.php 2006-03-25 23:38:00.000000000 +0100 -+++ syscp-gentoo-comp/customer_email.php 2006-03-26 00:39:05.000000000 +0100 -@@ -285,7 +285,7 @@ - - else - { -- $db->query("INSERT INTO `".TABLE_MAIL_USERS."` (`customerid`, `email`, `username`, `password`, `password_enc`, `homedir`, `maildir`, `uid`, `gid`, `domainid`, `postfix`) VALUES ('".$userinfo['customerid']."', '$email_full', '$username', '$password', ENCRYPT('$password'), '".$settings['system']['vmail_homedir']."', '".$userinfo['loginname']."/$email_full/', '".$settings['system']['vmail_uid']."', '".$settings['system']['vmail_gid']."', '".$result['domainid']."', 'y')"); -+ $db->query("INSERT INTO `".TABLE_MAIL_USERS."` (`customerid`, `email`, `username`, `password`, `password_enc`, `homedir`, `maildir`, `uid`, `gid`, `domainid`, `postfix`) VALUES ('".$userinfo['customerid']."', '$email_full', '$username', '', ENCRYPT('$password'), '".$settings['system']['vmail_homedir']."', '".$userinfo['loginname']."/$email_full/', '".$settings['system']['vmail_uid']."', '".$settings['system']['vmail_gid']."', '".$result['domainid']."', 'y')"); - $popaccountid = $db->insert_id(); - $result['destination'] .= ' ' . $email_full; - $db->query("UPDATE `".TABLE_MAIL_VIRTUAL."` SET `destination` = '".makeCorrectDestination($result['destination'])."', `popaccountid` = '$popaccountid' WHERE `customerid`='".$userinfo['customerid']."' AND `id`='$id'"); -@@ -333,7 +333,7 @@ - } - else - { -- $result=$db->query("UPDATE `".TABLE_MAIL_USERS."` SET `password` = '$password', `password_enc`=ENCRYPT('$password') WHERE `customerid`='".$userinfo['customerid']."' AND `id`='".$result['popaccountid']."'"); -+ $result=$db->query("UPDATE `".TABLE_MAIL_USERS."` SET `password` = '', `password_enc`=ENCRYPT('$password') WHERE `customerid`='".$userinfo['customerid']."' AND `id`='".$result['popaccountid']."'"); - redirectTo ( $filename , Array ( 'page' => 'emails' , 'action' => 'edit' , 'id' => $id , 's' => $s ) ) ; - } - } -diff -Nru syscp/scripts/cron_tasks.php syscp-gentoo-comp/scripts/cron_tasks.php ---- syscp/scripts/cron_tasks.php 2006-03-25 23:38:02.000000000 +0100 -+++ syscp-gentoo-comp/scripts/cron_tasks.php 2006-03-26 00:39:05.000000000 +0100 -@@ -70,10 +70,10 @@ - } - $vhosts_file.="\n"; - -- $vhosts_file.='# DummyHost for DefaultSite'."\n"; -- $vhosts_file.='<VirtualHost '.$settings['system']['ipaddress'].':80>'."\n"; -- $vhosts_file.='ServerName '.$settings['system']['hostname']."\n"; -- $vhosts_file.='</VirtualHost>'."\n"."\n"; -+// $vhosts_file.='# DummyHost for DefaultSite'."\n"; -+// $vhosts_file.='<VirtualHost '.$settings['system']['ipaddress'].':80>'."\n"; -+// $vhosts_file.='ServerName '.$settings['system']['hostname']."\n"; -+// $vhosts_file.='</VirtualHost>'."\n"."\n"; - - $result_domains=$db->query("SELECT `d`.`id`, `d`.`domain`, `d`.`customerid`, `d`.`documentroot`, CONCAT(`ip`.`ip`,':',`ip`.`port`) AS `ipandport`, `d`.`parentdomainid`, `d`.`isemaildomain`, `d`.`iswildcarddomain`, `d`.`openbasedir`, `d`.`safemode`, `d`.`speciallogfile`, `d`.`specialsettings`, `pd`.`domain` AS `parentdomain`, `c`.`loginname`, `c`.`guid`, `c`.`email`, `c`.`documentroot` AS `customerroot` FROM `".TABLE_PANEL_DOMAINS."` `d` LEFT JOIN `".TABLE_PANEL_CUSTOMERS."` `c` USING(`customerid`) LEFT JOIN `".TABLE_PANEL_DOMAINS."` `pd` ON (`pd`.`id` = `d`.`parentdomainid`) LEFT JOIN `".TABLE_PANEL_IPSANDPORTS."` `ip` ON (`d`.`ipandport` = `ip`.`id`) WHERE `d`.`deactivated` <> '1' AND `d`.`aliasdomain` IS NULL ORDER BY `d`.`iswildcarddomain`, `d`.`domain` ASC"); - while($domain=$db->fetch_array($result_domains)) -@@ -172,6 +172,7 @@ - safe_exec('cp -a '.$pathtophpfiles.'/templates/misc/standardcustomer/* "'.$settings['system']['documentroot_prefix'].$row['data']['loginname'].'/"'); - safe_exec('chown -R '.$row['data']['uid'].':'.$row['data']['gid'].' "'.$settings['system']['documentroot_prefix'].$row['data']['loginname'].'"'); - safe_exec('chown -R '.$settings['system']['vmail_uid'].':'.$settings['system']['vmail_gid'].' "'.$settings['system']['vmail_homedir'].$row['data']['loginname'].'"'); -+ safe_exec('chmod 0750 "'.$settings['system']['vmail_homedir'].$row['data']['loginname'].'"'); - } - } - diff --git a/syscp/patches/syscp-patches/syscp-1.2.13-patches-r3.tar.bz2 b/syscp/patches/syscp-patches/syscp-1.2.13-patches-r3.tar.bz2 Binary files differdeleted file mode 100644 index a4be393..0000000 --- a/syscp/patches/syscp-patches/syscp-1.2.13-patches-r3.tar.bz2 +++ /dev/null diff --git a/syscp/patches/syscp-sqlfile/syscp-1.2.13-addopts-db.sql b/syscp/patches/syscp-sqlfile/syscp-1.2.13-addopts-db.sql deleted file mode 100644 index 1bc4b28..0000000 --- a/syscp/patches/syscp-sqlfile/syscp-1.2.13-addopts-db.sql +++ /dev/null @@ -1,7 +0,0 @@ -USE `MYSQL_DATABASE_NAME` ; - -ALTER TABLE `panel_domains` ADD `ssi_includes` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `parentdomainid` , -ADD `php_engine` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `ssi_includes` , -ADD `php_errordisplay` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `safemode` ; - -ALTER TABLE `panel_htaccess` ADD `options_execcgi` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `options_indexes` ; diff --git a/syscp/patches/syscp-sqlfile/syscp-1.2.13-baseinstall-db.sql b/syscp/patches/syscp-sqlfile/syscp-1.2.13-baseinstall-db.sql deleted file mode 100644 index f02d175..0000000 --- a/syscp/patches/syscp-sqlfile/syscp-1.2.13-baseinstall-db.sql +++ /dev/null @@ -1,646 +0,0 @@ -# $Id: syscp.sql,v 1.50 2005/09/21 10:33:05 flo Exp $ -# -------------------------------------------------------- - -# -# Delete old users and databases if present -# - -DELETE FROM `mysql`.`user` WHERE `User` = 'MYSQL_UNPRIV_USER' AND `Host` = 'MYSQL_ACCESS_HOST'; -DELETE FROM `mysql`.`db` WHERE `User` = 'MYSQL_UNPRIV_USER' AND `Host` = 'MYSQL_ACCESS_HOST'; -DELETE FROM `mysql`.`tables_priv` WHERE `User` = 'MYSQL_UNPRIV_USER' AND `Host` = 'MYSQL_ACCESS_HOST'; -DELETE FROM `mysql`.`columns_priv` WHERE `User` = 'MYSQL_UNPRIV_USER' AND `Host` = 'MYSQL_ACCESS_HOST'; -DROP DATABASE IF EXISTS `MYSQL_DATABASE_NAME`; -FLUSH PRIVILEGES; - -# -# Create new users and databases -# - -CREATE DATABASE `MYSQL_DATABASE_NAME`; -GRANT ALL PRIVILEGES ON `MYSQL_DATABASE_NAME`.* TO MYSQL_UNPRIV_USER@MYSQL_ACCESS_HOST IDENTIFIED BY 'password'; -SET PASSWORD FOR MYSQL_UNPRIV_USER@MYSQL_ACCESS_HOST = PASSWORD('MYSQL_UNPRIV_PASSWORD'); -FLUSH PRIVILEGES; - -USE `MYSQL_DATABASE_NAME`; - -# -# Table structure for table `ftp_groups` -# - -DROP TABLE IF EXISTS `ftp_groups`; -CREATE TABLE `ftp_groups` ( - `id` int(20) NOT NULL auto_increment, - `groupname` varchar(60) NOT NULL default '', - `gid` int(5) NOT NULL default '0', - `members` longtext NOT NULL, - `customerid` int(11) NOT NULL default '0', - PRIMARY KEY (`id`), - UNIQUE KEY `groupname` (`groupname`), - KEY `customerid` (`customerid`) -) TYPE=MyISAM ; - -# -# Dumping data for table `ftp_groups` -# - - -# -------------------------------------------------------- - -# -# Table structure for table `ftp_users` -# - -DROP TABLE IF EXISTS `ftp_users`; -CREATE TABLE `ftp_users` ( - `id` int(20) NOT NULL auto_increment, - `username` varchar(128) NOT NULL default '', - `uid` int(5) NOT NULL default '0', - `gid` int(5) NOT NULL default '0', - `password` varchar(128) NOT NULL default '', - `homedir` varchar(255) NOT NULL default '', - `shell` varchar(255) NOT NULL default '/bin/false', - `login_enabled` enum('N','Y') NOT NULL default 'N', - `login_count` int(15) NOT NULL default '0', - `last_login` datetime NOT NULL default '0000-00-00 00:00:00', - `up_count` int(15) NOT NULL default '0', - `up_bytes` bigint(30) NOT NULL default '0', - `down_count` int(15) NOT NULL default '0', - `down_bytes` bigint(30) NOT NULL default '0', - `customerid` int(11) NOT NULL default '0', - PRIMARY KEY (`id`), - UNIQUE KEY `username` (`username`), - KEY `customerid` (`customerid`) -) TYPE=MyISAM ; - -# -# Dumping data for table `ftp_users` -# - -# -------------------------------------------------------- - - -# -# Table structure for table `mail_users` -# - -DROP TABLE IF EXISTS `mail_users`; -CREATE TABLE `mail_users` ( - `id` int(11) NOT NULL auto_increment, - `email` varchar(255) NOT NULL default '', - `username` varchar(255) NOT NULL default '', - `password` varchar(128) NOT NULL default '', - `password_enc` varchar(128) NOT NULL default '', - `uid` int(11) NOT NULL default '0', - `gid` int(11) NOT NULL default '0', - `homedir` varchar(255) NOT NULL default '', - `maildir` varchar(255) NOT NULL default '', - `postfix` enum('Y','N') NOT NULL default 'Y', - `domainid` int(11) NOT NULL default '0', - `customerid` int(11) NOT NULL default '0', - PRIMARY KEY (`id`), - UNIQUE KEY `email` (`email`) -) TYPE=MyISAM ; - -# -# Dumping data for table `mail_users` -# - - -# -------------------------------------------------------- - -# -# Table structure for table `mail_virtual` -# - -DROP TABLE IF EXISTS `mail_virtual`; -CREATE TABLE `mail_virtual` ( - `id` int(11) NOT NULL auto_increment, - `email` varchar(255) NOT NULL default '', - `email_full` varchar(255) NOT NULL default '', - `destination` text NOT NULL, - `domainid` int(11) NOT NULL default '0', - `customerid` int(11) NOT NULL default '0', - `popaccountid` int(11) NOT NULL default '0', - `iscatchall` tinyint(1) unsigned NOT NULL default '0', - PRIMARY KEY (`id`) -) TYPE=MyISAM ; - -# -# Dumping data for table `mail_virtual` -# - -# -------------------------------------------------------- - - -# -# Table structure for table `panel_admins` -# - -DROP TABLE IF EXISTS `panel_admins`; -CREATE TABLE `panel_admins` ( - `adminid` int(11) unsigned NOT NULL auto_increment, - `loginname` varchar(50) NOT NULL default '', - `password` varchar(50) NOT NULL default '', - `name` varchar(255) NOT NULL default '', - `email` varchar(255) NOT NULL default '', - `def_language` varchar(255) NOT NULL default '', - `customers` int(15) NOT NULL default '0', - `customers_used` int(15) NOT NULL default '0', - `customers_see_all` tinyint(1) NOT NULL default '0', - `domains` int(15) NOT NULL default '0', - `domains_used` int(15) NOT NULL default '0', - `domains_see_all` tinyint(1) NOT NULL default '0', - `change_serversettings` tinyint(1) NOT NULL default '0', - `diskspace` int(15) NOT NULL default '0', - `diskspace_used` int(15) NOT NULL default '0', - `mysqls` int(15) NOT NULL default '0', - `mysqls_used` int(15) NOT NULL default '0', - `emails` int(15) NOT NULL default '0', - `emails_used` int(15) NOT NULL default '0', - `email_accounts` int(15) NOT NULL default '0', - `email_accounts_used` int(15) NOT NULL default '0', - `email_forwarders` int(15) NOT NULL default '0', - `email_forwarders_used` int(15) NOT NULL default '0', - `ftps` int(15) NOT NULL default '0', - `ftps_used` int(15) NOT NULL default '0', - `subdomains` int(15) NOT NULL default '0', - `subdomains_used` int(15) NOT NULL default '0', - `traffic` int(15) NOT NULL default '0', - `traffic_used` int(15) NOT NULL default '0', - `deactivated` tinyint(1) NOT NULL default '0', - `lastlogin_succ` int(11) unsigned NOT NULL default '0', - `lastlogin_fail` int(11) unsigned NOT NULL default '0', - `loginfail_count` int(11) unsigned NOT NULL default '0', - PRIMARY KEY (`adminid`) -) TYPE=MyISAM ; - - -# -------------------------------------------------------- - -# -# Table structure for table `panel_customers` -# - -DROP TABLE IF EXISTS `panel_customers`; -CREATE TABLE `panel_customers` ( - `customerid` int(11) unsigned NOT NULL auto_increment, - `loginname` varchar(50) NOT NULL default '', - `password` varchar(50) NOT NULL default '', - `adminid` int(11) unsigned NOT NULL default '0', - `name` varchar(255) NOT NULL default '', - `firstname` varchar(255) NOT NULL default '', - `company` varchar(255) NOT NULL default '', - `street` varchar(255) NOT NULL default '', - `zipcode` varchar(255) NOT NULL default '', - `city` varchar(255) NOT NULL default '', - `phone` varchar(255) NOT NULL default '', - `fax` varchar(255) NOT NULL default '', - `email` varchar(255) NOT NULL default '', - `customernumber` varchar(255) NOT NULL default '', - `def_language` varchar(255) NOT NULL default '', - `diskspace` int(15) NOT NULL default '0', - `diskspace_used` int(15) NOT NULL default '0', - `mysqls` int(15) NOT NULL default '0', - `mysqls_used` int(15) NOT NULL default '0', - `emails` int(15) NOT NULL default '0', - `emails_used` int(15) NOT NULL default '0', - `email_accounts` int(15) NOT NULL default '0', - `email_accounts_used` int(15) NOT NULL default '0', - `email_forwarders` int(15) NOT NULL default '0', - `email_forwarders_used` int(15) NOT NULL default '0', - `ftps` int(15) NOT NULL default '0', - `ftps_used` int(15) NOT NULL default '0', - `subdomains` int(15) NOT NULL default '0', - `subdomains_used` int(15) NOT NULL default '0', - `traffic` int(15) NOT NULL default '0', - `traffic_used` int(15) NOT NULL default '0', - `documentroot` varchar(255) NOT NULL default '', - `standardsubdomain` int(11) NOT NULL default '0', - `guid` int(5) NOT NULL default '0', - `ftp_lastaccountnumber` int(11) NOT NULL default '0', - `mysql_lastaccountnumber` int(11) NOT NULL default '0', - `deactivated` tinyint(1) NOT NULL default '0', - `lastlogin_succ` int(11) unsigned NOT NULL default '0', - `lastlogin_fail` int(11) unsigned NOT NULL default '0', - `loginfail_count` int(11) unsigned NOT NULL default '0', - PRIMARY KEY (`customerid`), - KEY `loginname` (`loginname`) -) TYPE=MyISAM ; -# -# Dumping data for table `panel_customers` -# - - -# -------------------------------------------------------- - -# -# Table structure for table `panel_databases` -# - -DROP TABLE IF EXISTS `panel_databases`; -CREATE TABLE `panel_databases` ( - `id` int(11) unsigned NOT NULL auto_increment, - `customerid` int(11) NOT NULL default '0', - `databasename` varchar(255) NOT NULL default '', - `description` varchar(255) NOT NULL default '', - PRIMARY KEY (`id`), - KEY `customerid` (`customerid`) -) TYPE=MyISAM ; - -# -# Dumping data for table `panel_databases` -# - - -# -------------------------------------------------------- - -# -# Table structure for table `panel_domains` -# -DROP TABLE IF EXISTS `panel_domains`; -CREATE TABLE `panel_domains` ( - `id` int(11) unsigned NOT NULL auto_increment, - `domain` varchar(255) NOT NULL default '', - `adminid` int(11) unsigned NOT NULL default '0', - `customerid` int(11) unsigned NOT NULL default '0', - `aliasdomain` int(11) unsigned NULL, - `documentroot` varchar(255) NOT NULL default '', - `ipandport` int(11) unsigned NOT NULL default '1', - `isbinddomain` tinyint(1) NOT NULL default '0', - `isemaildomain` tinyint(1) NOT NULL default '0', - `iswildcarddomain` tinyint(1) NOT NULL default '0', - `subcanemaildomain` tinyint(1) NOT NULL default '0', - `caneditdomain` tinyint(1) NOT NULL default '1', - `zonefile` varchar(255) NOT NULL default '', - `parentdomainid` int(11) unsigned NOT NULL default '0', - `openbasedir` tinyint(1) NOT NULL default '0', - `safemode` tinyint(1) NOT NULL default '0', - `speciallogfile` tinyint(1) NOT NULL default '0', - `specialsettings` text NOT NULL, - `deactivated` tinyint(1) NOT NULL default '0', - PRIMARY KEY (`id`), - KEY `customerid` (`customerid`), - KEY `parentdomain` (`parentdomainid`) -) TYPE=MyISAM ; - -# -# Dumping data for table `panel_domains` -# - - -# -------------------------------------------------------- - -# -# Table structure for table `panel_ipsandports` -# -DROP TABLE IF EXISTS `panel_ipsandports`; -CREATE TABLE `panel_ipsandports` ( - `id` int(11) unsigned NOT NULL auto_increment, - `ip` varchar(15) NOT NULL default '', - `port` int(5) NOT NULL default '80', - `default` int(1) NOT NULL default '0', - PRIMARY KEY (`id`) -) TYPE=MyISAM ; - -# -# Dumping data for table `panel_ipsandports` -# - - -# -------------------------------------------------------- - -# -# Table structure for table `panel_htaccess` -# - -DROP TABLE IF EXISTS `panel_htaccess`; -CREATE TABLE `panel_htaccess` ( - `id` int(11) unsigned NOT NULL auto_increment, - `customerid` int(11) unsigned NOT NULL default '0', - `path` varchar(255) NOT NULL default '', - `options_indexes` tinyint(1) NOT NULL default '0', - `error404path` varchar(255) NOT NULL default '', - `error403path` varchar(255) NOT NULL default '', - `error500path` varchar(255) NOT NULL default '', - PRIMARY KEY (`id`) -) TYPE=MyISAM ; - -# -# Dumping data for table `panel_htaccess` -# - - -# -------------------------------------------------------- - -# -# Table structure for table `panel_htpasswds` -# - -DROP TABLE IF EXISTS `panel_htpasswds`; -CREATE TABLE `panel_htpasswds` ( - `id` int(11) unsigned NOT NULL auto_increment, - `customerid` int(11) unsigned NOT NULL default '0', - `path` varchar(255) NOT NULL default '', - `username` varchar(255) NOT NULL default '', - `password` varchar(255) NOT NULL default '', - PRIMARY KEY (`id`), - KEY `customerid` (`customerid`) -) TYPE=MyISAM ; - -# -# Dumping data for table `panel_htpasswds` -# - - -# -------------------------------------------------------- - -# -# Table structure for table `panel_sessions` -# - -DROP TABLE IF EXISTS `panel_sessions`; -CREATE TABLE `panel_sessions` ( - `hash` varchar(32) NOT NULL default '', - `userid` int(11) unsigned NOT NULL default '0', - `ipaddress` varchar(16) NOT NULL default '', - `useragent` varchar(255) NOT NULL default '', - `lastactivity` int(11) unsigned NOT NULL default '0', - `language` varchar(64) NOT NULL default '', - `adminsession` tinyint(1) unsigned NOT NULL default '0', - PRIMARY KEY (`hash`), - KEY `userid` (`userid`) -) TYPE=HEAP; - -# -# Dumping data for table `panel_sessions` -# - - -# -------------------------------------------------------- - -# -# Table structure for table `panel_settings` -# - -DROP TABLE IF EXISTS `panel_settings`; -CREATE TABLE `panel_settings` ( - `settingid` int(11) unsigned NOT NULL auto_increment, - `settinggroup` varchar(255) NOT NULL default '', - `varname` varchar(255) NOT NULL default '', - `value` text NOT NULL, - PRIMARY KEY (`settingid`) -) TYPE=MyISAM ; - - -# -------------------------------------------------------- - -# -# Dumping data for table `panel_settings` -# - -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (1, 'session', 'sessiontimeout', '600'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (2, 'panel', 'adminmail', 'admin@SERVERNAME'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (3, 'panel', 'phpmyadmin_url', ''); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (5, 'customer', 'accountprefix', 'web'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (6, 'customer', 'ftpprefix', 'f'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (7, 'customer', 'mysqlprefix', 's'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (8, 'system', 'lastaccountnumber', '0'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (9, 'system', 'lastguid', '10000'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (10, 'system', 'documentroot_prefix', '/var/www/syscpwebs/'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (11, 'system', 'logfiles_directory', '/var/log/syscplogs/'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (12, 'system', 'ipaddress', 'SERVERIP'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (13, 'system', 'apacheconf_directory', '/etc/apache2/'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (14, 'system', 'apachereload_command', '/etc/init.d/apache2 reload'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (15, 'system', 'last_traffic_run', '000000'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (16, 'system', 'vmail_uid', '9997'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (17, 'system', 'vmail_gid', '9997'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (18, 'system', 'vmail_homedir', '/var/syscpvmail/'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (19, 'system', 'bindconf_directory', '/etc/bind/'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (20, 'system', 'bindreload_command', '/bin/true'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (21, 'system', 'binddefaultzone', 'default.zone'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '1.2.13'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (23, 'system', 'hostname', 'SERVERNAME'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (24, 'login', 'maxloginattempts', '3'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (25, 'login', 'deactivatetime', '900'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (26, 'panel', 'webmail_url', ''); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (27, 'panel', 'webftp_url', ''); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (28, 'panel', 'standardlanguage', 'English'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (29, 'system', 'mysql_access_host', 'MYSQL_ACCESS_HOST'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (30, 'panel', 'pathedit', 'Manual'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (31, 'system', 'apacheconf_filename', 'vhosts.d/99_syscp-vhosts.conf'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (32, 'system', 'lastcronrun', UNIX_TIMESTAMP()); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (33, 'panel', 'paging', '20'); - -# -------------------------------------------------------- - -# -# Table structure for table `panel_tasks` -# - -DROP TABLE IF EXISTS `panel_tasks`; -CREATE TABLE `panel_tasks` ( - `id` int(11) unsigned NOT NULL auto_increment, - `type` int(11) NOT NULL default '0', - `data` text NOT NULL, - PRIMARY KEY (`id`) -) TYPE=MyISAM ; - -# -# Dumping data for table `panel_tasks` -# - - -# -------------------------------------------------------- - -# -# Table structure for table `panel_templates` -# - -DROP TABLE IF EXISTS `panel_templates`; -CREATE TABLE `panel_templates` ( - `id` int(11) NOT NULL auto_increment, - `adminid` int(11) NOT NULL default '0', - `language` varchar(255) NOT NULL default '', - `templategroup` varchar(255) NOT NULL default '', - `varname` varchar(255) NOT NULL default '', - `value` longtext NOT NULL, - PRIMARY KEY (id), - KEY adminid (adminid) -) TYPE=MyISAM; - -# -# Dumping data for table `panel_templates` -# - - -# -------------------------------------------------------- - -# -# Table structure for table `panel_traffic` -# - -DROP TABLE IF EXISTS `panel_traffic`; -CREATE TABLE `panel_traffic` ( - `id` int(11) unsigned NOT NULL auto_increment, - `customerid` int(11) unsigned NOT NULL default '0', - `year` int(4) unsigned zerofill NOT NULL default '0000', - `month` int(2) unsigned zerofill NOT NULL default '00', - `day` int(2) unsigned zerofill NOT NULL default '00', - `http` bigint(30) unsigned NOT NULL default '0', - `ftp_up` bigint(30) unsigned NOT NULL default '0', - `ftp_down` bigint(30) unsigned NOT NULL default '0', - `mail` bigint(30) unsigned NOT NULL default '0', - PRIMARY KEY (`id`), - KEY `customerid` (`customerid`), - UNIQUE `date` (`customerid` , `year` , `month` , `day`) -) TYPE=MyISAM ; - -# -# Dumping data for table `panel_traffic` -# - - -# -------------------------------------------------------- - -# -# Table structure for table `panel_traffic_admins` -# - -DROP TABLE IF EXISTS `panel_traffic_admins`; -CREATE TABLE `panel_traffic_admins` ( - `id` int(11) unsigned NOT NULL auto_increment, - `adminid` int(11) unsigned NOT NULL default '0', - `year` int(4) unsigned zerofill NOT NULL default '0000', - `month` int(2) unsigned zerofill NOT NULL default '00', - `day` int(2) unsigned zerofill NOT NULL default '00', - `http` bigint(30) unsigned NOT NULL default '0', - `ftp_up` bigint(30) unsigned NOT NULL default '0', - `ftp_down` bigint(30) unsigned NOT NULL default '0', - `mail` bigint(30) unsigned NOT NULL default '0', - PRIMARY KEY (`id`), - KEY `adminid` (`adminid`), - UNIQUE `date` (`adminid` , `year` , `month` , `day`) -) TYPE=MyISAM ; - -# -# Dumping data for table `panel_traffic_admins` -# - - -# -------------------------------------------------------- - -# -# Table structure for table `panel_navigation` -# - -DROP TABLE IF EXISTS `panel_navigation`; -CREATE TABLE `panel_navigation` ( - `id` int(11) unsigned NOT NULL auto_increment, - `area` varchar(20) NOT NULL default '', - `parent_url` varchar(255) NOT NULL default '', - `lang` varchar(255) NOT NULL default '', - `url` varchar(255) NOT NULL default '', - `order` int(4) NOT NULL default '0', - `required_resources` varchar(255) NOT NULL default '', - `new_window` tinyint(1) unsigned NOT NULL default '0', - PRIMARY KEY (`id`) -) TYPE=MyISAM ; - -# -# Dumping data for table `panel_navigation` -# - -INSERT INTO `panel_navigation` VALUES (1, 'login', '', 'login;login', 'login.nourl', '10', '', 0); -INSERT INTO `panel_navigation` VALUES (2, 'login', 'login.nourl', 'login;login', 'index.php', '10', '', 0); -INSERT INTO `panel_navigation` VALUES (3, 'customer', '', 'menue;main;main', 'customer_index.php', '10', '', 0); -INSERT INTO `panel_navigation` VALUES (4, 'customer', 'customer_index.php', 'menue;main;changepassword', 'customer_index.php?page=change_password', '10', '', 0); -INSERT INTO `panel_navigation` VALUES (5, 'customer', 'customer_index.php', 'menue;main;changelanguage', 'customer_index.php?page=change_language', '20', '', 0); -INSERT INTO `panel_navigation` VALUES (6, 'customer', 'customer_index.php', 'login;logout', 'customer_index.php?action=logout', '30', '', 0); -INSERT INTO `panel_navigation` VALUES (7, 'customer', '', 'menue;email;email', 'customer_email.php', '20', '', 0); -INSERT INTO `panel_navigation` VALUES (8, 'customer', 'customer_email.php', 'menue;email;emails', 'customer_email.php?page=emails', '10', 'emails', 0); -INSERT INTO `panel_navigation` VALUES (9, 'customer', '', 'menue;mysql;mysql', 'customer_mysql.php', '30', '', 0); -INSERT INTO `panel_navigation` VALUES (10, 'customer', 'customer_mysql.php', 'menue;mysql;databases', 'customer_mysql.php?page=mysqls', '10', 'mysqls', 0); -INSERT INTO `panel_navigation` VALUES (11, 'customer', '', 'menue;domains;domains', 'customer_domains.php', '40', '', 0); -INSERT INTO `panel_navigation` VALUES (12, 'customer', 'customer_domains.php', 'menue;domains;settings', 'customer_domains.php?page=domains', '10', '', 0); -INSERT INTO `panel_navigation` VALUES (13, 'customer', '', 'menue;ftp;ftp', 'customer_ftp.php', '50', '', 0); -INSERT INTO `panel_navigation` VALUES (14, 'customer', 'customer_ftp.php', 'menue;ftp;accounts', 'customer_ftp.php?page=accounts', '10', '', 0); -INSERT INTO `panel_navigation` VALUES (15, 'customer', '', 'menue;extras;extras', 'customer_extras.php', '60', '', 0); -INSERT INTO `panel_navigation` VALUES (16, 'customer', 'customer_extras.php', 'menue;extras;directoryprotection', 'customer_extras.php?page=htpasswds', '10', '', 0); -INSERT INTO `panel_navigation` VALUES (17, 'customer', 'customer_extras.php', 'menue;extras;pathoptions', 'customer_extras.php?page=htaccess', '20', '', 0); -INSERT INTO `panel_navigation` VALUES (18, 'admin', '', 'admin;overview', 'admin_index.php', '10', '', 0); -INSERT INTO `panel_navigation` VALUES (19, 'admin', 'admin_index.php', 'menue;main;changepassword', 'admin_index.php?page=change_password', '10', '', 0); -INSERT INTO `panel_navigation` VALUES (20, 'admin', 'admin_index.php', 'menue;main;changelanguage', 'admin_index.php?page=change_language', '20', '', 0); -INSERT INTO `panel_navigation` VALUES (21, 'admin', 'admin_index.php', 'login;logout', 'admin_index.php?action=logout', '30', '', 0); -INSERT INTO `panel_navigation` VALUES (22, 'admin', '', 'admin;resources', 'admin_resources.nourl', '20', 'customers', 0); -INSERT INTO `panel_navigation` VALUES (23, 'admin', 'admin_resources.nourl', 'admin;customers', 'admin_customers.php?page=customers', '10', 'customers', 0); -INSERT INTO `panel_navigation` VALUES (24, 'admin', 'admin_resources.nourl', 'admin;domains', 'admin_domains.php?page=domains', '20', 'domains', 0); -INSERT INTO `panel_navigation` VALUES (25, 'admin', 'admin_resources.nourl', 'admin;admins', 'admin_admins.php?page=admins', '30', 'change_serversettings', 0); -INSERT INTO `panel_navigation` VALUES (26, 'admin', '', 'admin;server', 'admin_server.nourl', '30', 'change_serversettings', 0); -INSERT INTO `panel_navigation` VALUES (27, 'admin', 'admin_server.nourl', 'admin;configfiles;serverconfiguration', 'admin_configfiles.php?page=configfiles', '10', 'change_serversettings', 0); -INSERT INTO `panel_navigation` VALUES (28, 'admin', 'admin_server.nourl', 'admin;serversettings', 'admin_settings.php?page=settings', '20', 'change_serversettings', 0); -INSERT INTO `panel_navigation` VALUES (29, 'admin', '', 'admin;templates;templates', 'admin_templates.nourl', '40', '', 0); -INSERT INTO `panel_navigation` VALUES (30, 'admin', 'admin_templates.nourl', 'admin;templates;email', 'admin_templates.php?page=email', '10', '', 0); -INSERT INTO `panel_navigation` VALUES (31, 'admin', 'admin_server.nourl', 'admin;rebuildconf', 'admin_settings.php?page=rebuildconfigs', '30', 'change_serversettings', 0); -INSERT INTO `panel_navigation` VALUES (32, 'admin', 'admin_server.nourl', 'admin;ipsandports;ipsandports', 'admin_ipsandports.php?page=ipsandports', '40', 'change_serversettings', 0); - - -# -------------------------------------------------------- - -# -# Table structure for table `panel_languages` -# - -DROP TABLE IF EXISTS `panel_languages`; -CREATE TABLE `panel_languages` ( - `id` int(11) unsigned NOT NULL auto_increment, - `language` varchar(30) NOT NULL default '', - `file` varchar(255) NOT NULL default '', - PRIMARY KEY (`id`) -) TYPE=MyISAM ; - -# -# Dumping data for table `panel_languages` -# - -INSERT INTO `panel_languages` VALUES (1, 'Deutsch', 'lng/german.lng.php'); -INSERT INTO `panel_languages` VALUES (2, 'English', 'lng/english.lng.php'); -INSERT INTO `panel_languages` VALUES (3, 'Français', 'lng/french.lng.php'); -INSERT INTO `panel_languages` VALUES (4, 'Chinese', 'lng/zh-cn.lng.php'); -INSERT INTO `panel_languages` VALUES (5, 'Catalan', 'lng/catalan.lng.php'); -INSERT INTO `panel_languages` VALUES (6, 'Español', 'lng/spanish.lng.php'); -INSERT INTO `panel_languages` VALUES (7, 'Português', 'lng/portugues.lng.php'); -INSERT INTO `panel_languages` VALUES (8, 'Italiano', 'lng/italian.lng.php'); - - -# -------------------------------------------------------- - -# -# Table structure for table `panel_cronscript` -# - -DROP TABLE IF EXISTS `panel_cronscript`; -CREATE TABLE `panel_cronscript` ( - `id` int(11) unsigned NOT NULL auto_increment, - `file` varchar(255) NOT NULL default '', - PRIMARY KEY (`id`) -) TYPE=MyISAM ; - -# -# Dumping data for table `panel_cronscript` -# - -INSERT INTO `panel_cronscript` (`id`, `file`) VALUES (1, 'cron_traffic.php'); -INSERT INTO `panel_cronscript` (`id`, `file`) VALUES (2, 'cron_tasks.php'); - - -# -# Add the main IP/Port combo -# - -INSERT INTO `panel_ipsandports` (`ip`, `port`, `default`) VALUES ('SERVERIP', '80', '1'); - -# -# Add the main admin user -# - -INSERT INTO `panel_admins` (`loginname`, `password`, `name`, `email`, `customers`, `customers_used`, `customers_see_all`, `domains`, `domains_used`, `domains_see_all`, `change_serversettings`, `diskspace`, `diskspace_used`, `mysqls`, `mysqls_used`, `emails`, `emails_used`, `email_accounts`, `email_accounts_used`, `email_forwarders`, `email_forwarders_used`, `ftps`, `ftps_used`, `subdomains`, `subdomains_used`, `traffic`, `traffic_used`, `deactivated`) VALUES ('ADMIN_USERNAME', MD5('ADMIN_PASSWORD'), 'Siteadmin', 'admin@SERVERNAME', -1, 0, 1, -1, 0, 1, 1, -1024, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1048576, 0, 0); diff --git a/syscp/patches/syscp-sqlfile/syscp-1.2.13-mysqlftpimp-db.sql b/syscp/patches/syscp-sqlfile/syscp-1.2.13-mysqlftpimp-db.sql deleted file mode 100644 index 3f29dea..0000000 --- a/syscp/patches/syscp-sqlfile/syscp-1.2.13-mysqlftpimp-db.sql +++ /dev/null @@ -1,15 +0,0 @@ -USE `MYSQL_DATABASE_NAME` ; - -ALTER TABLE `panel_databases` ADD `databaseuser` VARCHAR( 255 ) NOT NULL AFTER `customerid` ; - -DROP TABLE IF EXISTS `panel_databases_users` ; -CREATE TABLE `panel_databases_users` ( -`id` INT( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT, -`customerid` INT( 11 ) NOT NULL DEFAULT '0', -`databaseuser` VARCHAR( 255 ) NOT NULL, -PRIMARY KEY (`id`), -KEY `customerid` (`customerid`) -) TYPE = MYISAM ; - -ALTER TABLE `panel_customers` ADD `mysqls_used_users` INT( 15 ) NOT NULL DEFAULT '0' AFTER `mysqls_used` ; -ALTER TABLE `panel_customers` ADD `mysql_lastusernumber` INT( 11 ) NOT NULL DEFAULT '0' AFTER `mysql_lastaccountnumber` ; diff --git a/syscp/patches/syscp-sqlfile/syscp-1.2.13-sqlfile-r3.tar.bz2 b/syscp/patches/syscp-sqlfile/syscp-1.2.13-sqlfile-r3.tar.bz2 Binary files differdeleted file mode 100644 index 98fce46..0000000 --- a/syscp/patches/syscp-sqlfile/syscp-1.2.13-sqlfile-r3.tar.bz2 +++ /dev/null diff --git a/syscp/patches/syscp-sqlfile/syscp-1.2.13-suphp-db.sql b/syscp/patches/syscp-sqlfile/syscp-1.2.13-suphp-db.sql deleted file mode 100644 index f351acd..0000000 --- a/syscp/patches/syscp-sqlfile/syscp-1.2.13-suphp-db.sql +++ /dev/null @@ -1,3 +0,0 @@ -USE `MYSQL_DATABASE_NAME` ; - -ALTER TABLE `panel_htaccess` ADD `options_phpversionselect` TINYINT( 1 ) NOT NULL DEFAULT '4' AFTER `options_execcgi` ; |
