diff options
| author | Amenadiel <amenadiel@gmail.com> | 2018-05-30 03:16:16 +0300 |
|---|---|---|
| committer | Amenadiel <amenadiel@gmail.com> | 2018-05-30 03:16:16 +0300 |
| commit | a7725b596311b493f7745d9bd12ac8cde345da8f (patch) | |
| tree | b423431031d987328072f79d1fb8c69f0f129025 | |
| parent | 67149e001b87d2b7530a008c03ddcb641694fc64 (diff) | |
- Fixes falsy values displayed as NULL (#196).v6.0.0-beta.46
- Sets correct content type headers when exporting schema to screen output
- Simplifies roles and privileges methods
- When inserting a new row, check the null input for empty fields that allow null values
- Avoid passing SQL query in the query string when inspecting a column
- Export form has been extracted to a trait to reduce repetition (most of it is common to tables, views and matviews)
- Ensure server, database and table request params gets defined on hidden inputs when browsing a table
251 files changed, 440 insertions, 439 deletions
diff --git a/.php_cs.cache b/.php_cs.cache index 9dab6a00..8efb05ec 100644 --- a/.php_cs.cache +++ b/.php_cs.cache @@ -1 +1 @@ -{"php":"7.1.17-1+ubuntu17.10.1+deb.sury.org+1","version":"2.11.1:v2.11.1#ad94441c17b8ef096e517acccdbf3238af8a2da8","rules":{"no_php4_constructor":true,"php_unit_namespaced":{"target":"6.0"},"php_unit_dedicate_assert":{"target":"5.6"},"php_unit_expectation":{"target":"5.6"},"php_unit_mock":{"target":"5.5"},"php_unit_no_expectation_annotation":{"target":"4.3"},"binary_operator_spaces":{"align_double_arrow":true,"align_equals":true},"blank_line_after_opening_tag":true,"blank_line_before_statement":true,"braces":true,"cast_spaces":true,"class_attributes_separation":{"elements":["method"]},"class_definition":true,"concat_space":{"spacing":"none"},"declare_equal_normalize":true,"function_typehint_space":true,"include":true,"increment_style":true,"lowercase_cast":true,"magic_constant_casing":true,"method_argument_space":{"ensure_fully_multiline":true},"native_function_casing":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_blank_lines_after_phpdoc":true,"no_empty_comment":true,"no_empty_phpdoc":true,"no_empty_statement":true,"no_extra_blank_lines":{"tokens":["break","continue","extra","return","throw","use","parenthesis_brace_block","square_brace_block","curly_brace_block"]},"no_leading_import_slash":true,"no_leading_namespace_whitespace":true,"no_mixed_echo_print":{"use":"echo"},"no_multiline_whitespace_around_double_arrow":true,"no_short_bool_cast":true,"no_singleline_whitespace_before_semicolons":true,"no_spaces_around_offset":true,"no_trailing_comma_in_list_call":true,"no_trailing_comma_in_singleline_array":true,"no_unneeded_control_parentheses":true,"no_unneeded_curly_braces":true,"no_unneeded_final_method":true,"no_unused_imports":true,"no_whitespace_before_comma_in_array":true,"no_whitespace_in_blank_line":true,"normalize_index_brace":true,"object_operator_without_whitespace":true,"php_unit_fqcn_annotation":true,"phpdoc_align":true,"phpdoc_annotation_without_dot":true,"phpdoc_indent":true,"phpdoc_inline_tag":true,"phpdoc_no_access":true,"phpdoc_no_alias_tag":true,"phpdoc_no_empty_return":true,"phpdoc_no_useless_inheritdoc":true,"phpdoc_return_self_reference":true,"phpdoc_scalar":true,"phpdoc_separation":true,"phpdoc_single_line_var_spacing":true,"phpdoc_summary":true,"phpdoc_to_comment":true,"phpdoc_trim":true,"phpdoc_types":true,"phpdoc_var_without_name":true,"protected_to_private":true,"return_type_declaration":true,"semicolon_after_instruction":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_class_element_per_statement":{"elements":["property"]},"single_quote":true,"space_after_semicolon":{"remove_in_empty_for_expressions":true},"standardize_increment":true,"standardize_not_equals":true,"ternary_operator_spaces":true,"trailing_comma_in_multiline_array":true,"trim_array_spaces":true,"unary_operator_spaces":true,"whitespace_after_comma_in_array":true,"blank_line_after_namespace":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_constants":true,"lowercase_keywords":true,"no_break_comment":true,"no_closing_tag":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_import_per_statement":true,"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"visibility_required":true,"encoding":true,"full_opening_tag":true,"modernize_types_casting":true,"align_multiline_comment":true,"array_syntax":{"syntax":"short"},"combine_consecutive_issets":true,"combine_consecutive_unsets":true,"compact_nullable_typehint":true,"escape_implicit_backslashes":true,"explicit_indirect_variable":true,"explicit_string_variable":true,"final_internal_class":true,"header_comment":{"commentType":"PHPDoc","header":"PHPPgAdmin v6.0.0-beta.45"},"heredoc_to_nowdoc":true,"list_syntax":{"syntax":"long"},"method_chaining_indentation":true,"multiline_comment_opening_closing":true,"no_null_property_initialization":true,"no_short_echo_tag":true,"no_superfluous_elseif":true,"no_unreachable_default_argument_value":true,"no_useless_else":true,"no_useless_return":true,"ordered_imports":true,"php_unit_strict":true,"php_unit_test_annotation":true,"php_unit_test_class_requires_covers":true,"phpdoc_add_missing_param_annotation":true,"phpdoc_order":true,"phpdoc_types_order":true,"strict_param":true},"hashes":{"src\/classes\/ADOdbException.php":2001125432,"src\/classes\/PluginManager.php":564455653,"src\/classes\/ADORecordSet.php":331737986,"src\/classes\/ContainerUtils.php":783073530,"src\/classes\/Translations.php":599280444,"src\/classes\/ArrayRecordSet.php":1715146920,"src\/classes\/Misc.php":3359159260,"src\/controllers\/GroupsController.php":2504201758,"src\/controllers\/DbexportController.php":3246908436,"src\/controllers\/RulesController.php":3631905455,"src\/controllers\/OperatorsController.php":1821798212,"src\/controllers\/AlldbController.php":2447016304,"src\/controllers\/LanguagesController.php":3695711410,"src\/controllers\/TypesController.php":3645833147,"src\/controllers\/SequencesController.php":3277296176,"src\/controllers\/ServersController.php":1511920470,"src\/controllers\/AcinsertController.php":757548631,"src\/controllers\/ConversionsController.php":4100830025,"src\/controllers\/SqleditController.php":1038169742,"src\/controllers\/BaseController.php":1178944694,"src\/controllers\/UsersController.php":3007543470,"src\/controllers\/SqlController.php":215987623,"src\/controllers\/DatabaseController.php":1570539664,"src\/controllers\/TblpropertiesController.php":368579223,"src\/controllers\/TablespacesController.php":1743024803,"src\/controllers\/DataimportController.php":182535903,"src\/controllers\/OpclassesController.php":3316198638,"src\/controllers\/HelpController.php":2000218896,"src\/controllers\/ViewsController.php":3178307554,"src\/controllers\/DataexportController.php":3731936267,"src\/controllers\/ColpropertiesController.php":3878262440,"src\/controllers\/TriggersController.php":3789384408,"src\/controllers\/FunctionsController.php":1257220582,"src\/controllers\/AggregatesController.php":771532811,"src\/controllers\/SchemasController.php":1648121637,"src\/controllers\/IntroController.php":3900179643,"src\/controllers\/DisplayController.php":2635738352,"src\/controllers\/ViewpropertiesController.php":1636093521,"src\/controllers\/InfoController.php":1222521518,"src\/controllers\/TablesController.php":1535473648,"src\/controllers\/FulltextController.php":3490910670,"src\/controllers\/CastsController.php":1212870076,"src\/controllers\/LoginController.php":2215491313,"src\/controllers\/DomainsController.php":2553481002,"src\/controllers\/MaterializedviewsController.php":3754288663,"src\/controllers\/BrowserController.php":3653033146,"src\/controllers\/HistoryController.php":386372392,"src\/controllers\/MaterializedviewpropertiesController.php":171051208,"src\/controllers\/PrivilegesController.php":2184095018,"src\/controllers\/ConstraintsController.php":1129319140,"src\/controllers\/IndexesController.php":2240862396,"src\/controllers\/RolesController.php":2112311763,"src\/database\/Postgres84.php":1604979946,"src\/database\/Postgres81.php":2495975804,"src\/database\/Postgres92.php":302054873,"src\/database\/Postgres94.php":3691134815,"src\/database\/Postgres93.php":2763234119,"src\/database\/Postgres83.php":3868002279,"src\/database\/Postgres95.php":2143314292,"src\/database\/Postgres90.php":364274899,"src\/database\/Postgres96.php":1744915758,"src\/database\/Postgres74.php":3709653505,"src\/database\/Postgres80.php":1596813083,"src\/database\/ADOdbBase.php":1180819579,"src\/database\/Postgres10.php":1624744220,"src\/database\/Postgres82.php":889687333,"src\/database\/Postgres91.php":3908438421,"src\/database\/Postgres.php":1287452263,"src\/database\/Connection.php":2806468166,"src\/decorators\/ReplaceDecorator.php":2582497149,"src\/decorators\/Decorator.php":1640654231,"src\/decorators\/IfEmptyDecorator.php":2157848460,"src\/decorators\/ActionUrlDecorator.php":439205280,"src\/decorators\/BranchUrlDecorator.php":669608272,"src\/decorators\/UrlDecorator.php":966465904,"src\/decorators\/ConcatDecorator.php":986036590,"src\/decorators\/RedirectUrlDecorator.php":2919952119,"src\/decorators\/ArrayMergeDecorator.php":2634175766,"src\/decorators\/CallbackDecorator.php":643983478,"src\/decorators\/FieldDecorator.php":3380805661,"src\/help\/PostgresDoc96.php":3187675137,"src\/help\/PostgresDoc84.php":2604296220,"src\/help\/PostgresDoc80.php":2249091006,"src\/help\/PostgresDoc81.php":317037592,"src\/help\/PostgresDoc90.php":2104013214,"src\/help\/PostgresDoc83.php":2274913538,"src\/help\/PostgresDoc92.php":2713677183,"src\/help\/PostgresDoc82.php":77070483,"src\/help\/PostgresDoc95.php":2786765401,"src\/help\/PostgresDoc94.php":3296656442,"src\/help\/PostgresDoc91.php":2616176664,"src\/help\/PostgresDoc74.php":3515506166,"src\/help\/PostgresDoc93.php":1146483666,"src\/help\/PostgresDoc10.php":2903897335,"src\/translations\/Hebrew.php":1909294048,"src\/translations\/Italian.php":3705652745,"src\/translations\/Galician.php":621166469,"src\/translations\/Japanese.php":3605813585,"src\/translations\/Dutch.php":493951473,"src\/translations\/Catalan.php":2868376849,"src\/translations\/Lithuanian.php":3816605109,"src\/translations\/Mongol.php":1476455420,"src\/translations\/ChineseUtf8ZhTw.php":1290348627,"src\/translations\/ChineseUtf8ZhCn.php":276238088,"src\/translations\/Ukrainian.php":2320448240,"src\/translations\/PortuguesePt.php":240485732,"src\/translations\/ChineseTr.php":658266990,"src\/translations\/PortugueseBr.php":3957679204,"src\/translations\/RussianUtf8.php":3421794536,"src\/translations\/Greek.php":3950107696,"src\/translations\/Danish.php":1170529804,"src\/translations\/Arabic.php":3661895881,"src\/translations\/Hungarian.php":3211910175,"src\/translations\/Polish.php":2112029875,"src\/translations\/English.php":3562149828,"src\/translations\/Swedish.php":287717552,"src\/translations\/Romanian.php":2725579763,"src\/translations\/Afrikaans.php":453065980,"src\/translations\/German.php":3569717516,"src\/translations\/French.php":1851762551,"src\/translations\/Czech.php":264681306,"src\/translations\/Spanish.php":4155491741,"src\/translations\/ChineseSim.php":2691671326,"src\/translations\/Russian.php":2244514815,"src\/translations\/Slovak.php":563139897,"src\/translations\/Turkish.php":536105326,"src\/xhtml\/HTMLNavbarController.php":405737206,"src\/xhtml\/HTMLTableController.php":2284258928,"src\/xhtml\/HTMLController.php":144416265,"src\/xhtml\/XHtmlOption.php":1051732780,"src\/xhtml\/XHtmlButton.php":803534707,"src\/xhtml\/XHtmlSimpleElement.php":1872772551,"src\/xhtml\/XHtmlSelect.php":3089633145,"src\/xhtml\/HTMLFooterController.php":847525127,"src\/xhtml\/HTMLHeaderController.php":208108692,"src\/xhtml\/TreeController.php":3471683865,"src\/xhtml\/XHtmlElement.php":3977079630,"tests\/simpletest\/config.tests.php":2454529261,"tests\/simpletest\/testcase\/Schemas\/ConversionTest.php":3639935470,"tests\/simpletest\/testcase\/Schemas\/OperatorTest.php":961952065,"tests\/simpletest\/testcase\/Schemas\/AggregateTest.php":4182119835,"tests\/simpletest\/testcase\/Schemas\/FunctionTest.php":972969256,"tests\/simpletest\/testcase\/Schemas\/DomainTest.php":3846379447,"tests\/simpletest\/testcase\/Schemas\/TypeTest.php":26906996,"tests\/simpletest\/testcase\/Schemas\/TableTest.php":387730755,"tests\/simpletest\/testcase\/Schemas\/SequenceTest.php":2484743433,"tests\/simpletest\/testcase\/Schemas\/OpClassTest.php":2329127494,"tests\/simpletest\/testcase\/Schemas\/SchemasGroupTest.php":3269068630,"tests\/simpletest\/testcase\/Schemas\/ViewTest.php":3735933163,"tests\/simpletest\/testcase\/Server\/ServerGroupTest.php":2862795443,"tests\/simpletest\/testcase\/Server\/GroupsTest.php":3762725691,"tests\/simpletest\/testcase\/Server\/ReportsTest.php":2881861863,"tests\/simpletest\/testcase\/Server\/UsersTest.php":541176923,"tests\/simpletest\/testcase\/Server\/TableSpacesTest.php":3751214749,"tests\/simpletest\/testcase\/Databases\/FindObjectsTest.php":3832977788,"tests\/simpletest\/testcase\/Databases\/SqlTest.php":1364850707,"tests\/simpletest\/testcase\/Databases\/CastsTest.php":964587145,"tests\/simpletest\/testcase\/Databases\/LanguageTest.php":2192111705,"tests\/simpletest\/testcase\/Databases\/SchemaBasicTest.php":1735219606,"tests\/simpletest\/testcase\/Databases\/AdminTest.php":1700471086,"tests\/simpletest\/testcase\/Databases\/DatabaseTest.php":2732295923,"tests\/simpletest\/testcase\/Databases\/VariablesTest.php":1179472987,"tests\/simpletest\/testcase\/Databases\/DatabaseGroupTest.php":2827716340,"tests\/simpletest\/testcase\/Databases\/HelpTest.php":1522970928,"tests\/simpletest\/testcase\/Databases\/ProcessesTest.php":2919632042,"tests\/simpletest\/testcase\/Public\/common.php":2651953535,"tests\/simpletest\/testcase\/Public\/SetPrecondition.php":443603287,"tests\/simpletest\/testcase\/Tables\/IndexesTest.php":1808301976,"tests\/simpletest\/testcase\/Tables\/ConstraintsTest.php":480860487,"tests\/simpletest\/testcase\/Tables\/TableGroupTest.php":4223181931,"tests\/simpletest\/testcase\/Tables\/DeadlockTest.php":2606782857,"tests\/simpletest\/testcase\/Tables\/RulesTest.php":349163066,"tests\/simpletest\/testcase\/Tables\/ColumnTest.php":3033134562,"tests\/simpletest\/testcase\/Tables\/InfoTest.php":2986835570,"tests\/simpletest\/testcase\/Tables\/TriggersTest.php":698778414,"tests\/simpletest\/testcase\/simpletest.inc.php":2274415542,"tests\/simpletest\/testcase\/phpcoverage.inc.php":3621930486,"tests\/simpletest\/testcase\/testphpPgAdminMain.php":2856855888,"tests\/simpletest\/testcase\/coveragephpPgAdminMain.php":940446585,"tests\/simpletest\/testcase\/Common\/ExportTest.php":1164083528,"tests\/simpletest\/testcase\/Common\/ImportTest.php":192747369,"tests\/simpletest\/testcase\/Common\/CommonGroupTest.php":4041133219,"tests\/simpletest\/testcase\/Common\/SecurityTest.php":2534204778,"tests\/simpletest\/tests.php":4216481503,"tests\/unit\/ViewTest.php":1442452274,"tests\/_support\/UnitTester.php":341206305,"tests\/_support\/FunctionalTester.php":2800388818,"tests\/_support\/Helper\/Unit.php":2412730803,"tests\/_support\/Helper\/Functional.php":2851882065,"tests\/_support\/Helper\/Acceptance.php":2154552285,"tests\/_support\/AcceptanceTester.php":1689389534,"tests\/_support\/_generated\/UnitTesterActions.php":1347510072,"tests\/views\/rules.php":1350439452,"tests\/views\/info.php":3178656551,"tests\/views\/intro.php":1699155081,"tests\/views\/database.php":3203014713,"tests\/views\/triggers.php":2348571799,"tests\/views\/functions.php":3938036453,"tests\/views\/dbexport.php":383648620,"tests\/views\/sql.php":3938727007,"tests\/views\/display.php":1992495046,"tests\/views\/acinsert.php":3153797915,"tests\/views\/languages.php":2436048303,"tests\/views\/views.php":3489957166,"tests\/views\/types.php":4191463795,"tests\/views\/conversions.php":4161293232,"tests\/views\/users.php":1850118551,"tests\/views\/indexes.php":2469671897,"tests\/views\/login.php":3701541407,"tests\/views\/tables.php":1837630149,"tests\/views\/servers.php":2080519439,"tests\/views\/tblproperties.php":2694735418,"tests\/views\/tablespaces.php":330861570,"tests\/views\/privileges.php":1968972573,"tests\/views\/casts.php":1587243416,"tests\/views\/sqledit.php":3459596109,"tests\/views\/fulltext.php":1953115686,"tests\/views\/browser.php":884761323,"tests\/views\/colproperties.php":4233943934,"tests\/views\/roles.php":966128402,"tests\/views\/groups.php":3457434814,"tests\/views\/operators.php":1026160950,"tests\/views\/domains.php":1469605030,"tests\/views\/materializedviews.php":1727805570,"tests\/views\/history.php":3159413340,"tests\/views\/alldb.php":3188186359,"tests\/views\/opclasses.php":946924176,"tests\/views\/constraints.php":1389408147,"tests\/views\/sequences.php":1261983956,"tests\/views\/schemas.php":1968602940,"tests\/views\/dataimport.php":1835436893,"tests\/views\/help.php":1874453028,"tests\/views\/dataexport.php":909860234,"tests\/views\/viewproperties.php":1308702552,"tests\/views\/aggregates.php":1405798902,"tests\/views\/materializedviewproperties.php":2589982976,"tests\/selenium\/src\/12-admin.php":3872835029,"tests\/selenium\/src\/01-roles.php":2053838047,"tests\/selenium\/src\/30-view.php":2499001715,"tests\/selenium\/src\/99-cleantests.php":2174216879,"tests\/selenium\/src\/15-sequence.php":3672144342,"tests\/selenium\/src\/20-constraint.php":195197306,"tests\/selenium\/src\/25-column.php":3597534983,"tests\/selenium\/src\/06-schema.php":938428509,"tests\/selenium\/src\/35-index.php":2303516802,"tests\/selenium\/src\/04-database.php":3435178055,"tests\/selenium\/src\/10-table.php":1777548145,"tests\/selenium\/src\/08-domaine.php":1480695444,"tests\/selenium\/testBuilder.class.php":1704374362,"tests\/selenium\/TestSuite.php":154875943,"src\/classes\/ADONewConnection.php":751232923}}
\ No newline at end of file +{"php":"7.1.16-1+ubuntu16.04.1+deb.sury.org+1","version":"2.11.1:v2.11.1#ad94441c17b8ef096e517acccdbf3238af8a2da8","rules":{"no_php4_constructor":true,"php_unit_namespaced":{"target":"6.0"},"php_unit_dedicate_assert":{"target":"5.6"},"php_unit_expectation":{"target":"5.6"},"php_unit_mock":{"target":"5.5"},"php_unit_no_expectation_annotation":{"target":"4.3"},"binary_operator_spaces":{"align_double_arrow":true,"align_equals":true},"blank_line_after_opening_tag":true,"blank_line_before_statement":true,"braces":true,"cast_spaces":true,"class_attributes_separation":{"elements":["method"]},"class_definition":true,"concat_space":{"spacing":"none"},"declare_equal_normalize":true,"function_typehint_space":true,"include":true,"increment_style":true,"lowercase_cast":true,"magic_constant_casing":true,"method_argument_space":{"ensure_fully_multiline":true},"native_function_casing":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_blank_lines_after_phpdoc":true,"no_empty_comment":true,"no_empty_phpdoc":true,"no_empty_statement":true,"no_extra_blank_lines":{"tokens":["break","continue","extra","return","throw","use","parenthesis_brace_block","square_brace_block","curly_brace_block"]},"no_leading_import_slash":true,"no_leading_namespace_whitespace":true,"no_mixed_echo_print":{"use":"echo"},"no_multiline_whitespace_around_double_arrow":true,"no_short_bool_cast":true,"no_singleline_whitespace_before_semicolons":true,"no_spaces_around_offset":true,"no_trailing_comma_in_list_call":true,"no_trailing_comma_in_singleline_array":true,"no_unneeded_control_parentheses":true,"no_unneeded_curly_braces":true,"no_unneeded_final_method":true,"no_unused_imports":true,"no_whitespace_before_comma_in_array":true,"no_whitespace_in_blank_line":true,"normalize_index_brace":true,"object_operator_without_whitespace":true,"php_unit_fqcn_annotation":true,"phpdoc_align":true,"phpdoc_annotation_without_dot":true,"phpdoc_indent":true,"phpdoc_inline_tag":true,"phpdoc_no_access":true,"phpdoc_no_alias_tag":true,"phpdoc_no_empty_return":true,"phpdoc_no_useless_inheritdoc":true,"phpdoc_return_self_reference":true,"phpdoc_scalar":true,"phpdoc_separation":true,"phpdoc_single_line_var_spacing":true,"phpdoc_summary":true,"phpdoc_to_comment":true,"phpdoc_trim":true,"phpdoc_types":true,"phpdoc_var_without_name":true,"protected_to_private":true,"return_type_declaration":true,"semicolon_after_instruction":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_class_element_per_statement":{"elements":["property"]},"single_quote":true,"space_after_semicolon":{"remove_in_empty_for_expressions":true},"standardize_increment":true,"standardize_not_equals":true,"ternary_operator_spaces":true,"trailing_comma_in_multiline_array":true,"trim_array_spaces":true,"unary_operator_spaces":true,"whitespace_after_comma_in_array":true,"blank_line_after_namespace":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_constants":true,"lowercase_keywords":true,"no_break_comment":true,"no_closing_tag":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_import_per_statement":true,"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"visibility_required":true,"encoding":true,"full_opening_tag":true,"modernize_types_casting":true,"align_multiline_comment":true,"array_syntax":{"syntax":"short"},"combine_consecutive_issets":true,"combine_consecutive_unsets":true,"compact_nullable_typehint":true,"escape_implicit_backslashes":true,"explicit_indirect_variable":true,"explicit_string_variable":true,"final_internal_class":true,"header_comment":{"commentType":"PHPDoc","header":"PHPPgAdmin v6.0.0-beta.46"},"heredoc_to_nowdoc":true,"list_syntax":{"syntax":"long"},"method_chaining_indentation":true,"multiline_comment_opening_closing":true,"no_null_property_initialization":true,"no_short_echo_tag":true,"no_superfluous_elseif":true,"no_unreachable_default_argument_value":true,"no_useless_else":true,"no_useless_return":true,"ordered_imports":true,"php_unit_strict":true,"php_unit_test_annotation":true,"php_unit_test_class_requires_covers":true,"phpdoc_add_missing_param_annotation":true,"phpdoc_order":true,"phpdoc_types_order":true,"strict_param":true},"hashes":{"src\/classes\/ADOdbException.php":3007451176,"src\/classes\/ADONewConnection.php":2969738412,"src\/classes\/ArrayRecordSet.php":781875692,"src\/classes\/ContainerUtils.php":1280337655,"src\/classes\/PluginManager.php":3349920179,"src\/classes\/Misc.php":1637690653,"src\/classes\/Translations.php":3518299178,"src\/classes\/ADORecordSet.php":2487754159,"src\/controllers\/CastsController.php":2304696314,"src\/controllers\/RulesController.php":1230446051,"src\/controllers\/IndexesController.php":3408647371,"src\/controllers\/SequencesController.php":403760218,"src\/controllers\/HelpController.php":2500174028,"src\/controllers\/ConversionsController.php":3262643627,"src\/controllers\/LanguagesController.php":3778969195,"src\/controllers\/DisplayController.php":3629366203,"src\/controllers\/FulltextController.php":2234513159,"src\/controllers\/TablesController.php":3551539624,"src\/controllers\/TblpropertiesController.php":25088431,"src\/controllers\/LoginController.php":947152141,"src\/controllers\/ColpropertiesController.php":500485033,"src\/controllers\/PrivilegesController.php":1576861891,"src\/controllers\/ConstraintsController.php":1731220252,"src\/controllers\/BrowserController.php":3742508770,"src\/controllers\/AlldbController.php":1752986208,"src\/controllers\/ServersController.php":1063577541,"src\/controllers\/GroupsController.php":3288820046,"src\/controllers\/SqleditController.php":3044783495,"src\/controllers\/DomainsController.php":2358158946,"src\/controllers\/IntroController.php":4183644868,"src\/controllers\/ViewsController.php":3520681060,"src\/controllers\/HistoryController.php":900040622,"src\/controllers\/DataimportController.php":1816969049,"src\/controllers\/ViewpropertiesController.php":689370786,"src\/controllers\/AggregatesController.php":3932457095,"src\/controllers\/DbexportController.php":3390214063,"src\/controllers\/UsersController.php":2446413695,"src\/controllers\/InfoController.php":4265197351,"src\/controllers\/TriggersController.php":1085092155,"src\/controllers\/FunctionsController.php":1087091077,"src\/controllers\/SqlController.php":3857995893,"src\/controllers\/MaterializedviewpropertiesController.php":350837750,"src\/controllers\/DatabaseController.php":1986025722,"src\/controllers\/TablespacesController.php":1628686307,"src\/controllers\/DataexportController.php":2335931883,"src\/controllers\/RolesController.php":2609174050,"src\/controllers\/OpclassesController.php":319044406,"src\/controllers\/SchemasController.php":4070114037,"src\/controllers\/BaseController.php":2790674406,"src\/controllers\/OperatorsController.php":4140625602,"src\/controllers\/MaterializedviewsController.php":3646769077,"src\/controllers\/TypesController.php":1599649630,"src\/controllers\/AcinsertController.php":2746256934,"src\/database\/Postgres95.php":1964193971,"src\/database\/Postgres10.php":214079631,"src\/database\/Postgres82.php":4024387569,"src\/database\/Postgres84.php":2985653685,"src\/database\/Postgres80.php":784826163,"src\/database\/ADOdbBase.php":3850222836,"src\/database\/Postgres93.php":1317099201,"src\/database\/Postgres81.php":1869700275,"src\/database\/Postgres96.php":4233463944,"src\/database\/Postgres94.php":1010948835,"src\/database\/Postgres83.php":59463290,"src\/database\/Postgres92.php":2577241885,"src\/database\/Postgres.php":3991688953,"src\/database\/Postgres90.php":326174777,"src\/database\/Connection.php":828935425,"src\/database\/Postgres74.php":701279716,"src\/database\/Postgres91.php":3485286420,"src\/decorators\/UrlDecorator.php":2705567993,"src\/decorators\/IfEmptyDecorator.php":4242061178,"src\/decorators\/ActionUrlDecorator.php":1219204515,"src\/decorators\/ConcatDecorator.php":3658767494,"src\/decorators\/BranchUrlDecorator.php":787309285,"src\/decorators\/Decorator.php":2228354982,"src\/decorators\/RedirectUrlDecorator.php":1764217759,"src\/decorators\/ArrayMergeDecorator.php":3359745272,"src\/decorators\/CallbackDecorator.php":3516674884,"src\/decorators\/FieldDecorator.php":3982559527,"src\/decorators\/ReplaceDecorator.php":4175896248,"src\/help\/PostgresDoc74.php":4128179939,"src\/help\/PostgresDoc81.php":619562046,"src\/help\/PostgresDoc94.php":3772487351,"src\/help\/PostgresDoc93.php":2383865201,"src\/help\/PostgresDoc92.php":1831770547,"src\/help\/PostgresDoc95.php":792608325,"src\/help\/PostgresDoc10.php":3114109996,"src\/help\/PostgresDoc96.php":925139997,"src\/help\/PostgresDoc82.php":2545244772,"src\/help\/PostgresDoc90.php":1506663187,"src\/help\/PostgresDoc84.php":3214869137,"src\/help\/PostgresDoc91.php":3209353877,"src\/help\/PostgresDoc83.php":3242748887,"src\/help\/PostgresDoc80.php":3807334535,"src\/translations\/ChineseTr.php":2026874369,"src\/translations\/Hebrew.php":879645786,"src\/translations\/Japanese.php":2627141306,"src\/translations\/Czech.php":3308731049,"src\/translations\/ChineseUtf8ZhTw.php":4104782199,"src\/translations\/Greek.php":515982078,"src\/translations\/ChineseUtf8ZhCn.php":1427449938,"src\/translations\/Galician.php":837635722,"src\/translations\/Russian.php":1057768301,"src\/translations\/Arabic.php":149728643,"src\/translations\/Dutch.php":2502997902,"src\/translations\/Catalan.php":1606698496,"src\/translations\/Hungarian.php":2285694581,"src\/translations\/Mongol.php":2644926398,"src\/translations\/ChineseSim.php":3322518649,"src\/translations\/Ukrainian.php":1160756759,"src\/translations\/German.php":397715422,"src\/translations\/Romanian.php":1749382554,"src\/translations\/Turkish.php":3883907486,"src\/translations\/Polish.php":468351832,"src\/translations\/Spanish.php":3587999990,"src\/translations\/French.php":636572207,"src\/translations\/PortugueseBr.php":892220463,"src\/translations\/Lithuanian.php":2928422703,"src\/translations\/Danish.php":2484457684,"src\/translations\/Swedish.php":1588499492,"src\/translations\/RussianUtf8.php":1336057745,"src\/translations\/Afrikaans.php":1631968630,"src\/translations\/English.php":3258178649,"src\/translations\/Italian.php":2492600476,"src\/translations\/PortuguesePt.php":2628836842,"src\/translations\/Slovak.php":863194954,"src\/xhtml\/TreeController.php":4020883336,"src\/xhtml\/HTMLController.php":2643226970,"src\/xhtml\/XHtmlSimpleElement.php":1563606729,"src\/xhtml\/XHtmlElement.php":3887384144,"src\/xhtml\/XHtmlSelect.php":2265350205,"src\/xhtml\/HTMLFooterController.php":1734172733,"src\/xhtml\/XHtmlButton.php":475195930,"src\/xhtml\/HTMLTableController.php":627054078,"src\/xhtml\/XHtmlOption.php":799385608,"src\/xhtml\/HTMLHeaderController.php":874259932,"src\/xhtml\/HTMLNavbarController.php":2101037085,"tests\/views\/indexes.php":1294691244,"tests\/views\/sequences.php":1804190271,"tests\/views\/schemas.php":3515928529,"tests\/views\/constraints.php":3232723320,"tests\/views\/dataimport.php":85346073,"tests\/views\/help.php":2894579642,"tests\/views\/materializedviewproperties.php":1582633696,"tests\/views\/roles.php":786527092,"tests\/views\/dbexport.php":250255110,"tests\/views\/acinsert.php":524129270,"tests\/views\/colproperties.php":3407257424,"tests\/views\/types.php":988450029,"tests\/views\/users.php":2910368777,"tests\/views\/conversions.php":1786221915,"tests\/views\/casts.php":2644855814,"tests\/views\/display.php":2833012659,"tests\/views\/fulltext.php":1423684813,"tests\/views\/browser.php":3077537596,"tests\/views\/materializedviews.php":3819554579,"tests\/views\/triggers.php":2874001020,"tests\/views\/sql.php":3631156130,"tests\/views\/tblproperties.php":2088706481,"tests\/views\/alldb.php":2100951401,"tests\/views\/history.php":1649379881,"tests\/views\/languages.php":2978135876,"tests\/views\/database.php":1626699852,"tests\/views\/groups.php":1792210003,"tests\/views\/tablespaces.php":3202940110,"tests\/views\/opclasses.php":415330427,"tests\/views\/tables.php":1829769938,"tests\/views\/functions.php":3712032911,"tests\/views\/info.php":2118670009,"tests\/views\/servers.php":4291897560,"tests\/views\/sqledit.php":3301092715,"tests\/views\/dataexport.php":1582010830,"tests\/views\/rules.php":1191875194,"tests\/views\/operators.php":496526301,"tests\/views\/domains.php":2307341523,"tests\/views\/viewproperties.php":2464182483,"tests\/views\/privileges.php":489484121,"tests\/views\/login.php":1152458015,"tests\/views\/aggregates.php":1681015708,"tests\/views\/intro.php":4250344329,"tests\/views\/views.php":322609328,"tests\/_support\/FunctionalTester.php":3141791838,"tests\/_support\/Helper\/Unit.php":2712093571,"tests\/_support\/Helper\/Functional.php":3588618101,"tests\/_support\/Helper\/Acceptance.php":4235356409,"tests\/_support\/AcceptanceTester.php":2031842130,"tests\/_support\/UnitTester.php":3975028120,"tests\/_support\/_generated\/UnitTesterActions.php":816899145,"tests\/selenium\/src\/08-domaine.php":4135309237,"tests\/selenium\/src\/99-cleantests.php":597093588,"tests\/selenium\/src\/01-roles.php":1998560322,"tests\/selenium\/src\/10-table.php":4032523856,"tests\/selenium\/src\/04-database.php":1694280644,"tests\/selenium\/src\/06-schema.php":4066439848,"tests\/selenium\/src\/12-admin.php":2327717251,"tests\/selenium\/src\/30-view.php":2923385644,"tests\/selenium\/src\/35-index.php":2698049597,"tests\/selenium\/src\/20-constraint.php":3958961940,"tests\/selenium\/src\/15-sequence.php":493012763,"tests\/selenium\/src\/25-column.php":4159814147,"tests\/selenium\/TestSuite.php":3340193892,"tests\/selenium\/testBuilder.class.php":4041514431,"tests\/unit\/ViewTest.php":2961075608,"tests\/simpletest\/config.tests.php":2095115662,"tests\/simpletest\/testcase\/Databases\/AdminTest.php":2581748152,"tests\/simpletest\/testcase\/Databases\/SchemaBasicTest.php":2015140002,"tests\/simpletest\/testcase\/Databases\/ProcessesTest.php":3210673786,"tests\/simpletest\/testcase\/Databases\/DatabaseGroupTest.php":317427171,"tests\/simpletest\/testcase\/Databases\/VariablesTest.php":3843339374,"tests\/simpletest\/testcase\/Databases\/HelpTest.php":726833678,"tests\/simpletest\/testcase\/Databases\/SqlTest.php":3029093383,"tests\/simpletest\/testcase\/Databases\/CastsTest.php":2395861911,"tests\/simpletest\/testcase\/Databases\/DatabaseTest.php":1295655385,"tests\/simpletest\/testcase\/Databases\/LanguageTest.php":4228179040,"tests\/simpletest\/testcase\/Databases\/FindObjectsTest.php":2554852522,"tests\/simpletest\/testcase\/Common\/SecurityTest.php":3544998377,"tests\/simpletest\/testcase\/Common\/ImportTest.php":1652469026,"tests\/simpletest\/testcase\/Common\/CommonGroupTest.php":1452033449,"tests\/simpletest\/testcase\/Common\/ExportTest.php":2754807034,"tests\/simpletest\/testcase\/testphpPgAdminMain.php":3708798342,"tests\/simpletest\/testcase\/Server\/GroupsTest.php":3426387805,"tests\/simpletest\/testcase\/Server\/UsersTest.php":3946339215,"tests\/simpletest\/testcase\/Server\/ReportsTest.php":2692330451,"tests\/simpletest\/testcase\/Server\/TableSpacesTest.php":568009779,"tests\/simpletest\/testcase\/Server\/ServerGroupTest.php":4244122822,"tests\/simpletest\/testcase\/phpcoverage.inc.php":3621930486,"tests\/simpletest\/testcase\/simpletest.inc.php":2274415542,"tests\/simpletest\/testcase\/Public\/common.php":1297548726,"tests\/simpletest\/testcase\/Public\/SetPrecondition.php":3412831225,"tests\/simpletest\/testcase\/coveragephpPgAdminMain.php":2565942488,"tests\/simpletest\/testcase\/Schemas\/SequenceTest.php":2659008121,"tests\/simpletest\/testcase\/Schemas\/OpClassTest.php":2670876613,"tests\/simpletest\/testcase\/Schemas\/TypeTest.php":3683532851,"tests\/simpletest\/testcase\/Schemas\/DomainTest.php":436911809,"tests\/simpletest\/testcase\/Schemas\/ConversionTest.php":3100395617,"tests\/simpletest\/testcase\/Schemas\/SchemasGroupTest.php":3585874541,"tests\/simpletest\/testcase\/Schemas\/TableTest.php":1516713951,"tests\/simpletest\/testcase\/Schemas\/FunctionTest.php":4195543992,"tests\/simpletest\/testcase\/Schemas\/AggregateTest.php":349255858,"tests\/simpletest\/testcase\/Schemas\/ViewTest.php":3903737683,"tests\/simpletest\/testcase\/Schemas\/OperatorTest.php":714759046,"tests\/simpletest\/testcase\/Tables\/InfoTest.php":3896068178,"tests\/simpletest\/testcase\/Tables\/ConstraintsTest.php":3395231954,"tests\/simpletest\/testcase\/Tables\/RulesTest.php":1862029710,"tests\/simpletest\/testcase\/Tables\/TableGroupTest.php":3353144101,"tests\/simpletest\/testcase\/Tables\/TriggersTest.php":2287253366,"tests\/simpletest\/testcase\/Tables\/IndexesTest.php":240025848,"tests\/simpletest\/testcase\/Tables\/DeadlockTest.php":1298958898,"tests\/simpletest\/testcase\/Tables\/ColumnTest.php":884903494,"tests\/simpletest\/tests.php":1172469454}}
\ No newline at end of file diff --git a/composer.json b/composer.json index 04001f86..8d05ab42 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "huasofoundries/phppgadmin6", - "version": "6.0.0-beta.45", + "version": "6.0.0-beta.46", "description": "Like phpmyadmin but for postgres", "type": "project", "license": "MIT", diff --git a/composer.lock b/composer.lock index f94e3c9e..0050e771 100644 --- a/composer.lock +++ b/composer.lock @@ -1,10 +1,10 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "f58f91bc3a13740927c0e10fc350fa40", + "content-hash": "07f412fd6782da8dacff0ffeb0ae9710", "packages": [ { "name": "adodb/adodb-php", diff --git a/src/classes/ADONewConnection.php b/src/classes/ADONewConnection.php index f191391f..1b33db5f 100644 --- a/src/classes/ADONewConnection.php +++ b/src/classes/ADONewConnection.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin; diff --git a/src/classes/ADORecordSet.php b/src/classes/ADORecordSet.php index e473a2d5..48658e0b 100644 --- a/src/classes/ADORecordSet.php +++ b/src/classes/ADORecordSet.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin; diff --git a/src/classes/ADOdbException.php b/src/classes/ADOdbException.php index 0e6caa1e..8f56fc65 100644 --- a/src/classes/ADOdbException.php +++ b/src/classes/ADOdbException.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin; diff --git a/src/classes/ArrayRecordSet.php b/src/classes/ArrayRecordSet.php index d28e16fd..300e4ebc 100644 --- a/src/classes/ArrayRecordSet.php +++ b/src/classes/ArrayRecordSet.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin; diff --git a/src/classes/ContainerUtils.php b/src/classes/ContainerUtils.php index c1869ad1..38e9b95f 100644 --- a/src/classes/ContainerUtils.php +++ b/src/classes/ContainerUtils.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin; diff --git a/src/classes/Misc.php b/src/classes/Misc.php index 2135a627..d57771f1 100644 --- a/src/classes/Misc.php +++ b/src/classes/Misc.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin; diff --git a/src/classes/PluginManager.php b/src/classes/PluginManager.php index ebe9d3a5..d892f4f7 100644 --- a/src/classes/PluginManager.php +++ b/src/classes/PluginManager.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin; diff --git a/src/classes/Translations.php b/src/classes/Translations.php index 0175a680..0a46ea1d 100644 --- a/src/classes/Translations.php +++ b/src/classes/Translations.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin; diff --git a/src/controllers/AcinsertController.php b/src/controllers/AcinsertController.php index d77f921b..d950d4b4 100644 --- a/src/controllers/AcinsertController.php +++ b/src/controllers/AcinsertController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/AggregatesController.php b/src/controllers/AggregatesController.php index 06d4fd5c..1b085a01 100644 --- a/src/controllers/AggregatesController.php +++ b/src/controllers/AggregatesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/AlldbController.php b/src/controllers/AlldbController.php index e4fcc0fd..dc54d42c 100644 --- a/src/controllers/AlldbController.php +++ b/src/controllers/AlldbController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/BaseController.php b/src/controllers/BaseController.php index bed4064a..18e4b2f0 100644 --- a/src/controllers/BaseController.php +++ b/src/controllers/BaseController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/BrowserController.php b/src/controllers/BrowserController.php index 1a809a93..e595a965 100644 --- a/src/controllers/BrowserController.php +++ b/src/controllers/BrowserController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/CastsController.php b/src/controllers/CastsController.php index e4594818..d7f15b70 100644 --- a/src/controllers/CastsController.php +++ b/src/controllers/CastsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/ColpropertiesController.php b/src/controllers/ColpropertiesController.php index 3f247e5d..4b0a7e2e 100644 --- a/src/controllers/ColpropertiesController.php +++ b/src/controllers/ColpropertiesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/ConstraintsController.php b/src/controllers/ConstraintsController.php index 32db3fe1..74138f9b 100644 --- a/src/controllers/ConstraintsController.php +++ b/src/controllers/ConstraintsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/ConversionsController.php b/src/controllers/ConversionsController.php index 2c02974e..bb8a7e1f 100644 --- a/src/controllers/ConversionsController.php +++ b/src/controllers/ConversionsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/DatabaseController.php b/src/controllers/DatabaseController.php index e4c2fb34..c9af67de 100644 --- a/src/controllers/DatabaseController.php +++ b/src/controllers/DatabaseController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; @@ -44,20 +44,20 @@ 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\">\n"; $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>\n"; } @@ -184,7 +184,7 @@ class DatabaseController extends BaseController $this->printTabs('database', 'find'); $this->printMsg($msg); - echo '<form action="' . \SUBFOLDER . "/src/views/database\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/database\" method=\"post\">\n"; echo '<p><input name="term" value="', htmlspecialchars($_REQUEST['term']), "\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" />\n"; // Output list of filters. This is complex due to all the 'has' and 'conf' feature possibilities @@ -213,8 +213,8 @@ class DatabaseController extends BaseController echo "</select>\n"; echo "<input type=\"submit\" value=\"{$this->lang['strfind']}\" />\n"; echo $this->misc->form; - echo '<input type="hidden" name="action" value="find" /></p>' . "\n"; - echo '<input type="hidden" name="confirm" value="true" /></p>' . "\n"; + echo '<input type="hidden" name="action" value="find" /></p>'."\n"; + echo '<input type="hidden" name="confirm" value="true" /></p>'."\n"; echo "</form>\n"; // Default focus @@ -324,7 +324,7 @@ 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>\n"; @@ -333,14 +333,14 @@ class DatabaseController extends BaseController 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=', + 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>\n"; 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=', + 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>\n"; break; @@ -353,7 +353,7 @@ class DatabaseController extends BaseController 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']), '">', @@ -362,7 +362,7 @@ class DatabaseController extends BaseController 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']), '">', @@ -371,15 +371,15 @@ class DatabaseController extends BaseController 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="'.\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>\n"; 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>\n"; @@ -393,24 +393,24 @@ class DatabaseController extends BaseController 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>\n"; 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>\n"; 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>\n"; @@ -464,7 +464,7 @@ class DatabaseController extends BaseController 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>\n"; @@ -494,7 +494,7 @@ class DatabaseController extends BaseController $this->printTabs('database', 'export'); $this->printMsg($msg); - echo '<form action="' . \SUBFOLDER . "/src/views/dbexport\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/dbexport\" method=\"post\">\n"; echo "<table>\n"; echo "<tr><th class=\"data\">{$this->lang['strformat']}</th><th class=\"data\" colspan=\"2\">{$this->lang['stroptions']}</th></tr>\n"; // Data only @@ -577,7 +577,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">'; @@ -759,7 +759,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(); @@ -779,7 +779,7 @@ class DatabaseController extends BaseController $this->printTrail('database'); $this->printTabs('database', 'sql'); echo "<p>{$this->lang['strentersql']}</p>\n"; - echo '<form action="' . \SUBFOLDER . '/src/views/sql" method="post" enctype="multipart/form-data" id="sqlform">' . "\n"; + echo '<form action="'.\SUBFOLDER.'/src/views/sql" method="post" enctype="multipart/form-data" id="sqlform">'."\n"; echo "<p>{$this->lang['strsql']}<br />\n"; echo '<textarea style="width:95%;" rows="15" cols="50" name="query" id="query">', htmlspecialchars($_SESSION['sqlquery']), "</textarea></p>\n"; diff --git a/src/controllers/DataexportController.php b/src/controllers/DataexportController.php index ed19977d..c7d41b2f 100644 --- a/src/controllers/DataexportController.php +++ b/src/controllers/DataexportController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/DataimportController.php b/src/controllers/DataimportController.php index 5bfab54b..726c1e14 100644 --- a/src/controllers/DataimportController.php +++ b/src/controllers/DataimportController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/DbexportController.php b/src/controllers/DbexportController.php index d63c5eee..c8615273 100644 --- a/src/controllers/DbexportController.php +++ b/src/controllers/DbexportController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; @@ -46,7 +46,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); $this->prtrace('$exe', $exe, 'version', $version[1]); @@ -96,20 +96,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; } @@ -124,7 +124,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': @@ -137,13 +137,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); } } @@ -184,7 +184,7 @@ class DbexportController extends BaseController } if (!$dumpall) { - putenv('PGDATABASE=' . $_REQUEST['database']); + putenv('PGDATABASE='.$_REQUEST['database']); } /*$this->prtrace( diff --git a/src/controllers/DisplayController.php b/src/controllers/DisplayController.php index 1a162453..8d0a806d 100644 --- a/src/controllers/DisplayController.php +++ b/src/controllers/DisplayController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; @@ -28,13 +28,13 @@ class DisplayController extends BaseController set_time_limit(0); - $scripts = '<script src="' . \SUBFOLDER . '/assets/js/display.js" type="text/javascript"></script>'; + $scripts = '<script src="'.\SUBFOLDER.'/assets/js/display.js" type="text/javascript"></script>'; - $scripts .= '<script type="text/javascript">' . "\n"; + $scripts .= '<script type="text/javascript">'."\n"; $scripts .= "var Display = {\n"; - $scripts .= "errmsg: '" . str_replace("'", "\\'", $this->lang['strconnectionfail']) . "'\n"; + $scripts .= "errmsg: '".str_replace("'", "\\'", $this->lang['strconnectionfail'])."'\n"; $scripts .= "};\n"; - $scripts .= '</script>' . "\n"; + $scripts .= '</script>'."\n"; $footer_template = 'footer.twig'; $header_template = 'header.twig'; @@ -257,10 +257,10 @@ class DisplayController extends BaseController //die(htmlspecialchars($query)); - echo '<form method="post" id="sqlform" action="' . $_SERVER['REQUEST_URI'] . '">'; + echo '<form method="post" id="sqlform" action="'.$_SERVER['REQUEST_URI'].'">'; echo $this->misc->form; if ($object) { - echo '<input type="hidden" name="' . $subject . '" value="', htmlspecialchars($object), '" />' . "\n"; + echo '<input type="hidden" name="'.$subject.'" value="', htmlspecialchars($object), '" />'."\n"; } echo '<textarea width="90%" name="query" id="query" rows="5" cols="100" resizable="true">'; echo htmlspecialchars($query); @@ -343,19 +343,19 @@ class DisplayController extends BaseController // Display edit and delete actions if we have a key $colspan = count($buttons); if ($colspan > 0 and count($key) > 0) { - echo "<th colspan=\"{$colspan}\" class=\"data\">{$this->lang['stractions']}</th>" . "\n"; + echo "<th colspan=\"{$colspan}\" class=\"data\">{$this->lang['stractions']}</th>"."\n"; } // we show OIDs only if we are in TABLE or SELECT type browsing $this->printTableHeaderCells($resultset, $_gets, isset($object)); - echo '</tr>' . "\n"; + echo '</tr>'."\n"; $i = 0; reset($resultset->fields); while (!$resultset->EOF) { $id = (0 == ($i % 2) ? '1' : '2'); - echo "<tr class=\"data{$id}\">" . "\n"; + echo "<tr class=\"data{$id}\">"."\n"; // Display edit and delete links if we have a key if ($colspan > 0 and count($key) > 0) { $keys_array = []; @@ -369,7 +369,7 @@ class DisplayController extends BaseController $keys_array["key[{$v}]"] = $resultset->fields[$v]; } if ($has_nulls) { - echo "<td colspan=\"{$colspan}\"> </td>" . "\n"; + echo "<td colspan=\"{$colspan}\"> </td>"."\n"; } else { if (isset($actions['actionbuttons']['edit'])) { $actions['actionbuttons']['edit'] = $edit_params; @@ -390,24 +390,24 @@ class DisplayController extends BaseController foreach ($actions['actionbuttons'] as $this->action) { echo "<td class=\"opbutton{$id}\">"; $this->printLink($this->action, true, __METHOD__); - echo '</td>' . "\n"; + echo '</td>'."\n"; } } } $this->printTableRowCells($resultset, $fkey_information, isset($object)); - echo '</tr>' . "\n"; + echo '</tr>'."\n"; $resultset->moveNext(); ++$i; } - echo '</table>' . "\n"; + echo '</table>'."\n"; - echo '<p>', $resultset->recordCount(), " {$this->lang['strrows']}</p>" . "\n"; + echo '<p>', $resultset->recordCount(), " {$this->lang['strrows']}</p>"."\n"; // Show page navigation echo $paginator; } else { - echo "<p>{$this->lang['strnodata']}</p>" . "\n"; + echo "<p>{$this->lang['strnodata']}</p>"."\n"; } // Navigation links @@ -585,7 +585,7 @@ class DisplayController extends BaseController $finfo = $resultset->fetchField($j); if (false === $args) { - echo '<th class="data">', $this->misc->printVal($finfo->name), '</th>' . "\n"; + echo '<th class="data">', $this->misc->printVal($finfo->name), '</th>'."\n"; } else { $args['page'] = $_REQUEST['page']; $args['sortkey'] = $j + 1; @@ -601,12 +601,12 @@ class DisplayController extends BaseController , $this->misc->printVal($finfo->name); if ($_REQUEST['sortkey'] == ($j + 1)) { if ('asc' == $_REQUEST['sortdir']) { - echo '<img src="' . $this->misc->icon('RaiseArgument') . '" alt="asc">'; + echo '<img src="'.$this->misc->icon('RaiseArgument').'" alt="asc">'; } else { - echo '<img src="' . $this->misc->icon('LowerArgument') . '" alt="desc">'; + echo '<img src="'.$this->misc->icon('LowerArgument').'" alt="desc">'; } } - echo '</a></th>' . "\n"; + echo '</a></th>'."\n"; } ++$j; } @@ -645,16 +645,16 @@ class DisplayController extends BaseController $query_params = $fkey_information['byconstr'][$conid]['url_data']; foreach ($fkey_information['byconstr'][$conid]['fkeys'] as $p_field => $f_field) { - $query_params .= '&' . urlencode("fkey[{$f_field}]") . '=' . urlencode($resultset->fields[$p_field]); + $query_params .= '&'.urlencode("fkey[{$f_field}]").'='.urlencode($resultset->fields[$p_field]); } // $fkey_information['common_url'] is already urlencoded - $query_params .= '&' . $fkey_information['common_url']; + $query_params .= '&'.$fkey_information['common_url']; echo '<div style="display:inline-block;">'; - echo '<a class="fk fk_' . htmlentities($conid, ENT_QUOTES, 'UTF-8') . "\" href=\"display?{$query_params}\">"; - echo '<img src="' . $this->misc->icon('ForeignKey') . '" style="vertical-align:middle;" alt="[fk]" title="' - . htmlentities($fkey_information['byconstr'][$conid]['consrc'], ENT_QUOTES, 'UTF-8') - . '" />'; + echo '<a class="fk fk_'.htmlentities($conid, ENT_QUOTES, 'UTF-8')."\" href=\"display?{$query_params}\">"; + echo '<img src="'.$this->misc->icon('ForeignKey').'" style="vertical-align:middle;" alt="[fk]" title="' + .htmlentities($fkey_information['byconstr'][$conid]['consrc'], ENT_QUOTES, 'UTF-8') + .'" />'; echo '</a>'; echo '</div>'; } @@ -701,7 +701,7 @@ class DisplayController extends BaseController $fksprops = false; } - echo '<form action="' . \SUBFOLDER . '/src/views/display" method="post" id="ac_form">' . "\n"; + echo '<form action="'.\SUBFOLDER.'/src/views/display" method="post" id="ac_form">'."\n"; /*echo '<p>'; if (!$error) { @@ -715,11 +715,11 @@ class DisplayController extends BaseController $elements = 0; $error = true; if (1 == $resultset->recordCount() && $attrs->recordCount() > 0) { - echo '<table>' . "\n"; + echo '<table>'."\n"; // Output table header echo "<tr><th class=\"data\">{$this->lang['strcolumn']}</th><th class=\"data\">{$this->lang['strtype']}</th>"; - echo "<th class=\"data\">{$this->lang['strformat']}</th>" . "\n"; + echo "<th class=\"data\">{$this->lang['strformat']}</th>"."\n"; echo "<th class=\"data\">{$this->lang['strnull']}</th><th class=\"data\">{$this->lang['strvalue']}</th></tr>"; $i = 0; @@ -732,19 +732,19 @@ class DisplayController extends BaseController $_REQUEST['format'][$attrs->fields['attname']] = 'VALUE'; } - echo "<tr class=\"data{$id}\">" . "\n"; + echo "<tr class=\"data{$id}\">"."\n"; echo '<td style="white-space:nowrap;">', $this->misc->printVal($attrs->fields['attname']), '</td>'; - echo '<td style="white-space:nowrap;">' . "\n"; + echo '<td style="white-space:nowrap;">'."\n"; echo $this->misc->printVal($data->formatType($attrs->fields['type'], $attrs->fields['atttypmod'])); echo '<input type="hidden" name="types[', htmlspecialchars($attrs->fields['attname']), ']" value="', htmlspecialchars($attrs->fields['type']), '" /></td>'; ++$elements; - echo '<td style="white-space:nowrap;">' . "\n"; - echo '<select name="format[' . htmlspecialchars($attrs->fields['attname']), ']">' . "\n"; - echo '<option value="VALUE"', ($_REQUEST['format'][$attrs->fields['attname']] == 'VALUE') ? ' selected="selected"' : '', ">{$this->lang['strvalue']}</option>" . "\n"; + echo '<td style="white-space:nowrap;">'."\n"; + echo '<select name="format['.htmlspecialchars($attrs->fields['attname']), ']">'."\n"; + echo '<option value="VALUE"', ($_REQUEST['format'][$attrs->fields['attname']] == 'VALUE') ? ' selected="selected"' : '', ">{$this->lang['strvalue']}</option>"."\n"; $selected = ($_REQUEST['format'][$attrs->fields['attname']] == 'EXPRESSION') ? ' selected="selected"' : ''; - echo '<option value="EXPRESSION"' . $selected . ">{$this->lang['strexpression']}</option>" . "\n"; - echo "</select>\n</td>" . "\n"; + echo '<option value="EXPRESSION"'.$selected.">{$this->lang['strexpression']}</option>"."\n"; + echo "</select>\n</td>"."\n"; ++$elements; echo '<td style="white-space:nowrap;">'; // Output null box if the column allows nulls (doesn't look at CHECKs or ASSERTIONS) @@ -754,7 +754,7 @@ class DisplayController extends BaseController $_REQUEST['nulls'][$attrs->fields['attname']] = 'on'; } echo "<label><span><input type=\"checkbox\" name=\"nulls[{$attrs->fields['attname']}]\"", - isset($_REQUEST['nulls'][$attrs->fields['attname']]) ? ' checked="checked"' : '', ' /></span></label></td>' . "\n"; + isset($_REQUEST['nulls'][$attrs->fields['attname']]) ? ' checked="checked"' : '', ' /></span></label></td>'."\n"; ++$elements; } else { echo ' </td>'; @@ -769,7 +769,7 @@ class DisplayController extends BaseController // keep track of which element offset we're up to. We can't refer to the null checkbox by name // as it contains '[' and ']' characters. if (!$attrs->fields['attnotnull']) { - $extras['onChange'] = 'elements[' . ($elements - 1) . '].checked = false;'; + $extras['onChange'] = 'elements['.($elements - 1).'].checked = false;'; } if ((false !== $fksprops) && isset($fksprops['byfield'][$attrs->fields['attnum']])) { @@ -781,63 +781,63 @@ class DisplayController extends BaseController echo '</td>'; ++$elements; - echo '</tr>' . "\n"; + echo '</tr>'."\n"; ++$i; $attrs->moveNext(); } - echo '</table>' . "\n"; + echo '</table>'."\n"; $error = false; } elseif (1 != $resultset->recordCount()) { - echo "<p>{$this->lang['strrownotunique']}</p>" . "\n"; + echo "<p>{$this->lang['strrownotunique']}</p>"."\n"; } else { - echo "<p>{$this->lang['strinvalidparam']}</p>" . "\n"; + echo "<p>{$this->lang['strinvalidparam']}</p>"."\n"; } - echo '<input type="hidden" name="action" value="editrow" />' . "\n"; + echo '<input type="hidden" name="action" value="editrow" />'."\n"; echo $this->misc->form; if (isset($_REQUEST['table'])) { - echo '<input type="hidden" name="table" value="', htmlspecialchars($_REQUEST['table']), '" />' . "\n"; + echo '<input type="hidden" name="table" value="', htmlspecialchars($_REQUEST['table']), '" />'."\n"; } if (isset($_REQUEST['subject'])) { - echo '<input type="hidden" name="subject" value="', htmlspecialchars($_REQUEST['subject']), '" />' . "\n"; + echo '<input type="hidden" name="subject" value="', htmlspecialchars($_REQUEST['subject']), '" />'."\n"; } if (isset($_REQUEST['query'])) { - echo '<input type="hidden" name="query" value="', htmlspecialchars($_REQUEST['query']), '" />' . "\n"; + echo '<input type="hidden" name="query" value="', htmlspecialchars($_REQUEST['query']), '" />'."\n"; } if (isset($_REQUEST['count'])) { - echo '<input type="hidden" name="count" value="', htmlspecialchars($_REQUEST['count']), '" />' . "\n"; + echo '<input type="hidden" name="count" value="', htmlspecialchars($_REQUEST['count']), '" />'."\n"; } if (isset($_REQUEST['return'])) { - echo '<input type="hidden" name="return" value="', htmlspecialchars($_REQUEST['return']), '" />' . "\n"; + echo '<input type="hidden" name="return" value="', htmlspecialchars($_REQUEST['return']), '" />'."\n"; } - echo '<input type="hidden" name="page" value="', htmlspecialchars($_REQUEST['page']), '" />' . "\n"; - echo '<input type="hidden" name="sortkey" value="', htmlspecialchars($_REQUEST['sortkey']), '" />' . "\n"; - echo '<input type="hidden" name="sortdir" value="', htmlspecialchars($_REQUEST['sortdir']), '" />' . "\n"; - echo '<input type="hidden" name="strings" value="', htmlspecialchars($_REQUEST['strings']), '" />' . "\n"; - echo '<input type="hidden" name="key" value="', htmlspecialchars(urlencode(serialize($key))), '" />' . "\n"; + echo '<input type="hidden" name="page" value="', htmlspecialchars($_REQUEST['page']), '" />'."\n"; + echo '<input type="hidden" name="sortkey" value="', htmlspecialchars($_REQUEST['sortkey']), '" />'."\n"; + echo '<input type="hidden" name="sortdir" value="', htmlspecialchars($_REQUEST['sortdir']), '" />'."\n"; + echo '<input type="hidden" name="strings" value="', htmlspecialchars($_REQUEST['strings']), '" />'."\n"; + echo '<input type="hidden" name="key" value="', htmlspecialchars(urlencode(serialize($key))), '" />'."\n"; echo '<p>'; if (!$error) { - echo "<input type=\"submit\" name=\"save\" accesskey=\"r\" value=\"{$this->lang['strsave']}\" />" . "\n"; + echo "<input type=\"submit\" name=\"save\" accesskey=\"r\" value=\"{$this->lang['strsave']}\" />"."\n"; } - echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" />" . "\n"; + echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" />"."\n"; if (false !== $fksprops) { if ('default off' != $this->conf['autocomplete']) { - echo "<input type=\"checkbox\" id=\"no_ac\" value=\"1\" checked=\"checked\" /><label for=\"no_ac\">{$this->lang['strac']}</label>" . "\n"; + echo "<input type=\"checkbox\" id=\"no_ac\" value=\"1\" checked=\"checked\" /><label for=\"no_ac\">{$this->lang['strac']}</label>"."\n"; } else { - echo "<input type=\"checkbox\" id=\"no_ac\" value=\"0\" /><label for=\"no_ac\">{$this->lang['strac']}</label>" . "\n"; + echo "<input type=\"checkbox\" id=\"no_ac\" value=\"0\" /><label for=\"no_ac\">{$this->lang['strac']}</label>"."\n"; } } - echo '</p>' . "\n"; - echo '</form>' . "\n"; + echo '</p>'."\n"; + echo '</form>'."\n"; } else { $this->coalesceArr($_POST, 'values', []); @@ -876,58 +876,58 @@ class DisplayController extends BaseController $resultset = $data->browseRow($_REQUEST['table'], $_REQUEST['key']); - echo '<form action="' . \SUBFOLDER . '/src/views/display" method="post">' . "\n"; + echo '<form action="'.\SUBFOLDER.'/src/views/display" method="post">'."\n"; echo $this->misc->form; if (1 == $resultset->recordCount()) { - echo "<p>{$this->lang['strconfdeleterow']}</p>" . "\n"; + echo "<p>{$this->lang['strconfdeleterow']}</p>"."\n"; $fkinfo = []; echo '<table><tr>'; $this->printTableHeaderCells($resultset, false, true); echo '</tr>'; - echo '<tr class="data1">' . "\n"; + echo '<tr class="data1">'."\n"; $this->printTableRowCells($resultset, $fkinfo, true); - echo '</tr>' . "\n"; - echo '</table>' . "\n"; - echo '<br />' . "\n"; + echo '</tr>'."\n"; + echo '</table>'."\n"; + echo '<br />'."\n"; - echo '<input type="hidden" name="action" value="delrow" />' . "\n"; - echo "<input type=\"submit\" name=\"yes\" value=\"{$this->lang['stryes']}\" />" . "\n"; - echo "<input type=\"submit\" name=\"no\" value=\"{$this->lang['strno']}\" />" . "\n"; + echo '<input type="hidden" name="action" value="delrow" />'."\n"; + echo "<input type=\"submit\" name=\"yes\" value=\"{$this->lang['stryes']}\" />"."\n"; + echo "<input type=\"submit\" name=\"no\" value=\"{$this->lang['strno']}\" />"."\n"; } elseif (1 != $resultset->recordCount()) { - echo "<p>{$this->lang['strrownotunique']}</p>" . "\n"; - echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" />" . "\n"; + echo "<p>{$this->lang['strrownotunique']}</p>"."\n"; + echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" />"."\n"; } else { - echo "<p>{$this->lang['strinvalidparam']}</p>" . "\n"; - echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" />" . "\n"; + echo "<p>{$this->lang['strinvalidparam']}</p>"."\n"; + echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" />"."\n"; } if (isset($_REQUEST['table'])) { - echo '<input type="hidden" name="table" value="', htmlspecialchars($_REQUEST['table']), '" />' . "\n"; + echo '<input type="hidden" name="table" value="', htmlspecialchars($_REQUEST['table']), '" />'."\n"; } if (isset($_REQUEST['subject'])) { - echo '<input type="hidden" name="subject" value="', htmlspecialchars($_REQUEST['subject']), '" />' . "\n"; + echo '<input type="hidden" name="subject" value="', htmlspecialchars($_REQUEST['subject']), '" />'."\n"; } if (isset($_REQUEST['query'])) { - echo '<input type="hidden" name="query" value="', htmlspecialchars($_REQUEST['query']), '" />' . "\n"; + echo '<input type="hidden" name="query" value="', htmlspecialchars($_REQUEST['query']), '" />'."\n"; } if (isset($_REQUEST['count'])) { - echo '<input type="hidden" name="count" value="', htmlspecialchars($_REQUEST['count']), '" />' . "\n"; + echo '<input type="hidden" name="count" value="', htmlspecialchars($_REQUEST['count']), '" />'."\n"; } if (isset($_REQUEST['return'])) { - echo '<input type="hidden" name="return" value="', htmlspecialchars($_REQUEST['return']), '" />' . "\n"; + echo '<input type="hidden" name="return" value="', htmlspecialchars($_REQUEST['return']), '" />'."\n"; } - echo '<input type="hidden" name="page" value="', htmlspecialchars($_REQUEST['page']), '" />' . "\n"; - echo '<input type="hidden" name="sortkey" value="', htmlspecialchars($_REQUEST['sortkey']), '" />' . "\n"; - echo '<input type="hidden" name="sortdir" value="', htmlspecialchars($_REQUEST['sortdir']), '" />' . "\n"; - echo '<input type="hidden" name="strings" value="', htmlspecialchars($_REQUEST['strings']), '" />' . "\n"; - echo '<input type="hidden" name="key" value="', htmlspecialchars(urlencode(serialize($_REQUEST['key']))), '" />' . "\n"; - echo '</form>' . "\n"; + echo '<input type="hidden" name="page" value="', htmlspecialchars($_REQUEST['page']), '" />'."\n"; + echo '<input type="hidden" name="sortkey" value="', htmlspecialchars($_REQUEST['sortkey']), '" />'."\n"; + echo '<input type="hidden" name="sortdir" value="', htmlspecialchars($_REQUEST['sortdir']), '" />'."\n"; + echo '<input type="hidden" name="strings" value="', htmlspecialchars($_REQUEST['strings']), '" />'."\n"; + echo '<input type="hidden" name="key" value="', htmlspecialchars(urlencode(serialize($_REQUEST['key']))), '" />'."\n"; + echo '</form>'."\n"; } else { $status = $data->deleteRow($_POST['table'], unserialize(urldecode($_POST['key']))); if (0 == $status) { @@ -956,7 +956,7 @@ class DisplayController extends BaseController if (isset($_REQUEST['table'])) { $constraints = $data->getConstraintsWithFields($_REQUEST['table']); if ($constraints->recordCount() > 0) { - $fkey_information['common_url'] = $this->misc->getHREF('schema') . '&subject=table'; + $fkey_information['common_url'] = $this->misc->getHREF('schema').'&subject=table'; // build the FK constraints data structure while (!$constraints->EOF) { @@ -964,7 +964,7 @@ class DisplayController extends BaseController if ('f' == $constr['contype']) { if (!isset($fkey_information['byconstr'][$constr['conid']])) { $fkey_information['byconstr'][$constr['conid']] = [ - 'url_data' => 'table=' . urlencode($constr['f_table']) . '&schema=' . urlencode($constr['f_schema']), + 'url_data' => 'table='.urlencode($constr['f_table']).'&schema='.urlencode($constr['f_schema']), 'fkeys' => [], 'consrc' => $constr['consrc'], ]; @@ -1013,7 +1013,7 @@ class DisplayController extends BaseController $max_pages ); - echo '<a href="javascript:void(0);" style="display:table-cell;" class="fk_delete"><img alt="[delete]" src="' . $this->misc->icon('Delete') . '" /></a>' . "\n"; + echo '<a href="javascript:void(0);" style="display:table-cell;" class="fk_delete"><img alt="[delete]" src="'.$this->misc->icon('Delete').'" /></a>'."\n"; echo '<div style="display:table-cell;">'; if (is_object($resultset) && $resultset->recordCount() > 0) { @@ -1024,10 +1024,10 @@ class DisplayController extends BaseController echo '<table><tr>'; $this->printTableHeaderCells($resultset, false, true); echo '</tr>'; - echo '<tr class="data1">' . "\n"; + echo '<tr class="data1">'."\n"; $this->printTableRowCells($resultset, $fkinfo, true); - echo '</tr>' . "\n"; - echo '</table>' . "\n"; + echo '</tr>'."\n"; + echo '</table>'."\n"; } else { echo $this->lang['strnodata']; } @@ -1078,7 +1078,7 @@ class DisplayController extends BaseController unset($gets['page']); $url = http_build_query($gets); - $result = '<p style="text-align: center">' . "\n"; + $result = '<p style="text-align: center">'."\n"; if ($page != 1) { $result .= sprintf('<a class="pagenav" href="?%s&page=1">%s</a>%s ', $url, $lang['strfirst'], "\n"); $result .= sprintf('<a class="pagenav" href="?%s&page=%s">%s</a>%s', $url, $page - 1, $lang['strprev'], "\n"); @@ -1087,7 +1087,7 @@ class DisplayController extends BaseController list($min_page, $max_page) = $this->_getMinMaxPages($page, $pages); for ($i = $min_page; $i <= $max_page; ++$i) { - $result .= (($i === $page) ? $i : sprintf('<a class="pagenav" href="display?%s&page=%s">%s</a>', $url, $i, $i)) . "\n"; + $result .= (($i === $page) ? $i : sprintf('<a class="pagenav" href="display?%s&page=%s">%s</a>', $url, $i, $i))."\n"; } if ($page != $pages) { diff --git a/src/controllers/DomainsController.php b/src/controllers/DomainsController.php index 2379e7d6..7cdc767d 100644 --- a/src/controllers/DomainsController.php +++ b/src/controllers/DomainsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/FulltextController.php b/src/controllers/FulltextController.php index 0b69651d..ea40c589 100644 --- a/src/controllers/FulltextController.php +++ b/src/controllers/FulltextController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/FunctionsController.php b/src/controllers/FunctionsController.php index 41446c18..fd8ddb15 100644 --- a/src/controllers/FunctionsController.php +++ b/src/controllers/FunctionsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/GroupsController.php b/src/controllers/GroupsController.php index ad2f829c..903dd05e 100644 --- a/src/controllers/GroupsController.php +++ b/src/controllers/GroupsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/HelpController.php b/src/controllers/HelpController.php index db0bdcd7..3e54baac 100644 --- a/src/controllers/HelpController.php +++ b/src/controllers/HelpController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/HistoryController.php b/src/controllers/HistoryController.php index 8292de85..0c09e495 100644 --- a/src/controllers/HistoryController.php +++ b/src/controllers/HistoryController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/IndexesController.php b/src/controllers/IndexesController.php index da0d0654..93d38786 100644 --- a/src/controllers/IndexesController.php +++ b/src/controllers/IndexesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/InfoController.php b/src/controllers/InfoController.php index d2e851bb..a0c5c459 100644 --- a/src/controllers/InfoController.php +++ b/src/controllers/InfoController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/IntroController.php b/src/controllers/IntroController.php index fc52b022..77db74d3 100644 --- a/src/controllers/IntroController.php +++ b/src/controllers/IntroController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/LanguagesController.php b/src/controllers/LanguagesController.php index c21e2f13..d21680c0 100644 --- a/src/controllers/LanguagesController.php +++ b/src/controllers/LanguagesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/LoginController.php b/src/controllers/LoginController.php index 094bf700..0d7dcc97 100644 --- a/src/controllers/LoginController.php +++ b/src/controllers/LoginController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/MaterializedviewpropertiesController.php b/src/controllers/MaterializedviewpropertiesController.php index 5d203bb0..8c50483b 100644 --- a/src/controllers/MaterializedviewpropertiesController.php +++ b/src/controllers/MaterializedviewpropertiesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/MaterializedviewsController.php b/src/controllers/MaterializedviewsController.php index fb48d810..e967736d 100644 --- a/src/controllers/MaterializedviewsController.php +++ b/src/controllers/MaterializedviewsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/OpclassesController.php b/src/controllers/OpclassesController.php index 6c3157c3..c29289a7 100644 --- a/src/controllers/OpclassesController.php +++ b/src/controllers/OpclassesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/OperatorsController.php b/src/controllers/OperatorsController.php index 3ab0348b..f6aaa923 100644 --- a/src/controllers/OperatorsController.php +++ b/src/controllers/OperatorsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/PrivilegesController.php b/src/controllers/PrivilegesController.php index 02298720..8dfeb589 100644 --- a/src/controllers/PrivilegesController.php +++ b/src/controllers/PrivilegesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; @@ -67,7 +67,7 @@ class PrivilegesController extends BaseController 'table', 'column', 'view', - ])) { + ], true)) { $this->printTabs($subject, 'privileges'); } else { $this->printTitle($this->lang['strprivileges'], 'pg.privilege'); @@ -75,13 +75,14 @@ class PrivilegesController extends BaseController $this->printMsg($msg); if (!isset($data->privlist[$subject])) { - $this->container->utils->halt('No privileges defined for subject ' . $subject); + $this->container->utils->halt('No privileges defined for subject '.$subject); + return; } // Determine whether object should be ref'd by name or oid. - if (isset($_REQUEST[$subject . '_oid'])) { - $object = $_REQUEST[$subject . '_oid']; + if (isset($_REQUEST[$subject.'_oid'])) { + $object = $_REQUEST[$subject.'_oid']; } else { $object = $_REQUEST[$subject]; } @@ -191,7 +192,7 @@ class PrivilegesController extends BaseController $object = $_REQUEST[$subject]; if ('function' == $subject) { - $objectoid = $_REQUEST[$subject . '_oid']; + $objectoid = $_REQUEST[$subject.'_oid']; $urlvars = [ 'action' => 'alter', 'server' => $_REQUEST['server'], @@ -310,7 +311,7 @@ class PrivilegesController extends BaseController } $this->printMsg($msg); - echo '<form action="' . \SUBFOLDER . "/src/views/privileges\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/privileges\" method=\"post\">\n"; echo "<table>\n"; echo "<tr><th class=\"data left\">{$this->lang['strusers']}</th>\n"; echo '<td class="data1"><select name="username[]" multiple="multiple" size="', min(6, $users->recordCount()), "\">\n"; @@ -364,9 +365,9 @@ class PrivilegesController extends BaseController echo "<p><input type=\"hidden\" name=\"action\" value=\"save\" />\n"; echo '<input type="hidden" name="mode" value="', htmlspecialchars($mode), "\" />\n"; echo '<input type="hidden" name="subject" value="', htmlspecialchars($_REQUEST['subject']), "\" />\n"; - if (isset($_REQUEST[$_REQUEST['subject'] . '_oid'])) { - echo '<input type="hidden" name="', htmlspecialchars($_REQUEST['subject'] . '_oid'), - '" value="', htmlspecialchars($_REQUEST[$_REQUEST['subject'] . '_oid']), "\" />\n"; + if (isset($_REQUEST[$_REQUEST['subject'].'_oid'])) { + echo '<input type="hidden" name="', htmlspecialchars($_REQUEST['subject'].'_oid'), + '" value="', htmlspecialchars($_REQUEST[$_REQUEST['subject'].'_oid']), "\" />\n"; } echo '<input type="hidden" name="', htmlspecialchars($_REQUEST['subject']), @@ -387,8 +388,8 @@ class PrivilegesController extends BaseController echo "</form>\n"; } else { // Determine whether object should be ref'd by name or oid. - if (isset($_REQUEST[$_REQUEST['subject'] . '_oid'])) { - $object = $_REQUEST[$_REQUEST['subject'] . '_oid']; + if (isset($_REQUEST[$_REQUEST['subject'].'_oid'])) { + $object = $_REQUEST[$_REQUEST['subject'].'_oid']; } else { $object = $_REQUEST[$_REQUEST['subject']]; } diff --git a/src/controllers/RolesController.php b/src/controllers/RolesController.php index c278692e..7be4d4a1 100644 --- a/src/controllers/RolesController.php +++ b/src/controllers/RolesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/RulesController.php b/src/controllers/RulesController.php index 3e0a762c..730e0f23 100644 --- a/src/controllers/RulesController.php +++ b/src/controllers/RulesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/SchemasController.php b/src/controllers/SchemasController.php index 28000173..f5b3f57b 100644 --- a/src/controllers/SchemasController.php +++ b/src/controllers/SchemasController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/SequencesController.php b/src/controllers/SequencesController.php index f8bb6a51..cecaef9d 100644 --- a/src/controllers/SequencesController.php +++ b/src/controllers/SequencesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/ServersController.php b/src/controllers/ServersController.php index b8b79a08..6033bbb8 100644 --- a/src/controllers/ServersController.php +++ b/src/controllers/ServersController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/SqlController.php b/src/controllers/SqlController.php index 1b2b2258..5633a143 100644 --- a/src/controllers/SqlController.php +++ b/src/controllers/SqlController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/SqleditController.php b/src/controllers/SqleditController.php index d33652a5..c04fd6a1 100644 --- a/src/controllers/SqleditController.php +++ b/src/controllers/SqleditController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/TablesController.php b/src/controllers/TablesController.php index 2da866a1..85465e73 100644 --- a/src/controllers/TablesController.php +++ b/src/controllers/TablesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; @@ -155,7 +155,7 @@ class TablesController extends BaseController 'table' => [ 'title' => $this->lang['strtable'], 'field' => Decorator::field('relname'), - 'url' => \SUBFOLDER . "/redirect/table?{$this->misc->href}&", + 'url' => \SUBFOLDER."/redirect/table?{$this->misc->href}&", 'vars' => ['table' => 'relname'], ], 'owner' => [ @@ -462,7 +462,7 @@ class TablesController extends BaseController $this->printTitle($this->lang['strcreatetable'], 'pg.table.create'); $this->printMsg($msg); - echo '<form action="' . \SUBFOLDER . '/src/views/' . $this->script . '" method="post">'; + echo '<form action="'.\SUBFOLDER.'/src/views/'.$this->script.'" method="post">'; echo "\n"; echo "<table>\n"; echo "\t<tr>\n\t\t<th class=\"data left required\">{$this->lang['strname']}</th>\n"; @@ -528,8 +528,8 @@ class TablesController extends BaseController $this->printTitle($this->lang['strcreatetable'], 'pg.table.create'); $this->printMsg($msg); - echo '<script src="' . \SUBFOLDER . '/assets/js/tables.js" type="text/javascript"></script>'; - echo '<form action="' . \SUBFOLDER . "/src/views/tables\" method=\"post\">\n"; + echo '<script src="'.\SUBFOLDER.'/assets/js/tables.js" type="text/javascript"></script>'; + echo '<form action="'.\SUBFOLDER."/src/views/tables\" method=\"post\">\n"; // Output table header echo "<table>\n"; @@ -583,7 +583,7 @@ class TablesController extends BaseController foreach ($predefined_size_types as $value) { $escaped_predef_types[] = "'{$value}'"; } - echo '<script type="text/javascript">predefined_lengths = new Array(' . implode(',', $escaped_predef_types) . ");</script>\n\t</td>"; + echo '<script type="text/javascript">predefined_lengths = new Array('.implode(',', $escaped_predef_types).");</script>\n\t</td>"; } // Output array type selector @@ -596,10 +596,10 @@ class TablesController extends BaseController htmlspecialchars($_REQUEST['length'][$i]), "\" /></td>\n"; echo "\t\t<td><input type=\"checkbox\" name=\"notnull[{$i}]\"", (isset($_REQUEST['notnull'][$i])) ? ' checked="checked"' : '', " /></td>\n"; echo "\t\t<td style=\"text-align: center\"><input type=\"checkbox\" name=\"uniquekey[{$i}]\"" - . (isset($_REQUEST['uniquekey'][$i]) ? ' checked="checked"' : '') . " /></td>\n"; + .(isset($_REQUEST['uniquekey'][$i]) ? ' checked="checked"' : '')." /></td>\n"; echo "\t\t<td style=\"text-align: center\"><input type=\"checkbox\" name=\"primarykey[{$i}]\" " - . (isset($_REQUEST['primarykey'][$i]) ? ' checked="checked"' : '') - . " /></td>\n"; + .(isset($_REQUEST['primarykey'][$i]) ? ' checked="checked"' : '') + ." /></td>\n"; echo "\t\t<td><input name=\"default[{$i}]\" size=\"20\" value=\"", htmlspecialchars($_REQUEST['default'][$i]), "\" /></td>\n"; echo "\t\t<td><input name=\"colcomment[{$i}]\" size=\"40\" value=\"", @@ -730,7 +730,7 @@ class TablesController extends BaseController unset($tbltmp); - echo '<form action="' . \SUBFOLDER . "/src/views/tables\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/tables\" method=\"post\">\n"; echo "<table>\n\t<tr>\n\t\t<th class=\"data left required\">{$this->lang['strname']}</th>\n"; echo "\t\t<td class=\"data\"><input name=\"name\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"", htmlspecialchars($_REQUEST['name']), "\" /></td>\n\t</tr>\n"; echo "\t<tr>\n\t\t<th class=\"data left required\">{$this->lang['strcreatetablelikeparent']}</th>\n"; @@ -825,7 +825,7 @@ class TablesController extends BaseController $attrs = $data->getTableAttributes($_REQUEST['table']); - echo '<form action="' . \SUBFOLDER . "/src/views/tables\" method=\"post\" id=\"selectform\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/tables\" method=\"post\" id=\"selectform\">\n"; if ($attrs->recordCount() > 0) { // JavaScript for select all feature echo "<script type=\"text/javascript\">\n"; @@ -965,7 +965,7 @@ class TablesController extends BaseController $this->coalesceArr($_REQUEST, 'nulls', []); $this->coalesceArr($_REQUEST, 'format', []); - echo '<form action="' . \SUBFOLDER . "/src/views/tables\" method=\"post\" id=\"ac_form\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/tables\" method=\"post\" id=\"ac_form\">\n"; if ($attrs->recordCount() > 0) { echo "<table>\n"; @@ -1042,7 +1042,7 @@ class TablesController extends BaseController echo "<input type=\"hidden\" name=\"action\" value=\"insertrow\" />\n"; echo '<input type="hidden" name="fields" value="', htmlentities(serialize($fields), ENT_QUOTES, 'UTF-8'), "\" />\n"; - echo '<input type="hidden" name="protection_counter" value="' . $_SESSION['counter'] . "\" />\n"; + echo '<input type="hidden" name="protection_counter" value="'.$_SESSION['counter']."\" />\n"; echo '<input type="hidden" name="table" value="', htmlspecialchars($_REQUEST['table']), "\" />\n"; echo "<p><input type=\"submit\" name=\"insert\" value=\"{$this->lang['strinsert']}\" />\n"; echo "<input type=\"submit\" name=\"insertandrepeat\" accesskey=\"r\" value=\"{$this->lang['strinsertandrepeat']}\" />\n"; @@ -1106,10 +1106,10 @@ class TablesController extends BaseController $this->printTrail('schema'); $this->printTitle($this->lang['strempty'], 'pg.table.empty'); - echo '<form action="' . \SUBFOLDER . "/src/views/tables\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/tables\" method=\"post\">\n"; foreach ($_REQUEST['ma'] as $v) { $a = unserialize(htmlspecialchars_decode($v, ENT_QUOTES)); - echo '<p>' . sprintf($this->lang['strconfemptytable'], $this->misc->printVal($a['table'])); + echo '<p>'.sprintf($this->lang['strconfemptytable'], $this->misc->printVal($a['table'])); echo "</p>\n"; printf('<input type="hidden" name="table[]" value="%s" />', htmlspecialchars($a['table'])); @@ -1120,7 +1120,7 @@ class TablesController extends BaseController echo '<p>', sprintf($this->lang['strconfemptytable'], $this->misc->printVal($_REQUEST['table'])), "</p>\n"; - echo '<form action="' . \SUBFOLDER . "/src/views/tables\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/tables\" method=\"post\">\n"; echo '<input type="hidden" name="table" value="', htmlspecialchars($_REQUEST['table']), "\" />\n"; // END not mutli empty @@ -1155,7 +1155,7 @@ class TablesController extends BaseController return $this->doDefault($msg); } - return $this->doDefault($sql . '<br>' . $this->lang['strtableemptiedbad']); + return $this->doDefault($sql.'<br>'.$this->lang['strtableemptiedbad']); // END not mutli empty } // END do Empty @@ -1181,7 +1181,7 @@ class TablesController extends BaseController $this->printTrail('schema'); $this->printTitle($this->lang['strdrop'], 'pg.table.drop'); - echo '<form action="' . \SUBFOLDER . "/src/views/tables\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/tables\" method=\"post\">\n"; foreach ($_REQUEST['ma'] as $v) { $a = unserialize(htmlspecialchars_decode($v, ENT_QUOTES)); echo '<p>', sprintf($this->lang['strconfdroptable'], $this->misc->printVal($a['table'])), "</p>\n"; @@ -1193,7 +1193,7 @@ class TablesController extends BaseController echo '<p>', sprintf($this->lang['strconfdroptable'], $this->misc->printVal($_REQUEST['table'])), "</p>\n"; - echo '<form action="' . \SUBFOLDER . "/src/views/tables\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/tables\" method=\"post\">\n"; echo '<input type="hidden" name="table" value="', htmlspecialchars($_REQUEST['table']), "\" />\n"; // END if multi drop } diff --git a/src/controllers/TablespacesController.php b/src/controllers/TablespacesController.php index 871141bb..fea815c4 100644 --- a/src/controllers/TablespacesController.php +++ b/src/controllers/TablespacesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/TblpropertiesController.php b/src/controllers/TblpropertiesController.php index c593709b..7b554576 100644 --- a/src/controllers/TblpropertiesController.php +++ b/src/controllers/TblpropertiesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/TriggersController.php b/src/controllers/TriggersController.php index 9ab166de..1ebda3b9 100644 --- a/src/controllers/TriggersController.php +++ b/src/controllers/TriggersController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/TypesController.php b/src/controllers/TypesController.php index 5debf867..1410fd0c 100644 --- a/src/controllers/TypesController.php +++ b/src/controllers/TypesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/UsersController.php b/src/controllers/UsersController.php index 1988e0d6..7a7f8b96 100644 --- a/src/controllers/UsersController.php +++ b/src/controllers/UsersController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/ViewpropertiesController.php b/src/controllers/ViewpropertiesController.php index c65792f2..f7b5d71b 100644 --- a/src/controllers/ViewpropertiesController.php +++ b/src/controllers/ViewpropertiesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/ViewsController.php b/src/controllers/ViewsController.php index f0454cc2..4c6df304 100644 --- a/src/controllers/ViewsController.php +++ b/src/controllers/ViewsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Controller; diff --git a/src/database/ADOdbBase.php b/src/database/ADOdbBase.php index e18a20a7..36b19616 100644 --- a/src/database/ADOdbBase.php +++ b/src/database/ADOdbBase.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Database; @@ -605,7 +605,7 @@ class ADOdbBase $values = ") VALUES ('{$value}'"; } } - $sql = $fields . $values . ')'; + $sql = $fields.$values.')'; } // Check for failures @@ -677,7 +677,7 @@ class ADOdbBase } // Check for failures - if (!$this->conn->Execute($setClause . $whereClause)) { + if (!$this->conn->Execute($setClause.$whereClause)) { // Check for unique constraint failure if (stristr($this->conn->ErrorMsg(), 'unique')) { return -1; diff --git a/src/database/Connection.php b/src/database/Connection.php index fe354231..ae4ae658 100644 --- a/src/database/Connection.php +++ b/src/database/Connection.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres.php b/src/database/Postgres.php index e1718a1e..3dedac8f 100644 --- a/src/database/Postgres.php +++ b/src/database/Postgres.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Database; @@ -58,13 +58,13 @@ class Postgres extends ADOdbBase if (is_array($this->help_page[$help])) { $urls = []; foreach ($this->help_page[$help] as $link) { - $urls[] = $this->help_base . $link; + $urls[] = $this->help_base.$link; } return $urls; } - return $this->help_base . $this->help_page[$help]; + return $this->help_base.$this->help_page[$help]; } return null; @@ -78,7 +78,7 @@ class Postgres extends ADOdbBase public function getHelpPages() { if ($this->help_page === null || $this->help_base === null) { - $help_classname = '\PHPPgAdmin\Help\PostgresDoc' . str_replace('.', '', $this->major_version); + $help_classname = '\PHPPgAdmin\Help\PostgresDoc'.str_replace('.', '', $this->major_version); $help_class = new $help_classname($this->conf, $this->major_version); @@ -103,7 +103,7 @@ class Postgres extends ADOdbBase // Determine actions string $extra_str = ''; foreach ($extras as $k => $v) { - $extra_str .= " {$k}=\"" . htmlspecialchars($v) . '"'; + $extra_str .= " {$k}=\"".htmlspecialchars($v).'"'; } switch (substr($type, 0, 9)) { @@ -210,7 +210,7 @@ class Postgres extends ADOdbBase if (isset($server_info['hiddendbs']) && $server_info['hiddendbs']) { $hiddendbs = $server_info['hiddendbs']; - $not_in = "('" . implode("','", $hiddendbs) . "')"; + $not_in = "('".implode("','", $hiddendbs)."')"; $clause .= " AND pdb.datname NOT IN {$not_in} "; } @@ -806,7 +806,7 @@ class Postgres extends ADOdbBase } $this->fieldArrayClean($temp); - $sql = 'SET SEARCH_PATH TO "' . implode('","', $temp) . '"'; + $sql = 'SET SEARCH_PATH TO "'.implode('","', $temp).'"'; return $this->execute($sql); } @@ -989,7 +989,7 @@ class Postgres extends ADOdbBase } elseif ($typname == 'varchar') { $temp = 'character varying'; if ($typmod != -1) { - $temp .= '(' . ($typmod - $varhdrsz) . ')'; + $temp .= '('.($typmod - $varhdrsz).')'; } } elseif ($typname == 'numeric') { $temp = 'numeric'; @@ -1040,7 +1040,7 @@ class Postgres extends ADOdbBase $sql = "SELECT attnum, attname FROM pg_catalog.pg_attribute WHERE attrelid=(SELECT oid FROM pg_catalog.pg_class WHERE relname='{$table}' AND relnamespace=(SELECT oid FROM pg_catalog.pg_namespace WHERE nspname='{$c_schema}')) - AND attnum IN ('" . join("','", $atts) . "')"; + AND attnum IN ('".join("','", $atts)."')"; $rs = $this->selectSet($sql); if ($rs->RecordCount() != sizeof($atts)) { @@ -2004,13 +2004,13 @@ class Postgres extends ADOdbBase $sql = "DROP OPERATOR \"{$f_schema}\".{$opr->fields['oprname']} ("; // Quoting or formatting here??? if ($opr->fields['oprleftname'] !== null) { - $sql .= $opr->fields['oprleftname'] . ', '; + $sql .= $opr->fields['oprleftname'].', '; } else { $sql .= 'NONE, '; } if ($opr->fields['oprrightname'] !== null) { - $sql .= $opr->fields['oprrightname'] . ')'; + $sql .= $opr->fields['oprrightname'].')'; } else { $sql .= 'NONE)'; } @@ -2416,7 +2416,7 @@ class Postgres extends ADOdbBase $params[] = "autovacuum_vacuum_cost_limit='{$vaccostlimit}'"; } - $sql = $sql . implode(',', $params) . ');'; + $sql = $sql.implode(',', $params).');'; return $this->execute($sql); } @@ -2649,7 +2649,7 @@ class Postgres extends ADOdbBase } $pre = substr($line, 0, $i); $post = substr($line, $i + 2 + $finishpos, $len); - $line = $pre . ' ' . $post; + $line = $pre.' '.$post; $in_xcomment = 0; $i = 0; } @@ -2948,7 +2948,7 @@ class Postgres extends ADOdbBase } // Actually retrieve the rows, with offset and limit - $rs = $this->selectSet("SELECT * FROM ({$query}) AS sub {$orderby} LIMIT {$page_size} OFFSET " . ($page - 1) * $page_size); + $rs = $this->selectSet("SELECT * FROM ({$query}) AS sub {$orderby} LIMIT {$page_size} OFFSET ".($page - 1) * $page_size); $status = $this->endTransaction(); if ($status != 0) { $this->rollbackTransaction(); @@ -2990,7 +2990,7 @@ class Postgres extends ADOdbBase $sql = 'SELECT "'; } - $sql .= join('","', $show) . '" FROM '; + $sql .= join('","', $show).'" FROM '; } $this->fieldClean($table); @@ -3058,7 +3058,7 @@ class Postgres extends ADOdbBase $sql .= $k; } else { $this->fieldClean($k); - $sql .= '"' . $k . '"'; + $sql .= '"'.$k.'"'; } if (strtoupper($v) == 'DESC') { $sql .= ' DESC'; diff --git a/src/database/Postgres10.php b/src/database/Postgres10.php index 2ae694fb..a64e513b 100644 --- a/src/database/Postgres10.php +++ b/src/database/Postgres10.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres74.php b/src/database/Postgres74.php index b787b0eb..f3222a32 100644 --- a/src/database/Postgres74.php +++ b/src/database/Postgres74.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres80.php b/src/database/Postgres80.php index 8e3aa901..edbdcfa9 100644 --- a/src/database/Postgres80.php +++ b/src/database/Postgres80.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Database; @@ -308,11 +308,11 @@ class Postgres80 extends Postgres81 * Protected method which alter a view * SHOULDN'T BE CALLED OUTSIDE OF A TRANSACTION. * - * @param \PHPPgAdmin\ADORecordSet $vwrs The view recordSet returned by getView() - * @param string $name The new name for the view - * @param string $owner The new owner for the view - * @param string $schema The view schema - * @param string $comment The comment on the view + * @param \PHPPgAdmin\ADORecordSet $vwrs The view recordSet returned by getView() + * @param string $name The new name for the view + * @param string $owner The new owner for the view + * @param string $schema The view schema + * @param string $comment The comment on the view * * @return int 0 success, otherwise, an error code */ diff --git a/src/database/Postgres81.php b/src/database/Postgres81.php index c1fe64c1..9ce37efd 100644 --- a/src/database/Postgres81.php +++ b/src/database/Postgres81.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres82.php b/src/database/Postgres82.php index f7b85840..2c8669c1 100644 --- a/src/database/Postgres82.php +++ b/src/database/Postgres82.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres83.php b/src/database/Postgres83.php index ef4577d3..372a2764 100644 --- a/src/database/Postgres83.php +++ b/src/database/Postgres83.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Database; @@ -331,7 +331,7 @@ class Postgres83 extends Postgres84 // toggle cycle yes/no if (!is_null($cycledvalue)) { - $sql .= (!$cycledvalue ? ' NO ' : '') . ' CYCLE'; + $sql .= (!$cycledvalue ? ' NO ' : '').' CYCLE'; } if ($sql != '') { diff --git a/src/database/Postgres84.php b/src/database/Postgres84.php index 6b5e5595..0c3d0848 100644 --- a/src/database/Postgres84.php +++ b/src/database/Postgres84.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres90.php b/src/database/Postgres90.php index 257f07d7..1c61406c 100644 --- a/src/database/Postgres90.php +++ b/src/database/Postgres90.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres91.php b/src/database/Postgres91.php index cdfc8a65..ff8b7da6 100644 --- a/src/database/Postgres91.php +++ b/src/database/Postgres91.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres92.php b/src/database/Postgres92.php index 2283cd20..c72d06d4 100644 --- a/src/database/Postgres92.php +++ b/src/database/Postgres92.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres93.php b/src/database/Postgres93.php index 0c9a56fa..b37fc6ba 100644 --- a/src/database/Postgres93.php +++ b/src/database/Postgres93.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres94.php b/src/database/Postgres94.php index bb3a396a..fd5bc6da 100644 --- a/src/database/Postgres94.php +++ b/src/database/Postgres94.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres95.php b/src/database/Postgres95.php index dc9f9305..7df57794 100644 --- a/src/database/Postgres95.php +++ b/src/database/Postgres95.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres96.php b/src/database/Postgres96.php index 421d0c52..bd516666 100644 --- a/src/database/Postgres96.php +++ b/src/database/Postgres96.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Database; diff --git a/src/decorators/ActionUrlDecorator.php b/src/decorators/ActionUrlDecorator.php index 66da6043..7538cd48 100644 --- a/src/decorators/ActionUrlDecorator.php +++ b/src/decorators/ActionUrlDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/ArrayMergeDecorator.php b/src/decorators/ArrayMergeDecorator.php index 953008ff..e98036ce 100644 --- a/src/decorators/ArrayMergeDecorator.php +++ b/src/decorators/ArrayMergeDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/BranchUrlDecorator.php b/src/decorators/BranchUrlDecorator.php index c7f59103..3b54cbe3 100644 --- a/src/decorators/BranchUrlDecorator.php +++ b/src/decorators/BranchUrlDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/CallbackDecorator.php b/src/decorators/CallbackDecorator.php index ca91c995..7f3a63e9 100644 --- a/src/decorators/CallbackDecorator.php +++ b/src/decorators/CallbackDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/ConcatDecorator.php b/src/decorators/ConcatDecorator.php index cc0711b2..9215248f 100644 --- a/src/decorators/ConcatDecorator.php +++ b/src/decorators/ConcatDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/Decorator.php b/src/decorators/Decorator.php index 9840a3d8..85db7e0e 100644 --- a/src/decorators/Decorator.php +++ b/src/decorators/Decorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/FieldDecorator.php b/src/decorators/FieldDecorator.php index 6e8b619a..8b95f9f2 100644 --- a/src/decorators/FieldDecorator.php +++ b/src/decorators/FieldDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/IfEmptyDecorator.php b/src/decorators/IfEmptyDecorator.php index 0820de25..5ff78e06 100644 --- a/src/decorators/IfEmptyDecorator.php +++ b/src/decorators/IfEmptyDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/RedirectUrlDecorator.php b/src/decorators/RedirectUrlDecorator.php index 3048bf45..2b213f8e 100644 --- a/src/decorators/RedirectUrlDecorator.php +++ b/src/decorators/RedirectUrlDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/ReplaceDecorator.php b/src/decorators/ReplaceDecorator.php index ea91569b..f4ee2463 100644 --- a/src/decorators/ReplaceDecorator.php +++ b/src/decorators/ReplaceDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/UrlDecorator.php b/src/decorators/UrlDecorator.php index f82872ed..09d90dd6 100644 --- a/src/decorators/UrlDecorator.php +++ b/src/decorators/UrlDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Decorators; diff --git a/src/help/PostgresDoc10.php b/src/help/PostgresDoc10.php index 76858fbd..b049aa29 100644 --- a/src/help/PostgresDoc10.php +++ b/src/help/PostgresDoc10.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc74.php b/src/help/PostgresDoc74.php index 6ab73ac8..75780e64 100644 --- a/src/help/PostgresDoc74.php +++ b/src/help/PostgresDoc74.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc80.php b/src/help/PostgresDoc80.php index 6d5b2f81..317a0ead 100644 --- a/src/help/PostgresDoc80.php +++ b/src/help/PostgresDoc80.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc81.php b/src/help/PostgresDoc81.php index 5ff7532f..21928022 100644 --- a/src/help/PostgresDoc81.php +++ b/src/help/PostgresDoc81.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc82.php b/src/help/PostgresDoc82.php index 8a11cc6d..7c890665 100644 --- a/src/help/PostgresDoc82.php +++ b/src/help/PostgresDoc82.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc83.php b/src/help/PostgresDoc83.php index 8ec1409e..ad907bb8 100644 --- a/src/help/PostgresDoc83.php +++ b/src/help/PostgresDoc83.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc84.php b/src/help/PostgresDoc84.php index 4c57a030..4fb22f83 100644 --- a/src/help/PostgresDoc84.php +++ b/src/help/PostgresDoc84.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc90.php b/src/help/PostgresDoc90.php index d807be1c..6871ef15 100644 --- a/src/help/PostgresDoc90.php +++ b/src/help/PostgresDoc90.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc91.php b/src/help/PostgresDoc91.php index 2f95c03e..357b4a20 100644 --- a/src/help/PostgresDoc91.php +++ b/src/help/PostgresDoc91.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc92.php b/src/help/PostgresDoc92.php index e48d4fc5..cb90e1a2 100644 --- a/src/help/PostgresDoc92.php +++ b/src/help/PostgresDoc92.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc93.php b/src/help/PostgresDoc93.php index 106e77c6..69241675 100644 --- a/src/help/PostgresDoc93.php +++ b/src/help/PostgresDoc93.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc94.php b/src/help/PostgresDoc94.php index 5f0bc5e4..d54dcd01 100644 --- a/src/help/PostgresDoc94.php +++ b/src/help/PostgresDoc94.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc95.php b/src/help/PostgresDoc95.php index b49e5355..98845785 100644 --- a/src/help/PostgresDoc95.php +++ b/src/help/PostgresDoc95.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc96.php b/src/help/PostgresDoc96.php index 40d31ffd..40f916a8 100644 --- a/src/help/PostgresDoc96.php +++ b/src/help/PostgresDoc96.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Help; diff --git a/src/translations/Afrikaans.php b/src/translations/Afrikaans.php index f9d07e8e..34e70b52 100644 --- a/src/translations/Afrikaans.php +++ b/src/translations/Afrikaans.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Arabic.php b/src/translations/Arabic.php index 0d441efd..f0b941fe 100644 --- a/src/translations/Arabic.php +++ b/src/translations/Arabic.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Catalan.php b/src/translations/Catalan.php index 0a4e94ac..0f3d9937 100644 --- a/src/translations/Catalan.php +++ b/src/translations/Catalan.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/ChineseSim.php b/src/translations/ChineseSim.php index 2e67ab5f..9913d618 100644 --- a/src/translations/ChineseSim.php +++ b/src/translations/ChineseSim.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/ChineseTr.php b/src/translations/ChineseTr.php index cd9f1839..6f42f6c2 100644 --- a/src/translations/ChineseTr.php +++ b/src/translations/ChineseTr.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/ChineseUtf8ZhCn.php b/src/translations/ChineseUtf8ZhCn.php index 4bf00856..c21a29f3 100644 --- a/src/translations/ChineseUtf8ZhCn.php +++ b/src/translations/ChineseUtf8ZhCn.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/ChineseUtf8ZhTw.php b/src/translations/ChineseUtf8ZhTw.php index ce5b35b4..cb41e672 100644 --- a/src/translations/ChineseUtf8ZhTw.php +++ b/src/translations/ChineseUtf8ZhTw.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Czech.php b/src/translations/Czech.php index 8dc70bac..2a3bf06e 100644 --- a/src/translations/Czech.php +++ b/src/translations/Czech.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Danish.php b/src/translations/Danish.php index 9b247508..583bcdc9 100644 --- a/src/translations/Danish.php +++ b/src/translations/Danish.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Dutch.php b/src/translations/Dutch.php index fad346c8..81aa6225 100644 --- a/src/translations/Dutch.php +++ b/src/translations/Dutch.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/English.php b/src/translations/English.php index 9840473f..255fa9c8 100644 --- a/src/translations/English.php +++ b/src/translations/English.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/French.php b/src/translations/French.php index 5c328c22..a41ee688 100644 --- a/src/translations/French.php +++ b/src/translations/French.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Galician.php b/src/translations/Galician.php index 6a070a21..270855ec 100644 --- a/src/translations/Galician.php +++ b/src/translations/Galician.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/German.php b/src/translations/German.php index 9998afac..ddcf0552 100644 --- a/src/translations/German.php +++ b/src/translations/German.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Greek.php b/src/translations/Greek.php index 3b7c663d..7310a72a 100644 --- a/src/translations/Greek.php +++ b/src/translations/Greek.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Hebrew.php b/src/translations/Hebrew.php index 5510cef7..320bd7c8 100644 --- a/src/translations/Hebrew.php +++ b/src/translations/Hebrew.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Hungarian.php b/src/translations/Hungarian.php index fb0afe7c..ea0914e0 100644 --- a/src/translations/Hungarian.php +++ b/src/translations/Hungarian.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Italian.php b/src/translations/Italian.php index 36f6abfd..fd896423 100644 --- a/src/translations/Italian.php +++ b/src/translations/Italian.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Japanese.php b/src/translations/Japanese.php index d0570bfb..0d14ab9f 100644 --- a/src/translations/Japanese.php +++ b/src/translations/Japanese.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Lithuanian.php b/src/translations/Lithuanian.php index db06bebb..85f1a01d 100644 --- a/src/translations/Lithuanian.php +++ b/src/translations/Lithuanian.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Mongol.php b/src/translations/Mongol.php index 822e3bf1..76007704 100644 --- a/src/translations/Mongol.php +++ b/src/translations/Mongol.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Polish.php b/src/translations/Polish.php index 85d963b2..8f8803ff 100644 --- a/src/translations/Polish.php +++ b/src/translations/Polish.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/PortugueseBr.php b/src/translations/PortugueseBr.php index 4d8ecec3..869d3338 100644 --- a/src/translations/PortugueseBr.php +++ b/src/translations/PortugueseBr.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/PortuguesePt.php b/src/translations/PortuguesePt.php index a895b314..de455d9a 100644 --- a/src/translations/PortuguesePt.php +++ b/src/translations/PortuguesePt.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Romanian.php b/src/translations/Romanian.php index 5745e95b..5e89a18c 100644 --- a/src/translations/Romanian.php +++ b/src/translations/Romanian.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Russian.php b/src/translations/Russian.php index 54c1aeb4..15298681 100644 --- a/src/translations/Russian.php +++ b/src/translations/Russian.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/RussianUtf8.php b/src/translations/RussianUtf8.php index dea34e98..9e090dde 100644 --- a/src/translations/RussianUtf8.php +++ b/src/translations/RussianUtf8.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Slovak.php b/src/translations/Slovak.php index 7dcdbd0d..4b420b21 100644 --- a/src/translations/Slovak.php +++ b/src/translations/Slovak.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Spanish.php b/src/translations/Spanish.php index 8408b492..129cf8fd 100644 --- a/src/translations/Spanish.php +++ b/src/translations/Spanish.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Swedish.php b/src/translations/Swedish.php index b3620b46..f9247342 100644 --- a/src/translations/Swedish.php +++ b/src/translations/Swedish.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Turkish.php b/src/translations/Turkish.php index 9198e5e2..e38e6cf2 100644 --- a/src/translations/Turkish.php +++ b/src/translations/Turkish.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Ukrainian.php b/src/translations/Ukrainian.php index 2bf9af00..d53df553 100644 --- a/src/translations/Ukrainian.php +++ b/src/translations/Ukrainian.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\Translations; diff --git a/src/xhtml/HTMLController.php b/src/xhtml/HTMLController.php index 7e75d589..be102dbd 100644 --- a/src/xhtml/HTMLController.php +++ b/src/xhtml/HTMLController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\XHtml; @@ -110,7 +110,7 @@ class HTMLController ksort($urlvars); foreach ($urlvars as $var => $varfield) { - $url .= $sep . Decorator::value_url($var, $fields) . '=' . Decorator::value_url($varfield, $fields); + $url .= $sep.Decorator::value_url($var, $fields).'='.Decorator::value_url($varfield, $fields); $sep = '&'; } @@ -143,12 +143,12 @@ class HTMLController $tag = '<a '; foreach ($link['attr'] as $attr => $value) { if ('href' == $attr and is_array($value)) { - $tag .= 'href="' . htmlentities($this->getActionUrl($value, $link['fields'], $from)) . '" '; + $tag .= 'href="'.htmlentities($this->getActionUrl($value, $link['fields'], $from)).'" '; } else { - $tag .= htmlentities($attr) . '="' . Decorator::get_sanitized_value($value, $link['fields'], 'html') . '" '; + $tag .= htmlentities($attr).'="'.Decorator::get_sanitized_value($value, $link['fields'], 'html').'" '; } } - $tag .= '>' . Decorator::get_sanitized_value($link['content'], $link['fields'], 'html') . "</a>\n"; + $tag .= '>'.Decorator::get_sanitized_value($link['content'], $link['fields'], 'html')."</a>\n"; if ($do_print) { echo $tag; @@ -212,9 +212,9 @@ class HTMLController $htmlOut = ''; if ($bMultiple) { // If multiple select combo - $htmlOut .= "<select rel=\"printCombo\" name=\"${szName}\" id=\"${szName}\" multiple=\"multiple\" size=\"${iSize}\">" . "\n"; + $htmlOut .= "<select rel=\"printCombo\" name=\"${szName}\" id=\"${szName}\" multiple=\"multiple\" size=\"${iSize}\">"."\n"; } else { - $htmlOut .= "<select rel=\"printCombo\" class=\"select2\" name=\"${szName}\" id=\"${szName}\">" . "\n"; + $htmlOut .= "<select rel=\"printCombo\" class=\"select2\" name=\"${szName}\" id=\"${szName}\">"."\n"; } if ($bBlankEntry) { diff --git a/src/xhtml/HTMLFooterController.php b/src/xhtml/HTMLFooterController.php index 163c0c14..a682e769 100644 --- a/src/xhtml/HTMLFooterController.php +++ b/src/xhtml/HTMLFooterController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/HTMLHeaderController.php b/src/xhtml/HTMLHeaderController.php index 24bb3581..08ec0a81 100644 --- a/src/xhtml/HTMLHeaderController.php +++ b/src/xhtml/HTMLHeaderController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/HTMLNavbarController.php b/src/xhtml/HTMLNavbarController.php index 786046ea..a25c2441 100644 --- a/src/xhtml/HTMLNavbarController.php +++ b/src/xhtml/HTMLNavbarController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/HTMLTableController.php b/src/xhtml/HTMLTableController.php index b873fb8a..9c04b0b9 100644 --- a/src/xhtml/HTMLTableController.php +++ b/src/xhtml/HTMLTableController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/TreeController.php b/src/xhtml/TreeController.php index b79914f0..592d7ef6 100644 --- a/src/xhtml/TreeController.php +++ b/src/xhtml/TreeController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/XHtmlButton.php b/src/xhtml/XHtmlButton.php index c74c1692..41aa2add 100644 --- a/src/xhtml/XHtmlButton.php +++ b/src/xhtml/XHtmlButton.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/XHtmlElement.php b/src/xhtml/XHtmlElement.php index 51f1c69e..7b5b1ea9 100644 --- a/src/xhtml/XHtmlElement.php +++ b/src/xhtml/XHtmlElement.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/XHtmlOption.php b/src/xhtml/XHtmlOption.php index 90729d86..cb4626a5 100644 --- a/src/xhtml/XHtmlOption.php +++ b/src/xhtml/XHtmlOption.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/XHtmlSelect.php b/src/xhtml/XHtmlSelect.php index ee7ddaba..d2435da3 100644 --- a/src/xhtml/XHtmlSelect.php +++ b/src/xhtml/XHtmlSelect.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/XHtmlSimpleElement.php b/src/xhtml/XHtmlSimpleElement.php index a2ea7968..a987291b 100644 --- a/src/xhtml/XHtmlSimpleElement.php +++ b/src/xhtml/XHtmlSimpleElement.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace PHPPgAdmin\XHtml; diff --git a/tests/_support/AcceptanceTester.php b/tests/_support/AcceptanceTester.php index 6b39cb16..f826bd7f 100644 --- a/tests/_support/AcceptanceTester.php +++ b/tests/_support/AcceptanceTester.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ class AcceptanceTester extends \Codeception\Actor { diff --git a/tests/_support/FunctionalTester.php b/tests/_support/FunctionalTester.php index 1ed9b8b5..e018cb54 100644 --- a/tests/_support/FunctionalTester.php +++ b/tests/_support/FunctionalTester.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ class FunctionalTester extends \Codeception\Actor { diff --git a/tests/_support/Helper/Acceptance.php b/tests/_support/Helper/Acceptance.php index 13802186..3e8cc0a5 100644 --- a/tests/_support/Helper/Acceptance.php +++ b/tests/_support/Helper/Acceptance.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace Helper; diff --git a/tests/_support/Helper/Functional.php b/tests/_support/Helper/Functional.php index a467a7ab..da4c038d 100644 --- a/tests/_support/Helper/Functional.php +++ b/tests/_support/Helper/Functional.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace Helper; diff --git a/tests/_support/Helper/Unit.php b/tests/_support/Helper/Unit.php index d4be33e3..3af8f920 100644 --- a/tests/_support/Helper/Unit.php +++ b/tests/_support/Helper/Unit.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ namespace Helper; diff --git a/tests/_support/UnitTester.php b/tests/_support/UnitTester.php index fb706839..8703aff3 100644 --- a/tests/_support/UnitTester.php +++ b/tests/_support/UnitTester.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ class UnitTester extends \Codeception\Actor { diff --git a/tests/selenium/TestSuite.php b/tests/selenium/TestSuite.php index b2f77e2e..190b48c4 100644 --- a/tests/selenium/TestSuite.php +++ b/tests/selenium/TestSuite.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ chdir('../..'); /* go back to root so we can include scripts */ diff --git a/tests/selenium/src/01-roles.php b/tests/selenium/src/01-roles.php index d311967e..f22c48c4 100644 --- a/tests/selenium/src/01-roles.php +++ b/tests/selenium/src/01-roles.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ $test_title = 'Roles, Users and Groups tests'; diff --git a/tests/selenium/src/04-database.php b/tests/selenium/src/04-database.php index be484ce9..6367035a 100644 --- a/tests/selenium/src/04-database.php +++ b/tests/selenium/src/04-database.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ $test_title = 'Database tests'; diff --git a/tests/selenium/src/06-schema.php b/tests/selenium/src/06-schema.php index 836b711c..6d131cae 100644 --- a/tests/selenium/src/06-schema.php +++ b/tests/selenium/src/06-schema.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ $test_title = 'Schema tests'; diff --git a/tests/selenium/src/08-domaine.php b/tests/selenium/src/08-domaine.php index 955e3e98..1cff5fb2 100644 --- a/tests/selenium/src/08-domaine.php +++ b/tests/selenium/src/08-domaine.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ $test_title = 'Domain tests'; diff --git a/tests/selenium/src/10-table.php b/tests/selenium/src/10-table.php index 9d70148d..56d4b543 100644 --- a/tests/selenium/src/10-table.php +++ b/tests/selenium/src/10-table.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ $test_title = 'Table tests'; diff --git a/tests/selenium/src/12-admin.php b/tests/selenium/src/12-admin.php index 5aa7990f..90a981d3 100644 --- a/tests/selenium/src/12-admin.php +++ b/tests/selenium/src/12-admin.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ $test_title = 'Admin tests'; diff --git a/tests/selenium/src/15-sequence.php b/tests/selenium/src/15-sequence.php index 2a55359b..c2f97322 100644 --- a/tests/selenium/src/15-sequence.php +++ b/tests/selenium/src/15-sequence.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ $test_title = 'Sequence tests'; diff --git a/tests/selenium/src/20-constraint.php b/tests/selenium/src/20-constraint.php index e4f3581c..93e5abff 100644 --- a/tests/selenium/src/20-constraint.php +++ b/tests/selenium/src/20-constraint.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ $test_title = 'Constraint tests'; diff --git a/tests/selenium/src/25-column.php b/tests/selenium/src/25-column.php index 0b6ed7f6..13d49f82 100644 --- a/tests/selenium/src/25-column.php +++ b/tests/selenium/src/25-column.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ $test_title = 'Column tests'; diff --git a/tests/selenium/src/30-view.php b/tests/selenium/src/30-view.php index 7478d68d..c2225eb0 100644 --- a/tests/selenium/src/30-view.php +++ b/tests/selenium/src/30-view.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ $test_title = 'View tests'; diff --git a/tests/selenium/src/35-index.php b/tests/selenium/src/35-index.php index aca47cf2..21744b19 100644 --- a/tests/selenium/src/35-index.php +++ b/tests/selenium/src/35-index.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ $test_title = 'Index tests'; diff --git a/tests/selenium/src/99-cleantests.php b/tests/selenium/src/99-cleantests.php index a8cd0927..a7ac99b0 100644 --- a/tests/selenium/src/99-cleantests.php +++ b/tests/selenium/src/99-cleantests.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ $test_title = 'Cleaner tests'; diff --git a/tests/selenium/testBuilder.class.php b/tests/selenium/testBuilder.class.php index b4189669..702cba7a 100644 --- a/tests/selenium/testBuilder.class.php +++ b/tests/selenium/testBuilder.class.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 * * @param mixed $dbms * @param mixed $fn diff --git a/tests/simpletest/config.tests.php b/tests/simpletest/config.tests.php index b4c67b1a..3d20b304 100644 --- a/tests/simpletest/config.tests.php +++ b/tests/simpletest/config.tests.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ global $webUrl; global $SERVER; diff --git a/tests/simpletest/testcase/Common/CommonGroupTest.php b/tests/simpletest/testcase/Common/CommonGroupTest.php index 6d12eea9..8cd16d91 100644 --- a/tests/simpletest/testcase/Common/CommonGroupTest.php +++ b/tests/simpletest/testcase/Common/CommonGroupTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Import the test cases. diff --git a/tests/simpletest/testcase/Common/ExportTest.php b/tests/simpletest/testcase/Common/ExportTest.php index e4c2296b..6f8f1499 100644 --- a/tests/simpletest/testcase/Common/ExportTest.php +++ b/tests/simpletest/testcase/Common/ExportTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Common/ImportTest.php b/tests/simpletest/testcase/Common/ImportTest.php index 5202cd89..2289913d 100644 --- a/tests/simpletest/testcase/Common/ImportTest.php +++ b/tests/simpletest/testcase/Common/ImportTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Common/SecurityTest.php b/tests/simpletest/testcase/Common/SecurityTest.php index d1d42fcf..b09c47c0 100644 --- a/tests/simpletest/testcase/Common/SecurityTest.php +++ b/tests/simpletest/testcase/Common/SecurityTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Databases/AdminTest.php b/tests/simpletest/testcase/Databases/AdminTest.php index ea68df77..9be342ca 100644 --- a/tests/simpletest/testcase/Databases/AdminTest.php +++ b/tests/simpletest/testcase/Databases/AdminTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Databases/CastsTest.php b/tests/simpletest/testcase/Databases/CastsTest.php index 29eb3548..a1b0e14e 100644 --- a/tests/simpletest/testcase/Databases/CastsTest.php +++ b/tests/simpletest/testcase/Databases/CastsTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Databases/DatabaseGroupTest.php b/tests/simpletest/testcase/Databases/DatabaseGroupTest.php index b0955667..446f81cb 100644 --- a/tests/simpletest/testcase/Databases/DatabaseGroupTest.php +++ b/tests/simpletest/testcase/Databases/DatabaseGroupTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ require_once 'DatabaseTest.php'; require_once 'SqlTest.php'; diff --git a/tests/simpletest/testcase/Databases/DatabaseTest.php b/tests/simpletest/testcase/Databases/DatabaseTest.php index dcd7df88..b3b589ed 100644 --- a/tests/simpletest/testcase/Databases/DatabaseTest.php +++ b/tests/simpletest/testcase/Databases/DatabaseTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Databases/FindObjectsTest.php b/tests/simpletest/testcase/Databases/FindObjectsTest.php index c8b5a8e9..0b1cb8c1 100644 --- a/tests/simpletest/testcase/Databases/FindObjectsTest.php +++ b/tests/simpletest/testcase/Databases/FindObjectsTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Databases/HelpTest.php b/tests/simpletest/testcase/Databases/HelpTest.php index 618ded70..8b02dc02 100644 --- a/tests/simpletest/testcase/Databases/HelpTest.php +++ b/tests/simpletest/testcase/Databases/HelpTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Databases/LanguageTest.php b/tests/simpletest/testcase/Databases/LanguageTest.php index 3a7f3682..eec49186 100644 --- a/tests/simpletest/testcase/Databases/LanguageTest.php +++ b/tests/simpletest/testcase/Databases/LanguageTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Databases/ProcessesTest.php b/tests/simpletest/testcase/Databases/ProcessesTest.php index a435b64d..1cbf3abc 100644 --- a/tests/simpletest/testcase/Databases/ProcessesTest.php +++ b/tests/simpletest/testcase/Databases/ProcessesTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Databases/SchemaBasicTest.php b/tests/simpletest/testcase/Databases/SchemaBasicTest.php index 8cebca9c..da3ae4c7 100644 --- a/tests/simpletest/testcase/Databases/SchemaBasicTest.php +++ b/tests/simpletest/testcase/Databases/SchemaBasicTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Databases/SqlTest.php b/tests/simpletest/testcase/Databases/SqlTest.php index 300424ea..5319a432 100644 --- a/tests/simpletest/testcase/Databases/SqlTest.php +++ b/tests/simpletest/testcase/Databases/SqlTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Databases/VariablesTest.php b/tests/simpletest/testcase/Databases/VariablesTest.php index 011851d1..cf1a3f11 100644 --- a/tests/simpletest/testcase/Databases/VariablesTest.php +++ b/tests/simpletest/testcase/Databases/VariablesTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Public/SetPrecondition.php b/tests/simpletest/testcase/Public/SetPrecondition.php index afbe703c..5397f93b 100644 --- a/tests/simpletest/testcase/Public/SetPrecondition.php +++ b/tests/simpletest/testcase/Public/SetPrecondition.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ /** diff --git a/tests/simpletest/testcase/Public/common.php b/tests/simpletest/testcase/Public/common.php index 6c2558f7..93ea9e4a 100644 --- a/tests/simpletest/testcase/Public/common.php +++ b/tests/simpletest/testcase/Public/common.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // The home page of phpPgAdmin. diff --git a/tests/simpletest/testcase/Schemas/AggregateTest.php b/tests/simpletest/testcase/Schemas/AggregateTest.php index a2c9644e..ec3bce3d 100644 --- a/tests/simpletest/testcase/Schemas/AggregateTest.php +++ b/tests/simpletest/testcase/Schemas/AggregateTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Schemas/ConversionTest.php b/tests/simpletest/testcase/Schemas/ConversionTest.php index 8466095c..f66a89c3 100644 --- a/tests/simpletest/testcase/Schemas/ConversionTest.php +++ b/tests/simpletest/testcase/Schemas/ConversionTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Schemas/DomainTest.php b/tests/simpletest/testcase/Schemas/DomainTest.php index 05964b1d..c59d24d6 100644 --- a/tests/simpletest/testcase/Schemas/DomainTest.php +++ b/tests/simpletest/testcase/Schemas/DomainTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Schemas/FunctionTest.php b/tests/simpletest/testcase/Schemas/FunctionTest.php index 34c1464a..78245c97 100644 --- a/tests/simpletest/testcase/Schemas/FunctionTest.php +++ b/tests/simpletest/testcase/Schemas/FunctionTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Schemas/OpClassTest.php b/tests/simpletest/testcase/Schemas/OpClassTest.php index 10627bea..5d8b19c5 100644 --- a/tests/simpletest/testcase/Schemas/OpClassTest.php +++ b/tests/simpletest/testcase/Schemas/OpClassTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Schemas/OperatorTest.php b/tests/simpletest/testcase/Schemas/OperatorTest.php index 3dd61a90..e3f5ac80 100644 --- a/tests/simpletest/testcase/Schemas/OperatorTest.php +++ b/tests/simpletest/testcase/Schemas/OperatorTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Schemas/SchemasGroupTest.php b/tests/simpletest/testcase/Schemas/SchemasGroupTest.php index 857cd8ad..991a6a1e 100644 --- a/tests/simpletest/testcase/Schemas/SchemasGroupTest.php +++ b/tests/simpletest/testcase/Schemas/SchemasGroupTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Import the test case files. diff --git a/tests/simpletest/testcase/Schemas/SequenceTest.php b/tests/simpletest/testcase/Schemas/SequenceTest.php index 307024a8..9c450425 100644 --- a/tests/simpletest/testcase/Schemas/SequenceTest.php +++ b/tests/simpletest/testcase/Schemas/SequenceTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Schemas/TableTest.php b/tests/simpletest/testcase/Schemas/TableTest.php index 5bc11568..e89bcbe7 100644 --- a/tests/simpletest/testcase/Schemas/TableTest.php +++ b/tests/simpletest/testcase/Schemas/TableTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Schemas/TypeTest.php b/tests/simpletest/testcase/Schemas/TypeTest.php index 36c332cc..091b0300 100644 --- a/tests/simpletest/testcase/Schemas/TypeTest.php +++ b/tests/simpletest/testcase/Schemas/TypeTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Schemas/ViewTest.php b/tests/simpletest/testcase/Schemas/ViewTest.php index a07030f7..c4358b83 100644 --- a/tests/simpletest/testcase/Schemas/ViewTest.php +++ b/tests/simpletest/testcase/Schemas/ViewTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Server/GroupsTest.php b/tests/simpletest/testcase/Server/GroupsTest.php index 3ec042cc..83f1c8b4 100644 --- a/tests/simpletest/testcase/Server/GroupsTest.php +++ b/tests/simpletest/testcase/Server/GroupsTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Server/ReportsTest.php b/tests/simpletest/testcase/Server/ReportsTest.php index c31019b6..1ed24ad0 100644 --- a/tests/simpletest/testcase/Server/ReportsTest.php +++ b/tests/simpletest/testcase/Server/ReportsTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Server/ServerGroupTest.php b/tests/simpletest/testcase/Server/ServerGroupTest.php index 4e888b9e..301e9c2f 100644 --- a/tests/simpletest/testcase/Server/ServerGroupTest.php +++ b/tests/simpletest/testcase/Server/ServerGroupTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Import the test cases. diff --git a/tests/simpletest/testcase/Server/TableSpacesTest.php b/tests/simpletest/testcase/Server/TableSpacesTest.php index 95f69d7f..f8d9ecfb 100644 --- a/tests/simpletest/testcase/Server/TableSpacesTest.php +++ b/tests/simpletest/testcase/Server/TableSpacesTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Server/UsersTest.php b/tests/simpletest/testcase/Server/UsersTest.php index 531dfa98..a1982de1 100644 --- a/tests/simpletest/testcase/Server/UsersTest.php +++ b/tests/simpletest/testcase/Server/UsersTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Tables/ColumnTest.php b/tests/simpletest/testcase/Tables/ColumnTest.php index 4e286fa0..b05aacba 100644 --- a/tests/simpletest/testcase/Tables/ColumnTest.php +++ b/tests/simpletest/testcase/Tables/ColumnTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Tables/ConstraintsTest.php b/tests/simpletest/testcase/Tables/ConstraintsTest.php index 3989d55e..3cdd7c70 100644 --- a/tests/simpletest/testcase/Tables/ConstraintsTest.php +++ b/tests/simpletest/testcase/Tables/ConstraintsTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Tables/DeadlockTest.php b/tests/simpletest/testcase/Tables/DeadlockTest.php index d983f6f0..3b531ea6 100644 --- a/tests/simpletest/testcase/Tables/DeadlockTest.php +++ b/tests/simpletest/testcase/Tables/DeadlockTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Tables/IndexesTest.php b/tests/simpletest/testcase/Tables/IndexesTest.php index b235cc1a..62c140f6 100644 --- a/tests/simpletest/testcase/Tables/IndexesTest.php +++ b/tests/simpletest/testcase/Tables/IndexesTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Tables/InfoTest.php b/tests/simpletest/testcase/Tables/InfoTest.php index 061dde48..479c40d8 100644 --- a/tests/simpletest/testcase/Tables/InfoTest.php +++ b/tests/simpletest/testcase/Tables/InfoTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Tables/RulesTest.php b/tests/simpletest/testcase/Tables/RulesTest.php index 4aa17185..9765263e 100644 --- a/tests/simpletest/testcase/Tables/RulesTest.php +++ b/tests/simpletest/testcase/Tables/RulesTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/Tables/TableGroupTest.php b/tests/simpletest/testcase/Tables/TableGroupTest.php index b1a6e77b..2b68541d 100644 --- a/tests/simpletest/testcase/Tables/TableGroupTest.php +++ b/tests/simpletest/testcase/Tables/TableGroupTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ require_once 'ColumnTest.php'; require_once 'IndexesTest.php'; diff --git a/tests/simpletest/testcase/Tables/TriggersTest.php b/tests/simpletest/testcase/Tables/TriggersTest.php index 7e719661..34b2aeb1 100644 --- a/tests/simpletest/testcase/Tables/TriggersTest.php +++ b/tests/simpletest/testcase/Tables/TriggersTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Import the precondition class. diff --git a/tests/simpletest/testcase/coveragephpPgAdminMain.php b/tests/simpletest/testcase/coveragephpPgAdminMain.php index 33abf6dc..39fd71e5 100644 --- a/tests/simpletest/testcase/coveragephpPgAdminMain.php +++ b/tests/simpletest/testcase/coveragephpPgAdminMain.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ require_once 'simpletest.inc.php'; require_once 'simpletest/web_tester.php'; diff --git a/tests/simpletest/testcase/testphpPgAdminMain.php b/tests/simpletest/testcase/testphpPgAdminMain.php index 3f26b0b3..1cfd8ee2 100644 --- a/tests/simpletest/testcase/testphpPgAdminMain.php +++ b/tests/simpletest/testcase/testphpPgAdminMain.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Import necessary library files to setup the testcase. diff --git a/tests/simpletest/tests.php b/tests/simpletest/tests.php index 585e0fcf..5b559a0f 100644 --- a/tests/simpletest/tests.php +++ b/tests/simpletest/tests.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ require_once __DIR__.'/../../src/lib.inc.php'; require_once __DIR__.'/../../src/lang/english.php'; diff --git a/tests/unit/ViewTest.php b/tests/unit/ViewTest.php index df9106f8..92176444 100644 --- a/tests/unit/ViewTest.php +++ b/tests/unit/ViewTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 * * @coversNothing */ diff --git a/tests/views/acinsert.php b/tests/views/acinsert.php index bed68209..1662d4cb 100644 --- a/tests/views/acinsert.php +++ b/tests/views/acinsert.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ $do_render = false; if (!defined('BASE_PATH')) { diff --git a/tests/views/aggregates.php b/tests/views/aggregates.php index 56800446..c80ddf0b 100644 --- a/tests/views/aggregates.php +++ b/tests/views/aggregates.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Include application functions diff --git a/tests/views/alldb.php b/tests/views/alldb.php index 23984b1f..ddfb9bbd 100644 --- a/tests/views/alldb.php +++ b/tests/views/alldb.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Include application functions diff --git a/tests/views/browser.php b/tests/views/browser.php index dcc67113..2513f6bb 100644 --- a/tests/views/browser.php +++ b/tests/views/browser.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ $do_render = false; if (!defined('BASE_PATH')) { diff --git a/tests/views/casts.php b/tests/views/casts.php index e672e0c2..2f773a6a 100644 --- a/tests/views/casts.php +++ b/tests/views/casts.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Include application functions diff --git a/tests/views/colproperties.php b/tests/views/colproperties.php index 77e243ba..7613cf32 100644 --- a/tests/views/colproperties.php +++ b/tests/views/colproperties.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Include application functions diff --git a/tests/views/constraints.php b/tests/views/constraints.php index 62fa3178..4001d0cd 100644 --- a/tests/views/constraints.php +++ b/tests/views/constraints.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Include application functions diff --git a/tests/views/conversions.php b/tests/views/conversions.php index f17cb484..404b41a1 100644 --- a/tests/views/conversions.php +++ b/tests/views/conversions.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Include application functions diff --git a/tests/views/database.php b/tests/views/database.php index 59389a96..71733034 100644 --- a/tests/views/database.php +++ b/tests/views/database.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Include application functions diff --git a/tests/views/dataexport.php b/tests/views/dataexport.php index b383dc37..f6b71a78 100644 --- a/tests/views/dataexport.php +++ b/tests/views/dataexport.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ $do_render = false; if (!defined('BASE_PATH')) { diff --git a/tests/views/dataimport.php b/tests/views/dataimport.php index 3e61344d..a47c9db9 100644 --- a/tests/views/dataimport.php +++ b/tests/views/dataimport.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ $do_render = false; if (!defined('BASE_PATH')) { diff --git a/tests/views/dbexport.php b/tests/views/dbexport.php index 64b99683..1b364100 100644 --- a/tests/views/dbexport.php +++ b/tests/views/dbexport.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ $do_render = false; if (!defined('BASE_PATH')) { diff --git a/tests/views/display.php b/tests/views/display.php index 65c9914a..c9434d24 100644 --- a/tests/views/display.php +++ b/tests/views/display.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Include application functions diff --git a/tests/views/domains.php b/tests/views/domains.php index fb3594e1..fbaa2e5b 100644 --- a/tests/views/domains.php +++ b/tests/views/domains.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Include application functions diff --git a/tests/views/fulltext.php b/tests/views/fulltext.php index 14843e6e..d244e9bf 100644 --- a/tests/views/fulltext.php +++ b/tests/views/fulltext.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Include application functions diff --git a/tests/views/functions.php b/tests/views/functions.php index 9ad61f69..b13f3022 100644 --- a/tests/views/functions.php +++ b/tests/views/functions.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Include application functions diff --git a/tests/views/groups.php b/tests/views/groups.php index 5d743e97..0e3085a5 100644 --- a/tests/views/groups.php +++ b/tests/views/groups.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Include application functions diff --git a/tests/views/help.php b/tests/views/help.php index 2beddbfe..5e8c0bcd 100644 --- a/tests/views/help.php +++ b/tests/views/help.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Include application functions diff --git a/tests/views/history.php b/tests/views/history.php index 6d90ca57..66682690 100644 --- a/tests/views/history.php +++ b/tests/views/history.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Include application functions diff --git a/tests/views/indexes.php b/tests/views/indexes.php index 45dcf4e4..b27a0357 100644 --- a/tests/views/indexes.php +++ b/tests/views/indexes.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Include application functions diff --git a/tests/views/info.php b/tests/views/info.php index 0f78d093..d14ed315 100644 --- a/tests/views/info.php +++ b/tests/views/info.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Include application functions diff --git a/tests/views/intro.php b/tests/views/intro.php index adc939b6..f5393e99 100644 --- a/tests/views/intro.php +++ b/tests/views/intro.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ $do_render = false; if (!defined('BASE_PATH')) { diff --git a/tests/views/languages.php b/tests/views/languages.php index f19988d1..b8fd7ab2 100644 --- a/tests/views/languages.php +++ b/tests/views/languages.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Include application functions diff --git a/tests/views/login.php b/tests/views/login.php index 87f3f75f..78267c1a 100644 --- a/tests/views/login.php +++ b/tests/views/login.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ $do_render = false; if (!defined('BASE_PATH')) { diff --git a/tests/views/materializedviewproperties.php b/tests/views/materializedviewproperties.php index 16f90d8a..a8533cb6 100644 --- a/tests/views/materializedviewproperties.php +++ b/tests/views/materializedviewproperties.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Include application functions diff --git a/tests/views/materializedviews.php b/tests/views/materializedviews.php index a07e057e..62247103 100644 --- a/tests/views/materializedviews.php +++ b/tests/views/materializedviews.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Include application functions diff --git a/tests/views/opclasses.php b/tests/views/opclasses.php index d0b25474..839bcc96 100644 --- a/tests/views/opclasses.php +++ b/tests/views/opclasses.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Include application functions diff --git a/tests/views/operators.php b/tests/views/operators.php index a0d452d6..2d2cd3e1 100644 --- a/tests/views/operators.php +++ b/tests/views/operators.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Include application functions diff --git a/tests/views/privileges.php b/tests/views/privileges.php index 4e428966..c9b97ff3 100644 --- a/tests/views/privileges.php +++ b/tests/views/privileges.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ $do_render = false; if (!defined('BASE_PATH')) { diff --git a/tests/views/roles.php b/tests/views/roles.php index d1a02291..cb9f9ec0 100644 --- a/tests/views/roles.php +++ b/tests/views/roles.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Include application functions diff --git a/tests/views/rules.php b/tests/views/rules.php index 45eb9881..5ea6ec85 100644 --- a/tests/views/rules.php +++ b/tests/views/rules.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Include application functions diff --git a/tests/views/schemas.php b/tests/views/schemas.php index 09729e3a..770cf1bd 100644 --- a/tests/views/schemas.php +++ b/tests/views/schemas.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Include application functions diff --git a/tests/views/sequences.php b/tests/views/sequences.php index 89f7f037..5ba18d1d 100644 --- a/tests/views/sequences.php +++ b/tests/views/sequences.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Include application functions diff --git a/tests/views/servers.php b/tests/views/servers.php index bc102bd5..3d9d8038 100644 --- a/tests/views/servers.php +++ b/tests/views/servers.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ $do_render = false; if (!defined('BASE_PATH')) { diff --git a/tests/views/sql.php b/tests/views/sql.php index 7c0e6621..0a4c9d8e 100644 --- a/tests/views/sql.php +++ b/tests/views/sql.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Include application functions diff --git a/tests/views/sqledit.php b/tests/views/sqledit.php index 6dc3b6a7..7ae14348 100644 --- a/tests/views/sqledit.php +++ b/tests/views/sqledit.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Include application functions diff --git a/tests/views/tables.php b/tests/views/tables.php index 5e1dac05..4b0e4ca8 100644 --- a/tests/views/tables.php +++ b/tests/views/tables.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ $do_render = false; if (!defined('BASE_PATH')) { diff --git a/tests/views/tablespaces.php b/tests/views/tablespaces.php index 4ec90bed..aadfb693 100644 --- a/tests/views/tablespaces.php +++ b/tests/views/tablespaces.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Include application functions diff --git a/tests/views/tblproperties.php b/tests/views/tblproperties.php index 9eafb0d2..52b649e6 100644 --- a/tests/views/tblproperties.php +++ b/tests/views/tblproperties.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Include application functions diff --git a/tests/views/triggers.php b/tests/views/triggers.php index 975a7df1..3908b125 100644 --- a/tests/views/triggers.php +++ b/tests/views/triggers.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Include application functions diff --git a/tests/views/types.php b/tests/views/types.php index 70ff8d3f..14180807 100644 --- a/tests/views/types.php +++ b/tests/views/types.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Include application functions diff --git a/tests/views/users.php b/tests/views/users.php index 1ee98d38..cfb44ca0 100644 --- a/tests/views/users.php +++ b/tests/views/users.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Include application functions diff --git a/tests/views/viewproperties.php b/tests/views/viewproperties.php index b7eb7bdc..3a62d334 100644 --- a/tests/views/viewproperties.php +++ b/tests/views/viewproperties.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Include application functions diff --git a/tests/views/views.php b/tests/views/views.php index e6e0dd49..a75fd4d9 100644 --- a/tests/views/views.php +++ b/tests/views/views.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.45 + * PHPPgAdmin v6.0.0-beta.46 */ // Include application functions |