Skip to content

Commit a892b8c

Browse files
author
vogelor
committed
ISPConfig can now handle webdav - user (only at the interface, server to come ;-)
1 parent e4efe7a commit a892b8c

33 files changed

+1152
-315
lines changed

‎install/sql/ispconfig3.sql‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ CREATE TABLE `client` (
8989
`limit_ftp_user` int(11) NOT NULL default '-1',
9090
`limit_shell_user` int(11) NOT NULL default '0',
9191
`ssh_chroot` varchar(255) NOT NULL DEFAULT 'no,jailkit,ssh-chroot',
92+
`limit_webdav_user` int(11) NOT NULL default '0',
9293
`default_dnsserver` int(11) unsigned NOT NULL default '1',
9394
`limit_dns_zone` int(11) NOT NULL default '-1',
9495
`limit_dns_record` int(11) NOT NULL default '-1',
@@ -145,6 +146,7 @@ CREATE TABLE `client_template` (
145146
`limit_web_aliasdomain` int(11) NOT NULL default '-1',
146147
`limit_ftp_user` int(11) NOT NULL default '-1',
147148
`limit_shell_user` int(11) NOT NULL default '0',
149+
`limit_webdav_user` int(11) NOT NULL default '0',
148150
`limit_dns_zone` int(11) NOT NULL default '-1',
149151
`limit_dns_record` int(11) NOT NULL default '-1',
150152
`limit_database` int(11) NOT NULL default '-1',
@@ -1124,6 +1126,29 @@ CREATE TABLE `web_traffic` (
11241126
) ENGINE=MyISAM;
11251127

11261128

1129+
-- --------------------------------------------------------
1130+
1131+
--
1132+
-- Table structure for table `webdav_user`
1133+
--
1134+
1135+
CREATE TABLE `webdav_user` (
1136+
`webdav_user_id` int(11) unsigned NOT NULL auto_increment,
1137+
`sys_userid` int(11) unsigned NOT NULL default '0',
1138+
`sys_groupid` int(11) unsigned NOT NULL default '0',
1139+
`sys_perm_user` varchar(5) default NULL,
1140+
`sys_perm_group` varchar(5) default NULL,
1141+
`sys_perm_other` varchar(5) default NULL,
1142+
`server_id` int(11) unsigned NOT NULL default '0',
1143+
`parent_domain_id` int(11) unsigned NOT NULL default '0',
1144+
`username` varchar(64) default NULL,
1145+
`password` varchar(64) default NULL,
1146+
`active` enum('n','y') NOT NULL default 'y',
1147+
`dir` varchar(255) default NULL,
1148+
PRIMARY KEY (`webdav_user_id`)
1149+
) ENGINE=MyISAM
1150+
1151+
11271152
-- --------------------------------------------------------
11281153

11291154
--

‎install/tpl/config.inc.php.master‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?php
2-
32
/*
4-
Copyright (c) 2007 - 2009, Till Brehm, projektfarm Gmbh
3+
Copyright (c) 2007 - 2010, Till Brehm, projektfarm Gmbh
54
All rights reserved.
65

76
Redistribution and use in source and binary forms, with or without modification,
@@ -151,4 +150,10 @@ define("LOGLEVEL_DEBUG",0);
151150
define("LOGLEVEL_WARN",1);
152151
define("LOGLEVEL_ERROR",2);
153152

153+
//** include a local config-file if there is one
154+
//** IMPORTANT!!!
155+
//** DO NOT MAKE A COPY OF THIS FILE AS LOCAL CONFIG-FILE
156+
//** USE A EMPTY FILE AND ONLY COPY THE SETTINGS IN IT, YOU NEED TO OVERRIDE
157+
if (is_file('config.inc.local.php')) include_once 'config.inc.local.php';
158+
154159
?>

‎install/tpl/system.ini.master‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ dbname_prefix=c[CLIENTID]
1717
dbuser_prefix=c[CLIENTID]
1818
ftpuser_prefix=[CLIENTNAME]
1919
shelluser_prefix=[CLIENTNAME]
20+
webdavuser_prefix=[CLIENTNAME]
2021
dblist_phpmyadmin_link=y
2122
phpmyadmin_url=
2223

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,18 @@
106106
'width' => '30',
107107
'maxlength' => '255'
108108
),
109+
'webdavuser_prefix' => array (
110+
'datatype' => 'VARCHAR',
111+
'formtype' => 'TEXT',
112+
'validators' => array ( 0 => array ( 'type' => 'REGEX',
113+
'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',
114+
'errmsg'=> 'webdavuser_prefix_error_regex'),
115+
),
116+
'default' => '',
117+
'value' => '',
118+
'width' => '30',
119+
'maxlength' => '255'
120+
),
109121
'dblist_phpmyadmin_link' => array (
110122
'datatype' => 'VARCHAR',
111123
'formtype' => 'CHECKBOX',

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@ $wb['warning'] = 'Bearbeiten Sie diese Werte sorgfältig! Entfernen Sie die Pref
33
$wb['dbname_prefix_txt'] = 'Datenbanknamen Prefix';
44
$wb['dbuser_prefix_txt'] = 'Datenbankbenutzer Prefix';
55
$wb['shelluser_prefix_txt'] = 'Shellbenutzer Prefix';
6+
$wb['webdavuser_prefix_txt'] = 'Webdavbenutzer Prefix';
67
$wb['ftpuser_prefix_txt'] = 'FTP Benutzer Prefix';
78
$wb['dbname_prefix_error_regex'] = 'Zeichen nicht erlaubt in Datenbanknamen Prefix.';
89
$wb['dbuser_prefix_error_regex'] = 'Zeichen nicht erlaubt in Datenbankbenutzer Prefix.';
910
$wb['ftpuser_prefix_error_regex'] = 'Zeichen nicht erlaubt in FTP Benutzer Prefix.';
1011
$wb['shelluser_prefix_error_regex'] = 'Zeichen nicht erlaubt in Shellbenutzer Prefix.';
12+
$wb['webdavuser_prefix_error_regex'] = 'Zeichen nicht erlaubt in Webdavbenutzer Prefix.';
1113
$wb['dblist_phpmyadmin_link_txt'] = 'Link zu phpMyAdmin in der Datenbankliste';
1214
$wb['mailboxlist_webmail_link_txt'] = 'Link zu Webmail in der Mailboxliste';
1315
$wb['webmail_url_txt'] = 'Webmail URL';

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@ $wb['warning'] = 'Edit these values carefully! Do not remove the prefixes on a s
44
$wb['dbname_prefix_txt'] = 'Database name prefix';
55
$wb['dbuser_prefix_txt'] = 'Database user prefix';
66
$wb['shelluser_prefix_txt'] = 'Shell user prefix';
7+
$wb['webdavuser_prefix_txt'] = 'Webdav user prefix';
78
$wb['ftpuser_prefix_txt'] = 'FTP user prefix';
89
$wb['dbname_prefix_error_regex'] = 'Char not allowed in database name prefix.';
910
$wb['dbuser_prefix_error_regex'] = 'Char not allowed in database user prefix.';
1011
$wb['ftpuser_prefix_error_regex'] = 'Char not allowed in ftp user prefix.';
1112
$wb['shelluser_prefix_error_regex'] = 'Char not allowed in shell user prefix.';
13+
$wb['webdavuser_prefix_error_regex'] = 'Char not allowed in webdav user prefix.';
1214
$wb['dblist_phpmyadmin_link_txt'] = 'Link to phpmyadmin in DB list';
1315
$wb['mailboxlist_webmail_link_txt'] = 'Link to webmail in Mailbox list';
1416
$wb['webmail_url_txt'] = 'Webmail URL';

‎interface/web/admin/system_config_edit.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/*
3-
Copyright (c) 2008, Till Brehm, projektfarm Gmbh
3+
Copyright (c) 2008-2010, Till Brehm, projektfarm Gmbh
44
All rights reserved.
55
66
Redistribution and use in source and binary forms, with or without modification,

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ <h2><tmpl_var name="list_head_txt"></h2>
2121
<label for="shelluser_prefix">{tmpl_var name='shelluser_prefix_txt'}</label>
2222
<input name="shelluser_prefix" id="shelluser_prefix" value="{tmpl_var name='shelluser_prefix'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
2323
</div>
24+
<div class="ctrlHolder">
25+
<label for="webdavuser_prefix">{tmpl_var name='webdavuser_prefix_txt'}</label>
26+
<input name="webdavuser_prefix" id="webdavuser_prefix" value="{tmpl_var name='webdavuser_prefix'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
27+
</div>
2428
<div class="ctrlHolder">
2529
<p class="label">{tmpl_var name='dblist_phpmyadmin_link_txt'}</p>
2630
<div class="multiField">

‎interface/web/client/client_template_del.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/*
3-
Copyright (c) 2007-2008, Till Brehm, projektfarm Gmbh and Oliver Vogel www.muv.com
3+
Copyright (c) 2007-2010, Till Brehm, projektfarm Gmbh and Oliver Vogel www.muv.com
44
All rights reserved.
55
66
Redistribution and use in source and binary forms, with or without modification,

‎interface/web/client/client_template_edit.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/*
3-
Copyright (c) 2007-2008, Till Brehm, projektfarm Gmbh and Oliver Vogel www.muv.com
3+
Copyright (c) 2007-2010, Till Brehm, projektfarm Gmbh and Oliver Vogel www.muv.com
44
All rights reserved.
55
66
Redistribution and use in source and binary forms, with or without modification,

0 commit comments

Comments
 (0)