diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql index 459e0f36d52ae7b5a8070ee23b8bb9a86f489542..da1919eb76b60832a5319f6367e2bf548ca9da22 100644 --- a/install/sql/ispconfig3.sql +++ b/install/sql/ispconfig3.sql @@ -204,6 +204,7 @@ CREATE TABLE `client` ( `limit_shell_user` int(11) NOT NULL DEFAULT '0', `ssh_chroot` varchar(255) NOT NULL DEFAULT 'no,jailkit,ssh-chroot', `limit_webdav_user` int(11) NOT NULL DEFAULT '0', + `limit_backup` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n', `limit_aps` int(11) NOT NULL DEFAULT '-1', `default_dnsserver` int(11) unsigned NOT NULL DEFAULT '1', `db_servers` blob NOT NULL, @@ -313,6 +314,7 @@ CREATE TABLE `client_template` ( `limit_shell_user` int(11) NOT NULL default '0', `ssh_chroot` varchar(255) NOT NULL DEFAULT 'no', `limit_webdav_user` int(11) NOT NULL default '0', + `limit_backup` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n', `limit_aps` int(11) NOT NULL DEFAULT '-1', `limit_dns_zone` int(11) NOT NULL default '-1', `limit_dns_slave_zone` int(11) NOT NULL default '-1', diff --git a/interface/web/sites/form/web_vhost_domain.tform.php b/interface/web/sites/form/web_vhost_domain.tform.php index 937a5967e82924f82a7155aba1481f393c130a19..4877b66b2dbbdc5107ff07a163bbc1be8ee1b292 100644 --- a/interface/web/sites/form/web_vhost_domain.tform.php +++ b/interface/web/sites/form/web_vhost_domain.tform.php @@ -561,57 +561,6 @@ $form["tabs"]['stats'] = array ( ) ); -// if($_SESSION["s"]["user"]["typ"] == 'admin') { - -//* Backup -$form["tabs"]['backup'] = array ( - 'title' => "Backup", - 'width' => 100, - 'template' => "templates/web_vhost_domain_backup.htm", - 'readonly' => false, - 'fields' => array ( - //################################# - // Begin Datatable fields - //################################# - 'backup_interval' => array ( - 'datatype' => 'VARCHAR', - 'formtype' => 'SELECT', - 'default' => '', - 'value' => array('none' => 'no_backup_txt', 'daily' => 'daily_backup_txt', 'weekly' => 'weekly_backup_txt', 'monthly' => 'monthly_backup_txt') - ), - 'backup_copies' => array ( - 'datatype' => 'INTEGER', - 'formtype' => 'SELECT', - 'default' => '', - 'value' => array('1' => '1', '2' => '2', '3' => '3', '4' => '4', '5' => '5', '6' => '6', '7' => '7', '8' => '8', '9' => '9', '10' => '10') - ), - 'backup_excludes' => array ( - 'datatype' => 'VARCHAR', - 'validators' => array ( 0 => array ( 'type' => 'REGEX', - 'regex' => '@^(?!.*\.\.)[-a-zA-Z0-9_/.~,*]*$@', - 'errmsg'=> 'backup_excludes_error_regex'), - ), - 'formtype' => 'TEXT', - 'default' => '', - 'value' => '', - 'width' => '30', - 'maxlength' => '255' - ), - //################################# - // ENDE Datatable fields - //################################# - ), - 'plugins' => array ( - 'backup_records' => array ( - 'class' => 'plugin_backuplist', - 'options' => array( - ) - ) - ) -); - -// } - if($_SESSION["s"]["user"]["typ"] == 'admin' || ($web_config['reseller_can_use_options'] == 'y' && $app->auth->has_clients($_SESSION['s']['user']['userid']))) { diff --git a/interface/web/sites/templates/web_vhost_domain_backup.htm b/interface/web/sites/templates/web_vhost_domain_backup.htm deleted file mode 100644 index 7f573b874dedbb1c43b2e73c118246b0d65c3ce7..0000000000000000000000000000000000000000 --- a/interface/web/sites/templates/web_vhost_domain_backup.htm +++ /dev/null @@ -1,45 +0,0 @@ -<h2><tmpl_var name="list_head_txt"></h2> -<p><tmpl_var name="list_desc_txt"></p> - -<tmpl_if name="config_error_msg"> -<div style="background: #ffdfdf; border: 1px solid #df7d7d; border-width: 1px 0; margin: 1.5em 0 1.5em 0; padding: 7px;"> - <p style="font-face:bold">{tmpl_var name='configuration_error_txt'}</p> - <div> - <div style="float:left;width:150px;">{tmpl_var name='config_error_tstamp'} : </div><div style="padding-left:150px;">{tmpl_var name='config_error_msg'}</div> - </div> -</div> -</tmpl_if> - -<div class="panel panel_web_domain"> - - <div class="pnl_formsarea"> - <fieldset class="inlineLabels"><legend>Backup</legend> - <div class="ctrlHolder"> - <label for="backup_interval">{tmpl_var name='backup_interval_txt'}</label> - <select name="backup_interval" id="backup_interval" class="selectInput"> - {tmpl_var name='backup_interval'} - </select> - </div> - <div class="ctrlHolder"> - <label for="backup_copies">{tmpl_var name='backup_copies_txt'}</label> - <select name="backup_copies" id="backup_copies" class="selectInput"> - {tmpl_var name='backup_copies'} - </select> - </div> - <div class="ctrlHolder"> - <label for="backup_excludes">{tmpl_var name='backup_excludes_txt'}</label> - <input name="backup_excludes" id="backup_excludes" value="{tmpl_var name='backup_excludes'}" size="30" type="text" class="textInput" /> {tmpl_var name='backup_excludes_note_txt'} - </div> - </fieldset> - - {tmpl_var name='backup_records'} - - <input type="hidden" name="id" value="{tmpl_var name='id'}"> - - <div class="buttonHolder buttons"> - <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_vhost_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button> - <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_vhost_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button> - </div> - </div> - -</div> \ No newline at end of file