HuasoFoundries / phpPgAdmin6

src/classes/ContainerUtils.php

Spacing +2 added lines, -2 removed lines

@@ -20,9 +20,9 @@
 
         // but if server_id isn't set, then you will be redirected to intro
         if ($this->container->requestobj->getQueryParam('server') === null) {
-            $destinationurl = SUBFOLDER.'/src/views/intro';
+            $destinationurl = SUBFOLDER . '/src/views/intro';
         } else {
-            $destinationurl = SUBFOLDER.'/src/views/login'.($query_string ? '?'.$query_string : '');
+            $destinationurl = SUBFOLDER . '/src/views/login' . ($query_string ? '?' . $query_string : '');
         }
 
         return $destinationurl;

src/classes/PluginManager.php

Spacing +5 added lines, -5 removed lines

@@ -48,7 +48,7 @@ 
             $plugins = $this->conf['plugins'];
 
             foreach ($plugins as $activated_plugin) {
-                $plugin_file = BASE_PATH.'/src/plugins/'.$activated_plugin.'/plugin.php';
+                $plugin_file = BASE_PATH . '/src/plugins/' . $activated_plugin . '/plugin.php';
 
                 // Verify is the activated plugin exists
                 if (file_exists($plugin_file)) {
@@ -61,7 +61,7 @@ 
                         continue;
                     }
                 } else {
-                    printf($this->lang['strpluginnotfound']."\t\n", $activated_plugin);
+                    printf($this->lang['strpluginnotfound'] . "\t\n", $activated_plugin);
                     exit;
                 }
             }
@@ -85,7 +85,7 @@ 
             $hooks = $plugin->get_hooks();
             foreach ($hooks as $hook => $functions) {
                 if (!in_array($hook, $this->available_hooks)) {
-                    printf($this->lang['strhooknotfound']."\t\n", $hook);
+                    printf($this->lang['strhooknotfound'] . "\t\n", $hook);
                     exit;
                 }
                 $this->hooks[$hook][$plugin_name] = $functions;
@@ -133,7 +133,7 @@ 
         {
             if (!isset($this->plugins_list[$plugin_name])) {
                 // Show an error and stop the application
-                printf($this->lang['strpluginnotfound']."\t\n", $plugin_name);
+                printf($this->lang['strpluginnotfound'] . "\t\n", $plugin_name);
                 exit;
             }
             $plugin = $this->plugins_list[$plugin_name];
@@ -143,7 +143,7 @@ 
                 call_user_func([$plugin, $action]);
             } else {
                 // Show an error and stop the application
-                printf($this->lang['stractionnotfound']."\t\n", $action, $plugin_name);
+                printf($this->lang['stractionnotfound'] . "\t\n", $action, $plugin_name);
                 exit;
             }
         }

src/classes/Misc.php

Spacing +63 added lines, -63 removed lines

@@ -67,7 +67,7 @@ 
 
         if (count($this->conf['servers']) === 1) {
             $info = $this->conf['servers'][0];
-            $this->server_id = $info['host'].':'.$info['port'].':'.$info['sslmode'];
+            $this->server_id = $info['host'] . ':' . $info['port'] . ':' . $info['sslmode'];
         } elseif (isset($_REQUEST['server'])) {
             $this->server_id = $_REQUEST['server'];
         } elseif (isset($_SESSION['webdbLogin']) && count($_SESSION['webdbLogin']) > 0) {
@@ -133,7 +133,7 @@ 
         //\PC::debug(['str' => $str, 'help' => $help], 'printHelp');
         if ($help !== null) {
             $helplink = $this->getHelpLink($help);
-            $str .= '<a class="help" href="'.$helplink.'" title="'.$this->lang['strhelp'].'" target="phppgadminhelp">'.$this->lang['strhelpicon'].'</a>';
+            $str .= '<a class="help" href="' . $helplink . '" title="' . $this->lang['strhelp'] . '" target="phppgadminhelp">' . $this->lang['strhelpicon'] . '</a>';
         }
         if ($do_print) {
             echo $str;
@@ -144,7 +144,7 @@ 
 
     public function getHelpLink($help)
     {
-        return htmlspecialchars(SUBFOLDER.'/help?help='.urlencode($help).'&server='.urlencode($this->getServerId()));
+        return htmlspecialchars(SUBFOLDER . '/help?help=' . urlencode($help) . '&server=' . urlencode($this->getServerId()));
     }
 
     /**
@@ -206,9 +206,9 @@ 
                 $sql = $p1;
                 $inputparams = $p2;
 
-                $error_msg = '<p><b>strsqlerror</b><br />'.nl2br($errmsg).'</p> <p><b>SQL:</b><br />'.nl2br($sql).'</p>	';
+                $error_msg = '<p><b>strsqlerror</b><br />' . nl2br($errmsg) . '</p> <p><b>SQL:</b><br />' . nl2br($sql) . '</p>	';
 
-                echo '<table class="error" cellpadding="5"><tr><td>'.nl2br($error_msg).'</td></tr></table><br />'."\n";
+                echo '<table class="error" cellpadding="5"><tr><td>' . nl2br($error_msg) . '</td></tr></table><br />' . "\n";
 
                 break;
 
@@ -323,7 +323,7 @@ 
 
                 return;
             }
-            $_type = '\PHPPgAdmin\Database\\'.$_type;
+            $_type = '\PHPPgAdmin\Database\\' . $_type;
 
             $this->setServerInfo('platform', $platform, $this->server_id);
             $this->setServerInfo('pgVersion', $_connection->conn->pgVersion, $this->server_id);
@@ -445,7 +445,7 @@ 
 
         // Otherwise, look for it in the conf file
         foreach ($this->conf['servers'] as $idx => $info) {
-            if ($this->server_id == $info['host'].':'.$info['port'].':'.$info['sslmode']) {
+            if ($this->server_id == $info['host'] . ':' . $info['port'] . ':' . $info['sslmode']) {
                 // Automatically use shared credentials if available
                 if (!isset($info['username']) && isset($_SESSION['sharedUsername'])) {
                     $info['username'] = $_SESSION['sharedUsername'];
@@ -620,9 +620,9 @@ 
         }
 
         foreach ($this->conf['servers'] as $idx => $info) {
-            $server_id = $info['host'].':'.$info['port'].':'.$info['sslmode'];
+            $server_id = $info['host'] . ':' . $info['port'] . ':' . $info['sslmode'];
             if ($group === false || isset($group[$idx]) || ($group === 'all')) {
-                $server_id = $info['host'].':'.$info['port'].':'.$info['sslmode'];
+                $server_id = $info['host'] . ':' . $info['port'] . ':' . $info['sslmode'];
 
                 if (isset($logins[$server_id])) {
                     $srvs[$server_id] = $logins[$server_id];
@@ -723,13 +723,13 @@ 
     {
         $href = [];
         if (isset($_REQUEST['server']) && $exclude_from != 'server') {
-            $href[] = 'server='.urlencode($_REQUEST['server']);
+            $href[] = 'server=' . urlencode($_REQUEST['server']);
         }
         if (isset($_REQUEST['database']) && $exclude_from != 'database') {
-            $href[] = 'database='.urlencode($_REQUEST['database']);
+            $href[] = 'database=' . urlencode($_REQUEST['database']);
         }
         if (isset($_REQUEST['schema']) && $exclude_from != 'schema') {
-            $href[] = 'schema='.urlencode($_REQUEST['schema']);
+            $href[] = 'schema=' . urlencode($_REQUEST['schema']);
         }
 
         return htmlentities(implode('&', $href));
@@ -891,10 +891,10 @@ 
         }
 
         if (!isset($vars['url'])) {
-            $vars['url'] = SUBFOLDER.'/redirect';
+            $vars['url'] = SUBFOLDER . '/redirect';
         }
-        if ($vars['url'] == SUBFOLDER.'/redirect' && isset($vars['params']['subject'])) {
-            $vars['url'] = SUBFOLDER.'/redirect/'.$vars['params']['subject'];
+        if ($vars['url'] == SUBFOLDER . '/redirect' && isset($vars['params']['subject'])) {
+            $vars['url'] = SUBFOLDER . '/redirect/' . $vars['params']['subject'];
             unset($vars['params']['subject']);
         }
 
@@ -908,14 +908,14 @@ 
     {
         $form = [];
         if (isset($_REQUEST['server'])) {
-            $form[] = '<input type="hidden" name="server" value="'.htmlspecialchars($_REQUEST['server']).'" />';
+            $form[] = '<input type="hidden" name="server" value="' . htmlspecialchars($_REQUEST['server']) . '" />';
         }
         if (isset($_REQUEST['database'])) {
-            $form[] = '<input type="hidden" name="database" value="'.htmlspecialchars($_REQUEST['database']).'" />';
+            $form[] = '<input type="hidden" name="database" value="' . htmlspecialchars($_REQUEST['database']) . '" />';
         }
 
         if (isset($_REQUEST['schema'])) {
-            $form[] = '<input type="hidden" name="schema" value="'.htmlspecialchars($_REQUEST['schema']).'" />';
+            $form[] = '<input type="hidden" name="schema" value="' . htmlspecialchars($_REQUEST['schema']) . '" />';
         }
         $this->form = implode("\n", $form);
 
@@ -973,7 +973,7 @@ 
             $maxlen = isset($params['cliplen']) && is_int($params['cliplen']) ? $params['cliplen'] : $this->conf['max_chars'];
             $ellipsis = isset($params['ellipsis']) ? $params['ellipsis'] : $lang['strellipsis'];
             if (strlen($str) > $maxlen) {
-                $str = substr($str, 0, $maxlen - 1).$ellipsis;
+                $str = substr($str, 0, $maxlen - 1) . $ellipsis;
             }
         }
 
@@ -1058,23 +1058,23 @@ 
                     $limit = 10 * 1024;
                     $mult = 1;
                     if ($str < $limit * $mult) {
-                        $out = $str.' '.$lang['strbytes'];
+                        $out = $str . ' ' . $lang['strbytes'];
                     } else {
                         $mult *= 1024;
                         if ($str < $limit * $mult) {
-                            $out = floor(($str + $mult / 2) / $mult).' '.$lang['strkb'];
+                            $out = floor(($str + $mult / 2) / $mult) . ' ' . $lang['strkb'];
                         } else {
                             $mult *= 1024;
                             if ($str < $limit * $mult) {
-                                $out = floor(($str + $mult / 2) / $mult).' '.$lang['strmb'];
+                                $out = floor(($str + $mult / 2) / $mult) . ' ' . $lang['strmb'];
                             } else {
                                 $mult *= 1024;
                                 if ($str < $limit * $mult) {
-                                    $out = floor(($str + $mult / 2) / $mult).' '.$lang['strgb'];
+                                    $out = floor(($str + $mult / 2) / $mult) . ' ' . $lang['strgb'];
                                 } else {
                                     $mult *= 1024;
                                     if ($str < $limit * $mult) {
-                                        $out = floor(($str + $mult / 2) / $mult).' '.$lang['strtb'];
+                                        $out = floor(($str + $mult / 2) / $mult) . ' ' . $lang['strtb'];
                                     }
                                 }
                             }
@@ -1120,7 +1120,7 @@ 
             if ($num > 0) {
                 $temp = "<table>\n<tr><td class=\"{$class}\" style=\"vertical-align: top; padding-right: 10px;\"><pre class=\"{$class}\">";
                 for ($i = 1; $i <= $num; $i++) {
-                    $temp .= $i."\n";
+                    $temp .= $i . "\n";
                 }
                 $temp .= "</pre></td><td class=\"{$class}\" style=\"vertical-align: top;\">{$out}</td></tr></table>\n";
                 $out = $temp;
@@ -1370,7 +1370,7 @@ 
                         'icon'    => 'Views',
                     ],
                     'matviews'    => [
-                        'title'   => 'M '.$lang['strviews'],
+                        'title'   => 'M ' . $lang['strviews'],
                         'url'     => 'materializedviews.php',
                         'urlvars' => ['subject' => 'schema'],
                         'help'    => 'pg.matview',
@@ -2003,43 +2003,43 @@ 
     {
         if (is_string($icon)) {
             $path = "/images/themes/{$this->conf['theme']}/{$icon}";
-            if (file_exists(BASE_PATH.$path.'.png')) {
-                return SUBFOLDER.$path.'.png';
+            if (file_exists(BASE_PATH . $path . '.png')) {
+                return SUBFOLDER . $path . '.png';
             }
 
-            if (file_exists(BASE_PATH.$path.'.gif')) {
-                return SUBFOLDER.$path.'.gif';
+            if (file_exists(BASE_PATH . $path . '.gif')) {
+                return SUBFOLDER . $path . '.gif';
             }
 
-            if (file_exists(BASE_PATH.$path.'.ico')) {
-                return SUBFOLDER.$path.'.ico';
+            if (file_exists(BASE_PATH . $path . '.ico')) {
+                return SUBFOLDER . $path . '.ico';
             }
 
             $path = "/images/themes/default/{$icon}";
-            if (file_exists(BASE_PATH.$path.'.png')) {
-                return SUBFOLDER.$path.'.png';
+            if (file_exists(BASE_PATH . $path . '.png')) {
+                return SUBFOLDER . $path . '.png';
             }
 
-            if (file_exists(BASE_PATH.$path.'.gif')) {
-                return SUBFOLDER.$path.'.gif';
+            if (file_exists(BASE_PATH . $path . '.gif')) {
+                return SUBFOLDER . $path . '.gif';
             }
 
-            if (file_exists(BASE_PATH.$path.'.ico')) {
-                return SUBFOLDER.$path.'.ico';
+            if (file_exists(BASE_PATH . $path . '.ico')) {
+                return SUBFOLDER . $path . '.ico';
             }
         } else {
             // Icon from plugins
             $path = "/plugins/{$icon[0]}/images/{$icon[1]}";
-            if (file_exists(BASE_PATH.$path.'.png')) {
-                return SUBFOLDER.$path.'.png';
+            if (file_exists(BASE_PATH . $path . '.png')) {
+                return SUBFOLDER . $path . '.png';
             }
 
-            if (file_exists(BASE_PATH.$path.'.gif')) {
-                return SUBFOLDER.$path.'.gif';
+            if (file_exists(BASE_PATH . $path . '.gif')) {
+                return SUBFOLDER . $path . '.gif';
             }
 
-            if (file_exists(BASE_PATH.$path.'.ico')) {
-                return SUBFOLDER.$path.'.ico';
+            if (file_exists(BASE_PATH . $path . '.ico')) {
+                return SUBFOLDER . $path . '.ico';
             }
         }
 
@@ -2087,7 +2087,7 @@ 
         if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
             $data->fieldClean($str);
 
-            return '"'.$str.'"';
+            return '"' . $str . '"';
         }
 
         return escapeshellcmd($str);
@@ -2125,7 +2125,7 @@ 
         $forcedserver = null;
         if (count($servers) === 1) {
             $forcedserver = $this->server_id;
-            $connection_html .= '<input type="hidden" readonly="readonly" value="'.$this->server_id.'" name="server">';
+            $connection_html .= '<input type="hidden" readonly="readonly" value="' . $this->server_id . '" name="server">';
         } else {
             $connection_html .= '<label>';
             $connection_html .= $this->printHelp($lang['strserver'], 'pg.server', false);
@@ -2137,7 +2137,7 @@ 
                 }
                 $selected = isset($_REQUEST['server']) && $info['id'] == $_REQUEST['server'] ? ' selected="selected"' : '';
                 // not logged on this server
-                $connection_html .= '<option value="'.htmlspecialchars($info['id']).'" '.$selected.'>';
+                $connection_html .= '<option value="' . htmlspecialchars($info['id']) . '" ' . $selected . '>';
                 $connection_html .= htmlspecialchars("{$info['desc']} ({$info['id']})");
                 $connection_html .= "</option>\n";
             }
@@ -2147,7 +2147,7 @@ 
         $connection_html .= "</td><td class=\"popup_select2\" style=\"text-align: right\">\n";
 
         if (count($servers) === 1 && isset($servers[$this->server_id]['useonlydefaultdb']) && $servers[$this->server_id]['useonlydefaultdb'] === true) {
-            $connection_html .= '<input type="hidden" name="database" value="'.htmlspecialchars($servers[$this->server_id]['defaultdb'])."\" />\n";
+            $connection_html .= '<input type="hidden" name="database" value="' . htmlspecialchars($servers[$this->server_id]['defaultdb']) . "\" />\n";
         } else {
 
             // Get the list of all databases
@@ -2166,14 +2166,14 @@ 
                 while (!$databases->EOF) {
                     $dbname = $databases->fields['datname'];
                     $dbselected = isset($_REQUEST['database']) && $dbname == $_REQUEST['database'] ? ' selected="selected"' : '';
-                    $connection_html .= '<option value="'.htmlspecialchars($dbname).'" '.$dbselected.'>'.htmlspecialchars($dbname)."</option>\n";
+                    $connection_html .= '<option value="' . htmlspecialchars($dbname) . '" ' . $dbselected . '>' . htmlspecialchars($dbname) . "</option>\n";
 
                     $databases->moveNext();
                 }
                 $connection_html .= "</select></label>\n";
             } else {
                 $server_info = $misc->getServerInfo();
-                $connection_html .= '<input type="hidden" name="database" value="'.htmlspecialchars($server_info['defaultdb'])."\" />\n";
+                $connection_html .= '<input type="hidden" name="database" value="' . htmlspecialchars($server_info['defaultdb']) . "\" />\n";
             }
         }
 
@@ -2253,38 +2253,38 @@ 
             $fksprops['code'] .= "var constrs = {};\n";
             foreach ($fksprops['byconstr'] as $conid => $props) {
                 $fksprops['code'] .= "constrs.constr_{$conid} = {\n";
-                $fksprops['code'] .= 'pattnums: ['.implode(',', $props['pattnums'])."],\n";
-                $fksprops['code'] .= "f_table:'".addslashes(htmlentities($props['f_table'], ENT_QUOTES, 'UTF-8'))."',\n";
-                $fksprops['code'] .= "f_schema:'".addslashes(htmlentities($props['f_schema'], ENT_QUOTES, 'UTF-8'))."',\n";
+                $fksprops['code'] .= 'pattnums: [' . implode(',', $props['pattnums']) . "],\n";
+                $fksprops['code'] .= "f_table:'" . addslashes(htmlentities($props['f_table'], ENT_QUOTES, 'UTF-8')) . "',\n";
+                $fksprops['code'] .= "f_schema:'" . addslashes(htmlentities($props['f_schema'], ENT_QUOTES, 'UTF-8')) . "',\n";
                 $_ = '';
                 foreach ($props['pattnames'] as $n) {
-                    $_ .= ",'".htmlentities($n, ENT_QUOTES, 'UTF-8')."'";
+                    $_ .= ",'" . htmlentities($n, ENT_QUOTES, 'UTF-8') . "'";
                 }
-                $fksprops['code'] .= 'pattnames: ['.substr($_, 1)."],\n";
+                $fksprops['code'] .= 'pattnames: [' . substr($_, 1) . "],\n";
 
                 $_ = '';
                 foreach ($props['fattnames'] as $n) {
-                    $_ .= ",'".htmlentities($n, ENT_QUOTES, 'UTF-8')."'";
+                    $_ .= ",'" . htmlentities($n, ENT_QUOTES, 'UTF-8') . "'";
                 }
 
-                $fksprops['code'] .= 'fattnames: ['.substr($_, 1)."]\n";
+                $fksprops['code'] .= 'fattnames: [' . substr($_, 1) . "]\n";
                 $fksprops['code'] .= "};\n";
             }
 
             $fksprops['code'] .= "var attrs = {};\n";
             foreach ($fksprops['byfield'] as $attnum => $cstrs) {
-                $fksprops['code'] .= "attrs.attr_{$attnum} = [".implode(',', $fksprops['byfield'][$attnum])."];\n";
+                $fksprops['code'] .= "attrs.attr_{$attnum} = [" . implode(',', $fksprops['byfield'][$attnum]) . "];\n";
             }
 
-            $fksprops['code'] .= "var table='".addslashes(htmlentities($table, ENT_QUOTES, 'UTF-8'))."';";
-            $fksprops['code'] .= "var server='".htmlentities($_REQUEST['server'], ENT_QUOTES, 'UTF-8')."';";
-            $fksprops['code'] .= "var database='".addslashes(htmlentities($_REQUEST['database'], ENT_QUOTES, 'UTF-8'))."';";
-            $fksprops['code'] .= "var subfolder='".SUBFOLDER."';";
+            $fksprops['code'] .= "var table='" . addslashes(htmlentities($table, ENT_QUOTES, 'UTF-8')) . "';";
+            $fksprops['code'] .= "var server='" . htmlentities($_REQUEST['server'], ENT_QUOTES, 'UTF-8') . "';";
+            $fksprops['code'] .= "var database='" . addslashes(htmlentities($_REQUEST['database'], ENT_QUOTES, 'UTF-8')) . "';";
+            $fksprops['code'] .= "var subfolder='" . SUBFOLDER . "';";
             $fksprops['code'] .= "</script>\n";
 
             $fksprops['code'] .= '<div id="fkbg"></div>';
             $fksprops['code'] .= '<div id="fklist"></div>';
-            $fksprops['code'] .= '<script src="'.SUBFOLDER.'/js/ac_insert_row.js" type="text/javascript"></script>';
+            $fksprops['code'] .= '<script src="' . SUBFOLDER . '/js/ac_insert_row.js" type="text/javascript"></script>';
         } else /* we have no foreign keys on this table */
         {
             return false;