nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2025-12-30 00:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

WhitespaceClean-core/install

Browse Source 
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
This commit is contained in:
mafoo
2016-03-11 12:03:29 +00:00
parent 11c2176a15
commit 91b61683c0
7 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/install/install.php
View File

@@ -53,8 +53,8 @@ require_once "resources/classes/text.php";
//TBD $locale = Locale::getDefault();
$timezone = 'UTC';
if (is_link('/etc/localtime')) {
// Mac OS X (and older Linuxes)
// /etc/localtime is a symlink to the
// Mac OS X (and older Linuxes)
// /etc/localtime is a symlink to the
// timezone in /usr/share/zoneinfo.
$filename = readlink('/etc/localtime');
if (strpos($filename, '/usr/share/zoneinfo/') === 0) {
@@ -73,7 +73,7 @@ if (is_link('/etc/localtime')) {
$timezone = $data['ZONE'];
}
}
date_default_timezone_set($timezone);
//detect install state

6
core/install/resources/classes/detect_switch.php
View File

@@ -22,7 +22,7 @@
Contributor(s):
Matthew Vale <github@mafoo.org>
*/
require_once "root.php";
require_once "resources/classes/EventSocket.php";
@@ -151,14 +151,14 @@ require_once "resources/classes/EventSocket.php";
}
return false;
}
protected function event_socket_request($cmd) {
$esl = new EventSocket($this->event_socket);
$result = $esl->request($cmd);
$esl->reset_fp();
return $result;
}
public function restart_switch() {
$this->connect_event_socket();
if(!$this->event_socket){

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

@@ -22,7 +22,7 @@
Contributor(s):
Matthew Vale <github@mafoo.org>
*/
require_once "root.php";

2
core/install/resources/classes/install_fusionpbx.php
View File

@@ -427,7 +427,7 @@ include "root.php";
//create the table, user and set the permissions only if the db_create_username was provided
if ($this->global_settings->db_create()) {
$this->write_progress("\tCreating database");
$this->write_progress("\tCreating database");
try {
$this->dbh = new PDO($connect_string, $this->global_settings->db_create_username(), db_create_password, array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
$this->dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);

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

@@ -61,7 +61,7 @@ include "root.php";
echo "$message\n";
}
}
function write_progress($message) {
if($this->echo_progress){
echo "$message\n";

2
core/install/resources/page_parts/install_config_detail.php
View File

@@ -68,7 +68,7 @@
echo "<td class='vtable' align='left'>\n";
echo " <select id='install_default_country' name='install_default_country' class='formfld' style=''>\n";
require "resources/countries.php";
foreach ($countries as $iso_code => $country ){
if($iso_code == $install_default_country){
echo " <option value='$iso_code' selected='selected'>".$country['country']."</option>\n";

6
core/install/resources/page_parts/install_event_socket.php
View File

@@ -89,7 +89,7 @@
echo "</form>";
if($detect_ok){
echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
echo "<tr>\n";
echo "<td colspan='4' align='left' nowrap><b>".$text['title-detected_configuration']."</b></td>\n";
echo "</tr>\n";
@@ -102,7 +102,7 @@
echo "<td class='vtable' width='35%' align='left'>\n";
echo " ".$switch_detect->version()."\n";
echo "</td>\n";
foreach ($switch_detect->get_dirs() as $folder)
{
if($id % 2 == 0){ echo "<tr>\n"; }
@@ -132,7 +132,7 @@
if($id % 2 == 1){ echo "</tr>\n"; }
$id++;
}
echo "</table>";
}