From b2fbe1b49ba8a6e3542f63d6c88e8d63800a111b Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 24 Feb 2012 08:47:41 -0500
Subject: [PATCH] Fixed: FS#2078 - Cron - ISPConfig website users permission - Improved date format in nl language file - Disabled debugging mode in interface plugin class.
---
interface/lib/lang/nl.lng | 8 ++++----
interface/lib/classes/plugin.inc.php | 2 +-
interface/web/mail/form/mail_user.tform.php | 5 -----
server/plugins-available/cron_plugin.inc.php | 5 +++--
4 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/interface/lib/classes/plugin.inc.php b/interface/lib/classes/plugin.inc.php
index 1cc9a06..341b186 100644
--- a/interface/lib/classes/plugin.inc.php
+++ b/interface/lib/classes/plugin.inc.php
@@ -31,7 +31,7 @@
class plugin {
private $subscribed_events = array();
- private $debug = true;
+ private $debug = false;
/*
diff --git a/interface/lib/lang/nl.lng b/interface/lib/lang/nl.lng
index badb322..90e6432 100644
--- a/interface/lib/lang/nl.lng
+++ b/interface/lib/lang/nl.lng
@@ -1,11 +1,11 @@
<?php
-$wb['conf_format_dateshort'] = 'Y-m-d';
-$wb['conf_format_datelong'] = 'l d F Y';
+$wb['conf_format_dateshort'] = 'd.m.Y';
+$wb['conf_format_datelong'] = 'l, d. F Y';
$wb['conf_format_timeshort'] = 'H:i';
$wb['conf_format_timelong'] = 'H:i:s';
-$wb['conf_format_datetime'] = 'Y-m-d H:i';
+$wb['conf_format_datetime'] = 'd.m.Y H:i';
$wb['number_format_decimals'] = '2';
-$wb['number_format_dec_point'] = '.';
+$wb['number_format_dec_point'] = ',';
$wb['number_format_thousands_sep'] = '';
$wb['error_301'] = 'Module niet toegestaan voor de huidige gebruiker.';
$wb['error_302'] = 'Ongeldige module.';
diff --git a/interface/web/mail/form/mail_user.tform.php b/interface/web/mail/form/mail_user.tform.php
index e7431cb..73fa281 100644
--- a/interface/web/mail/form/mail_user.tform.php
+++ b/interface/web/mail/form/mail_user.tform.php
@@ -226,11 +226,6 @@
'autoresponder_start_date' => array (
'datatype' => 'DATETIME',
'formtype' => 'DATETIME',
- 'validators'=> array ( 0 => array ( 'type' => 'CUSTOM',
- 'class' => 'validate_autoresponder',
- 'function' => 'start_date',
- 'errmsg'=> 'autoresponder_start_date_ispast'),
- ),
),
'autoresponder_end_date' => array (
'datatype' => 'DATETIME',
diff --git a/server/plugins-available/cron_plugin.inc.php b/server/plugins-available/cron_plugin.inc.php
index d1e31d1..ffb6e1a 100644
--- a/server/plugins-available/cron_plugin.inc.php
+++ b/server/plugins-available/cron_plugin.inc.php
@@ -183,8 +183,9 @@
//* try to find customer's mail address
/** TODO: add possibility for client to choose mail notification! **/
- $cron_content = "MAILTO=''\n\n";
- $chr_cron_content = "MAILTO=''\n\n";
+ $cron_content = "MAILTO=''\n";
+ $cron_content .= "SHELL='/bin/sh'\n\n";
+ $chr_cron_content = "MAILTO=''\n";
$chr_cron_content .= "SHELL='/usr/sbin/jk_chrootsh'\n\n";
$cmd_count = 0;
--
Gitblit v1.9.1