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

Merge pull request #16 from fusionpbx/master 

14
This commit is contained in:
blackc2004 2016-02-05 09:37:07 -08:00
parent f32ca0bf14 fa1d97a6ca
commit e7c80adf2e
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/ivr_menus/ivr_menu_edit.php
View File

@ -652,6 +652,20 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
$ivr_menu_option_param = str_replace("\${domain}", "", $ivr_menu_option_param); $ivr_menu_option_param = str_replace("\${domain}", "", $ivr_menu_option_param);
$ivr_menu_option_param = str_replace(".".$_SESSION['domain_uuid'], "", $ivr_menu_option_param); $ivr_menu_option_param = str_replace(".".$_SESSION['domain_uuid'], "", $ivr_menu_option_param);
$ivr_menu_option_param = str_replace("//", "/", $ivr_menu_option_param); $ivr_menu_option_param = str_replace("//", "/", $ivr_menu_option_param);
if (preg_match( "/^phrase /", $ivr_menu_option_param )) {
// parse out phrase uuid
$phrase_uuid = str_replace("phrase ", "", $ivr_menu_option_param);
// retrieve phrase name from db
$sql = "select phrase_name from v_phrases where phrase_uuid = '$phrase_uuid' limit 1";
$prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute();
$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
if (count($result) > 0) {
$phrase_name = $result[0]['phrase_name'];
$ivr_menu_option_param = "<b>phrase:</b> $phrase_name";
}
unset ($prep_statement, $sql, $phrase_uuid, $phrase_name);
}
//$ivr_menu_option_param = ucfirst(trim($ivr_menu_option_param)); //$ivr_menu_option_param = ucfirst(trim($ivr_menu_option_param));
echo " <tr>\n"; echo " <tr>\n";
echo " <td class='vtable'>\n"; echo " <td class='vtable'>\n";

4
app/system/system.php
View File

@ -372,8 +372,7 @@ $document['title'] = $text['title-sys-status'];
} }
//memcache information //memcache information
if (permission_exists('system_view_memcache')) { if (permission_exists("system_view_memcache") && file_exists($_SERVER["PROJECT_ROOT"]."/app/sip_status/app_config.php")){
echo "<table width='100%' border='0' cellpadding='7' cellspacing='0'>\n"; echo "<table width='100%' border='0' cellpadding='7' cellspacing='0'>\n";
echo " <tr>\n"; echo " <tr>\n";
echo " <th class='th' colspan='2' align='left'>".$text['title-memcache']."</th>\n"; echo " <th class='th' colspan='2' align='left'>".$text['title-memcache']."</th>\n";
@ -418,7 +417,6 @@ $document['title'] = $text['title-sys-status'];
echo "</table>\n"; echo "</table>\n";
echo "<br /><br />\n"; echo "<br /><br />\n";
} }
//backup //backup

3
core/install/resources/classes/global_settings.php
View File

@ -132,9 +132,6 @@ require_once "root.php";
sort( $this->_switch_vdirs ); sort( $this->_switch_vdirs );
if(is_null($detect_switch)){ if(is_null($detect_switch)){
//take settings from session //take settings from session
if(!isset($_SESSION['switch'])){
throw new Exception("No detect_switch was passed to me but \$_SESSION['switch'] is empty!");
}
foreach ($this->_switch_dirs as $dir){ foreach ($this->_switch_dirs as $dir){
$category = 'switch'; $category = 'switch';
$session_var; $session_var;