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

Change links from includes to the resources directory.

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/call_center/call_center_agent_status.php
View File

@ -51,7 +51,7 @@ require_once "resources/paging.php";
//get the http post values and set them as php variables
if (count($_POST)>0) {
//include the dnd php class
include "includes/classes/do_not_disturb.php";
include "resources/classes/do_not_disturb.php";
foreach($_POST['agents'] as $row) {
if (strlen($row['status']) > 0) {

15
app/calls/resources/classes/follow_me.php
View File

@ -31,6 +31,7 @@ include "root.php";
public $db_type;
public $follow_me_uuid;
public $cid_name_prefix;
public $cid_number_prefix;
public $accountcode;
public $call_prompt;
public $follow_me_enabled;
@ -74,6 +75,9 @@ include "root.php";
$sql .= "domain_uuid, ";
$sql .= "follow_me_uuid, ";
$sql .= "cid_name_prefix, ";
if (strlen($this->cid_number_prefix) > 0) {
$sql .= "cid_number_prefix, ";
}
$sql .= "call_prompt, ";
$sql .= "follow_me_enabled ";
$sql .= ")";
@ -82,6 +86,9 @@ include "root.php";
$sql .= "'$this->domain_uuid', ";
$sql .= "'$this->follow_me_uuid', ";
$sql .= "'$this->cid_name_prefix', ";
if (strlen($this->cid_number_prefix) > 0) {
$sql .= "'$this->cid_number_prefix', ";
}
$sql .= "'$this->call_prompt', ";
$sql .= "'$this->follow_me_enabled' ";
$sql .= ")";
@ -100,6 +107,9 @@ include "root.php";
$sql = "update v_follow_me set ";
$sql .= "follow_me_enabled = '$this->follow_me_enabled', ";
$sql .= "cid_name_prefix = '$this->cid_name_prefix', ";
if (strlen($this->cid_number_prefix) > 0) {
$sql .= "cid_number_prefix = '$this->cid_number_prefix', ";
}
$sql .= "call_prompt = '$this->call_prompt' ";
$sql .= "where domain_uuid = '$this->domain_uuid' ";
$sql .= "and follow_me_uuid = '$this->follow_me_uuid' ";
@ -273,6 +283,7 @@ include "root.php";
$follow_me_uuid = $row["follow_me_uuid"];
$this->call_prompt = $row["call_prompt"];
$this->cid_name_prefix = $row["cid_name_prefix"];
$this->cid_number_prefix = $row["cid_number_prefix"];
}
}
unset ($prep_statement);
@ -294,6 +305,10 @@ include "root.php";
if (strlen($this->cid_name_prefix) > 0) {
$dial_string .= ",origination_caller_id_name=".$this->cid_name_prefix."#\${caller_id_name}";
}
if (strlen($this->cid_number_prefix) > 0) {
$dial_string .= ",origination_caller_id_number=".$this->cid_number_prefix."";
//$dial_string .= ",origination_caller_id_number=".$this->cid_number_prefix."#\${caller_id_number}";
}
if (strlen($this->accountcode) > 0) {
$dial_string .= ",accountcode=".$this->accountcode;
}

2
app/calls_active/calls_exec.php
View File

@ -125,7 +125,7 @@ if (count($_GET)>0) {
if (strlen($user_status) > 0) {
//include the dnd class
include "includes/classes/do_not_disturb.php";
include "resources/classes/do_not_disturb.php";
//loop through the list of assigned extensions
foreach ($_SESSION['user']['extension'] as &$row) {
$extension = $row["user"];

2
app/content/rssadd.php
View File

@ -272,7 +272,7 @@ if (count($_POST)>0) {
//echo " <td class='vncellreq' valign='top'></td>";
echo " <td class='' colspan='2' align='left'>";
echo " <strong>".$text['label-content'].":</strong> ";
if (is_dir($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/includes/tiny_mce')) {
if (is_dir($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/resources/tiny_mce')) {
echo " &nbsp; &nbsp; &nbsp; editor &nbsp; <a href='#' title='toggle' onclick=\"toogleEditorMode('rss_description'); return false;\">".$text['label-on-off']."</a><br>";
}
else {

2
app/content/rssupdate.php
View File

@ -305,7 +305,7 @@ else {
echo " <td class='' colspan='2' align='left'>";
echo " <strong>".$text['label-content'].":</strong> ";
if ($rss_optional_1 == "text/html") {
if (is_dir($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/includes/tiny_mce')) {
if (is_dir($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/resources/tiny_mce')) {
echo " &nbsp; &nbsp; &nbsp; editor &nbsp; <a href='#' title='toggle' onclick=\"toogleEditorMode('rss_description'); return false;\">".$text['label-on-off']."</a><br>";
}
echo " <textarea name='rss_description' id='rss_description' class='formfld' cols='20' style='width: 100%' rows='12' >$rss_description</textarea>";

5
app/follow_me/app_config.php
View File

@ -62,6 +62,7 @@
//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
//$apps[$x]['permissions'][$y]['groups'][] = 'user';
$y++;
$apps[$x]['permissions'][$y]['name'] = 'follow_me_cid_number_prefix';
//schema details
$y = 0; //table array index
@ -83,6 +84,10 @@
$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
$z++;
$apps[$x]['db'][$y]['fields'][$z]['name'] = 'cid_number_prefix';
$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
$z++;
$apps[$x]['db'][$y]['fields'][$z]['name'] = 'call_prompt';
$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';

2
core/user_settings/user_dashboard.php
View File

@ -30,7 +30,7 @@
//if config.php file does not exist then redirect to the install page
if (file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/resources/config.php")) {
//do nothing
} elseif (file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/includes/config.php")) {
} elseif (file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/resources/config.php")) {
//original directory
} elseif (file_exists("/etc/fusionpbx/config.php")){
//linux

2
index.php
View File

@ -28,7 +28,7 @@ include "root.php";
//if config.php file does not exist then redirect to the install page
if (file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/resources/config.php")) {
//do nothing
} elseif (file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/includes/config.php")) {
} elseif (file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/resources/config.php")) {
//original directory
} elseif (file_exists("/etc/fusionpbx/config.php")){
//linux

2
login.php
View File

@ -28,7 +28,7 @@ include "root.php";
//if config.php file does not exist then redirect to the install page
if (file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/resources/config.php")) {
//do nothing
} elseif (file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/includes/config.php")) {
} elseif (file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/resources/config.php")) {
//original directory
} elseif (file_exists("/etc/fusionpbx/config.php")){
//linux

4
resources/classes/database.php
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";

2
resources/classes/modules.php
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";

10
resources/install.php
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>";

2
resources/login.php
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";

4
resources/menu.php
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";

4
resources/require.php
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";

6
resources/wysiwyg.php
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";