install/dist/conf/centos52.conf.php
@@ -5,7 +5,7 @@ //* Main $conf['language'] = 'en'; $conf['distname'] = 'centos52'; $conf['hostname'] = 'server1.example.com'; // Full hostname $conf['hostname'] = 'server1.domain.tld'; // Full hostname $conf['ispconfig_install_dir'] = '/usr/local/ispconfig'; $conf['ispconfig_config_dir'] = '/usr/local/ispconfig'; $conf['ispconfig_log_priority'] = 2; // 0 = Debug, 1 = Warning, 2 = Error @@ -24,6 +24,7 @@ $conf['mysql']['database'] = 'dbispconfig'; $conf['mysql']['admin_user'] = 'root'; $conf['mysql']['admin_password'] = ''; $conf['mysql']['charset'] = 'utf8'; $conf['mysql']['ispconfig_user'] = 'ispconfig'; $conf['mysql']['ispconfig_password'] = md5 (uniqid (rand()));
@@ -5,7 +5,7 @@ //* Main $conf['language'] = 'en'; $conf['distname'] = 'debian40'; $conf['hostname'] = 'server1.example.com'; // Full hostname $conf['hostname'] = 'server1.domain.tld'; // Full hostname $conf['ispconfig_install_dir'] = '/usr/local/ispconfig'; $conf['ispconfig_config_dir'] = '/usr/local/ispconfig'; $conf['ispconfig_log_priority'] = 2; // 0 = Debug, 1 = Warning, 2 = Error @@ -24,6 +24,7 @@ $conf['mysql']['database'] = 'dbispconfig'; $conf['mysql']['admin_user'] = 'root'; $conf['mysql']['admin_password'] = ''; $conf['mysql']['charset'] = 'utf8'; $conf['mysql']['ispconfig_user'] = 'ispconfig'; $conf['mysql']['ispconfig_password'] = md5 (uniqid (rand()));
@@ -5,7 +5,7 @@ //* Main $conf['language'] = 'en'; $conf['distname'] = 'fedora9'; $conf['hostname'] = 'server1.example.com'; // Full hostname $conf['hostname'] = 'server1.domain.tld'; // Full hostname $conf['ispconfig_install_dir'] = '/usr/local/ispconfig'; $conf['ispconfig_config_dir'] = '/usr/local/ispconfig'; $conf['ispconfig_log_priority'] = 2; // 0 = Debug, 1 = Warning, 2 = Error @@ -24,6 +24,7 @@ $conf['mysql']['database'] = 'dbispconfig'; $conf['mysql']['admin_user'] = 'root'; $conf['mysql']['admin_password'] = ''; $conf['mysql']['charset'] = 'utf8'; $conf['mysql']['ispconfig_user'] = 'ispconfig'; $conf['mysql']['ispconfig_password'] = md5 (uniqid (rand()));
@@ -5,7 +5,7 @@ //* Main $conf['language'] = 'en'; $conf['distname'] = 'opensuse110'; $conf['hostname'] = 'server1.example.com'; // Full hostname $conf['hostname'] = 'server1.domain.tld'; // Full hostname $conf['ispconfig_install_dir'] = '/usr/local/ispconfig'; $conf['ispconfig_config_dir'] = '/usr/local/ispconfig'; $conf['ispconfig_log_priority'] = 2; // 0 = Debug, 1 = Warning, 2 = Error @@ -24,6 +24,7 @@ $conf['mysql']['database'] = 'dbispconfig'; $conf['mysql']['admin_user'] = 'root'; $conf['mysql']['admin_password'] = ''; $conf['mysql']['charset'] = 'utf8'; $conf['mysql']['ispconfig_user'] = 'ispconfig'; $conf['mysql']['ispconfig_password'] = md5 (uniqid (rand()));
@@ -32,9 +32,6 @@ ISPConfig 3 installer. */ //** Check for existing installation //if(is_dir("/usr/local/ispconfig")) die('We will stop here. There is already a ISPConfig installation, use the update script to update this installation.'); error_reporting(E_ALL|E_STRICT); //** The banner on the command line @@ -56,19 +53,24 @@ //** Include the base class of the installer class require_once('lib/installer_base.lib.php'); //** Install logfile define('ISPC_LOG_FILE', '/var/log/ispconfig_install.log'); define('ISPC_INSTALL_ROOT', realpath(dirname(__FILE__).'/../')); //** Check for existing installation /*if(is_dir("/usr/local/ispconfig")) { die('We will stop here. There is already a ISPConfig installation, use the update script to update this installation.'); }*/ //** Get distribution identifier $dist = get_distname(); if($dist['id'] == '') die('Linux Dustribution or Version not recognized.'); 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'); //** Install logfile define('ISPC_LOG_FILE', '/var/log/ispconfig_install.log'); define('ISPC_INSTALL_ROOT', realpath(dirname(__FILE__).'/../')); //**************************************************************************************************** //** Installer Interface @@ -97,7 +99,7 @@ //** Get the hostname $tmp_out = array(); exec('hostname -f', $tmp_out); $conf['hostname'] = $inst->free_query('Full qualified hostname (FQDN) of the server, eg foo.example.com ', $tmp_out[0]); $conf['hostname'] = $inst->free_query('Full qualified hostname (FQDN) of the server, eg server1.domain.tld ', $tmp_out[0]); unset($tmp_out); //** Get MySQL root credentials @@ -107,6 +109,7 @@ $tmp_mysql_server_admin_user = $inst->free_query('MySQL root username', $conf['mysql']['admin_user']); $tmp_mysql_server_admin_password = $inst->free_query('MySQL root password', $conf['mysql']['admin_password']); $tmp_mysql_server_database = $inst->free_query('MySQL database to create', $conf['mysql']['database']); $tmp_mysql_server_charset = $inst->free_query('MySQL charset', $conf['mysql']['charset']); //* Initialize the MySQL server connection if(@mysql_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) { @@ -114,6 +117,7 @@ $conf['mysql']['admin_user'] = $tmp_mysql_server_admin_user; $conf['mysql']['admin_password'] = $tmp_mysql_server_admin_password; $conf['mysql']['database'] = $tmp_mysql_server_database; $conf['mysql']['charset'] = $tmp_mysql_server_charset; $finished = true; } else { swriteln($inst->lng('Unable to connect to mysql server').' '.mysql_error()); install/lib/installer_base.lib.php
@@ -119,7 +119,7 @@ $cf = $conf['mysql']; // make $conf['mysql'] more accessible //** Create the database if(!$this->db->query('CREATE DATABASE IF NOT EXISTS '.$cf['database'])) { if(!$this->db->query('CREATE DATABASE IF NOT EXISTS '.$cf['database'].' DEFAULT CHARACTER SET '.$cf['charset'])) { $this->error('Unable to create MySQL database: '.$cf['database'].'.'); } @@ -132,10 +132,10 @@ $this->error('Stopped: Database already contains some tables.'); } else { if($cf['admin_password'] == '') { caselog("mysql -h '".$cf['host']."' -u '".$cf['admin_user']."' '".$cf['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/ispconfig3.sql' &> /dev/null", caselog("mysql --default-character-set=".$cf['charset']." -h '".$cf['host']."' -u '".$cf['admin_user']."' '".$cf['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/ispconfig3.sql' &> /dev/null", __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql'); } else { caselog("mysql -h '".$cf['host']."' -u '".$cf['admin_user']."' -p'".$cf['admin_password']."' '".$cf['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/ispconfig3.sql' &> /dev/null", caselog("mysql --default-character-set=".$cf['charset']." -h '".$cf['host']."' -u '".$cf['admin_user']."' -p'".$cf['admin_password']."' '".$cf['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/ispconfig3.sql' &> /dev/null", __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql'); } $db_tables = $this->db->getTables(); install/lib/mysql.lib.php
@@ -33,6 +33,7 @@ var $dbName = ""; // logical database name on that server var $dbUser = ""; // database authorized user var $dbPass = ""; // user's password var $dbCharset = ""; // what charset comes and goes to mysql: utf8 / latin1 var $linkId = 0; // last result of mysql_connect() var $queryId = 0; // last result of mysql_query() var $record = array(); // last record fetched @@ -52,6 +53,7 @@ //$this->dbName = $conf["mysql"]["database"]; $this->dbUser = $conf["mysql"]["admin_user"]; $this->dbPass = $conf["mysql"]["admin_password"]; $this->dbCharset = $conf["mysql"]["charset"]; //$this->connect(); } @@ -79,6 +81,7 @@ $this->updateError('DB::connect()<br />mysql_connect'); return false; } $this->queryId = @mysql_query('SET NAMES '.$this->dbCharset, $this->linkId); } return true; } install/options.conf.php
@@ -6,7 +6,7 @@ $conf['language'] = 'en'; $conf['distname'] = 'debian40'; $conf['hostname'] = 'server1.example.com'; // Full hostname $conf['hostname'] = 'server1.domain.tld'; // Full hostname $conf['ispconfig_install_dir'] = '/usr/local/ispconfig'; $conf['ispconfig_config_dir'] = '/usr/local/ispconfig'; $conf['server_id'] = 1; @@ -18,6 +18,7 @@ $conf['mysql']['database'] = 'dbispconfig'; $conf['mysql']['admin_user'] = 'root'; $conf['mysql']['admin_password'] = ''; $conf['mysql']['charset'] = 'utf8'; $conf['mysql']['ispconfig_user'] = 'ispconfig'; $conf['mysql']['ispconfig_password'] = '5sDrewBhk';
@@ -1,13 +1,11 @@ -- phpMyAdmin SQL Dump -- version 2.9.0.3 -- http://www.phpmyadmin.net -- ISPConfig 3 -- DB-Version: 3.0.0.8 -- -------------------------------------------------------- -- -- Host: localhost -- Erstellungszeit: 29. Juni 2007 um 16:37 -- Server Version: 5.0.24 -- PHP-Version: 5.1.4 -- -- Datenbank: `ispconfig3` -- Datenbank: `ispconfig_v3` -- -- -------------------------------------------------------- @@ -36,7 +34,7 @@ `mobile` varchar(255) default NULL, `fax` varchar(255) default NULL, `email` varchar(255) default NULL, `internet` varchar(255) NOT NULL default 'http://', `internet` varchar(255) NOT NULL, `icq` varchar(255) default NULL, `notes` text, `default_mailserver` int(11) NOT NULL default '1', @@ -71,7 +69,7 @@ `language` varchar(255) NOT NULL default 'en', `usertheme` varchar(255) NOT NULL default 'default', PRIMARY KEY (`client_id`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -- Daten für Tabelle `client` @@ -101,7 +99,7 @@ `active` enum('N','Y') NOT NULL default 'Y', PRIMARY KEY (`id`), UNIQUE KEY `rr` (`zone`,`name`,`type`,`data`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -------------------------------------------------------- @@ -131,7 +129,7 @@ PRIMARY KEY (`id`), UNIQUE KEY `origin` (`origin`), KEY `active` (`active`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -------------------------------------------------------- @@ -151,7 +149,7 @@ `template` text, `visible` varchar(255) NOT NULL default 'Y', PRIMARY KEY (`template_id`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=3 ; ) ENGINE=MyISAM AUTO_INCREMENT=3 ; -- -- Daten für Tabelle `dns_template` @@ -180,7 +178,7 @@ `udp_port` varchar(255) default NULL, `active` varchar(255) NOT NULL default 'y', PRIMARY KEY (`firewall_id`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -- Daten für Tabelle `firewall` @@ -219,7 +217,7 @@ KEY `server_id` (`server_id`), KEY `username` (`username`), KEY `quota_files` (`quota_files`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -- Daten für Tabelle `ftp_user` @@ -246,7 +244,7 @@ `active` enum('n','y') NOT NULL default 'y', PRIMARY KEY (`access_id`), KEY `server_id` (`server_id`,`source`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -- Daten für Tabelle `mail_access` @@ -273,7 +271,7 @@ `action` varchar(255) default NULL, `active` varchar(255) NOT NULL default 'y', PRIMARY KEY (`content_filter_id`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -------------------------------------------------------- @@ -294,7 +292,7 @@ PRIMARY KEY (`domain_id`), KEY `server_id` (`server_id`,`domain`), KEY `domain_active` (`domain`,`active`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -- Daten für Tabelle `mail_domain` @@ -321,7 +319,7 @@ `active` enum('y','n') NOT NULL, PRIMARY KEY (`forwarding_id`), KEY `server_id` (`server_id`,`source`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -- Daten für Tabelle `mail_forwarding` @@ -350,7 +348,7 @@ `destination` varchar(255) default NULL, `active` varchar(255) NOT NULL default 'y', PRIMARY KEY (`mailget_id`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -- Daten für Tabelle `mail_get` @@ -372,7 +370,7 @@ `origin_type` enum('MANUAL','AUTO') NOT NULL default 'AUTO', `create_time` datetime NOT NULL default '0000-00-00 00:00:00', PRIMARY KEY (`greylist_id`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -- Daten für Tabelle `mail_greylist` @@ -394,7 +392,7 @@ `mm_user` varchar(50) NOT NULL default '', `mm_group` varchar(50) NOT NULL default '', PRIMARY KEY (`mailman_id`,`server_id`,`domain`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -- Daten für Tabelle `mail_mailman_domain` @@ -413,7 +411,7 @@ `traffic` bigint(20) unsigned NOT NULL, PRIMARY KEY (`traffic_id`), KEY `mailuser_id` (`mailuser_id`,`month`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ; ) ENGINE=MyISAM AUTO_INCREMENT=2 ; -- -- Daten für Tabelle `mail_traffic` @@ -441,7 +439,7 @@ PRIMARY KEY (`transport_id`), KEY `server_id` (`server_id`,`transport`), KEY `server_id_2` (`server_id`,`domain`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -- Daten für Tabelle `mail_transport` @@ -480,7 +478,7 @@ PRIMARY KEY (`mailuser_id`), KEY `server_id` (`server_id`,`email`), KEY `email_access` (`email`,`access`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -- Daten für Tabelle `mail_user` @@ -509,7 +507,7 @@ `target` varchar(255) default NULL, `active` varchar(255) NOT NULL default 'y', PRIMARY KEY (`filter_id`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -------------------------------------------------------- @@ -523,7 +521,7 @@ `remote_functions` text NOT NULL, `tstamp` int(10) unsigned NOT NULL, PRIMARY KEY (`remote_session`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; ) ENGINE=MyISAM; -- -- Daten für Tabelle `remote_session` @@ -542,7 +540,7 @@ `remote_password` varchar(255) NOT NULL, `remote_functions` text NOT NULL, PRIMARY KEY (`remote_userid`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -- Daten für Tabelle `remote_user` @@ -575,7 +573,7 @@ `updated` tinyint(4) NOT NULL default '0', `active` tinyint(4) NOT NULL default '1', PRIMARY KEY (`server_id`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -- Daten für Tabelle `server` @@ -598,7 +596,7 @@ `ip_address` varchar(15) default NULL, `virtualhost` char(1) NOT NULL default 'y', PRIMARY KEY (`server_ip_id`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -- Daten für Tabelle `server_ip` @@ -625,7 +623,7 @@ `dir` varchar(255) default NULL, `chroot` varchar(255) NOT NULL, PRIMARY KEY (`shell_user_id`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1; ) ENGINE=MyISAM AUTO_INCREMENT=1; -- @@ -648,7 +646,7 @@ `package_version` varchar(255) default NULL, PRIMARY KEY (`package_id`), UNIQUE KEY `package_name` (`package_name`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -- Daten für Tabelle `software_package` @@ -673,7 +671,7 @@ `repo_password` varchar(30) default NULL, `active` varchar(255) NOT NULL default 'y', PRIMARY KEY (`software_repo_id`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -- Daten für Tabelle `software_repo` @@ -701,7 +699,7 @@ `v4` tinyint(4) NOT NULL default '0', `type` enum('full','update') NOT NULL default 'full', PRIMARY KEY (`software_update_id`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -- Daten für Tabelle `software_update` @@ -721,7 +719,7 @@ `status` enum('none','installing','installed','deleting') NOT NULL default 'none', PRIMARY KEY (`software_update_inst_id`), UNIQUE KEY `software_update_id` (`software_update_id`,`package_name`,`server_id`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -- Daten für Tabelle `software_update_inst` @@ -780,7 +778,7 @@ `message_size_limit` int(11) default NULL, `banned_rulenames` varchar(64) default NULL, PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=13 ; ) ENGINE=MyISAM AUTO_INCREMENT=13 ; -- -- Daten für Tabelle `spamfilter_policy` @@ -815,7 +813,7 @@ `local` char(1) default NULL, PRIMARY KEY (`id`), UNIQUE KEY `email` (`email`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -- Daten für Tabelle `spamfilter_users` @@ -842,7 +840,7 @@ `priority` int(11) NOT NULL, `active` enum('y','n') NOT NULL default 'y', PRIMARY KEY (`wblist_id`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -- Daten für Tabelle `spamfilter_wblist` @@ -868,7 +866,7 @@ `message` varchar(255) default NULL, `tstamp` int(11) NOT NULL default '1187707778', PRIMARY KEY (`support_message_id`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -------------------------------------------------------- @@ -886,7 +884,7 @@ `user` varchar(255) NOT NULL default '', `data` text NOT NULL, PRIMARY KEY (`datalog_id`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -- Daten für Tabelle `sys_datalog` @@ -915,7 +913,7 @@ `last_datalog_id` bigint(20) NOT NULL default '0', PRIMARY KEY (`id`), KEY `last_datalog_id` (`last_datalog_id`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -- Daten für Tabelle `sys_dbsync` @@ -940,7 +938,7 @@ `wput_options` varchar(255) NOT NULL default '--timestamping --reupload --dont-continue', `active` int(11) NOT NULL default '1', PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -- Daten für Tabelle `sys_filesync` @@ -959,7 +957,7 @@ `description` text NOT NULL, `client_id` int(11) NOT NULL default '0', PRIMARY KEY (`groupid`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=4 ; ) ENGINE=MyISAM AUTO_INCREMENT=4 ; -- -- Daten für Tabelle `sys_group` @@ -992,7 +990,7 @@ `default_group` int(11) NOT NULL default '0', `client_id` int(11) NOT NULL default '0', PRIMARY KEY (`userid`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=3 ; ) ENGINE=MyISAM AUTO_INCREMENT=3 ; -- -- Daten für Tabelle `sys_user` @@ -1045,7 +1043,7 @@ `apache_directives` text, `active` varchar(255) NOT NULL default 'y', PRIMARY KEY (`domain_id`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- @@ -1074,7 +1072,7 @@ `remote_access` varchar(255) NOT NULL default 'y', `active` varchar(255) NOT NULL default 'y', PRIMARY KEY (`database_id`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -- Daten für Tabelle `web_database` @@ -1090,7 +1088,7 @@ `ip` varchar(12) NOT NULL, `times` tinyint(1) NOT NULL default '1', `login_time` timestamp NOT NULL default '0000-00-00 00:00:00' ) ENGINE=MyISAM DEFAULT CHARSET=latin1; ) ENGINE=MyISAM; -- @@ -1104,29 +1102,45 @@ `data` mediumtext NOT NULL, `state` enum('no_state', 'unknown', 'ok', 'info', 'warning', 'critical', 'error') NOT NULL default 'unknown', PRIMARY KEY (`server_id`,`type`,`created`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; ) ENGINE=MyISAM; -- -- Tabellenstruktur für Tabelle `sys_config` -- # iso_country_list.sql # # This will create and then populate a MySQL table with a list of the names and # ISO 3166 codes for countries in existence as of the date below. # # For updates to this file, see http://27.org/isocountrylist/ # For more about ISO 3166, see http://www.iso.ch/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1.html # # Created by getisocountrylist.pl on Sun Nov 2 14:59:20 2003. # Wm. Rhodes <iso_country_list@27.org> # CREATE TABLE `sys_config` ( `config_id` int(11) NOT NULL, `group` varchar(255) NOT NULL, `name` varchar(255) NOT NULL, `value` varchar(255) NOT NULL ) ENGINE=MyISAM; CREATE TABLE IF NOT EXISTS country ( iso CHAR(2) NOT NULL PRIMARY KEY, name VARCHAR(80) NOT NULL, printable_name VARCHAR(80) NOT NULL, iso3 CHAR(3), numcode SMALLINT ); INSERT INTO sys_config VALUES ('1','db','db_version','3.0.0.8'); -- -------------------------------------------------------- -- -- iso_country_list.sql -- -- This will create and then populate a MySQL table with a list of the names and -- ISO 3166 codes for countries in existence as of the date below. -- -- For updates to this file, see http://27.org/isocountrylist/ -- For more about ISO 3166, see http://www.iso.ch/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1.html -- -- Created by getisocountrylist.pl on Sun Nov 2 14:59:20 2003. -- Wm. Rhodes <iso_country_list@27.org> -- CREATE TABLE `country` ( `iso` CHAR(2) NOT NULL PRIMARY KEY, `name` VARCHAR(80) NOT NULL, `printable_name` VARCHAR(80) NOT NULL, `iso3` CHAR(3), `numcode` SMALLINT ) ENGINE=MyISAM; INSERT INTO country VALUES ('AF','AFGHANISTAN','Afghanistan','AFG','004'); INSERT INTO country VALUES ('AL','ALBANIA','Albania','ALB','008'); @@ -1368,10 +1382,6 @@ INSERT INTO country VALUES ('ZM','ZAMBIA','Zambia','ZMB','894'); INSERT INTO country VALUES ('ZW','ZIMBABWE','Zimbabwe','ZWE','716'); -- -------------------------------------------------------- SET FOREIGN_KEY_CHECKS = 1;
@@ -32,122 +32,95 @@ Header("Pragma: no-cache"); Header("Cache-Control: no-store, no-cache, max-age=0, must-revalidate"); Header("Content-Type: text/html"); Header("Content-Type: text/html; charset=utf-8"); ini_set('register_globals',0); } $conf["app_title"] = "ISPConfig"; $conf["app_version"] = "3.0.0"; $conf["modules_available"] = "admin,mail,sites,monitor,client,dns"; $conf["interface_logout_url"] = ""; //** Key paramaters //** Application define('ISPC_APP_TITLE', 'ISPConfig'); $conf['app_title'] = 'ISPConfig'; define('ISPC_APP_VERSION', '3.0.0'); $conf['app_version'] = '3.0.0'; $conf['modules_available'] = 'admin,mail,sites,monitor,client,dns,help'; //** The main ROOT is the parent directory to this file, ie Interface/. NO trailing slashes. define('ISPC_ROOT_PATH', realpath(dirname(__FILE__).'/../')); define('ISPC_LIB_PATH', ISPC_ROOT_PATH.'/lib'); define('ISPC_CLASS_PATH', ISPC_ROOT_PATH.'/lib/classes'); define('ISPC_WEB_PATH', ISPC_ROOT_PATH.'/web'); define('ISPC_THEMES_PATH', ISPC_ROOT_PATH.'/web/themes'); define('ISPC_WEB_TEMP_PATH', ISPC_WEB_PATH.'/temp'); // Path for downloads, accessible via browser define('ISPC_CACHE_PATH', ISPC_ROOT_PATH.'/cache'); //** Interface settings define('ISPC_INTERFACE_MODULES_ENABLED', 'mail,sites,dns,tools'); define('ISPC_APP_VERSION', '3.0.8 beta'); define('ISPC_APP_LINK', 'http://www.howtoforge.com/forums/showthread.php?t=26988'); /* Server variables */ $conf["server_id"] = "{server_id}"; /* Database Settings */ //** Database $conf["db_type"] = 'mysql'; $conf["db_host"] = '{mysql_server_host}'; $conf["db_database"] = '{mysql_server_database}'; $conf["db_user"] = '{mysql_server_ispconfig_user}'; $conf["db_password"] = '{mysql_server_ispconfig_password}'; /* Path Settings (Do not change!) */ $conf["rootpath"] = substr(dirname(__FILE__),0,-4); $conf["fs_div"] = "/"; // File system divider, \\ on windows and / on linux and unix $conf["classpath"] = $conf["rootpath"].$conf["fs_div"]."lib".$conf["fs_div"]."classes"; $conf["temppath"] = $conf["rootpath"].$conf["fs_div"]."temp"; define("DIR_TRENNER",$conf["fs_div"]); define("SERVER_ROOT",$conf["rootpath"]); define("INCLUDE_ROOT",SERVER_ROOT.DIR_TRENNER."lib"); define("CLASSES_ROOT",INCLUDE_ROOT.DIR_TRENNER."classes"); $conf["db_charset"] = 'utf8'; // same charset as html-charset - (HTML --> MYSQL: "utf-8" --> "utf8", "iso-8859-1" --> "latin1") define("DB_TYPE",$conf["db_type"]); define("DB_HOST",$conf["db_host"]); define("DB_DATABASE",$conf["db_database"]); define("DB_USER",$conf["db_user"]); define("DB_PASSWORD",$conf["db_password"]); define("DB_CHARSET",$conf["db_charset"]); /* Logging */ //** Paths define('ISPC_ROOT_PATH', realpath(dirname(__FILE__).'/../')); // The main ROOT is the parent directory to this file, ie Interface/. NO trailing slashes. define('ISPC_LIB_PATH', ISPC_ROOT_PATH.'/lib'); define('ISPC_CLASS_PATH', ISPC_ROOT_PATH.'/lib/classes'); define('ISPC_WEB_PATH', ISPC_ROOT_PATH.'/web'); define('ISPC_THEMES_PATH', ISPC_ROOT_PATH.'/web/themes'); define('ISPC_WEB_TEMP_PATH', ISPC_WEB_PATH.'/temp'); // Path for downloads, accessible via browser define('ISPC_CACHE_PATH', ISPC_ROOT_PATH.'/cache'); //** Paths (Do not change!) $conf["rootpath"] = substr(dirname(__FILE__),0,-4); $conf["fs_div"] = "/"; // File system divider, "\\" on windows and "/"" on linux and unix $conf["classpath"] = $conf["rootpath"].$conf["fs_div"]."lib".$conf["fs_div"]."classes"; $conf["temppath"] = $conf["rootpath"].$conf["fs_div"]."temp"; define("FS_DIV",$conf["fs_div"]); define("SERVER_ROOT",$conf["rootpath"]); define("INCLUDE_ROOT",SERVER_ROOT.FS_DIV."lib"); define("CLASSES_ROOT",INCLUDE_ROOT.FS_DIV."classes"); //** Server $conf['app_title'] = ISPC_APP_TITLE; $conf['app_version'] = ISPC_APP_VERSION; $conf['modules_available'] = 'admin,mail,sites,monitor,client,dns,help'; $conf["server_id"] = "{server_id}"; //** Interface define('ISPC_INTERFACE_MODULES_ENABLED', 'mail,sites,dns,tools'); //** Logging $conf["log_file"] = '/var/log/ispconfig/ispconfig.log'; $conf["log_priority"] = {ispconfig_log_priority}; // 0 = Debug, 1 = Warning, 2 = Error /* Allow software package installations */ //** Allow software package installations $conf['software_updates_enabled'] = false; /* Themes */ //** Themes $conf["theme"] = 'default'; $conf["html_content_encoding"] = 'text/html; charset=iso-8859-1'; $conf["logo"] = 'themes/default/images/mydnsconfig_logo.gif'; $conf["html_content_encoding"] = 'utf-8'; // example: utf-8, iso-8859-1, ... $conf["logo"] = 'themes/default/images/ispc_logo.png'; /* Default Language */ //** Default Language $conf["language"] = 'en'; /* Misc. */ //** Misc. $conf["interface_logout_url"] = ""; // example: http://www.domain.tld/ /* Auto Load Modules */ //** Auto Load Modules $conf["start_db"] = true; $conf["start_session"] = true; /* Constants */ //** Constants define("LOGLEVEL_DEBUG",0); define("LOGLEVEL_WARN",1); define("LOGLEVEL_ERROR",2); install/tpl/server.ini.master
@@ -8,8 +8,8 @@ ip_address=192.168.0.105 netmask=255.255.255.0 gateway=192.168.0.1 hostname=server1.example.com nameservers=193.174.32.18,145.253.2.75 hostname=server1.domain.tld nameservers=192.168.0.1,192.168.0.2 [mail] module=postfix_mysql install/uninstall.php
@@ -1,7 +1,7 @@ <?php /* Copyright (c) 2008, Till Brehm, projektfarm Gmbh Copyright (c) 2007, Till Brehm, projektfarm Gmbh All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -28,6 +28,25 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /* ISPConfig 3 uninstaller. */ 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>> Uninstall \n\n"; require("/usr/local/ispconfig/server/lib/config.inc.php"); require("/usr/local/ispconfig/server/lib/app.inc.php");
@@ -28,8 +28,12 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /* ISPConfig 3 updater. */ //** ISPConfig 3 installer. error_reporting(E_ALL|E_STRICT); //** The banner on the command line echo "\n\n".str_repeat('-',80)."\n"; echo " _____ ___________ _____ __ _ @@ -43,14 +47,13 @@ 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 base class of the installer class require_once('lib/installer_base.lib.php'); //** Installer/updater logfile //** Install logfile define('ISPC_LOG_FILE', '/var/log/ispconfig_install.log'); define('ISPC_INSTALL_ROOT', realpath(dirname(__FILE__).'/../')); @@ -82,6 +85,7 @@ //** 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"]; @@ -138,10 +142,10 @@ //** load old data back into database if( !empty($conf["mysql"]["admin_password"]) ) { system("mysql -h ".$conf['mysql']['host']." -u ".$conf['mysql']['admin_user']." -p".$conf['mysql']['admin_password']." ".$conf['mysql']['database']." < existing_db.sql"); system("mysql --default-character-set=".$conf['mysql']['charset']." -h ".$conf['mysql']['host']." -u ".$conf['mysql']['admin_user']." -p".$conf['mysql']['admin_password']." ".$conf['mysql']['database']." < existing_db.sql"); } else { system("mysql -h ".$conf['mysql']['host']." -u ".$conf['mysql']['admin_user']." ".$conf['mysql']['database']." < existing_db.sql"); system("mysql --default-character-set=".$conf['mysql']['charset']." -h ".$conf['mysql']['host']." -u ".$conf['mysql']['admin_user']." ".$conf['mysql']['database']." < existing_db.sql"); } // create a backup copy of the ispconfig database in the root folder interface/lib/app.inc.php
@@ -100,14 +100,14 @@ if($priority >= $this->_conf['log_priority']) { if (is_writable($this->_conf['log_file'])) { if (!$fp = fopen ($this->_conf['log_file'], 'a')) { $this->error('Logfile konnte nicht ge�ffnet werden.'); $this->error('Unable to open logfile.'); } if (!fwrite($fp, date('d.m.Y-H:i').' - '. $msg."\r\n")) { $this->error('Schreiben in Logfile nicht m�glich.'); $this->error('Unable to write to logfile.'); } fclose($fp); } else { $this->error('Logfile ist nicht beschreibbar.'); $this->error('Unable to write to logfile.'); } } } @@ -121,7 +121,7 @@ $msg = '<html> <head> <title>Error</title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <link href="../themes/default/style.css" rel="stylesheet" type="text/css"> </head> <body> @@ -161,15 +161,20 @@ public function tpl_defaults() { $this->tpl->setVar('theme', $_SESSION['s']['theme']); $this->tpl->setVar('app_title', $this->_conf['app_title']); $this->tpl->setVar('app_version', $this->_conf['app_version']); $this->tpl->setVar('app_link', $this->_conf['app_link']); $this->tpl->setVar('phpsessid', session_id()); $this->tpl->setVar('theme', $_SESSION['s']['theme']); $this->tpl->setVar('html_content_encoding', $this->_conf['html_content_encoding']); if(isset($this->_conf['logo']) && $this->_conf['logo'] != '' && @is_file($this->_conf['logo'])){ $this->tpl->setVar('logo', '<img src="'.$this->_conf['logo'].'" border="0" alt="">'); } else { $this->tpl->setVar('logo', ' '); } $this->tpl->setVar('app_title', $this->_conf['app_title']); $this->tpl->setVar('delete_confirmation', $this->lng('delete_confirmation')); //print_r($_SESSION); if(isset($_SESSION['s']['module']['name'])) { @@ -181,7 +186,6 @@ if(isset($_SESSION['s']['user']) && $this->auth->has_clients($_SESSION['s']['user']['userid'])) { $this->tpl->setVar('is_reseller', 1); } $this->tpl->setVar('ISPC_APP_VERSION', ISPC_APP_VERSION); } } // end class interface/lib/classes/db_mysql.inc.php
@@ -41,6 +41,7 @@ private $dbName = ''; // logical database name on that server private $dbUser = ''; // database authorized user private $dbPass = ''; // user's password private $dbCharset = ""; // what charset comes and goes to mysql: utf8 / latin1 private $linkId = 0; // last result of mysql_connect() private $queryId = 0; // last result of mysql_query() private $record = array(); // last record fetched @@ -58,6 +59,7 @@ $this->dbName = $conf['db_database']; $this->dbUser = $conf['db_user']; $this->dbPass = $conf['db_password']; $this->dbCharset = $conf['db_charset']; //$this->connect(); } @@ -81,6 +83,7 @@ $this->updateError('DB::connect()<br />mysql_connect'); return false; } $this->queryId = @mysql_query('SET NAMES '.$this->dbCharset, $this->linkId); } return true; } interface/lib/config.inc.php
File was deleted interface/lib/db_local.php.skel
File was deleted interface/web/admin/form/server_config.tform.php
@@ -67,7 +67,7 @@ 'ip_address' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', 'default' => '192.168.0.100', 'default' => '192.168.0.105', 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY', 'errmsg'=> 'ip_address_error_empty'), ), @@ -100,7 +100,7 @@ 'hostname' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', 'default' => 'server1.example.com', 'default' => 'server1.domain.tld', 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY', 'errmsg'=> 'hostname_error_empty'), ), interface/web/dns/templates/dns_soa_edit.htm
@@ -22,15 +22,15 @@ </tmpl_if> <span class="wf_oneField"> <label for="origin" class="wf_preField">{tmpl_var name='origin_txt'}</label> <input type="text" id="origin" name="origin" value="{tmpl_var name='origin'}" size="30" maxlength="255"> e.g. mydomain.com. <input type="text" id="origin" name="origin" value="{tmpl_var name='origin'}" size="30" maxlength="255"> e.g. domain.tld </span> <span class="wf_oneField"> <label for="ns" class="wf_preField">{tmpl_var name='ns_txt'}</label> <input type="text" id="ns" name="ns" value="{tmpl_var name='ns'}" size="30" maxlength="255"> e.g. ns1.mydomain.com. <input type="text" id="ns" name="ns" value="{tmpl_var name='ns'}" size="30" maxlength="255"> e.g. ns1.domain.tld </span> <span class="wf_oneField"> <label for="mbox" class="wf_preField">{tmpl_var name='mbox_txt'}</label> <input type="text" id="mbox" name="mbox" value="{tmpl_var name='mbox'}" size="30" maxlength="255"> e.g. postmaster.mydomain.com. <input type="text" id="mbox" name="mbox" value="{tmpl_var name='mbox'}" size="30" maxlength="255"> e.g. webmaster.domain.tld </span> <span class="wf_oneField"> <label for="refresh" class="wf_preField">{tmpl_var name='refresh_txt'}</label> interface/web/mail/form/spamfilter_config.tform.php
@@ -61,7 +61,7 @@ 'ip_address' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', 'default' => '192.168.0.100', 'default' => '192.168.0.105', 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY', 'errmsg'=> 'ip_address_error_empty'), ), @@ -94,7 +94,7 @@ 'hostname' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', 'default' => 'server1.example.com', 'default' => 'server1.domain.tld', 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY', 'errmsg'=> 'hostname_error_empty'), ), interface/web/themes/default/templates/main.tpl.htm
@@ -2,8 +2,8 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <title>ISPConfig 3</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <title><tmpl_var name="app_title"> <tmpl_var name="app_version"></title> <meta http-equiv="Content-Type" content="text/html; charset=<tmpl_var name="html_content_encoding">"/> <!-- (en) Add your meta data here --> <!-- (de) Fuegen Sie hier ihre Meta-Daten ein --> <link href="themes/default/css/central.css" rel="stylesheet" type="text/css"/> @@ -62,7 +62,7 @@ <!-- end: #main --> <!-- begin: #footer --> <div id="footer"> Powered by <a href="http://www.howtoforge.com/forums/showthread.php?t=26988" target="_blank">ISPConfig <tmpl_var name="ISPC_APP_VERSION"> beta</a></div> Powered by <a href="<tmpl_var name="app_link">" target="_blank"><tmpl_var name="app_title"> <tmpl_var name="app_version"></a></div> </div> <!-- end: #footer --> </div> remoting_client/example.php
@@ -29,7 +29,7 @@ /* //* Add a email domain $params = array( 'server_id' => 1, 'domain' => 'test.com', 'domain' => 'domain.tld', 'active' => 'y'); $client_id = 0; $domain_id = $client->mail_domain_add($session_id, $client_id, $params); @@ -38,7 +38,7 @@ /* //* Update email domain $params = array( 'server_id' => 1, 'domain' => 'test.org', 'domain' => 'domain.tld', 'active' => 'y'); //* ID of the client. 0 = the admin owns this record. $client_id = 0; server/ispconfig.log
File was deleted server/lib/app.inc.php
@@ -87,7 +87,7 @@ if($priority >= $conf["log_priority"]) { //if (is_writable($conf["log_file"])) { if (!$fp = fopen ($conf["log_file"], "a")) { die("Unable to open Logfile."); die("Unable to open logfile."); } switch ($priority) { case 0: server/lib/classes/db_mysql.inc.php
@@ -33,6 +33,7 @@ var $dbName = ""; // logical database name on that server var $dbUser = ""; // database authorized user var $dbPass = ""; // user's password var $dbCharset = ""; // what charset comes and goes to mysql: utf8 / latin1 var $linkId = 0; // last result of mysql_connect() var $queryId = 0; // last result of mysql_query() var $record = array(); // last record fetched @@ -52,6 +53,7 @@ $this->dbName = $conf["db_database"]; $this->dbUser = $conf["db_user"]; $this->dbPass = $conf["db_password"]; $this->dbCharset = $conf["db_charset"]; //$this->connect(); } @@ -78,6 +80,7 @@ $this->updateError('DB::connect()<br />mysql_connect'); return false; } $this->queryId = @mysql_query('SET NAMES '.$this->dbCharset, $this->linkId); } return true; } server/lib/config.inc.php
File was deleted
