dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change links from includes to the resources directory.

Browse Source
This commit is contained in:
Mark Crane
2013-07-10 23:41:12 +00:00
parent 2c3f51fdcf
commit 9f71bdd024
16 changed files with 43 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/classes/database.php
+2 -2
View File
@@ -55,8 +55,8 @@ include "root.php";
include "root.php";
if (file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/resources/config.php")) {
include $_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/resources/config.php";
} elseif (file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/includes/config.php")) {
include $_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/includes/config.php";
} elseif (file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/resources/config.php")) {
include $_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/resources/config.php";
} elseif (file_exists("/etc/fusionpbx/config.php")){
//linux
include "/etc/fusionpbx/config.php";
resources/classes/modules.php
+1 -1
View File
@@ -27,7 +27,7 @@ include "root.php";
//add the database structure
/*
require_once "includes/classes/modules.php";
require_once "resources/classes/modules.php";
$mod = new switch_modules;
$mod->dir = $_SESSION['switch']['mod']['dir'];
echo $mod->dir."\n";
resources/install.php
+5 -5
View File
@@ -46,7 +46,7 @@ require_once "resources/functions.php";
$domain_name = $domain_array[0];
//if the config file exists then disable the install page
if (file_exists($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/includes/config.php")) {
if (file_exists($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/resources/config.php")) {
$msg .= "Already Installed";
header("Location: ".PROJECT_PATH."/index.php?msg=".urlencode($msg));
exit;
@@ -449,15 +449,15 @@ if ($_POST["install_step"] == "3" && count($_POST) > 0 && strlen($_POST["persist
$tmp_config .= " error_reporting(E_ALL ^ E_NOTICE ^ E_WARNING ); //hide notices and warnings";
$tmp_config .= "\n";
$tmp_config .= "?>";
if (is_dir($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/includes")) {
$config = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/includes/config.php";
if (is_dir($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/resources")) {
$config = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/resources/config.php";
} elseif (is_dir("/etc/fusionpbx")){
$config = "/etc/fusionpbx/config.php";
} elseif (is_dir("/usr/local/etc/fusionpbx")){
$config = "/usr/local/etc/fusionpbx/config.php";
}
else {
$config = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/includes/config.php";
$config = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/resources/config.php";
}
$fout = fopen($config,"w");
fwrite($fout, $tmp_config);
@@ -1347,7 +1347,7 @@ if ($_POST["install_step"] == "3" && count($_POST) > 0 && strlen($_POST["persist
//show the html form
if (!is_writable($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/resources/header.php")) {
$install_msg .= "<li>Write access to ".$_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/includes/ is required during the install.</li>\n";
$install_msg .= "<li>Write access to ".$_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/resources/ is required during the install.</li>\n";
}
if (!extension_loaded('PDO')) {
$install_msg .= "<li>PHP PDO was not detected. Please install it before proceeding.</li>";
resources/login.php
+1 -1
View File
@@ -71,7 +71,7 @@
echo "username: <strong>admin</strong> <br />password: <strong>fusionpbx</strong> <br/><br/>\n";
echo "</li>\n";
echo "<li>\n";
echo "The database connection settings have been saved to ".$_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/includes/config.php.<br />\n";
echo "The database connection settings have been saved to ".$_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/resources/config.php.<br />\n";
echo "</li>\n";
echo "</ul>\n";
echo "<strong>\n";
resources/menu.php
+2 -2
View File
@@ -47,14 +47,14 @@ require_once "resources/require.php";
$v_menu .= " #menu{float:none;} /* This is required for IE to avoid positioning bug when placing content first in source. */\n";
$v_menu .= " /* IE Menu CSS */\n";
$v_menu .= " /* csshover.htc file version: V1.21.041022 - Available for download from: http://www.xs4all.nl/~peterned/csshover.html */\n";
$v_menu .= " body{behavior:url(/includes/csshover.htc);\n";
$v_menu .= " body{behavior:url(/resources/csshover.htc);\n";
$v_menu .= " font-size:100%; /* to enable text resizing in IE */\n";
$v_menu .= " }\n";
$v_menu .= " #menu ul li{float:left;width:100%;}\n";
$v_menu .= " #menu h2, #menu a{height:1%;font:bold arial,helvetica,sans-serif;}\n";
$v_menu .= " </style>\n";
$v_menu .= " <![endif]-->\n";
//$v_menu .= " <style type=\"text/css\">@import url(\"/includes/menuh.css\");</style>\n";
//$v_menu .= " <style type=\"text/css\">@import url(\"/resources/menuh.css\");</style>\n";
$v_menu .= "\n";
$v_menu .= "<!-- Begin CSS Horizontal Popout Menu -->\n";
resources/require.php
+2 -2
View File
@@ -30,8 +30,8 @@ if (file_exists("/etc/fusionpbx/config.php")) {
elseif (file_exists("/usr/local/etc/fusionpbx/config.php")) {
include "/usr/local/etc/fusionpbx/config.php";
}
elseif (file_exists("includes/config.php")) {
include "includes/config.php";
elseif (file_exists("resources/config.php")) {
include "resources/config.php";
}
else {
include "resources/config.php";
resources/wysiwyg.php
+3 -3
View File
@@ -33,11 +33,11 @@
//plugins : style,layer,table,save,advhr,advimage,advlink,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,spellchecker
//theme_advanced_buttons3_add : "spellchecker,media,advhr,separator,print,separator,ltr,rtl,separator,fullscreen",
//<script language="javascript" type="text/javascript" src="/includes/tiny_mce/tiny_mce.js"></script>
//<script language="javascript" type="text/javascript" src="/resources/tiny_mce/tiny_mce.js"></script>
?>
<script type="text/javascript" src="<?php echo PROJECT_PATH; ?>/includes/tiny_mce/tiny_mce_gzip.js"></script>
<script type="text/javascript" src="<?php echo PROJECT_PATH; ?>/resources/tiny_mce/tiny_mce_gzip.js"></script>
<script type="text/javascript">
tinyMCE_GZ.init({
plugins : 'style,layer,table,save,advhr,advimage,advlink,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,spellchecker',
@@ -85,7 +85,7 @@ tinyMCE_GZ.init({
function ajaxfilemanager(field_name, url, type, win) {
var ajaxfilemanagerurl = "<?php echo PROJECT_PATH; ?>/includes/tiny_mce/plugins/ajaxfilemanager/ajaxfilemanager.php";
var ajaxfilemanagerurl = "<?php echo PROJECT_PATH; ?>/resources/tiny_mce/plugins/ajaxfilemanager/ajaxfilemanager.php";
switch (type) {
case "image":
ajaxfilemanagerurl += "?type=img";