From fcc268948d4c512e3e86daf4bb11ca431ce641ad Mon Sep 17 00:00:00 2001 From: Amenadiel Date: Fri, 2 Aug 2019 15:26:35 -0400 Subject: Tag v 6.0.0-beta.52 --- src/classes/ADONewConnection.php | 2 +- src/classes/ADORecordSet.php | 2 +- src/classes/ADOdbException.php | 2 +- src/classes/ArrayRecordSet.php | 2 +- src/classes/ContainerUtils.php | 2 +- src/classes/Misc.php | 2 +- src/classes/PluginManager.php | 2 +- src/classes/Translations.php | 2 +- src/controllers/AcinsertController.php | 2 +- src/controllers/AggregatesController.php | 2 +- src/controllers/AlldbController.php | 128 +++++++------- src/controllers/BaseController.php | 2 +- src/controllers/BrowserController.php | 2 +- src/controllers/CastsController.php | 2 +- src/controllers/ColpropertiesController.php | 2 +- src/controllers/ConstraintsController.php | 2 +- src/controllers/ConversionsController.php | 2 +- src/controllers/DatabaseController.php | 146 ++++++++-------- src/controllers/DataexportController.php | 2 +- src/controllers/DataimportController.php | 2 +- src/controllers/DbexportController.php | 24 +-- src/controllers/DisplayController.php | 2 +- src/controllers/DomainsController.php | 2 +- src/controllers/FulltextController.php | 2 +- src/controllers/FunctionsController.php | 2 +- src/controllers/GroupsController.php | 2 +- src/controllers/HelpController.php | 2 +- src/controllers/HistoryController.php | 2 +- src/controllers/IndexesController.php | 2 +- src/controllers/InfoController.php | 2 +- src/controllers/IntroController.php | 2 +- src/controllers/LanguagesController.php | 2 +- src/controllers/LoginController.php | 2 +- .../MaterializedviewpropertiesController.php | 2 +- src/controllers/MaterializedviewsController.php | 2 +- src/controllers/OpclassesController.php | 2 +- src/controllers/OperatorsController.php | 2 +- src/controllers/PrivilegesController.php | 2 +- src/controllers/RolesController.php | 2 +- src/controllers/RulesController.php | 2 +- src/controllers/SchemasController.php | 2 +- src/controllers/SequencesController.php | 2 +- src/controllers/ServersController.php | 2 +- src/controllers/SqlController.php | 2 +- src/controllers/SqleditController.php | 2 +- src/controllers/TablesController.php | 2 +- src/controllers/TablespacesController.php | 2 +- src/controllers/TblpropertiesController.php | 2 +- src/controllers/TriggersController.php | 2 +- src/controllers/TypesController.php | 2 +- src/controllers/UsersController.php | 2 +- src/controllers/ViewpropertiesController.php | 2 +- src/controllers/ViewsController.php | 2 +- src/database/ADOdbBase.php | 4 +- src/database/Connection.php | 2 +- src/database/Postgres.php | 4 +- src/database/Postgres10.php | 2 +- src/database/Postgres11.php | 2 +- src/database/Postgres74.php | 2 +- src/database/Postgres80.php | 2 +- src/database/Postgres81.php | 4 +- src/database/Postgres82.php | 2 +- src/database/Postgres83.php | 4 +- src/database/Postgres84.php | 2 +- src/database/Postgres90.php | 2 +- src/database/Postgres91.php | 2 +- src/database/Postgres92.php | 2 +- src/database/Postgres93.php | 2 +- src/database/Postgres94.php | 2 +- src/database/Postgres95.php | 2 +- src/database/Postgres96.php | 2 +- src/database/databasetraits/AggregateTrait.php | 2 +- src/database/databasetraits/ColumnTrait.php | 2 +- src/database/databasetraits/DatabaseTrait.php | 2 +- src/database/databasetraits/DomainTrait.php | 2 +- src/database/databasetraits/FtsTrait.php | 2 +- src/database/databasetraits/FunctionTrait.php | 11 +- src/database/databasetraits/HasTrait.php | 2 +- src/database/databasetraits/IndexTrait.php | 4 +- src/database/databasetraits/OperatorTrait.php | 2 +- src/database/databasetraits/PrivilegesTrait.php | 2 +- src/database/databasetraits/RoleTrait.php | 14 +- src/database/databasetraits/RowTrait.php | 4 +- src/database/databasetraits/SchemaTrait.php | 2 +- src/database/databasetraits/SequenceTrait.php | 6 +- src/database/databasetraits/StatsTrait.php | 2 +- src/database/databasetraits/TableTrait.php | 18 +- src/database/databasetraits/TablespaceTrait.php | 2 +- src/database/databasetraits/TriggerTrait.php | 2 +- src/database/databasetraits/TypeTrait.php | 2 +- src/database/databasetraits/ViewTrait.php | 4 +- src/decorators/ActionUrlDecorator.php | 2 +- src/decorators/ArrayMergeDecorator.php | 2 +- src/decorators/BranchUrlDecorator.php | 2 +- src/decorators/CallbackDecorator.php | 2 +- src/decorators/ConcatDecorator.php | 2 +- src/decorators/Decorator.php | 2 +- src/decorators/FieldDecorator.php | 2 +- src/decorators/IfEmptyDecorator.php | 2 +- src/decorators/RedirectUrlDecorator.php | 2 +- src/decorators/ReplaceDecorator.php | 2 +- src/decorators/UrlDecorator.php | 2 +- src/help/PostgresDoc10.php | 2 +- src/help/PostgresDoc74.php | 2 +- src/help/PostgresDoc80.php | 2 +- src/help/PostgresDoc81.php | 2 +- src/help/PostgresDoc82.php | 2 +- src/help/PostgresDoc83.php | 2 +- src/help/PostgresDoc84.php | 2 +- src/help/PostgresDoc90.php | 2 +- src/help/PostgresDoc91.php | 2 +- src/help/PostgresDoc92.php | 2 +- src/help/PostgresDoc93.php | 2 +- src/help/PostgresDoc94.php | 2 +- src/help/PostgresDoc95.php | 2 +- src/help/PostgresDoc96.php | 2 +- src/traits/AdminTrait.php | 4 +- src/traits/ExportTrait.php | 184 ++++++++++++++------- src/traits/FormTrait.php | 2 +- src/traits/HelperTrait.php | 4 +- src/traits/InsertEditRowTrait.php | 2 +- src/traits/MiscTrait.php | 2 +- src/traits/ServersTrait.php | 4 +- src/traits/ViewsMatViewsPropertiesTrait.php | 4 +- src/traits/ViewsMatviewsTrait.php | 2 +- src/translations/Afrikaans.php | 2 +- src/translations/Arabic.php | 2 +- src/translations/Catalan.php | 2 +- src/translations/ChineseSim.php | 2 +- src/translations/ChineseTr.php | 2 +- src/translations/ChineseUtf8ZhCn.php | 2 +- src/translations/ChineseUtf8ZhTw.php | 2 +- src/translations/Czech.php | 2 +- src/translations/Danish.php | 2 +- src/translations/Dutch.php | 2 +- src/translations/English.php | 2 +- src/translations/French.php | 2 +- src/translations/Galician.php | 2 +- src/translations/German.php | 2 +- src/translations/Greek.php | 2 +- src/translations/Hebrew.php | 2 +- src/translations/Hungarian.php | 2 +- src/translations/Italian.php | 2 +- src/translations/Japanese.php | 2 +- src/translations/Lithuanian.php | 2 +- src/translations/Mongol.php | 2 +- src/translations/Polish.php | 2 +- src/translations/PortugueseBr.php | 2 +- src/translations/PortuguesePt.php | 2 +- src/translations/Romanian.php | 2 +- src/translations/Russian.php | 2 +- src/translations/RussianUtf8.php | 2 +- src/translations/Slovak.php | 2 +- src/translations/Spanish.php | 2 +- src/translations/Swedish.php | 2 +- src/translations/Turkish.php | 2 +- src/translations/Ukrainian.php | 2 +- src/xhtml/HTMLController.php | 2 +- src/xhtml/HTMLFooterController.php | 2 +- src/xhtml/HTMLHeaderController.php | 2 +- src/xhtml/HTMLNavbarController.php | 2 +- src/xhtml/HTMLTableController.php | 2 +- src/xhtml/TreeController.php | 2 +- src/xhtml/XHtmlButton.php | 2 +- src/xhtml/XHtmlElement.php | 2 +- src/xhtml/XHtmlOption.php | 2 +- src/xhtml/XHtmlSelect.php | 2 +- src/xhtml/XHtmlSimpleElement.php | 2 +- 168 files changed, 465 insertions(+), 408 deletions(-) (limited to 'src') 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 @@ [ '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 '
' . PHP_EOL; - echo '' . PHP_EOL; - echo "" . PHP_EOL; + echo ''.PHP_EOL; + echo '
{$this->lang['strname']}
'.PHP_EOL; + echo "".PHP_EOL; echo '' . PHP_EOL; + htmlspecialchars($_REQUEST['alterdatabase']), '" />'.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 "" . PHP_EOL; + echo "".PHP_EOL; echo '' . PHP_EOL; + echo ''.PHP_EOL; } if ($data->hasSharedComments()) { $rs = $data->getDatabaseComment($_REQUEST['alterdatabase']); $comment = isset($rs->fields['description']) ? $rs->fields['description'] : ''; - echo "" . PHP_EOL; + echo "".PHP_EOL; echo '' . PHP_EOL; + htmlspecialchars($comment), ''.PHP_EOL; } - echo '
{$this->lang['strname']}'; echo "_maxNameLen}\" value=\"", - htmlspecialchars($_REQUEST['alterdatabase']), '" />
{$this->lang['strowner']}
{$this->lang['strowner']}
{$this->lang['strcomment']}
{$this->lang['strcomment']}'; echo '
' . PHP_EOL; - echo '' . PHP_EOL; + echo ''.PHP_EOL; + echo ''.PHP_EOL; echo $this->misc->form; echo '' . PHP_EOL; - echo "lang['stralter']}\" />" . PHP_EOL; - echo "lang['strcancel']}\" />" . PHP_EOL; - echo '
' . PHP_EOL; + htmlspecialchars($_REQUEST['alterdatabase']), '" />'.PHP_EOL; + echo "lang['stralter']}\" />".PHP_EOL; + echo "lang['strcancel']}\" />".PHP_EOL; + echo ''.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 '
' . PHP_EOL; + echo ''.PHP_EOL; //If multi drop if (isset($_REQUEST['ma'])) { foreach ($_REQUEST['ma'] as $v) { $a = unserialize(htmlspecialchars_decode($v, ENT_QUOTES)); - echo '

', sprintf($this->lang['strconfdropdatabase'], $this->misc->printVal($a['database'])), '

' . PHP_EOL; + echo '

', sprintf($this->lang['strconfdropdatabase'], $this->misc->printVal($a['database'])), '

'.PHP_EOL; printf('', htmlspecialchars($a['database'])); } } else { - echo '

', sprintf($this->lang['strconfdropdatabase'], $this->misc->printVal($_REQUEST['dropdatabase'])), '

' . PHP_EOL; - echo '' . PHP_EOL; + echo '

', sprintf($this->lang['strconfdropdatabase'], $this->misc->printVal($_REQUEST['dropdatabase'])), '

'.PHP_EOL; + echo ''.PHP_EOL; // END if multi drop } - echo '' . PHP_EOL; + echo ''.PHP_EOL; echo $this->misc->form; - echo "lang['strdrop']}\" />" . PHP_EOL; - echo "lang['strcancel']}\" />" . PHP_EOL; + echo "lang['strdrop']}\" />".PHP_EOL; + echo "lang['strcancel']}\" />".PHP_EOL; echo "
\n"; // END confirm } else { //If multi drop @@ -417,45 +417,45 @@ class AlldbController extends BaseController $tablespaces = $data->getTablespaces(); } - echo '
' . PHP_EOL; - echo '' . PHP_EOL; - echo "\t\n\t\t" . PHP_EOL; + echo ''.PHP_EOL; + echo '
{$this->lang['strname']}
'.PHP_EOL; + echo "\t\n\t\t".PHP_EOL; echo "\t\t\n\t" . PHP_EOL; + htmlspecialchars($_POST['formName']), "\" />\n\t".PHP_EOL; - echo "\t\n\t\t" . PHP_EOL; - echo "\t\t\n\t\t".PHP_EOL; + echo "\t\t\n\t" . PHP_EOL; + echo "\t\t\t".PHP_EOL; + echo "\t\t\n\t".PHP_EOL; // ENCODING - echo "\t\n\t\t" . PHP_EOL; - echo "\t\t\n\t\t".PHP_EOL; + echo "\t\t\n\t" . PHP_EOL; + echo "\t\t\t".PHP_EOL; + echo "\t\t\n\t".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\n\t\t" . PHP_EOL; - echo "\t\t\n\t" . PHP_EOL; + echo "\t\n\t\t".PHP_EOL; + echo "\t\t\n\t".PHP_EOL; // LC_CTYPE - echo "\t\n\t\t" . PHP_EOL; - echo "\t\t\n\t" . PHP_EOL; + echo "\t\n\t\t".PHP_EOL; + echo "\t\t\n\t".PHP_EOL; } // Tablespace (if there are any) if ($data->hasTablespaces() && $tablespaces->recordCount() > 0) { - echo "\t\n\t\t" . PHP_EOL; - echo "\t\t\n\t\t".PHP_EOL; + echo "\t\t\n\t" . PHP_EOL; + echo "\t\t\t\n\t\t\n\t".PHP_EOL; } // Comments (if available) if ($data->hasSharedComments()) { - echo "\t\n\t\t" . PHP_EOL; + echo "\t\n\t\t".PHP_EOL; echo "\t\t\n\t" . PHP_EOL; + htmlspecialchars($_POST['formComment']), "\n\t".PHP_EOL; } - echo '
{$this->lang['strname']}_maxNameLen}\" value=\"", - htmlspecialchars($_POST['formName']), "\" />
{$this->lang['strtemplatedb']}" . PHP_EOL; - echo "\t\t\t
{$this->lang['strtemplatedb']}".PHP_EOL; + echo "\t\t\t" . PHP_EOL; - echo "\t\t
{$this->lang['strencoding']}" . PHP_EOL; - echo "\t\t\t
{$this->lang['strencoding']}".PHP_EOL; + echo "\t\t\t" . PHP_EOL; - echo "\t\t
{$this->lang['strcollation']}" . PHP_EOL; - echo "\t\t\t' . PHP_EOL; - echo "\t\t
{$this->lang['strcollation']}".PHP_EOL; + echo "\t\t\t'.PHP_EOL; + echo "\t\t
{$this->lang['strctype']}" . PHP_EOL; - echo "\t\t\t' . PHP_EOL; - echo "\t\t
{$this->lang['strctype']}".PHP_EOL; + echo "\t\t\t'.PHP_EOL; + echo "\t\t
{$this->lang['strtablespace']}\n\t\t\t
{$this->lang['strtablespace']}\n\t\t\t\n\t\t
{$this->lang['strcomment']}
{$this->lang['strcomment']}
' . PHP_EOL; - echo '

' . PHP_EOL; + echo ''.PHP_EOL; + echo '

'.PHP_EOL; echo $this->misc->form; - echo "lang['strcreate']}\" />" . PHP_EOL; - echo "lang['strcancel']}\" />

" . PHP_EOL; - echo '
' . PHP_EOL; + echo "lang['strcreate']}\" />".PHP_EOL; + echo "lang['strcancel']}\" />

".PHP_EOL; + echo ''.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 @@ action || 'processes' == $this->action) { - $scripts .= ''; + $scripts .= ''; $refreshTime = $this->conf['ajax_refresh'] * 1500; - $scripts .= '' . PHP_EOL; + $scripts .= ''.PHP_EOL; } $header_template = 'header.twig'; @@ -185,11 +185,11 @@ class DatabaseController extends BaseController $this->printTabs('database', 'find'); $this->printMsg($msg); - echo '
' . PHP_EOL; + echo ''.PHP_EOL; echo '

_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 ''.PHP_EOL; echo $this->_printTypeOption(''); echo $this->_printTypeOption('COLUMN'); @@ -213,12 +213,12 @@ class DatabaseController extends BaseController echo $this->_printTypeOption('LANGUAGE'); } - echo '' . PHP_EOL; - echo "lang['strfind']}\" />" . PHP_EOL; + echo ''.PHP_EOL; + echo "lang['strfind']}\" />".PHP_EOL; echo $this->misc->form; - echo '

' . PHP_EOL; - echo '

' . PHP_EOL; - echo '
' . PHP_EOL; + echo '

'.PHP_EOL; + echo '

'.PHP_EOL; + echo ''.PHP_EOL; // Default focus $this->setFocus('forms[0].term'); @@ -235,7 +235,7 @@ class DatabaseController extends BaseController $filter = $_REQUEST['filter']; $optionhtml = sprintf('%s' . PHP_EOL; + $optionhtml .= ''.PHP_EOL; return $optionhtml; } @@ -279,95 +279,95 @@ class DatabaseController extends BaseController { switch ($curr) { case 'SCHEMA': - echo '
  • misc->href}&schema="; + echo '
  • misc->href}&schema="; echo $this->misc->printVal($rs->fields['name']), '">'; echo $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']); - echo '
    • ' . PHP_EOL; + echo ''.PHP_EOL; break; case 'TABLE': echo '
  • '; echo "misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '.'; - echo 'misc->href}&schema=", urlencode($rs->fields['schemaname']), '&table=', - urlencode($rs->fields['name']), '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '
    • ' . PHP_EOL; + echo 'misc->href}&schema=", urlencode($rs->fields['schemaname']), '&table=', + urlencode($rs->fields['name']), '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), ''.PHP_EOL; break; case 'VIEW': echo '
  • '; echo "misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '.'; - echo 'misc->href}&schema=", urlencode($rs->fields['schemaname']), '&view=', - urlencode($rs->fields['name']), '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '
    • ' . PHP_EOL; + echo 'misc->href}&schema=", urlencode($rs->fields['schemaname']), '&view=', + urlencode($rs->fields['name']), '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), ''.PHP_EOL; break; case 'SEQUENCE': echo '
  • '; echo "misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '.'; echo "misc->href}&schema=", urlencode($rs->fields['schemaname']), - '&sequence=', urlencode($rs->fields['name']), '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '
    • ' . PHP_EOL; + '&sequence=', urlencode($rs->fields['name']), '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), ''.PHP_EOL; break; case 'COLUMNTABLE': echo '
  • '; - echo 'misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '.'; + echo 'misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '.'; echo "misc->href}&table=", urlencode($rs->fields['relname']), '&schema=', urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['relname']), '.'; echo "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']), '
    • ' . PHP_EOL; + $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), ''.PHP_EOL; break; case 'COLUMNVIEW': echo '
  • '; - echo 'misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '.'; + echo 'misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '.'; echo "misc->href}&view=", urlencode($rs->fields['relname']), '&schema=', urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['relname']), '.'; echo "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']), '
    • ' . PHP_EOL; + $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), ''.PHP_EOL; break; case 'INDEX': echo '
  • '; - echo 'misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '.'; - echo 'misc->href}&table=", urlencode($rs->fields['relname']), '&schema=', urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['relname']), '.'; - echo "misc->href}&schema=", urlencode($rs->fields['schemaname']), '&table=', urlencode($rs->fields['relname']), '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '
    • ' . PHP_EOL; + echo 'misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '.'; + echo 'misc->href}&table=", urlencode($rs->fields['relname']), '&schema=', urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['relname']), '.'; + echo "misc->href}&schema=", urlencode($rs->fields['schemaname']), '&table=', urlencode($rs->fields['relname']), '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), ''.PHP_EOL; break; case 'CONSTRAINTTABLE': echo '
  • '; - echo 'misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '.'; - echo 'misc->href}&table=", urlencode($rs->fields['relname']), '&schema=', urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['relname']), '.'; + echo 'misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '.'; + echo 'misc->href}&table=", urlencode($rs->fields['relname']), '&schema=', urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['relname']), '.'; echo "misc->href}&schema=", urlencode($rs->fields['schemaname']), '&table=', - urlencode($rs->fields['relname']), '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '
    • ' . PHP_EOL; + urlencode($rs->fields['relname']), '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), ''.PHP_EOL; break; case 'CONSTRAINTDOMAIN': echo '
  • '; echo "misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '.'; echo "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']), '
    • ' . PHP_EOL; + $this->misc->printVal($rs->fields['relname']), '.', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), ''.PHP_EOL; break; case 'TRIGGER': echo '
  • '; - echo 'misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '.'; - echo 'misc->href}&table=", urlencode($rs->fields['relname']), '&schema=', urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['relname']), '.'; + echo 'misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '.'; + echo 'misc->href}&table=", urlencode($rs->fields['relname']), '&schema=', urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['relname']), '.'; echo "misc->href}&schema=", urlencode($rs->fields['schemaname']), '&table=', urlencode($rs->fields['relname']), '">', - $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '
    • ' . PHP_EOL; + $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), ''.PHP_EOL; break; case 'RULETABLE': echo '
  • '; - echo 'misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '.'; - echo 'misc->href}&table=", urlencode($rs->fields['relname']), '&schema=', urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['relname']), '.'; + echo 'misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '.'; + echo 'misc->href}&table=", urlencode($rs->fields['relname']), '&schema=', urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['relname']), '.'; echo "misc->href}&schema=", urlencode($rs->fields['schemaname']), '&reltype=table&table=', - urlencode($rs->fields['relname']), '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '
    • ' . PHP_EOL; + urlencode($rs->fields['relname']), '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), ''.PHP_EOL; break; case 'RULEVIEW': echo '
  • '; - echo 'misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '.'; - echo 'misc->href}&view=", urlencode($rs->fields['relname']), '&schema=', urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['relname']), '.'; + echo 'misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '.'; + echo 'misc->href}&view=", urlencode($rs->fields['relname']), '&schema=', urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['relname']), '.'; echo "misc->href}&schema=", urlencode($rs->fields['schemaname']), '&reltype=view&view=', - urlencode($rs->fields['relname']), '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '
    • ' . PHP_EOL; + urlencode($rs->fields['relname']), '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), ''.PHP_EOL; break; case 'FUNCTION': @@ -375,53 +375,53 @@ class DatabaseController extends BaseController echo "misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '.'; echo "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']), '' . PHP_EOL; + $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), ''.PHP_EOL; break; case 'TYPE': echo '
  • '; echo "misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '.'; echo "misc->href}&schema=", urlencode($rs->fields['schemaname']), '&type=', - urlencode($rs->fields['name']), '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '
    • ' . PHP_EOL; + urlencode($rs->fields['name']), '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), ''.PHP_EOL; break; case 'DOMAIN': echo '
  • '; echo "misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '.'; echo "misc->href}&schema=", urlencode($rs->fields['schemaname']), '&domain=', - urlencode($rs->fields['name']), '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '
    • ' . PHP_EOL; + urlencode($rs->fields['name']), '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), ''.PHP_EOL; break; case 'OPERATOR': echo '
  • '; echo "misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '.'; echo "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']), '
    • ' . PHP_EOL; + urlencode($rs->fields['name']), '&operator_oid=', urlencode($rs->fields['oid']), '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), ''.PHP_EOL; break; case 'CONVERSION': echo '
  • '; echo "misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '.'; echo "misc->href}&schema=", urlencode($rs->fields['schemaname']), - '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '
    • ' . PHP_EOL; + '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), ''.PHP_EOL; break; case 'LANGUAGE': - echo "
  • misc->href}\">", $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '
    • ' . PHP_EOL; + echo "
  • misc->href}\">", $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '
    • '.PHP_EOL; break; case 'AGGREGATE': echo '
  • '; echo "misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '.'; echo "misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', - $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '
    • ' . PHP_EOL; + $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), ''.PHP_EOL; break; case 'OPCLASS': echo '
  • '; - echo 'misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '.'; + echo 'misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '.'; echo "misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', - $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), '
    • ' . PHP_EOL; + $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), ''.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 '' . PHP_EOL; + echo ''.PHP_EOL; } $curr = $rs->fields['type']; echo '

    '; echo $this->_translatedType($curr); echo '

    '; - echo ''.PHP_EOL; - echo '

    ', $rs->recordCount(), ' ', $this->lang['strobjects'], '

    ' . PHP_EOL; + echo '

    ', $rs->recordCount(), ' ', $this->lang['strobjects'], '

    '.PHP_EOL; } else { - echo "

    {$this->lang['strnoobjects']}

    " . PHP_EOL; + echo "

    {$this->lang['strnoobjects']}

    ".PHP_EOL; } } @@ -539,7 +539,7 @@ class DatabaseController extends BaseController $this->printMsg($msg); if (0 === strlen($msg)) { - echo '
    \"{$this-lang['strrefresh']}\" title=\"{$this->lang['strrefresh']}\"/> {$this->lang['strrefresh']}"; + echo '
    \"{$this-lang['strrefresh']}\" title=\"{$this->lang['strrefresh']}\"/> {$this->lang['strrefresh']}"; } echo '
    '; @@ -553,7 +553,7 @@ class DatabaseController extends BaseController // Display prepared transactions if ($data->hasPreparedXacts()) { - echo "

    {$this->lang['strpreparedxacts']}

    " . PHP_EOL; + echo "

    {$this->lang['strpreparedxacts']}

    ".PHP_EOL; $prep_xacts = $data->getPreparedXacts($_REQUEST['database']); $columns = [ @@ -581,7 +581,7 @@ class DatabaseController extends BaseController } // Fetch the processes from the database - echo "

    {$this->lang['strprocesses']}

    " . PHP_EOL; + echo "

    {$this->lang['strprocesses']}

    ".PHP_EOL; $processes = $data->getProcesses($_REQUEST['database']); $columns = [ @@ -721,7 +721,7 @@ class DatabaseController extends BaseController $this->printTrail('database'); $this->printTabs('database', 'locks'); - echo '
    \"{$this-lang['strrefresh']}\" title=\"{$this->lang['strrefresh']}\"/> {$this->lang['strrefresh']}"; + echo '
    \"{$this-lang['strrefresh']}\" title=\"{$this->lang['strrefresh']}\"/> {$this->lang['strrefresh']}"; echo '
    '; $this->currentLocks(); @@ -740,27 +740,27 @@ class DatabaseController extends BaseController $this->printTrail('database'); $this->printTabs('database', 'sql'); - echo "

    {$this->lang['strentersql']}

    " . PHP_EOL; - echo '
    ' . PHP_EOL; - echo "

    {$this->lang['strsql']}
    " . PHP_EOL; + echo "

    {$this->lang['strentersql']}

    ".PHP_EOL; + echo ''.PHP_EOL; + echo "

    {$this->lang['strsql']}
    ".PHP_EOL; echo '

    ' . PHP_EOL; + htmlspecialchars($_SESSION['sqlquery']), '

    '.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 "

    " . PHP_EOL; - echo "

    " . PHP_EOL; + echo "

    ".PHP_EOL; + echo "

    ".PHP_EOL; } } - echo '

    " . PHP_EOL; - echo "

    lang['strexecute']}\" />" . PHP_EOL; + echo '

    ".PHP_EOL; + echo "

    lang['strexecute']}\" />".PHP_EOL; echo $this->misc->form; - echo "lang['strreset']}\" />

    " . PHP_EOL; - echo '
    ' . PHP_EOL; + echo "lang['strreset']}\" />

    ".PHP_EOL; + echo ''.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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ printTable($autovac, $columns, $actions, 'admin-admin', $this->lang['strnovacuumconf']); - if (('table' == $type) and (0 == $autovac->RecordCount())) { + if (('table' == $type) and (0 == $autovac->recordCount())) { echo '
    '; echo '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 @@ '; - $content .= ''; + $content .= ''; $content .= ''; $content .= sprintf( - '%s', $this->lang['strdataonly'], - PHP_EOL); + '%s', + $this->lang['strdataonly'], + PHP_EOL + ); $content .= sprintf( - '%s%s', $this->lang['strformat'], - PHP_EOL); - $content .= ''.PHP_EOL; + $content .= ''.PHP_EOL; + $content .= ''.PHP_EOL; if (!$onlyCopyAndSQL) { - $content .= '' . PHP_EOL; - $content .= "" . PHP_EOL; - $content .= '' . PHP_EOL; - $content .= '' . PHP_EOL; + $content .= ''.PHP_EOL; + $content .= "".PHP_EOL; + $content .= ''.PHP_EOL; + $content .= ''.PHP_EOL; } $content .= sprintf( '%s%s%s', PHP_EOL, PHP_EOL, - PHP_EOL); + PHP_EOL + ); if ($hasID) { $content .= sprintf( - '
    %s', \SUBFOLDER . '/src/views', $endpoint, - PHP_EOL); - $content .= '' . PHP_EOL; + '%s', + \SUBFOLDER.'/src/views', + $endpoint, + PHP_EOL + ); + $content .= '
    '.PHP_EOL; $content .= sprintf( - '', $this->lang['strformat']); + '', + $this->lang['strformat'] + ); $content .= sprintf( - '%s', $this->lang['stroptions'], - PHP_EOL); + '%s', + $this->lang['stroptions'], + PHP_EOL + ); return $content; } @@ -165,24 +198,29 @@ trait ExportTrait */ public function formFooter($subject, $object) { - $content = '

    ' . PHP_EOL; + $content = '

    '.PHP_EOL; $content .= $this->misc->form; $content .= sprintf( '%s', $subject, - PHP_EOL); + PHP_EOL + ); $content .= sprintf( '', - $subject, htmlspecialchars($object), - PHP_EOL); + $subject, + htmlspecialchars($object), + PHP_EOL + ); $content .= sprintf( '

    %s', $this->lang['strexport'], - PHP_EOL); + PHP_EOL + ); $content .= sprintf( '%s', - PHP_EOL); + PHP_EOL + ); return $content; } @@ -198,37 +236,49 @@ trait ExportTrait { $content = sprintf( '
    %s
    %s%s
    %s
    %s', - PHP_EOL); + PHP_EOL + ); $content .= sprintf( - '

    %s

    %s', $this->lang['stroptions'], - PHP_EOL); + '

    %s

    %s', + $this->lang['stroptions'], + PHP_EOL + ); $content .= '

    '; $content .= sprintf( - '', $this->lang['strshow'], - PHP_EOL); + '', + $this->lang['strshow'], + PHP_EOL + ); $content .= '
    '; $content .= sprintf( - '', $this->lang['strdownload']); + '', + $this->lang['strdownload'] + ); if ($offerGzip) { $content .= '
    '; $content .= sprintf( - '%s', $this->lang['strdownloadgzipped'], - PHP_EOL); + '%s', + $this->lang['strdownloadgzipped'], + PHP_EOL + ); } $content .= sprintf( '

    %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 = '' . PHP_EOL; + $content = ''.PHP_EOL; $content .= sprintf( '%s %s', PHP_EOL, - PHP_EOL); + PHP_EOL + ); $content .= sprintf( '%s

    %s
    %s

    %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( '%s    ?%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( '%s%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 @@ 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 @@ misc->getDatabaseAccessor(); $databases = $data->getDatabases(); - if ($databases->RecordCount() > 0) { + if ($databases->recordCount() > 0) { $connection_html .= '