Added: Cron Jobs for clients (url, chrooted, full)

Fixed: Missing server.ini config entries for vlogger and jailkit
Added: Admin interface server_config for vlogger and cron

install/dist/conf/centos52.conf.php

@@ -147,8 +147,14 @@ $conf['jailkit']['config_dir'] = '/etc/jailkit';
 $conf['jailkit']['jk_init'] = 'jk_init.ini';
 $conf['jailkit']['jk_chrootsh'] = 'jk_chrootsh.ini';
 $conf['jailkit']['jailkit_chroot_app_programs'] = '/usr/bin/groups /usr/bin/id /usr/bin/dircolors /bin/basename /usr/bin/dirname /usr/bin/nano';
+$conf['jailkit']['jailkit_chroot_cron_programs'] = '/usr/bin/php /usr/bin/perl /usr/share/perl /usr/share/php';
 
 //* vlogger
 $conf['vlogger']['config_dir'] = '/etc';
 
+//* cron
+$conf['cron']['init_script'] = 'crond';
+$conf['cron']['crontab_dir'] = '/etc/cron.d';
+$conf['cron']['wget'] = '/usr/bin/wget';
+
 ?>
\ No newline at end of file

install/dist/conf/centos53.conf.php

@@ -147,8 +147,14 @@ $conf['jailkit']['config_dir'] = '/etc/jailkit';
 $conf['jailkit']['jk_init'] = 'jk_init.ini';
 $conf['jailkit']['jk_chrootsh'] = 'jk_chrootsh.ini';
 $conf['jailkit']['jailkit_chroot_app_programs'] = '/usr/bin/groups /usr/bin/id /usr/bin/dircolors /bin/basename /usr/bin/dirname /usr/bin/nano';
+$conf['jailkit']['jailkit_chroot_cron_programs'] = '/usr/bin/php /usr/bin/perl /usr/share/perl /usr/share/php';
 
 //* vlogger
 $conf['vlogger']['config_dir'] = '/etc';
 
+//* cron
+$conf['cron']['init_script'] = 'crond';
+$conf['cron']['crontab_dir'] = '/etc/cron.d';
+$conf['cron']['wget'] = '/usr/bin/wget';
+
 ?>
\ No newline at end of file

install/dist/conf/debian40.conf.php

@@ -147,8 +147,14 @@ $conf['jailkit']['config_dir'] = '/etc/jailkit';
 $conf['jailkit']['jk_init'] = 'jk_init.ini';
 $conf['jailkit']['jk_chrootsh'] = 'jk_chrootsh.ini';
 $conf['jailkit']['jailkit_chroot_app_programs'] = '/usr/bin/groups /usr/bin/id /usr/bin/dircolors /usr/bin/lesspipe /usr/bin/basename /usr/bin/dirname /usr/bin/nano /usr/bin/pico';
+$conf['jailkit']['jailkit_chroot_cron_programs'] = '/usr/bin/php /usr/bin/perl /usr/share/perl /usr/share/php';
 
 //* vlogger
 $conf['vlogger']['config_dir'] = '/etc';
 
+//* cron
+$conf['cron']['init_script'] = 'cron';
+$conf['cron']['crontab_dir'] = '/etc/cron.d';
+$conf['cron']['wget'] = '/usr/bin/wget';
+
 ?>
\ No newline at end of file

install/dist/conf/fedora9.conf.php

@@ -147,8 +147,14 @@ $conf['jailkit']['config_dir'] = '/etc/jailkit';
 $conf['jailkit']['jk_init'] = 'jk_init.ini';
 $conf['jailkit']['jk_chrootsh'] = 'jk_chrootsh.ini';
 $conf['jailkit']['jailkit_chroot_app_programs'] = '/usr/bin/groups /usr/bin/id /usr/bin/dircolors /bin/basename /usr/bin/dirname /usr/bin/nano';
+$conf['jailkit']['jailkit_chroot_cron_programs'] = '/usr/bin/php /usr/bin/perl /usr/share/perl /usr/share/php';
 
 //* vlogger
 $conf['vlogger']['config_dir'] = '/etc';
 
+//* cron
+$conf['cron']['init_script'] = 'crond';
+$conf['cron']['crontab_dir'] = '/etc/cron.d';
+$conf['cron']['wget'] = '/usr/bin/wget';
+
 ?>
\ No newline at end of file

install/dist/conf/gentoo.conf.php

@@ -96,8 +96,14 @@ $conf['jailkit']['config_dir'] = '/etc/jailkit';
 $conf['jailkit']['jk_init'] = 'jk_init.ini';
 $conf['jailkit']['jk_chrootsh'] = 'jk_chrootsh.ini';
 $conf['jailkit']['jailkit_chroot_app_programs'] = '/usr/bin/groups /usr/bin/id /usr/bin/dircolors /usr/bin/lesspipe /usr/bin/basename /usr/bin/dirname /usr/bin/nano /usr/bin/pico';
+$conf['jailkit']['jailkit_chroot_cron_programs'] = '/usr/bin/php /usr/bin/perl /usr/share/perl /usr/share/php';
 
 //* vlogger
 $conf['vlogger']['config_dir'] = '/etc';
 
+//* cron
+$conf['cron']['init_script'] = 'cron';
+$conf['cron']['crontab_dir'] = '/etc/cron.d';
+$conf['cron']['wget'] = '/usr/bin/wget';
+
 ?>
\ No newline at end of file

install/dist/conf/opensuse110.conf.php

@@ -147,9 +147,14 @@ $conf['jailkit']['config_dir'] = '/etc/jailkit';
 $conf['jailkit']['jk_init'] = 'jk_init.ini';
 $conf['jailkit']['jk_chrootsh'] = 'jk_chrootsh.ini';
 $conf['jailkit']['jailkit_chroot_app_programs'] = '/usr/bin/groups /usr/bin/id /usr/bin/dircolors /usr/bin/basename /usr/bin/dirname /usr/bin/nano /usr/bin/pico';
+$conf['jailkit']['jailkit_chroot_cron_programs'] = '/usr/bin/php /usr/bin/perl /usr/share/perl /usr/share/php';
 
 //* vlogger
 $conf['vlogger']['config_dir'] = '/etc';
 
+//* cron
+$conf['cron']['init_script'] = 'cron';
+$conf['cron']['crontab_dir'] = '/etc/cron.d';
+$conf['cron']['wget'] = '/usr/bin/wget';
 
 ?>
\ No newline at end of file

install/lib/installer_base.lib.php

@@ -210,7 +210,8 @@ class installer_base {
 		$tpl_ini_array['web']['website_basedir'] = $conf['web']['website_basedir'];
 		$tpl_ini_array['web']['website_path'] = $conf['web']['website_path'];
 		$tpl_ini_array['web']['website_symlinks'] = $conf['web']['website_symlinks'];
-		
+        $tpl_ini_array['cron']['crontab_dir'] = $conf['cron']['crontab_dir'];
+        
 		$server_ini_content = array_to_ini($tpl_ini_array);
 		$server_ini_content = mysql_real_escape_string($server_ini_content);
 		

install/sql/ispconfig3.sql

@@ -92,6 +92,9 @@ CREATE TABLE `client` (
   `limit_dns_record` int(11) NOT NULL default '-1',
   `default_dbserver` int(11) NOT NULL default '1',
   `limit_database` int(11) NOT NULL default '-1',
+  `limit_cron` int(11) NOT NULL default '0',
+  `limit_cron_type` enum('url','chrooted','full') NOT NULL default 'url',
+  `limit_cron_frequency` int(11) NOT NULL default '5',
   `limit_client` int(11) NOT NULL default '0',
   `parent_client_id` int(11) unsigned NOT NULL default '0',
   `username` varchar(64) default NULL,
@@ -140,10 +143,40 @@ CREATE TABLE `client_template` (
   `limit_dns_zone` int(11) NOT NULL default '-1',
   `limit_dns_record` int(11) NOT NULL default '-1',
   `limit_database` int(11) NOT NULL default '-1',
+  `limit_cron` int(11) NOT NULL default '0',
+  `limit_cron_type` enum('url','chrooted','full') NOT NULL default 'url',
+  `limit_cron_frequency` int(11) NOT NULL default '5',
   `limit_client` int(11) NOT NULL default '0',
   PRIMARY KEY  (`template_id`)
 ) ENGINE=MyISAM AUTO_INCREMENT=1;
 
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table  `dns_rr`
+-- 
+CREATE TABLE `cron` (
+  `id` int(11) unsigned NOT NULL auto_increment,
+  `sys_userid` int(11) unsigned NOT NULL default '0',
+  `sys_groupid` int(11) unsigned NOT NULL default '0',
+  `sys_perm_user` varchar(5) NULL default NULL,
+  `sys_perm_group` varchar(5) NULL default NULL,
+  `sys_perm_other` varchar(5) NULL default NULL,
+  `server_id` int(11) unsigned NOT NULL default '0',
+  `parent_domain_id` int(11) unsigned NOT NULL default '0',
+  `type` enum('url','chrooted','full') NOT NULL default 'url',
+  `command` varchar(255) NOT NULL,
+  `run_min` varchar(100) NULL,
+  `run_hour` varchar(100) NULL,
+  `run_mday` varchar(100) NULL,
+  `run_month` varchar(100) NULL,
+  `run_wday` varchar(100) NULL,
+  `active` enum('n','y') NOT NULL default 'y',
+  PRIMARY KEY  (`id`)
+) ENGINE=MyISAM  AUTO_INCREMENT=1;
+
+
 -- --------------------------------------------------------
 
 -- 

install/tpl/server.ini.master

@@ -48,3 +48,12 @@ fastcgi_bin=/usr/bin/php-cgi
 jailkit_chroot_home=/home/[username]
 jailkit_chroot_app_sections=basicshell editors extendedshell netutils ssh sftp scp groups jk_lsh
 jailkit_chroot_app_programs=/usr/bin/groups /usr/bin/id /usr/bin/dircolors /usr/bin/lesspipe /usr/bin/basename /usr/bin/dirname /usr/bin/nano /usr/bin/pico
+jailkit_chroot_cron_programs=/usr/bin/php /usr/bin/perl /usr/share/perl /usr/share/php
+
+[vlogger]
+config_dir=/etc
+
+[cron]
+init_script=cron
+crontab_dir=/etc/cron.d
+wget=/usr/bin/wget

interface/lib/classes/validate_cron.inc.php

+<?php
+
+/*
+Copyright (c) 2007, Till Brehm, projektfarm Gmbh
+Modified 2009, Marius Cramer, pixcept KG
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of ISPConfig nor the names of its contributors
+      may be used to endorse or promote products derived from this software without
+      specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+class validate_cron {
+	
+    function get_error($errmsg) {
+        global $app;
+        
+        if(isset($app->tform->wordbook[$errmsg])) {
+            return $app->tform->wordbook[$errmsg]."<br>\r\n";
+        } else {
+            return $errmsg."<br>\r\n";
+        }
+    }
+    
+    /*
+        Validator function to check if a given cron command is in correct form (url only).
+    */
+    function command_format($field_name, $field_value, $validator) {
+        if(preg_match("'^(\w+):\/\/'", $field_value, $matches)) {
+            
+            $parsed = parse_url($field_value);
+            if($parsed === false) return $this->get_error($validator['errmsg']);
+            
+            if($parsed["scheme"] != "http" && $parsed["scheme"] != "https") return $this->get_error($validator['errmsg']);
+            
+            if(preg_match("'^([a-z0-9][a-z0-9-]{0,62}\.)+([a-z]{2,4})$'i", $parsed["host"]) == false) return $this->get_error($validator['errmsg']);
+        }
+    }
+    
+	/*
+		Validator function to check if a given cron time is in correct form.
+	*/
+	function run_time_format($field_name, $field_value, $validator) {
+		global $app;
+		
+        //* check general form
+        $is_ok = true;
+        $field_value = str_replace(" ", "", $field_value); // spaces are not needed
+        $used_times = array();
+        
+        if(preg_match("'^[0-9\-\,\/\*]+$'", $field_value) == false) return $this->get_error($validator['errmsg']); // allowed characters are 0-9, comma, *, -, /
+        elseif(preg_match("'[\-\,\/][\-\,\/]'", $field_value) == true) return $this->get_error($validator['errmsg']); // comma, - and / never stand together
+        //* now split list and check each entry. store used values in array for later limit-check
+        $time_list = split(",", $field_value);
+        if(count($time_list) < 1) return $this->get_error($validator['errmsg']);
+        
+        $max_entry = 0;
+        $min_entry = 0;
+        $in_minutes = 1;
+        //* get maximum value of entry for each field type (name)
+        switch($field_name) {
+            case "run_min":
+                $max_entry = 59;
+                break;
+            case "run_hour":
+                $max_entry = 23;
+                $in_minutes = 60;
+                break;
+            case "run_mday":
+                $max_entry = 31;
+                $min_entry = 1;
+                $in_minutes = 1440;
+                break;
+            case "run_month":
+                $max_entry = 12;
+                $min_entry = 1;
+                $in_minutes = 1440 * 28; // not exactly but enough
+                break;
+            case "run_wday":
+                $max_entry = 7;
+                $in_minutes = 1440;
+                break;
+        }
+        
+        if($max_entry == 0) return $this->get_error('unknown_fieldtype_error');
+        
+        foreach($time_list as $entry) {
+            //* possible value combinations:
+            //* x               =>      ^(\d+)$
+            //* x-y             =>      ^(\d+)\-(\d+)$
+            //* x/y             =>      ^(\d+)\/([1-9]\d*)$
+            //* x-y/z           =>      ^(\d+)\-(\d+)\/([1-9]\d*)$
+            //* */x             =>      ^\*\/([1-9]\d*)$
+            //* combined regex  =>      ^(\d+|\*)(\-(\d+))?(\/([1-9]\d*))?$
+            
+            if(preg_match("'^(((\d+)(\-(\d+))?)|\*)(\/([1-9]\d*))?$'", $entry, $matches) == false) {
+                return $this->get_error($validator['errmsg']);
+            }
+            
+            //* matches contains:
+            //* 1       =>      * or value or x-y range
+            //* 2       =>      unused
+            //* 3       =>      value if [1] != *
+            //* 4       =>      empty if no range was used
+            //* 5       =>      2nd value of range if [1] != * and range was used
+            //* 6       =>      empty if step was not used
+            //* 7       =>      step
+            
+            $loop_step = 1;
+            $loop_from = $min_entry;
+            $loop_to = $max_entry;
+            
+            //* calculate used values
+            if($matches[1] == "*") {
+                //* not to check
+            } else {
+                if($matches[3] < $min_entry || $matches[3] > $max_entry) {
+                    //* check if value is in allowed range
+                    return $this->get_error($validator['errmsg']);
+                } elseif($matches[4] && ($matches[5] < $min_entry || $matches[5] > $max_entry || $matches[5] <= $matches[3])) {
+                    //* check if value is in allowed range and not less or equal to first value
+                    return $this->get_error($validator['errmsg']);
+                }
+                
+                $loop_from = $matches[3];
+                $loop_to = $matches[3];
+                if($matches[4]) $loop_to = $matches[5];
+            }
+            if($matches[6] && ($matches[7] < 2 || $matches[7] > $max_entry - 1)) {
+                //* check if step value is valid
+                return $this->get_error($validator['errmsg']);
+            }
+            if($matches[7]) $loop_step = $matches[7];
+            
+            //* loop through values to set used times
+            for($t = $loop_from; $t <= $loop_to; $t = $t + $loop_step) {
+                $used_times[] = $t;
+            }
+        } //* end foreach entry loop
+        
+        //* sort used times and erase doubles
+        sort($used_times);
+        $used_times = array_unique($used_times);
+        
+        //* get minimum frequency and store it in $app->tform->cron_min_freq for usage in onUpdateSave and onInsertSave!
+        $min_freq = -1;
+        $prev_time = -1;
+        foreach($used_times as $curtime) {
+            if($prev_time != -1) {
+                $freq = $curtime - $prev_time;
+                if($min_freq == -1 || $freq < $min_freq) $min_freq = $freq;
+            }
+            $prev_time = $curtime;
+        }
+        
+        //* check last against first (needed because e.g. wday 1,4,7 has diff 1 not 3
+        $prev_time = $used_times[0];
+        $freq = ($prev_time - $min_entry) + ($max_entry - $curtime) + 1;
+        if($min_freq == -1 || $freq < $min_freq) $min_freq = $freq;
+        
+        if($min_freq > 0 && $min_freq <= $max_entry) { //* only store if > 1 && < $max_entry!
+            $min_freq = $min_freq * $in_minutes; // we have to overwrite $app->tform->cron_min_freq if this is higher value
+            if(!$app->tform->cron_min_freq || $app->tform->cron_min_freq > $min_freq) $app->tform->cron_min_freq = $min_freq;
+        }
+        
+        //return "DEBUG: " . $app->tform->cron_min_freq . " ($min_freq) --- " . var_export($used_times, true) . "<br />";
+	}
+	
+	
+	
+	
+}
\ No newline at end of file

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

@@ -478,6 +478,17 @@ $form["tabs"]['jailkit'] = array (
 			'width'		=> '40',
 			'maxlength'	=> '1000'
 		),
+        'jailkit_chroot_cron_programs' => array (
+            'datatype'  => 'VARCHAR',
+            'formtype'  => 'TEXT',
+            'default'   => '',
+            'validators'    => array (  0 => array (    'type'  => 'NOTEMPTY',
+                                                        'errmsg'=> 'jailkit_chroot_cron_programs_error_empty'),
+                                    ),
+            'value'     => '',
+            'width'     => '40',
+            'maxlength' => '1000'
+        ),
 	##################################
 	# ENDE Datatable fields
 	##################################
@@ -485,10 +496,79 @@ $form["tabs"]['jailkit'] = array (
 );
 
 
+$form["tabs"]['vlogger'] = array (
+    'title'     => "vlogger",
+    'width'     => 80,
+    'template'  => "templates/server_config_vlogger_edit.htm",
+    'fields'    => array (
+    ##################################
+    # Begin Datatable fields
+    ##################################
+        'config_dir' => array (
+            'datatype'  => 'VARCHAR',
+            'formtype'  => 'TEXT',
+            'default'   => '',
+            'validators'    => array (  0 => array (    'type'  => 'NOTEMPTY',
+                                                        'errmsg'=> 'vlogger_config_dir_error_empty'),
+                                    ),
+            'value'     => '',
+            'width'     => '40',
+            'maxlength' => '255'
+        ),
+    ##################################
+    # ENDE Datatable fields
+    ##################################
+    )
+);
 
 
 
-
+$form["tabs"]['cron'] = array (
+    'title'     => "Cron",
+    'width'     => 80,
+    'template'  => "templates/server_config_cron_edit.htm",
+    'fields'    => array (
+    ##################################
+    # Begin Datatable fields
+    ##################################
+        'init_script' => array (
+            'datatype'  => 'VARCHAR',
+            'formtype'  => 'TEXT',
+            'default'   => '',
+            'validators'    => array (  0 => array (    'type'  => 'NOTEMPTY',
+                                                        'errmsg'=> 'cron_init_script_error_empty'),
+                                    ),
+            'value'     => '',
+            'width'     => '40',
+            'maxlength' => '255'
+        ),
+        'crontab_dir' => array (
+            'datatype'  => 'VARCHAR',
+            'formtype'  => 'TEXT',
+            'default'   => '',
+            'validators'    => array (  0 => array (    'type'  => 'NOTEMPTY',
+                                                        'errmsg'=> 'crontab_dir_error_empty'),
+                                    ),
+            'value'     => '',
+            'width'     => '40',
+            'maxlength' => '255'
+        ),
+        'wget' => array (
+            'datatype'  => 'VARCHAR',
+            'formtype'  => 'TEXT',
+            'default'   => '',
+            'validators'    => array (  0 => array (    'type'  => 'NOTEMPTY',
+                                                        'errmsg'=> 'cron_wget_error_empty'),
+                                    ),
+            'value'     => '',
+            'width'     => '40',
+            'maxlength' => '255'
+        ),
+    ##################################
+    # ENDE Datatable fields
+    ##################################
+    )
+);
 
 
 

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

@@ -2,6 +2,7 @@
 $wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
 $wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app sections';
 $wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted applications';
+$wb['jailkit_chroot_cron_programs_txt'] = 'Jailkit cron chrooted applications';
 $wb['website_path_txt'] = 'Website path';
 $wb['website_symlinks_txt'] = 'Website symlinks';
 $wb['vhost_conf_dir_txt'] = 'Vhost config dir';
@@ -38,4 +39,8 @@ $wb['netmask_error_wrong'] = 'Invalid Netmask format.';
 $wb['gateway_error_wrong'] = 'Invalid Gateway format.';
 $wb['hostname_error_empty'] = 'Hostname is empty.';
 $wb['nameservers_error_empty'] = 'Nameserver is empty.';
+$wb["config_dir_txt"] = 'Config directory';
+$wb["init_script_txt"] = 'Cron init script name';
+$wb["crontab_dir_txt"] = 'Path for individual crontabs';
+$wb["wget_txt"] = 'Path to wget program';
 ?>

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

@@ -2,6 +2,7 @@
 $wb["jailkit_chroot_home_txt"] = 'Jailkit chroot home';
 $wb["jailkit_chroot_app_sections_txt"] = 'Jailkit chroot app sections';
 $wb["jailkit_chroot_app_programs_txt"] = 'Jailkit chrooted applications';
+$wb['jailkit_chroot_cron_programs_txt'] = 'Jailkit cron chrooted applications';
 $wb["website_path_txt"] = 'Website path';
 $wb["website_symlinks_txt"] = 'Website symlinks';
 $wb["website_basedir_txt"] = 'Website basedir';
@@ -38,4 +39,8 @@ $wb["netmask_error_wrong"] = 'Invalid Netmask format.';
 $wb["gateway_error_wrong"] = 'Invalid Gateway format.';
 $wb["hostname_error_empty"] = 'Hostname is empty.';
 $wb["nameservers_error_empty"] = 'Nameserver is empty.';
+$wb["config_dir_txt"] = 'Config directory';
+$wb["init_script_txt"] = 'Cron init script name';
+$wb["crontab_dir_txt"] = 'Path for individual crontabs';
+$wb["wget_txt"] = 'Path to wget program';
 ?>
\ No newline at end of file

interface/web/admin/templates/server_config_cron_edit.htm

+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_server_config">
+  
+  <div class="pnl_formsarea">
+    <fieldset class="inlineLabels">
+      <div class="ctrlHolder">
+        <label for="init_script">{tmpl_var name='init_script_txt'}</label>
+        <input name="init_script" id="init_script" value="{tmpl_var name='init_script'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+      <div class="ctrlHolder">
+        <label for="crontab_dir">{tmpl_var name='crontab_dir_txt'}</label>
+        <input name="crontab_dir" id="crontab_dir" value="{tmpl_var name='crontab_dir'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+      <div class="ctrlHolder">
+        <label for="wget">{tmpl_var name='wget_txt'}</label>
+        <input name="wget" id="wget" value="{tmpl_var name='wget'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+    </fieldset>
+
+    <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','admin/server_config_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('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>

interface/web/admin/templates/server_config_jailkit_edit.htm

@@ -17,6 +17,10 @@
       	<label for="jailkit_chroot_app_programs">{tmpl_var name='jailkit_chroot_app_programs_txt'}</label>
         <input name="jailkit_chroot_app_programs" id="jailkit_chroot_app_programs" value="{tmpl_var name='jailkit_chroot_app_programs'}" size="40" maxlength="1000" type="text" class="textInput" />
 			</div>
+      <div class="ctrlHolder">
+        <label for="jailkit_chroot_cron_programs">{tmpl_var name='jailkit_chroot_cron_programs_txt'}</label>
+        <input name="jailkit_chroot_cron_programs" id="jailkit_chroot_cron_programs" value="{tmpl_var name='jailkit_chroot_cron_programs'}" size="40" maxlength="1000" type="text" class="textInput" />
+            </div>
     </fieldset>
 
     <input type="hidden" name="id" value="{tmpl_var name='id'}">

interface/web/admin/templates/server_config_vlogger_edit.htm

+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_server_config">
+  
+  <div class="pnl_formsarea">
+    <fieldset class="inlineLabels">
+      <div class="ctrlHolder">
+      	<label for="config_dir">{tmpl_var name='config_dir_txt'}</label>
+        <input name="config_dir" id="config_dir" value="{tmpl_var name='config_dir'}" size="40" maxlength="255" type="text" class="textInput" />
+			</div>
+    </fieldset>
+
+    <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','admin/server_config_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('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>

interface/web/client/form/client.tform.php

@@ -663,6 +663,40 @@ $form["tabs"]['limits'] = array (
 			'rows'		=> '',
 			'cols'		=> ''
 		),
+        'limit_cron' => array (
+            'datatype'  => 'INTEGER',
+            'formtype'  => 'TEXT',
+            'validators'    => array (  0 => array (    'type'  => 'ISINT',
+                                                        'errmsg'=> 'limit_cron_error_notint'),
+                                    ),
+            'default'   => '0',
+            'value'     => '',
+            'separator' => '',
+            'width'     => '10',
+            'maxlength' => '10',
+            'rows'      => '',
+            'cols'      => ''
+        ),
+        'limit_cron_type' => array (
+            'datatype'  => 'VARCHAR',
+            'formtype'  => 'SELECT',
+            'default'   => '',
+            'value'     => array('full' => 'Full Cron','chrooted' => 'Chrooted Cron','url' => 'URL Cron')
+        ),
+        'limit_cron_frequency' => array (
+            'datatype'  => 'INTEGER',