Scanned repo and converted dos formatted files to unix

nveid

2011-08-27 8896abb18415d5d856c45546f9ea460f5759e1b5

Scanned repo and converted dos formatted files to unix

 install/uninstall-fedora.php

@@ -70,4 +70,4 @@

echo "Finished.\n";

?>
?>

 install/uninstall.php

@@ -70,4 +70,4 @@

echo "Finished.\n";

?>
?>

 install/update.php

@@ -1,387 +1,387 @@
<?php



/*

Copyright (c) 2007-2010, Till Brehm, projektfarm Gmbh

All rights reserved.



Redistribution and use in source and binary forms, with or without modification,

are permitted provided that the following conditions are met:



    * Redistributions of source code must retain the above copyright notice,

      this list of conditions and the following disclaimer.

    * Redistributions in binary form must reproduce the above copyright notice,

      this list of conditions and the following disclaimer in the documentation

      and/or other materials provided with the distribution.

    * Neither the name of ISPConfig nor the names of its contributors

      may be used to endorse or promote products derived from this software without

      specific prior written permission.



THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND

ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.

IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,

INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,

BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY

OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,

EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

*/



/*

    ISPConfig 3 updater.

*/



error_reporting(E_ALL|E_STRICT);



//** The banner on the command line

echo "\n\n".str_repeat('-',80)."\n";

echo " _____ ___________   _____              __ _         ____

|_   _/  ___| ___ \ /  __ \            / _(_)       /__  \

  | | \ `--.| |_/ / | /  \/ ___  _ __ | |_ _  __ _    _/ /

  | |  `--. \  __/  | |    / _ \| '_ \|  _| |/ _` |  |_ |

 _| |_/\__/ / |     | \__/\ (_) | | | | | | | (_| | ___\ \

 \___/\____/\_|      \____/\___/|_| |_|_| |_|\__, | \____/

                                              __/ |

                                             |___/ ";

echo "\n".str_repeat('-',80)."\n";

echo "\n\n>> Update  \n\n";



//** Include the library with the basic installer functions

require_once('lib/install.lib.php');



//** Include the library with the basic updater functions

require_once('lib/update.lib.php');



//** Include the base class of the installer class

require_once('lib/installer_base.lib.php');



//** Ensure that current working directory is install directory

$cur_dir = getcwd();

if(realpath(dirname(__FILE__)) != $cur_dir) die("Please run installation/update from _inside_ the install directory!\n");



//** Install logfile

define('ISPC_LOG_FILE', '/var/log/ispconfig_install.log');

define('ISPC_INSTALL_ROOT', realpath(dirname(__FILE__).'/../'));



//** Check for ISPConfig 2.x versions

if(is_dir('/root/ispconfig') || is_dir('/home/admispconfig')) {

    die('This software cannot be installed on a server wich runs ISPConfig 2.x.');

}



//** Get distribution identifier

$dist = get_distname();



include_once("/usr/local/ispconfig/server/lib/config.inc.php");

$conf_old = $conf;

unset($conf);



if($dist['id'] == '') die('Linux distribution or version not recognized.');



//** Include the distribution-specific installer class library and configuration

if(is_file('dist/lib/'.$dist['baseid'].'.lib.php')) include_once('dist/lib/'.$dist['baseid'].'.lib.php');

include_once('dist/lib/'.$dist['id'].'.lib.php');

include_once('dist/conf/'.$dist['id'].'.conf.php');



//** Get hostname

exec('hostname -f', $tmp_out);

$conf['hostname'] = $tmp_out[0];

unset($tmp_out);



//** Set the mysql login information

$conf["mysql"]["host"] = $conf_old["db_host"];

$conf["mysql"]["database"] = $conf_old["db_database"];

$conf['mysql']['charset'] = 'utf8';

$conf["mysql"]["ispconfig_user"] = $conf_old["db_user"];

$conf["mysql"]["ispconfig_password"] = $conf_old["db_password"];

$conf['language'] = $conf_old['language'];

if($conf['language'] == '{language}') $conf['language'] = 'en';



if(isset($conf_old["dbmaster_host"])) $conf["mysql"]["master_host"] = $conf_old["dbmaster_host"];

if(isset($conf_old["dbmaster_database"])) $conf["mysql"]["master_database"] = $conf_old["dbmaster_database"];

if(isset($conf_old["dbmaster_user"])) $conf["mysql"]["master_ispconfig_user"] = $conf_old["dbmaster_user"];

if(isset($conf_old["dbmaster_password"])) $conf["mysql"]["master_ispconfig_password"] = $conf_old["dbmaster_password"];



//* Check if this is a master / slave setup

if($conf["mysql"]["master_host"] != '' && $conf["mysql"]["host"] != $conf["mysql"]["master_host"]) {

    $conf['mysql']['master_slave_setup'] = 'y';

}



// Resolve the IP address of the mysql hostname.

if(!$conf['mysql']['ip'] = gethostbyname($conf['mysql']['host'])) die('Unable to resolve hostname'.$conf['mysql']['host']);



$conf['server_id'] = intval($conf_old["server_id"]);

$conf['ispconfig_log_priority'] = $conf_old["log_priority"];



$inst = new installer();

$inst->is_update = true;



//** Detect the installed applications

$inst->find_installed_apps();



echo "This application will update ISPConfig 3 on your server.\n";



//** Initialize the MySQL server connection

include_once('lib/mysql.lib.php');



//** Database update is a bit brute force and should be rebuild later ;)



/*

 * Try to read the DB-admin settings

 */

$clientdb_host            = '';

$clientdb_user            = '';

$clientdb_password        = '';

include_once("/usr/local/ispconfig/server/lib/mysql_clientdb.conf");

$conf["mysql"]["admin_user"] = $clientdb_user;

$conf["mysql"]["admin_password"] = $clientdb_password;

$clientdb_host            = '';

$clientdb_user            = '';

$clientdb_password        = '';



//** Ask user for mysql admin_password if empty

if( empty($conf["mysql"]["admin_password"]) ) {



    $conf["mysql"]["admin_password"] = $inst->free_query('MySQL root password', $conf['mysql']['admin_password']);

}



/*

 *  Prepare the dump of the database 
 */

prepareDBDump();



//* initialize the database

$inst->db = new db();



//* initialize the master DB, if we have a multiserver setup

if($conf['mysql']['master_slave_setup'] == 'y') {

        //** Get MySQL root credentials

        $finished = false;

        do {

            $tmp_mysql_server_host = $inst->free_query('MySQL master server hostname', $conf['mysql']['master_host']);

            $tmp_mysql_server_admin_user = $inst->free_query('MySQL master server root username', $conf['mysql']['master_admin_user']);

            $tmp_mysql_server_admin_password = $inst->free_query('MySQL master server root password', $conf['mysql']['master_admin_password']);

            $tmp_mysql_server_database = $inst->free_query('MySQL master server database name', $conf['mysql']['master_database']);

	
            //* Initialize the MySQL server connection

            if(@mysql_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) {

                $conf['mysql']['master_host'] = $tmp_mysql_server_host;

                $conf['mysql']['master_admin_user'] = $tmp_mysql_server_admin_user;

                $conf['mysql']['master_admin_password'] = $tmp_mysql_server_admin_password;

                $conf['mysql']['master_database'] = $tmp_mysql_server_database;

                $finished = true;

            } else {

                swriteln($inst->lng('Unable to connect to mysql server').' '.mysql_error());

            }

        } while ($finished == false);

        unset($finished);

		
        // initialize the connection to the master database

        $inst->dbmaster = new db();

        if($inst->dbmaster->linkId) $inst->dbmaster->closeConn();

        $inst->dbmaster->dbHost = $conf['mysql']["master_host"];

        $inst->dbmaster->dbName = $conf['mysql']["master_database"];

        $inst->dbmaster->dbUser = $conf['mysql']["master_admin_user"];

        $inst->dbmaster->dbPass = $conf['mysql']["master_admin_password"];

} else {

    $inst->dbmaster = $inst->db;

}



/*

 *  Check all tables

*/

checkDbHealth();



/*

 *  dump the new Database and reconfigure the server.ini

 */

updateDbAndIni();



/*

 * Reconfigure the permisson if needed

 * (if this is done at client side, only this client is updated.

 * If this is done at server side, all clients are updated.

 */

//if($conf_old['dbmaster_user'] != '' or $conf_old['dbmaster_host'] != '') {

    //** Update master database rights

    $reconfigure_master_database_rights_answer = $inst->simple_query('Reconfigure Permissions in master database?', array('yes','no'),'no');



    if($reconfigure_master_database_rights_answer == 'yes') {

        $inst->grant_master_database_rights();

    }

//}



//** Shall the services be reconfigured during update

$reconfigure_services_answer = $inst->simple_query('Reconfigure Services?', array('yes','no'),'yes');



if($reconfigure_services_answer == 'yes') {

	
    if($conf['services']['mail']) {

        //** Configure postfix

        swriteln('Configuring Postfix');

        $inst->configure_postfix('dont-create-certs');

		
        //** Configure mailman

        swriteln('Configuring Mailman');

        $inst->configure_mailman('update');

	
        //* Configure Jailkit

        swriteln('Configuring Jailkit');

        $inst->configure_jailkit();



        if($conf['dovecot']['installed'] == true) {

            //* Configure dovecot

            swriteln('Configuring Dovecot');

            $inst->configure_dovecot();

        } else {

            //** Configure saslauthd

            swriteln('Configuring SASL');

            $inst->configure_saslauthd();

	
            //** Configure PAM

            swriteln('Configuring PAM');

            $inst->configure_pam();

		
            //* Configure courier

            swriteln('Configuring Courier');

            $inst->configure_courier();

        }



        //** Configure Spamasassin

        swriteln('Configuring Spamassassin');

        $inst->configure_spamassassin();



        //** Configure Amavis

        swriteln('Configuring Amavisd');

        $inst->configure_amavis();



        //** Configure Getmail

        swriteln('Configuring Getmail');

        $inst->configure_getmail();

    }

	
    if($conf['services']['web'] && $conf['pureftpd']['installed'] == true) {

        //** Configure Pureftpd

        swriteln('Configuring Pureftpd');

        $inst->configure_pureftpd();

    }

	
    if($conf['services']['dns']) {

        //* Configure DNS

        if($conf['powerdns']['installed'] == true) {

            swriteln('Configuring PowerDNS');

            $inst->configure_powerdns();

        } elseif($conf['bind']['installed'] == true) {

            swriteln('Configuring BIND');

            $inst->configure_bind();

        } else {

            swriteln('Configuring MyDNS');

            $inst->configure_mydns();

        }

    }

	
    if($conf['services']['web']) {

        //** Configure Apache

        swriteln('Configuring Apache');

        $inst->configure_apache();

        
        //** Configure vlogger

        swriteln('Configuring vlogger');

        $inst->configure_vlogger();

		
        //** Configure apps vhost

        swriteln('Configuring Apps vhost');

        $inst->configure_apps_vhost();

    }





    //* Configure DBServer

    swriteln('Configuring Database');

    $inst->configure_dbserver();



	
    if($conf['services']['firewall']) {

        if($conf['bastille']['installed'] == true) {

            //* Configure Bastille Firewall

            swriteln('Configuring Bastille Firewall');

            $inst->configure_firewall();

        } elseif($conf['ufw']['installed'] == true) {

            //* Configure Ubuntu Firewall

            swriteln('Configuring Ubuntu Firewall');

            $inst->configure_ufw_firewall();

        }

    }

	
    if($conf['squid']['installed'] == true) {

        swriteln('Configuring Squid');

        $inst->configure_squid();

    } else if($conf['nginx']['installed'] == true) {

        swriteln('Configuring Nginx');

        $inst->configure_nginx();

    }

}



//** Configure ISPConfig

swriteln('Updating ISPConfig');





if ($conf['services']['web'] && $inst->ispconfig_interface_installed) {

    //** Customise the port ISPConfig runs on

    $ispconfig_port_number = get_ispconfig_port_number();

    $conf['apache']['vhost_port'] = $inst->free_query('ISPConfig Port', $ispconfig_port_number);

	
    // $ispconfig_ssl_default = (is_ispconfig_ssl_enabled() == true)?'y':'n';

    if(strtolower($inst->simple_query('Create new ISPConfig SSL certificate',array('yes','no'),'no')) == 'yes') {

        $inst->make_ispconfig_ssl_cert();

    }

}



$inst->install_ispconfig();



//** Configure Crontab

$update_crontab_answer = $inst->simple_query('Reconfigure Crontab?', array('yes','no'),'yes');

if($update_crontab_answer == 'yes') {

    swriteln('Updating Crontab');

    $inst->install_crontab();

}



//** Restart services:

if($reconfigure_services_answer == 'yes') {

    swriteln('Restarting services ...');

    if($conf['mysql']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mysql']['init_script']))                    system($conf['init_scripts'].'/'.$conf['mysql']['init_script'].' restart');

    if($conf['services']['mail']) {

        if($conf['postfix']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['postfix']['init_script']))                system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');

        if($conf['saslauthd']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['saslauthd']['init_script']))            system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');

        if($conf['amavis']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['amavis']['init_script']))                    system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');

        if($conf['clamav']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['clamav']['init_script']))                    system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');

        if($conf['courier']['courier-authdaemon'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');

        if($conf['courier']['courier-imap'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-imap']))             system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');

        if($conf['courier']['courier-imap-ssl'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl']))     system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');

        if($conf['courier']['courier-pop'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop']))                 system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');

        if($conf['courier']['courier-pop-ssl'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl']))         system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');

        if($conf['dovecot']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['dovecot']['init_script']))         system($conf['init_scripts'].'/'.$conf['dovecot']['init_script'].' restart');

        if($conf['mailman']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mailman']['init_script']))         system($conf['init_scripts'].'/'.$conf['mailman']['init_script'].' restart');

    }

    if($conf['services']['web']) {

        if($conf['apache']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['apache']['init_script']))                 system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');

        if($conf['pureftpd']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['pureftpd']['init_script']))                system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');

    }

    if($conf['services']['dns']) {

        if($conf['mydns']['installed'] == true && $conf['mydns']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mydns']['init_script']))                    system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');

        if($conf['powerdns']['installed'] == true && $conf['powerdns']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['powerdns']['init_script']))                    system($conf['init_scripts'].'/'.$conf['powerdns']['init_script'].' restart &> /dev/null');

        if($conf['bind']['installed'] == true && $conf['bind']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['bind']['init_script']))                    system($conf['init_scripts'].'/'.$conf['bind']['init_script'].' restart &> /dev/null');

    }

	
    if($conf['services']['proxy']) {

        if($conf['squid']['installed'] == true && $conf['squid']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['squid']['init_script']))                    system($conf['init_scripts'].'/'.$conf['squid']['init_script'].' restart &> /dev/null');

        if($conf['nginx']['installed'] == true && $conf['nginx']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['nginx']['init_script']))                    system($conf['init_scripts'].'/'.$conf['nginx']['init_script'].' restart &> /dev/null');

    }

	
    if($conf['services']['firewall']) {

        if($conf['ufw']['installed'] == true && $conf['ufw']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['ufw']['init_script']))                    system($conf['init_scripts'].'/'.$conf['ufw']['init_script'].' restart &> /dev/null');

    }

}



echo "Update finished.\n";



?>
<?php

/*
Copyright (c) 2007-2010, Till Brehm, projektfarm Gmbh
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:

    * Redistributions of source code must retain the above copyright notice,
      this list of conditions and the following disclaimer.
    * Redistributions in binary form must reproduce the above copyright notice,
      this list of conditions and the following disclaimer in the documentation
      and/or other materials provided with the distribution.
    * Neither the name of ISPConfig nor the names of its contributors
      may be used to endorse or promote products derived from this software without
      specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

/*
    ISPConfig 3 updater.
*/

error_reporting(E_ALL|E_STRICT);

//** The banner on the command line
echo "\n\n".str_repeat('-',80)."\n";
echo " _____ ___________   _____              __ _         ____
|_   _/  ___| ___ \ /  __ \            / _(_)       /__  \
  | | \ `--.| |_/ / | /  \/ ___  _ __ | |_ _  __ _    _/ /
  | |  `--. \  __/  | |    / _ \| '_ \|  _| |/ _` |  |_ |
 _| |_/\__/ / |     | \__/\ (_) | | | | | | | (_| | ___\ \
 \___/\____/\_|      \____/\___/|_| |_|_| |_|\__, | \____/
                                              __/ |
                                             |___/ ";
echo "\n".str_repeat('-',80)."\n";
echo "\n\n>> Update  \n\n";

//** Include the library with the basic installer functions
require_once('lib/install.lib.php');

//** Include the library with the basic updater functions
require_once('lib/update.lib.php');

//** Include the base class of the installer class
require_once('lib/installer_base.lib.php');

//** Ensure that current working directory is install directory
$cur_dir = getcwd();
if(realpath(dirname(__FILE__)) != $cur_dir) die("Please run installation/update from _inside_ the install directory!\n");

//** Install logfile
define('ISPC_LOG_FILE', '/var/log/ispconfig_install.log');
define('ISPC_INSTALL_ROOT', realpath(dirname(__FILE__).'/../'));

//** Check for ISPConfig 2.x versions
if(is_dir('/root/ispconfig') || is_dir('/home/admispconfig')) {
    die('This software cannot be installed on a server wich runs ISPConfig 2.x.');
}

//** Get distribution identifier
$dist = get_distname();

include_once("/usr/local/ispconfig/server/lib/config.inc.php");
$conf_old = $conf;
unset($conf);

if($dist['id'] == '') die('Linux distribution or version not recognized.');

//** Include the distribution-specific installer class library and configuration
if(is_file('dist/lib/'.$dist['baseid'].'.lib.php')) include_once('dist/lib/'.$dist['baseid'].'.lib.php');
include_once('dist/lib/'.$dist['id'].'.lib.php');
include_once('dist/conf/'.$dist['id'].'.conf.php');

//** Get hostname
exec('hostname -f', $tmp_out);
$conf['hostname'] = $tmp_out[0];
unset($tmp_out);

//** Set the mysql login information
$conf["mysql"]["host"] = $conf_old["db_host"];
$conf["mysql"]["database"] = $conf_old["db_database"];
$conf['mysql']['charset'] = 'utf8';
$conf["mysql"]["ispconfig_user"] = $conf_old["db_user"];
$conf["mysql"]["ispconfig_password"] = $conf_old["db_password"];
$conf['language'] = $conf_old['language'];
if($conf['language'] == '{language}') $conf['language'] = 'en';

if(isset($conf_old["dbmaster_host"])) $conf["mysql"]["master_host"] = $conf_old["dbmaster_host"];
if(isset($conf_old["dbmaster_database"])) $conf["mysql"]["master_database"] = $conf_old["dbmaster_database"];
if(isset($conf_old["dbmaster_user"])) $conf["mysql"]["master_ispconfig_user"] = $conf_old["dbmaster_user"];
if(isset($conf_old["dbmaster_password"])) $conf["mysql"]["master_ispconfig_password"] = $conf_old["dbmaster_password"];

//* Check if this is a master / slave setup
if($conf["mysql"]["master_host"] != '' && $conf["mysql"]["host"] != $conf["mysql"]["master_host"]) {
    $conf['mysql']['master_slave_setup'] = 'y';
}

// Resolve the IP address of the mysql hostname.
if(!$conf['mysql']['ip'] = gethostbyname($conf['mysql']['host'])) die('Unable to resolve hostname'.$conf['mysql']['host']);

$conf['server_id'] = intval($conf_old["server_id"]);
$conf['ispconfig_log_priority'] = $conf_old["log_priority"];

$inst = new installer();
$inst->is_update = true;

//** Detect the installed applications
$inst->find_installed_apps();

echo "This application will update ISPConfig 3 on your server.\n";

//** Initialize the MySQL server connection
include_once('lib/mysql.lib.php');

//** Database update is a bit brute force and should be rebuild later ;)

/*
 * Try to read the DB-admin settings
 */
$clientdb_host            = '';
$clientdb_user            = '';
$clientdb_password        = '';
include_once("/usr/local/ispconfig/server/lib/mysql_clientdb.conf");
$conf["mysql"]["admin_user"] = $clientdb_user;
$conf["mysql"]["admin_password"] = $clientdb_password;
$clientdb_host            = '';
$clientdb_user            = '';
$clientdb_password        = '';

//** Ask user for mysql admin_password if empty
if( empty($conf["mysql"]["admin_password"]) ) {

    $conf["mysql"]["admin_password"] = $inst->free_query('MySQL root password', $conf['mysql']['admin_password']);
}

/*
 *  Prepare the dump of the database 
 */
prepareDBDump();

//* initialize the database
$inst->db = new db();

//* initialize the master DB, if we have a multiserver setup
if($conf['mysql']['master_slave_setup'] == 'y') {
        //** Get MySQL root credentials
        $finished = false;
        do {
            $tmp_mysql_server_host = $inst->free_query('MySQL master server hostname', $conf['mysql']['master_host']);
            $tmp_mysql_server_admin_user = $inst->free_query('MySQL master server root username', $conf['mysql']['master_admin_user']);
            $tmp_mysql_server_admin_password = $inst->free_query('MySQL master server root password', $conf['mysql']['master_admin_password']);
            $tmp_mysql_server_database = $inst->free_query('MySQL master server database name', $conf['mysql']['master_database']);
	
            //* Initialize the MySQL server connection
            if(@mysql_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) {
                $conf['mysql']['master_host'] = $tmp_mysql_server_host;
                $conf['mysql']['master_admin_user'] = $tmp_mysql_server_admin_user;
                $conf['mysql']['master_admin_password'] = $tmp_mysql_server_admin_password;
                $conf['mysql']['master_database'] = $tmp_mysql_server_database;
                $finished = true;
            } else {
                swriteln($inst->lng('Unable to connect to mysql server').' '.mysql_error());
            }
        } while ($finished == false);
        unset($finished);
		
        // initialize the connection to the master database
        $inst->dbmaster = new db();
        if($inst->dbmaster->linkId) $inst->dbmaster->closeConn();
        $inst->dbmaster->dbHost = $conf['mysql']["master_host"];
        $inst->dbmaster->dbName = $conf['mysql']["master_database"];
        $inst->dbmaster->dbUser = $conf['mysql']["master_admin_user"];
        $inst->dbmaster->dbPass = $conf['mysql']["master_admin_password"];
} else {
    $inst->dbmaster = $inst->db;
}

/*
 *  Check all tables
*/
checkDbHealth();

/*
 *  dump the new Database and reconfigure the server.ini
 */
updateDbAndIni();

/*
 * Reconfigure the permisson if needed
 * (if this is done at client side, only this client is updated.
 * If this is done at server side, all clients are updated.
 */
//if($conf_old['dbmaster_user'] != '' or $conf_old['dbmaster_host'] != '') {
    //** Update master database rights
    $reconfigure_master_database_rights_answer = $inst->simple_query('Reconfigure Permissions in master database?', array('yes','no'),'no');

    if($reconfigure_master_database_rights_answer == 'yes') {
        $inst->grant_master_database_rights();
    }
//}

//** Shall the services be reconfigured during update
$reconfigure_services_answer = $inst->simple_query('Reconfigure Services?', array('yes','no'),'yes');

if($reconfigure_services_answer == 'yes') {
	
    if($conf['services']['mail']) {
        //** Configure postfix
        swriteln('Configuring Postfix');
        $inst->configure_postfix('dont-create-certs');
		
        //** Configure mailman
        swriteln('Configuring Mailman');
        $inst->configure_mailman('update');
	
        //* Configure Jailkit
        swriteln('Configuring Jailkit');
        $inst->configure_jailkit();

        if($conf['dovecot']['installed'] == true) {
            //* Configure dovecot
            swriteln('Configuring Dovecot');
            $inst->configure_dovecot();
        } else {
            //** Configure saslauthd
            swriteln('Configuring SASL');
            $inst->configure_saslauthd();
	
            //** Configure PAM
            swriteln('Configuring PAM');
            $inst->configure_pam();
		
            //* Configure courier
            swriteln('Configuring Courier');
            $inst->configure_courier();
        }

        //** Configure Spamasassin
        swriteln('Configuring Spamassassin');
        $inst->configure_spamassassin();

        //** Configure Amavis
        swriteln('Configuring Amavisd');
        $inst->configure_amavis();

        //** Configure Getmail
        swriteln('Configuring Getmail');
        $inst->configure_getmail();
    }
	
    if($conf['services']['web'] && $conf['pureftpd']['installed'] == true) {
        //** Configure Pureftpd
        swriteln('Configuring Pureftpd');
        $inst->configure_pureftpd();
    }
	
    if($conf['services']['dns']) {
        //* Configure DNS
        if($conf['powerdns']['installed'] == true) {
            swriteln('Configuring PowerDNS');
            $inst->configure_powerdns();
        } elseif($conf['bind']['installed'] == true) {
            swriteln('Configuring BIND');
            $inst->configure_bind();
        } else {
            swriteln('Configuring MyDNS');
            $inst->configure_mydns();
        }
    }
	
    if($conf['services']['web']) {
        //** Configure Apache
        swriteln('Configuring Apache');
        $inst->configure_apache();
        
        //** Configure vlogger
        swriteln('Configuring vlogger');
        $inst->configure_vlogger();
		
        //** Configure apps vhost
        swriteln('Configuring Apps vhost');
        $inst->configure_apps_vhost();
    }


    //* Configure DBServer
    swriteln('Configuring Database');
    $inst->configure_dbserver();

	
    if($conf['services']['firewall']) {
        if($conf['bastille']['installed'] == true) {
            //* Configure Bastille Firewall
            swriteln('Configuring Bastille Firewall');
            $inst->configure_firewall();
        } elseif($conf['ufw']['installed'] == true) {
            //* Configure Ubuntu Firewall
            swriteln('Configuring Ubuntu Firewall');
            $inst->configure_ufw_firewall();
        }
    }
	
    if($conf['squid']['installed'] == true) {
        swriteln('Configuring Squid');
        $inst->configure_squid();
    } else if($conf['nginx']['installed'] == true) {
        swriteln('Configuring Nginx');
        $inst->configure_nginx();
    }
}

//** Configure ISPConfig
swriteln('Updating ISPConfig');


if ($conf['services']['web'] && $inst->ispconfig_interface_installed) {
    //** Customise the port ISPConfig runs on
    $ispconfig_port_number = get_ispconfig_port_number();
    $conf['apache']['vhost_port'] = $inst->free_query('ISPConfig Port', $ispconfig_port_number);
	
    // $ispconfig_ssl_default = (is_ispconfig_ssl_enabled() == true)?'y':'n';
    if(strtolower($inst->simple_query('Create new ISPConfig SSL certificate',array('yes','no'),'no')) == 'yes') {
        $inst->make_ispconfig_ssl_cert();
    }
}

$inst->install_ispconfig();

//** Configure Crontab
$update_crontab_answer = $inst->simple_query('Reconfigure Crontab?', array('yes','no'),'yes');
if($update_crontab_answer == 'yes') {
    swriteln('Updating Crontab');
    $inst->install_crontab();
}

//** Restart services:
if($reconfigure_services_answer == 'yes') {
    swriteln('Restarting services ...');
    if($conf['mysql']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mysql']['init_script']))                    system($conf['init_scripts'].'/'.$conf['mysql']['init_script'].' restart');
    if($conf['services']['mail']) {
        if($conf['postfix']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['postfix']['init_script']))                system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
        if($conf['saslauthd']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['saslauthd']['init_script']))            system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
        if($conf['amavis']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['amavis']['init_script']))                    system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');
        if($conf['clamav']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['clamav']['init_script']))                    system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');
        if($conf['courier']['courier-authdaemon'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');
        if($conf['courier']['courier-imap'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-imap']))             system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');
        if($conf['courier']['courier-imap-ssl'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl']))     system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
        if($conf['courier']['courier-pop'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop']))                 system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
        if($conf['courier']['courier-pop-ssl'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl']))         system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
        if($conf['dovecot']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['dovecot']['init_script']))         system($conf['init_scripts'].'/'.$conf['dovecot']['init_script'].' restart');
        if($conf['mailman']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mailman']['init_script']))         system($conf['init_scripts'].'/'.$conf['mailman']['init_script'].' restart');
    }
    if($conf['services']['web']) {
        if($conf['apache']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['apache']['init_script']))                 system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
        if($conf['pureftpd']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['pureftpd']['init_script']))                system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
    }
    if($conf['services']['dns']) {
        if($conf['mydns']['installed'] == true && $conf['mydns']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mydns']['init_script']))                    system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');
        if($conf['powerdns']['installed'] == true && $conf['powerdns']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['powerdns']['init_script']))                    system($conf['init_scripts'].'/'.$conf['powerdns']['init_script'].' restart &> /dev/null');
        if($conf['bind']['installed'] == true && $conf['bind']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['bind']['init_script']))                    system($conf['init_scripts'].'/'.$conf['bind']['init_script'].' restart &> /dev/null');
    }
	
    if($conf['services']['proxy']) {
        if($conf['squid']['installed'] == true && $conf['squid']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['squid']['init_script']))                    system($conf['init_scripts'].'/'.$conf['squid']['init_script'].' restart &> /dev/null');
        if($conf['nginx']['installed'] == true && $conf['nginx']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['nginx']['init_script']))                    system($conf['init_scripts'].'/'.$conf['nginx']['init_script'].' restart &> /dev/null');
    }
	
    if($conf['services']['firewall']) {
        if($conf['ufw']['installed'] == true && $conf['ufw']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['ufw']['init_script']))                    system($conf['init_scripts'].'/'.$conf['ufw']['init_script'].' restart &> /dev/null');
    }
}

echo "Update finished.\n";

?>

 interface/web/admin/form/system_config.tform.php

@@ -1,294 +1,294 @@
<?php



/*

    Form Definition



    Tabledefinition



    Datatypes:

    - INTEGER (Forces the input to Int)

    - DOUBLE

    - CURRENCY (Formats the values to currency notation)

    - VARCHAR (no format check, maxlength: 255)

    - TEXT (no format check)

    - DATE (Dateformat, automatic conversion to timestamps)



    Formtype:

    - TEXT (Textfield)

    - TEXTAREA (Textarea)

    - PASSWORD (Password textfield, input is not shown when edited)

    - SELECT (Select option field)

    - RADIO

    - CHECKBOX

    - CHECKBOXARRAY

    - FILE



    VALUE:

    - Wert oder Array



    Hint:

    The ID field of the database table is not part of the datafield definition.

    The ID field must be always auto incement (int or bigint).





*/



$form["title"]             = "System Config";

$form["description"]     = "";

$form["name"]             = "system_config";

$form["action"]            = "system_config_edit.php";

$form["db_table"]        = "sys_ini";

$form["db_table_idx"]    = "sysini_id";

$form["db_history"]        = "yes";

$form["tab_default"]    = "sites";

$form["list_default"]    = "server_list.php";

$form["auth"]            = 'yes'; // yes / no



$form["auth_preset"]["userid"]  = 0; // 0 = id of the user, > 0 id must match with id of current user

$form["auth_preset"]["groupid"] = 0; // 0 = default groupid of the user, > 0 id must match with groupid of current user

$form["auth_preset"]["perm_user"] = 'riud'; //r = read, i = insert, u = update, d = delete

$form["auth_preset"]["perm_group"] = 'riud'; //r = read, i = insert, u = update, d = delete

$form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete



$form["tabs"]['sites'] = array (

    'title'     => "Sites",

    'width'     => 70,

    'template'     => "templates/system_config_sites_edit.htm",

    'fields'     => array (

    ##################################

    # Begin Datatable fields

    ##################################

        'dbname_prefix' => array (

            'datatype'    => 'VARCHAR',

            'formtype'    => 'TEXT',

            'validators'    => array (     0 => array (    'type'    => 'REGEX',

                                                        'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',

                                                        'errmsg'=> 'dbname_prefix_error_regex'),

                                        ),

            'default'    => '',

            'value'        => '',

            'width'        => '30',

            'maxlength'    => '255'

        ),

        'dbuser_prefix' => array (

            'datatype'    => 'VARCHAR',

            'formtype'    => 'TEXT',

            'validators'    => array (     0 => array (    'type'    => 'REGEX',

                                                        'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',

                                                        'errmsg'=> 'dbuser_prefix_error_regex'),

                                        ),

            'default'    => '',

            'value'        => '',

            'width'        => '30',

            'maxlength'    => '255'

        ),

        'ftpuser_prefix' => array (

            'datatype'    => 'VARCHAR',

            'formtype'    => 'TEXT',

            'validators'    => array (     0 => array (    'type'    => 'REGEX',

                                                        'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',

                                                        'errmsg'=> 'ftpuser_prefix_error_regex'),

                                        ),

            'default'    => '',

            'value'        => '',

            'width'        => '30',

            'maxlength'    => '255'

        ),

        'shelluser_prefix' => array (

            'datatype'    => 'VARCHAR',

            'formtype'    => 'TEXT',

            'validators'    => array (     0 => array (    'type'    => 'REGEX',

                                                        'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',

                                                        'errmsg'=> 'shelluser_prefix_error_regex'),

                                        ),

            'default'    => '',

            'value'        => '',

            'width'        => '30',

            'maxlength'    => '255'

        ),

        'webdavuser_prefix' => array (

            'datatype'    => 'VARCHAR',

            'formtype'    => 'TEXT',

            'validators'    => array (     0 => array (    'type'    => 'REGEX',

                                                        'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',

                                                        'errmsg'=> 'webdavuser_prefix_error_regex'),

                                        ),

            'default'    => '',

            'value'        => '',

            'width'        => '30',

            'maxlength'    => '255'

        ),

        'dblist_phpmyadmin_link' => array (

            'datatype'    => 'VARCHAR',

            'formtype'    => 'CHECKBOX',

            'default'    => 'n',

            'value'        => array(0 => 'n',1 => 'y')

        ),

        'phpmyadmin_url' => array (

            'datatype'    => 'VARCHAR',

            'formtype'    => 'TEXT',

            'validators'    => array (     0 => array (    'type'    => 'REGEX',

                                                        'regex' => '/^[0-9a-zA-Z\:\/\-\.]{0,255}$/',

                                                        'errmsg'=> 'phpmyadmin_url_error_regex'),

                                        ),

            'default'    => '',

            'value'        => '',

            'width'        => '30',

            'maxlength'    => '255'

        ),

        'webftp_url' => array (

            'datatype'    => 'VARCHAR',

            'formtype'    => 'TEXT',

            'validators'    => array (     0 => array (    'type'    => 'REGEX',

                                                        'regex' => '/^[0-9a-zA-Z\:\/\-\.]{0,255}$/',

                                                        'errmsg'=> 'webftp_url_error_regex'),

                                        ),

            'default'    => '',

            'value'        => '',

            'width'        => '30',

            'maxlength'    => '255'

        ),

    ##################################

    # ENDE Datatable fields

    ##################################

    )

);



$form["tabs"]['mail'] = array (

    'title'     => "Mail",

    'width'     => 70,

    'template'     => "templates/system_config_mail_edit.htm",

    'fields'     => array (

    ##################################

    # Begin Datatable fields

    ##################################

    'enable_custom_login' => array(

      'datatype' => 'VARCHAR',

      'formtype' => 'CHECKBOX',

      'default' => 'n',

      'value' => array(0 => 'n', 1 => 'y')

    ),

        'mailboxlist_webmail_link' => array (

            'datatype'    => 'VARCHAR',

            'formtype'    => 'CHECKBOX',

            'default'    => 'n',

            'value'        => array(0 => 'n',1 => 'y')

        ),

        'webmail_url' => array (

            'datatype'    => 'VARCHAR',

            'formtype'    => 'TEXT',

            'validators'    => array (     0 => array (    'type'    => 'REGEX',

                                                        'regex' => '/^[0-9a-zA-Z\:\/\-\.]{0,255}$/',

                                                        'errmsg'=> 'webmail_url_error_regex'),

                                        ),

            'default'    => '',

            'value'        => '',

            'width'        => '30',

            'maxlength'    => '255'

        ),

        'mailmailinglist_link' => array (

            'datatype'    => 'VARCHAR',

            'formtype'    => 'CHECKBOX',

            'default'    => 'n',

            'value'        => array(0 => 'n',1 => 'y')

        ),

        'mailmailinglist_url' => array (

            'datatype'    => 'VARCHAR',

            'formtype'    => 'TEXT',

            'validators'    => array (     0 => array (    'type'    => 'REGEX',

                                                        'regex' => '/^[0-9a-zA-Z\:\/\-\.]{0,255}$/',

                                                        'errmsg'=> 'mailinglist_url_error_regex'),

                                        ),

            'default'    => '',

            'value'        => '',

            'width'        => '30',

            'maxlength'    => '255'

        ),

        'admin_mail' => array (

            'datatype'    => 'VARCHAR',

            'formtype'    => 'TEXT',

            'default'    => '',

            'value'        => '',

            'width'        => '30',

            'maxlength'    => '255'

        ),

        'admin_name' => array (

            'datatype'    => 'VARCHAR',

            'formtype'    => 'TEXT',

            'default'    => '',

            'value'        => '',

            'width'        => '30',

            'maxlength'    => '255'

        ),

    ##################################

    # ENDE Datatable fields

    ##################################

    )

);



$form["tabs"]['domains'] = array (

    'title'     => "Domains",

    'width'     => 70,

    'template'     => "templates/system_config_domains_edit.htm",

    'fields'     => array (

    ##################################

    # Begin Datatable fields

    ##################################

        'use_domain_module' => array (

            'datatype'    => 'VARCHAR',

            'formtype'    => 'CHECKBOX',

            'default'    => 'n',

            'value'        => array(0 => 'n',1 => 'y')

        ),

        'new_domain_html' => array (

            'datatype'    => 'VARCHAR',

            'formtype'    => 'TEXT',

            'default'    => '',

            'value'        => ''

        ),

    ##################################

    # ENDE Datatable fields

    ##################################

    )

);



$form["tabs"]['misc'] = array (

    'title'     => "Misc",

    'width'     => 70,

    'template'     => "templates/system_config_misc_edit.htm",

    'fields'     => array (

    ##################################

    # Begin Datatable fields

    ##################################

        'dashboard_atom_url_admin' => array (

            'datatype'    => 'VARCHAR',

            'formtype'    => 'TEXT',

            'default'    => 'http://www.ispconfig.org/atom',

            'value'        => ''

        ),

        'dashboard_atom_url_reseller' => array (

            'datatype'    => 'VARCHAR',

            'formtype'    => 'TEXT',

            'default'    => 'http://www.ispconfig.org/atom',

            'value'        => ''

        ),

        'dashboard_atom_url_client' => array (

            'datatype'    => 'VARCHAR',

            'formtype'    => 'TEXT',

            'default'    => 'http://www.ispconfig.org/atom',

            'value'        => ''

        ),

        'monitor_key' => array (

            'datatype'    => 'VARCHAR',

            'formtype'    => 'TEXT',

            'default'    => '',

            'value'        => ''

        ),

    ##################################

    # ENDE Datatable fields

    ##################################

    )

);





?>

<?php

/*
    Form Definition

    Tabledefinition

    Datatypes:
    - INTEGER (Forces the input to Int)
    - DOUBLE
    - CURRENCY (Formats the values to currency notation)
    - VARCHAR (no format check, maxlength: 255)
    - TEXT (no format check)
    - DATE (Dateformat, automatic conversion to timestamps)

    Formtype:
    - TEXT (Textfield)
    - TEXTAREA (Textarea)
    - PASSWORD (Password textfield, input is not shown when edited)
    - SELECT (Select option field)
    - RADIO
    - CHECKBOX
    - CHECKBOXARRAY
    - FILE

    VALUE:
    - Wert oder Array

    Hint:
    The ID field of the database table is not part of the datafield definition.
    The ID field must be always auto incement (int or bigint).


*/

$form["title"]             = "System Config";
$form["description"]     = "";
$form["name"]             = "system_config";
$form["action"]            = "system_config_edit.php";
$form["db_table"]        = "sys_ini";
$form["db_table_idx"]    = "sysini_id";
$form["db_history"]        = "yes";
$form["tab_default"]    = "sites";
$form["list_default"]    = "server_list.php";
$form["auth"]            = 'yes'; // yes / no

$form["auth_preset"]["userid"]  = 0; // 0 = id of the user, > 0 id must match with id of current user
$form["auth_preset"]["groupid"] = 0; // 0 = default groupid of the user, > 0 id must match with groupid of current user
$form["auth_preset"]["perm_user"] = 'riud'; //r = read, i = insert, u = update, d = delete
$form["auth_preset"]["perm_group"] = 'riud'; //r = read, i = insert, u = update, d = delete
$form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete

$form["tabs"]['sites'] = array (
    'title'     => "Sites",
    'width'     => 70,
    'template'     => "templates/system_config_sites_edit.htm",
    'fields'     => array (
    ##################################
    # Begin Datatable fields
    ##################################
        'dbname_prefix' => array (
            'datatype'    => 'VARCHAR',
            'formtype'    => 'TEXT',
            'validators'    => array (     0 => array (    'type'    => 'REGEX',
                                                        'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',
                                                        'errmsg'=> 'dbname_prefix_error_regex'),
                                        ),
            'default'    => '',
            'value'        => '',
            'width'        => '30',
            'maxlength'    => '255'
        ),
        'dbuser_prefix' => array (
            'datatype'    => 'VARCHAR',
            'formtype'    => 'TEXT',
            'validators'    => array (     0 => array (    'type'    => 'REGEX',
                                                        'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',
                                                        'errmsg'=> 'dbuser_prefix_error_regex'),
                                        ),
            'default'    => '',
            'value'        => '',
            'width'        => '30',
            'maxlength'    => '255'
        ),
        'ftpuser_prefix' => array (
            'datatype'    => 'VARCHAR',
            'formtype'    => 'TEXT',
            'validators'    => array (     0 => array (    'type'    => 'REGEX',
                                                        'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',
                                                        'errmsg'=> 'ftpuser_prefix_error_regex'),
                                        ),
            'default'    => '',
            'value'        => '',
            'width'        => '30',
            'maxlength'    => '255'
        ),
        'shelluser_prefix' => array (
            'datatype'    => 'VARCHAR',
            'formtype'    => 'TEXT',
            'validators'    => array (     0 => array (    'type'    => 'REGEX',
                                                        'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',
                                                        'errmsg'=> 'shelluser_prefix_error_regex'),
                                        ),
            'default'    => '',
            'value'        => '',
            'width'        => '30',
            'maxlength'    => '255'
        ),
        'webdavuser_prefix' => array (
            'datatype'    => 'VARCHAR',
            'formtype'    => 'TEXT',
            'validators'    => array (     0 => array (    'type'    => 'REGEX',
                                                        'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',
                                                        'errmsg'=> 'webdavuser_prefix_error_regex'),
                                        ),
            'default'    => '',
            'value'        => '',
            'width'        => '30',
            'maxlength'    => '255'
        ),
        'dblist_phpmyadmin_link' => array (
            'datatype'    => 'VARCHAR',
            'formtype'    => 'CHECKBOX',
            'default'    => 'n',
            'value'        => array(0 => 'n',1 => 'y')
        ),
        'phpmyadmin_url' => array (
            'datatype'    => 'VARCHAR',
            'formtype'    => 'TEXT',
            'validators'    => array (     0 => array (    'type'    => 'REGEX',
                                                        'regex' => '/^[0-9a-zA-Z\:\/\-\.]{0,255}$/',
                                                        'errmsg'=> 'phpmyadmin_url_error_regex'),
                                        ),
            'default'    => '',
            'value'        => '',
            'width'        => '30',
            'maxlength'    => '255'
        ),
        'webftp_url' => array (
            'datatype'    => 'VARCHAR',
            'formtype'    => 'TEXT',
            'validators'    => array (     0 => array (    'type'    => 'REGEX',
                                                        'regex' => '/^[0-9a-zA-Z\:\/\-\.]{0,255}$/',
                                                        'errmsg'=> 'webftp_url_error_regex'),
                                        ),
            'default'    => '',
            'value'        => '',
            'width'        => '30',
            'maxlength'    => '255'
        ),
    ##################################
    # ENDE Datatable fields
    ##################################
    )
);

$form["tabs"]['mail'] = array (
    'title'     => "Mail",
    'width'     => 70,
    'template'     => "templates/system_config_mail_edit.htm",
    'fields'     => array (
    ##################################
    # Begin Datatable fields
    ##################################
    'enable_custom_login' => array(
      'datatype' => 'VARCHAR',
      'formtype' => 'CHECKBOX',
      'default' => 'n',
      'value' => array(0 => 'n', 1 => 'y')
    ),
        'mailboxlist_webmail_link' => array (
            'datatype'    => 'VARCHAR',
            'formtype'    => 'CHECKBOX',
            'default'    => 'n',
            'value'        => array(0 => 'n',1 => 'y')
        ),
        'webmail_url' => array (
            'datatype'    => 'VARCHAR',
            'formtype'    => 'TEXT',
            'validators'    => array (     0 => array (    'type'    => 'REGEX',
                                                        'regex' => '/^[0-9a-zA-Z\:\/\-\.]{0,255}$/',
                                                        'errmsg'=> 'webmail_url_error_regex'),
                                        ),
            'default'    => '',
            'value'        => '',
            'width'        => '30',
            'maxlength'    => '255'
        ),
        'mailmailinglist_link' => array (
            'datatype'    => 'VARCHAR',
            'formtype'    => 'CHECKBOX',
            'default'    => 'n',
            'value'        => array(0 => 'n',1 => 'y')
        ),
        'mailmailinglist_url' => array (
            'datatype'    => 'VARCHAR',
            'formtype'    => 'TEXT',
            'validators'    => array (     0 => array (    'type'    => 'REGEX',
                                                        'regex' => '/^[0-9a-zA-Z\:\/\-\.]{0,255}$/',
                                                        'errmsg'=> 'mailinglist_url_error_regex'),
                                        ),
            'default'    => '',
            'value'        => '',
            'width'        => '30',
            'maxlength'    => '255'
        ),
        'admin_mail' => array (
            'datatype'    => 'VARCHAR',
            'formtype'    => 'TEXT',
            'default'    => '',
            'value'        => '',
            'width'        => '30',
            'maxlength'    => '255'
        ),
        'admin_name' => array (
            'datatype'    => 'VARCHAR',
            'formtype'    => 'TEXT',
            'default'    => '',
            'value'        => '',
            'width'        => '30',
            'maxlength'    => '255'
        ),
    ##################################
    # ENDE Datatable fields
    ##################################
    )
);

$form["tabs"]['domains'] = array (
    'title'     => "Domains",
    'width'     => 70,
    'template'     => "templates/system_config_domains_edit.htm",
    'fields'     => array (
    ##################################
    # Begin Datatable fields
    ##################################
        'use_domain_module' => array (
            'datatype'    => 'VARCHAR',
            'formtype'    => 'CHECKBOX',
            'default'    => 'n',
            'value'        => array(0 => 'n',1 => 'y')
        ),
        'new_domain_html' => array (
            'datatype'    => 'VARCHAR',
            'formtype'    => 'TEXT',
            'default'    => '',
            'value'        => ''
        ),
    ##################################
    # ENDE Datatable fields
    ##################################
    )
);

$form["tabs"]['misc'] = array (
    'title'     => "Misc",
    'width'     => 70,
    'template'     => "templates/system_config_misc_edit.htm",
    'fields'     => array (
    ##################################
    # Begin Datatable fields
    ##################################
        'dashboard_atom_url_admin' => array (
            'datatype'    => 'VARCHAR',
            'formtype'    => 'TEXT',
            'default'    => 'http://www.ispconfig.org/atom',
            'value'        => ''
        ),
        'dashboard_atom_url_reseller' => array (
            'datatype'    => 'VARCHAR',
            'formtype'    => 'TEXT',
            'default'    => 'http://www.ispconfig.org/atom',
            'value'        => ''
        ),
        'dashboard_atom_url_client' => array (
            'datatype'    => 'VARCHAR',
            'formtype'    => 'TEXT',
            'default'    => 'http://www.ispconfig.org/atom',
            'value'        => ''
        ),
        'monitor_key' => array (
            'datatype'    => 'VARCHAR',
            'formtype'    => 'TEXT',
            'default'    => '',
            'value'        => ''
        ),
    ##################################
    # ENDE Datatable fields
    ##################################
    )
);


?>

 interface/web/dashboard/lib/custom_menu.inc.php

@@ -1,90 +1,90 @@
<?php



/*

Copyright (c) 2010 Till Brehm, projektfarm Gmbh

All rights reserved.



Redistribution and use in source and binary forms, with or without modification,

are permitted provided that the following conditions are met:



    * Redistributions of source code must retain the above copyright notice,

      this list of conditions and the following disclaimer.

    * Redistributions in binary form must reproduce the above copyright notice,

      this list of conditions and the following disclaimer in the documentation

      and/or other materials provided with the distribution.

    * Neither the name of ISPConfig nor the names of its contributors

      may be used to endorse or promote products derived from this software without

      specific prior written permission.



THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND

ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.

IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,

INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,

BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY

OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,

EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

*/



$app->uses('simplepie');

$app->uses('auth');



$app->tpl->newTemplate('dashboard/templates/custom_menu.htm');



$app->uses('getconf');

$misc_config = $app->getconf->get_global_config('misc');





switch($_SESSION['s']['user']['typ']) {

    case 'admin':

        $atom_url = $misc_config['dashboard_atom_url_admin'];

        break;

    case 'user':

        if ($app->auth->has_clients($_SESSION['s']['user']['userid']) === true)

            $atom_url = $misc_config['dashboard_atom_url_reseller'];

        else

            $atom_url = $misc_config['dashboard_atom_url_client'];

        break;

    default:

        $atom_url = "";

}



if( $atom_url != '' ) {

    if(!isset($_SESSION['s']['rss_news'])) {

		
        $app->simplepie->set_feed_url($atom_url);

        $app->simplepie->enable_cache(false);

        $app->simplepie->init();

        $items = $app->simplepie->get_items();



        $rows = array();

        $n = 1;



        foreach ($items as $item)

        {

            //* We want to show only the first 10 news records

            if($n <= 10) {

                $rows[] = array('title' => $item->get_title(),

                                'link' => $item->get_link(),

                                'content' => $item->get_content(),

                                'date' => $item->get_date('Y-m-d')

                                );

            }

            $n++;

        }

		
        $_SESSION['s']['rss_news'] = $rows;

		
    } else {

        $rows = $_SESSION['s']['rss_news'];

    }

	
    $app->tpl->setVar('latest_news_txt',$app->lng('latest_news_txt'));



}



$app->tpl->setLoop('news',$rows);



?>

<?php

/*
Copyright (c) 2010 Till Brehm, projektfarm Gmbh
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:

    * Redistributions of source code must retain the above copyright notice,
      this list of conditions and the following disclaimer.
    * Redistributions in binary form must reproduce the above copyright notice,
      this list of conditions and the following disclaimer in the documentation
      and/or other materials provided with the distribution.
    * Neither the name of ISPConfig nor the names of its contributors
      may be used to endorse or promote products derived from this software without
      specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

$app->uses('simplepie');
$app->uses('auth');

$app->tpl->newTemplate('dashboard/templates/custom_menu.htm');

$app->uses('getconf');
$misc_config = $app->getconf->get_global_config('misc');


switch($_SESSION['s']['user']['typ']) {
    case 'admin':
        $atom_url = $misc_config['dashboard_atom_url_admin'];
        break;
    case 'user':
        if ($app->auth->has_clients($_SESSION['s']['user']['userid']) === true)
            $atom_url = $misc_config['dashboard_atom_url_reseller'];
        else
            $atom_url = $misc_config['dashboard_atom_url_client'];
        break;
    default:
        $atom_url = "";
}

if( $atom_url != '' ) {
    if(!isset($_SESSION['s']['rss_news'])) {
		
        $app->simplepie->set_feed_url($atom_url);
        $app->simplepie->enable_cache(false);
        $app->simplepie->init();
        $items = $app->simplepie->get_items();

        $rows = array();
        $n = 1;

        foreach ($items as $item)
        {
            //* We want to show only the first 10 news records
            if($n <= 10) {
                $rows[] = array('title' => $item->get_title(),
                                'link' => $item->get_link(),
                                'content' => $item->get_content(),
                                'date' => $item->get_date('Y-m-d')
                                );
            }
            $n++;
        }
		
        $_SESSION['s']['rss_news'] = $rows;
		
    } else {
        $rows = $_SESSION['s']['rss_news'];
    }
	
    $app->tpl->setVar('latest_news_txt',$app->lng('latest_news_txt'));

}

$app->tpl->setLoop('news',$rows);

?>