From 967af4dc370c393a349fdbf2e6b2ef4877a5b61f Mon Sep 17 00:00:00 2001 From: Clemens Schwaighofer Date: Fri, 24 Nov 2017 13:27:13 +0900 Subject: [PATCH] Core libraries white space fixes --- www/libs/Class.Admin.Backend.inc | 6 +- www/libs/Class.Progressbar.inc | 108 +++++++++++++++---------------- www/libs/Class.l10n.inc | 4 +- www/libs/db_pgsql.inc | 8 +-- www/libs/db_pgsql_pdo.inc | 12 ++-- 5 files changed, 69 insertions(+), 69 deletions(-) diff --git a/www/libs/Class.Admin.Backend.inc b/www/libs/Class.Admin.Backend.inc index 03deca3c..65bb73b7 100644 --- a/www/libs/Class.Admin.Backend.inc +++ b/www/libs/Class.Admin.Backend.inc @@ -81,7 +81,7 @@ // set page name $this->page_name = $this->get_page_name(); - + // set the action ids foreach ($this->action_list as $_action) { @@ -102,7 +102,7 @@ $this->queue_key = join('', array_map(function () { $range = $GLOBALS['_KEY_RANGE']; return $range[rand(0, (count($range) - 1))]; }, range(1, 3))); } } - + // deconstructor public function __destruct() { @@ -110,7 +110,7 @@ } // INTERNAL METHODS |===============================================> - + // PUBLIC METHODS |=================================================> diff --git a/www/libs/Class.Progressbar.inc b/www/libs/Class.Progressbar.inc index 6b20a971..f52b57dd 100644 --- a/www/libs/Class.Progressbar.inc +++ b/www/libs/Class.Progressbar.inc @@ -14,7 +14,7 @@ class ProgressBar { // private vars - + public $code; // unique code public $status = 'new'; // current status (new,show,hide) public $step = 0; // current step @@ -22,12 +22,12 @@ class ProgressBar public $clear_buffer_size = 1; // we need to send this before the lfush to get browser output public $clear_buffer_size_init = 1024*1024; // if I don't send that junk, it won't send anything - + // public vars - + public $min = 0; // minimal steps public $max = 100; // maximal steps - + public $left = 5; // bar position from left public $top = 5; // bar position from top public $width = 300; // bar width @@ -38,9 +38,9 @@ class ProgressBar public $bgr_color_master = '#ffffff'; // master div background color public $border = 1; // bar border width public $brd_color = '#000000'; // bar border color - + public $direction = 'right'; // direction of motion (right,left,up,down) - + public $frame = array('show' => false); // ProgressBar Frame /* 'show' => false, # frame show (true/false) 'left' => 200, # frame position from left @@ -51,7 +51,7 @@ class ProgressBar 'border' => 2, # frame border 'brd_color' => '#dfdfdf #404040 #404040 #dfdfdf' # frame border color */ - + public $label = array(); // ProgressBar Labels /* 'name' => array( # label name 'type' => 'text', # label type (text,button,step,percent,crossbar) @@ -68,7 +68,7 @@ class ProgressBar 'bgr_color' => '' # label background color ) */ - + // constructor public function __construct($width = 0, $height = 0) { @@ -81,9 +81,9 @@ class ProgressBar $this->_flushCache($this->clear_buffer_size_init); $this->_flushCache($this->clear_buffer_size_init); } - + // private functions - + private function _flushCache($clear_buffer_size = 0) { if (!$clear_buffer_size) @@ -103,7 +103,7 @@ class ProgressBar $percent = 100; return $percent; } - + private function _calculatePosition($step) { switch ($this->direction) @@ -125,7 +125,7 @@ class ProgressBar $pixel = 0; if ($step >= $this->max) $pixel = $bar - ($this->pedding * 2); - + switch ($this->direction) { case 'right': @@ -155,7 +155,7 @@ class ProgressBar } return $position; } - + private function _setStep($step) { if ($step > $this->max) @@ -164,7 +164,7 @@ class ProgressBar $step = $this->min; $this->step = $step; } - + // public functions public function setFrame($width = 0, $height = 0) { @@ -178,13 +178,13 @@ class ProgressBar 'border' => 2, 'brd_color' => '#dfdfdf #404040 #404040 #dfdfdf' ); - + if ($width > 0) $this->frame['width'] = $width; if ($height > 0) $this->frame['height'] = $height; } - + public function addLabel($type, $name, $value = ' ') { switch($type) @@ -280,14 +280,14 @@ class ProgressBar break; } } - + public function addButton($name, $value, $action, $target = 'self') { $this->addLabel('button', $name, $value); $this->label[$name]['action'] = $action; $this->label[$name]['target'] = $target; } - + public function setLabelPosition($name, $left, $top, $width, $height, $align='') { // print "SET POSITION[$name]: $left
"; @@ -301,7 +301,7 @@ class ProgressBar if ($align != '') $this->label[$name]['align'] = $align; - } + } // init if ($this->status != 'new') { @@ -316,7 +316,7 @@ class ProgressBar $this->_flushCache(); } } - + public function setLabelColor($name, $color) { $this->label[$name]['color'] = $color; @@ -326,7 +326,7 @@ class ProgressBar $this->_flushCache(); } } - + public function setLabelBackground($name, $color) { $this->label[$name]['bgr_color'] = $color; @@ -336,7 +336,7 @@ class ProgressBar $this->_flushCache(); } } - + public function setLabelFont($name, $size, $family = '', $weight = '') { // just in case if it is too small @@ -355,7 +355,7 @@ class ProgressBar $this->label[$name]['font-family'] = $family; if ($weight != '') $this->label[$name]['font-weight'] = $weight; - + if ($this->status != 'new') { $output = ''."\n"; $html .= ''; - + return $html; } - + public function show() { $this->status = 'show'; echo $this->getHtml(); $this->_flushCache(); } - + public function moveStep($step) { $last_step = $this->step; $this->_setStep($step); - + $js = ''; $new_position = $this->_calculatePosition($this->step); if ($new_position['width'] != $this->position['width'] && ($this->direction == 'right' || $this->direction == 'left')) @@ -621,37 +621,37 @@ class ProgressBar $this->_flushCache(); } } - + public function moveNext() { $this->moveStep($this->step + 1); } - + public function moveMin() { $this->moveStep($this->min); } - + public function hide() { if ($this->status == 'show') { $this->status = 'hide'; - + $output = ''."\n"; + $output .= ''."\n"; echo $output; $this->_flushCache(); } } - + public function unhide() { if ($this->status == 'hide') { $this->status = 'show'; - + $output = ''."\n"; @@ -659,6 +659,6 @@ class ProgressBar $this->_flushCache(); } } - + } ?> diff --git a/www/libs/Class.l10n.inc b/www/libs/Class.l10n.inc index 8601a5f6..f282c13e 100644 --- a/www/libs/Class.l10n.inc +++ b/www/libs/Class.l10n.inc @@ -11,9 +11,9 @@ * I changed that to a class to be more portable with my style of coding * * PUBLIC VARIABLES - * + * * PRIVATE VARIABLES - * + * * PUBLIC METHODS * __: returns string (translated or original if not found) * _e: echos out string (translated or original if not found) diff --git a/www/libs/db_pgsql.inc b/www/libs/db_pgsql.inc index c4b65a67..bbf17307 100644 --- a/www/libs/db_pgsql.inc +++ b/www/libs/db_pgsql.inc @@ -1,7 +1,7 @@ dbh); } - + // METHOD: _db_version // PARAMS: none // RETURN: databse version diff --git a/www/libs/db_pgsql_pdo.inc b/www/libs/db_pgsql_pdo.inc index 9ac0a518..98535f87 100644 --- a/www/libs/db_pgsql_pdo.inc +++ b/www/libs/db_pgsql_pdo.inc @@ -33,7 +33,7 @@ else return false; } - + // METHOD: _db_query // PARAMS: query // RETURN: cursor @@ -99,7 +99,7 @@ } $this->dbh = null; } - + // METHOD: _db_prepare // PARAMS: prepare name, query // RETURN: prepared statement handler @@ -140,7 +140,7 @@ // return pg_num_fields($cursor); return $cursor->columnCount(); } - + // METHOD: _db_field_name // PARAMS: cursor, field position // RETURN: name of field @@ -166,7 +166,7 @@ // DESC : wrapper for pg_affected_rows public function _db_affected_rows($cursor) { -// return pg_affected_rows($cursor); +// return pg_affected_rows($cursor); return $cusor->rowCount(); } @@ -278,7 +278,7 @@ { $db_port = 5432; } - try + try { $this->dbh = new PDO('pgsql:host='.$db_host.';dbname='.$db_name.';port='.$db_port.';sslmode='.$db_ssl, $db_user, $db_pass); } @@ -342,7 +342,7 @@ { // return pg_connection_busy($this->dbh); } - + // METHOD: _db_version // PARAMS: none // RETURN: databse version