From 4bd960b10d9f32cb8a82a0718caaa005768c107c Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 24 Oct 2012 06:07:53 -0400
Subject: [PATCH] Merged revisions 3557-3594 from 3.0.5 stable branch.
---
interface/web/client/form/reseller.tform.php | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/interface/web/client/form/reseller.tform.php b/interface/web/client/form/reseller.tform.php
index 1669e36..c9079ec 100644
--- a/interface/web/client/form/reseller.tform.php
+++ b/interface/web/client/form/reseller.tform.php
@@ -61,7 +61,7 @@
while ($file = @readdir ($handle)) {
if (substr($file, 0, 1) != '.') {
if(@is_dir(ISPC_THEMES_PATH."/$file")) {
- if($file == 'default' || (@file_exists(ISPC_THEMES_PATH."/$file/ISPC_VERSION") && trim(@file_get_contents(ISPC_THEMES_PATH."/$file/ISPC_VERSION")) == ISPC_APP_VERSION)) {
+ if(!file_exists(ISPC_THEMES_PATH."/$file/ispconfig_version") || (@file_exists(ISPC_THEMES_PATH."/$file/ispconfig_version") && trim(@file_get_contents(ISPC_THEMES_PATH."/$file/ispconfig_version")) == ISPC_APP_VERSION)) {
$themes_list[$file] = $file;
}
}
@@ -118,6 +118,10 @@
'customer_no' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ 'validators' => array ( 0 => array ( 'type' => 'UNIQUE',
+ 'errmsg'=> 'customer_no_error_unique',
+ 'allowempty' => 'y'),
+ ),
'default' => '',
'value' => '',
'separator' => '',
--
Gitblit v1.9.1