[evolvis-commits] r11075: Added function util_is_root_dir↵
mirabilos at evolvis.org
mirabilos at evolvis.org
Thu Feb 24 18:01:31 CET 2011
Author: mirabilos
Date: 2011-02-24 18:01:30 +0100 (Thu, 24 Feb 2011)
New Revision: 11075
Modified:
trunk/gforge_base/evolvisforge-5.1/gforge/common/frs/FRSPackage.class
trunk/gforge_base/evolvisforge-5.1/gforge/common/frs/FRSRelease.class
trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/cvs-cron/ssh_create.php
trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/cvs-cron/usergroup.php
trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/dav-svn/create_svn.php
Log:
Added function util_is_root_dir
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/common/frs/FRSPackage.class
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/common/frs/FRSPackage.class 2011-02-24 17:01:28 UTC (rev 11074)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/common/frs/FRSPackage.class 2011-02-24 17:01:30 UTC (rev 11075)
@@ -468,7 +468,7 @@
$this->getFileName().'/';
// double-check we're not trying to remove root dir
- if (!preg_match('/[^\\/]/',$dir)) {
+ if (util_is_root_dir($dir)) {
$this->setError('Package::delete error: trying to delete root dir');
return false;
}
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/common/frs/FRSRelease.class
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/common/frs/FRSRelease.class 2011-02-24 17:01:28 UTC (rev 11074)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/common/frs/FRSRelease.class 2011-02-24 17:01:30 UTC (rev 11075)
@@ -355,7 +355,7 @@
$this->getFileName().'/';
// double-check we're not trying to remove root dir
- if (!preg_match('/[^\\/]/',$dir)) {
+ if (util_is_root_dir($dir)) {
$this->setError('Release::delete error: trying to delete root dir');
return false;
}
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/cvs-cron/ssh_create.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/cvs-cron/ssh_create.php 2011-02-24 17:01:28 UTC (rev 11074)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/cvs-cron/ssh_create.php 2011-02-24 17:01:30 UTC (rev 11075)
@@ -39,7 +39,7 @@
$ssh_key=db_result($res,$i,'authorized_keys');
$username=db_result($res,$i,'user_name');
$dir = $homedir_prefix.'/'.$username;
- if (!preg_match('/[^\\/]/',$dir)) {
+ if (util_is_root_dir($dir)) {
$err .= "Error! homedir_prefix/username Points To Root Directory!";
continue;
}
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/cvs-cron/usergroup.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/cvs-cron/usergroup.php 2011-02-24 17:01:28 UTC (rev 11074)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/cvs-cron/usergroup.php 2011-02-24 17:01:30 UTC (rev 11075)
@@ -95,7 +95,7 @@
exit;
}
-if (!preg_match('/[^\\/]/',$groupdir_prefix)) {
+if (util_is_root_dir($groupdir_prefix)) {
$err .= "Error! groupdir_prefix Points To Root Directory!";
echo $err;
cron_entry(16,$err);
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/dav-svn/create_svn.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/dav-svn/create_svn.php 2011-02-24 17:01:28 UTC (rev 11074)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/cronjobs/dav-svn/create_svn.php 2011-02-24 17:01:30 UTC (rev 11075)
@@ -48,7 +48,7 @@
exit;
}
-if (empty($svn) || !preg_match('/[^\\/]/',$svn)) {
+if (empty($svn) || util_is_root_dir($svn)) {
$err .= "Error! svndir_prefix Is Not Set Or Points To The Root Directory!";
echo $err;
cron_entry(21,$err);
More information about the evolvis-commits
mailing list