diff options
author | Felipe Figueroa <amenadiel@gmail.com> | 2018-04-21 02:31:30 +0300 |
---|---|---|
committer | Felipe Figueroa <amenadiel@gmail.com> | 2018-04-21 02:31:30 +0300 |
commit | 5b2befe8827b440c0b8724f3a2684b95b4571f26 (patch) | |
tree | 3f926c9f8885674ae77658ba4f2262d336462742 /src/controllers/ViewsController.php | |
parent | 647554b3ad9c907b5268b7197fb927258bc0a9fe (diff) |
Tag v 6.0.0-beta.41 sets container parameters from /usr/bin/makeREQUESTv6.0.0-beta.41
Diffstat (limited to 'src/controllers/ViewsController.php')
-rw-r--r-- | src/controllers/ViewsController.php | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/controllers/ViewsController.php b/src/controllers/ViewsController.php index af38e5f1..e289e197 100644 --- a/src/controllers/ViewsController.php +++ b/src/controllers/ViewsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; @@ -119,7 +119,7 @@ class ViewsController extends BaseController 'view' => [ 'title' => $this->lang['strview'], 'field' => Decorator::field('relname'), - 'url' => \SUBFOLDER . "/redirect/view?{$this->misc->href}&", + 'url' => \SUBFOLDER."/redirect/view?{$this->misc->href}&", 'vars' => ['view' => 'relname'], ], 'owner' => [ @@ -306,7 +306,7 @@ class ViewsController extends BaseController $attrs = $data->getTableAttributes($_REQUEST['view']); - echo '<form action="' . \SUBFOLDER . '/src/views/' . $this->script . '" method="post" id="selectform">'; + echo '<form action="'.\SUBFOLDER.'/src/views/'.$this->script.'" method="post" id="selectform">'; echo "\n"; if ($attrs->recordCount() > 0) { @@ -438,7 +438,7 @@ class ViewsController extends BaseController $this->printTrail('view'); $this->printTitle($this->lang['strdrop'], 'pg.view.drop'); - echo '<form action="' . \SUBFOLDER . "/src/views/views\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/views\" method=\"post\">\n"; //If multi drop if (isset($_REQUEST['ma'])) { @@ -549,7 +549,7 @@ class ViewsController extends BaseController [ 'schemaname' => $arrSelTables[$i]['schemaname'], 'tablename' => $arrSelTables[$i]['tablename'], - 'fieldname' => $attrs->fields['attname']] + 'fieldname' => $attrs->fields['attname'], ] ); $attrs->moveNext(); } @@ -558,7 +558,7 @@ class ViewsController extends BaseController } asort($arrFields); - echo '<form action="' . \SUBFOLDER . "/src/views/views\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/views\" method=\"post\">\n"; echo "<table>\n"; echo "<tr><th class=\"data\">{$this->lang['strviewname']}</th></tr>"; echo "<tr>\n<td class=\"data1\">\n"; @@ -637,7 +637,7 @@ class ViewsController extends BaseController echo "<p><input type=\"hidden\" name=\"action\" value=\"save_create_wiz\" />\n"; foreach ($arrSelTables as $curTable) { - echo '<input type="hidden" name="formTables[]" value="' . htmlspecialchars(serialize($curTable)) . "\" />\n"; + echo '<input type="hidden" name="formTables[]" value="'.htmlspecialchars(serialize($curTable))."\" />\n"; } echo $this->misc->form; @@ -662,7 +662,7 @@ class ViewsController extends BaseController $this->printTitle($this->lang['strcreateviewwiz'], 'pg.view.create'); $this->printMsg($msg); - echo '<form action="' . \SUBFOLDER . "/src/views/views\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/views\" method=\"post\">\n"; echo "<table>\n"; echo "<tr><th class=\"data\">{$this->lang['strtables']}</th></tr>"; echo "<tr>\n<td class=\"data1\">\n"; @@ -672,7 +672,7 @@ class ViewsController extends BaseController $arrTmp = []; $arrTmp['schemaname'] = $tables->fields['nspname']; $arrTmp['tablename'] = $tables->fields['relname']; - $arrTables[$tables->fields['nspname'] . '.' . $tables->fields['relname']] = serialize($arrTmp); + $arrTables[$tables->fields['nspname'].'.'.$tables->fields['relname']] = serialize($arrTmp); $tables->moveNext(); } echo \PHPPgAdmin\XHtml\HTMLController::printCombo($arrTables, 'formTables[]', false, '', true); @@ -714,7 +714,7 @@ class ViewsController extends BaseController $this->printTitle($this->lang['strcreateview'], 'pg.view.create'); $this->printMsg($msg); - echo '<form action="' . \SUBFOLDER . "/src/views/views\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/views\" method=\"post\">\n"; echo "<table style=\"width: 100%\">\n"; echo "\t<tr>\n\t\t<th class=\"data left required\">{$this->lang['strname']}</th>\n"; echo "\t<td class=\"data1\"><input name=\"formView\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"", @@ -830,7 +830,7 @@ class ViewsController extends BaseController if ((!in_array($curLink, $arrJoined, true) && in_array($tbl1, $arrUsedTbls, true)) || !count($arrJoined)) { // Make sure for multi-column foreign keys that we use a table alias tables joined to more than once // This can (and should be) more optimized for multi-column foreign keys - $adj_tbl2 = in_array($tbl2, $arrUsedTbls, true) ? "${tbl2} AS alias_ppa_" . mktime() : $tbl2; + $adj_tbl2 = in_array($tbl2, $arrUsedTbls, true) ? "${tbl2} AS alias_ppa_".mktime() : $tbl2; $linkFields .= strlen($linkFields) ? "{$curLink['operator']} ${adj_tbl2} ON (\"{$arrLeftLink['schemaname']}\".\"{$arrLeftLink['tablename']}\".\"{$arrLeftLink['fieldname']}\" = \"{$arrRightLink['schemaname']}\".\"{$arrRightLink['tablename']}\".\"{$arrRightLink['fieldname']}\") " : "${tbl1} {$curLink['operator']} ${adj_tbl2} ON (\"{$arrLeftLink['schemaname']}\".\"{$arrLeftLink['tablename']}\".\"{$arrLeftLink['fieldname']}\" = \"{$arrRightLink['schemaname']}\".\"{$arrRightLink['tablename']}\".\"{$arrRightLink['fieldname']}\") "; @@ -876,7 +876,7 @@ class ViewsController extends BaseController //add where from additional conditions if (strlen($addConditions)) { - $viewQuery .= ' WHERE ' . $addConditions; + $viewQuery .= ' WHERE '.$addConditions; } try { |