Merged revisions 2095-2129 which contain bugfixes from stable branch.

docs/INSTALL_CENTOS_5.2.txt

@@ -162,6 +162,18 @@ tar xvfz vlogger-1.3.tar.gz
 mv vlogger-1.3/vlogger /usr/sbin/
 rm -rf vlogger*
 
+Edit the file /etc/sudoers
+
+vi /etc/sudoers
+
+and change the line:
+
+Defaults    requiretty
+
+to:
+
+# Defaults    requiretty
+
 7) Install ISPConfig 3
 
 Disable the firewall:

docs/INSTALL_CENTOS_5.4_dovecot_bind.txt

@@ -191,6 +191,18 @@ make
 make install
 rm -rf jailkit-2.11*
 
+Edit the file /etc/sudoers
+
+vi /etc/sudoers
+
+and change the line:
+
+Defaults    requiretty
+
+to:
+
+# Defaults    requiretty
+
 
 7) Install ISPConfig 3
 

install/dist/lib/centos53.lib.php

@@ -37,6 +37,7 @@ class installer extends installer_dist {
 		$configfile = 'fedora_amavisd_conf';
 		if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf')) copy($conf["amavis"]["config_dir"].'/amavisd.conf',$conf["amavis"]["config_dir"].'/amavisd.conf~');
 		if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf~')) exec('chmod 400 '.$conf["amavis"]["config_dir"].'/amavisd.conf~');
+		if(!is_dir($conf["amavis"]["config_dir"])) mkdir($conf["amavis"]["config_dir"]);
 		$content = rf("tpl/".$configfile.".master");
 		$content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content);
 		$content = str_replace('{mysql_server_ispconfig_password}',$conf['mysql']['ispconfig_password'], $content);

install/dist/lib/fedora.lib.php

@@ -903,6 +903,9 @@ class installer_dist extends installer_base {
 		exec('chown getmail /usr/local/bin/run-getmail.sh');
 		exec('chmod 744 /usr/local/bin/run-getmail.sh');
 		
+		// Edit the file Edit the file /etc/sudoers and comment out the requiregetty line, otherwise the backup function will fail
+		replaceLine('/etc/sudoers','Defaults    requiretty','#Defaults    requiretty',0,0);
+		
 		
 	}
 	

install/lib/installer_base.lib.php

@@ -1010,7 +1010,7 @@ class installer_base {
 		// copy('tpl/apache_ispconfig.conf.master',$vhost_conf_dir.'/ispconfig.conf');
 
 		$content = rf('tpl/apache_ispconfig.conf.master');
-		$records = $this->db->queryAllRecords("SELECT * FROM server_ip WHERE server_id = ".$conf["server_id"]." AND virtualhost = 'y'");
+		$records = $this->db->queryAllRecords('SELECT * FROM '.$conf['mysql']['master_database'].'.server_ip WHERE server_id = '.$conf['server_id']." AND virtualhost = 'y'");
 		if(is_array($records) && count($records) > 0) {
 			foreach($records as $rec) {
 				$content .= 'NameVirtualHost '.$rec['ip_address'].":80\n";
@@ -1036,6 +1036,10 @@ class installer_base {
 			replaceLine('/etc/webalizer/webalizer.conf','#Incremental','Incremental     yes',0,0);
 			replaceLine('/etc/webalizer/webalizer.conf','#HistoryName','HistoryName     webalizer.hist',0,0);
 		}
+		
+		// Check the awsatst script
+		if(!is_dir('/usr/share/awstats/tools')) exec('mkdir -p /usr/share/awstats/tools');
+		if(!file_exists('/usr/share/awstats/tools/awstats_buildstaticpages.pl') && file_exists('/usr/share/doc/awstats/examples/awstats_buildstaticpages.pl')) symlink('/usr/share/doc/awstats/examples/awstats_buildstaticpages.pl','/usr/share/awstats/tools/awstats_buildstaticpages.pl');
 
 		//* add a sshusers group
 		$command = 'groupadd sshusers';

install/sql/ispconfig3.sql

@@ -1102,7 +1102,6 @@ CREATE TABLE `web_domain` (
   `parent_domain_id` int(11) unsigned NOT NULL default '0',
   `vhost_type` varchar(32) default NULL,
   `document_root` varchar(255) default NULL,
-  `document_root_www` varchar(255) default NULL,
   `system_user` varchar(255) default NULL,
   `system_group` varchar(255) default NULL,
   `hd_quota` bigint(20) NOT NULL default '0',
@@ -1131,9 +1130,9 @@ CREATE TABLE `web_domain` (
   `stats_password` varchar(255) default NULL,
   `stats_type` varchar(255) default 'webalizer',
   `allow_override` varchar(255) NOT NULL default 'All',
-  `apache_directives` text,
-  `php_open_basedir` text,
-  `custom_php_ini` text,
+  `apache_directives` mediumtext,
+  `php_open_basedir` mediumtext,
+  `custom_php_ini` mediumtext,
   `backup_interval` VARCHAR( 255 ) NOT NULL DEFAULT 'none',
   `backup_copies` INT NOT NULL DEFAULT '1',
   `active` enum('n','y') NOT NULL default 'y',
@@ -1354,7 +1353,7 @@ INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`,
 -- Dumping data for table `sys_config`
 --
 
-INSERT INTO sys_config VALUES ('1','db','db_version','3.0.3');
+INSERT INTO sys_config VALUES ('1','db','db_version','3.0.3.1');
 
 -- --------------------------------------------------------
 

install/tpl/apache_ispconfig.conf.master

@@ -41,6 +41,6 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
         Order allow,deny
         Allow from all
 </Directory>
-Alias /awstats-icon "/usr/share/awstats/icon"
 
+Alias /awstats-icon "/usr/share/awstats/icon"
 

install/tpl/config.inc.php.master

@@ -56,7 +56,7 @@ $revision = str_replace(array('Revision:','$',' '), '', $svn_revision);
 
 //** Application
 define('ISPC_APP_TITLE', 'ISPConfig');
-define('ISPC_APP_VERSION', '3.0.3');
+define('ISPC_APP_VERSION', '3.0.3.1');
 
 
 //** Database

install/update.php

@@ -308,7 +308,7 @@ $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('y','n'),'n')) == 'y') {
+if(strtolower($inst->simple_query('Create new ISPConfig SSL certificate',array('yes','no'),'no')) == 'yes') {
 	$inst->make_ispconfig_ssl_cert();
 }
 

interface/lib/classes/tform.inc.php

@@ -362,7 +362,8 @@ class tform {
                                         // If Datasource is set, get the data from there
                                         if(isset($field['datasource']) && is_array($field['datasource'])) {
 												if(is_array($field["value"])) {
-													$field["value"] = array_merge($field["value"],$this->getDatasourceData($field, $record));
+													//$field["value"] = array_merge($field["value"],$this->getDatasourceData($field, $record));
+													$field["value"] = $field["value"]+$this->getDatasourceData($field, $record);
 												} else {
                                                 	$field["value"] = $this->getDatasourceData($field, $record);
 												}

interface/lib/lang/id.lng

+<?php
+$wb['conf_format_dateshort'] = 'd-m-Y';
+$wb['conf_format_datelong'] = 'l dS of F Y';
+$wb['conf_format_timeshort'] = 'H:i';
+$wb['conf_format_timelong'] = 'H:i:s';
+$wb['conf_format_datetime'] = 'd-m-Y H:i';
+$wb['301'] = 'Modul tidak diperbolehkan diakses oleh pengguna saat ini.';
+$wb['302'] = 'Modul tidak valid.';
+$wb['1001'] = 'Nama pengguna dan kata sandi tidak boleh kosong !';
+$wb['1002'] = 'Nama pengguna dan/atau sandi salah !';
+$wb['1003'] = 'Pengguna tersebut telah dinonaktifkan!';
+$wb['delete_confirmation'] = 'Apakah Anda benar-benar ingin menghapus record ini?';
+$wb['error_no_view_permission'] = 'Anda tidak memiliki hak untuk melihat record ini atau record ini tidak ada!';
+$wb['error_no_delete_permission'] = 'Anda tidak memiliki hak untuk menghapus record ini!';
+$wb['page_txt'] = 'Halaman';
+$wb['page_of_txt'] = 'dari';
+$wb['page_and_txt'] = 'dan';
+$wb['page_next_txt'] = 'Lanjut';
+$wb['page_back_txt'] = 'Kembali';
+$wb['delete_txt'] = 'Hapus';
+$wb['filter_txt'] = 'Filter';
+$wb['add_new_record_txt'] = 'Tambah record baru';
+$wb['btn_save_txt'] = 'Simpan';
+$wb['btn_cancel_txt'] = 'Kembali';
+$wb['top_menu_system'] = 'Sistem';
+$wb['top_menu_client'] = 'Klien';
+$wb['top_menu_email'] = 'Email';
+$wb['top_menu_monitor'] = 'Monitor';
+$wb['top_menu_sites'] = 'Situs';
+$wb['top_menu_dns'] = 'DNS';
+$wb['top_menu_tools'] = 'Perkakas';
+$wb['top_menu_help'] = 'Bantuan';
+$wb['toolsarea_head_txt'] = 'Perkakas';
+$wb['top_menu_billing'] = 'Billing';
+$wb['top_menu_domain'] = 'Domain';
+$wb['top_menu_dashboard'] = 'Beranda';
+$wb['latest_news_txt'] = 'Berita terbaru';
+?>
+

interface/lib/lang/nl.lng

@@ -39,3 +39,4 @@ $wb['latest_news_txt'] = 'Laatste nieuws';
 
 
 
+

interface/web/admin/lib/lang/id.lng

+<?php
+$wb['1001'] = 'Nama pengguna atau sandi kosong.';
+$wb['1002'] = 'Nama pengguna atau sandi salah.';
+$wb['Firewall'] = 'Firewall';
+$wb['Groups'] = 'Grup';
+$wb['groups_description'] = 'Form untuk menyunting grup pengguna sistem.';
+$wb['Server'] = 'Server';
+$wb['Services'] = 'Layanan';
+$wb['Config'] = 'Konfigurasi';
+$wb['Server Config'] = 'Konfigurasi Server';
+$wb['Mail'] = 'Mail';
+$wb['Getmail'] = 'Ambil Mail';
+$wb['Web'] = 'Web';
+$wb['FastCGI'] = 'FastCGI';
+$wb['Jailkit'] = 'Jailkit';
+$wb['System'] = 'Sistem';
+$wb['Add user'] = 'Tambah Pengguna';
+$wb['Edit user'] = 'Sunting Pengguna';
+$wb['CP Users'] = 'Pengguna CP';
+$wb['Add group'] = 'Tambah Grup';
+$wb['Edit group'] = 'Sunting Grup';
+$wb['Edit server'] = 'Sunting Server';
+$wb['Edit Server IP'] = 'Alamat IP Server';
+$wb['Servers'] = 'Server';
+$wb['Sync. Now'] = 'Sinkronisasi Sekarang';
+$wb['DB Sync.'] = 'Sinkronisasi DB.';
+$wb['Languages'] = 'Bahasa';
+$wb['New Language'] = 'Bahasa Baru';
+$wb['Export'] = 'Ekspor';
+$wb['Import'] = 'Impor';
+$wb['Language Editor'] = 'Penyunting Bahasa';
+$wb['Software'] = 'Perangkat Lunak';
+$wb['Repositories'] = 'Repositori';
+$wb['Server Services'] = 'Layanan Server';
+$wb['Interface Config'] = 'Konfigurasi Antarmuka';
+$wb['Packages'] = 'Paket';
+$wb['Updates'] = 'Pemutakhiran';
+$wb['Merge'] = 'Gabung';
+$wb['Remote Users'] = 'Pengguna Remote';
+$wb['Remote Actions'] = 'Tindakan Remote';
+$wb['Do OS-Update'] = 'Lakukan Pemutakhiran OS';
+$wb['Do ISPConfig-Update'] = 'Lakukan Pemutakhiran ISPConfig';
+?>
+

interface/web/admin/lib/lang/id_firewall.lng

+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['tcp_port_txt'] = 'Port TCP yang dibuka';
+$wb['udp_port_txt'] = 'Port UDP yang dibuka';
+$wb['tcp_port_help_txt'] = 'Dipisahkan oleh koma';
+$wb['udp_port_help_txt'] = 'Dipisahkan oleh koma';
+$wb['active_txt'] = 'Aktif';
+$wb['firewall_error_unique'] = 'Telah ada record firewall untuk server ini.';
+$wb['tcp_ports_error_regex'] = 'Karakter di definisi port tcp tidak diperbolehkan. Karakter yang diizinkan adalah angka, : dan ,.';
+$wb['udp_ports_error_regex'] = 'Karakter di definisi port udp tidak diperbolehkan. Karakter yang diizinkan adalah angka, : dan ,.';
+?>
+

interface/web/admin/lib/lang/id_firewall_list.lng

+<?php
+$wb['list_head_txt'] = 'Firewall';
+$wb['active_txt'] = 'Aktif';
+$wb['server_id_txt'] = 'Server';
+$wb['tcp_port_txt'] = 'Port TCP yang dibuka';
+$wb['udp_port_txt'] = 'Port UDP yang dibuka';
+$wb['add_new_record_txt'] = 'Tambah record Firewall';
+?>
+

interface/web/admin/lib/lang/id_groups.lng

+<?php
+$wb['description_txt'] = 'Keterangan';
+$wb['name_txt'] = 'Grup';
+$wb['name_err'] = 'Grup harus terdiri dari min 1, maks 30 Karakter.';
+?>
+

interface/web/admin/lib/lang/id_groups_list.lng

+<?php
+$wb['list_head_txt'] = 'Grup';
+$wb['description_txt'] = 'Keterangan';
+$wb['name_txt'] = 'Grup';
+$wb['add_new_record_txt'] = 'Tambah Grup Baru';
+$wb['warning_txt'] = '<b>PERINGATAN:</b> Jangan menyunting atau memodifikasi pengaturan pengguna apapun di sini. Gunakan Pengaturan Klien dan Reseller di modul Klien. Memodifikasi atau mengubah Pengguna atau Grup di sini dapat mengakibatkan kehilangan data!';
+?>
+

interface/web/admin/lib/lang/id_language_add.lng

+<?php
+$wb['list_head_txt'] = 'Tambah Bahasa Baru';
+$wb['language_select_txt'] = 'Pilih basis bahasa';
+$wb['language_new_txt'] = 'Bahasa baru';
+$wb['language_new_hint_txt'] = '2 karakter kode bahasa ISO 639-1 (Lihat http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)';
+$wb['btn_save_txt'] = 'Buat kumpulan berkas bahasa baru';
+$wb['btn_cancel_txt'] = 'Kembali';
+?>
+

interface/web/admin/lib/lang/id_language_complete.lng

+<?php
+$wb['list_head_txt'] = 'Penggabungan Bahasa';
+$wb['list_desc_txt'] = 'Gabungkan berkas bahasa yang dipilih dengan berkas master bahasa Inggris. <br />Ini akan menambahkan string yang tidak ada dari berkas master bahasa Inggris ke bahasa yang dipilih.';
+$wb['language_select_txt'] = 'Pilih bahasa';
+$wb['btn_save_txt'] = 'Gabungkan Berkas Sekarang';
+$wb['btn_cancel_txt'] = 'Kembali';
+?>
+

interface/web/admin/lib/lang/id_language_edit.lng

+<?php
+$wb['list_head_txt'] = 'Penyunting Berkas Bahasa';
+$wb['language_select_txt'] = 'Pemilihan bahasa';
+$wb['module_txt'] = 'Modul';
+$wb['lang_file_txt'] = 'Berkas bahasa';
+$wb['btn_save_txt'] = 'Simpan';
+$wb['btn_cancel_txt'] = 'Kembali';
+?>
+