From 91b61683c0c5308d6fa47901f032bdbac73fb067 Mon Sep 17 00:00:00 2001 From: mafoo Date: Fri, 11 Mar 2016 12:03:29 +0000 Subject: [PATCH] WhitespaceClean-core/install whitespace pass over files for reference regex that was used s/[ \t]+(\r?\n)/\1/ --- core/install/install.php | 6 +++--- core/install/resources/classes/detect_switch.php | 6 +++--- core/install/resources/classes/global_settings.php | 2 +- core/install/resources/classes/install_fusionpbx.php | 2 +- core/install/resources/classes/install_switch.php | 2 +- core/install/resources/page_parts/install_config_detail.php | 2 +- core/install/resources/page_parts/install_event_socket.php | 6 +++--- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/core/install/install.php b/core/install/install.php index a3e1189695..8863c433cd 100644 --- a/core/install/install.php +++ b/core/install/install.php @@ -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 diff --git a/core/install/resources/classes/detect_switch.php b/core/install/resources/classes/detect_switch.php index 9324840280..0232bbb715 100644 --- a/core/install/resources/classes/detect_switch.php +++ b/core/install/resources/classes/detect_switch.php @@ -22,7 +22,7 @@ Contributor(s): Matthew Vale - + */ 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){ diff --git a/core/install/resources/classes/global_settings.php b/core/install/resources/classes/global_settings.php index 24d980d912..0c9c1c6120 100644 --- a/core/install/resources/classes/global_settings.php +++ b/core/install/resources/classes/global_settings.php @@ -22,7 +22,7 @@ Contributor(s): Matthew Vale - + */ require_once "root.php"; diff --git a/core/install/resources/classes/install_fusionpbx.php b/core/install/resources/classes/install_fusionpbx.php index 263d796241..2cdd85b44e 100644 --- a/core/install/resources/classes/install_fusionpbx.php +++ b/core/install/resources/classes/install_fusionpbx.php @@ -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); diff --git a/core/install/resources/classes/install_switch.php b/core/install/resources/classes/install_switch.php index 8d6013c114..3467d00507 100644 --- a/core/install/resources/classes/install_switch.php +++ b/core/install/resources/classes/install_switch.php @@ -61,7 +61,7 @@ include "root.php"; echo "$message\n"; } } - + function write_progress($message) { if($this->echo_progress){ echo "$message\n"; diff --git a/core/install/resources/page_parts/install_config_detail.php b/core/install/resources/page_parts/install_config_detail.php index 6fd2c8ce05..e25889ac5c 100644 --- a/core/install/resources/page_parts/install_config_detail.php +++ b/core/install/resources/page_parts/install_config_detail.php @@ -68,7 +68,7 @@ echo "\n"; echo "