Skip to content

Commit 8e9a5fd

Browse files
author
nveid
committed
More Changes/fixes to allow linkfarm setups off a repo.
1 parent 0ea2a52 commit 8e9a5fd

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

server/cron_daily.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@
2828
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2929
*/
3030

31-
require('lib/config.inc.php');
32-
require('lib/app.inc.php');
31+
define('SCRIPT_PATH', dirname($_SERVER["SCRIPT_FILENAME"]));
32+
require(SCRIPT_PATH."/lib/config.inc.php");
33+
require(SCRIPT_PATH."/lib/app.inc.php");
3334

3435
set_time_limit(0);
3536

server/mods-available/remoteaction_core_module.inc.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ private function _execActions() {
9595
* stop a service, a admin stopped some days before! To avoid this, we ignore
9696
* the status (it is only for the interface to show) and use our own maxid
9797
*/
98-
include_once (dirname(__FILE__) . "/../lib/remote_action.inc.php");
98+
include_once (SCRIPT_PATH."/lib/remote_action.inc.php");
9999

100100
/*
101101
* Get all actions this server should execute
@@ -243,4 +243,4 @@ private function _doIspCUpdate($action) {
243243
//$this->_actionDone($action['action_id'], 'ok');
244244
}
245245
}
246-
?>
246+
?>

server/server.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,9 @@
2727
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2828
*/
2929

30-
// $script_path allows development work of using a symbolic link farm
31-
// to use along side git or svn
32-
$script_path = dirname($_SERVER["SCRIPT_FILENAME"]);
33-
require("$script_path/lib/config.inc.php");
34-
require("$script_path/lib/app.inc.php");
30+
define('SCRIPT_PATH', dirname($_SERVER["SCRIPT_FILENAME"]));
31+
require(SCRIPT_PATH."/lib/config.inc.php");
32+
require(SCRIPT_PATH."/lib/app.inc.php");
3533

3634
set_time_limit(0);
3735
ini_set('error_reporting', E_ALL & ~E_NOTICE);

server/server.sh

100644100755
File mode changed.

0 commit comments

Comments
 (0)