HuasoFoundries / phpPgAdmin6

index.php

Spacing +11 added lines, -11 removed lines

@@ -5,7 +5,7 @@ 
  */
 require_once './src/lib.inc.php';
 
-$app->post('/redirect[/{subject}]', function ($request, $response, $args) {
+$app->post('/redirect[/{subject}]', function($request, $response, $args) {
     $body = $response->getBody();
     $query_string = $request->getUri()->getQuery();
     $misc = $this->misc;
@@ -13,7 +13,7 @@ 
     $loginShared = $request->getParsedBodyParam('loginShared');
     $loginServer = $request->getParsedBodyParam('loginServer');
     $loginUsername = $request->getParsedBodyParam('loginUsername');
-    $loginPassword = $request->getParsedBodyParam('loginPassword_'.md5($loginServer));
+    $loginPassword = $request->getParsedBodyParam('loginPassword_' . md5($loginServer));
 
     // If login action is set, then set session variables
     if (boolval($loginServer) && boolval($loginUsername) && $loginPassword !== null) {
@@ -53,47 +53,47 @@ 
     }
 });
 
-$app->get('/redirect[/{subject}]', function ($request, $response, $args) {
+$app->get('/redirect[/{subject}]', function($request, $response, $args) {
     $subject = (isset($args['subject'])) ? $args['subject'] : 'root';
     $destinationurl = $this->utils->getDestinationWithLastTab($subject);
 
     return $response->withStatus(302)->withHeader('Location', $destinationurl);
 });
 
-$app->get('/src/views/browser', function ($request, $response, $args) {
+$app->get('/src/views/browser', function($request, $response, $args) {
     $controller = new \PHPPgAdmin\Controller\BrowserController($this, true);
 
     return $controller->render();
 });
 
-$app->get('/src/views/login', function ($request, $response, $args) {
+$app->get('/src/views/login', function($request, $response, $args) {
     $controller = new \PHPPgAdmin\Controller\LoginController($this, true);
 
     return $controller->render();
 });
 
-$app->get('/src/views/servers', function ($request, $response, $args) {
+$app->get('/src/views/servers', function($request, $response, $args) {
     $controller = new \PHPPgAdmin\Controller\ServersController($this, true);
 
     return $controller->render();
 });
 
-$app->get('/src/views/intro', function ($request, $response, $args) {
+$app->get('/src/views/intro', function($request, $response, $args) {
     $controller = new \PHPPgAdmin\Controller\IntroController($this, true);
 
     return $controller->render();
 });
 
-$app->map(['GET', 'POST'], '/src/views/{subject}', function ($request, $response, $args) {
+$app->map(['GET', 'POST'], '/src/views/{subject}', function($request, $response, $args) {
     $subject = $args['subject'];
 
-    $className = '\PHPPgAdmin\Controller\\'.ucfirst($subject).'Controller';
+    $className = '\PHPPgAdmin\Controller\\' . ucfirst($subject) . 'Controller';
     $controller = new $className($this);
 
     return $controller->render();
 });
 
-$app->get('/[{subject}]', function ($request, $response, $args) {
+$app->get('/[{subject}]', function($request, $response, $args) {
     $subject = (isset($args['subject'])) ? $args['subject'] : 'intro';
     $_server_info = $this->misc->getServerInfo();
     $query_string = $request->getUri()->getQuery();
@@ -108,7 +108,7 @@ 
     }
 
     $viewVars = [
-        'url'            => '/src/views/'.$subject.($query_string ? '?'.$query_string : ''),
+        'url'            => '/src/views/' . $subject . ($query_string ? '?' . $query_string : ''),
         'headertemplate' => 'header.twig',
     ];
 

src/database/Postgres83.php

Spacing +1 added lines, -1 removed lines

@@ -322,7 +322,7 @@
 
             // toggle cycle yes/no
             if (!is_null($cycledvalue)) {
-                $sql .= (!$cycledvalue ? ' NO ' : '').' CYCLE';
+                $sql .= (!$cycledvalue ? ' NO ' : '') . ' CYCLE';
             }
 
             if ($sql != '') {

src/database/Connection.php

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
         // Ignore host if null
         if ($host === null || $host == '') {
             if ($port !== null && $port != '') {
-                $pghost = ':'.$port;
+                $pghost = ':' . $port;
             } else {
                 $pghost = '';
             }
@@ -46,7 +46,7 @@ 
 
         // Add sslmode to $pghost as needed
         if (($sslmode == 'disable') || ($sslmode == 'allow') || ($sslmode == 'prefer') || ($sslmode == 'require')) {
-            $pghost .= ':'.$sslmode;
+            $pghost .= ':' . $sslmode;
         } elseif ($sslmode == 'legacy') {
             $pghost .= ' requiressl=1';
         }

src/database/Postgres82.php

Spacing +3 added lines, -3 removed lines

@@ -251,13 +251,13 @@
 
             if (is_array($definition)) {
                 $this->arrayClean($definition);
-                $sql .= "'".$definition[0]."'";
+                $sql .= "'" . $definition[0] . "'";
                 if ($definition[1]) {
-                    $sql .= ",'".$definition[1]."'";
+                    $sql .= ",'" . $definition[1] . "'";
                 }
             } else {
                 $this->clean($definition);
-                $sql .= "'".$definition."'";
+                $sql .= "'" . $definition . "'";
             }
 
             $sql .= " LANGUAGE \"{$language}\"";

src/database/ADOdbBase.php

Spacing +2 added lines, -2 removed lines

@@ -235,7 +235,7 @@ 
                     $values = ") VALUES ('{$value}'";
                 }
             }
-            $sql = $fields.$values.')';
+            $sql = $fields . $values . ')';
         }
 
         // Check for failures
@@ -304,7 +304,7 @@ 
         }
 
         // Check for failures
-        if (!$this->conn->Execute($setClause.$whereClause)) {
+        if (!$this->conn->Execute($setClause . $whereClause)) {
             // Check for unique constraint failure
             if (stristr($this->conn->ErrorMsg(), 'unique')) {
                 return -1;

src/database/Postgres.php

Spacing +52 added lines, -52 removed lines

@@ -269,13 +269,13 @@ 
             if (is_array($this->help_page[$help])) {
                 $urls = [];
                 foreach ($this->help_page[$help] as $link) {
-                    $urls[] = $this->help_base.$link;
+                    $urls[] = $this->help_base . $link;
                 }
 
                 return $urls;
             }
 
-            return $this->help_base.$this->help_page[$help];
+            return $this->help_base . $this->help_page[$help];
         } else {
             return;
         }
@@ -288,7 +288,7 @@ 
     public function getHelpPages()
     {
         if ($this->help_page === null || $this->help_base === null) {
-            $help_classname = '\PHPPgAdmin\Help\PostgresDoc'.str_replace('.', '', $this->major_version);
+            $help_classname = '\PHPPgAdmin\Help\PostgresDoc' . str_replace('.', '', $this->major_version);
 
             $help_class = new $help_classname($this->conf, $this->major_version);
 
@@ -314,7 +314,7 @@ 
         // Determine actions string
         $extra_str = '';
         foreach ($extras as $k => $v) {
-            $extra_str .= " {$k}=\"".htmlspecialchars($v).'"';
+            $extra_str .= " {$k}=\"" . htmlspecialchars($v) . '"';
         }
 
         switch (substr($type, 0, 9)) {
@@ -444,7 +444,7 @@ 
 
         if (isset($server_info['hiddendbs']) && $server_info['hiddendbs']) {
             $hiddendbs = $server_info['hiddendbs'];
-            $not_in = "('".implode("','", $hiddendbs)."')";
+            $not_in = "('" . implode("','", $hiddendbs) . "')";
             $clause .= " AND pdb.datname NOT IN {$not_in} ";
         }
 
@@ -1107,7 +1107,7 @@ 
         }
         $this->fieldArrayClean($temp);
 
-        $sql = 'SET SEARCH_PATH TO "'.implode('","', $temp).'"';
+        $sql = 'SET SEARCH_PATH TO "' . implode('","', $temp) . '"';
 
         return $this->execute($sql);
     }
@@ -1408,7 +1408,7 @@ 
         }
 
         // Output a reconnect command to create the table as the correct user
-        $sql = $this->getChangeUserSQL($t->fields['relowner'])."\n\n";
+        $sql = $this->getChangeUserSQL($t->fields['relowner']) . "\n\n";
 
         // Set schema search path
         $sql .= "SET search_path = \"{$t->fields['nspname']}\", pg_catalog;\n\n";
@@ -1441,7 +1441,7 @@ 
                     $sql .= ' BIGSERIAL';
                 }
             } else {
-                $sql .= ' '.$this->formatType($atts->fields['type'], $atts->fields['atttypmod']);
+                $sql .= ' ' . $this->formatType($atts->fields['type'], $atts->fields['atttypmod']);
 
                 // Add NOT NULL if necessary
                 if ($this->phpBool($atts->fields['attnotnull'])) {
@@ -1481,11 +1481,11 @@ 
                 switch ($cons->fields['contype']) {
                     case 'p':
                         $keys = $this->getAttributeNames($table, explode(' ', $cons->fields['indkey']));
-                        $sql .= 'PRIMARY KEY ('.implode(',', $keys).')';
+                        $sql .= 'PRIMARY KEY (' . implode(',', $keys) . ')';
                         break;
                     case 'u':
                         $keys = $this->getAttributeNames($table, explode(' ', $cons->fields['indkey']));
-                        $sql .= 'UNIQUE ('.implode(',', $keys).')';
+                        $sql .= 'UNIQUE (' . implode(',', $keys) . ')';
                         break;
                     default:
                         // Unrecognised constraint
@@ -1629,7 +1629,7 @@ 
                 }
 
                 // Output privileges with no GRANT OPTION
-                $sql .= 'GRANT '.implode(', ', $nongrant)." ON TABLE \"{$t->fields['relname']}\" TO ";
+                $sql .= 'GRANT ' . implode(', ', $nongrant) . " ON TABLE \"{$t->fields['relname']}\" TO ";
                 switch ($v[0]) {
                     case 'public':
                         $sql .= "PUBLIC;\n";
@@ -1668,7 +1668,7 @@ 
                     $sql .= "SET SESSION AUTHORIZATION '{$grantor}';\n";
                 }
 
-                $sql .= 'GRANT '.implode(', ', $v[4])." ON \"{$t->fields['relname']}\" TO ";
+                $sql .= 'GRANT ' . implode(', ', $v[4]) . " ON \"{$t->fields['relname']}\" TO ";
                 switch ($v[0]) {
                     case 'public':
                         $sql .= 'PUBLIC';
@@ -1908,7 +1908,7 @@ 
         } elseif ($typname == 'varchar') {
             $temp = 'character varying';
             if ($typmod != -1) {
-                $temp .= '('.($typmod - $varhdrsz).')';
+                $temp .= '(' . ($typmod - $varhdrsz) . ')';
             }
         } elseif ($typname == 'numeric') {
             $temp = 'numeric';
@@ -1959,7 +1959,7 @@ 
         $sql = "SELECT attnum, attname FROM pg_catalog.pg_attribute WHERE
 			attrelid=(SELECT oid FROM pg_catalog.pg_class WHERE relname='{$table}' AND
 			relnamespace=(SELECT oid FROM pg_catalog.pg_namespace WHERE nspname='{$c_schema}'))
-			AND attnum IN ('".implode("','", $atts)."')";
+			AND attnum IN ('" . implode("','", $atts) . "')";
 
         $rs = $this->selectSet($sql);
         if ($rs->recordCount() != count($atts)) {
@@ -2261,7 +2261,7 @@ 
         if ($indexes->recordCount() > 0) {
             $sql .= "\n-- Indexes\n\n";
             while (!$indexes->EOF) {
-                $sql .= $indexes->fields['inddef'].";\n";
+                $sql .= $indexes->fields['inddef'] . ";\n";
 
                 $indexes->moveNext();
             }
@@ -2296,7 +2296,7 @@ 
         if ($rules->recordCount() > 0) {
             $sql .= "\n-- Rules\n\n";
             while (!$rules->EOF) {
-                $sql .= $rules->fields['definition']."\n";
+                $sql .= $rules->fields['definition'] . "\n";
 
                 $rules->moveNext();
             }
@@ -2524,7 +2524,7 @@ 
             }
         }
         if (count($primarykeycolumns) > 0) {
-            $sql .= ', PRIMARY KEY ('.implode(', ', $primarykeycolumns).')';
+            $sql .= ', PRIMARY KEY (' . implode(', ', $primarykeycolumns) . ')';
         }
 
         $sql .= ')';
@@ -2945,7 +2945,7 @@ 
 
             // DEFAULT clause
             if ($default != '') {
-                $sql .= ' DEFAULT '.$default;
+                $sql .= ' DEFAULT ' . $default;
             }
         }
 
@@ -3038,7 +3038,7 @@ 
         $toAlter = [];
         // Create the command for changing nullability
         if ($notnull != $oldnotnull) {
-            $toAlter[] = "ALTER COLUMN \"{$name}\" ".($notnull ? 'SET' : 'DROP').' NOT NULL';
+            $toAlter[] = "ALTER COLUMN \"{$name}\" " . ($notnull ? 'SET' : 'DROP') . ' NOT NULL';
         }
 
         // Add default, if it has changed
@@ -3165,7 +3165,7 @@ 
         $this->fieldClean($table);
         $this->fieldClean($column);
 
-        $sql = "ALTER TABLE \"{$f_schema}\".\"{$table}\" ALTER COLUMN \"{$column}\" ".($state ? 'DROP' : 'SET').' NOT NULL';
+        $sql = "ALTER TABLE \"{$f_schema}\".\"{$table}\" ALTER COLUMN \"{$column}\" " . ($state ? 'DROP' : 'SET') . ' NOT NULL';
 
         return $this->execute($sql);
     }
@@ -3284,7 +3284,7 @@ 
 
         // Actually retrieve the rows
         if ($oids) {
-            $oid_str = $this->id.', ';
+            $oid_str = $this->id . ', ';
         } else {
             $oid_str = '';
         }
@@ -3446,12 +3446,12 @@ 
                 if (isset($nulls[$i])) {
                     $sql .= ',NULL';
                 } else {
-                    $sql .= ','.$this->formatValue($types[$i], $format[$i], $value);
+                    $sql .= ',' . $this->formatValue($types[$i], $format[$i], $value);
                 }
             }
 
-            $sql = "INSERT INTO \"{$f_schema}\".\"{$table}\" (\"".implode('","', $fields).'")
-                VALUES ('.substr($sql, 1).')';
+            $sql = "INSERT INTO \"{$f_schema}\".\"{$table}\" (\"" . implode('","', $fields) . '")
+                VALUES ('.substr($sql, 1) . ')';
 
             return $this->execute($sql);
         }
@@ -4067,7 +4067,7 @@ 
 
         // toggle cycle yes/no
         if (!is_null($cycledvalue)) {
-            $sql .= (!$cycledvalue ? ' NO ' : '').' CYCLE';
+            $sql .= (!$cycledvalue ? ' NO ' : '') . ' CYCLE';
         }
 
         if ($sql != '') {
@@ -4529,9 +4529,9 @@ 
 
         if (is_array($columns)) {
             $this->arrayClean($columns);
-            $sql .= '("'.implode('","', $columns).'")';
+            $sql .= '("' . implode('","', $columns) . '")';
         } else {
-            $sql .= '('.$columns.')';
+            $sql .= '(' . $columns . ')';
         }
 
         // Tablespace
@@ -4731,7 +4731,7 @@ 
             $sql .= "CONSTRAINT \"{$name}\" ";
         }
 
-        $sql .= 'PRIMARY KEY ("'.implode('","', $fields).'")';
+        $sql .= 'PRIMARY KEY ("' . implode('","', $fields) . '")';
 
         if ($tablespace != '' && $this->hasTablespaces()) {
             $sql .= " USING INDEX TABLESPACE \"{$tablespace}\"";
@@ -4768,7 +4768,7 @@ 
             $sql .= "CONSTRAINT \"{$name}\" ";
         }
 
-        $sql .= 'UNIQUE ("'.implode('","', $fields).'")';
+        $sql .= 'UNIQUE ("' . implode('","', $fields) . '")';
 
         if ($tablespace != '' && $this->hasTablespaces()) {
             $sql .= " USING INDEX TABLESPACE \"{$tablespace}\"";
@@ -4920,9 +4920,9 @@ 
             $sql .= "CONSTRAINT \"{$name}\" ";
         }
 
-        $sql .= 'FOREIGN KEY ("'.implode('","', $sfields).'") ';
+        $sql .= 'FOREIGN KEY ("' . implode('","', $sfields) . '") ';
         // Target table needs to be fully qualified
-        $sql .= "REFERENCES \"{$targschema}\".\"{$targtable}\"(\"".implode('","', $tfields).'") ';
+        $sql .= "REFERENCES \"{$targschema}\".\"{$targtable}\"(\"" . implode('","', $tfields) . '") ';
         if ($match != $this->fkmatches[0]) {
             $sql .= " {$match}";
         }
@@ -5611,13 +5611,13 @@ 
 
         if (is_array($definition)) {
             $this->arrayClean($definition);
-            $sql .= "'".$definition[0]."'";
+            $sql .= "'" . $definition[0] . "'";
             if ($definition[1]) {
-                $sql .= ",'".$definition[1]."'";
+                $sql .= ",'" . $definition[1] . "'";
             }
         } else {
             $this->clean($definition);
-            $sql .= "'".$definition."'";
+            $sql .= "'" . $definition . "'";
         }
 
         $sql .= " LANGUAGE \"{$language}\"";
@@ -6393,7 +6393,7 @@ 
         // Split on escaped null characters
         $params = explode('\\000', $v);
         for ($findx = 0; $findx < $trigger['tgnargs']; $findx++) {
-            $param = "'".str_replace('\'', '\\\'', $params[$findx])."'";
+            $param = "'" . str_replace('\'', '\\\'', $params[$findx]) . "'";
             $tgdef .= $param;
             if ($findx < ($trigger['tgnargs'] - 1)) {
                 $tgdef .= ', ';
@@ -6625,13 +6625,13 @@ 
         $sql = "DROP OPERATOR \"{$f_schema}\".{$opr->fields['oprname']} (";
         // Quoting or formatting here???
         if ($opr->fields['oprleftname'] !== null) {
-            $sql .= $opr->fields['oprleftname'].', ';
+            $sql .= $opr->fields['oprleftname'] . ', ';
         } else {
             $sql .= 'NONE, ';
         }
 
         if ($opr->fields['oprrightname'] !== null) {
-            $sql .= $opr->fields['oprrightname'].')';
+            $sql .= $opr->fields['oprrightname'] . ')';
         } else {
             $sql .= 'NONE)';
         }
@@ -7459,11 +7459,11 @@ 
 			FROM pg_catalog.pg_proc p, pg_catalog.pg_namespace n, pg_catalog.pg_user u, pg_catalog.pg_aggregate a
 			WHERE n.oid = p.pronamespace AND p.proowner=u.usesysid AND p.oid=a.aggfnoid
 				AND p.proisagg AND n.nspname='{$c_schema}'
-				AND p.proname='".$name."'
+				AND p.proname='" . $name . "'
 				AND CASE p.proargtypes[0]
 					WHEN 'pg_catalog.\"any\"'::pg_catalog.regtype THEN ''
 					ELSE pg_catalog.format_type(p.proargtypes[0], NULL)
-				END ='".$basetype."'";
+				END ='".$basetype . "'";
 
         return $this->selectSet($sql);
     }
@@ -7620,7 +7620,7 @@ 
     public function renameAggregate($aggrschema, $aggrname, $aggrtype, $newaggrname)
     {
         /* this function is called from alterAggregate where params are cleaned */
-        $sql = "ALTER AGGREGATE \"{$aggrschema}\"".'.'."\"{$aggrname}\" (\"{$aggrtype}\") RENAME TO \"{$newaggrname}\"";
+        $sql = "ALTER AGGREGATE \"{$aggrschema}\"" . '.' . "\"{$aggrname}\" (\"{$aggrtype}\") RENAME TO \"{$newaggrname}\"";
 
         return $this->execute($sql);
     }
@@ -7762,15 +7762,15 @@ 
         }
 
         if (is_array($memberof) && count($memberof) > 0) {
-            $sql .= ' IN ROLE "'.implode('", "', $memberof).'"';
+            $sql .= ' IN ROLE "' . implode('", "', $memberof) . '"';
         }
 
         if (is_array($members) && count($members) > 0) {
-            $sql .= ' ROLE "'.implode('", "', $members).'"';
+            $sql .= ' ROLE "' . implode('", "', $members) . '"';
         }
 
         if (is_array($adminmembers) && count($adminmembers) > 0) {
-            $sql .= ' ADMIN "'.implode('", "', $adminmembers).'"';
+            $sql .= ' ADMIN "' . implode('", "', $adminmembers) . '"';
         }
 
         return $this->execute($sql);
@@ -7786,7 +7786,7 @@ 
      */
     public function _encryptPassword($username, $password)
     {
-        return 'md5'.md5($password.$username);
+        return 'md5' . md5($password . $username);
     }
 
     /**
@@ -8108,7 +8108,7 @@ 
         $sql .= $createdb ? ' CREATEDB' : ' NOCREATEDB';
         $sql .= $createuser ? ' CREATEUSER' : ' NOCREATEUSER';
         if (is_array($groups) && count($groups) > 0) {
-            $sql .= ' IN GROUP "'.implode('", "', $groups).'"';
+            $sql .= ' IN GROUP "' . implode('", "', $groups) . '"';
         }
 
         if ($expiry != '') {
@@ -8377,7 +8377,7 @@ 
 
         if (is_array($users) && count($users) > 0) {
             $this->fieldArrayClean($users);
-            $sql .= ' WITH USER "'.implode('", "', $users).'"';
+            $sql .= ' WITH USER "' . implode('", "', $users) . '"';
         }
 
         return $this->execute($sql);
@@ -8458,9 +8458,9 @@ 
         } else {
             if ($type == 'column') {
                 $this->fieldClean($object);
-                $sql .= ' '.implode(" (\"{$object}\"), ", $privileges);
+                $sql .= ' ' . implode(" (\"{$object}\"), ", $privileges);
             } else {
-                $sql .= ' '.implode(', ', $privileges);
+                $sql .= ' ' . implode(', ', $privileges);
             }
         }
 
@@ -8840,7 +8840,7 @@ 
             $params[] = "autovacuum_vacuum_cost_limit='{$vaccostlimit}'";
         }
 
-        $sql = $sql.implode(',', $params).');';
+        $sql = $sql . implode(',', $params) . ');';
 
         return $this->execute($sql);
     }
@@ -9361,7 +9361,7 @@ 
         }
 
         // Actually retrieve the rows, with offset and limit
-        $rs = $this->selectSet("SELECT * FROM ({$query}) AS sub {$orderby} LIMIT {$page_size} OFFSET ".($page - 1) * $page_size);
+        $rs = $this->selectSet("SELECT * FROM ({$query}) AS sub {$orderby} LIMIT {$page_size} OFFSET " . ($page - 1) * $page_size);
         $status = $this->endTransaction();
         if ($status != 0) {
             $this->rollbackTransaction();
@@ -9403,7 +9403,7 @@ 
                 $sql = 'SELECT "';
             }
 
-            $sql .= implode('","', $show).'" FROM ';
+            $sql .= implode('","', $show) . '" FROM ';
         }
 
         $this->fieldClean($table);
@@ -9467,7 +9467,7 @@ 
                     $sql .= $k;
                 } else {
                     $this->fieldClean($k);
-                    $sql .= '"'.$k.'"';
+                    $sql .= '"' . $k . '"';
                 }
                 if (strtoupper($v) == 'DESC') {
                     $sql .= ' DESC';

src/translations.php

Spacing +2 added lines, -2 removed lines

@@ -90,7 +90,7 @@ 
     }
 
     $lang = [];
-    include_once BASE_PATH.'/src/lang/english.php';
+    include_once BASE_PATH . '/src/lang/english.php';
 
 // Determine language file to import:
     unset($_language);
@@ -151,7 +151,7 @@ 
 
 // Import the language file
     if (isset($_language)) {
-        include BASE_PATH."/src/lang/{$_language}.php";
+        include BASE_PATH . "/src/lang/{$_language}.php";
         $_SESSION['webdbLanguage'] = $_language;
 
         if (array_key_exists($_language, $languages_iso_code)) {

src/lib.inc.php

Spacing +31 added lines, -31 removed lines

@@ -7,23 +7,23 @@ 
  */
 defined('BASE_PATH') or define('BASE_PATH', dirname(__DIR__));
 
-define('THEME_PATH', BASE_PATH.'/src/themes');
+define('THEME_PATH', BASE_PATH . '/src/themes');
 // Enforce PHP environment
 ini_set('arg_separator.output', '&');
 
-ini_set('error_log', BASE_PATH.'/temp/logs/phppga.php_error.log');
+ini_set('error_log', BASE_PATH . '/temp/logs/phppga.php_error.log');
 
 // Check to see if the configuration file exists, if not, explain
-if (file_exists(BASE_PATH.'/config.inc.php')) {
+if (file_exists(BASE_PATH . '/config.inc.php')) {
     $conf = [];
-    include BASE_PATH.'/config.inc.php';
+    include BASE_PATH . '/config.inc.php';
 } else {
     die('Configuration error: Copy config.inc.php-dist to config.inc.php and edit appropriately.');
 }
 $debugmode = (!isset($conf['debugmode'])) ? false : boolval($conf['debugmode']);
 define('DEBUGMODE', $debugmode);
 
-require_once BASE_PATH.'/vendor/autoload.php';
+require_once BASE_PATH . '/vendor/autoload.php';
 
 if (!defined('ADODB_ERROR_HANDLER_TYPE')) {
     define('ADODB_ERROR_HANDLER_TYPE', E_USER_ERROR);
@@ -54,7 +54,7 @@ 
 $handler->start(); // initialize handlers*/
 \PhpConsole\Helper::register(); // it will register global PC class
 
-$composerinfo = json_decode(file_get_contents(BASE_PATH.'/composer.json'));
+$composerinfo = json_decode(file_get_contents(BASE_PATH . '/composer.json'));
 $appVersion = $composerinfo->version;
 
 $config = [
@@ -75,7 +75,7 @@ 
         // backwards incompatible changes are made to config.inc.php-dist.
         'base_version'                      => 60,
         // Application version
-        'appVersion'                        => 'v'.$appVersion,
+        'appVersion'                        => 'v' . $appVersion,
         // Application name
         'appName'                           => 'phpPgAdmin6',
 
@@ -95,20 +95,20 @@ 
 //\Kint::dump($container->environment);die();
 
 $normalized_php_self = str_replace('/src/views', '', $container->environment->get('PHP_SELF'));
-$subfolder = str_replace('/'.basename($normalized_php_self), '', $normalized_php_self);
+$subfolder = str_replace('/' . basename($normalized_php_self), '', $normalized_php_self);
 define('SUBFOLDER', $subfolder);
 
 $container['errors'] = [];
 $container['requestobj'] = $container['request'];
 $container['responseobj'] = $container['response'];
 
-$container['utils'] = function ($c) {
+$container['utils'] = function($c) {
     $utils = new \PHPPgAdmin\ContainerUtils($c);
 
     return $utils;
 };
 
-$container['conf'] = function ($c) use ($conf) {
+$container['conf'] = function($c) use ($conf) {
 
     //\Kint::dump($conf);
     // Plugins are removed
@@ -117,8 +117,8 @@ 
     return $conf;
 };
 
-$container['lang'] = function ($c) {
-    include_once BASE_PATH.'/src/translations.php';
+$container['lang'] = function($c) {
+    include_once BASE_PATH . '/src/translations.php';
 
     $c['appLangFiles'] = $appLangFiles;
     $c['language'] = $_language;
@@ -127,16 +127,16 @@ 
     return $lang;
 };
 
-$container['plugin_manager'] = function ($c) {
+$container['plugin_manager'] = function($c) {
     $plugin_manager = new \PHPPgAdmin\PluginManager($c);
 
     return $plugin_manager;
 };
 
-$container['serializer'] = function ($c) {
+$container['serializer'] = function($c) {
     $serializerbuilder = \JMS\Serializer\SerializerBuilder::create();
     $serializer = $serializerbuilder
-        ->setCacheDir(BASE_PATH.'/temp/jms')
+        ->setCacheDir(BASE_PATH . '/temp/jms')
         ->setDebug($c->get('settings')['debug'])
         ->build();
 
@@ -144,7 +144,7 @@ 
 };
 
 // Create Misc class references
-$container['misc'] = function ($c) {
+$container['misc'] = function($c) {
     $misc = new \PHPPgAdmin\Misc($c);
 
     $conf = $c->get('conf');
@@ -156,7 +156,7 @@ 
 
     /* starting with PostgreSQL 9.0, we can set the application name */
     if (isset($_server_info['pgVersion']) && $_server_info['pgVersion'] >= 9) {
-        putenv('PGAPPNAME='.$c->get('settings')['appName'].'_'.$c->get('settings')['appVersion']);
+        putenv('PGAPPNAME=' . $c->get('settings')['appName'] . '_' . $c->get('settings')['appVersion']);
     }
 
     $themefolders = [];
@@ -168,10 +168,10 @@ 
                 continue;
             }
 
-            $folderpath = THEME_PATH.DIRECTORY_SEPARATOR.$foldername;
+            $folderpath = THEME_PATH . DIRECTORY_SEPARATOR . $foldername;
 
             // if $folderpath if indeed a folder and contains a global.css file, then it's a theme
-            if (is_dir($folderpath) && is_file($folderpath.DIRECTORY_SEPARATOR.'global.css')) {
+            if (is_dir($folderpath) && is_file($folderpath . DIRECTORY_SEPARATOR . 'global.css')) {
                 $themefolders[$foldername] = $folderpath;
             }
         }
@@ -242,12 +242,12 @@ 
 };
 
 // Register Twig View helper
-$container['view'] = function ($c) {
+$container['view'] = function($c) {
     $conf = $c->get('conf');
     $misc = $c->misc;
 
-    $view = new \Slim\Views\Twig(BASE_PATH.'/templates', [
-        'cache'       => BASE_PATH.'/temp/twigcache',
+    $view = new \Slim\Views\Twig(BASE_PATH . '/templates', [
+        'cache'       => BASE_PATH . '/temp/twigcache',
         'auto_reload' => $c->get('settings')['debug'],
         'debug'       => $c->get('settings')['debug'],
     ]);
@@ -278,18 +278,18 @@ 
     return $view;
 };
 
-$container['haltHandler'] = function ($c) {
-    return function ($request, $response, $exits, $status = 500) use ($c) {
+$container['haltHandler'] = function($c) {
+    return function($request, $response, $exits, $status = 500) use ($c) {
         $title = 'PHPPgAdmin Error';
 
         $html = '<p>The application could not run because of the following error:</p>';
 
         $output = sprintf(
-            "<html><head><meta http-equiv='Content-Type' content='text/html; charset=utf-8'>".
-            '<title>%s</title><style>'.
-            'body{margin:0;padding:30px;font:12px/1.5 Helvetica,Arial,Verdana,sans-serif;}'.
-            'h3{margin:0;font-size:28px;font-weight:normal;line-height:30px;}'.
-            'span{display:inline-block;font-size:16px;}'.
+            "<html><head><meta http-equiv='Content-Type' content='text/html; charset=utf-8'>" .
+            '<title>%s</title><style>' .
+            'body{margin:0;padding:30px;font:12px/1.5 Helvetica,Arial,Verdana,sans-serif;}' .
+            'h3{margin:0;font-size:28px;font-weight:normal;line-height:30px;}' .
+            'span{display:inline-block;font-size:16px;}' .
             '</style></head><body><h3>%s</h3><p>%s</p><span>%s</span></body></html>',
             $title,
             $title,
@@ -309,7 +309,7 @@ 
 
 // Set the requestobj and responseobj properties of the container
 // as the value of $request and $response, which already contain the route
-$app->add(function ($request, $response, $next) {
+$app->add(function($request, $response, $next) {
     $this['requestobj'] = $request;
     $this['responseobj'] = $response;
 
@@ -320,7 +320,7 @@ 
 
     $query_string = $request->getUri()->getQuery();
     $this->view->offsetSet('query_string', $query_string);
-    $path = SUBFOLDER.'/'.$request->getUri()->getPath().($query_string ? '?'.$query_string : '');
+    $path = SUBFOLDER . '/' . $request->getUri()->getPath() . ($query_string ? '?' . $query_string : '');
     $this->view->offsetSet('path', $path);
     $this->view->offsetSet('params', $request->getParams());
 

src/decorators/UrlDecorator.php

Spacing +2 added lines, -2 removed lines

@@ -26,13 +26,13 @@
             $sep = '?';
             ksort($queryVars);
             foreach ($queryVars as $var => $value) {
-                $url .= $sep.Decorator::value_url($var, $fields).'='.Decorator::value_url($value, $fields);
+                $url .= $sep . Decorator::value_url($var, $fields) . '=' . Decorator::value_url($value, $fields);
                 $sep = '&';
             }
         }
         //$this->prtrace('url before', $url);
         if (SUBFOLDER !== '' && (strpos($url, '/') === 0) && (strpos($url, SUBFOLDER) === false)) {
-            $url = str_replace('//', '/', SUBFOLDER.'/'.$url);
+            $url = str_replace('//', '/', SUBFOLDER . '/' . $url);
         }
         //$this->prtrace('url after', $url);
         return $url;