Skip to content

Commit 379a4b6

Browse files
tbrehmtbrehm
committed
Added configuration fields for awstats support in the ispconfig interface.
1 parent 7d6ec3d commit 379a4b6

File tree

14 files changed

+286
-2
lines changed

14 files changed

+286
-2
lines changed

‎install/sql/ispconfig3.sql‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
/*
3-
Copyright (c) 2007-2009, Till Brehm, projektfarm Gmbh
3+
Copyright (c) 2007-2010, Till Brehm, projektfarm Gmbh
44
All rights reserved.
55
66
Redistribution and use in source and binary forms, with or without modification,
@@ -1079,6 +1079,7 @@ CREATE TABLE `web_domain` (
10791079
`ssl_bundle` mediumtext NULL,
10801080
`ssl_action` varchar(16) NULL,
10811081
`stats_password` varchar(255) default NULL,
1082+
`stats_type` varchar(255) default 'webalizer',
10821083
`allow_override` varchar(255) NOT NULL default 'All',
10831084
`apache_directives` text,
10841085
`php_open_basedir` text,

‎install/tpl/server.ini.master‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ apps_vhost_ip=_default_
4646
apps_vhost_servername=
4747
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
4848
htaccess_allow_override=All
49+
awstats_conf_dir=/etc/awstats
50+
awstats_data_dir=/var/lib/awstats
51+
awstats_pl=/usr/lib/cgi-bin/awstats.pl
52+
awstats_updateall_pl=/usr/share/doc/awstats/examples/awstats_updateall.pl
4953

5054
[dns]
5155
bind_user=root

‎interface/web/admin/form/server_config.tform.php‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -439,6 +439,38 @@
439439
'width' => '40',
440440
'maxlength' => '255'
441441
),
442+
'awstats_conf_dir' => array (
443+
'datatype' => 'VARCHAR',
444+
'formtype' => 'TEXT',
445+
'default' => '',
446+
'value' => '',
447+
'width' => '40',
448+
'maxlength' => '255'
449+
),
450+
'awstats_data_dir' => array (
451+
'datatype' => 'VARCHAR',
452+
'formtype' => 'TEXT',
453+
'default' => '',
454+
'value' => '',
455+
'width' => '40',
456+
'maxlength' => '255'
457+
),
458+
'awstats_pl' => array (
459+
'datatype' => 'VARCHAR',
460+
'formtype' => 'TEXT',
461+
'default' => '',
462+
'value' => '',
463+
'width' => '40',
464+
'maxlength' => '255'
465+
),
466+
'awstats_updateall_pl' => array (
467+
'datatype' => 'VARCHAR',
468+
'formtype' => 'TEXT',
469+
'default' => '',
470+
'value' => '',
471+
'width' => '40',
472+
'maxlength' => '255'
473+
),
442474
##################################
443475
# ENDE Datatable fields
444476
##################################

‎interface/web/admin/lib/lang/en_server_config.lng‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,8 @@ $wb["php_open_basedir_txt"] = 'PHP open_basedir';
6565
$wb["php_open_basedir_error_empty"] = 'PHP open_basedir is empty.';
6666
$wb["htaccess_allow_override_txt"] = '.htaccess AllowOverride';
6767
$wb["htaccess_allow_override_error_empty"] = '.htaccess AllowOverride is empty.';
68+
$wb["awstats_conf_dir_txt"] = 'awstats conf folder';
69+
$wb["awstats_data_dir_txt"] = 'awstats data folder';
70+
$wb["awstats_pl_txt"] = 'awstats.pl script';
71+
$wb["awstats_updateall_pl_txt"] = 'awstats_updateall script';
6872
?>

‎interface/web/admin/templates/server_config_web_edit.htm‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,22 @@ <h2><tmpl_var name="list_head_txt"></h2>
6161
<label for="apps_vhost_servername">{tmpl_var name='apps_vhost_servername_txt'}</label>
6262
<input name="apps_vhost_servername" id="apps_vhost_servername" value="{tmpl_var name='apps_vhost_servername'}" size="40" maxlength="255" type="text" class="textInput" />
6363
</div>
64+
<div class="ctrlHolder">
65+
<label for="awstats_conf_dir">{tmpl_var name='awstats_conf_dir_txt'}</label>
66+
<input name="awstats_conf_dir" id="awstats_conf_dir" value="{tmpl_var name='awstats_conf_dir'}" size="40" maxlength="255" type="text" class="textInput" />
67+
</div>
68+
<div class="ctrlHolder">
69+
<label for="awstats_data_dir">{tmpl_var name='awstats_data_dir_txt'}</label>
70+
<input name="awstats_data_dir" id="awstats_data_dir" value="{tmpl_var name='awstats_data_dir'}" size="40" maxlength="255" type="text" class="textInput" />
71+
</div>
72+
<div class="ctrlHolder">
73+
<label for="awstats_pl">{tmpl_var name='awstats_pl_txt'}</label>
74+
<input name="awstats_pl" id="awstats_pl" value="{tmpl_var name='awstats_pl'}" size="40" maxlength="255" type="text" class="textInput" />
75+
</div>
76+
<div class="ctrlHolder">
77+
<label for="awstats_updateall_pl">{tmpl_var name='awstats_updateall_pl_txt'}</label>
78+
<input name="awstats_updateall_pl" id="awstats_updateall_pl" value="{tmpl_var name='awstats_updateall_pl'}" size="40" maxlength="255" type="text" class="textInput" />
79+
</div>
6480
</fieldset>
6581

6682
<input type="hidden" name="id" value="{tmpl_var name='id'}">

‎interface/web/mail/lib/lang/en_mail_domain_admin_list.lng‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?php
2+
$wb["list_head_txt"] = 'Email Domain';
3+
$wb["server_id_txt"] = 'Server';
4+
$wb["domain_txt"] = 'Domain';
5+
$wb["add_new_record_txt"] = 'Add new Domain';
6+
$wb["active_txt"] = 'Active';
7+
$wb["sys_groupid_txt"] = 'Client';
8+
?>

‎interface/web/mail/templates/mail_domain_admin_list.htm‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
<h2><tmpl_var name="list_head_txt"></h2>
2+
3+
<div class="panel panel_list_mail_domain_admin">
4+
5+
<div class="pnl_toolsarea">
6+
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
7+
<div class="buttons">
8+
<button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_domain_edit.php');">
9+
<span>{tmpl_var name="add_new_record_txt"}</span>
10+
</button>
11+
</div>
12+
</fieldset>
13+
</div>
14+
15+
<div class="pnl_listarea">
16+
<fieldset><legend><tmpl_var name="list_head_txt"></legend>
17+
<table class="list">
18+
<thead>
19+
<tr>
20+
<th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
21+
<th class="tbl_col_sys_groupid" scope="col"><tmpl_var name="sys_groupid_txt"></th>
22+
<th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
23+
<th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
24+
<th class="tbl_col_buttons" scope="col">&nbsp;</th>
25+
</tr>
26+
<tr>
27+
<td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','mail/mail_domain_list.php');">{tmpl_var name='search_active'}</select></td>
28+
<td class="tbl_col_sys_groupid"><select name="search_sys_groupid" onChange="submitForm('pageForm','mail/mail_domain_list.php');">{tmpl_var name='search_sys_groupid'}</select></td>
29+
<td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','mail/mail_domain_list.php');">{tmpl_var name='search_server_id'}</select></td>
30+
<td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
31+
<td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
32+
</tr>
33+
</thead>
34+
<tbody>
35+
<tmpl_loop name="records">
36+
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
37+
<td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
38+
<td class="tbl_col_sys_groupid"><a href="#" onClick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="sys_groupid"}</a></td>
39+
<td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
40+
<td class="tbl_col_domain"><a href="#" onClick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
41+
<td class="tbl_col_buttons">
42+
<div class="buttons icons16">
43+
<a class="icons16 icoDelete" href="javascript: del_record('mail/mail_domain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
44+
</div>
45+
</td>
46+
</tr>
47+
</tmpl_loop>
48+
</tbody>
49+
<tfoot>
50+
<tr>
51+
<td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
52+
</tr>
53+
</tfoot>
54+
</table>
55+
</fieldset>
56+
</div>
57+
58+
</div>

‎interface/web/sites/form/web_domain.tform.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -377,6 +377,12 @@
377377
'width' => '30',
378378
'maxlength' => '255'
379379
),
380+
'stats_type' => array (
381+
'datatype' => 'VARCHAR',
382+
'formtype' => 'SELECT',
383+
'default' => 'y',
384+
'value' => array('webalizer' => 'Webalizer', 'awstats' => 'AWStats')
385+
),
380386
##################################
381387
# ENDE Datatable fields
382388
##################################

‎interface/web/sites/lib/lang/en_database_admin_list.lng‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?php
2+
$wb["list_head_txt"] = 'Database';
3+
$wb["active_txt"] = 'Active';
4+
$wb["remote_access_txt"] = 'Remote Access';
5+
$wb["server_id_txt"] = 'Server';
6+
$wb["database_user_txt"] = 'Database user';
7+
$wb["database_name_txt"] = 'Database name';
8+
$wb["add_new_record_txt"] = 'Add new Database';
9+
$wb["sys_groupid_txt"] = 'Client';
10+
?>

‎interface/web/sites/lib/lang/en_web_domain.lng‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,6 @@ $wb["redirect_error_regex"] = 'Invalid redirect path. Valid redirects are for ex
5959
$wb["php_open_basedir_txt"] = 'PHP open_basedir';
6060
$wb["traffic_quota_exceeded_txt"] = 'Traffic quota exceeded';
6161
$wb["ruby_txt"] = 'Ruby';
62+
$wb["stats_user_txt"] = 'Webstatistics username';
63+
$wb["stats_type_txt"] = 'Webstatistics program';
6264
?>

0 commit comments

Comments
 (0)