From 8e9a5fdf533cb82357555b1f8b5587290b9fa7f1 Mon Sep 17 00:00:00 2001
From: nveid <nveid@ispconfig3>
Date: Sun, 4 Sep 2011 18:50:39 +0000
Subject: [PATCH] More Changes/fixes to allow linkfarm setups off a repo.
---
server/cron_daily.php | 5 +++--
server/mods-available/remoteaction_core_module.inc.php | 4 ++--
server/server.php | 8 +++-----
server/server.sh | 0
4 files changed, 8 insertions(+), 9 deletions(-)
mode change 100644 => 100755 server/server.sh
diff --git a/server/cron_daily.php b/server/cron_daily.php
index 1ec0ac258..748797162 100644
--- a/server/cron_daily.php
+++ b/server/cron_daily.php
@@ -28,8 +28,9 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-require('lib/config.inc.php');
-require('lib/app.inc.php');
+define('SCRIPT_PATH', dirname($_SERVER["SCRIPT_FILENAME"]));
+require(SCRIPT_PATH."/lib/config.inc.php");
+require(SCRIPT_PATH."/lib/app.inc.php");
set_time_limit(0);
diff --git a/server/mods-available/remoteaction_core_module.inc.php b/server/mods-available/remoteaction_core_module.inc.php
index d9af3a7d6..1f6ab0998 100644
--- a/server/mods-available/remoteaction_core_module.inc.php
+++ b/server/mods-available/remoteaction_core_module.inc.php
@@ -95,7 +95,7 @@ class remoteaction_core_module {
* stop a service, a admin stopped some days before! To avoid this, we ignore
* the status (it is only for the interface to show) and use our own maxid
*/
- include_once (dirname(__FILE__) . "/../lib/remote_action.inc.php");
+ include_once (SCRIPT_PATH."/lib/remote_action.inc.php");
/*
* Get all actions this server should execute
@@ -243,4 +243,4 @@ class remoteaction_core_module {
//$this->_actionDone($action['action_id'], 'ok');
}
}
-?>
\ No newline at end of file
+?>
diff --git a/server/server.php b/server/server.php
index 967d13a61..c5ff5ac2f 100644
--- a/server/server.php
+++ b/server/server.php
@@ -27,11 +27,9 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-// $script_path allows development work of using a symbolic link farm
-// to use along side git or svn
-$script_path = dirname($_SERVER["SCRIPT_FILENAME"]);
-require("$script_path/lib/config.inc.php");
-require("$script_path/lib/app.inc.php");
+define('SCRIPT_PATH', dirname($_SERVER["SCRIPT_FILENAME"]));
+require(SCRIPT_PATH."/lib/config.inc.php");
+require(SCRIPT_PATH."/lib/app.inc.php");
set_time_limit(0);
ini_set('error_reporting', E_ALL & ~E_NOTICE);
diff --git a/server/server.sh b/server/server.sh
old mode 100644
new mode 100755
--
GitLab