From 4ca1f82d6486238543ea005dbb9d22dd2d534505 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Sat, 18 Oct 2014 03:39:04 -0400
Subject: [PATCH] - fixed typo (double }) in fedora install library
---
server/lib/classes/system.inc.php | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/server/lib/classes/system.inc.php b/server/lib/classes/system.inc.php
index 9bd3e00..d227792 100644
--- a/server/lib/classes/system.inc.php
+++ b/server/lib/classes/system.inc.php
@@ -1722,7 +1722,7 @@
function getinitcommand($servicename, $action, $init_script_directory = ''){
global $conf;
// systemd
- if(is_executable('/bin/systemd')){
+ if(is_executable('/bin/systemd') || is_executable('/usr/bin/systemctl')){
return 'systemctl '.$action.' '.$servicename.'.service';
}
// upstart
@@ -1824,7 +1824,7 @@
$name_blacklist = array('root','ispconfig','vmail','getmail');
if(in_array($username,$name_blacklist)) return false;
- if(preg_match('/^[a-zA-Z0-9\.\-]{1,32}$/', $username) == false) return false;
+ if(preg_match('/^[a-zA-Z0-9\.\-_]{1,32}$/', $username) == false) return false;
if($check_id && intval($this->getuid($username)) < $this->min_uid) return false;
@@ -1835,16 +1835,16 @@
public function is_allowed_group($groupname, $check_id = true, $restrict_names = false) {
global $app;
- echo 1;
+
$name_blacklist = array('root','ispconfig','vmail','getmail');
if(in_array($groupname,$name_blacklist)) return false;
- echo 2;
- if(preg_match('/^[a-zA-Z0-9\.\-]{1,32}$/', $groupname) == false) return false;
- echo 3;
+
+ if(preg_match('/^[a-zA-Z0-9\.\-_]{1,32}$/', $groupname) == false) return false;
+
if($check_id && intval($this->getgid($groupname)) < $this->min_gid) return false;
- echo 4;
+
if($restrict_names == true && preg_match('/^client\d+$/', $groupname) == false) return false;
- echo 5;
+
return true;
}
--
Gitblit v1.9.1