From 86241bd24d54b5baf2fe0f76a1350445f0d180f9 Mon Sep 17 00:00:00 2001
From: Dominik <info@profi-webdesign.net>
Date: Fri, 04 Apr 2014 17:08:20 -0400
Subject: [PATCH] Backups können bei vhost-domains nicht mehr gemacht werden
---
interface/lib/classes/validate_dkim.inc.php | 16 ++--------------
1 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/interface/lib/classes/validate_dkim.inc.php b/interface/lib/classes/validate_dkim.inc.php
index 523c7c7..5a9b8c0 100644
--- a/interface/lib/classes/validate_dkim.inc.php
+++ b/interface/lib/classes/validate_dkim.inc.php
@@ -57,18 +57,6 @@
}
}
-
- /**
- * Validator function for DKIM Path
- * @return boolean - true when the dkim-path exists and is writeable
- */
- function check_dkim_path($field_name, $field_value, $validator) {
- if(empty($field_value)) return $this->get_error($validator['errmsg']);
- if (substr(sprintf('%o', fileperms($field_value)), -3) <= 600)
- return $this->get_error($validator['errmsg']);
- }
-
-
/**
* Check function for DNS-Template
*/
@@ -87,10 +75,10 @@
function validate_post($key, $value) {
switch ($key) {
case 'public':
- if (preg_match("/(^-----BEGIN PUBLIC KEY-----)[a-zA-Z0-9\r\n\/\+=]{1,221}(-----END PUBLIC KEY-----(\n|\r)$)/", $value) === 1) { return true; } else { return false; }
+ if (preg_match("/(^-----BEGIN PUBLIC KEY-----)[a-zA-Z0-9\r\n\/\+=]{1,221}(-----END PUBLIC KEY-----(\n|\r)?$)/", $value) === 1) { return true; } else { return false; }
break;
case 'private':
- if (preg_match("/(^-----BEGIN RSA PRIVATE KEY-----)[a-zA-Z0-9\r\n\/\+=]{1,850}(-----END RSA PRIVATE KEY-----(\n|\r)$)/", $value) === 1) { return true; } else { return false; }
+ if (preg_match("/(^-----BEGIN RSA PRIVATE KEY-----)[a-zA-Z0-9\r\n\/\+=]{1,850}(-----END RSA PRIVATE KEY-----(\n|\r)?$)/", $value) === 1) { return true; } else { return false; }
break;
}
}
--
Gitblit v1.9.1