diff options
| author | Amenadiel <amenadiel@gmail.com> | 2019-08-02 22:26:35 +0300 |
|---|---|---|
| committer | Amenadiel <amenadiel@gmail.com> | 2019-08-02 22:26:35 +0300 |
| commit | fcc268948d4c512e3e86daf4bb11ca431ce641ad (patch) | |
| tree | eb8aea2283f326a7a4c81f58eeba7417da992dca /src | |
| parent | 5e22d718f22528c93428ba6e3ffdbff2e46ece59 (diff) | |
Tag v 6.0.0-beta.52v6.0.0-beta.52
Diffstat (limited to 'src')
168 files changed, 465 insertions, 408 deletions
diff --git a/src/classes/ADONewConnection.php b/src/classes/ADONewConnection.php index 23d2e5db..0c4db028 100644 --- a/src/classes/ADONewConnection.php +++ b/src/classes/ADONewConnection.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin; diff --git a/src/classes/ADORecordSet.php b/src/classes/ADORecordSet.php index 07ba41e5..af02d810 100644 --- a/src/classes/ADORecordSet.php +++ b/src/classes/ADORecordSet.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin; diff --git a/src/classes/ADOdbException.php b/src/classes/ADOdbException.php index 80504afe..791c3998 100644 --- a/src/classes/ADOdbException.php +++ b/src/classes/ADOdbException.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin; diff --git a/src/classes/ArrayRecordSet.php b/src/classes/ArrayRecordSet.php index 698668b1..b584c991 100644 --- a/src/classes/ArrayRecordSet.php +++ b/src/classes/ArrayRecordSet.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin; diff --git a/src/classes/ContainerUtils.php b/src/classes/ContainerUtils.php index bdfcfc91..9fdbe443 100644 --- a/src/classes/ContainerUtils.php +++ b/src/classes/ContainerUtils.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin; diff --git a/src/classes/Misc.php b/src/classes/Misc.php index 42a7823b..2d2baca0 100644 --- a/src/classes/Misc.php +++ b/src/classes/Misc.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin; diff --git a/src/classes/PluginManager.php b/src/classes/PluginManager.php index b1174b07..cd6b97a5 100644 --- a/src/classes/PluginManager.php +++ b/src/classes/PluginManager.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin; diff --git a/src/classes/Translations.php b/src/classes/Translations.php index 61a92c1e..24287791 100644 --- a/src/classes/Translations.php +++ b/src/classes/Translations.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin; diff --git a/src/controllers/AcinsertController.php b/src/controllers/AcinsertController.php index 76938a47..b3cce1f7 100644 --- a/src/controllers/AcinsertController.php +++ b/src/controllers/AcinsertController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/AggregatesController.php b/src/controllers/AggregatesController.php index fd413ad3..c731536f 100644 --- a/src/controllers/AggregatesController.php +++ b/src/controllers/AggregatesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/AlldbController.php b/src/controllers/AlldbController.php index 86aa3256..a790a88f 100644 --- a/src/controllers/AlldbController.php +++ b/src/controllers/AlldbController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; @@ -109,7 +109,7 @@ class AlldbController extends BaseController 'database' => [ 'title' => $this->lang['strdatabase'], 'field' => Decorator::field('datname'), - 'url' => \SUBFOLDER . "/redirect/database?{$href}&", + 'url' => \SUBFOLDER."/redirect/database?{$href}&", 'vars' => ['database' => 'datname'], ], 'owner' => [ @@ -263,12 +263,12 @@ class AlldbController extends BaseController $this->printTrail('database'); $this->printTitle($this->lang['stralter'], 'pg.database.alter'); - echo '<form action="' . \SUBFOLDER . '/src/views/alldb" method="post">' . PHP_EOL; - echo '<table>' . PHP_EOL; - echo "<tr><th class=\"data left required\">{$this->lang['strname']}</th>" . PHP_EOL; + echo '<form action="'.\SUBFOLDER.'/src/views/alldb" method="post">'.PHP_EOL; + echo '<table>'.PHP_EOL; + echo "<tr><th class=\"data left required\">{$this->lang['strname']}</th>".PHP_EOL; echo '<td class="data1">'; echo "<input name=\"newname\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"", - htmlspecialchars($_REQUEST['alterdatabase']), '" /></td></tr>' . PHP_EOL; + htmlspecialchars($_REQUEST['alterdatabase']), '" /></td></tr>'.PHP_EOL; if ($data->hasAlterDatabaseOwner() && $data->isSuperUser()) { // Fetch all users @@ -277,32 +277,32 @@ class AlldbController extends BaseController $owner = isset($rs->fields['usename']) ? $rs->fields['usename'] : ''; $users = $data->getUsers(); - echo "<tr><th class=\"data left required\">{$this->lang['strowner']}</th>" . PHP_EOL; + echo "<tr><th class=\"data left required\">{$this->lang['strowner']}</th>".PHP_EOL; echo '<td class="data1"><select name="owner">'; while (!$users->EOF) { $uname = $users->fields['usename']; echo '<option value="', htmlspecialchars($uname), '"', - ($uname == $owner) ? ' selected="selected"' : '', '>', htmlspecialchars($uname), '</option>' . PHP_EOL; + ($uname == $owner) ? ' selected="selected"' : '', '>', htmlspecialchars($uname), '</option>'.PHP_EOL; $users->moveNext(); } - echo '</select></td></tr>' . PHP_EOL; + echo '</select></td></tr>'.PHP_EOL; } if ($data->hasSharedComments()) { $rs = $data->getDatabaseComment($_REQUEST['alterdatabase']); $comment = isset($rs->fields['description']) ? $rs->fields['description'] : ''; - echo "<tr><th class=\"data left\">{$this->lang['strcomment']}</th>" . PHP_EOL; + echo "<tr><th class=\"data left\">{$this->lang['strcomment']}</th>".PHP_EOL; echo '<td class="data1">'; echo '<textarea rows="3" cols="32" name="dbcomment">', - htmlspecialchars($comment), '</textarea></td></tr>' . PHP_EOL; + htmlspecialchars($comment), '</textarea></td></tr>'.PHP_EOL; } - echo '</table>' . PHP_EOL; - echo '<input type="hidden" name="action" value="alter" />' . PHP_EOL; + echo '</table>'.PHP_EOL; + echo '<input type="hidden" name="action" value="alter" />'.PHP_EOL; echo $this->misc->form; echo '<input type="hidden" name="oldname" value="', - htmlspecialchars($_REQUEST['alterdatabase']), '" />' . PHP_EOL; - echo "<input type=\"submit\" name=\"alter\" value=\"{$this->lang['stralter']}\" />" . PHP_EOL; - echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" />" . PHP_EOL; - echo '</form>' . PHP_EOL; + htmlspecialchars($_REQUEST['alterdatabase']), '" />'.PHP_EOL; + echo "<input type=\"submit\" name=\"alter\" value=\"{$this->lang['stralter']}\" />".PHP_EOL; + echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" />".PHP_EOL; + echo '</form>'.PHP_EOL; } else { $this->coalesceArr($_POST, 'owner', ''); @@ -334,24 +334,24 @@ class AlldbController extends BaseController $this->printTrail('database'); $this->printTitle($this->lang['strdrop'], 'pg.database.drop'); - echo '<form action="' . \SUBFOLDER . '/src/views/alldb" method="post">' . PHP_EOL; + echo '<form action="'.\SUBFOLDER.'/src/views/alldb" method="post">'.PHP_EOL; //If multi drop if (isset($_REQUEST['ma'])) { foreach ($_REQUEST['ma'] as $v) { $a = unserialize(htmlspecialchars_decode($v, ENT_QUOTES)); - echo '<p>', sprintf($this->lang['strconfdropdatabase'], $this->misc->printVal($a['database'])), '</p>' . PHP_EOL; + echo '<p>', sprintf($this->lang['strconfdropdatabase'], $this->misc->printVal($a['database'])), '</p>'.PHP_EOL; printf('<input type="hidden" name="dropdatabase[]" value="%s" />', htmlspecialchars($a['database'])); } } else { - echo '<p>', sprintf($this->lang['strconfdropdatabase'], $this->misc->printVal($_REQUEST['dropdatabase'])), '</p>' . PHP_EOL; - echo '<input type="hidden" name="dropdatabase" value="', htmlspecialchars($_REQUEST['dropdatabase']), '" />' . PHP_EOL; + echo '<p>', sprintf($this->lang['strconfdropdatabase'], $this->misc->printVal($_REQUEST['dropdatabase'])), '</p>'.PHP_EOL; + echo '<input type="hidden" name="dropdatabase" value="', htmlspecialchars($_REQUEST['dropdatabase']), '" />'.PHP_EOL; // END if multi drop } - echo '<input type="hidden" name="action" value="drop" />' . PHP_EOL; + echo '<input type="hidden" name="action" value="drop" />'.PHP_EOL; echo $this->misc->form; - echo "<input type=\"submit\" name=\"drop\" value=\"{$this->lang['strdrop']}\" />" . PHP_EOL; - echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" />" . PHP_EOL; + echo "<input type=\"submit\" name=\"drop\" value=\"{$this->lang['strdrop']}\" />".PHP_EOL; + echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" />".PHP_EOL; echo "</form>\n"; // END confirm } else { //If multi drop @@ -417,45 +417,45 @@ class AlldbController extends BaseController $tablespaces = $data->getTablespaces(); } - echo '<form action="' . \SUBFOLDER . '/src/views/alldb" method="post">' . PHP_EOL; - echo '<table>' . PHP_EOL; - echo "\t<tr>\n\t\t<th class=\"data left required\">{$this->lang['strname']}</th>" . PHP_EOL; + echo '<form action="'.\SUBFOLDER.'/src/views/alldb" method="post">'.PHP_EOL; + echo '<table>'.PHP_EOL; + echo "\t<tr>\n\t\t<th class=\"data left required\">{$this->lang['strname']}</th>".PHP_EOL; echo "\t\t<td class=\"data1\"><input name=\"formName\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"", - htmlspecialchars($_POST['formName']), "\" /></td>\n\t</tr>" . PHP_EOL; + htmlspecialchars($_POST['formName']), "\" /></td>\n\t</tr>".PHP_EOL; - echo "\t<tr>\n\t\t<th class=\"data left required\">{$this->lang['strtemplatedb']}</th>" . PHP_EOL; - echo "\t\t<td class=\"data1\">" . PHP_EOL; - echo "\t\t\t<select name=\"formTemplate\">" . PHP_EOL; + echo "\t<tr>\n\t\t<th class=\"data left required\">{$this->lang['strtemplatedb']}</th>".PHP_EOL; + echo "\t\t<td class=\"data1\">".PHP_EOL; + echo "\t\t\t<select name=\"formTemplate\">".PHP_EOL; // Always offer template0 and template1 echo "\t\t\t\t<option value=\"template0\"", - ('template0' == $_POST['formTemplate']) ? ' selected="selected"' : '', '>template0</option>' . PHP_EOL; + ('template0' == $_POST['formTemplate']) ? ' selected="selected"' : '', '>template0</option>'.PHP_EOL; echo "\t\t\t\t<option value=\"template1\"", - ('template1' == $_POST['formTemplate']) ? ' selected="selected"' : '', '>template1</option>' . PHP_EOL; + ('template1' == $_POST['formTemplate']) ? ' selected="selected"' : '', '>template1</option>'.PHP_EOL; while (!$templatedbs->EOF) { $dbname = htmlspecialchars($templatedbs->fields['datname']); if ('template1' != $dbname) { // filter out for $this->conf[show_system] users so we dont get duplicates echo "\t\t\t\t<option value=\"{$dbname}\"", - ($dbname == $_POST['formTemplate']) ? ' selected="selected"' : '', ">{$dbname}</option>" . PHP_EOL; + ($dbname == $_POST['formTemplate']) ? ' selected="selected"' : '', ">{$dbname}</option>".PHP_EOL; } $templatedbs->moveNext(); } - echo "\t\t\t</select>" . PHP_EOL; - echo "\t\t</td>\n\t</tr>" . PHP_EOL; + echo "\t\t\t</select>".PHP_EOL; + echo "\t\t</td>\n\t</tr>".PHP_EOL; // ENCODING - echo "\t<tr>\n\t\t<th class=\"data left required\">{$this->lang['strencoding']}</th>" . PHP_EOL; - echo "\t\t<td class=\"data1\">" . PHP_EOL; - echo "\t\t\t<select name=\"formEncoding\">" . PHP_EOL; - echo "\t\t\t\t<option value=\"\"></option>" . PHP_EOL; + echo "\t<tr>\n\t\t<th class=\"data left required\">{$this->lang['strencoding']}</th>".PHP_EOL; + echo "\t\t<td class=\"data1\">".PHP_EOL; + echo "\t\t\t<select name=\"formEncoding\">".PHP_EOL; + echo "\t\t\t\t<option value=\"\"></option>".PHP_EOL; foreach ($data->codemap as $key) { echo "\t\t\t\t<option value=\"", htmlspecialchars($key), '"', ($key == $_POST['formEncoding']) ? ' selected="selected"' : '', '>', - $this->misc->printVal($key), '</option>' . PHP_EOL; + $this->misc->printVal($key), '</option>'.PHP_EOL; } - echo "\t\t\t</select>" . PHP_EOL; - echo "\t\t</td>\n\t</tr>" . PHP_EOL; + echo "\t\t\t</select>".PHP_EOL; + echo "\t\t</td>\n\t</tr>".PHP_EOL; if ($data->hasDatabaseCollation()) { $this->coalesceArr($_POST, 'formCollate', ''); @@ -463,48 +463,48 @@ class AlldbController extends BaseController $this->coalesceArr($_POST, 'formCType', ''); // LC_COLLATE - echo "\t<tr>\n\t\t<th class=\"data left\">{$this->lang['strcollation']}</th>" . PHP_EOL; - echo "\t\t<td class=\"data1\">" . PHP_EOL; - echo "\t\t\t<input name=\"formCollate\" value=\"", htmlspecialchars($_POST['formCollate']), '" />' . PHP_EOL; - echo "\t\t</td>\n\t</tr>" . PHP_EOL; + echo "\t<tr>\n\t\t<th class=\"data left\">{$this->lang['strcollation']}</th>".PHP_EOL; + echo "\t\t<td class=\"data1\">".PHP_EOL; + echo "\t\t\t<input name=\"formCollate\" value=\"", htmlspecialchars($_POST['formCollate']), '" />'.PHP_EOL; + echo "\t\t</td>\n\t</tr>".PHP_EOL; // LC_CTYPE - echo "\t<tr>\n\t\t<th class=\"data left\">{$this->lang['strctype']}</th>" . PHP_EOL; - echo "\t\t<td class=\"data1\">" . PHP_EOL; - echo "\t\t\t<input name=\"formCType\" value=\"", htmlspecialchars($_POST['formCType']), '" />' . PHP_EOL; - echo "\t\t</td>\n\t</tr>" . PHP_EOL; + echo "\t<tr>\n\t\t<th class=\"data left\">{$this->lang['strctype']}</th>".PHP_EOL; + echo "\t\t<td class=\"data1\">".PHP_EOL; + echo "\t\t\t<input name=\"formCType\" value=\"", htmlspecialchars($_POST['formCType']), '" />'.PHP_EOL; + echo "\t\t</td>\n\t</tr>".PHP_EOL; } // Tablespace (if there are any) if ($data->hasTablespaces() && $tablespaces->recordCount() > 0) { - echo "\t<tr>\n\t\t<th class=\"data left\">{$this->lang['strtablespace']}</th>" . PHP_EOL; - echo "\t\t<td class=\"data1\">\n\t\t\t<select name=\"formSpc\">" . PHP_EOL; + echo "\t<tr>\n\t\t<th class=\"data left\">{$this->lang['strtablespace']}</th>".PHP_EOL; + echo "\t\t<td class=\"data1\">\n\t\t\t<select name=\"formSpc\">".PHP_EOL; // Always offer the default (empty) option echo "\t\t\t\t<option value=\"\"", - ('' == $_POST['formSpc']) ? ' selected="selected"' : '', '></option>' . PHP_EOL; + ('' == $_POST['formSpc']) ? ' selected="selected"' : '', '></option>'.PHP_EOL; // Display all other tablespaces while (!$tablespaces->EOF) { $spcname = htmlspecialchars($tablespaces->fields['spcname']); echo "\t\t\t\t<option value=\"{$spcname}\"", - ($spcname == $_POST['formSpc']) ? ' selected="selected"' : '', ">{$spcname}</option>" . PHP_EOL; + ($spcname == $_POST['formSpc']) ? ' selected="selected"' : '', ">{$spcname}</option>".PHP_EOL; $tablespaces->moveNext(); } - echo "\t\t\t</select>\n\t\t</td>\n\t</tr>" . PHP_EOL; + echo "\t\t\t</select>\n\t\t</td>\n\t</tr>".PHP_EOL; } // Comments (if available) if ($data->hasSharedComments()) { - echo "\t<tr>\n\t\t<th class=\"data left\">{$this->lang['strcomment']}</th>" . PHP_EOL; + echo "\t<tr>\n\t\t<th class=\"data left\">{$this->lang['strcomment']}</th>".PHP_EOL; echo "\t\t<td><textarea name=\"formComment\" rows=\"3\" cols=\"32\">", - htmlspecialchars($_POST['formComment']), "</textarea></td>\n\t</tr>" . PHP_EOL; + htmlspecialchars($_POST['formComment']), "</textarea></td>\n\t</tr>".PHP_EOL; } - echo '</table>' . PHP_EOL; - echo '<p><input type="hidden" name="action" value="save_create" />' . PHP_EOL; + echo '</table>'.PHP_EOL; + echo '<p><input type="hidden" name="action" value="save_create" />'.PHP_EOL; echo $this->misc->form; - echo "<input type=\"submit\" value=\"{$this->lang['strcreate']}\" />" . PHP_EOL; - echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" /></p>" . PHP_EOL; - echo '</form>' . PHP_EOL; + echo "<input type=\"submit\" value=\"{$this->lang['strcreate']}\" />".PHP_EOL; + echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" /></p>".PHP_EOL; + echo '</form>'.PHP_EOL; } /** @@ -574,7 +574,7 @@ class AlldbController extends BaseController $server_info = $this->misc->getServerInfo(); - echo $this->offerNoRoleExport(isset($server_info['pgVersion']) && floatval(substr($server_info['pgVersion'], 0, 3)) >= 10); + echo $this->offerNoRoleExport(isset($server_info['pgVersion']) && (float) (substr($server_info['pgVersion'], 0, 3)) >= 10); // dumpall doesn't support gzip echo $this->displayOrDownload(false); diff --git a/src/controllers/BaseController.php b/src/controllers/BaseController.php index 8c23918b..6e6fde31 100644 --- a/src/controllers/BaseController.php +++ b/src/controllers/BaseController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/BrowserController.php b/src/controllers/BrowserController.php index ba219da9..734fe69a 100644 --- a/src/controllers/BrowserController.php +++ b/src/controllers/BrowserController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/CastsController.php b/src/controllers/CastsController.php index db872c3c..5a6ea9f0 100644 --- a/src/controllers/CastsController.php +++ b/src/controllers/CastsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/ColpropertiesController.php b/src/controllers/ColpropertiesController.php index 84a93c2a..0e2b84c4 100644 --- a/src/controllers/ColpropertiesController.php +++ b/src/controllers/ColpropertiesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/ConstraintsController.php b/src/controllers/ConstraintsController.php index a16fc764..b1dbdbb7 100644 --- a/src/controllers/ConstraintsController.php +++ b/src/controllers/ConstraintsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/ConversionsController.php b/src/controllers/ConversionsController.php index c8163199..84139490 100644 --- a/src/controllers/ConversionsController.php +++ b/src/controllers/ConversionsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/DatabaseController.php b/src/controllers/DatabaseController.php index b2572061..4494169a 100644 --- a/src/controllers/DatabaseController.php +++ b/src/controllers/DatabaseController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; @@ -45,22 +45,22 @@ class DatabaseController extends BaseController $scripts = ''; // normal flow if ('locks' == $this->action || 'processes' == $this->action) { - $scripts .= '<script src="' . \SUBFOLDER . '/assets/js/database.js" type="text/javascript"></script>'; + $scripts .= '<script src="'.\SUBFOLDER.'/assets/js/database.js" type="text/javascript"></script>'; $refreshTime = $this->conf['ajax_refresh'] * 1500; - $scripts .= '<script type="text/javascript">' . PHP_EOL; + $scripts .= '<script type="text/javascript">'.PHP_EOL; $scripts .= "var Database = {\n"; $scripts .= "ajax_time_refresh: {$refreshTime},\n"; - $scripts .= "str_start: {text:'{$this->lang['strstart']}',icon: '" . $this->misc->icon('Execute') . "'},\n"; - $scripts .= "str_stop: {text:'{$this->lang['strstop']}',icon: '" . $this->misc->icon('Stop') . "'},\n"; - $scripts .= "load_icon: '" . $this->misc->icon('Loading') . "',\n"; + $scripts .= "str_start: {text:'{$this->lang['strstart']}',icon: '".$this->misc->icon('Execute')."'},\n"; + $scripts .= "str_stop: {text:'{$this->lang['strstop']}',icon: '".$this->misc->icon('Stop')."'},\n"; + $scripts .= "load_icon: '".$this->misc->icon('Loading')."',\n"; $scripts .= "server:'{$_REQUEST['server']}',\n"; $scripts .= "dbname:'{$_REQUEST['database']}',\n"; $scripts .= "action:'refresh_{$this->action}',\n"; - $scripts .= "errmsg: '" . str_replace("'", "\\'", $this->lang['strconnectionfail']) . "'\n"; + $scripts .= "errmsg: '".str_replace("'", "\\'", $this->lang['strconnectionfail'])."'\n"; $scripts .= "};\n"; - $scripts .= '</script>' . PHP_EOL; + $scripts .= '</script>'.PHP_EOL; } $header_template = 'header.twig'; @@ -185,11 +185,11 @@ class DatabaseController extends BaseController $this->printTabs('database', 'find'); $this->printMsg($msg); - echo '<form action="' . \SUBFOLDER . '/src/views/database" method="post">' . PHP_EOL; + echo '<form action="'.\SUBFOLDER.'/src/views/database" method="post">'.PHP_EOL; echo '<p><input name="term" value="', htmlspecialchars($_REQUEST['term']), - "\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" />" . PHP_EOL; + "\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" />".PHP_EOL; // Output list of filters. This is complex due to all the 'has' and 'conf' feature possibilities - echo '<select name="filter">' . PHP_EOL; + echo '<select name="filter">'.PHP_EOL; echo $this->_printTypeOption(''); echo $this->_printTypeOption('COLUMN'); @@ -213,12 +213,12 @@ class DatabaseController extends BaseController echo $this->_printTypeOption('LANGUAGE'); } - echo '</select>' . PHP_EOL; - echo "<input type=\"submit\" value=\"{$this->lang['strfind']}\" />" . PHP_EOL; + echo '</select>'.PHP_EOL; + echo "<input type=\"submit\" value=\"{$this->lang['strfind']}\" />".PHP_EOL; echo $this->misc->form; - echo '<input type="hidden" name="action" value="find" /></p>' . PHP_EOL; - echo '<input type="hidden" name="confirm" value="true" /></p>' . PHP_EOL; - echo '</form>' . PHP_EOL; + echo '<input type="hidden" name="action" value="find" /></p>'.PHP_EOL; + echo '<input type="hidden" name="confirm" value="true" /></p>'.PHP_EOL; + echo '</form>'.PHP_EOL; // Default focus $this->setFocus('forms[0].term'); @@ -235,7 +235,7 @@ class DatabaseController extends BaseController $filter = $_REQUEST['filter']; $optionhtml = sprintf('%s<option value="%s" %s>', "\t", $curr, ($curr === $filter) ? ' selected="selected"' : ''); $optionhtml .= $this->_translatedType($curr); - $optionhtml .= '</option>' . PHP_EOL; + $optionhtml .= '</option>'.PHP_EOL; return $optionhtml; } @@ -279,95 +279,95 @@ class DatabaseController extends BaseController { switch ($curr) { case 'SCHEMA': - echo '<li><a href="' . \SUBFOLDER . "/redirect/schema?{$this->misc->href}&schema="; + echo '<li><a href="'.\SUBFOLDER."/redirect/schema?{$this->misc->href}&schema="; echo $this->misc->printVal($rs->fields['name']), '">'; echo $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']); - echo '</a></li>' . PHP_EOL; + echo '</a></li>'.PHP_EOL; break; case 'TABLE': echo '<li>'; echo "<a href=\"tables?subject=schema&{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '</a>.'; - echo '<a href="' . \SUBFOLDER . "/redirect/table?{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '&table=', - urlencode($rs->fields['name']), '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '</a></li>' . PHP_EOL; + echo '<a href="'.\SUBFOLDER."/redirect/table?{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '&table=', + urlencode($rs->fields['name']), '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '</a></li>'.PHP_EOL; break; case 'VIEW': echo '<li>'; echo "<a href=\"views?subject=schema&{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '</a>.'; - echo '<a href="' . \SUBFOLDER . "/redirect/view?{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '&view=', - urlencode($rs->fields['name']), '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '</a></li>' . PHP_EOL; + echo '<a href="'.\SUBFOLDER."/redirect/view?{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '&view=', + urlencode($rs->fields['name']), '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '</a></li>'.PHP_EOL; break; case 'SEQUENCE': echo '<li>'; echo "<a href=\"sequences?subject=schema&{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '</a>.'; echo "<a href=\"sequences?subject=sequence&action=properties&{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), - '&sequence=', urlencode($rs->fields['name']), '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '</a></li>' . PHP_EOL; + '&sequence=', urlencode($rs->fields['name']), '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '</a></li>'.PHP_EOL; break; case 'COLUMNTABLE': echo '<li>'; - echo '<a href="' . \SUBFOLDER . "/redirect/schema?{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '</a>.'; + echo '<a href="'.\SUBFOLDER."/redirect/schema?{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '</a>.'; echo "<a href=\"tblproperties?subject=table&{$this->misc->href}&table=", urlencode($rs->fields['relname']), '&schema=', urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['relname']), '</a>.'; echo "<a href=\"colproperties?{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '&table=', urlencode($rs->fields['relname']), '&column=', urlencode($rs->fields['name']), '">', - $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '</a></li>' . PHP_EOL; + $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '</a></li>'.PHP_EOL; break; case 'COLUMNVIEW': echo '<li>'; - echo '<a href="' . \SUBFOLDER . "/redirect/schema?{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '</a>.'; + echo '<a href="'.\SUBFOLDER."/redirect/schema?{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '</a>.'; echo "<a href=\"viewproperties?subject=view&{$this->misc->href}&view=", urlencode($rs->fields['relname']), '&schema=', urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['relname']), '</a>.'; echo "<a href=\"colproperties?{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '&view=', urlencode($rs->fields['relname']), '&column=', urlencode($rs->fields['name']), '">', - $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '</a></li>' . PHP_EOL; + $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '</a></li>'.PHP_EOL; break; case 'INDEX': echo '<li>'; - echo '<a href="' . \SUBFOLDER . "/redirect/schema?{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '</a>.'; - echo '<a href="' . \SUBFOLDER . "/redirect/table?{$this->misc->href}&table=", urlencode($rs->fields['relname']), '&schema=', urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['relname']), '</a>.'; - echo "<a href=\"indexes?{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '&table=', urlencode($rs->fields['relname']), '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '</a></li>' . PHP_EOL; + echo '<a href="'.\SUBFOLDER."/redirect/schema?{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '</a>.'; + echo '<a href="'.\SUBFOLDER."/redirect/table?{$this->misc->href}&table=", urlencode($rs->fields['relname']), '&schema=', urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['relname']), '</a>.'; + echo "<a href=\"indexes?{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '&table=', urlencode($rs->fields['relname']), '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '</a></li>'.PHP_EOL; break; case 'CONSTRAINTTABLE': echo '<li>'; - echo '<a href="' . \SUBFOLDER . "/redirect/schema?{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '</a>.'; - echo '<a href="' . \SUBFOLDER . "/redirect/table?{$this->misc->href}&table=", urlencode($rs->fields['relname']), '&schema=', urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['relname']), '</a>.'; + echo '<a href="'.\SUBFOLDER."/redirect/schema?{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '</a>.'; + echo '<a href="'.\SUBFOLDER."/redirect/table?{$this->misc->href}&table=", urlencode($rs->fields['relname']), '&schema=', urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['relname']), '</a>.'; echo "<a href=\"constraints?{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '&table=', - urlencode($rs->fields['relname']), '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '</a></li>' . PHP_EOL; + urlencode($rs->fields['relname']), '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '</a></li>'.PHP_EOL; break; case 'CONSTRAINTDOMAIN': echo '<li>'; echo "<a href=\"domains?subject=schema&{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '</a>.'; echo "<a href=\"domains?action=properties&{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '&domain=', urlencode($rs->fields['relname']), '">', - $this->misc->printVal($rs->fields['relname']), '.', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '</a></li>' . PHP_EOL; + $this->misc->printVal($rs->fields['relname']), '.', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '</a></li>'.PHP_EOL; break; case 'TRIGGER': echo '<li>'; - echo '<a href="' . \SUBFOLDER . "/redirect/schema?{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '</a>.'; - echo '<a href="' . \SUBFOLDER . "/redirect/table?{$this->misc->href}&table=", urlencode($rs->fields['relname']), '&schema=', urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['relname']), '</a>.'; + echo '<a href="'.\SUBFOLDER."/redirect/schema?{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '</a>.'; + echo '<a href="'.\SUBFOLDER."/redirect/table?{$this->misc->href}&table=", urlencode($rs->fields['relname']), '&schema=', urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['relname']), '</a>.'; echo "<a href=\"triggers?{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '&table=', urlencode($rs->fields['relname']), '">', - $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '</a></li>' . PHP_EOL; + $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '</a></li>'.PHP_EOL; break; case 'RULETABLE': echo '<li>'; - echo '<a href="' . \SUBFOLDER . "/redirect/schema?{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '</a>.'; - echo '<a href="' . \SUBFOLDER . "/redirect/table?{$this->misc->href}&table=", urlencode($rs->fields['relname']), '&schema=', urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['relname']), '</a>.'; + echo '<a href="'.\SUBFOLDER."/redirect/schema?{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '</a>.'; + echo '<a href="'.\SUBFOLDER."/redirect/table?{$this->misc->href}&table=", urlencode($rs->fields['relname']), '&schema=', urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['relname']), '</a>.'; echo "<a href=\"rules?subject=table&{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '&reltype=table&table=', - urlencode($rs->fields['relname']), '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '</a></li>' . PHP_EOL; + urlencode($rs->fields['relname']), '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '</a></li>'.PHP_EOL; break; case 'RULEVIEW': echo '<li>'; - echo '<a href="' . \SUBFOLDER . "/redirect/schema?{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '</a>.'; - echo '<a href="' . \SUBFOLDER . "/redirect/view?{$this->misc->href}&view=", urlencode($rs->fields['relname']), '&schema=', urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['relname']), '</a>.'; + echo '<a href="'.\SUBFOLDER."/redirect/schema?{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '</a>.'; + echo '<a href="'.\SUBFOLDER."/redirect/view?{$this->misc->href}&view=", urlencode($rs->fields['relname']), '&schema=', urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['relname']), '</a>.'; echo "<a href=\"rules?subject=view&{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '&reltype=view&view=', - urlencode($rs->fields['relname']), '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '</a></li>' . PHP_EOL; + urlencode($rs->fields['relname']), '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '</a></li>'.PHP_EOL; break; case 'FUNCTION': @@ -375,53 +375,53 @@ class DatabaseController extends BaseController echo "<a href=\"functions?subject=schema&{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '</a>.'; echo "<a href=\"functions?action=properties&{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '&function=', urlencode($rs->fields['name']), '&function_oid=', urlencode($rs->fields['oid']), '">', - $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '</a></li>' . PHP_EOL; + $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '</a></li>'.PHP_EOL; break; case 'TYPE': echo '<li>'; echo "<a href=\"types?subject=schema&{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '</a>.'; echo "<a href=\"types?action=properties&{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '&type=', - urlencode($rs->fields['name']), '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '</a></li>' . PHP_EOL; + urlencode($rs->fields['name']), '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '</a></li>'.PHP_EOL; break; case 'DOMAIN': echo '<li>'; echo "<a href=\"domains?subject=schema&{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '</a>.'; echo "<a href=\"domains?action=properties&{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '&domain=', - urlencode($rs->fields['name']), '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '</a></li>' . PHP_EOL; + urlencode($rs->fields['name']), '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '</a></li>'.PHP_EOL; break; case 'OPERATOR': echo '<li>'; echo "<a href=\"operators?subject=schema&{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '</a>.'; echo "<a href=\"operators?action=properties&{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '&operator=', - urlencode($rs->fields['name']), '&operator_oid=', urlencode($rs->fields['oid']), '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '</a></li>' . PHP_EOL; + urlencode($rs->fields['name']), '&operator_oid=', urlencode($rs->fields['oid']), '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '</a></li>'.PHP_EOL; break; case 'CONVERSION': echo '<li>'; echo "<a href=\"conversions?subject=schema&{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '</a>.'; echo "<a href=\"conversions?{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), - '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '</a></li>' . PHP_EOL; + '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '</a></li>'.PHP_EOL; break; case 'LANGUAGE': - echo "<li><a href=\"languages?{$this->misc->href}\">", $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '</a></li>' . PHP_EOL; + echo "<li><a href=\"languages?{$this->misc->href}\">", $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '</a></li>'.PHP_EOL; break; case 'AGGREGATE': echo '<li>'; echo "<a href=\"aggregates?subject=schema&{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '</a>.'; echo "<a href=\"aggregates?{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', - $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '</a></li>' . PHP_EOL; + $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '</a></li>'.PHP_EOL; break; case 'OPCLASS': echo '<li>'; - echo '<a href="' . \SUBFOLDER . "/redirect/schema?{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '</a>.'; + echo '<a href="'.\SUBFOLDER."/redirect/schema?{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '</a>.'; echo "<a href=\"opclasses?{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', - $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '</a></li>' . PHP_EOL; + $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '</a></li>'.PHP_EOL; break; } @@ -431,7 +431,7 @@ class DatabaseController extends BaseController { $data = $this->misc->getDatabaseAccessor(); $rs = $data->findObject($_REQUEST['term'], $_REQUEST['filter']); - if ($rs->RecordCount() > 0) { + if ($rs->recordCount() > 0) { $curr = ''; while (!$rs->EOF) { // Output a new header if the current type has changed, but not if it's just changed the rule type @@ -446,25 +446,25 @@ class DatabaseController extends BaseController $curr = $rs->fields['type']; } else { if ('' != $curr) { - echo '</ul>' . PHP_EOL; + echo '</ul>'.PHP_EOL; } $curr = $rs->fields['type']; echo '<h3>'; echo $this->_translatedType($curr); echo '</h3>'; - echo '<ul>' . PHP_EOL; + echo '<ul>'.PHP_EOL; } } $this->_printHtmlForType($curr, $rs); $rs->moveNext(); } - echo '</ul>' . PHP_EOL; + echo '</ul>'.PHP_EOL; - echo '<p>', $rs->recordCount(), ' ', $this->lang['strobjects'], '</p>' . PHP_EOL; + echo '<p>', $rs->recordCount(), ' ', $this->lang['strobjects'], '</p>'.PHP_EOL; } else { - echo "<p>{$this->lang['strnoobjects']}</p>" . PHP_EOL; + echo "<p>{$this->lang['strnoobjects']}</p>".PHP_EOL; } } @@ -539,7 +539,7 @@ class DatabaseController extends BaseController $this->printMsg($msg); if (0 === strlen($msg)) { - echo '<br /><a id="control" href=""><img src="' . $this->misc->icon('Refresh') . "\" alt=\"{$this->lang['strrefresh']}\" title=\"{$this->lang['strrefresh']}\"/> {$this->lang['strrefresh']}</a>"; + echo '<br /><a id="control" href=""><img src="'.$this->misc->icon('Refresh')."\" alt=\"{$this->lang['strrefresh']}\" title=\"{$this->lang['strrefresh']}\"/> {$this->lang['strrefresh']}</a>"; } echo '<div id="data_block">'; @@ -553,7 +553,7 @@ class DatabaseController extends BaseController // Display prepared transactions if ($data->hasPreparedXacts()) { - echo "<h3>{$this->lang['strpreparedxacts']}</h3>" . PHP_EOL; + echo "<h3>{$this->lang['strpreparedxacts']}</h3>".PHP_EOL; $prep_xacts = $data->getPreparedXacts($_REQUEST['database']); $columns = [ @@ -581,7 +581,7 @@ class DatabaseController extends BaseController } // Fetch the processes from the database - echo "<h3>{$this->lang['strprocesses']}</h3>" . PHP_EOL; + echo "<h3>{$this->lang['strprocesses']}</h3>".PHP_EOL; $processes = $data->getProcesses($_REQUEST['database']); $columns = [ @@ -721,7 +721,7 @@ class DatabaseController extends BaseController $this->printTrail('database'); $this->printTabs('database', 'locks'); - echo '<br /><a id="control" href=""><img src="' . $this->misc->icon('Refresh') . "\" alt=\"{$this->lang['strrefresh']}\" title=\"{$this->lang['strrefresh']}\"/> {$this->lang['strrefresh']}</a>"; + echo '<br /><a id="control" href=""><img src="'.$this->misc->icon('Refresh')."\" alt=\"{$this->lang['strrefresh']}\" title=\"{$this->lang['strrefresh']}\"/> {$this->lang['strrefresh']}</a>"; echo '<div id="data_block">'; $this->currentLocks(); @@ -740,27 +740,27 @@ class DatabaseController extends BaseController $this->printTrail('database'); $this->printTabs('database', 'sql'); - echo "<p>{$this->lang['strentersql']}</p>" . PHP_EOL; - echo '<form action="' . \SUBFOLDER . '/src/views/sql" method="post" enctype="multipart/form-data" id="sqlform">' . PHP_EOL; - echo "<p>{$this->lang['strsql']}<br />" . PHP_EOL; + echo "<p>{$this->lang['strentersql']}</p>".PHP_EOL; + echo '<form action="'.\SUBFOLDER.'/src/views/sql" method="post" enctype="multipart/form-data" id="sqlform">'.PHP_EOL; + echo "<p>{$this->lang['strsql']}<br />".PHP_EOL; echo '<textarea style="width:95%;" rows="15" cols="50" name="query" id="query">', - htmlspecialchars($_SESSION['sqlquery']), '</textarea></p>' . PHP_EOL; + htmlspecialchars($_SESSION['sqlquery']), '</textarea></p>'.PHP_EOL; // Check that file uploads are enabled if (ini_get('file_uploads')) { // Don't show upload option if max size of uploads is zero $max_size = $this->misc->inisizeToBytes(ini_get('upload_max_filesize')); if (is_double($max_size) && $max_size > 0) { - echo "<p><input type=\"hidden\" name=\"MAX_FILE_SIZE\" value=\"{$max_size}\" />" . PHP_EOL; - echo "<label for=\"script\">{$this->lang['struploadscript']}</label> <input id=\"script\" name=\"script\" type=\"file\" /></p>" . PHP_EOL; + echo "<p><input type=\"hidden\" name=\"MAX_FILE_SIZE\" value=\"{$max_size}\" />".PHP_EOL; + echo "<label for=\"script\">{$this->lang['struploadscript']}</label> <input id=\"script\" name=\"script\" type=\"file\" /></p>".PHP_EOL; } } - echo '<p><input type="checkbox" id="paginate" name="paginate"', (isset($_REQUEST['paginate']) ? ' checked="checked"' : ''), " /><label for=\"paginate\">{$this->lang['strpaginate']}</label></p>" . PHP_EOL; - echo "<p><input type=\"submit\" name=\"execute\" accesskey=\"r\" value=\"{$this->lang['strexecute']}\" />" . PHP_EOL; + echo '<p><input type="checkbox" id="paginate" name="paginate"', (isset($_REQUEST['paginate']) ? ' checked="checked"' : ''), " /><label for=\"paginate\">{$this->lang['strpaginate']}</label></p>".PHP_EOL; + echo "<p><input type=\"submit\" name=\"execute\" accesskey=\"r\" value=\"{$this->lang['strexecute']}\" />".PHP_EOL; echo $this->misc->form; - echo "<input type=\"reset\" accesskey=\"q\" value=\"{$this->lang['strreset']}\" /></p>" . PHP_EOL; - echo '</form>' . PHP_EOL; + echo "<input type=\"reset\" accesskey=\"q\" value=\"{$this->lang['strreset']}\" /></p>".PHP_EOL; + echo '</form>'.PHP_EOL; // Default focus $this->setFocus('forms[0].query'); diff --git a/src/controllers/DataexportController.php b/src/controllers/DataexportController.php index 5a14c505..4b55af34 100644 --- a/src/controllers/DataexportController.php +++ b/src/controllers/DataexportController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/DataimportController.php b/src/controllers/DataimportController.php index aa2c24a6..e5a044a9 100644 --- a/src/controllers/DataimportController.php +++ b/src/controllers/DataimportController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/DbexportController.php b/src/controllers/DbexportController.php index 531cc37d..2b177f3b 100644 --- a/src/controllers/DbexportController.php +++ b/src/controllers/DbexportController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; @@ -48,7 +48,7 @@ class DbexportController extends BaseController // Obtain the pg_dump version number and check if the path is good $version = []; - preg_match('/(\\d+(?:\\.\\d+)?)(?:\\.\\d+)?.*$/', exec($exe . ' --version'), $version); + preg_match('/(\\d+(?:\\.\\d+)?)(?:\\.\\d+)?.*$/', exec($exe.' --version'), $version); if (empty($version)) { $this->prtrace('$exe', $exe, 'version', $version[1]); @@ -97,20 +97,20 @@ class DbexportController extends BaseController } // Set environmental variables that pg_dump uses - putenv('PGPASSWORD=' . $server_info['password']); - putenv('PGUSER=' . $server_info['username']); + putenv('PGPASSWORD='.$server_info['password']); + putenv('PGUSER='.$server_info['username']); $hostname = $server_info['host']; if (null !== $hostname && '' != $hostname) { - putenv('PGHOST=' . $hostname); + putenv('PGHOST='.$hostname); } $port = $server_info['port']; if (null !== $port && '' != $port) { - putenv('PGPORT=' . $port); + putenv('PGPORT='.$port); } // Build command for executing pg_dump. '-i' means ignore version differences. if (((float) $version[1]) < 9.5) { - $cmd = $exe . ' -i'; + $cmd = $exe.' -i'; } else { $cmd = $exe; } @@ -125,7 +125,7 @@ class DbexportController extends BaseController switch ($_REQUEST['subject']) { case 'schema': // This currently works for 8.2+ (due to the orthoganl -t -n issue introduced then) - $cmd .= ' -n ' . $this->misc->escapeShellArg("\"{$f_schema}\""); + $cmd .= ' -n '.$this->misc->escapeShellArg("\"{$f_schema}\""); break; case 'table': @@ -138,13 +138,13 @@ class DbexportController extends BaseController // Starting in 8.2, -n and -t are orthagonal, so we now schema qualify // the table name in the -t argument and quote both identifiers if (((float) $version[1]) >= 8.2) { - $cmd .= ' -t ' . $this->misc->escapeShellArg("\"{$f_schema}\".\"{$f_object}\""); + $cmd .= ' -t '.$this->misc->escapeShellArg("\"{$f_schema}\".\"{$f_object}\""); } else { // If we are 7.4 or higher, assume they are using 7.4 pg_dump and // set dump schema as well. Also, mixed case dumping has been fixed // then.. - $cmd .= ' -t ' . $this->misc->escapeShellArg($f_object) - . ' -n ' . $this->misc->escapeShellArg($f_schema); + $cmd .= ' -t '.$this->misc->escapeShellArg($f_object) + .' -n '.$this->misc->escapeShellArg($f_schema); } } @@ -185,7 +185,7 @@ class DbexportController extends BaseController } if (!$dumpall) { - putenv('PGDATABASE=' . $_REQUEST['database']); + putenv('PGDATABASE='.$_REQUEST['database']); } else { //$cmd .= ' --no-role-password'; putenv('PGDATABASE'); diff --git a/src/controllers/DisplayController.php b/src/controllers/DisplayController.php index 1a2e8bfa..eefeae75 100644 --- a/src/controllers/DisplayController.php +++ b/src/controllers/DisplayController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/DomainsController.php b/src/controllers/DomainsController.php index 8a63154d..f0065154 100644 --- a/src/controllers/DomainsController.php +++ b/src/controllers/DomainsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/FulltextController.php b/src/controllers/FulltextController.php index 06e59aaf..3b4d3d0f 100644 --- a/src/controllers/FulltextController.php +++ b/src/controllers/FulltextController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/FunctionsController.php b/src/controllers/FunctionsController.php index 411984c2..f5510c71 100644 --- a/src/controllers/FunctionsController.php +++ b/src/controllers/FunctionsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/GroupsController.php b/src/controllers/GroupsController.php index 2cffd3be..c98d2f39 100644 --- a/src/controllers/GroupsController.php +++ b/src/controllers/GroupsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/HelpController.php b/src/controllers/HelpController.php index ec34e752..51d863e5 100644 --- a/src/controllers/HelpController.php +++ b/src/controllers/HelpController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/HistoryController.php b/src/controllers/HistoryController.php index 5febdccd..12c9d719 100644 --- a/src/controllers/HistoryController.php +++ b/src/controllers/HistoryController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/IndexesController.php b/src/controllers/IndexesController.php index 518ace67..1f5730ca 100644 --- a/src/controllers/IndexesController.php +++ b/src/controllers/IndexesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/InfoController.php b/src/controllers/InfoController.php index 70cb9db1..65e5143c 100644 --- a/src/controllers/InfoController.php +++ b/src/controllers/InfoController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/IntroController.php b/src/controllers/IntroController.php index a7b73af6..01303515 100644 --- a/src/controllers/IntroController.php +++ b/src/controllers/IntroController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/LanguagesController.php b/src/controllers/LanguagesController.php index ea917293..c2a4cb5c 100644 --- a/src/controllers/LanguagesController.php +++ b/src/controllers/LanguagesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/LoginController.php b/src/controllers/LoginController.php index d5a7a075..1f7b7817 100644 --- a/src/controllers/LoginController.php +++ b/src/controllers/LoginController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/MaterializedviewpropertiesController.php b/src/controllers/MaterializedviewpropertiesController.php index 9994155f..069557ed 100644 --- a/src/controllers/MaterializedviewpropertiesController.php +++ b/src/controllers/MaterializedviewpropertiesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/MaterializedviewsController.php b/src/controllers/MaterializedviewsController.php index 1366ab18..fa5bedf5 100644 --- a/src/controllers/MaterializedviewsController.php +++ b/src/controllers/MaterializedviewsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/OpclassesController.php b/src/controllers/OpclassesController.php index f03552ae..8867229c 100644 --- a/src/controllers/OpclassesController.php +++ b/src/controllers/OpclassesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/OperatorsController.php b/src/controllers/OperatorsController.php index 76e5d2c5..214ee948 100644 --- a/src/controllers/OperatorsController.php +++ b/src/controllers/OperatorsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/PrivilegesController.php b/src/controllers/PrivilegesController.php index 268a6548..d7ac2f80 100644 --- a/src/controllers/PrivilegesController.php +++ b/src/controllers/PrivilegesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/RolesController.php b/src/controllers/RolesController.php index a143c589..5b93d54e 100644 --- a/src/controllers/RolesController.php +++ b/src/controllers/RolesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/RulesController.php b/src/controllers/RulesController.php index b95660f2..e4eb6c0a 100644 --- a/src/controllers/RulesController.php +++ b/src/controllers/RulesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/SchemasController.php b/src/controllers/SchemasController.php index 25037dcd..e030a262 100644 --- a/src/controllers/SchemasController.php +++ b/src/controllers/SchemasController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/SequencesController.php b/src/controllers/SequencesController.php index 6bf2774b..db8714f1 100644 --- a/src/controllers/SequencesController.php +++ b/src/controllers/SequencesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/ServersController.php b/src/controllers/ServersController.php index 1ab4e921..2c9aea0e 100644 --- a/src/controllers/ServersController.php +++ b/src/controllers/ServersController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/SqlController.php b/src/controllers/SqlController.php index c97341f3..fe2fe9a8 100644 --- a/src/controllers/SqlController.php +++ b/src/controllers/SqlController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/SqleditController.php b/src/controllers/SqleditController.php index b1126af0..a05ebe8e 100644 --- a/src/controllers/SqleditController.php +++ b/src/controllers/SqleditController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/TablesController.php b/src/controllers/TablesController.php index 4f159e65..1019fae3 100644 --- a/src/controllers/TablesController.php +++ b/src/controllers/TablesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/TablespacesController.php b/src/controllers/TablespacesController.php index b4e4d960..502de5eb 100644 --- a/src/controllers/TablespacesController.php +++ b/src/controllers/TablespacesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/TblpropertiesController.php b/src/controllers/TblpropertiesController.php index 0f73dde7..f09e77da 100644 --- a/src/controllers/TblpropertiesController.php +++ b/src/controllers/TblpropertiesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/TriggersController.php b/src/controllers/TriggersController.php index 8c953282..2137da7b 100644 --- a/src/controllers/TriggersController.php +++ b/src/controllers/TriggersController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/TypesController.php b/src/controllers/TypesController.php index ad1f85f8..0301e179 100644 --- a/src/controllers/TypesController.php +++ b/src/controllers/TypesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/UsersController.php b/src/controllers/UsersController.php index 2556ba81..2510b6b3 100644 --- a/src/controllers/UsersController.php +++ b/src/controllers/UsersController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/ViewpropertiesController.php b/src/controllers/ViewpropertiesController.php index ea71cbb1..898a1375 100644 --- a/src/controllers/ViewpropertiesController.php +++ b/src/controllers/ViewpropertiesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/ViewsController.php b/src/controllers/ViewsController.php index f76ff476..e9e044de 100644 --- a/src/controllers/ViewsController.php +++ b/src/controllers/ViewsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Controller; diff --git a/src/database/ADOdbBase.php b/src/database/ADOdbBase.php index cb18d805..bfeb1346 100644 --- a/src/database/ADOdbBase.php +++ b/src/database/ADOdbBase.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database; @@ -234,7 +234,7 @@ class ADOdbBase return $this->conn->ErrorNo(); } - if ($rs->RecordCount() == 0) { + if ($rs->recordCount() == 0) { return -1; } diff --git a/src/database/Connection.php b/src/database/Connection.php index a18cdd93..67630acd 100644 --- a/src/database/Connection.php +++ b/src/database/Connection.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres.php b/src/database/Postgres.php index 0716aa15..42634867 100644 --- a/src/database/Postgres.php +++ b/src/database/Postgres.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database; @@ -358,7 +358,7 @@ class Postgres extends ADOdbBase AND attnum IN ('".join("','", $atts)."')"; $rs = $this->selectSet($sql); - if ($rs->RecordCount() != sizeof($atts)) { + if ($rs->recordCount() != sizeof($atts)) { return -2; } diff --git a/src/database/Postgres10.php b/src/database/Postgres10.php index ae1c62a5..1af7d5f4 100644 --- a/src/database/Postgres10.php +++ b/src/database/Postgres10.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres11.php b/src/database/Postgres11.php index d3badfe1..72a932db 100644 --- a/src/database/Postgres11.php +++ b/src/database/Postgres11.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres74.php b/src/database/Postgres74.php index dbf0b855..bedf1bce 100644 --- a/src/database/Postgres74.php +++ b/src/database/Postgres74.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres80.php b/src/database/Postgres80.php index 8918edcb..b58dcab3 100644 --- a/src/database/Postgres80.php +++ b/src/database/Postgres80.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres81.php b/src/database/Postgres81.php index f27bb1a1..50081c7b 100644 --- a/src/database/Postgres81.php +++ b/src/database/Postgres81.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database; @@ -203,7 +203,7 @@ class Postgres81 extends Postgres82 WHERE vacrelid = {$toid};"); $status = -1; // ini - if ($rs->RecordCount() and ($rs->fields['vacrelid'] == $toid)) { + if ($rs->recordCount() and ($rs->fields['vacrelid'] == $toid)) { // table exists in pg_autovacuum, UPDATE $sql = sprintf( "UPDATE \"pg_catalog\".\"pg_autovacuum\" SET diff --git a/src/database/Postgres82.php b/src/database/Postgres82.php index c83208f5..65bb8563 100644 --- a/src/database/Postgres82.php +++ b/src/database/Postgres82.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres83.php b/src/database/Postgres83.php index 30f54ded..d823bb01 100644 --- a/src/database/Postgres83.php +++ b/src/database/Postgres83.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database; @@ -216,7 +216,7 @@ class Postgres83 extends Postgres84 WHERE vacrelid = {$toid};"); $status = -1; // ini - if ($rs->RecordCount() and ($rs->fields['vacrelid'] == $toid)) { + if ($rs->recordCount() and ($rs->fields['vacrelid'] == $toid)) { // table exists in pg_autovacuum, UPDATE $sql = sprintf( "UPDATE \"pg_catalog\".\"pg_autovacuum\" SET diff --git a/src/database/Postgres84.php b/src/database/Postgres84.php index aed669a5..25e0e09c 100644 --- a/src/database/Postgres84.php +++ b/src/database/Postgres84.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres90.php b/src/database/Postgres90.php index 450b85e0..316e172d 100644 --- a/src/database/Postgres90.php +++ b/src/database/Postgres90.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres91.php b/src/database/Postgres91.php index 456b188d..03188635 100644 --- a/src/database/Postgres91.php +++ b/src/database/Postgres91.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres92.php b/src/database/Postgres92.php index a43420fe..d507f7cb 100644 --- a/src/database/Postgres92.php +++ b/src/database/Postgres92.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres93.php b/src/database/Postgres93.php index 829616fe..93304ae9 100644 --- a/src/database/Postgres93.php +++ b/src/database/Postgres93.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres94.php b/src/database/Postgres94.php index c31a09ca..a60e6871 100644 --- a/src/database/Postgres94.php +++ b/src/database/Postgres94.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres95.php b/src/database/Postgres95.php index 69e043ec..a59b6fc4 100644 --- a/src/database/Postgres95.php +++ b/src/database/Postgres95.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres96.php b/src/database/Postgres96.php index 748f3b0e..f06fb763 100644 --- a/src/database/Postgres96.php +++ b/src/database/Postgres96.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database; diff --git a/src/database/databasetraits/AggregateTrait.php b/src/database/databasetraits/AggregateTrait.php index 07ea417b..fb7294b0 100644 --- a/src/database/databasetraits/AggregateTrait.php +++ b/src/database/databasetraits/AggregateTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/database/databasetraits/ColumnTrait.php b/src/database/databasetraits/ColumnTrait.php index dd8d8199..253ec255 100644 --- a/src/database/databasetraits/ColumnTrait.php +++ b/src/database/databasetraits/ColumnTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/database/databasetraits/DatabaseTrait.php b/src/database/databasetraits/DatabaseTrait.php index 680a6f6f..668769f9 100644 --- a/src/database/databasetraits/DatabaseTrait.php +++ b/src/database/databasetraits/DatabaseTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/database/databasetraits/DomainTrait.php b/src/database/databasetraits/DomainTrait.php index 35705c7e..e8c74c22 100644 --- a/src/database/databasetraits/DomainTrait.php +++ b/src/database/databasetraits/DomainTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/database/databasetraits/FtsTrait.php b/src/database/databasetraits/FtsTrait.php index b2a0c5a0..a0d88ef4 100644 --- a/src/database/databasetraits/FtsTrait.php +++ b/src/database/databasetraits/FtsTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/database/databasetraits/FunctionTrait.php b/src/database/databasetraits/FunctionTrait.php index cce2dfa1..660eac6c 100644 --- a/src/database/databasetraits/FunctionTrait.php +++ b/src/database/databasetraits/FunctionTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database\Traits; @@ -62,7 +62,8 @@ trait FunctionTrait } /** - * Returns a list of all functions that can be used in triggers + * Returns a list of all functions that can be used in triggers. + * * @return \PHPPgAdmin\ADORecordSet Functions that can be used in a trigger */ public function getTriggerFunctions() @@ -273,13 +274,13 @@ trait FunctionTrait 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}\""; diff --git a/src/database/databasetraits/HasTrait.php b/src/database/databasetraits/HasTrait.php index 8df8afbe..491fc95a 100644 --- a/src/database/databasetraits/HasTrait.php +++ b/src/database/databasetraits/HasTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/database/databasetraits/IndexTrait.php b/src/database/databasetraits/IndexTrait.php index 2ec7ef01..a4c19382 100644 --- a/src/database/databasetraits/IndexTrait.php +++ b/src/database/databasetraits/IndexTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database\Traits; @@ -34,7 +34,7 @@ trait IndexTrait $v = $this->selectSet($sql); - return !($v->RecordCount() == 0); + return !($v->recordCount() == 0); } /** diff --git a/src/database/databasetraits/OperatorTrait.php b/src/database/databasetraits/OperatorTrait.php index 7f82b25f..cb0c3708 100644 --- a/src/database/databasetraits/OperatorTrait.php +++ b/src/database/databasetraits/OperatorTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/database/databasetraits/PrivilegesTrait.php b/src/database/databasetraits/PrivilegesTrait.php index 07ccf2cd..f514cc5d 100644 --- a/src/database/databasetraits/PrivilegesTrait.php +++ b/src/database/databasetraits/PrivilegesTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/database/databasetraits/RoleTrait.php b/src/database/databasetraits/RoleTrait.php index 534c7390..97a1bf07 100644 --- a/src/database/databasetraits/RoleTrait.php +++ b/src/database/databasetraits/RoleTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database\Traits; @@ -185,15 +185,15 @@ trait RoleTrait } if (is_array($new_roles_to_add) && sizeof($new_roles_to_add) > 0) { - $sql .= ' IN ROLE "' . join('", "', $new_roles_to_add) . '"'; + $sql .= ' IN ROLE "'.join('", "', $new_roles_to_add).'"'; } if (is_array($new_members_of_role) && sizeof($new_members_of_role) > 0) { - $sql .= ' ROLE "' . join('", "', $new_members_of_role) . '"'; + $sql .= ' ROLE "'.join('", "', $new_members_of_role).'"'; } if (is_array($new_admins_of_role) && sizeof($new_admins_of_role) > 0) { - $sql .= ' ADMIN "' . join('", "', $new_admins_of_role) . '"'; + $sql .= ' ADMIN "'.join('", "', $new_admins_of_role).'"'; } return $this->execute($sql); @@ -209,7 +209,7 @@ trait RoleTrait */ public function _encryptPassword($username, $password) { - return 'md5' . md5($password . $username); + return 'md5'.md5($password.$username); } /** @@ -590,7 +590,7 @@ trait RoleTrait $sql .= $createdb ? ' CREATEDB' : ' NOCREATEDB'; $sql .= $createuser ? ' CREATEUSER' : ' NOCREATEUSER'; if (is_array($groups) && sizeof($groups) > 0) { - $sql .= ' IN GROUP "' . join('", "', $groups) . '"'; + $sql .= ' IN GROUP "'.join('", "', $groups).'"'; } if ($expiry != '') { @@ -859,7 +859,7 @@ trait RoleTrait if (is_array($users) && sizeof($users) > 0) { $this->fieldArrayClean($users); - $sql .= ' WITH USER "' . join('", "', $users) . '"'; + $sql .= ' WITH USER "'.join('", "', $users).'"'; } return $this->execute($sql); diff --git a/src/database/databasetraits/RowTrait.php b/src/database/databasetraits/RowTrait.php index bd3ebe9e..11fd453c 100644 --- a/src/database/databasetraits/RowTrait.php +++ b/src/database/databasetraits/RowTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database\Traits; @@ -74,7 +74,7 @@ trait RowTrait // If none, check for an OID column. Even though OIDs can be duplicated, the edit and delete row // functions check that they're only modiying a single row. Otherwise, return empty array. - if ($rs->RecordCount() == 0) { + if ($rs->recordCount() == 0) { // Check for OID column $temp = []; if ($this->hasObjectID($table)) { diff --git a/src/database/databasetraits/SchemaTrait.php b/src/database/databasetraits/SchemaTrait.php index c280918b..f28926d4 100644 --- a/src/database/databasetraits/SchemaTrait.php +++ b/src/database/databasetraits/SchemaTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/database/databasetraits/SequenceTrait.php b/src/database/databasetraits/SequenceTrait.php index 398ef876..4740204c 100644 --- a/src/database/databasetraits/SequenceTrait.php +++ b/src/database/databasetraits/SequenceTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database\Traits; @@ -114,7 +114,7 @@ trait SequenceTrait { // Get the minimum value of the sequence $seq = $this->getSequence($sequence); - if ($seq->RecordCount() != 1) { + if ($seq->recordCount() != 1) { return -1; } @@ -253,7 +253,7 @@ trait SequenceTrait $data = $this->getSequence($sequence); - if ($data->RecordCount() != 1) { + if ($data->recordCount() != 1) { return -2; } diff --git a/src/database/databasetraits/StatsTrait.php b/src/database/databasetraits/StatsTrait.php index 8eec79f1..e753bf3b 100644 --- a/src/database/databasetraits/StatsTrait.php +++ b/src/database/databasetraits/StatsTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/database/databasetraits/TableTrait.php b/src/database/databasetraits/TableTrait.php index d4edf3ec..a3f4c641 100644 --- a/src/database/databasetraits/TableTrait.php +++ b/src/database/databasetraits/TableTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database\Traits; @@ -151,7 +151,7 @@ trait TableTrait { // Fetch table $t = $this->getTable($table); - if (!is_object($t) || $t->RecordCount() != 1) { + if (!is_object($t) || $t->recordCount() != 1) { $this->rollbackTransaction(); return null; @@ -182,7 +182,7 @@ trait TableTrait // Output all table columns $col_comments_sql = ''; // Accumulate comments on columns - $num = $atts->RecordCount() + $cons->RecordCount(); + $num = $atts->recordCount() + $cons->recordCount(); $i = 1; $sql = $this->_dumpSerials($atts, $t, $sql, $col_comments_sql, $i, $num); @@ -205,7 +205,7 @@ trait TableTrait * as inherited NOT NULL and CHECK constraints. So for the time being, we just do * not claim to support inheritance. * $parents = $this->getTableParents($table); - * if ($parents->RecordCount() > 0) { + * if ($parents->recordCount() > 0) { * $sql .= " INHERITS ("; * while (!$parents->EOF) { * $this->fieldClean($parents->fields['relname']); @@ -798,7 +798,7 @@ trait TableTrait AND relnamespace = (SELECT oid FROM pg_catalog.pg_namespace WHERE nspname='{$c_schema}')"; $rs = $this->selectSet($sql); - if ($rs->RecordCount() != 1) { + if ($rs->recordCount() != 1) { return null; } @@ -827,7 +827,7 @@ trait TableTrait return null; } - if ($indexes->RecordCount() > 0) { + if ($indexes->recordCount() > 0) { $sql .= "\n-- Indexes\n\n"; while (!$indexes->EOF) { $sql .= $indexes->fields['inddef'].";\n"; @@ -844,7 +844,7 @@ trait TableTrait return null; } - if ($triggers->RecordCount() > 0) { + if ($triggers->recordCount() > 0) { $sql .= "\n-- Triggers\n\n"; while (!$triggers->EOF) { $sql .= $triggers->fields['tgdef']; @@ -862,7 +862,7 @@ trait TableTrait return null; } - if ($rules->RecordCount() > 0) { + if ($rules->recordCount() > 0) { $sql .= "\n-- Rules\n\n"; while (!$rules->EOF) { $sql .= $rules->fields['definition']."\n"; @@ -1216,7 +1216,7 @@ trait TableTrait { $data = $this->getTable($table); - if ($data->RecordCount() != 1) { + if ($data->recordCount() != 1) { return -2; } diff --git a/src/database/databasetraits/TablespaceTrait.php b/src/database/databasetraits/TablespaceTrait.php index 5e5a757c..8d258543 100644 --- a/src/database/databasetraits/TablespaceTrait.php +++ b/src/database/databasetraits/TablespaceTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/database/databasetraits/TriggerTrait.php b/src/database/databasetraits/TriggerTrait.php index 95bef505..42b010fb 100644 --- a/src/database/databasetraits/TriggerTrait.php +++ b/src/database/databasetraits/TriggerTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/database/databasetraits/TypeTrait.php b/src/database/databasetraits/TypeTrait.php index be4ba9a7..7f6947d1 100644 --- a/src/database/databasetraits/TypeTrait.php +++ b/src/database/databasetraits/TypeTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database\Traits; diff --git a/src/database/databasetraits/ViewTrait.php b/src/database/databasetraits/ViewTrait.php index 35585be8..d4ab55f4 100644 --- a/src/database/databasetraits/ViewTrait.php +++ b/src/database/databasetraits/ViewTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Database\Traits; @@ -132,7 +132,7 @@ trait ViewTrait { $data = $this->getView($view); - if ($data->RecordCount() != 1) { + if ($data->recordCount() != 1) { return -2; } diff --git a/src/decorators/ActionUrlDecorator.php b/src/decorators/ActionUrlDecorator.php index f8ec2032..c425d18a 100644 --- a/src/decorators/ActionUrlDecorator.php +++ b/src/decorators/ActionUrlDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/ArrayMergeDecorator.php b/src/decorators/ArrayMergeDecorator.php index 95177b2f..5e279bd5 100644 --- a/src/decorators/ArrayMergeDecorator.php +++ b/src/decorators/ArrayMergeDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/BranchUrlDecorator.php b/src/decorators/BranchUrlDecorator.php index 25ee82e1..c1f437d3 100644 --- a/src/decorators/BranchUrlDecorator.php +++ b/src/decorators/BranchUrlDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/CallbackDecorator.php b/src/decorators/CallbackDecorator.php index 68328588..ef269abb 100644 --- a/src/decorators/CallbackDecorator.php +++ b/src/decorators/CallbackDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/ConcatDecorator.php b/src/decorators/ConcatDecorator.php index 31063ae2..8b19a2dc 100644 --- a/src/decorators/ConcatDecorator.php +++ b/src/decorators/ConcatDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/Decorator.php b/src/decorators/Decorator.php index 45fb1bf4..2e63715c 100644 --- a/src/decorators/Decorator.php +++ b/src/decorators/Decorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/FieldDecorator.php b/src/decorators/FieldDecorator.php index 121a1fd1..416c57d5 100644 --- a/src/decorators/FieldDecorator.php +++ b/src/decorators/FieldDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/IfEmptyDecorator.php b/src/decorators/IfEmptyDecorator.php index 41d600d0..135220ca 100644 --- a/src/decorators/IfEmptyDecorator.php +++ b/src/decorators/IfEmptyDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/RedirectUrlDecorator.php b/src/decorators/RedirectUrlDecorator.php index 9e913f4b..9c0dc7f7 100644 --- a/src/decorators/RedirectUrlDecorator.php +++ b/src/decorators/RedirectUrlDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/ReplaceDecorator.php b/src/decorators/ReplaceDecorator.php index af21a4ee..c0a06fe7 100644 --- a/src/decorators/ReplaceDecorator.php +++ b/src/decorators/ReplaceDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/UrlDecorator.php b/src/decorators/UrlDecorator.php index c9981a1a..507563ed 100644 --- a/src/decorators/UrlDecorator.php +++ b/src/decorators/UrlDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Decorators; diff --git a/src/help/PostgresDoc10.php b/src/help/PostgresDoc10.php index 9713823d..f7eee9cc 100644 --- a/src/help/PostgresDoc10.php +++ b/src/help/PostgresDoc10.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc74.php b/src/help/PostgresDoc74.php index 6ee93124..466567fc 100644 --- a/src/help/PostgresDoc74.php +++ b/src/help/PostgresDoc74.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc80.php b/src/help/PostgresDoc80.php index 06107baa..4e70fb66 100644 --- a/src/help/PostgresDoc80.php +++ b/src/help/PostgresDoc80.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc81.php b/src/help/PostgresDoc81.php index 372ee5ce..aead1485 100644 --- a/src/help/PostgresDoc81.php +++ b/src/help/PostgresDoc81.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc82.php b/src/help/PostgresDoc82.php index f7d463f7..bff4ff27 100644 --- a/src/help/PostgresDoc82.php +++ b/src/help/PostgresDoc82.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc83.php b/src/help/PostgresDoc83.php index 26edfa36..0a42f7e0 100644 --- a/src/help/PostgresDoc83.php +++ b/src/help/PostgresDoc83.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc84.php b/src/help/PostgresDoc84.php index cb2e5433..379e7e66 100644 --- a/src/help/PostgresDoc84.php +++ b/src/help/PostgresDoc84.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc90.php b/src/help/PostgresDoc90.php index 6b796ccd..cee589b6 100644 --- a/src/help/PostgresDoc90.php +++ b/src/help/PostgresDoc90.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc91.php b/src/help/PostgresDoc91.php index adf2dc26..4dceea2b 100644 --- a/src/help/PostgresDoc91.php +++ b/src/help/PostgresDoc91.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc92.php b/src/help/PostgresDoc92.php index f9338a61..54b7f21a 100644 --- a/src/help/PostgresDoc92.php +++ b/src/help/PostgresDoc92.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc93.php b/src/help/PostgresDoc93.php index c35203a8..f9ec8b06 100644 --- a/src/help/PostgresDoc93.php +++ b/src/help/PostgresDoc93.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc94.php b/src/help/PostgresDoc94.php index adbf3fe4..bf5272ce 100644 --- a/src/help/PostgresDoc94.php +++ b/src/help/PostgresDoc94.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc95.php b/src/help/PostgresDoc95.php index 5b5a9009..6444c20f 100644 --- a/src/help/PostgresDoc95.php +++ b/src/help/PostgresDoc95.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc96.php b/src/help/PostgresDoc96.php index d0f62b84..5df1f38d 100644 --- a/src/help/PostgresDoc96.php +++ b/src/help/PostgresDoc96.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Help; diff --git a/src/traits/AdminTrait.php b/src/traits/AdminTrait.php index bbb56b60..3c0592df 100644 --- a/src/traits/AdminTrait.php +++ b/src/traits/AdminTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Traits; @@ -905,7 +905,7 @@ trait AdminTrait echo $this->printTable($autovac, $columns, $actions, 'admin-admin', $this->lang['strnovacuumconf']); - if (('table' == $type) and (0 == $autovac->RecordCount())) { + if (('table' == $type) and (0 == $autovac->recordCount())) { echo '<br />'; echo '<a href="'.\SUBFOLDER."/src/views/tables?action=confeditautovac&{$this->misc->href}&table="; diff --git a/src/traits/ExportTrait.php b/src/traits/ExportTrait.php index 0b05786b..4a5987ad 100644 --- a/src/traits/ExportTrait.php +++ b/src/traits/ExportTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Traits; @@ -25,38 +25,46 @@ trait ExportTrait public function dataOnly($hasID, $onlyCopyAndSQL = false) { $content = '<tr>'; - $content .= '<th class="data left" rowspan="' . ($hasID ? 2 : 1) . '">'; + $content .= '<th class="data left" rowspan="'.($hasID ? 2 : 1).'">'; $content .= '<input type="radio" id="what1" name="what" value="dataonly" checked="checked" />'; $content .= sprintf( - '<label for="what1">%s</label></th>%s', $this->lang['strdataonly'], - PHP_EOL); + '<label for="what1">%s</label></th>%s', + $this->lang['strdataonly'], + PHP_EOL + ); $content .= sprintf( - '<td>%s</td>%s', $this->lang['strformat'], - PHP_EOL); - $content .= '<td><select name="d_format">' . PHP_EOL; - $content .= '<option value="copy">COPY</option>' . PHP_EOL; - $content .= '<option value="sql">SQL</option>' . PHP_EOL; + '<td>%s</td>%s', + $this->lang['strformat'], + PHP_EOL + ); + $content .= '<td><select name="d_format">'.PHP_EOL; + $content .= '<option value="copy">COPY</option>'.PHP_EOL; + $content .= '<option value="sql">SQL</option>'.PHP_EOL; if (!$onlyCopyAndSQL) { - $content .= '<option value="csv">CSV</option>' . PHP_EOL; - $content .= "<option value=\"tab\">{$this->lang['strtabbed']}</option>" . PHP_EOL; - $content .= '<option value="html">XHTML</option>' . PHP_EOL; - $content .= '<option value="xml">XML</option>' . PHP_EOL; + $content .= '<option value="csv">CSV</option>'.PHP_EOL; + $content .= "<option value=\"tab\">{$this->lang['strtabbed']}</option>".PHP_EOL; + $content .= '<option value="html">XHTML</option>'.PHP_EOL; + $content .= '<option value="xml">XML</option>'.PHP_EOL; } $content .= sprintf( '</select>%s</td>%s</tr>%s', PHP_EOL, PHP_EOL, - PHP_EOL); + PHP_EOL + ); if ($hasID) { $content .= sprintf( - '<tr><td><label for="d_oids">%s</td>', $this->lang['stroids']); + '<tr><td><label for="d_oids">%s</td>', + $this->lang['stroids'] + ); $content .= sprintf( '<td><input type="checkbox" id="d_oids" name="d_oids" /></td>%s</tr>%s', PHP_EOL, - PHP_EOL); + PHP_EOL + ); } return $content; @@ -72,36 +80,47 @@ trait ExportTrait public function structureAndData($hasID) { $content = '<tr>'; - $content .= '<th class="data left" rowspan="' . ($hasID ? 3 : 2) . '">'; + $content .= '<th class="data left" rowspan="'.($hasID ? 3 : 2).'">'; $content .= '<input type="radio" id="what3" name="what" value="structureanddata" />'; $content .= sprintf( - '<label for="what3">%s</label></th>%s', $this->lang['strstructureanddata'], - PHP_EOL); + '<label for="what3">%s</label></th>%s', + $this->lang['strstructureanddata'], + PHP_EOL + ); $content .= sprintf( - '<td>%s</td>%s', $this->lang['strformat'], - PHP_EOL); - $content .= '<td><select name="sd_format">' . PHP_EOL; - $content .= '<option value="copy">COPY</option>' . PHP_EOL; - $content .= '<option value="sql">SQL</option>' . PHP_EOL; + '<td>%s</td>%s', + $this->lang['strformat'], + PHP_EOL + ); + $content .= '<td><select name="sd_format">'.PHP_EOL; + $content .= '<option value="copy">COPY</option>'.PHP_EOL; + $content .= '<option value="sql">SQL</option>'.PHP_EOL; $content .= sprintf( '</select>%s</td>%s</tr>%s', PHP_EOL, PHP_EOL, - PHP_EOL); + PHP_EOL + ); $content .= sprintf( - '<tr><td><label for="sd_clean">%s</label></td>', $this->lang['strdrop']); + '<tr><td><label for="sd_clean">%s</label></td>', + $this->lang['strdrop'] + ); $content .= sprintf( '<td><input type="checkbox" id="sd_clean" name="sd_clean" /></td>%s</tr>%s', PHP_EOL, - PHP_EOL); + PHP_EOL + ); if ($hasID) { $content .= sprintf( - '<tr><td><label for="sd_oids">%s</label></td>', $this->lang['stroids']); + '<tr><td><label for="sd_oids">%s</label></td>', + $this->lang['stroids'] + ); $content .= sprintf( '<td><input type="checkbox" id="sd_oids" name="sd_oids" /></td>%s</tr>%s', PHP_EOL, - PHP_EOL); + PHP_EOL + ); } return $content; @@ -119,16 +138,23 @@ trait ExportTrait { $content = '<tr><th class="data left">'; $content .= sprintf( - '<input type="radio" id="what2" name="what" value="structureonly" %s />', $checked ? 'checked="checked"' : ''); + '<input type="radio" id="what2" name="what" value="structureonly" %s />', + $checked ? 'checked="checked"' : '' + ); $content .= sprintf( - '<label for="what2">%s</label></th>', $this->lang['strstructureonly'], - PHP_EOL); + '<label for="what2">%s</label></th>', + $this->lang['strstructureonly'], + PHP_EOL + ); $content .= sprintf( - '<td><label for="no_role_info">%s</label></td>', $this->lang['strdrop']); + '<td><label for="no_role_info">%s</label></td>', + $this->lang['strdrop'] + ); $content .= sprintf( '<td><input type="checkbox" id="no_role_info" name="no_role_info" /></td>%s</tr>%s', PHP_EOL, - PHP_EOL); + PHP_EOL + ); return $content; } @@ -143,14 +169,21 @@ trait ExportTrait public function formHeader($endpoint = 'dataexport') { $content = sprintf( - '<form id="export_form" action="%s/%s" method="post">%s', \SUBFOLDER . '/src/views', $endpoint, - PHP_EOL); - $content .= '<table>' . PHP_EOL; + '<form id="export_form" action="%s/%s" method="post">%s', + \SUBFOLDER.'/src/views', + $endpoint, + PHP_EOL + ); + $content .= '<table>'.PHP_EOL; $content .= sprintf( - '<tr><th class="data">%s</th>', $this->lang['strformat']); + '<tr><th class="data">%s</th>', + $this->lang['strformat'] + ); $content .= sprintf( - '<th class="data" colspan="2">%s</th></tr>%s', $this->lang['stroptions'], - PHP_EOL); + '<th class="data" colspan="2">%s</th></tr>%s', + $this->lang['stroptions'], + PHP_EOL + ); return $content; } @@ -165,24 +198,29 @@ trait ExportTrait */ public function formFooter($subject, $object) { - $content = '<p><input type="hidden" name="action" value="export" />' . PHP_EOL; + $content = '<p><input type="hidden" name="action" value="export" />'.PHP_EOL; $content .= $this->misc->form; $content .= sprintf( '<input type="hidden" name="subject" value="%s" />%s', $subject, - PHP_EOL); + PHP_EOL + ); $content .= sprintf( '<input type="hidden" name="%s" value="%s" />', - $subject, htmlspecialchars($object), - PHP_EOL); + $subject, + htmlspecialchars($object), + PHP_EOL + ); $content .= sprintf( '<input type="submit" value="%s" /></p>%s', $this->lang['strexport'], - PHP_EOL); + PHP_EOL + ); $content .= sprintf( '</form>%s', - PHP_EOL); + PHP_EOL + ); return $content; } @@ -198,37 +236,49 @@ trait ExportTrait { $content = sprintf( '</table>%s', - PHP_EOL); + PHP_EOL + ); $content .= sprintf( - '<h3>%s</h3>%s', $this->lang['stroptions'], - PHP_EOL); + '<h3>%s</h3>%s', + $this->lang['stroptions'], + PHP_EOL + ); $content .= '<p><input type="radio" id="output1" name="output" value="show" checked="checked" />'; $content .= sprintf( - '<label for="output1">%s</label>', $this->lang['strshow'], - PHP_EOL); + '<label for="output1">%s</label>', + $this->lang['strshow'], + PHP_EOL + ); $content .= '<br/><input type="radio" id="output2" name="output" value="download" />'; $content .= sprintf( - '<label for="output2">%s</label>', $this->lang['strdownload']); + '<label for="output2">%s</label>', + $this->lang['strdownload'] + ); if ($offerGzip) { $content .= '<br /><input type="radio" id="output3" name="output" value="gzipped" />'; $content .= sprintf( - '<label for="output3">%s</label>%s', $this->lang['strdownloadgzipped'], - PHP_EOL); + '<label for="output3">%s</label>%s', + $this->lang['strdownloadgzipped'], + PHP_EOL + ); } $content .= sprintf( '</p>%s', - PHP_EOL); + PHP_EOL + ); return $content; } /** * Offers the option of export database without user credentials. When running in Amazon RDS this is the workaround - * to make pg_dumpall work at all + * to make pg_dumpall work at all. + * * + * @param mixed $version10orMore * - * @return string the html of the options snipper + * @return string the html of the options snipper */ public function offerNoRoleExport($version10orMore) { @@ -236,25 +286,31 @@ trait ExportTrait if (!$version10orMore) { return ''; } - $content = '<tr>' . PHP_EOL; + $content = '<tr>'.PHP_EOL; $content .= sprintf( '<tr>%s<td colspan="3"> </td></tr>%s', PHP_EOL, - PHP_EOL); + PHP_EOL + ); $content .= sprintf( '<tr>%s<th class="data left" colspan="3"><h3>%s <br> %s</h3></th></tr>%s', PHP_EOL, - 'Use the option below if your platform prevents dumping DBs', 'with role info (e.g. Amazon RDS)', - PHP_EOL); + 'Use the option below if your platform prevents dumping DBs', + 'with role info (e.g. Amazon RDS)', + PHP_EOL + ); $content .= sprintf( '<tr>%s<td colspan="2"><label for="no_role_passwords">%s</label><a href="%s">?</></td>%s', - PHP_EOL, 'Avoid dumping roles', + PHP_EOL, + 'Avoid dumping roles', 'https://www.postgresql.org/docs/10/app-pg-dumpall.html', - PHP_EOL); + PHP_EOL + ); $content .= sprintf( '<td><input type="checkbox" id="no_role_passwords" name="no_role_passwords" /></td>%s</tr>%s', PHP_EOL, - PHP_EOL); + PHP_EOL + ); return $content; } diff --git a/src/traits/FormTrait.php b/src/traits/FormTrait.php index bb8a1486..6e9aba6c 100644 --- a/src/traits/FormTrait.php +++ b/src/traits/FormTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Traits; diff --git a/src/traits/HelperTrait.php b/src/traits/HelperTrait.php index 7c844e96..b12a6f55 100644 --- a/src/traits/HelperTrait.php +++ b/src/traits/HelperTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Traits; @@ -107,7 +107,7 @@ trait HelperTrait { $result = []; - if ($set->RecordCount() <= 0) { + if ($set->recordCount() <= 0) { return $result; } while (!$set->EOF) { diff --git a/src/traits/InsertEditRowTrait.php b/src/traits/InsertEditRowTrait.php index 78ad0ab8..bc098b09 100644 --- a/src/traits/InsertEditRowTrait.php +++ b/src/traits/InsertEditRowTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Traits; diff --git a/src/traits/MiscTrait.php b/src/traits/MiscTrait.php index 10ccc12f..57386901 100644 --- a/src/traits/MiscTrait.php +++ b/src/traits/MiscTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Traits; diff --git a/src/traits/ServersTrait.php b/src/traits/ServersTrait.php index 88270f50..6cc4c3ea 100644 --- a/src/traits/ServersTrait.php +++ b/src/traits/ServersTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Traits; @@ -138,7 +138,7 @@ trait ServersTrait // Get the list of all databases $data = $this->misc->getDatabaseAccessor(); $databases = $data->getDatabases(); - if ($databases->RecordCount() > 0) { + if ($databases->recordCount() > 0) { $connection_html .= '<label>'; $connection_html .= $this->misc->printHelp($this->lang['strdatabase'], 'pg.database', false); $connection_html .= ": <select id='selectdb' name=\"database\" >".PHP_EOL; diff --git a/src/traits/ViewsMatViewsPropertiesTrait.php b/src/traits/ViewsMatViewsPropertiesTrait.php index 2fe984a9..415be999 100644 --- a/src/traits/ViewsMatViewsPropertiesTrait.php +++ b/src/traits/ViewsMatViewsPropertiesTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Traits; @@ -261,7 +261,7 @@ trait ViewsMatViewsPropertiesTrait $this->printTabs($this->subject, 'definition'); $this->printMsg($msg); - if ($vdata->RecordCount() > 0) { + if ($vdata->recordCount() > 0) { // Show comment if any if (null !== $vdata->fields['relcomment']) { echo '<p class="comment">', $this->misc->printVal($vdata->fields['relcomment']), '</p>'.PHP_EOL; diff --git a/src/traits/ViewsMatviewsTrait.php b/src/traits/ViewsMatviewsTrait.php index 779e0c8d..08df0532 100644 --- a/src/traits/ViewsMatviewsTrait.php +++ b/src/traits/ViewsMatviewsTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Traits; diff --git a/src/translations/Afrikaans.php b/src/translations/Afrikaans.php index 2dd893b9..cec70533 100644 --- a/src/translations/Afrikaans.php +++ b/src/translations/Afrikaans.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Arabic.php b/src/translations/Arabic.php index e67304cf..966ec4d7 100644 --- a/src/translations/Arabic.php +++ b/src/translations/Arabic.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Catalan.php b/src/translations/Catalan.php index be9f36f9..3571dd3a 100644 --- a/src/translations/Catalan.php +++ b/src/translations/Catalan.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/ChineseSim.php b/src/translations/ChineseSim.php index d2a1961a..b68dfaed 100644 --- a/src/translations/ChineseSim.php +++ b/src/translations/ChineseSim.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/ChineseTr.php b/src/translations/ChineseTr.php index 75812cbd..7f9f299f 100644 --- a/src/translations/ChineseTr.php +++ b/src/translations/ChineseTr.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/ChineseUtf8ZhCn.php b/src/translations/ChineseUtf8ZhCn.php index 6138614d..84574a9f 100644 --- a/src/translations/ChineseUtf8ZhCn.php +++ b/src/translations/ChineseUtf8ZhCn.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/ChineseUtf8ZhTw.php b/src/translations/ChineseUtf8ZhTw.php index 08e3b739..7c38a927 100644 --- a/src/translations/ChineseUtf8ZhTw.php +++ b/src/translations/ChineseUtf8ZhTw.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Czech.php b/src/translations/Czech.php index 703fb740..9b422c65 100644 --- a/src/translations/Czech.php +++ b/src/translations/Czech.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Danish.php b/src/translations/Danish.php index 88074cbf..41e85304 100644 --- a/src/translations/Danish.php +++ b/src/translations/Danish.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Dutch.php b/src/translations/Dutch.php index 6ca33bac..20e6f9e9 100644 --- a/src/translations/Dutch.php +++ b/src/translations/Dutch.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/English.php b/src/translations/English.php index 2ed9e8f4..b55a0ea0 100644 --- a/src/translations/English.php +++ b/src/translations/English.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/French.php b/src/translations/French.php index bdda0210..a3c6c811 100644 --- a/src/translations/French.php +++ b/src/translations/French.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Galician.php b/src/translations/Galician.php index 5750946c..87cf2a18 100644 --- a/src/translations/Galician.php +++ b/src/translations/Galician.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/German.php b/src/translations/German.php index 25010c78..a7c1649a 100644 --- a/src/translations/German.php +++ b/src/translations/German.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Greek.php b/src/translations/Greek.php index f06cb5ba..a5436c1e 100644 --- a/src/translations/Greek.php +++ b/src/translations/Greek.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Hebrew.php b/src/translations/Hebrew.php index dd4e0793..0a4fb2f3 100644 --- a/src/translations/Hebrew.php +++ b/src/translations/Hebrew.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Hungarian.php b/src/translations/Hungarian.php index c72b9484..dac0714d 100644 --- a/src/translations/Hungarian.php +++ b/src/translations/Hungarian.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Italian.php b/src/translations/Italian.php index 15e3ae3e..24fda6d3 100644 --- a/src/translations/Italian.php +++ b/src/translations/Italian.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Japanese.php b/src/translations/Japanese.php index 6bbc6367..b2457a4d 100644 --- a/src/translations/Japanese.php +++ b/src/translations/Japanese.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Lithuanian.php b/src/translations/Lithuanian.php index 70561945..1a0570f1 100644 --- a/src/translations/Lithuanian.php +++ b/src/translations/Lithuanian.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Mongol.php b/src/translations/Mongol.php index 5ba94b4e..b12fefce 100644 --- a/src/translations/Mongol.php +++ b/src/translations/Mongol.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Polish.php b/src/translations/Polish.php index 8c2b0877..d80dccf5 100644 --- a/src/translations/Polish.php +++ b/src/translations/Polish.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/PortugueseBr.php b/src/translations/PortugueseBr.php index d98456ba..8e2932a4 100644 --- a/src/translations/PortugueseBr.php +++ b/src/translations/PortugueseBr.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/PortuguesePt.php b/src/translations/PortuguesePt.php index 3747e387..5c06de1b 100644 --- a/src/translations/PortuguesePt.php +++ b/src/translations/PortuguesePt.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Romanian.php b/src/translations/Romanian.php index d9392bc9..edfb607f 100644 --- a/src/translations/Romanian.php +++ b/src/translations/Romanian.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Russian.php b/src/translations/Russian.php index 0000df9c..8d451241 100644 --- a/src/translations/Russian.php +++ b/src/translations/Russian.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/RussianUtf8.php b/src/translations/RussianUtf8.php index f909c0f0..df225760 100644 --- a/src/translations/RussianUtf8.php +++ b/src/translations/RussianUtf8.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Slovak.php b/src/translations/Slovak.php index f17fa247..b919caf1 100644 --- a/src/translations/Slovak.php +++ b/src/translations/Slovak.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Spanish.php b/src/translations/Spanish.php index 9a99c499..f4ed18c8 100644 --- a/src/translations/Spanish.php +++ b/src/translations/Spanish.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Swedish.php b/src/translations/Swedish.php index bc3a2e1d..d14ca202 100644 --- a/src/translations/Swedish.php +++ b/src/translations/Swedish.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Turkish.php b/src/translations/Turkish.php index b66b1c0d..8139ee3a 100644 --- a/src/translations/Turkish.php +++ b/src/translations/Turkish.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Ukrainian.php b/src/translations/Ukrainian.php index ec5dc606..19965129 100644 --- a/src/translations/Ukrainian.php +++ b/src/translations/Ukrainian.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\Translations; diff --git a/src/xhtml/HTMLController.php b/src/xhtml/HTMLController.php index d76f4e55..9410180f 100644 --- a/src/xhtml/HTMLController.php +++ b/src/xhtml/HTMLController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/HTMLFooterController.php b/src/xhtml/HTMLFooterController.php index 307c3236..a9bfb724 100644 --- a/src/xhtml/HTMLFooterController.php +++ b/src/xhtml/HTMLFooterController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/HTMLHeaderController.php b/src/xhtml/HTMLHeaderController.php index e7905db9..125aff3f 100644 --- a/src/xhtml/HTMLHeaderController.php +++ b/src/xhtml/HTMLHeaderController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/HTMLNavbarController.php b/src/xhtml/HTMLNavbarController.php index 43ed6d3d..c68bb149 100644 --- a/src/xhtml/HTMLNavbarController.php +++ b/src/xhtml/HTMLNavbarController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/HTMLTableController.php b/src/xhtml/HTMLTableController.php index 81d4c07e..b9254f3f 100644 --- a/src/xhtml/HTMLTableController.php +++ b/src/xhtml/HTMLTableController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/TreeController.php b/src/xhtml/TreeController.php index 147101d3..e7d9e269 100644 --- a/src/xhtml/TreeController.php +++ b/src/xhtml/TreeController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/XHtmlButton.php b/src/xhtml/XHtmlButton.php index ff4faa6a..0a6f7e58 100644 --- a/src/xhtml/XHtmlButton.php +++ b/src/xhtml/XHtmlButton.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/XHtmlElement.php b/src/xhtml/XHtmlElement.php index 55b3d0ad..1203ea10 100644 --- a/src/xhtml/XHtmlElement.php +++ b/src/xhtml/XHtmlElement.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/XHtmlOption.php b/src/xhtml/XHtmlOption.php index 23ec3ad7..cd9a44b6 100644 --- a/src/xhtml/XHtmlOption.php +++ b/src/xhtml/XHtmlOption.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/XHtmlSelect.php b/src/xhtml/XHtmlSelect.php index 8297dbb7..beb14ed4 100644 --- a/src/xhtml/XHtmlSelect.php +++ b/src/xhtml/XHtmlSelect.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/XHtmlSimpleElement.php b/src/xhtml/XHtmlSimpleElement.php index be573344..dbc69376 100644 --- a/src/xhtml/XHtmlSimpleElement.php +++ b/src/xhtml/XHtmlSimpleElement.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.51 + * PHPPgAdmin v6.0.0-beta.52 */ namespace PHPPgAdmin\XHtml; |