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

Remove trailing tabs. Fix some spelling mistakes. And update core/upgrade/app_defaults.php to fix advanced -> upgrade.

This commit is contained in:
markjcrane 2015-11-25 18:06:27 -07:00
parent 331778e36c
commit a30b0b56ab
7 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/install/index.php
View File

@ -95,8 +95,6 @@ if (!if_group("superadmin")) {
echo "<br><br>";
echo "<p>WiP</p>";
//include the footer
require_once "resources/footer.php";
?>

10
core/install/install_first_time.php
View File

@ -17,7 +17,7 @@
The Initial Developer of the Original Code is
Mark J Crane <markjcrane@fusionpbx.com>
Portions created by the Initial Developer are Copyright (C) 2008-2012
Portions created by the Initial Developer are Copyright (C) 2008-2015
the Initial Developer. All Rights Reserved.
Contributor(s):
@ -28,7 +28,7 @@ require_once "root.php";
require_once "resources/functions.php";
require_once "resources/classes/text.php";
//initialize varibles we are going to use
//initialize variables we are going to use
$event_host = '';
$event_port = '';
$event_password = '';
@ -185,11 +185,8 @@ if(!$install_step) { $install_step = 'select_language'; }
//set the max execution time to 1 hour
ini_set('max_execution_time',3600);
}
//display messages
if (count($messages)>0) {
echo "<br />\n";
@ -262,7 +259,7 @@ if(!$install_step) { $install_step = 'select_language'; }
try {
$switch_detect->detect();
} catch(Exception $e){
echo "<p>Failed to detect confgiuration detect_switch reported: " . $e->getMessage() . "</p>\n";
echo "<p>Failed to detect configuration detect_switch reported: " . $e->getMessage() . "</p>\n";
$detect_ok = false;
}
if($detect_ok){
@ -345,6 +342,7 @@ if($first_time_install){
$_SESSION['permissions'][]['permission_name'] = 'superadmin';
$_SESSION['menu'] = '';
}
// add the content to the template and then send output
$body = ob_get_contents(); //get the output from the buffer
ob_end_clean(); //clean the buffer

7
core/install/resources/classes/install_switch.php
View File

@ -35,9 +35,9 @@ include "root.php";
public $debug = false;
function __construct($domain_name, $domain_uuid, $detect_switch) {
if(!is_a($detect_switch, 'detect_switch')){
throw new Exception('The parameter $detect_switch must be a detect_switch object (or a subclass of)');
}
//if(!is_a($detect_switch, 'detect_switch')){
// throw new Exception('The parameter $detect_switch must be a detect_switch object (or a subclass of)');
//}
$this->domain_uuid = $domain_uuid;
$this->domain = $domain_name;
$this->detect_switch = $detect_switch;
@ -166,7 +166,6 @@ include "root.php";
}
}
function install() {
$this->copy_conf();
$this->copy_scripts();

6
core/upgrade/app_defaults.php
View File

@ -34,10 +34,8 @@ if ($domains_processed == 1) {
}
//copy the files and directories from resources/install
$install = new install;
$install->domain_uuid = $domain_uuid;
$install->switch_scripts_dir = $_SESSION['switch']['scripts']['dir'];
$install->copy_scripts();
$obj = new install_switch;
$obj->upgrade();
}
//update the software table

4
resources/templates/provision/cisco/7940/SIPDefault.cnf
View File

@ -126,6 +126,6 @@ directory_url: "http://{$domain_name}/app/provision/?file=directory.php"
# URL for branding logo
#logo_url: "http://{$domain_name}/app/provision/logo.bmp"
# Remote Party ID
remote_party_id: 1 ; 0-Disabled (default), 1-Enabled
# Remote Party ID 0-Disabled (default), 1-Enabled
remote_party_id: 1

2
resources/templates/provision/mitel/5324/MN_${mac}.cfg
View File

@ -31,7 +31,7 @@
<remote_reboot>1</remote_reboot>
<checkpeercert>0</checkpeercert>
<sipkeepalive>1</sipkeepalive>
<rss_feed>http://rss.news.yahoo.com/rss/topstories</rss_feed>
<rss_feed></rss_feed>
<host_ip>135.199.77.12</host_ip>
<video_ip>135.199.77.12</video_ip>
<sntp>128.138.141.172</sntp>

2
resources/templates/provision/mitel/5340/MN_${mac}.cfg
View File

@ -31,7 +31,7 @@
<remote_reboot>1</remote_reboot>
<checkpeercert>0</checkpeercert>
<sipkeepalive>1</sipkeepalive>
<rss_feed>http://rss.news.yahoo.com/rss/topstories</rss_feed>
<rss_feed></rss_feed>
<host_ip>135.199.77.12</host_ip>
<video_ip>135.199.77.12</video_ip>
<sntp>128.138.141.172</sntp>