diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql index beab7409e91f1f6b604d9a715ad5f8ce9afc53f5..227b014cd6a850ae0ebc4b6bf2eb0408ec0f780c 100644 --- a/install/sql/ispconfig3.sql +++ b/install/sql/ispconfig3.sql @@ -1,6 +1,6 @@ /* -Copyright (c) 2007-2009, Till Brehm, projektfarm Gmbh +Copyright (c) 2007-2010, Till Brehm, projektfarm Gmbh All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -1079,6 +1079,7 @@ CREATE TABLE `web_domain` ( `ssl_bundle` mediumtext NULL, `ssl_action` varchar(16) NULL, `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, diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master index b52280bb632e9e07ac8bbce86d96efc7f7a1dcf1..747b9c69421f5d544c720c854d352518ccf4e4e2 100644 --- a/install/tpl/server.ini.master +++ b/install/tpl/server.ini.master @@ -46,6 +46,10 @@ apps_vhost_ip=_default_ apps_vhost_servername= php_open_basedir=[website_path]/web:[website_path]/tmp:/var/www/[website_domain]/web:/srv/www/[website_domain]/web:/usr/share/php5:/tmp:/usr/share/phpmyadmin:/etc/phpmyadmin:/var/lib/phpmyadmin htaccess_allow_override=All +awstats_conf_dir=/etc/awstats +awstats_data_dir=/var/lib/awstats +awstats_pl=/usr/lib/cgi-bin/awstats.pl +awstats_updateall_pl=/usr/share/doc/awstats/examples/awstats_updateall.pl [dns] bind_user=root diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php index 631df038892fe1cdefb5c549e268aecf92076484..15415aa5105c926e1786ec64357b937fd1048f47 100644 --- a/interface/web/admin/form/server_config.tform.php +++ b/interface/web/admin/form/server_config.tform.php @@ -439,6 +439,38 @@ $form["tabs"]['web'] = array ( 'width' => '40', 'maxlength' => '255' ), + 'awstats_conf_dir' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'TEXT', + 'default' => '', + 'value' => '', + 'width' => '40', + 'maxlength' => '255' + ), + 'awstats_data_dir' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'TEXT', + 'default' => '', + 'value' => '', + 'width' => '40', + 'maxlength' => '255' + ), + 'awstats_pl' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'TEXT', + 'default' => '', + 'value' => '', + 'width' => '40', + 'maxlength' => '255' + ), + 'awstats_updateall_pl' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'TEXT', + 'default' => '', + 'value' => '', + 'width' => '40', + 'maxlength' => '255' + ), ################################## # ENDE Datatable fields ################################## diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng index 603245d7d40016568ef67ad33a98b3ede60d4979..0a122e3caa96e20b0caa991f93a53dc4027f78b8 100644 --- a/interface/web/admin/lib/lang/en_server_config.lng +++ b/interface/web/admin/lib/lang/en_server_config.lng @@ -65,4 +65,8 @@ $wb["php_open_basedir_txt"] = 'PHP open_basedir'; $wb["php_open_basedir_error_empty"] = 'PHP open_basedir is empty.'; $wb["htaccess_allow_override_txt"] = '.htaccess AllowOverride'; $wb["htaccess_allow_override_error_empty"] = '.htaccess AllowOverride is empty.'; +$wb["awstats_conf_dir_txt"] = 'awstats conf folder'; +$wb["awstats_data_dir_txt"] = 'awstats data folder'; +$wb["awstats_pl_txt"] = 'awstats.pl script'; +$wb["awstats_updateall_pl_txt"] = 'awstats_updateall script'; ?> \ No newline at end of file diff --git a/interface/web/admin/templates/server_config_web_edit.htm b/interface/web/admin/templates/server_config_web_edit.htm index cfe9c7e046b3471b598545b17d24cd4f7ecd07cf..83d3bbb2a401bc3fe533fac0ddb4f6800314d5c4 100644 --- a/interface/web/admin/templates/server_config_web_edit.htm +++ b/interface/web/admin/templates/server_config_web_edit.htm @@ -61,6 +61,22 @@ +
+ + +
+
+ + +
+
+ + +
+
+ + +
diff --git a/interface/web/mail/lib/lang/en_mail_domain_admin_list.lng b/interface/web/mail/lib/lang/en_mail_domain_admin_list.lng new file mode 100644 index 0000000000000000000000000000000000000000..03350cf80081de15e2d73ef51e8b20002c8ff658 --- /dev/null +++ b/interface/web/mail/lib/lang/en_mail_domain_admin_list.lng @@ -0,0 +1,8 @@ + \ No newline at end of file diff --git a/interface/web/mail/templates/mail_domain_admin_list.htm b/interface/web/mail/templates/mail_domain_admin_list.htm new file mode 100644 index 0000000000000000000000000000000000000000..b0e14e5f7f5cba38f5902ae65a519b63703bbc5b --- /dev/null +++ b/interface/web/mail/templates/mail_domain_admin_list.htm @@ -0,0 +1,58 @@ +

+ +
+ +
+
{tmpl_var name="toolsarea_head_txt"} +
+ +
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 
{tmpl_var name="active"}{tmpl_var name="sys_groupid"}{tmpl_var name="server_id"}{tmpl_var name="domain"} +
+ {tmpl_var name='delete_txt'} +
+
+
+
+ +
diff --git a/interface/web/sites/form/web_domain.tform.php b/interface/web/sites/form/web_domain.tform.php index 9d7a1c15fd9841276a40b284ecfa46826af8fc42..2c3d80e2b8a1ef905091748822be9ed4788c08ca 100644 --- a/interface/web/sites/form/web_domain.tform.php +++ b/interface/web/sites/form/web_domain.tform.php @@ -377,6 +377,12 @@ $form["tabs"]['stats'] = array ( 'width' => '30', 'maxlength' => '255' ), + 'stats_type' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'SELECT', + 'default' => 'y', + 'value' => array('webalizer' => 'Webalizer', 'awstats' => 'AWStats') + ), ################################## # ENDE Datatable fields ################################## diff --git a/interface/web/sites/lib/lang/en_database_admin_list.lng b/interface/web/sites/lib/lang/en_database_admin_list.lng new file mode 100644 index 0000000000000000000000000000000000000000..d076d60cf5306030ee93559fea7fb40571f7f9db --- /dev/null +++ b/interface/web/sites/lib/lang/en_database_admin_list.lng @@ -0,0 +1,10 @@ + \ No newline at end of file diff --git a/interface/web/sites/lib/lang/en_web_domain.lng b/interface/web/sites/lib/lang/en_web_domain.lng index 84ae4d064d1e580782f9b2e7cae7185e1507812f..bdf46fa5ac0a61a830e3f2572e5fa82aba6e9fba 100644 --- a/interface/web/sites/lib/lang/en_web_domain.lng +++ b/interface/web/sites/lib/lang/en_web_domain.lng @@ -59,4 +59,6 @@ $wb["redirect_error_regex"] = 'Invalid redirect path. Valid redirects are for ex $wb["php_open_basedir_txt"] = 'PHP open_basedir'; $wb["traffic_quota_exceeded_txt"] = 'Traffic quota exceeded'; $wb["ruby_txt"] = 'Ruby'; +$wb["stats_user_txt"] = 'Webstatistics username'; +$wb["stats_type_txt"] = 'Webstatistics program'; ?> diff --git a/interface/web/sites/lib/lang/en_web_domain_admin_list.lng b/interface/web/sites/lib/lang/en_web_domain_admin_list.lng new file mode 100644 index 0000000000000000000000000000000000000000..f8b37f4f840af0c9fabf80af33ef69ca02999eab --- /dev/null +++ b/interface/web/sites/lib/lang/en_web_domain_admin_list.lng @@ -0,0 +1,9 @@ + \ No newline at end of file diff --git a/interface/web/sites/templates/database_admin_list.htm b/interface/web/sites/templates/database_admin_list.htm new file mode 100644 index 0000000000000000000000000000000000000000..bcd6b417d79d2613f46fbd46ab7df39e42e6fad4 --- /dev/null +++ b/interface/web/sites/templates/database_admin_list.htm @@ -0,0 +1,64 @@ +

+ +
+ +
+
{tmpl_var name="toolsarea_head_txt"} +
+ +
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 
{tmpl_var name="active"}{tmpl_var name="remote_access"}{tmpl_var name="sys_groupid"}{tmpl_var name="server_id"}{tmpl_var name="database_user"}{tmpl_var name="database_name"} +
+ {tmpl_var name='delete_txt'} +
+
+
+
+ +
diff --git a/interface/web/sites/templates/web_domain_admin_list.htm b/interface/web/sites/templates/web_domain_admin_list.htm new file mode 100644 index 0000000000000000000000000000000000000000..7290f1f8e46c2b08f4a3eb061467e2589562d1b9 --- /dev/null +++ b/interface/web/sites/templates/web_domain_admin_list.htm @@ -0,0 +1,61 @@ +

+ +
+ +
+
{tmpl_var name="toolsarea_head_txt"} +
+ +
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 
{tmpl_var name="domain_id"}{tmpl_var name="active"}{tmpl_var name="sys_groupid"}{tmpl_var name="server_id"}{tmpl_var name="domain"} +
+ {tmpl_var name='delete_txt'} +
+
+
+
+ +
diff --git a/interface/web/sites/templates/web_domain_stats.htm b/interface/web/sites/templates/web_domain_stats.htm index 1c216574d33cfc15ddda4e0c08d8c3b1e72be349..48258e2bf6da5349c19828b6c1c0cb193e6f13ee 100644 --- a/interface/web/sites/templates/web_domain_stats.htm +++ b/interface/web/sites/templates/web_domain_stats.htm @@ -6,9 +6,18 @@
- +

{tmpl_var name='stats_user_txt'}:     admin

+
+
+
+
+ + +