diff options
| author | Felipe Figueroa <amenadiel@gmail.com> | 2018-04-21 02:31:30 +0300 |
|---|---|---|
| committer | Felipe Figueroa <amenadiel@gmail.com> | 2018-04-21 02:31:30 +0300 |
| commit | 5b2befe8827b440c0b8724f3a2684b95b4571f26 (patch) | |
| tree | 3f926c9f8885674ae77658ba4f2262d336462742 | |
| parent | 647554b3ad9c907b5268b7197fb927258bc0a9fe (diff) | |
Tag v 6.0.0-beta.41 sets container parameters from /usr/bin/makeREQUESTv6.0.0-beta.41
163 files changed, 673 insertions, 664 deletions
diff --git a/.php_cs.cache b/.php_cs.cache index f07bca5e..5a15c4d0 100644 --- a/.php_cs.cache +++ b/.php_cs.cache @@ -1 +1 @@ -{"php":"7.1.16-1+ubuntu17.10.1+deb.sury.org+1","version":"2.11.1:v2.11.1#ad94441c17b8ef096e517acccdbf3238af8a2da8","rules":{"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":{"tags":["method","param","property","return","throws","type","var"]},"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.40"},"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\/HelperTrait.php":3962203032,"src\/classes\/ADOdbException.php":3457883256,"src\/classes\/PluginManager.php":988409110,"src\/classes\/ADORecordSet.php":1076033460,"src\/classes\/ContainerUtils.php":3033686079,"src\/classes\/Highlight.php":3079258829,"src\/classes\/ArrayRecordSet.php":2887750223,"src\/classes\/Misc.php":3062942471,"src\/controllers\/GroupsController.php":179155289,"src\/controllers\/DbexportController.php":1529283194,"src\/controllers\/RulesController.php":3706620005,"src\/controllers\/OperatorsController.php":1420653950,"src\/controllers\/AlldbController.php":3530318526,"src\/controllers\/LanguagesController.php":654361284,"src\/controllers\/TypesController.php":451918135,"src\/controllers\/SequencesController.php":74776914,"src\/controllers\/ServersController.php":2792343599,"src\/controllers\/AcinsertController.php":2022332093,"src\/controllers\/ConversionsController.php":3709429781,"src\/controllers\/SqleditController.php":547135334,"src\/controllers\/ServersTrait.php":1092815825,"src\/controllers\/BaseController.php":3058121086,"src\/controllers\/UsersController.php":216505650,"src\/controllers\/SqlController.php":3641356458,"src\/controllers\/DatabaseController.php":3581052371,"src\/controllers\/TblpropertiesController.php":2369281970,"src\/controllers\/TablespacesController.php":13045974,"src\/controllers\/DataimportController.php":3965034982,"src\/controllers\/OpclassesController.php":1629409214,"src\/controllers\/HelpController.php":1973209435,"src\/controllers\/ViewsController.php":965057498,"src\/controllers\/AdminTrait.php":3624747106,"src\/controllers\/DataexportController.php":3315380485,"src\/controllers\/ColpropertiesController.php":2749275332,"src\/controllers\/TriggersController.php":4145915968,"src\/controllers\/FunctionsController.php":3233701265,"src\/controllers\/AggregatesController.php":420036898,"src\/controllers\/SchemasController.php":4272047103,"src\/controllers\/IntroController.php":654767374,"src\/controllers\/DisplayController.php":1233802052,"src\/controllers\/ViewpropertiesController.php":909902259,"src\/controllers\/InfoController.php":1554996647,"src\/controllers\/TablesController.php":3158161748,"src\/controllers\/FulltextController.php":4254368478,"src\/controllers\/CastsController.php":1924056874,"src\/controllers\/LoginController.php":2357185754,"src\/controllers\/DomainsController.php":3638060035,"src\/controllers\/MaterializedviewsController.php":1588128265,"src\/controllers\/BrowserController.php":803876113,"src\/controllers\/HistoryController.php":3016862689,"src\/controllers\/MaterializedviewpropertiesController.php":3910354502,"src\/controllers\/PrivilegesController.php":1883524776,"src\/controllers\/ConstraintsController.php":595017000,"src\/controllers\/IndexesController.php":2298400846,"src\/controllers\/RolesController.php":2173583639,"src\/database\/Postgres84.php":1747543779,"src\/database\/Postgres81.php":3335570266,"src\/database\/Postgres92.php":509520542,"src\/database\/Postgres94.php":1254667497,"src\/database\/Postgres93.php":1743814444,"src\/database\/Postgres83.php":13373140,"src\/database\/Postgres95.php":1622510397,"src\/database\/Postgres90.php":520081901,"src\/database\/Postgres96.php":987957748,"src\/database\/Postgres74.php":3035538307,"src\/database\/Postgres80.php":953013370,"src\/database\/ADOdbBase.php":1075881617,"src\/database\/Postgres10.php":3572034473,"src\/database\/Postgres82.php":1573892112,"src\/database\/Postgres91.php":3172623792,"src\/database\/Postgres.php":2067896063,"src\/database\/Connection.php":479540924,"src\/decorators\/ReplaceDecorator.php":988982578,"src\/decorators\/Decorator.php":1647785273,"src\/decorators\/IfEmptyDecorator.php":72717974,"src\/decorators\/ActionUrlDecorator.php":3987195301,"src\/decorators\/BranchUrlDecorator.php":1021670799,"src\/decorators\/UrlDecorator.php":1266935210,"src\/decorators\/ConcatDecorator.php":3234238743,"src\/decorators\/RedirectUrlDecorator.php":1007464206,"src\/decorators\/ArrayMergeDecorator.php":1657161508,"src\/decorators\/CallbackDecorator.php":3843130209,"src\/decorators\/FieldDecorator.php":2762283859,"src\/help\/PostgresDoc96.php":4263291492,"src\/help\/PostgresDoc84.php":85936584,"src\/help\/PostgresDoc80.php":1952782664,"src\/help\/PostgresDoc81.php":1105572964,"src\/help\/PostgresDoc90.php":767495768,"src\/help\/PostgresDoc83.php":2798496466,"src\/help\/PostgresDoc92.php":2820077431,"src\/help\/PostgresDoc82.php":3381866152,"src\/help\/PostgresDoc95.php":3859157052,"src\/help\/PostgresDoc94.php":3902819778,"src\/help\/PostgresDoc91.php":964874097,"src\/help\/PostgresDoc74.php":2961066179,"src\/help\/PostgresDoc93.php":3927139560,"src\/views\/rules.php":2707342797,"src\/views\/info.php":1229185270,"src\/views\/intro.php":1516041959,"src\/views\/database.php":1346443819,"src\/views\/triggers.php":4070600817,"src\/views\/functions.php":2745807236,"src\/views\/dbexport.php":3124731095,"src\/views\/sql.php":199406665,"src\/views\/display.php":4132916687,"src\/views\/acinsert.php":3895891892,"src\/views\/languages.php":1650786269,"src\/views\/views.php":2238552095,"src\/views\/types.php":2898113602,"src\/views\/conversions.php":244027818,"src\/views\/users.php":992971942,"src\/views\/indexes.php":329282000,"src\/views\/login.php":666381666,"src\/views\/tables.php":1667771199,"src\/views\/servers.php":1514340215,"src\/views\/tblproperties.php":1991594408,"src\/views\/tablespaces.php":1756848107,"src\/views\/privileges.php":316503642,"src\/views\/casts.php":200438953,"src\/views\/sqledit.php":11589096,"src\/views\/fulltext.php":221643456,"src\/views\/browser.php":3305279576,"src\/views\/colproperties.php":1815767994,"src\/views\/roles.php":3367314627,"src\/views\/groups.php":1060210219,"src\/views\/operators.php":3464373060,"src\/views\/domains.php":3607897775,"src\/views\/materializedviews.php":2569396390,"src\/views\/history.php":1019514965,"src\/views\/alldb.php":3949904326,"src\/views\/opclasses.php":3408343266,"src\/views\/constraints.php":2756933001,"src\/views\/sequences.php":3094315686,"src\/views\/schemas.php":3490529598,"src\/views\/dataimport.php":182967834,"src\/views\/help.php":2609672693,"src\/views\/dataexport.php":1371146445,"src\/views\/viewproperties.php":3533199169,"src\/views\/aggregates.php":3979513404,"src\/views\/materializedviewproperties.php":1243239004,"src\/xhtml\/HTMLNavbarController.php":3564454430,"src\/xhtml\/HTMLTableController.php":407235860,"src\/xhtml\/HTMLController.php":3099236715,"src\/xhtml\/XHtmlOption.php":227454528,"src\/xhtml\/XHtmlButton.php":2067714248,"src\/xhtml\/XHtmlSimpleElement.php":3428888980,"src\/xhtml\/XHtmlSelect.php":4183531189,"src\/xhtml\/HTMLFooterController.php":3775838857,"src\/xhtml\/HTMLHeaderController.php":113680185,"src\/xhtml\/TreeController.php":2908954876,"src\/xhtml\/XHtmlElement.php":2272103316}}
\ No newline at end of file +{"php":"7.1.16-1+ubuntu17.10.1+deb.sury.org+1","version":"2.11.1:v2.11.1#ad94441c17b8ef096e517acccdbf3238af8a2da8","rules":{"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":{"tags":["method","param","property","return","throws","type","var"]},"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.41"},"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\/HelperTrait.php":1291101547,"src\/classes\/ADOdbException.php":3790871827,"src\/classes\/PluginManager.php":1745000932,"src\/classes\/ADORecordSet.php":1029285295,"src\/classes\/ContainerUtils.php":3393356839,"src\/classes\/Highlight.php":3123411470,"src\/classes\/ArrayRecordSet.php":248810828,"src\/classes\/Misc.php":1212832607,"src\/controllers\/GroupsController.php":4123007712,"src\/controllers\/DbexportController.php":200408227,"src\/controllers\/RulesController.php":1409742448,"src\/controllers\/OperatorsController.php":2033601865,"src\/controllers\/AlldbController.php":312560632,"src\/controllers\/LanguagesController.php":782326786,"src\/controllers\/TypesController.php":4007462859,"src\/controllers\/SequencesController.php":126970039,"src\/controllers\/ServersController.php":1677813561,"src\/controllers\/AcinsertController.php":1392082487,"src\/controllers\/ConversionsController.php":1286601633,"src\/controllers\/SqleditController.php":2448079430,"src\/controllers\/ServersTrait.php":884335431,"src\/controllers\/BaseController.php":1963012622,"src\/controllers\/UsersController.php":1223658146,"src\/controllers\/SqlController.php":3386065533,"src\/controllers\/DatabaseController.php":1014103125,"src\/controllers\/TblpropertiesController.php":3438716660,"src\/controllers\/TablespacesController.php":2780112694,"src\/controllers\/DataimportController.php":4181309534,"src\/controllers\/OpclassesController.php":3330040822,"src\/controllers\/HelpController.php":3433190022,"src\/controllers\/ViewsController.php":814900526,"src\/controllers\/AdminTrait.php":2775161719,"src\/controllers\/DataexportController.php":1061021986,"src\/controllers\/ColpropertiesController.php":31892442,"src\/controllers\/TriggersController.php":1952586278,"src\/controllers\/FunctionsController.php":1742352971,"src\/controllers\/AggregatesController.php":3233242694,"src\/controllers\/SchemasController.php":1729958728,"src\/controllers\/IntroController.php":2234290365,"src\/controllers\/DisplayController.php":4109024643,"src\/controllers\/ViewpropertiesController.php":1040677535,"src\/controllers\/InfoController.php":1469332541,"src\/controllers\/TablesController.php":3506945081,"src\/controllers\/FulltextController.php":262493614,"src\/controllers\/CastsController.php":845226912,"src\/controllers\/LoginController.php":1478377863,"src\/controllers\/DomainsController.php":1124072348,"src\/controllers\/MaterializedviewsController.php":2468212380,"src\/controllers\/BrowserController.php":2363103958,"src\/controllers\/HistoryController.php":2551220072,"src\/controllers\/MaterializedviewpropertiesController.php":812485289,"src\/controllers\/PrivilegesController.php":3545918482,"src\/controllers\/ConstraintsController.php":1190203158,"src\/controllers\/IndexesController.php":573152200,"src\/controllers\/RolesController.php":1901650554,"src\/database\/Postgres84.php":2338517631,"src\/database\/SequenceTrait.php":816779992,"src\/database\/TableTrait.php":3361581097,"src\/database\/Postgres81.php":3930429248,"src\/database\/AggregateTrait.php":2795801424,"src\/database\/Postgres92.php":3107718870,"src\/database\/Postgres94.php":2685834489,"src\/database\/FtsTrait.php":1156130953,"src\/database\/Postgres93.php":2239304626,"src\/database\/Postgres83.php":2534420452,"src\/database\/Postgres95.php":1727742848,"src\/database\/DomainTrait.php":2478360474,"src\/database\/Postgres90.php":482150987,"src\/database\/Postgres96.php":2510765918,"src\/database\/RoleTrait.php":4050209822,"src\/database\/Postgres74.php":3662143018,"src\/database\/Postgres80.php":4236373816,"src\/database\/ADOdbBase.php":1370935204,"src\/database\/Postgres10.php":1177878247,"src\/database\/Postgres82.php":1982792145,"src\/database\/Postgres91.php":1453093121,"src\/database\/IndexTrait.php":449484671,"src\/database\/Postgres.php":89766137,"src\/database\/Connection.php":3904824543,"src\/database\/ViewTrait.php":2423415960,"src\/decorators\/ReplaceDecorator.php":436935281,"src\/decorators\/Decorator.php":1750576334,"src\/decorators\/IfEmptyDecorator.php":798484164,"src\/decorators\/ActionUrlDecorator.php":3693469092,"src\/decorators\/BranchUrlDecorator.php":2369155363,"src\/decorators\/UrlDecorator.php":1010072877,"src\/decorators\/ConcatDecorator.php":2675323471,"src\/decorators\/RedirectUrlDecorator.php":3359160809,"src\/decorators\/ArrayMergeDecorator.php":1375266942,"src\/decorators\/CallbackDecorator.php":3082532239,"src\/decorators\/FieldDecorator.php":3103464517,"src\/help\/PostgresDoc96.php":808442799,"src\/help\/PostgresDoc84.php":3352007035,"src\/help\/PostgresDoc80.php":1599035434,"src\/help\/PostgresDoc81.php":1250124058,"src\/help\/PostgresDoc90.php":4016821995,"src\/help\/PostgresDoc83.php":3039203705,"src\/help\/PostgresDoc92.php":2752324615,"src\/help\/PostgresDoc82.php":2604210246,"src\/help\/PostgresDoc95.php":674587127,"src\/help\/PostgresDoc94.php":712283505,"src\/help\/PostgresDoc91.php":4216723394,"src\/help\/PostgresDoc74.php":2474393781,"src\/help\/PostgresDoc93.php":2952259198,"src\/views\/rules.php":1120741709,"src\/views\/info.php":3114562174,"src\/views\/intro.php":2908840166,"src\/views\/database.php":3263090592,"src\/views\/triggers.php":2287473932,"src\/views\/functions.php":2372355168,"src\/views\/dbexport.php":266935598,"src\/views\/sql.php":3823335641,"src\/views\/display.php":1684576324,"src\/views\/acinsert.php":91064184,"src\/views\/languages.php":412916384,"src\/views\/views.php":1971980951,"src\/views\/types.php":1549412042,"src\/views\/conversions.php":4182675231,"src\/views\/users.php":3418889774,"src\/views\/indexes.php":2174723163,"src\/views\/login.php":3498425187,"src\/views\/tables.php":2601879930,"src\/views\/servers.php":4065179368,"src\/views\/tblproperties.php":352895475,"src\/views\/tablespaces.php":3489576831,"src\/views\/privileges.php":1293691598,"src\/views\/casts.php":4212516385,"src\/views\/sqledit.php":3147538516,"src\/views\/fulltext.php":2010015677,"src\/views\/browser.php":3312803925,"src\/views\/colproperties.php":3620137383,"src\/views\/roles.php":723961923,"src\/views\/groups.php":3530200807,"src\/views\/operators.php":3028698681,"src\/views\/domains.php":1161032484,"src\/views\/materializedviews.php":1029530815,"src\/views\/history.php":2935703006,"src\/views\/alldb.php":461984590,"src\/views\/opclasses.php":2984203679,"src\/views\/constraints.php":1402366780,"src\/views\/sequences.php":3264735195,"src\/views\/schemas.php":1029067250,"src\/views\/dataimport.php":1428587150,"src\/views\/help.php":1802232701,"src\/views\/dataexport.php":242963545,"src\/views\/viewproperties.php":2972043034,"src\/views\/aggregates.php":3288103896,"src\/views\/materializedviewproperties.php":3221414114,"src\/xhtml\/HTMLNavbarController.php":3568323084,"src\/xhtml\/HTMLTableController.php":3754414179,"src\/xhtml\/HTMLController.php":3210975075,"src\/xhtml\/XHtmlOption.php":42086236,"src\/xhtml\/XHtmlButton.php":3699628496,"src\/xhtml\/XHtmlSimpleElement.php":1276992936,"src\/xhtml\/XHtmlSelect.php":1519458742,"src\/xhtml\/HTMLFooterController.php":639423830,"src\/xhtml\/HTMLHeaderController.php":4159790583,"src\/xhtml\/TreeController.php":3342513580,"src\/xhtml\/XHtmlElement.php":4108282851}}
\ No newline at end of file diff --git a/composer.json b/composer.json index 95dd2901..77513827 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "huasofoundries/phppgadmin6", - "version": "6.0.0-beta.40", + "version": "6.0.0-beta.41", "description": "Like phpmyadmin but for postgres", "type": "project", "license": "MIT", diff --git a/composer.lock b/composer.lock index 23dcf15f..3fc0ae73 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "2d4bc3507768a8b388e377c597b8fbec", + "content-hash": "03e3c4e79b75a4d8a0645204ca92fec3", "packages": [ { "name": "adodb/adodb-php", diff --git a/src/classes/ADORecordSet.php b/src/classes/ADORecordSet.php index 62127333..1baa5113 100644 --- a/src/classes/ADORecordSet.php +++ b/src/classes/ADORecordSet.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin; diff --git a/src/classes/ADOdbException.php b/src/classes/ADOdbException.php index ec200e91..de5f7b49 100644 --- a/src/classes/ADOdbException.php +++ b/src/classes/ADOdbException.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin; diff --git a/src/classes/ArrayRecordSet.php b/src/classes/ArrayRecordSet.php index 5418cf35..165cb438 100644 --- a/src/classes/ArrayRecordSet.php +++ b/src/classes/ArrayRecordSet.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin; diff --git a/src/classes/ContainerUtils.php b/src/classes/ContainerUtils.php index 3fcaf96e..4630e9d0 100644 --- a/src/classes/ContainerUtils.php +++ b/src/classes/ContainerUtils.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin; @@ -33,9 +33,9 @@ class ContainerUtils // but if server_id isn't set, then you will be redirected to intro if ($this->container->requestobj->getQueryParam('server') === null) { - $destinationurl = \SUBFOLDER . '/src/views/intro'; + $destinationurl = \SUBFOLDER.'/src/views/intro'; } else { - $destinationurl = \SUBFOLDER . '/src/views/login' . ($query_string ? '?' . $query_string : ''); + $destinationurl = \SUBFOLDER.'/src/views/login'.($query_string ? '?'.$query_string : ''); } return $destinationurl; @@ -50,7 +50,7 @@ class ContainerUtils $destinationurl = $this->getRedirectUrl(); } else { $url = $this->container->misc->getLastTabURL($subject); - $this->prtrace('getLastTabURL for ' . $subject, $url); + $this->prtrace('getLastTabURL for '.$subject, $url); // Load query vars into superglobal arrays if (isset($url['urlvars'])) { $urlvars = []; @@ -121,8 +121,6 @@ class ContainerUtils /** * Receives N parameters and sends them to the console adding where was it called from. - * - * @return null nothing */ public static function statictrace() { @@ -139,6 +137,7 @@ class ContainerUtils $tag = implode('', $btarray0); \PC::debug(func_get_args(), $tag); + return null; } @@ -155,9 +154,9 @@ class ContainerUtils $body->write('terminating script'); return $this->container->responseobj - ->withStatus(200) - ->withHeader('Content-type', 'text/html') - ->withBody($body); + ->withStatus(200) + ->withHeader('Content-type', 'text/html') + ->withBody($body); } /** diff --git a/src/classes/HelperTrait.php b/src/classes/HelperTrait.php index df0b102a..c2f2202c 100644 --- a/src/classes/HelperTrait.php +++ b/src/classes/HelperTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin; diff --git a/src/classes/Highlight.php b/src/classes/Highlight.php index 1258a2f6..e4b8be9f 100644 --- a/src/classes/Highlight.php +++ b/src/classes/Highlight.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin; diff --git a/src/classes/Misc.php b/src/classes/Misc.php index b4f3d241..076685b9 100644 --- a/src/classes/Misc.php +++ b/src/classes/Misc.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin; @@ -111,7 +111,7 @@ class Misc if (count($this->conf['servers']) === 1) { $info = $this->conf['servers'][0]; - $this->_server_id = sha1($info['host'] . ':' . $info['port'] . ':' . $info['sslmode']); + $this->_server_id = sha1($info['host'].':'.$info['port'].':'.$info['sslmode']); } elseif ($request_server !== null) { $this->_server_id = $request_server; } elseif (isset($_SESSION['webdbLogin']) && count($_SESSION['webdbLogin']) > 0) { @@ -177,7 +177,7 @@ class Misc //\PC::debug(['str' => $str, 'help' => $help], 'printHelp'); if ($help !== null) { $helplink = $this->getHelpLink($help); - $str .= '<a class="help" href="' . $helplink . '" title="' . $this->lang['strhelp'] . '" target="phppgadminhelp">' . $this->lang['strhelpicon'] . '</a>'; + $str .= '<a class="help" href="'.$helplink.'" title="'.$this->lang['strhelp'].'" target="phppgadminhelp">'.$this->lang['strhelpicon'].'</a>'; } if ($do_print) { echo $str; @@ -188,7 +188,7 @@ class Misc public function getHelpLink($help) { - return htmlspecialchars(SUBFOLDER . '/help?help=' . urlencode($help) . '&server=' . urlencode($this->getServerId())); + return htmlspecialchars(SUBFOLDER.'/help?help='.urlencode($help).'&server='.urlencode($this->getServerId())); } /** @@ -213,13 +213,13 @@ class Misc /** * Default Error Handler. This will be called with the following params. * - * @param string $dbms the RDBMS you are connecting to - * @param string $fn the name of the calling function (in uppercase) - * @param number $errno the native error number from the database - * @param string $errmsg the native error msg from the database - * @param string $p1 $fn specific parameter - see below - * @param string $p2 parameter 2 - * @param mixed $thisConnection connection + * @param string $dbms the RDBMS you are connecting to + * @param string $fn the name of the calling function (in uppercase) + * @param number $errno the native error number from the database + * @param string $errmsg the native error msg from the database + * @param string $p1 $fn specific parameter - see below + * @param string $p2 parameter 2 + * @param mixed $thisConnection connection * * @throws \PHPPgAdmin\ADOdbException * @@ -263,9 +263,9 @@ class Misc $inputparams = $p2; - $error_msg = '<p><b>strsqlerror</b><br />' . nl2br($errmsg) . '</p> <p><b>SQL:</b><br />' . nl2br($sql) . '</p> '; + $error_msg = '<p><b>strsqlerror</b><br />'.nl2br($errmsg).'</p> <p><b>SQL:</b><br />'.nl2br($sql).'</p> '; - echo '<table class="error" cellpadding="5"><tr><td>' . nl2br($error_msg) . '</td></tr></table><br />' . "\n"; + echo '<table class="error" cellpadding="5"><tr><td>'.nl2br($error_msg).'</td></tr></table><br />'."\n"; break; case 'PCONNECT': @@ -379,7 +379,7 @@ class Misc return null; } - $_type = '\PHPPgAdmin\Database\\' . $_type; + $_type = '\PHPPgAdmin\Database\\'.$_type; $this->setServerInfo('platform', $platform, $this->_server_id); $this->setServerInfo('pgVersion', $_connection->conn->pgVersion, $this->_server_id); @@ -497,7 +497,7 @@ class Misc // Otherwise, look for it in the conf file foreach ($this->conf['servers'] as $idx => $info) { - $server_string = $info['host'] . ':' . $info['port'] . ':' . $info['sslmode']; + $server_string = $info['host'].':'.$info['port'].':'.$info['sslmode']; $server_sha = sha1($server_string); if ($this->_server_id === $server_string || $this->_server_id === $server_sha) { @@ -645,13 +645,13 @@ class Misc $schema = $this->container->schema || isset($_REQUEST['schema']) ? $_REQUEST['schema'] : null; if ($server && $exclude_from !== 'server') { - $href[] = 'server=' . urlencode($server); + $href[] = 'server='.urlencode($server); } if ($database && $exclude_from !== 'database') { - $href[] = 'database=' . urlencode($database); + $href[] = 'database='.urlencode($database); } if ($schema && $exclude_from !== 'schema') { - $href[] = 'schema=' . urlencode($schema); + $href[] = 'schema='.urlencode($schema); } $this->href = htmlentities(implode('&', $href)); @@ -727,7 +727,7 @@ class Misc 'schema' => $_REQUEST['schema'], 'table' => $_REQUEST['table'], 'action' => 'confselectrows', - ]]; + ], ]; break; case 'view': @@ -814,7 +814,7 @@ class Misc 'server' => $_REQUEST['server'], 'subject' => 'plugin', 'plugin' => $_REQUEST['plugin'], - ]]; + ], ]; if (!is_null($plugin_manager->getPlugin($_REQUEST['plugin']))) { $vars['params'] = array_merge($vars['params'], $plugin_manager->getPlugin($_REQUEST['plugin'])->get_subject_params()); @@ -826,10 +826,10 @@ class Misc } if (!isset($vars['url'])) { - $vars['url'] = SUBFOLDER . '/redirect'; + $vars['url'] = SUBFOLDER.'/redirect'; } - if ($vars['url'] == SUBFOLDER . '/redirect' && isset($vars['params']['subject'])) { - $vars['url'] = SUBFOLDER . '/redirect/' . $vars['params']['subject']; + if ($vars['url'] == SUBFOLDER.'/redirect' && isset($vars['params']['subject'])) { + $vars['url'] = SUBFOLDER.'/redirect/'.$vars['params']['subject']; unset($vars['params']['subject']); } @@ -843,14 +843,14 @@ class Misc { $form = []; if ($this->container->server) { - $form[] = '<input type="hidden" name="server" value="' . htmlspecialchars($this->container->server) . '" />'; + $form[] = '<input type="hidden" name="server" value="'.htmlspecialchars($this->container->server).'" />'; } if ($this->container->database) { - $form[] = '<input type="hidden" name="database" value="' . htmlspecialchars($this->container->database) . '" />'; + $form[] = '<input type="hidden" name="database" value="'.htmlspecialchars($this->container->database).'" />'; } if ($this->container->schema) { - $form[] = '<input type="hidden" name="schema" value="' . htmlspecialchars($this->container->schema) . '" />'; + $form[] = '<input type="hidden" name="schema" value="'.htmlspecialchars($this->container->schema).'" />'; } $this->form = implode("\n", $form); @@ -907,7 +907,7 @@ class Misc $maxlen = isset($params['cliplen']) && is_integer($params['cliplen']) ? $params['cliplen'] : $this->conf['max_chars']; $ellipsis = isset($params['ellipsis']) ? $params['ellipsis'] : $lang['strellipsis']; if (strlen($str) > $maxlen) { - $str = substr($str, 0, $maxlen - 1) . $ellipsis; + $str = substr($str, 0, $maxlen - 1).$ellipsis; } } @@ -1002,23 +1002,23 @@ class Misc $limit = 10 * 1024; $mult = 1; if ($str < $limit * $mult) { - $out = $str . ' ' . $lang['strbytes']; + $out = $str.' '.$lang['strbytes']; } else { $mult *= 1024; if ($str < $limit * $mult) { - $out = floor(($str + $mult / 2) / $mult) . ' ' . $lang['strkb']; + $out = floor(($str + $mult / 2) / $mult).' '.$lang['strkb']; } else { $mult *= 1024; if ($str < $limit * $mult) { - $out = floor(($str + $mult / 2) / $mult) . ' ' . $lang['strmb']; + $out = floor(($str + $mult / 2) / $mult).' '.$lang['strmb']; } else { $mult *= 1024; if ($str < $limit * $mult) { - $out = floor(($str + $mult / 2) / $mult) . ' ' . $lang['strgb']; + $out = floor(($str + $mult / 2) / $mult).' '.$lang['strgb']; } else { $mult *= 1024; if ($str < $limit * $mult) { - $out = floor(($str + $mult / 2) / $mult) . ' ' . $lang['strtb']; + $out = floor(($str + $mult / 2) / $mult).' '.$lang['strtb']; } } } @@ -1065,7 +1065,7 @@ class Misc if ($num > 0) { $temp = "<table>\n<tr><td class=\"{$class}\" style=\"vertical-align: top; padding-right: 10px;\"><pre class=\"{$class}\">"; for ($i = 1; $i <= $num; ++$i) { - $temp .= $i . "\n"; + $temp .= $i."\n"; } $temp .= "</pre></td><td class=\"{$class}\" style=\"vertical-align: top;\">{$out}</td></tr></table>\n"; $out = $temp; @@ -1316,7 +1316,7 @@ class Misc 'icon' => 'Views', ], 'matviews' => [ - 'title' => 'M ' . $lang['strviews'], + 'title' => 'M '.$lang['strviews'], 'url' => 'materializedviews', 'urlvars' => ['subject' => 'schema'], 'help' => 'pg.matview', @@ -1948,43 +1948,43 @@ class Misc { if (is_string($icon)) { $path = "/images/themes/{$this->conf['theme']}/{$icon}"; - if (file_exists(\BASE_PATH . $path . '.png')) { - return SUBFOLDER . $path . '.png'; + if (file_exists(\BASE_PATH.$path.'.png')) { + return SUBFOLDER.$path.'.png'; } - if (file_exists(\BASE_PATH . $path . '.gif')) { - return SUBFOLDER . $path . '.gif'; + if (file_exists(\BASE_PATH.$path.'.gif')) { + return SUBFOLDER.$path.'.gif'; } - if (file_exists(\BASE_PATH . $path . '.ico')) { - return SUBFOLDER . $path . '.ico'; + if (file_exists(\BASE_PATH.$path.'.ico')) { + return SUBFOLDER.$path.'.ico'; } $path = "/images/themes/default/{$icon}"; - if (file_exists(\BASE_PATH . $path . '.png')) { - return SUBFOLDER . $path . '.png'; + if (file_exists(\BASE_PATH.$path.'.png')) { + return SUBFOLDER.$path.'.png'; } - if (file_exists(\BASE_PATH . $path . '.gif')) { - return SUBFOLDER . $path . '.gif'; + if (file_exists(\BASE_PATH.$path.'.gif')) { + return SUBFOLDER.$path.'.gif'; } - if (file_exists(\BASE_PATH . $path . '.ico')) { - return SUBFOLDER . $path . '.ico'; + if (file_exists(\BASE_PATH.$path.'.ico')) { + return SUBFOLDER.$path.'.ico'; } } else { // Icon from plugins $path = "/plugins/{$icon[0]}/images/{$icon[1]}"; - if (file_exists(\BASE_PATH . $path . '.png')) { - return SUBFOLDER . $path . '.png'; + if (file_exists(\BASE_PATH.$path.'.png')) { + return SUBFOLDER.$path.'.png'; } - if (file_exists(\BASE_PATH . $path . '.gif')) { - return SUBFOLDER . $path . '.gif'; + if (file_exists(\BASE_PATH.$path.'.gif')) { + return SUBFOLDER.$path.'.gif'; } - if (file_exists(\BASE_PATH . $path . '.ico')) { - return SUBFOLDER . $path . '.ico'; + if (file_exists(\BASE_PATH.$path.'.ico')) { + return SUBFOLDER.$path.'.ico'; } } @@ -2031,7 +2031,7 @@ class Misc if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { $data->fieldClean($str); - return '"' . $str . '"'; + return '"'.$str.'"'; } return escapeshellcmd($str); @@ -2121,38 +2121,38 @@ class Misc $fksprops['code'] .= "var constrs = {};\n"; foreach ($fksprops['byconstr'] as $conid => $props) { $fksprops['code'] .= "constrs.constr_{$conid} = {\n"; - $fksprops['code'] .= 'pattnums: [' . implode(',', $props['pattnums']) . "],\n"; - $fksprops['code'] .= "f_table:'" . addslashes(htmlentities($props['f_table'], ENT_QUOTES, 'UTF-8')) . "',\n"; - $fksprops['code'] .= "f_schema:'" . addslashes(htmlentities($props['f_schema'], ENT_QUOTES, 'UTF-8')) . "',\n"; + $fksprops['code'] .= 'pattnums: ['.implode(',', $props['pattnums'])."],\n"; + $fksprops['code'] .= "f_table:'".addslashes(htmlentities($props['f_table'], ENT_QUOTES, 'UTF-8'))."',\n"; + $fksprops['code'] .= "f_schema:'".addslashes(htmlentities($props['f_schema'], ENT_QUOTES, 'UTF-8'))."',\n"; $_ = ''; foreach ($props['pattnames'] as $n) { - $_ .= ",'" . htmlentities($n, ENT_QUOTES, 'UTF-8') . "'"; + $_ .= ",'".htmlentities($n, ENT_QUOTES, 'UTF-8')."'"; } - $fksprops['code'] .= 'pattnames: [' . substr($_, 1) . "],\n"; + $fksprops['code'] .= 'pattnames: ['.substr($_, 1)."],\n"; $_ = ''; foreach ($props['fattnames'] as $n) { - $_ .= ",'" . htmlentities($n, ENT_QUOTES, 'UTF-8') . "'"; + $_ .= ",'".htmlentities($n, ENT_QUOTES, 'UTF-8')."'"; } - $fksprops['code'] .= 'fattnames: [' . substr($_, 1) . "]\n"; + $fksprops['code'] .= 'fattnames: ['.substr($_, 1)."]\n"; $fksprops['code'] .= "};\n"; } $fksprops['code'] .= "var attrs = {};\n"; foreach ($fksprops['byfield'] as $attnum => $cstrs) { - $fksprops['code'] .= "attrs.attr_{$attnum} = [" . implode(',', $fksprops['byfield'][$attnum]) . "];\n"; + $fksprops['code'] .= "attrs.attr_{$attnum} = [".implode(',', $fksprops['byfield'][$attnum])."];\n"; } - $fksprops['code'] .= "var table='" . addslashes(htmlentities($table, ENT_QUOTES, 'UTF-8')) . "';"; - $fksprops['code'] .= "var server='" . htmlentities($_REQUEST['server'], ENT_QUOTES, 'UTF-8') . "';"; - $fksprops['code'] .= "var database='" . addslashes(htmlentities($_REQUEST['database'], ENT_QUOTES, 'UTF-8')) . "';"; - $fksprops['code'] .= "var subfolder='" . SUBFOLDER . "';"; + $fksprops['code'] .= "var table='".addslashes(htmlentities($table, ENT_QUOTES, 'UTF-8'))."';"; + $fksprops['code'] .= "var server='".htmlentities($_REQUEST['server'], ENT_QUOTES, 'UTF-8')."';"; + $fksprops['code'] .= "var database='".addslashes(htmlentities($_REQUEST['database'], ENT_QUOTES, 'UTF-8'))."';"; + $fksprops['code'] .= "var subfolder='".SUBFOLDER."';"; $fksprops['code'] .= "</script>\n"; $fksprops['code'] .= '<div id="fkbg"></div>'; $fksprops['code'] .= '<div id="fklist"></div>'; - $fksprops['code'] .= '<script src="' . SUBFOLDER . '/js/ac_insert_row.js" type="text/javascript"></script>'; + $fksprops['code'] .= '<script src="'.SUBFOLDER.'/js/ac_insert_row.js" type="text/javascript"></script>'; } else /* we have no foreign keys on this table */ { return false; diff --git a/src/classes/PluginManager.php b/src/classes/PluginManager.php index 81331d7c..841a2222 100644 --- a/src/classes/PluginManager.php +++ b/src/classes/PluginManager.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin; @@ -60,7 +60,7 @@ class PluginManager $plugins = $this->conf['plugins']; foreach ($plugins as $activated_plugin) { - $plugin_file = \BASE_PATH . '/src/plugins/' . $activated_plugin . '/plugin.php'; + $plugin_file = \BASE_PATH.'/src/plugins/'.$activated_plugin.'/plugin.php'; // Verify is the activated plugin exists if (file_exists($plugin_file)) { @@ -73,7 +73,7 @@ class PluginManager continue; } } else { - $this->halt(sprintf($this->lang['strpluginnotfound'] . "\t\n", $activated_plugin)); + $this->halt(sprintf($this->lang['strpluginnotfound']."\t\n", $activated_plugin)); } } } @@ -95,7 +95,7 @@ class PluginManager $hooks = $plugin->get_hooks(); foreach ($hooks as $hook => $functions) { if (!in_array($hook, $this->available_hooks, true)) { - $this->halt(sprintf($this->lang['strhooknotfound'] . "\t\n", $hook)); + $this->halt(sprintf($this->lang['strhooknotfound']."\t\n", $hook)); } $this->hooks[$hook][$plugin_name] = $functions; } @@ -117,8 +117,8 @@ class PluginManager /** * Execute the plugins hook functions when needed. * - * @param string $hook - The place where the function will be called - * @param array $function_args - An array reference with arguments to give to called function + * @param string $hook - The place where the function will be called + * @param array $function_args - An array reference with arguments to give to called function */ public function do_hook($hook, &$function_args) { @@ -139,13 +139,13 @@ class PluginManager * Execute a plugin's action. * * @param string $plugin_name - The plugin name - * @param string $action - action that will be executed + * @param string $action - action that will be executed */ public function do_action($plugin_name, $action) { if (!isset($this->plugins_list[$plugin_name])) { // Show an error and stop the application - $this->halt(sprintf($this->lang['strpluginnotfound'] . "\t\n", $plugin_name)); + $this->halt(sprintf($this->lang['strpluginnotfound']."\t\n", $plugin_name)); } $plugin = $this->plugins_list[$plugin_name]; @@ -154,7 +154,7 @@ class PluginManager call_user_func([$plugin, $action]); } else { // Show an error and stop the application - $this->halt(sprintf($this->lang['stractionnotfound'] . "\t\n", $action, $plugin_name)); + $this->halt(sprintf($this->lang['stractionnotfound']."\t\n", $action, $plugin_name)); } } } diff --git a/src/controllers/AcinsertController.php b/src/controllers/AcinsertController.php index b7d57d7f..0089c79a 100644 --- a/src/controllers/AcinsertController.php +++ b/src/controllers/AcinsertController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/AdminTrait.php b/src/controllers/AdminTrait.php index 64c4e20f..6f190ed7 100644 --- a/src/controllers/AdminTrait.php +++ b/src/controllers/AdminTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; @@ -38,7 +38,7 @@ trait AdminTrait $this->printTrail('schema'); $this->printTitle($this->lang['strclusterindex'], 'pg.index.cluster'); - echo '<form action="' . \SUBFOLDER . "/src/views/{$script}\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/{$script}\" method=\"post\">\n"; foreach ($_REQUEST['ma'] as $v) { $a = unserialize(htmlspecialchars_decode($v, ENT_QUOTES)); echo '<p>', sprintf($this->lang['strconfclustertable'], $this->misc->printVal($a['table'])), "</p>\n"; @@ -48,7 +48,7 @@ trait AdminTrait $this->printTrail($type); $this->printTitle($this->lang['strclusterindex'], 'pg.index.cluster'); - echo '<form action="' . \SUBFOLDER . "/src/views/{$script}\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/{$script}\" method=\"post\">\n"; if ('table' == $type) { echo '<p>', sprintf($this->lang['strconfclustertable'], $this->misc->printVal($_REQUEST['object'])), "</p>\n"; @@ -88,9 +88,9 @@ trait AdminTrait list($status, $sql) = $data->clusterIndex($_REQUEST['object']); $msg .= sprintf('%s<br />', htmlentities($sql, ENT_QUOTES, 'UTF-8')); if (0 == $status) { - $this->doAdmin($type, $msg . $this->lang['strclusteredgood']); + $this->doAdmin($type, $msg.$this->lang['strclusteredgood']); } else { - $this->doAdmin($type, $msg . $this->lang['strclusteredbad']); + $this->doAdmin($type, $msg.$this->lang['strclusteredbad']); } } } else { @@ -98,9 +98,9 @@ trait AdminTrait list($status, $sql) = $data->clusterIndex(); $msg .= sprintf('%s<br />', htmlentities($sql, ENT_QUOTES, 'UTF-8')); if (0 == $status) { - $this->doAdmin($type, $msg . $this->lang['strclusteredgood']); + $this->doAdmin($type, $msg.$this->lang['strclusteredgood']); } else { - $this->doAdmin($type, $msg . $this->lang['strclusteredbad']); + $this->doAdmin($type, $msg.$this->lang['strclusteredbad']); } } } @@ -130,7 +130,7 @@ trait AdminTrait $this->printTrail('schema'); $this->printTitle($this->lang['strreindex'], 'pg.reindex'); - echo '<form action="' . \SUBFOLDER . "/src/views/{$script}\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/{$script}\" method=\"post\">\n"; foreach ($_REQUEST['ma'] as $v) { $a = unserialize(htmlspecialchars_decode($v, ENT_QUOTES)); echo '<p>', sprintf($this->lang['strconfreindextable'], $this->misc->printVal($a['table'])), "</p>\n"; @@ -140,7 +140,7 @@ trait AdminTrait $this->printTrail($type); $this->printTitle($this->lang['strreindex'], 'pg.reindex'); - echo '<form action="' . \SUBFOLDER . "/src/views/{$script}\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/{$script}\" method=\"post\">\n"; if ('table' == $type) { echo '<p>', sprintf($this->lang['strconfreindextable'], $this->misc->printVal($_REQUEST['object'])), "</p>\n"; @@ -215,7 +215,7 @@ trait AdminTrait $this->printTrail('schema'); $this->printTitle($this->lang['stranalyze'], 'pg.analyze'); - echo '<form action="' . \SUBFOLDER . "/src/views/{$script}\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/{$script}\" method=\"post\">\n"; foreach ($_REQUEST['ma'] as $v) { $a = unserialize(htmlspecialchars_decode($v, ENT_QUOTES)); //\Kint::dump($a); @@ -226,7 +226,7 @@ trait AdminTrait $this->printTrail($type); $this->printTitle($this->lang['stranalyze'], 'pg.analyze'); - echo '<form action="' . \SUBFOLDER . "/src/views/{$script}\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/{$script}\" method=\"post\">\n"; if ('table' == $type) { echo '<p>', sprintf($this->lang['strconfanalyzetable'], $this->misc->printVal($_REQUEST['object'])), "</p>\n"; @@ -295,7 +295,7 @@ trait AdminTrait $this->printTrail('schema'); $this->printTitle($this->lang['strvacuum'], 'pg.vacuum'); - echo '<form action="' . \SUBFOLDER . "/src/views/{$script}\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/{$script}\" method=\"post\">\n"; foreach ($_REQUEST['ma'] as $v) { $a = unserialize(htmlspecialchars_decode($v, ENT_QUOTES)); echo '<p>', sprintf($this->lang['strconfvacuumtable'], $this->misc->printVal($a['table'])), "</p>\n"; @@ -306,7 +306,7 @@ trait AdminTrait $this->printTrail($type); $this->printTitle($this->lang['strvacuum'], 'pg.vacuum'); - echo '<form action="' . \SUBFOLDER . "/src/views/{$script}\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/{$script}\" method=\"post\">\n"; if ('table' == $type) { echo '<p>', sprintf($this->lang['strconfvacuumtable'], $this->misc->printVal($_REQUEST['object'])), "</p>\n"; @@ -420,7 +420,7 @@ trait AdminTrait $old_val['autovacuum_vacuum_cost_limit'] = ''; } - echo '<form action="' . \SUBFOLDER . "/src/views/{$script}\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/{$script}\" method=\"post\">\n"; echo $this->misc->form; echo "<input type=\"hidden\" name=\"action\" value=\"editautovac\" />\n"; echo '<input type="hidden" name="table" value="', htmlspecialchars($_REQUEST['table']), "\" />\n"; @@ -512,7 +512,7 @@ trait AdminTrait echo "<input type=\"submit\" name=\"yes\" value=\"{$this->lang['stryes']}\" />\n"; echo "</form>\n"; - echo '<form action="' . \SUBFOLDER . "/src/views/{$script}\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/{$script}\" method=\"post\">\n"; echo "<input type=\"hidden\" name=\"action\" value=\"admin\" />\n"; echo '<input type="hidden" name="table" value="', htmlspecialchars($_REQUEST['table']), "\" />\n"; echo $this->misc->form; @@ -558,7 +558,7 @@ trait AdminTrait echo "<table style=\"width: 50%\">\n"; echo "<tr>\n"; echo '<th class="data">'; - $this->misc->printHelp($this->lang['strvacuum'], 'pg.admin.vacuum') . "</th>\n"; + $this->misc->printHelp($this->lang['strvacuum'], 'pg.admin.vacuum')."</th>\n"; echo '</th>'; echo '<th class="data">'; $this->misc->printHelp($this->lang['stranalyze'], 'pg.admin.analyze'); @@ -576,7 +576,7 @@ trait AdminTrait // Vacuum echo "<tr class=\"row1\">\n"; echo "<td style=\"text-align: center; vertical-align: bottom\">\n"; - echo '<form action="' . \SUBFOLDER . "/src/views/{$script}\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/{$script}\" method=\"post\">\n"; echo "<p><input type=\"hidden\" name=\"action\" value=\"confirm_vacuum\" />\n"; echo $this->misc->form; @@ -590,7 +590,7 @@ trait AdminTrait // Analyze echo "<td style=\"text-align: center; vertical-align: bottom\">\n"; - echo '<form action="' . \SUBFOLDER . "/src/views/{$script}\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/{$script}\" method=\"post\">\n"; echo "<p><input type=\"hidden\" name=\"action\" value=\"confirm_analyze\" />\n"; echo $this->misc->form; if ('table' == $type) { @@ -605,7 +605,7 @@ trait AdminTrait if ($data->hasRecluster()) { $disabled = ''; echo "<td style=\"text-align: center; vertical-align: bottom\">\n"; - echo '<form action="' . \SUBFOLDER . "/src/views/{$script}\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/{$script}\" method=\"post\">\n"; echo $this->misc->form; if ('table' == $type) { echo '<input type="hidden" name="table" value="', htmlspecialchars($_REQUEST['object']), "\" />\n"; @@ -623,7 +623,7 @@ trait AdminTrait // Reindex echo "<td style=\"text-align: center; vertical-align: bottom\">\n"; - echo '<form action="' . \SUBFOLDER . "/src/views/{$script}\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/{$script}\" method=\"post\">\n"; echo "<p><input type=\"hidden\" name=\"action\" value=\"confirm_reindex\" />\n"; echo $this->misc->form; if ('table' == $type) { @@ -648,12 +648,12 @@ trait AdminTrait } echo "<br /><br /><h2>{$this->lang['strvacuumpertable']}</h2>"; - echo '<p>' . (('on' == $defaults['autovacuum']) ? $this->lang['strturnedon'] : $this->lang['strturnedoff']) . '</p>'; + echo '<p>'.(('on' == $defaults['autovacuum']) ? $this->lang['strturnedon'] : $this->lang['strturnedoff']).'</p>'; echo "<p class=\"message\">{$this->lang['strnotdefaultinred']}</p>"; $enlight = function ($f, $p) { if (isset($f[$p[0]]) and ($f[$p[0]] != $p[1])) { - return '<span style="color:#F33;font-weight:bold">' . htmlspecialchars($f[$p[0]]) . '</span>'; + return '<span style="color:#F33;font-weight:bold">'.htmlspecialchars($f[$p[0]]).'</span>'; } return htmlspecialchars($p[1]); @@ -663,13 +663,13 @@ trait AdminTrait 'namespace' => [ 'title' => $this->lang['strschema'], 'field' => Decorator::field('nspname'), - 'url' => \SUBFOLDER . "/redirect/schema?{$this->misc->href}&", + 'url' => \SUBFOLDER."/redirect/schema?{$this->misc->href}&", 'vars' => ['schema' => 'nspname'], ], 'relname' => [ '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', 'schema' => 'nspname'], ], 'autovacuum_enabled' => [ @@ -756,7 +756,7 @@ trait AdminTrait if (('table' == $type) and (0 == $autovac->recordCount())) { echo '<br />'; - echo '<a href="' . \SUBFOLDER . "/src/views/tables?action=confeditautovac&{$this->misc->href}&table="; + echo '<a href="'.\SUBFOLDER."/src/views/tables?action=confeditautovac&{$this->misc->href}&table="; echo htmlspecialchars($_REQUEST['table']); echo "\">{$this->lang['straddvacuumtable']}</a>"; } diff --git a/src/controllers/AggregatesController.php b/src/controllers/AggregatesController.php index 70e7245d..78064ae1 100644 --- a/src/controllers/AggregatesController.php +++ b/src/controllers/AggregatesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/AlldbController.php b/src/controllers/AlldbController.php index 443d068a..a6b56b60 100644 --- a/src/controllers/AlldbController.php +++ b/src/controllers/AlldbController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; @@ -108,7 +108,7 @@ class AlldbController extends BaseController 'database' => [ 'title' => $this->lang['strdatabase'], 'field' => Decorator::field('datname'), - 'url' => \SUBFOLDER . "/redirect/database?{$href}&", + 'url' => \SUBFOLDER."/redirect/database?{$href}&", 'vars' => ['database' => 'datname'], ], 'owner' => [ @@ -262,7 +262,7 @@ class AlldbController extends BaseController $this->printTrail('database'); $this->printTitle($this->lang['stralter'], 'pg.database.alter'); - echo '<form action="' . \SUBFOLDER . "/src/views/alldb\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/alldb\" method=\"post\">\n"; echo "<table>\n"; echo "<tr><th class=\"data left required\">{$this->lang['strname']}</th>\n"; echo '<td class="data1">'; @@ -337,7 +337,7 @@ class AlldbController extends BaseController $this->printTrail('database'); $this->printTitle($this->lang['strdrop'], 'pg.database.drop'); - echo '<form action="' . \SUBFOLDER . "/src/views/alldb\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/alldb\" method=\"post\">\n"; //If multi drop if (isset($_REQUEST['ma'])) { foreach ($_REQUEST['ma'] as $v) { @@ -429,7 +429,7 @@ class AlldbController extends BaseController $tablespaces = $data->getTablespaces(); } - echo '<form action="' . \SUBFOLDER . "/src/views/alldb\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/alldb\" method=\"post\">\n"; echo "<table>\n"; echo "\t<tr>\n\t\t<th class=\"data left required\">{$this->lang['strname']}</th>\n"; echo "\t\t<td class=\"data1\"><input name=\"formName\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"", @@ -583,7 +583,7 @@ class AlldbController extends BaseController $this->printTabs('server', '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\">{$this->lang['stroptions']}</th></tr>\n"; // Data only diff --git a/src/controllers/BaseController.php b/src/controllers/BaseController.php index 3677cb07..3ab6d329 100644 --- a/src/controllers/BaseController.php +++ b/src/controllers/BaseController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/BrowserController.php b/src/controllers/BrowserController.php index d4a6c9d0..f5384b27 100644 --- a/src/controllers/BrowserController.php +++ b/src/controllers/BrowserController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/CastsController.php b/src/controllers/CastsController.php index 13b920c8..49d798cb 100644 --- a/src/controllers/CastsController.php +++ b/src/controllers/CastsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; @@ -53,13 +53,10 @@ class CastsController extends BaseController switch ($val) { case 'e': return $lang['strno']; - case 'a': return $lang['strinassignment']; - default: return $lang['stryes']; - } }; diff --git a/src/controllers/ColpropertiesController.php b/src/controllers/ColpropertiesController.php index c1a1d2ee..0fee6a9e 100644 --- a/src/controllers/ColpropertiesController.php +++ b/src/controllers/ColpropertiesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/ConstraintsController.php b/src/controllers/ConstraintsController.php index 1ee88e97..55a5dfde 100644 --- a/src/controllers/ConstraintsController.php +++ b/src/controllers/ConstraintsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/ConversionsController.php b/src/controllers/ConversionsController.php index 7a611e53..a159eb82 100644 --- a/src/controllers/ConversionsController.php +++ b/src/controllers/ConversionsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/DatabaseController.php b/src/controllers/DatabaseController.php index 4ca03ce0..2d774b59 100644 --- a/src/controllers/DatabaseController.php +++ b/src/controllers/DatabaseController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ 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 . '/js/database.js" type="text/javascript"></script>'; + $scripts .= '<script src="'.\SUBFOLDER.'/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"; } @@ -188,7 +188,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 @@ -326,20 +326,20 @@ class DatabaseController extends BaseController switch ($curr) { case 'SCHEMA': - echo '<li><a href="' . \SUBFOLDER . "/redirect/schema?{$this->misc->href}&schema=", $this->misc->printVal($rs->fields['name']), '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), "</a></li>\n"; + echo '<li><a href="'.\SUBFOLDER."/redirect/schema?{$this->misc->href}&schema=", $this->misc->printVal($rs->fields['name']), '">', $this->_highlight($this->misc->printVal($rs->fields['name']), $_REQUEST['term']), "</a></li>\n"; break; case 'TABLE': echo '<li>'; echo "<a href=\"tables?subject=schema&{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '">', $this->misc->printVal($rs->fields['schemaname']), '</a>.'; - echo '<a href="' . \SUBFOLDER . "/redirect/table?{$this->misc->href}&schema=", urlencode($rs->fields['schemaname']), '&table=', + 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; @@ -352,7 +352,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']), '">', @@ -361,7 +361,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']), '">', @@ -370,15 +370,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"; @@ -392,24 +392,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"; @@ -463,7 +463,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"; @@ -493,7 +493,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 @@ -578,7 +578,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">'; @@ -762,7 +762,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(); @@ -784,7 +784,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 f608d2b9..86dab747 100644 --- a/src/controllers/DataexportController.php +++ b/src/controllers/DataexportController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/DataimportController.php b/src/controllers/DataimportController.php index 985a2127..57c4dae0 100644 --- a/src/controllers/DataimportController.php +++ b/src/controllers/DataimportController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/DbexportController.php b/src/controllers/DbexportController.php index 325a480c..aeac9e0e 100644 --- a/src/controllers/DbexportController.php +++ b/src/controllers/DbexportController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/DisplayController.php b/src/controllers/DisplayController.php index 1e68c4d0..ac1e9625 100644 --- a/src/controllers/DisplayController.php +++ b/src/controllers/DisplayController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/DomainsController.php b/src/controllers/DomainsController.php index 2dc8bada..9aee924e 100644 --- a/src/controllers/DomainsController.php +++ b/src/controllers/DomainsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/FulltextController.php b/src/controllers/FulltextController.php index 146d394b..3598acaf 100644 --- a/src/controllers/FulltextController.php +++ b/src/controllers/FulltextController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/FunctionsController.php b/src/controllers/FunctionsController.php index 414e9f21..fc4eade3 100644 --- a/src/controllers/FunctionsController.php +++ b/src/controllers/FunctionsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/GroupsController.php b/src/controllers/GroupsController.php index 3e15518e..d286a43d 100644 --- a/src/controllers/GroupsController.php +++ b/src/controllers/GroupsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; @@ -164,6 +164,7 @@ class GroupsController extends BaseController * Show confirmation of drop user from group and perform actual drop. * * @param mixed $confirm + * @param mixed $msg */ public function doDropMember($confirm, $msg = '') { @@ -179,7 +180,7 @@ class GroupsController extends BaseController echo '<p>', sprintf($this->lang['strconfdropmember'], $this->misc->printVal($_REQUEST['user']), $this->misc->printVal($_REQUEST['group'])), "</p>\n"; - echo '<form action="' . \SUBFOLDER . "/src/views/groups\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/groups\" method=\"post\">\n"; echo $this->misc->form; echo "<input type=\"hidden\" name=\"action\" value=\"drop_member\" />\n"; echo '<input type="hidden" name="group" value="', htmlspecialchars($_REQUEST['group']), "\" />\n"; @@ -248,7 +249,7 @@ class GroupsController extends BaseController } // Display form for adding a user to the group - echo '<form action="' . \SUBFOLDER . "/src/views/groups\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/groups\" method=\"post\">\n"; echo '<select name="user">'; while (!$users->EOF) { $uname = $this->misc->printVal($users->fields['usename']); @@ -291,7 +292,7 @@ class GroupsController extends BaseController echo '<p>', sprintf($this->lang['strconfdropgroup'], $this->misc->printVal($_REQUEST['group'])), "</p>\n"; - echo '<form action="' . \SUBFOLDER . "/src/views/groups\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/groups\" method=\"post\">\n"; echo $this->misc->form; echo "<input type=\"hidden\" name=\"action\" value=\"drop\" />\n"; echo '<input type="hidden" name="group" value="', htmlspecialchars($_REQUEST['group']), "\" />\n"; diff --git a/src/controllers/HelpController.php b/src/controllers/HelpController.php index a2752526..b376882b 100644 --- a/src/controllers/HelpController.php +++ b/src/controllers/HelpController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/HistoryController.php b/src/controllers/HistoryController.php index 288ab09a..6c0379c8 100644 --- a/src/controllers/HistoryController.php +++ b/src/controllers/HistoryController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/IndexesController.php b/src/controllers/IndexesController.php index 7f2aa41f..4e3c897a 100644 --- a/src/controllers/IndexesController.php +++ b/src/controllers/IndexesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; @@ -26,7 +26,7 @@ class IndexesController extends BaseController return $this->doTree(); } - $this->printHeader($this->lang['strindexes'], '<script src="' . \SUBFOLDER . '/js/indexes.js" type="text/javascript"></script>'); + $this->printHeader($this->lang['strindexes'], '<script src="'.\SUBFOLDER.'/js/indexes.js" type="text/javascript"></script>'); $onloadInit = false; if ('create_index' == $this->action || 'save_create_index' == $this->action) { @@ -144,7 +144,7 @@ class IndexesController extends BaseController ], ]; - $url = \SUBFOLDER . '/src/views/indexes'; + $url = \SUBFOLDER.'/src/views/indexes'; $actions = [ 'cluster' => [ @@ -272,18 +272,18 @@ class IndexesController extends BaseController $this->printTabs($subject, 'indexes'); $this->printTitle($this->lang['strclusterindex'], 'pg.index.cluster'); - echo '<p>', sprintf($this->lang['strconfcluster'], $this->misc->printVal($_REQUEST['index'])), '</p>' . "\n"; + echo '<p>', sprintf($this->lang['strconfcluster'], $this->misc->printVal($_REQUEST['index'])), '</p>'."\n"; - echo '<form action="' . \SUBFOLDER . '/src/views/indexes" method="post">' . "\n"; + echo '<form action="'.\SUBFOLDER.'/src/views/indexes" method="post">'."\n"; echo '<p><input type="checkbox" id="analyze" name="analyze"', (isset($_REQUEST['analyze']) ? ' checked="checked"' : ''), ' />'; - echo "<label for=\"analyze\">{$this->lang['stranalyze']}</label></p>" . "\n"; - echo '<input type="hidden" name="action" value="cluster_index" />' . "\n"; - echo '<input type="hidden" name="table" value="', htmlspecialchars($object), '" />' . "\n"; - echo '<input type="hidden" name="index" value="', htmlspecialchars($_REQUEST['index']), '" />' . "\n"; + echo "<label for=\"analyze\">{$this->lang['stranalyze']}</label></p>"."\n"; + echo '<input type="hidden" name="action" value="cluster_index" />'."\n"; + echo '<input type="hidden" name="table" value="', htmlspecialchars($object), '" />'."\n"; + echo '<input type="hidden" name="index" value="', htmlspecialchars($_REQUEST['index']), '" />'."\n"; echo $this->misc->form; - echo "<input type=\"submit\" name=\"cluster\" value=\"{$this->lang['strclusterindex']}\" />" . "\n"; - echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" />" . "\n"; - echo '</form>' . "\n"; + echo "<input type=\"submit\" name=\"cluster\" value=\"{$this->lang['strclusterindex']}\" />"."\n"; + echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" />"."\n"; + echo '</form>'."\n"; } else { set_time_limit(0); list($status, $sql) = $data->clusterIndex($object, $_POST['index']); @@ -291,15 +291,15 @@ class IndexesController extends BaseController if (isset($_POST['analyze'])) { $status = $data->analyzeDB($object); if (0 == $status) { - $this->doDefault($sql . '<br>' . $this->lang['strclusteredgood'] . ' ' . $this->lang['stranalyzegood']); + $this->doDefault($sql.'<br>'.$this->lang['strclusteredgood'].' '.$this->lang['stranalyzegood']); } else { - $this->doDefault($sql . '<br>' . $this->lang['stranalyzebad']); + $this->doDefault($sql.'<br>'.$this->lang['stranalyzebad']); } } else { - $this->doDefault($sql . '<br>' . $this->lang['strclusteredgood']); + $this->doDefault($sql.'<br>'.$this->lang['strclusteredgood']); } } else { - $this->doDefault($sql . '<br>' . $this->lang['strclusteredbad']); + $this->doDefault($sql.'<br>'.$this->lang['strclusteredbad']); } } } @@ -368,61 +368,61 @@ class IndexesController extends BaseController $buttonRemove->set_attribute('onclick', 'buttonPressed(this);'); $buttonRemove->set_attribute('type', 'button'); - echo '<form onsubmit="doSelectAll();" name="formIndex" action="indexes" method="post">' . "\n"; + echo '<form onsubmit="doSelectAll();" name="formIndex" action="indexes" method="post">'."\n"; - echo '<table>' . "\n"; - echo '<tr><th class="data required" colspan="3">' . $this->lang['strindexname'] . '</th></tr>'; + echo '<table>'."\n"; + echo '<tr><th class="data required" colspan="3">'.$this->lang['strindexname'].'</th></tr>'; echo '<tr>'; echo '<td class="data1" colspan="3">'; - echo 'Index name cannot exceed ' . $data->_maxNameLen . ' characters<br>'; - echo '<input type="text" name="formIndexName" size="32" placeholder="Index Name" maxlength="' . - $data->_maxNameLen . '" value="' . - htmlspecialchars($formIndexName) . '" />'; + echo 'Index name cannot exceed '.$data->_maxNameLen.' characters<br>'; + echo '<input type="text" name="formIndexName" size="32" placeholder="Index Name" maxlength="'. + $data->_maxNameLen.'" value="'. + htmlspecialchars($formIndexName).'" />'; echo '</td>'; echo '</tr>'; echo '<tr>'; - echo '<th class="data">' . $this->lang['strtablecolumnlist'] . '</th><th class="data"> </th>'; - echo '<th class="data required">' . $this->lang['strindexcolumnlist'] . '</th>'; - echo '</tr>' . "\n"; + echo '<th class="data">'.$this->lang['strtablecolumnlist'].'</th><th class="data"> </th>'; + echo '<th class="data required">'.$this->lang['strindexcolumnlist'].'</th>'; + echo '</tr>'."\n"; - echo '<tr><td class="data1">' . $selColumns->fetch() . '</td>' . "\n"; - echo '<td class="data1">' . $buttonRemove->fetch() . $buttonAdd->fetch() . '</td>'; - echo '<td class="data1">' . $selIndex->fetch() . '</td></tr>' . "\n"; + echo '<tr><td class="data1">'.$selColumns->fetch().'</td>'."\n"; + echo '<td class="data1">'.$buttonRemove->fetch().$buttonAdd->fetch().'</td>'; + echo '<td class="data1">'.$selIndex->fetch().'</td></tr>'."\n"; echo '<tr>'; - echo '<th class="data left required" scope="row">' . $this->lang['strindextype'] . '</th>'; + echo '<th class="data left required" scope="row">'.$this->lang['strindextype'].'</th>'; echo '<td colspan="2" class="data1"><select name="formIndexType">'; foreach ($data->typIndexes as $v) { echo '<option value="', htmlspecialchars($v), '"', - ($v == $formIndexType) ? ' selected="selected"' : '', '>', htmlspecialchars($v), '</option>' . "\n"; + ($v == $formIndexType) ? ' selected="selected"' : '', '>', htmlspecialchars($v), '</option>'."\n"; } - echo '</select></td></tr>' . "\n"; + echo '</select></td></tr>'."\n"; echo '<tr>'; echo "<th class=\"data left\" scope=\"row\"><label for=\"formUnique\">{$this->lang['strunique']}</label></th>"; echo '<td colspan="2" class="data1"><input type="checkbox" id="formUnique" name="formUnique"', ($formUnique ? 'checked="checked"' : ''), ' /></td>'; echo '</tr>'; echo '<tr>'; echo "<th class=\"data left\" scope=\"row\">{$this->lang['strwhere']}</th>"; - echo '<td colspan="2" class="data1">(<input name="formWhere" size="32" maxlength="' . $data->_maxNameLen . '" value="' . htmlspecialchars($formWhere) . '" />)</td>'; + echo '<td colspan="2" class="data1">(<input name="formWhere" size="32" maxlength="'.$data->_maxNameLen.'" value="'.htmlspecialchars($formWhere).'" />)</td>'; echo '</tr>'; // Tablespace (if there are any) if ($data->hasTablespaces() && $tablespaces->recordCount() > 0) { - echo '<tr>' . "\n"; - echo "<th class=\"data left\">{$this->lang['strtablespace']}</th>" . "\n"; + echo '<tr>'."\n"; + echo "<th class=\"data left\">{$this->lang['strtablespace']}</th>"."\n"; echo '<td colspan="2" class="data1">'; - echo "\n\t\t\t<select name=\"formSpc\">" . "\n"; + echo "\n\t\t\t<select name=\"formSpc\">"."\n"; // Always offer the default (empty) option echo "\t\t\t\t<option value=\"\"", - ('' == $formSpc) ? ' selected="selected"' : '', '></option>' . "\n"; + ('' == $formSpc) ? ' selected="selected"' : '', '></option>'."\n"; // Display all other tablespaces while (!$tablespaces->EOF) { $spcname = htmlspecialchars($tablespaces->fields['spcname']); echo "\t\t\t\t<option value=\"{$spcname}\"", - ($spcname == $formSpc) ? ' selected="selected"' : '', ">{$spcname}</option>" . "\n"; + ($spcname == $formSpc) ? ' selected="selected"' : '', ">{$spcname}</option>"."\n"; $tablespaces->moveNext(); } - echo "\t\t\t</select>\n\t\t</td>\n\t</tr>" . "\n"; + echo "\t\t\t</select>\n\t\t</td>\n\t</tr>"."\n"; } if ($data->hasConcurrentIndexBuild()) { @@ -434,13 +434,13 @@ class IndexesController extends BaseController echo '</table>'; - echo '<p><input type="hidden" name="action" value="save_create_index" />' . "\n"; + echo '<p><input type="hidden" name="action" value="save_create_index" />'."\n"; echo $this->misc->form; - echo '<input type="hidden" name="subject" value="', htmlspecialchars($subject), '" />' . "\n"; - echo '<input type="hidden" name="' . $subject . '" value="', htmlspecialchars($object), '" />' . "\n"; - echo "<input type=\"submit\" value=\"{$this->lang['strcreate']}\" />" . "\n"; - echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" /></p>" . "\n"; - echo '</form>' . "\n"; + echo '<input type="hidden" name="subject" value="', htmlspecialchars($subject), '" />'."\n"; + echo '<input type="hidden" name="'.$subject.'" value="', htmlspecialchars($object), '" />'."\n"; + echo "<input type=\"submit\" value=\"{$this->lang['strcreate']}\" />"."\n"; + echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" /></p>"."\n"; + echo '</form>'."\n"; } /** @@ -482,7 +482,7 @@ class IndexesController extends BaseController ); if (0 == $status) { - $this->doDefault($sql . '<br>' . $this->lang['strindexcreated']); + $this->doDefault($sql.'<br>'.$this->lang['strindexcreated']); } else { $this->doCreateIndex($this->lang['strindexcreatedbad']); } @@ -505,24 +505,24 @@ class IndexesController extends BaseController $this->printTrail('index'); $this->printTitle($this->lang['strdrop'], 'pg.index.drop'); - echo '<p>', sprintf($this->lang['strconfdropindex'], $this->misc->printVal($this->getRequestParam('index'))), '</p>' . "\n"; - echo '<form action="' . \SUBFOLDER . '/src/views/indexes" method="post">' . "\n"; - echo '<input type="hidden" name="action" value="drop_index" />' . "\n"; - echo '<input type="hidden" name="table" value="', htmlspecialchars($object), '" />' . "\n"; - echo '<input type="hidden" name="index" value="', htmlspecialchars($this->getRequestParam('index')), '" />' . "\n"; + echo '<p>', sprintf($this->lang['strconfdropindex'], $this->misc->printVal($this->getRequestParam('index'))), '</p>'."\n"; + echo '<form action="'.\SUBFOLDER.'/src/views/indexes" method="post">'."\n"; + echo '<input type="hidden" name="action" value="drop_index" />'."\n"; + echo '<input type="hidden" name="table" value="', htmlspecialchars($object), '" />'."\n"; + echo '<input type="hidden" name="index" value="', htmlspecialchars($this->getRequestParam('index')), '" />'."\n"; echo $this->misc->form; echo '<p><input type="checkbox" id="cascade" name="cascade" value="1" />'; - echo '<label for="cascade">' . $this->lang['strcascade'] . '</label></p>' . "\n"; - echo "<input type=\"submit\" name=\"drop\" value=\"{$this->lang['strdrop']}\" />" . "\n"; - echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" />" . "\n"; - echo '</form>' . "\n"; + echo '<label for="cascade">'.$this->lang['strcascade'].'</label></p>'."\n"; + echo "<input type=\"submit\" name=\"drop\" value=\"{$this->lang['strdrop']}\" />"."\n"; + echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" />"."\n"; + echo '</form>'."\n"; } else { try { list($status, $sql) = $data->dropIndex($this->getPostParam('index'), $this->getPostParam('cascade')); if (0 == $status) { - $this->doDefault($sql . "\n" . $this->lang['strindexdropped']); + $this->doDefault($sql."\n".$this->lang['strindexdropped']); } else { - $this->doDefault($sql . "\n" . $this->lang['strindexdroppedbad']); + $this->doDefault($sql."\n".$this->lang['strindexdroppedbad']); } } catch (\PHPPgAdmin\ADOdbException $e) { $this->doDefault($this->lang['strindexdroppedbad']); diff --git a/src/controllers/InfoController.php b/src/controllers/InfoController.php index 01cda7c7..8202d8a4 100644 --- a/src/controllers/InfoController.php +++ b/src/controllers/InfoController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/IntroController.php b/src/controllers/IntroController.php index d17f1908..9d20886a 100644 --- a/src/controllers/IntroController.php +++ b/src/controllers/IntroController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/LanguagesController.php b/src/controllers/LanguagesController.php index 06725af8..516b4eb3 100644 --- a/src/controllers/LanguagesController.php +++ b/src/controllers/LanguagesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/LoginController.php b/src/controllers/LoginController.php index 4086d1ad..518c0237 100644 --- a/src/controllers/LoginController.php +++ b/src/controllers/LoginController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/MaterializedviewpropertiesController.php b/src/controllers/MaterializedviewpropertiesController.php index 28008d2f..fe871df5 100644 --- a/src/controllers/MaterializedviewpropertiesController.php +++ b/src/controllers/MaterializedviewpropertiesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/MaterializedviewsController.php b/src/controllers/MaterializedviewsController.php index 9ee15b74..a69f56c4 100644 --- a/src/controllers/MaterializedviewsController.php +++ b/src/controllers/MaterializedviewsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; @@ -31,7 +31,7 @@ class MaterializedviewsController extends BaseController return $this->doSubTree(); } - $this->printHeader('M ' . $this->lang['strviews']); + $this->printHeader('M '.$this->lang['strviews']); $this->printBody(); switch ($this->action) { @@ -118,9 +118,9 @@ class MaterializedviewsController extends BaseController $columns = [ 'matview' => [ - 'title' => 'M ' . $this->lang['strview'], + 'title' => 'M '.$this->lang['strview'], 'field' => Decorator::field('relname'), - 'url' => \SUBFOLDER . "/redirect/matview?{$this->misc->href}&", + 'url' => \SUBFOLDER."/redirect/matview?{$this->misc->href}&", 'vars' => ['matview' => 'relname'], ], 'owner' => [ @@ -307,7 +307,7 @@ class MaterializedviewsController extends BaseController $attrs = $data->getTableAttributes($_REQUEST['matview']); - echo '<form action="' . \SUBFOLDER . '/src/views/' . $this->script . '" method="post" id="selectform">'; + echo '<form action="'.\SUBFOLDER.'/src/views/'.$this->script.'" method="post" id="selectform">'; echo "\n"; if ($attrs->recordCount() > 0) { @@ -439,7 +439,7 @@ class MaterializedviewsController extends BaseController $this->printTrail('getTrail'); $this->printTitle($this->lang['strdrop'], 'pg.matview.drop'); - echo '<form action="' . \SUBFOLDER . "/src/views/materializedviews\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/materializedviews\" method=\"post\">\n"; //If multi drop if (isset($_REQUEST['ma'])) { @@ -550,7 +550,7 @@ class MaterializedviewsController extends BaseController [ 'schemaname' => $arrSelTables[$i]['schemaname'], 'tablename' => $arrSelTables[$i]['tablename'], - 'fieldname' => $attrs->fields['attname']] + 'fieldname' => $attrs->fields['attname'], ] ); $attrs->moveNext(); } @@ -559,7 +559,7 @@ class MaterializedviewsController extends BaseController } asort($arrFields); - echo '<form action="' . \SUBFOLDER . "/src/views/materializedviews\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/materializedviews\" method=\"post\">\n"; echo "<table>\n"; echo "<tr><th class=\"data\">{$this->lang['strviewname']}</th></tr>"; echo "<tr>\n<td class=\"data1\">\n"; @@ -638,7 +638,7 @@ class MaterializedviewsController extends BaseController echo "<p><input type=\"hidden\" name=\"action\" value=\"save_create_wiz\" />\n"; foreach ($arrSelTables as $curTable) { - echo '<input type="hidden" name="formTables[]" value="' . htmlspecialchars(serialize($curTable)) . "\" />\n"; + echo '<input type="hidden" name="formTables[]" value="'.htmlspecialchars(serialize($curTable))."\" />\n"; } echo $this->misc->form; @@ -663,7 +663,7 @@ class MaterializedviewsController extends BaseController $this->printTitle($this->lang['strcreateviewwiz'], 'pg.matview.create'); $this->printMsg($msg); - echo '<form action="' . \SUBFOLDER . "/src/views/materializedviews\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/materializedviews\" method=\"post\">\n"; echo "<table>\n"; echo "<tr><th class=\"data\">{$this->lang['strtables']}</th></tr>"; echo "<tr>\n<td class=\"data1\">\n"; @@ -673,7 +673,7 @@ class MaterializedviewsController extends BaseController $arrTmp = []; $arrTmp['schemaname'] = $tables->fields['nspname']; $arrTmp['tablename'] = $tables->fields['relname']; - $arrTables[$tables->fields['nspname'] . '.' . $tables->fields['relname']] = serialize($arrTmp); + $arrTables[$tables->fields['nspname'].'.'.$tables->fields['relname']] = serialize($arrTmp); $tables->moveNext(); } echo \PHPPgAdmin\XHtml\HTMLController::printCombo($arrTables, 'formTables[]', false, '', true); @@ -715,7 +715,7 @@ class MaterializedviewsController extends BaseController $this->printTitle($this->lang['strcreateview'], 'pg.matview.create'); $this->printMsg($msg); - echo '<form action="' . \SUBFOLDER . "/src/views/materializedviews\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/materializedviews\" method=\"post\">\n"; echo "<table style=\"width: 100%\">\n"; echo "\t<tr>\n\t\t<th class=\"data left required\">{$this->lang['strname']}</th>\n"; echo "\t<td class=\"data1\"><input name=\"formView\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"", @@ -831,7 +831,7 @@ class MaterializedviewsController extends BaseController if ((!in_array($curLink, $arrJoined, true) && in_array($tbl1, $arrUsedTbls, true)) || !count($arrJoined)) { // Make sure for multi-column foreign keys that we use a table alias tables joined to more than once // This can (and should be) more optimized for multi-column foreign keys - $adj_tbl2 = in_array($tbl2, $arrUsedTbls, true) ? "${tbl2} AS alias_ppa_" . mktime() : $tbl2; + $adj_tbl2 = in_array($tbl2, $arrUsedTbls, true) ? "${tbl2} AS alias_ppa_".mktime() : $tbl2; $linkFields .= strlen($linkFields) ? "{$curLink['operator']} ${adj_tbl2} ON (\"{$arrLeftLink['schemaname']}\".\"{$arrLeftLink['tablename']}\".\"{$arrLeftLink['fieldname']}\" = \"{$arrRightLink['schemaname']}\".\"{$arrRightLink['tablename']}\".\"{$arrRightLink['fieldname']}\") " : "${tbl1} {$curLink['operator']} ${adj_tbl2} ON (\"{$arrLeftLink['schemaname']}\".\"{$arrLeftLink['tablename']}\".\"{$arrLeftLink['fieldname']}\" = \"{$arrRightLink['schemaname']}\".\"{$arrRightLink['tablename']}\".\"{$arrRightLink['fieldname']}\") "; @@ -877,7 +877,7 @@ class MaterializedviewsController extends BaseController //add where from additional conditions if (strlen($addConditions)) { - $viewQuery .= ' WHERE ' . $addConditions; + $viewQuery .= ' WHERE '.$addConditions; } $status = $data->createView($_POST['formView'], $viewQuery, false, $_POST['formComment']); diff --git a/src/controllers/OpclassesController.php b/src/controllers/OpclassesController.php index f13943d3..5418ed45 100644 --- a/src/controllers/OpclassesController.php +++ b/src/controllers/OpclassesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/OperatorsController.php b/src/controllers/OperatorsController.php index 4c622ca4..3a09dc20 100644 --- a/src/controllers/OperatorsController.php +++ b/src/controllers/OperatorsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/PrivilegesController.php b/src/controllers/PrivilegesController.php index 1ddfc5c4..640c5f32 100644 --- a/src/controllers/PrivilegesController.php +++ b/src/controllers/PrivilegesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/RolesController.php b/src/controllers/RolesController.php index 006acd9a..08dede39 100644 --- a/src/controllers/RolesController.php +++ b/src/controllers/RolesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; @@ -117,7 +117,7 @@ class RolesController extends BaseController 'role' => [ 'title' => $this->lang['strrole'], 'field' => Decorator::field('rolname'), - 'url' => \SUBFOLDER . "/redirect/role?action=properties&{$this->misc->href}&", + 'url' => \SUBFOLDER."/redirect/role?action=properties&{$this->misc->href}&", 'vars' => ['rolename' => 'rolname'], ], 'superuser' => [ @@ -253,7 +253,7 @@ class RolesController extends BaseController $this->printTitle($this->lang['strcreaterole'], 'pg.role.create'); $this->printMsg($msg); - echo '<form action="' . \SUBFOLDER . "/src/views/roles\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/roles\" method=\"post\">\n"; echo "<table>\n"; echo "\t<tr>\n\t\t<th class=\"data left required\" style=\"width: 130px\">{$this->lang['strname']}</th>\n"; echo "\t\t<td class=\"data1\"><input size=\"15\" maxlength=\"{$data->_maxNameLen}\" name=\"formRolename\" value=\"", htmlspecialchars($_POST['formRolename']), "\" /></td>\n\t</tr>\n"; @@ -431,10 +431,10 @@ class RolesController extends BaseController $_POST['formPassword'] = ''; } - echo '<form action="' . \SUBFOLDER . "/src/views/roles\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/roles\" method=\"post\">\n"; echo "<table>\n"; echo "\t<tr>\n\t\t<th class=\"data left\" style=\"width: 130px\">{$this->lang['strname']}</th>\n"; - echo "\t\t<td class=\"data1\">", ($canRename ? "<input name=\"formNewRoleName\" size=\"15\" maxlength=\"{$data->_maxNameLen}\" value=\"" . htmlspecialchars($_POST['formNewRoleName']) . '" />' : $this->misc->printVal($roledata->fields['rolname'])), "</td>\n\t</tr>\n"; + echo "\t\t<td class=\"data1\">", ($canRename ? "<input name=\"formNewRoleName\" size=\"15\" maxlength=\"{$data->_maxNameLen}\" value=\"".htmlspecialchars($_POST['formNewRoleName']).'" />' : $this->misc->printVal($roledata->fields['rolname'])), "</td>\n\t</tr>\n"; echo "\t<tr>\n\t\t<th class=\"data left\">{$this->lang['strpassword']}</th>\n"; echo "\t\t<td class=\"data1\"><input type=\"password\" size=\"15\" name=\"formPassword\" value=\"", htmlspecialchars($_POST['formPassword']), "\" /></td>\n\t</tr>\n"; echo "\t<tr>\n\t\t<th class=\"data left\">{$this->lang['strconfirm']}</th>\n"; @@ -612,7 +612,7 @@ class RolesController extends BaseController echo '<p>', sprintf($this->lang['strconfdroprole'], $this->misc->printVal($_REQUEST['rolename'])), "</p>\n"; - echo '<form action="' . \SUBFOLDER . "/src/views/roles\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/roles\" method=\"post\">\n"; echo "<p><input type=\"hidden\" name=\"action\" value=\"drop\" />\n"; echo '<input type="hidden" name="rolename" value="', htmlspecialchars($_REQUEST['rolename']), "\" />\n"; echo $this->misc->form; @@ -838,7 +838,7 @@ class RolesController extends BaseController $_POST['confirm'] = ''; } - echo '<form action="' . \SUBFOLDER . "/src/views/roles\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/roles\" method=\"post\">\n"; echo "<table>\n"; echo "\t<tr>\n\t\t<th class=\"data left required\">{$this->lang['strpassword']}</th>\n"; echo "\t\t<td><input type=\"password\" name=\"password\" size=\"32\" value=\"", diff --git a/src/controllers/RulesController.php b/src/controllers/RulesController.php index 6853b994..89cccfbd 100644 --- a/src/controllers/RulesController.php +++ b/src/controllers/RulesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/SchemasController.php b/src/controllers/SchemasController.php index 68b2621b..c057ec39 100644 --- a/src/controllers/SchemasController.php +++ b/src/controllers/SchemasController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; @@ -103,7 +103,7 @@ class SchemasController extends BaseController 'schema' => [ 'title' => $this->lang['strschema'], 'field' => Decorator::field('nspname'), - 'url' => \SUBFOLDER . "/redirect/schema?{$this->misc->href}&", + 'url' => \SUBFOLDER."/redirect/schema?{$this->misc->href}&", 'vars' => ['schema' => 'nspname'], ], 'owner' => [ @@ -289,7 +289,7 @@ class SchemasController extends BaseController $this->printTitle($this->lang['strcreateschema'], 'pg.schema.create'); $this->printMsg($msg); - echo '<form action="' . \SUBFOLDER . '/src/views/schemas" method="post">' . "\n"; + echo '<form action="'.\SUBFOLDER.'/src/views/schemas" method="post">'."\n"; echo "<table style=\"width: 100%\">\n"; echo "\t<tr>\n\t\t<th class=\"data left required\">{$this->lang['strname']}</th>\n"; echo "\t\t<td class=\"data1\"><input name=\"formName\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"", @@ -372,7 +372,7 @@ class SchemasController extends BaseController $_POST['owner'] = $schema->fields['ownername']; } - echo '<form action="' . \SUBFOLDER . '/src/views/schemas" method="post">' . "\n"; + echo '<form action="'.\SUBFOLDER.'/src/views/schemas" method="post">'."\n"; echo "<table>\n"; echo "\t<tr>\n"; @@ -449,7 +449,7 @@ class SchemasController extends BaseController $this->printTrail('schema'); $this->printTitle($this->lang['strdrop'], 'pg.schema.drop'); - echo '<form action="' . \SUBFOLDER . '/src/views/schemas" method="post">' . "\n"; + echo '<form action="'.\SUBFOLDER.'/src/views/schemas" method="post">'."\n"; //If multi drop if (isset($_REQUEST['ma'])) { foreach ($_REQUEST['ma'] as $v) { @@ -518,7 +518,7 @@ class SchemasController extends BaseController $this->printTabs('schema', '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"; diff --git a/src/controllers/SequencesController.php b/src/controllers/SequencesController.php index 7455bb75..98e88b61 100644 --- a/src/controllers/SequencesController.php +++ b/src/controllers/SequencesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/ServersController.php b/src/controllers/ServersController.php index 5f81b8f2..28071b96 100644 --- a/src/controllers/ServersController.php +++ b/src/controllers/ServersController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/ServersTrait.php b/src/controllers/ServersTrait.php index b2b91211..0a37d0f9 100644 --- a/src/controllers/ServersTrait.php +++ b/src/controllers/ServersTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/SqlController.php b/src/controllers/SqlController.php index a5cf70c0..0f047939 100644 --- a/src/controllers/SqlController.php +++ b/src/controllers/SqlController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; @@ -185,7 +185,7 @@ class SqlController extends BaseController $rs = $data->conn->Execute($this->query); - echo '<form method="post" id="sqlform" action="' . $_SERVER['REQUEST_URI'] . '">'; + echo '<form method="post" id="sqlform" action="'.$_SERVER['REQUEST_URI'].'">'; echo '<textarea width="90%" name="query" id="query" rows="5" cols="100" resizable="true">'; echo htmlspecialchars($this->query); diff --git a/src/controllers/SqleditController.php b/src/controllers/SqleditController.php index 22172800..2c52090f 100644 --- a/src/controllers/SqleditController.php +++ b/src/controllers/SqleditController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/TablesController.php b/src/controllers/TablesController.php index 964e62c3..2d9b6131 100644 --- a/src/controllers/TablesController.php +++ b/src/controllers/TablesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; @@ -153,7 +153,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' => [ @@ -453,7 +453,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"; @@ -519,8 +519,8 @@ class TablesController extends BaseController $this->printTitle($this->lang['strcreatetable'], 'pg.table.create'); $this->printMsg($msg); - echo '<script src="' . \SUBFOLDER . '/js/tables.js" type="text/javascript"></script>'; - echo '<form action="' . \SUBFOLDER . "/src/views/tables\" method=\"post\">\n"; + echo '<script src="'.\SUBFOLDER.'/js/tables.js" type="text/javascript"></script>'; + echo '<form action="'.\SUBFOLDER."/src/views/tables\" method=\"post\">\n"; // Output table header echo "<table>\n"; @@ -574,7 +574,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 @@ -587,10 +587,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=\"", @@ -737,7 +737,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"; @@ -834,7 +834,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"; @@ -977,7 +977,7 @@ class TablesController extends BaseController $fksprops = false; } - 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"; @@ -1050,7 +1050,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"; @@ -1117,10 +1117,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'])); @@ -1131,7 +1131,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 @@ -1166,7 +1166,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 @@ -1192,7 +1192,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"; @@ -1204,7 +1204,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 2eff24ef..83847b81 100644 --- a/src/controllers/TablespacesController.php +++ b/src/controllers/TablespacesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/TblpropertiesController.php b/src/controllers/TblpropertiesController.php index f364923e..39c6c79e 100644 --- a/src/controllers/TblpropertiesController.php +++ b/src/controllers/TblpropertiesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/TriggersController.php b/src/controllers/TriggersController.php index c1b6551e..97a957d0 100644 --- a/src/controllers/TriggersController.php +++ b/src/controllers/TriggersController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/TypesController.php b/src/controllers/TypesController.php index b4749e99..dbf478c0 100644 --- a/src/controllers/TypesController.php +++ b/src/controllers/TypesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/UsersController.php b/src/controllers/UsersController.php index 1294f1c1..7db2c230 100644 --- a/src/controllers/UsersController.php +++ b/src/controllers/UsersController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; @@ -258,7 +258,7 @@ class UsersController extends BaseController $_POST['confirm'] = ''; } - echo '<form action="' . \SUBFOLDER . "/src/views/users\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/users\" method=\"post\">\n"; echo "<table>\n"; echo "\t<tr>\n\t\t<th class=\"data left required\">{$this->lang['strpassword']}</th>\n"; echo "\t\t<td><input type=\"password\" name=\"password\" size=\"32\" value=\"", @@ -332,10 +332,10 @@ class UsersController extends BaseController $_POST['formPassword'] = ''; } - echo '<form action="' . \SUBFOLDER . "/src/views/users\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/users\" method=\"post\">\n"; echo "<table>\n"; echo "\t<tr>\n\t\t<th class=\"data left\">{$this->lang['strusername']}</th>\n"; - echo "\t\t<td class=\"data1\">", ($canRename ? "<input name=\"newname\" size=\"15\" maxlength=\"{$data->_maxNameLen}\" value=\"" . htmlspecialchars($_POST['newname']) . '" />' : $this->misc->printVal($userdata->fields['usename'])), "</td>\n\t</tr>\n"; + echo "\t\t<td class=\"data1\">", ($canRename ? "<input name=\"newname\" size=\"15\" maxlength=\"{$data->_maxNameLen}\" value=\"".htmlspecialchars($_POST['newname']).'" />' : $this->misc->printVal($userdata->fields['usename'])), "</td>\n\t</tr>\n"; echo "\t<tr>\n\t\t<th class=\"data left\"><label for=\"formSuper\">{$this->lang['strsuper']}</label></th>\n"; echo "\t\t<td class=\"data1\"><input type=\"checkbox\" id=\"formSuper\" name=\"formSuper\"", (isset($_POST['formSuper'])) ? ' checked="checked"' : '', " /></td>\n\t</tr>\n"; @@ -402,7 +402,7 @@ class UsersController extends BaseController echo '<p>', sprintf($this->lang['strconfdropuser'], $this->misc->printVal($_REQUEST['username'])), "</p>\n"; - echo '<form action="' . \SUBFOLDER . "/src/views/users\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/users\" method=\"post\">\n"; echo "<p><input type=\"hidden\" name=\"action\" value=\"drop\" />\n"; echo '<input type="hidden" name="username" value="', htmlspecialchars($_REQUEST['username']), "\" />\n"; echo $this->misc->form; @@ -448,7 +448,7 @@ class UsersController extends BaseController $this->printTitle($this->lang['strcreateuser'], 'pg.user.create'); $this->printMsg($msg); - echo '<form action="' . \SUBFOLDER . "/src/views/users\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/users\" method=\"post\">\n"; echo "<table>\n"; echo "\t<tr>\n\t\t<th class=\"data left required\">{$this->lang['strusername']}</th>\n"; echo "\t\t<td class=\"data1\"><input size=\"15\" maxlength=\"{$data->_maxNameLen}\" name=\"formUsername\" value=\"", htmlspecialchars($_POST['formUsername']), "\" /></td>\n\t</tr>\n"; diff --git a/src/controllers/ViewpropertiesController.php b/src/controllers/ViewpropertiesController.php index 13f9a0c3..0841b293 100644 --- a/src/controllers/ViewpropertiesController.php +++ b/src/controllers/ViewpropertiesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/ViewsController.php b/src/controllers/ViewsController.php index af38e5f1..e289e197 100644 --- a/src/controllers/ViewsController.php +++ b/src/controllers/ViewsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Controller; @@ -119,7 +119,7 @@ class ViewsController extends BaseController 'view' => [ 'title' => $this->lang['strview'], 'field' => Decorator::field('relname'), - 'url' => \SUBFOLDER . "/redirect/view?{$this->misc->href}&", + 'url' => \SUBFOLDER."/redirect/view?{$this->misc->href}&", 'vars' => ['view' => 'relname'], ], 'owner' => [ @@ -306,7 +306,7 @@ class ViewsController extends BaseController $attrs = $data->getTableAttributes($_REQUEST['view']); - echo '<form action="' . \SUBFOLDER . '/src/views/' . $this->script . '" method="post" id="selectform">'; + echo '<form action="'.\SUBFOLDER.'/src/views/'.$this->script.'" method="post" id="selectform">'; echo "\n"; if ($attrs->recordCount() > 0) { @@ -438,7 +438,7 @@ class ViewsController extends BaseController $this->printTrail('view'); $this->printTitle($this->lang['strdrop'], 'pg.view.drop'); - echo '<form action="' . \SUBFOLDER . "/src/views/views\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/views\" method=\"post\">\n"; //If multi drop if (isset($_REQUEST['ma'])) { @@ -549,7 +549,7 @@ class ViewsController extends BaseController [ 'schemaname' => $arrSelTables[$i]['schemaname'], 'tablename' => $arrSelTables[$i]['tablename'], - 'fieldname' => $attrs->fields['attname']] + 'fieldname' => $attrs->fields['attname'], ] ); $attrs->moveNext(); } @@ -558,7 +558,7 @@ class ViewsController extends BaseController } asort($arrFields); - echo '<form action="' . \SUBFOLDER . "/src/views/views\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/views\" method=\"post\">\n"; echo "<table>\n"; echo "<tr><th class=\"data\">{$this->lang['strviewname']}</th></tr>"; echo "<tr>\n<td class=\"data1\">\n"; @@ -637,7 +637,7 @@ class ViewsController extends BaseController echo "<p><input type=\"hidden\" name=\"action\" value=\"save_create_wiz\" />\n"; foreach ($arrSelTables as $curTable) { - echo '<input type="hidden" name="formTables[]" value="' . htmlspecialchars(serialize($curTable)) . "\" />\n"; + echo '<input type="hidden" name="formTables[]" value="'.htmlspecialchars(serialize($curTable))."\" />\n"; } echo $this->misc->form; @@ -662,7 +662,7 @@ class ViewsController extends BaseController $this->printTitle($this->lang['strcreateviewwiz'], 'pg.view.create'); $this->printMsg($msg); - echo '<form action="' . \SUBFOLDER . "/src/views/views\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/views\" method=\"post\">\n"; echo "<table>\n"; echo "<tr><th class=\"data\">{$this->lang['strtables']}</th></tr>"; echo "<tr>\n<td class=\"data1\">\n"; @@ -672,7 +672,7 @@ class ViewsController extends BaseController $arrTmp = []; $arrTmp['schemaname'] = $tables->fields['nspname']; $arrTmp['tablename'] = $tables->fields['relname']; - $arrTables[$tables->fields['nspname'] . '.' . $tables->fields['relname']] = serialize($arrTmp); + $arrTables[$tables->fields['nspname'].'.'.$tables->fields['relname']] = serialize($arrTmp); $tables->moveNext(); } echo \PHPPgAdmin\XHtml\HTMLController::printCombo($arrTables, 'formTables[]', false, '', true); @@ -714,7 +714,7 @@ class ViewsController extends BaseController $this->printTitle($this->lang['strcreateview'], 'pg.view.create'); $this->printMsg($msg); - echo '<form action="' . \SUBFOLDER . "/src/views/views\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views/views\" method=\"post\">\n"; echo "<table style=\"width: 100%\">\n"; echo "\t<tr>\n\t\t<th class=\"data left required\">{$this->lang['strname']}</th>\n"; echo "\t<td class=\"data1\"><input name=\"formView\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"", @@ -830,7 +830,7 @@ class ViewsController extends BaseController if ((!in_array($curLink, $arrJoined, true) && in_array($tbl1, $arrUsedTbls, true)) || !count($arrJoined)) { // Make sure for multi-column foreign keys that we use a table alias tables joined to more than once // This can (and should be) more optimized for multi-column foreign keys - $adj_tbl2 = in_array($tbl2, $arrUsedTbls, true) ? "${tbl2} AS alias_ppa_" . mktime() : $tbl2; + $adj_tbl2 = in_array($tbl2, $arrUsedTbls, true) ? "${tbl2} AS alias_ppa_".mktime() : $tbl2; $linkFields .= strlen($linkFields) ? "{$curLink['operator']} ${adj_tbl2} ON (\"{$arrLeftLink['schemaname']}\".\"{$arrLeftLink['tablename']}\".\"{$arrLeftLink['fieldname']}\" = \"{$arrRightLink['schemaname']}\".\"{$arrRightLink['tablename']}\".\"{$arrRightLink['fieldname']}\") " : "${tbl1} {$curLink['operator']} ${adj_tbl2} ON (\"{$arrLeftLink['schemaname']}\".\"{$arrLeftLink['tablename']}\".\"{$arrLeftLink['fieldname']}\" = \"{$arrRightLink['schemaname']}\".\"{$arrRightLink['tablename']}\".\"{$arrRightLink['fieldname']}\") "; @@ -876,7 +876,7 @@ class ViewsController extends BaseController //add where from additional conditions if (strlen($addConditions)) { - $viewQuery .= ' WHERE ' . $addConditions; + $viewQuery .= ' WHERE '.$addConditions; } try { diff --git a/src/database/ADOdbBase.php b/src/database/ADOdbBase.php index 43b94e16..1f872fb1 100644 --- a/src/database/ADOdbBase.php +++ b/src/database/ADOdbBase.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Database; @@ -262,10 +262,13 @@ class ADOdbBase public $conf; protected $container; protected $server_info; + /** * Base constructor. * - * @param \ADONewConnection &$conn The connection object + * @param \ADONewConnection &$conn The connection object + * @param mixed $container + * @param mixed $server_info */ public function __construct(&$conn, $container, $server_info) { @@ -300,7 +303,7 @@ class ADOdbBase $this->clean($comment); // Passing in an already cleaned comment will lead to double escaped data // So, while counter-intuitive, it is important to not clean comments before // calling setComment. We will clean it here instead. - /** + /* * $this->fieldClean($table); * $this->fieldClean($obj_name); */ @@ -430,7 +433,7 @@ class ADOdbBase * * @param $sql The SQL statement to be executed * - * @return \PHPPgAdmin\ADORecordSet|int A recordset or an error number + * @return int|\PHPPgAdmin\ADORecordSet A recordset or an error number */ public function selectSet($sql) { @@ -452,7 +455,7 @@ class ADOdbBase * @param $sql The SQL statement to be executed * @param $field The field name to be returned * - * @return string|int single field value, error number on error or -1 if no rows where found + * @return int|string single field value, error number on error or -1 if no rows where found */ public function selectField($sql, $field) { @@ -475,7 +478,7 @@ class ADOdbBase * Delete from the database. * * @param string $table The name of the table - * @param array $conditions (array) A map of field names to conditions + * @param array $conditions (array) A map of field names to conditions * @param string $schema (optional) The table's schema * * @return int 0 success @@ -564,7 +567,7 @@ class ADOdbBase * Insert a set of values into the database. * * @param string $table The table to insert into - * @param array $vars (array) A mapping of the field names to the values to be inserted + * @param array $vars (array) A mapping of the field names to the values to be inserted * * @return int 0 success */ @@ -592,7 +595,7 @@ class ADOdbBase $values = ") VALUES ('{$value}'"; } } - $sql = $fields . $values . ')'; + $sql = $fields.$values.')'; } // Check for failures @@ -614,9 +617,9 @@ class ADOdbBase * Update a row in the database. * * @param string $table The table that is to be updated - * @param array $vars (array) A mapping of the field names to the values to be updated - * @param array $where (array) A mapping of field names to values for the where clause - * @param array $nulls (array, optional) An array of fields to be set null + * @param array $vars (array) A mapping of the field names to the values to be updated + * @param array $where (array) A mapping of field names to values for the where clause + * @param array $nulls (array, optional) An array of fields to be set null * * @return int 0 success */ @@ -664,7 +667,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; @@ -731,7 +734,7 @@ class ADOdbBase * * @param mixed $parameter the parameter * - * @return boolean boolean database representation + * @return bool boolean database representation */ public function dbBool(&$parameter) { @@ -743,7 +746,7 @@ class ADOdbBase * * @param mixed $parameter the parameter * - * @return boolean + * @return bool */ public function phpBool($parameter) { diff --git a/src/database/AggregateTrait.php b/src/database/AggregateTrait.php index 2b927f0a..533ef015 100644 --- a/src/database/AggregateTrait.php +++ b/src/database/AggregateTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Database; @@ -78,7 +78,7 @@ trait AggregateTrait * * @param string $aggrname The name of the aggregate * @param string $aggrtype The input data type of the aggregate - * @param bool $cascade True to cascade drop, false to restrict + * @param bool $cascade True to cascade drop, false to restrict * * @return int 0 if operation was successful */ @@ -121,11 +121,11 @@ trait AggregateTrait FROM pg_catalog.pg_proc p, pg_catalog.pg_namespace n, pg_catalog.pg_user u, pg_catalog.pg_aggregate a WHERE n.oid = p.pronamespace AND p.proowner=u.usesysid AND p.oid=a.aggfnoid AND p.proisagg AND n.nspname='{$c_schema}' - AND p.proname='" . $name . "' + AND p.proname='".$name."' AND CASE p.proargtypes[0] WHEN 'pg_catalog.\"any\"'::pg_catalog.regtype THEN '' ELSE pg_catalog.format_type(p.proargtypes[0], NULL) - END ='" . $basetype . "'"; + END ='".$basetype."'"; return $this->selectSet($sql); } @@ -282,7 +282,7 @@ trait AggregateTrait public function renameAggregate($aggrschema, $aggrname, $aggrtype, $newaggrname) { /* this function is called from alterAggregate where params are cleaned */ - $sql = "ALTER AGGREGATE \"{$aggrschema}\"" . '.' . "\"{$aggrname}\" (\"{$aggrtype}\") RENAME TO \"{$newaggrname}\""; + $sql = "ALTER AGGREGATE \"{$aggrschema}\"".'.'."\"{$aggrname}\" (\"{$aggrtype}\") RENAME TO \"{$newaggrname}\""; return $this->execute($sql); } diff --git a/src/database/Connection.php b/src/database/Connection.php index f236c32c..710c6fee 100644 --- a/src/database/Connection.php +++ b/src/database/Connection.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Database; @@ -25,16 +25,19 @@ class Connection protected $container; protected $server_info; + /** * Creates a new connection. Will actually make a database connection. * - * @param $host - * @param $port - * @param $sslmode - * @param $user - * @param $password - * @param $database - * @param int $fetchMode Defaults to associative. Override for different behaviour + * @param $host + * @param $port + * @param $sslmode + * @param $user + * @param $password + * @param $database + * @param int $fetchMode Defaults to associative. Override for different behaviour + * @param mixed $server_info + * @param mixed $container */ public function __construct($server_info, $database, $container, $fetchMode = ADODB_FETCH_ASSOC) { @@ -55,7 +58,7 @@ class Connection // Ignore host if null if ($host === null || $host == '') { if ($port !== null && $port != '') { - $pghost = ':' . $port; + $pghost = ':'.$port; } else { $pghost = ''; } @@ -65,7 +68,7 @@ class Connection // Add sslmode to $pghost as needed if (($sslmode == 'disable') || ($sslmode == 'allow') || ($sslmode == 'prefer') || ($sslmode == 'require')) { - $pghost .= ':' . $sslmode; + $pghost .= ':'.$sslmode; } elseif ($sslmode == 'legacy') { $pghost .= ' requiressl=1'; } diff --git a/src/database/DomainTrait.php b/src/database/DomainTrait.php index 7353331a..2899d0ae 100644 --- a/src/database/DomainTrait.php +++ b/src/database/DomainTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Database; @@ -11,7 +11,6 @@ namespace PHPPgAdmin\Database; */ trait DomainTrait { - /** * Gets all information for a single domain. * diff --git a/src/database/FtsTrait.php b/src/database/FtsTrait.php index dd4fd473..09be76c6 100644 --- a/src/database/FtsTrait.php +++ b/src/database/FtsTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Database; @@ -11,7 +11,6 @@ namespace PHPPgAdmin\Database; */ trait FtsTrait { - /** * Creates a new FTS configuration. * @@ -241,7 +240,7 @@ trait FtsTrait * Drops FTS coniguration. * * @param string $ftscfg The configuration's name - * @param bool $cascade true to Cascade to dependenced objects + * @param bool $cascade true to Cascade to dependenced objects * * @return int 0 if operation was successful */ @@ -263,7 +262,7 @@ trait FtsTrait * Drops FTS dictionary. * * @param string $ftsdict The dico's name - * @param bool $cascade Cascade to dependenced objects + * @param bool $cascade Cascade to dependenced objects * * @return int 0 if operation was successful * @@ -500,7 +499,7 @@ trait FtsTrait /** * Creates/updates/deletes FTS mapping. * - * @param string $ftscfg The name of the FTS dictionary + * @param string $ftscfg The name of the FTS dictionary * @param array $mapping Array of tokens' names * @param string $action What to do with the mapping: add, alter or drop * @param string $dictname Dictionary that will process tokens given or null in case of drop action diff --git a/src/database/IndexTrait.php b/src/database/IndexTrait.php index d1551b18..bf448d5c 100644 --- a/src/database/IndexTrait.php +++ b/src/database/IndexTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Database; @@ -76,9 +76,9 @@ trait IndexTrait if (is_array($columns)) { $this->arrayClean($columns); - $sql .= '("' . implode('","', $columns) . '")'; + $sql .= '("'.implode('","', $columns).'")'; } else { - $sql .= '(' . $columns . ')'; + $sql .= '('.$columns.')'; } // Tablespace @@ -284,7 +284,7 @@ trait IndexTrait $sql .= "CONSTRAINT \"{$name}\" "; } - $sql .= 'PRIMARY KEY ("' . join('","', $fields) . '")'; + $sql .= 'PRIMARY KEY ("'.join('","', $fields).'")'; if ($tablespace != '' && $this->hasTablespaces()) { $sql .= " USING INDEX TABLESPACE \"{$tablespace}\""; @@ -321,7 +321,7 @@ trait IndexTrait $sql .= "CONSTRAINT \"{$name}\" "; } - $sql .= 'UNIQUE ("' . join('","', $fields) . '")'; + $sql .= 'UNIQUE ("'.join('","', $fields).'")'; if ($tablespace != '' && $this->hasTablespaces()) { $sql .= " USING INDEX TABLESPACE \"{$tablespace}\""; @@ -473,9 +473,9 @@ trait IndexTrait $sql .= "CONSTRAINT \"{$name}\" "; } - $sql .= 'FOREIGN KEY ("' . join('","', $sfields) . '") '; + $sql .= 'FOREIGN KEY ("'.join('","', $sfields).'") '; // Target table needs to be fully qualified - $sql .= "REFERENCES \"{$targschema}\".\"{$targtable}\"(\"" . join('","', $tfields) . '") '; + $sql .= "REFERENCES \"{$targschema}\".\"{$targtable}\"(\"".join('","', $tfields).'") '; if ($match != $this->fkmatches[0]) { $sql .= " {$match}"; } diff --git a/src/database/Postgres.php b/src/database/Postgres.php index daa43fa6..c21875c9 100644 --- a/src/database/Postgres.php +++ b/src/database/Postgres.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Database; @@ -55,13 +55,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; @@ -75,7 +75,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); @@ -100,7 +100,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)) { @@ -204,7 +204,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} "; } @@ -248,7 +248,7 @@ class Postgres extends ADOdbBase * * @param string $username The username of the user * - * @return boolean true if is a super user, false otherwise + * @return bool true if is a super user, false otherwise */ public function isSuperUser($username = '') { @@ -795,7 +795,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); } @@ -978,7 +978,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'; @@ -1029,7 +1029,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)) { @@ -1073,7 +1073,7 @@ class Postgres extends ADOdbBase * @param $type The type of the object (eg. database, schema, relation, function or language) * @param $table Optional, column's table if type = column * - * @return arrray|integer Privileges array + * @return arrray|int Privileges array * @return -1 invalid type * @return -2 object not found * @return -3 unknown privilege type @@ -1139,7 +1139,7 @@ class Postgres extends ADOdbBase return -2; } - if ($acl == '' || $acl === null || !boolval($acl)) { + if ($acl == '' || $acl === null || !(bool) $acl) { return []; } @@ -1485,13 +1485,13 @@ class Postgres extends ADOdbBase if (is_array($definition)) { $this->arrayClean($definition); - $sql .= "'" . $definition[0] . "'"; + $sql .= "'".$definition[0]."'"; if ($definition[1]) { - $sql .= ",'" . $definition[1] . "'"; + $sql .= ",'".$definition[1]."'"; } } else { $this->clean($definition); - $sql .= "'" . $definition . "'"; + $sql .= "'".$definition."'"; } $sql .= " LANGUAGE \"{$language}\""; @@ -1759,7 +1759,7 @@ class Postgres extends ADOdbBase * Creates a new enum type in the database. * * @param string $name The name of the type - * @param array $values An array of values + * @param array $values An array of values * @param string $typcomment Type comment * * @return bool|int 0 success @@ -1834,12 +1834,12 @@ class Postgres extends ADOdbBase * Creates a new composite type in the database. * * @param string $name The name of the type - * @param int $fields The number of fields - * @param array $field An array of field names - * @param array $type An array of field types - * @param array $array An array of '' or '[]' for each type if it's an array or not - * @param array $length An array of field lengths - * @param array $colcomment An array of comments + * @param int $fields The number of fields + * @param array $field An array of field names + * @param array $type An array of field types + * @param array $array An array of '' or '[]' for each type if it's an array or not + * @param array $length An array of field lengths + * @param array $colcomment An array of comments * @param string $typcomment Type comment * * @return bool|int 0 success @@ -2029,7 +2029,7 @@ class Postgres extends ADOdbBase /** * Edits a rule on a table OR view. * - * @param string $name The name of the new rule + * @param string $name The name of the new rule * @param $event SELECT, INSERT, UPDATE or DELETE * @param $table Table on which to create the rule * @param $where When to execute the rule, '' indicates always @@ -2258,7 +2258,7 @@ class Postgres extends ADOdbBase // Split on escaped null characters $params = explode('\\000', $v); for ($findx = 0; $findx < $trigger['tgnargs']; ++$findx) { - $param = "'" . str_replace('\'', '\\\'', $params[$findx]) . "'"; + $param = "'".str_replace('\'', '\\\'', $params[$findx])."'"; $tgdef .= $param; if ($findx < ($trigger['tgnargs'] - 1)) { $tgdef .= ', '; @@ -2491,13 +2491,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)'; } @@ -2901,7 +2901,7 @@ class Postgres extends ADOdbBase $params[] = "autovacuum_vacuum_cost_limit='{$vaccostlimit}'"; } - $sql = $sql . implode(',', $params) . ');'; + $sql = $sql.implode(',', $params).');'; return $this->execute($sql); } @@ -3094,7 +3094,7 @@ class Postgres extends ADOdbBase $bslash_count = 0; } - /** + /* * It is important to place the in_* test routines before the * in_* detection routines. i.e. we have to test if we are in * a quote before testing for comments. @@ -3102,7 +3102,7 @@ class Postgres extends ADOdbBase /* in quote? */ if ($in_quote !== 0) { - /** + /* * end of quote if matching non-backslashed character. * backslashes don't count for double quotes, though. */ @@ -3134,7 +3134,7 @@ class Postgres extends ADOdbBase } else { if (substr($line, $i, 1) == '\'' || substr($line, $i, 1) == '"') { $in_quote = substr($line, $i, 1); - }/** + }/* * start of $foo$ type quote? */ else { @@ -3159,7 +3159,7 @@ class Postgres extends ADOdbBase } else { if (substr($line, $i, 1) == ';' && !$bslash_count && !$paren_level) { $subline = substr(substr($line, 0, $i), $query_start); - /** + /* * insert a cosmetic newline, if this is not the first * line in the buffer */ @@ -3201,7 +3201,7 @@ class Postgres extends ADOdbBase $query_start = $i + $thislen; } - /** + /* * keyword or identifier? * We grab the whole string so that we don't * mistakenly see $foo$ inside an identifier as the start @@ -3244,7 +3244,7 @@ class Postgres extends ADOdbBase $line = null; } // end while - /** + /* * Process query at the end of file without a semicolon, so long as * it's non-empty. */ @@ -3424,7 +3424,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(); @@ -3466,7 +3466,7 @@ class Postgres extends ADOdbBase $sql = 'SELECT "'; } - $sql .= join('","', $show) . '" FROM '; + $sql .= join('","', $show).'" FROM '; } $this->fieldClean($table); @@ -3534,7 +3534,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 54fb0103..38c17df3 100644 --- a/src/database/Postgres10.php +++ b/src/database/Postgres10.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres74.php b/src/database/Postgres74.php index 906b09c3..1f3bb44b 100644 --- a/src/database/Postgres74.php +++ b/src/database/Postgres74.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres80.php b/src/database/Postgres80.php index 543a361e..fc4b4d06 100644 --- a/src/database/Postgres80.php +++ b/src/database/Postgres80.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres81.php b/src/database/Postgres81.php index 84db4233..60f89ada 100644 --- a/src/database/Postgres81.php +++ b/src/database/Postgres81.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres82.php b/src/database/Postgres82.php index ecd75c63..8a59e519 100644 --- a/src/database/Postgres82.php +++ b/src/database/Postgres82.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres83.php b/src/database/Postgres83.php index 4abb5dc4..7dcc7bca 100644 --- a/src/database/Postgres83.php +++ b/src/database/Postgres83.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres84.php b/src/database/Postgres84.php index 13fc5877..948bf504 100644 --- a/src/database/Postgres84.php +++ b/src/database/Postgres84.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres90.php b/src/database/Postgres90.php index 128b2c99..c8ed564a 100644 --- a/src/database/Postgres90.php +++ b/src/database/Postgres90.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres91.php b/src/database/Postgres91.php index 3773fb7d..41fca35d 100644 --- a/src/database/Postgres91.php +++ b/src/database/Postgres91.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Database; @@ -12,7 +12,8 @@ namespace PHPPgAdmin\Database; */ /** - * Id: Postgres82.php,v 1.10 2007/12/28 16:21:25 ioguix Exp $ + * Id: Postgres82.php,v 1.10 2007/12/28 16:21:25 ioguix Exp $. + * * @package PHPPgAdmin */ class Postgres91 extends Postgres92 diff --git a/src/database/Postgres92.php b/src/database/Postgres92.php index 86f8aa29..4d6028b0 100644 --- a/src/database/Postgres92.php +++ b/src/database/Postgres92.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres93.php b/src/database/Postgres93.php index e6c74d69..9dca62fe 100644 --- a/src/database/Postgres93.php +++ b/src/database/Postgres93.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres94.php b/src/database/Postgres94.php index 7d0eba44..0658ed1e 100644 --- a/src/database/Postgres94.php +++ b/src/database/Postgres94.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres95.php b/src/database/Postgres95.php index 8eafb3d2..843980a0 100644 --- a/src/database/Postgres95.php +++ b/src/database/Postgres95.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres96.php b/src/database/Postgres96.php index 04de96ec..3a3b2681 100644 --- a/src/database/Postgres96.php +++ b/src/database/Postgres96.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Database; diff --git a/src/database/RoleTrait.php b/src/database/RoleTrait.php index 9da924d9..bafa7b72 100644 --- a/src/database/RoleTrait.php +++ b/src/database/RoleTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Database; @@ -11,7 +11,6 @@ namespace PHPPgAdmin\Database; */ trait RoleTrait { - /** * Returns all roles in the database cluster. * @@ -90,16 +89,16 @@ trait RoleTrait * * @param string $rolename The name of the role to create * @param string $password A password for the role - * @param boolean $superuser Boolean whether or not the role is a superuser - * @param boolean $createdb Boolean whether or not the role can create databases - * @param boolean $createrole Boolean whether or not the role can create other roles - * @param boolean $inherits Boolean whether or not the role inherits the privileges from parent roles - * @param boolean $login Boolean whether or not the role will be allowed to login + * @param bool $superuser Boolean whether or not the role is a superuser + * @param bool $createdb Boolean whether or not the role can create databases + * @param bool $createrole Boolean whether or not the role can create other roles + * @param bool $inherits Boolean whether or not the role inherits the privileges from parent roles + * @param bool $login Boolean whether or not the role will be allowed to login * @param number $connlimit Number of concurrent connections the role can make * @param string $expiry String Format 'YYYY-MM-DD HH:MM:SS'. '' means never expire - * @param array $memberof (array) Roles to which the new role will be immediately added as a new member - * @param array $members (array) Roles which are automatically added as members of the new role - * @param array $adminmembers (array) Roles which are automatically added as admin members of the new role + * @param array $memberof (array) Roles to which the new role will be immediately added as a new member + * @param array $members (array) Roles which are automatically added as members of the new role + * @param array $adminmembers (array) Roles which are automatically added as admin members of the new role * * @return int 0 if operation was successful */ @@ -149,15 +148,15 @@ trait RoleTrait } if (is_array($memberof) && sizeof($memberof) > 0) { - $sql .= ' IN ROLE "' . join('", "', $memberof) . '"'; + $sql .= ' IN ROLE "'.join('", "', $memberof).'"'; } if (is_array($members) && sizeof($members) > 0) { - $sql .= ' ROLE "' . join('", "', $members) . '"'; + $sql .= ' ROLE "'.join('", "', $members).'"'; } if (is_array($adminmembers) && sizeof($adminmembers) > 0) { - $sql .= ' ADMIN "' . join('", "', $adminmembers) . '"'; + $sql .= ' ADMIN "'.join('", "', $adminmembers).'"'; } return $this->execute($sql); @@ -173,7 +172,7 @@ trait RoleTrait */ public function _encryptPassword($username, $password) { - return 'md5' . md5($password . $username); + return 'md5'.md5($password.$username); } /** @@ -181,19 +180,19 @@ trait RoleTrait * * @param string $rolename The name of the role to adjust * @param string $password A password for the role - * @param boolean $superuser Boolean whether or not the role is a superuser - * @param boolean $createdb Boolean whether or not the role can create databases - * @param boolean $createrole Boolean whether or not the role can create other roles - * @param boolean $inherits Boolean whether or not the role inherits the privileges from parent roles - * @param boolean $login Boolean whether or not the role will be allowed to login + * @param bool $superuser Boolean whether or not the role is a superuser + * @param bool $createdb Boolean whether or not the role can create databases + * @param bool $createrole Boolean whether or not the role can create other roles + * @param bool $inherits Boolean whether or not the role inherits the privileges from parent roles + * @param bool $login Boolean whether or not the role will be allowed to login * @param number $connlimit Number of concurrent connections the role can make * @param string $expiry string Format 'YYYY-MM-DD HH:MM:SS'. '' means never expire - * @param array $memberof (array) Roles to which the role will be immediately added as a new member - * @param array $members (array) Roles which are automatically added as members of the role - * @param array $adminmembers (array) Roles which are automatically added as admin members of the role - * @param array $memberofold (array) Original roles whose the role belongs to - * @param array $membersold (array) Original roles that are members of the role - * @param array $adminmembersold (array) Original roles that are admin members of the role + * @param array $memberof (array) Roles to which the role will be immediately added as a new member + * @param array $members (array) Roles which are automatically added as members of the role + * @param array $adminmembers (array) Roles which are automatically added as admin members of the role + * @param array $memberofold (array) Original roles whose the role belongs to + * @param array $membersold (array) Original roles that are members of the role + * @param array $adminmembersold (array) Original roles that are admin members of the role * @param string $newrolename The new name of the role * * @return bool|int 0 success @@ -281,16 +280,16 @@ trait RoleTrait * * @param string $rolename The name of the role to adjust * @param string $password A password for the role - * @param boolean $superuser Boolean whether or not the role is a superuser - * @param boolean $createdb Boolean whether or not the role can create databases - * @param boolean $createrole Boolean whether or not the role can create other roles - * @param boolean $inherits Boolean whether or not the role inherits the privileges from parent roles - * @param boolean $login Boolean whether or not the role will be allowed to login + * @param bool $superuser Boolean whether or not the role is a superuser + * @param bool $createdb Boolean whether or not the role can create databases + * @param bool $createrole Boolean whether or not the role can create other roles + * @param bool $inherits Boolean whether or not the role inherits the privileges from parent roles + * @param bool $login Boolean whether or not the role will be allowed to login * @param number $connlimit Number of concurrent connections the role can make * @param string $expiry string Format 'YYYY-MM-DD HH:MM:SS'. '' means never expire - * @param array $memberof (array) Roles to which the role will be immediately added as a new member - * @param array $members (array) Roles which are automatically added as members of the role - * @param array $adminmembers (array) Roles which are automatically added as admin members of the role + * @param array $memberof (array) Roles to which the role will be immediately added as a new member + * @param array $members (array) Roles which are automatically added as members of the role + * @param array $adminmembers (array) Roles which are automatically added as admin members of the role * @param string $memberofold (array) Original roles whose the role belongs to * @param string $membersold (array) Original roles that are members of the role * @param string $adminmembersold (array) Original roles that are admin members of the role @@ -422,7 +421,7 @@ trait RoleTrait * * @param string $role The name of the target role * @param string $rolename The name of the role that will belong to the target role - * @param int $admin (optional) Flag to grant the admin option + * @param int $admin (optional) Flag to grant the admin option * * @return int 0 if operation was successful */ @@ -485,10 +484,10 @@ trait RoleTrait * * @param string $username The username of the user to create * @param string $password A password for the user - * @param boolean $createdb boolean Whether or not the user can create databases - * @param boolean $createuser boolean Whether or not the user can create other users + * @param bool $createdb boolean Whether or not the user can create databases + * @param bool $createuser boolean Whether or not the user can create other users * @param string $expiry string Format 'YYYY-MM-DD HH:MM:SS'. '' means never expire - * @param array $groups The groups to create the user in + * @param array $groups The groups to create the user in * * @return int 0 if operation was successful * @@ -510,7 +509,7 @@ trait RoleTrait $sql .= $createdb ? ' CREATEDB' : ' NOCREATEDB'; $sql .= $createuser ? ' CREATEUSER' : ' NOCREATEUSER'; if (is_array($groups) && sizeof($groups) > 0) { - $sql .= ' IN GROUP "' . join('", "', $groups) . '"'; + $sql .= ' IN GROUP "'.join('", "', $groups).'"'; } if ($expiry != '') { @@ -527,8 +526,8 @@ trait RoleTrait * * @param string $username The username of the user to modify * @param string $password A new password for the user - * @param bool $createdb boolean Whether or not the user can create databases - * @param bool $createuser boolean Whether or not the user can create other users + * @param bool $createdb boolean Whether or not the user can create databases + * @param bool $createuser boolean Whether or not the user can create other users * @param string $expiry string Format 'YYYY-MM-DD HH:MM:SS'. '' means never expire. * @param string $newname The new name of the user * @@ -586,8 +585,8 @@ trait RoleTrait * * @param string $username The username of the user to modify * @param string $password A new password for the user - * @param bool $createdb boolean Whether or not the user can create databases - * @param bool $createuser boolean Whether or not the user can create other users + * @param bool $createdb boolean Whether or not the user can create databases + * @param bool $createuser boolean Whether or not the user can create other users * @param string $expiry string Format 'YYYY-MM-DD HH:MM:SS'. '' means never expire. * * @return int 0 if operation was successful @@ -767,7 +766,7 @@ trait RoleTrait * Creates a new group. * * @param string $groname The name of the group - * @param array $users An array of users to add to the group + * @param array $users An array of users to add to the group * * @return int 0 if operation was successful */ @@ -779,7 +778,7 @@ trait RoleTrait if (is_array($users) && sizeof($users) > 0) { $this->fieldArrayClean($users); - $sql .= ' WITH USER "' . join('", "', $users) . '"'; + $sql .= ' WITH USER "'.join('", "', $users).'"'; } return $this->execute($sql); @@ -805,14 +804,14 @@ trait RoleTrait * Grants a privilege to a user, group or public. * * @param string $mode 'GRANT' or 'REVOKE'; - * @param mixed $type The type of object + * @param mixed $type The type of object * @param string $object The name of the object - * @param bool $public True to grant to public, false otherwise - * @param mixed $usernames the array of usernames to grant privs to - * @param mixed $groupnames the array of group names to grant privs to - * @param mixed $privileges The array of privileges to grant (eg. ('SELECT', 'ALL PRIVILEGES', etc.) ) - * @param bool $grantoption True if has grant option, false otherwise - * @param bool $cascade True for cascade revoke, false otherwise + * @param bool $public True to grant to public, false otherwise + * @param mixed $usernames the array of usernames to grant privs to + * @param mixed $groupnames the array of group names to grant privs to + * @param mixed $privileges The array of privileges to grant (eg. ('SELECT', 'ALL PRIVILEGES', etc.) ) + * @param bool $grantoption True if has grant option, false otherwise + * @param bool $cascade True for cascade revoke, false otherwise * @param string $table the column's table if type=column * * @return int 0 if operation was successful @@ -860,9 +859,9 @@ trait RoleTrait } else { if ($type == 'column') { $this->fieldClean($object); - $sql .= ' ' . join(" (\"{$object}\"), ", $privileges); + $sql .= ' '.join(" (\"{$object}\"), ", $privileges); } else { - $sql .= ' ' . join(', ', $privileges); + $sql .= ' '.join(', ', $privileges); } } diff --git a/src/database/SequenceTrait.php b/src/database/SequenceTrait.php index e1205c32..b02aeedf 100644 --- a/src/database/SequenceTrait.php +++ b/src/database/SequenceTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Database; @@ -11,7 +11,6 @@ namespace PHPPgAdmin\Database; */ trait SequenceTrait { - /** * Returns all sequences in the current database. * @@ -168,7 +167,7 @@ trait SequenceTrait * @param number $maxvalue The max value * @param number $startvalue The starting value * @param number $cachevalue The cache value - * @param boolean $cycledvalue True if cycled, false otherwise + * @param bool $cycledvalue True if cycled, false otherwise * * @return int 0 if operation was successful */ @@ -221,18 +220,18 @@ trait SequenceTrait /** * Alters a sequence. * - * @param string $sequence The name of the sequence - * @param string $name The new name for the sequence - * @param string $comment The comment on the sequence - * @param string $owner The new owner for the sequence - * @param string $schema The new schema for the sequence - * @param string $increment The increment - * @param number $minvalue The min value - * @param number $maxvalue The max value - * @param number $restartvalue The starting value - * @param number $cachevalue The cache value - * @param boolean|null $cycledvalue True if cycled, false otherwise - * @param number $startvalue The sequence start value when issueing a restart + * @param string $sequence The name of the sequence + * @param string $name The new name for the sequence + * @param string $comment The comment on the sequence + * @param string $owner The new owner for the sequence + * @param string $schema The new schema for the sequence + * @param string $increment The increment + * @param number $minvalue The min value + * @param number $maxvalue The max value + * @param number $restartvalue The starting value + * @param number $cachevalue The cache value + * @param null|bool $cycledvalue True if cycled, false otherwise + * @param number $startvalue The sequence start value when issueing a restart * * @return bool|int 0 success */ @@ -294,17 +293,17 @@ trait SequenceTrait * SHOULDN'T BE CALLED OUTSIDE OF A TRANSACTION. * * @param \PHPPgAdmin\ADORecordSet $seqrs The sequence recordSet returned by getSequence() - * @param string $name The new name for the sequence - * @param string $comment The comment on the sequence - * @param string $owner The new owner for the sequence - * @param string $schema The new schema for the sequence - * @param string $increment The increment - * @param string $minvalue The min value - * @param string $maxvalue The max value - * @param string $restartvalue The starting value - * @param string $cachevalue The cache value - * @param boolean|null $cycledvalue True if cycled, false otherwise - * @param string $startvalue The sequence start value when issueing a restart + * @param string $name The new name for the sequence + * @param string $comment The comment on the sequence + * @param string $owner The new owner for the sequence + * @param string $schema The new schema for the sequence + * @param string $increment The increment + * @param string $minvalue The min value + * @param string $maxvalue The max value + * @param string $restartvalue The starting value + * @param string $cachevalue The cache value + * @param null|bool $cycledvalue True if cycled, false otherwise + * @param string $startvalue The sequence start value when issueing a restart * * @return int 0 success */ @@ -382,7 +381,7 @@ trait SequenceTrait * Alter a sequence's owner. * * @param \PHPPgAdmin\ADORecordSet $seqrs The sequence RecordSet returned by getSequence() - * @param string $owner the new owner of the sequence + * @param string $owner the new owner of the sequence * * @return int 0 if operation was successful * @@ -409,13 +408,13 @@ trait SequenceTrait * Alter a sequence's properties. * * @param \PHPPgAdmin\ADORecordSet $seqrs The sequence RecordSet returned by getSequence() - * @param number $increment The sequence incremental value - * @param number $minvalue The sequence minimum value - * @param number $maxvalue The sequence maximum value - * @param number $restartvalue The sequence current value - * @param number $cachevalue The sequence cache value - * @param boolean|null $cycledvalue Sequence can cycle ? - * @param number $startvalue The sequence start value when issueing a restart + * @param number $increment The sequence incremental value + * @param number $minvalue The sequence minimum value + * @param number $maxvalue The sequence maximum value + * @param number $restartvalue The sequence current value + * @param number $cachevalue The sequence cache value + * @param null|bool $cycledvalue Sequence can cycle ? + * @param number $startvalue The sequence start value when issueing a restart * * @return int 0 if operation was successful */ @@ -457,7 +456,7 @@ trait SequenceTrait // toggle cycle yes/no if (!is_null($cycledvalue)) { - $sql .= (!$cycledvalue ? ' NO ' : '') . ' CYCLE'; + $sql .= (!$cycledvalue ? ' NO ' : '').' CYCLE'; } if ($sql != '') { @@ -475,7 +474,7 @@ trait SequenceTrait * Rename a sequence. * * @param \PHPPgAdmin\ADORecordSet $seqrs The sequence RecordSet returned by getSequence() - * @param string $name The new name for the sequence + * @param string $name The new name for the sequence * * @return int 0 if operation was successful */ @@ -500,8 +499,8 @@ trait SequenceTrait /** * Alter a sequence's schema. * - * @param \PHPPgAdmin\ADORecordSet $seqrs The sequence RecordSet returned by getSequence() - * @param string $schema + * @param \PHPPgAdmin\ADORecordSet $seqrs The sequence RecordSet returned by getSequence() + * @param string $schema * * @return int 0 if operation was successful * diff --git a/src/database/TableTrait.php b/src/database/TableTrait.php index 9d749838..fb2907f8 100644 --- a/src/database/TableTrait.php +++ b/src/database/TableTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Database; @@ -11,7 +11,6 @@ namespace PHPPgAdmin\Database; */ trait TableTrait { - /** * Return all tables in current database (and schema). * @@ -111,7 +110,7 @@ trait TableTrait /** * Returns the SQL definition for the table. - * MUST be run within a transaction + * MUST be run within a transaction. * * @param string $table The table to define * @param bool|true $clean True to issue drop command, false otherwise @@ -147,7 +146,7 @@ trait TableTrait } // Output a reconnect command to create the table as the correct user - $sql = $this->getChangeUserSQL($t->fields['relowner']) . "\n\n"; + $sql = $this->getChangeUserSQL($t->fields['relowner'])."\n\n"; // Set schema search path $sql .= "SET search_path = \"{$t->fields['nspname']}\", pg_catalog;\n\n"; @@ -180,7 +179,7 @@ trait TableTrait $sql .= ' BIGSERIAL'; } } else { - $sql .= ' ' . $this->formatType($atts->fields['type'], $atts->fields['atttypmod']); + $sql .= ' '.$this->formatType($atts->fields['type'], $atts->fields['atttypmod']); // Add NOT NULL if necessary if ($this->phpBool($atts->fields['attnotnull'])) { @@ -220,12 +219,12 @@ trait TableTrait switch ($cons->fields['contype']) { case 'p': $keys = $this->getAttributeNames($table, explode(' ', $cons->fields['indkey'])); - $sql .= 'PRIMARY KEY (' . join(',', $keys) . ')'; + $sql .= 'PRIMARY KEY ('.join(',', $keys).')'; break; case 'u': $keys = $this->getAttributeNames($table, explode(' ', $cons->fields['indkey'])); - $sql .= 'UNIQUE (' . join(',', $keys) . ')'; + $sql .= 'UNIQUE ('.join(',', $keys).')'; break; default: @@ -267,7 +266,7 @@ trait TableTrait * $this->fieldClean($parents->fields['schemaname']); * $sql .= "\"{$parents->fields['schemaname']}\"."; * } - * $sql .= "\"{$parents->fields['relname']}\""; + * $sql .= "\"{$parents->fields['relname']}\"";. * * $parents->moveNext(); * if (!$parents->EOF) $sql .= ', '; @@ -351,7 +350,7 @@ trait TableTrait if (sizeof($privs) > 0) { $sql .= "\n-- Privileges\n\n"; - /** + /* * Always start with REVOKE ALL FROM PUBLIC, so that we don't have to * wire-in knowledge about the default public privileges for different * kinds of objects. @@ -374,7 +373,7 @@ trait TableTrait } // Output privileges with no GRANT OPTION - $sql .= 'GRANT ' . join(', ', $nongrant) . " ON TABLE \"{$t->fields['relname']}\" TO "; + $sql .= 'GRANT '.join(', ', $nongrant)." ON TABLE \"{$t->fields['relname']}\" TO "; switch ($v[0]) { case 'public': $sql .= "PUBLIC;\n"; @@ -416,7 +415,7 @@ trait TableTrait $sql .= "SET SESSION AUTHORIZATION '{$grantor}';\n"; } - $sql .= 'GRANT ' . join(', ', $v[4]) . " ON \"{$t->fields['relname']}\" TO "; + $sql .= 'GRANT '.join(', ', $v[4])." ON \"{$t->fields['relname']}\" TO "; switch ($v[0]) { case 'public': $sql .= 'PUBLIC'; @@ -649,7 +648,7 @@ trait TableTrait if ($indexes->recordCount() > 0) { $sql .= "\n-- Indexes\n\n"; while (!$indexes->EOF) { - $sql .= $indexes->fields['inddef'] . ";\n"; + $sql .= $indexes->fields['inddef'].";\n"; $indexes->moveNext(); } @@ -684,7 +683,7 @@ trait TableTrait if ($rules->recordCount() > 0) { $sql .= "\n-- Rules\n\n"; while (!$rules->EOF) { - $sql .= $rules->fields['definition'] . "\n"; + $sql .= $rules->fields['definition']."\n"; $rules->moveNext(); } @@ -697,7 +696,7 @@ trait TableTrait * Grabs a list of indexes for a table. * * @param string $table The name of a table whose indexes to retrieve - * @param bool $unique Only get unique/pk indexes + * @param bool $unique Only get unique/pk indexes * * @return \PHPPgAdmin\ADORecordSet A recordset */ @@ -780,19 +779,19 @@ trait TableTrait * Creates a new table in the database. * * @param string $name The name of the table - * @param int $fields The number of fields - * @param array $field An array of field names - * @param array $type An array of field types - * @param array $array An array of '' or '[]' for each type if it's an array or not - * @param array $length An array of field lengths - * @param array $notnull An array of not null - * @param array $default An array of default values - * @param bool $withoutoids True if WITHOUT OIDS, false otherwise - * @param array $colcomment An array of comments - * @param string $tblcomment the comment for the table + * @param int $fields The number of fields + * @param array $field An array of field names + * @param array $type An array of field types + * @param array $array An array of '' or '[]' for each type if it's an array or not + * @param array $length An array of field lengths + * @param array $notnull An array of not null + * @param array $default An array of default values + * @param bool $withoutoids True if WITHOUT OIDS, false otherwise + * @param array $colcomment An array of comments + * @param string $tblcomment the comment for the table * @param string $tablespace The tablespace name ('' means none/default) - * @param array $uniquekey An Array indicating the fields that are unique (those indexes that are set) - * @param array $primarykey An Array indicating the field used for the primarykey (those indexes that are set) + * @param array $uniquekey An Array indicating the fields that are unique (those indexes that are set) + * @param array $primarykey An Array indicating the field used for the primarykey (those indexes that are set) * * @return bool|int 0 success */ @@ -912,7 +911,7 @@ trait TableTrait } } if (count($primarykeycolumns) > 0) { - $sql .= ', PRIMARY KEY (' . implode(', ', $primarykeycolumns) . ')'; + $sql .= ', PRIMARY KEY ('.implode(', ', $primarykeycolumns).')'; } $sql .= ')'; @@ -962,7 +961,7 @@ trait TableTrait * Creates a new table in the database copying attribs and other properties from another table. * * @param string $name The name of the table - * @param array $like an array giving the schema ans the name of the table from which attribs are copying + * @param array $like an array giving the schema ans the name of the table from which attribs are copying * from: array( * 'table' => table name, * 'schema' => the schema name, @@ -1062,11 +1061,11 @@ trait TableTrait * SHOULDN'T BE CALLED OUTSIDE OF A TRANSACTION. * * @param \PHPPgAdmin\ADORecordSet $tblrs The table recordSet returned by getTable() - * @param string $name The new name for the table - * @param string $owner The new owner for the table - * @param string $schema The new schema for the table - * @param string $comment The comment on the table - * @param string $tablespace The new tablespace for the table ('' means leave as is) + * @param string $name The new name for the table + * @param string $owner The new owner for the table + * @param string $schema The new schema for the table + * @param string $comment The comment on the table + * @param string $tablespace The new tablespace for the table ('' means leave as is) * * @return int 0 success */ @@ -1115,8 +1114,8 @@ trait TableTrait * Alter a table's owner * /!\ this function is called from _alterTable which take care of escaping fields. * - * @param \PHPPgAdmin\ADORecordSet $tblrs The table RecordSet returned by getTable() - * @param string|null $owner + * @param \PHPPgAdmin\ADORecordSet $tblrs The table RecordSet returned by getTable() + * @param null|string $owner * * @return int 0 if operation was successful */ @@ -1141,8 +1140,8 @@ trait TableTrait * Alter a table's tablespace * /!\ this function is called from _alterTable which take care of escaping fields. * - * @param \PHPPgAdmin\ADORecordSet $tblrs The table RecordSet returned by getTable() - * @param string|null $tablespace + * @param \PHPPgAdmin\ADORecordSet $tblrs The table RecordSet returned by getTable() + * @param null|string $tablespace * * @return int 0 if operation was successful */ @@ -1168,7 +1167,7 @@ trait TableTrait * /!\ this function is called from _alterTable which take care of escaping fields. * * @param \PHPPgAdmin\ADORecordSet $tblrs The table RecordSet returned by getTable() - * @param string $name The new table's name + * @param string $name The new table's name * * @return int 0 if operation was successful */ @@ -1199,7 +1198,7 @@ trait TableTrait * /!\ this function is called from _alterTable which take care of escaping fields. * * @param \PHPPgAdmin\ADORecordSet $tblrs The table RecordSet returned by getTable() - * @param string|null $schema + * @param null|string $schema * * @return int 0 if operation was successful */ @@ -1222,8 +1221,8 @@ trait TableTrait /** * Empties a table in the database. * - * @param string $table The table to be emptied - * @param boolean $cascade True to cascade truncate, false to restrict + * @param string $table The table to be emptied + * @param bool $cascade True to cascade truncate, false to restrict * * @return array<integer,mixed|string> 0 if operation was successful */ @@ -1235,7 +1234,7 @@ trait TableTrait $sql = "TRUNCATE TABLE \"{$f_schema}\".\"{$table}\" "; if ($cascade) { - $sql = $sql . ' CASCADE'; + $sql = $sql.' CASCADE'; } $status = $this->execute($sql); @@ -1247,7 +1246,7 @@ trait TableTrait * Removes a table from the database. * * @param string $table The table to drop - * @param boolean $cascade True to cascade drop, false to restrict + * @param bool $cascade True to cascade drop, false to restrict * * @return int 0 if operation was successful */ @@ -1271,10 +1270,10 @@ trait TableTrait * @param string $table The table to add to * @param string $column The name of the new column * @param string $type The type of the column - * @param boolean $array True if array type, false otherwise - * @param int $length The optional size of the column (ie. 30 for varchar(30)) - * @param bool $notnull True if NOT NULL, false otherwise - * @param mixed $default The default for the column. '' for none. + * @param bool $array True if array type, false otherwise + * @param int $length The optional size of the column (ie. 30 for varchar(30)) + * @param bool $notnull True if NOT NULL, false otherwise + * @param mixed $default The default for the column. '' for none. * @param string $comment comment for the column * * @return bool|int 0 success @@ -1325,7 +1324,7 @@ trait TableTrait // DEFAULT clause if ($default != '') { - $sql .= ' DEFAULT ' . $default; + $sql .= ' DEFAULT '.$default; } } @@ -1357,13 +1356,13 @@ trait TableTrait * @param string $table The table in which the column resides * @param string $column The column to alter * @param string $name The new name for the column - * @param boolean $notnull (boolean) True if not null, false otherwise - * @param boolean $oldnotnull (boolean) True if column is already not null, false otherwise - * @param mixed $default The new default for the column - * @param mixed $olddefault The old default for the column + * @param bool $notnull (boolean) True if not null, false otherwise + * @param bool $oldnotnull (boolean) True if column is already not null, false otherwise + * @param mixed $default The new default for the column + * @param mixed $olddefault The old default for the column * @param string $type The new type for the column - * @param integer $length The optional size of the column (ie. 30 for varchar(30)) - * @param boolean $array True if array type, false otherwise + * @param int $length The optional size of the column (ie. 30 for varchar(30)) + * @param bool $array True if array type, false otherwise * @param string $oldtype The old type for the column * @param string $comment Comment for the column * @@ -1411,7 +1410,7 @@ trait TableTrait $toAlter = []; // Create the command for changing nullability if ($notnull != $oldnotnull) { - $toAlter[] = "ALTER COLUMN \"{$name}\" " . ($notnull ? 'SET' : 'DROP') . ' NOT NULL'; + $toAlter[] = "ALTER COLUMN \"{$name}\" ".($notnull ? 'SET' : 'DROP').' NOT NULL'; } // Add default, if it has changed @@ -1460,7 +1459,7 @@ trait TableTrait if (!empty($toAlter)) { // Initialise an empty SQL string $sql = "ALTER TABLE \"{$f_schema}\".\"{$table}\" " - . implode(',', $toAlter); + .implode(',', $toAlter); $status = $this->execute($sql); if ($status != 0) { @@ -1508,7 +1507,7 @@ trait TableTrait * * @param string $table The table from which to drop * @param string $column The column name to set - * @param mixed $default The new default value + * @param mixed $default The new default value * * @return int 0 if operation was successful */ @@ -1529,7 +1528,7 @@ trait TableTrait * * @param string $table The table that contains the column * @param string $column The column to alter - * @param bool $state True to set null, false to set not null + * @param bool $state True to set null, false to set not null * * @return int 0 if operation was successful */ @@ -1540,7 +1539,7 @@ trait TableTrait $this->fieldClean($table); $this->fieldClean($column); - $sql = "ALTER TABLE \"{$f_schema}\".\"{$table}\" ALTER COLUMN \"{$column}\" " . ($state ? 'DROP' : 'SET') . ' NOT NULL'; + $sql = "ALTER TABLE \"{$f_schema}\".\"{$table}\" ALTER COLUMN \"{$column}\" ".($state ? 'DROP' : 'SET').' NOT NULL'; return $this->execute($sql); } @@ -1550,7 +1549,7 @@ trait TableTrait * * @param string $table The table from which to drop a column * @param string $column The column to be dropped - * @param bool $cascade True to cascade drop, false to restrict + * @param bool $cascade True to cascade drop, false to restrict * * @return int 0 if operation was successful */ @@ -1649,7 +1648,7 @@ trait TableTrait * @@ Note: Really needs to use a cursor * * @param string $relation The name of a relation - * @param bool $oids true to dump also the oids + * @param bool $oids true to dump also the oids * * @return \PHPPgAdmin\ADORecordSet A recordset on success */ @@ -1659,7 +1658,7 @@ trait TableTrait // Actually retrieve the rows if ($oids) { - $oid_str = $this->id . ', '; + $oid_str = $this->id.', '; } else { $oid_str = ''; } @@ -1730,7 +1729,7 @@ trait TableTrait * * @param string $table The table for which to retrieve the identifier * - * @return array<integer,string>|array|int An array mapping attribute number to attribute name, empty for no identifiers + * @return array|array<integer,string>|int An array mapping attribute number to attribute name, empty for no identifiers */ public function getRowIdentifier($table) { @@ -1788,11 +1787,11 @@ trait TableTrait * Adds a new row to a table. * * @param string $table The table in which to insert - * @param array $fields Array of given field in values - * @param array $values Array of new values for the row - * @param array $nulls An array mapping column => something if it is to be null - * @param array $format An array of the data type (VALUE or EXPRESSION) - * @param array $types An array of field types + * @param array $fields Array of given field in values + * @param array $values Array of new values for the row + * @param array $nulls An array mapping column => something if it is to be null + * @param array $format An array of the data type (VALUE or EXPRESSION) + * @param array $types An array of field types * * @return int 0 if operation was successful */ @@ -1819,12 +1818,12 @@ trait TableTrait if (isset($nulls[$i])) { $sql .= ',NULL'; } else { - $sql .= ',' . $this->formatValue($types[$i], $format[$i], $value); + $sql .= ','.$this->formatValue($types[$i], $format[$i], $value); } } - $sql = "INSERT INTO \"{$f_schema}\".\"{$table}\" (\"" . implode('","', $fields) . '") - VALUES (' . substr($sql, 1) . ')'; + $sql = "INSERT INTO \"{$f_schema}\".\"{$table}\" (\"".implode('","', $fields).'") + VALUES ('.substr($sql, 1).')'; return $this->execute($sql); } @@ -1836,8 +1835,8 @@ trait TableTrait * Formats a value or expression for sql purposes. * * @param string $type The type of the field - * @param mixed $format VALUE or EXPRESSION - * @param mixed $value The actual value entered in the field. Can be NULL + * @param mixed $format VALUE or EXPRESSION + * @param mixed $value The actual value entered in the field. Can be NULL * * @return mixed The suitably quoted and escaped value */ @@ -1898,11 +1897,11 @@ trait TableTrait * Updates a row in a table. * * @param string $table The table in which to update - * @param array $vars An array mapping new values for the row - * @param array $nulls An array mapping column => something if it is to be null - * @param array $format An array of the data type (VALUE or EXPRESSION) - * @param array $types An array of field types - * @param array $keyarr An array mapping column => value to update + * @param array $vars An array mapping new values for the row + * @param array $nulls An array mapping column => something if it is to be null + * @param array $format An array of the data type (VALUE or EXPRESSION) + * @param array $types An array of field types + * @param array $keyarr An array mapping column => value to update * * @return bool|int 0 success */ @@ -1979,7 +1978,7 @@ trait TableTrait * Delete a row from a table. * * @param string $table The table from which to delete - * @param array $key An array mapping column => value to delete + * @param array $key An array mapping column => value to delete * @param string $schema the schema of the table * * @return bool|int 0 success diff --git a/src/database/ViewTrait.php b/src/database/ViewTrait.php index c1664438..0132f804 100644 --- a/src/database/ViewTrait.php +++ b/src/database/ViewTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Database; @@ -179,10 +179,10 @@ trait ViewTrait * 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 Schema name - * @param string $comment The comment on the view + * @param string $name The new name for the view + * @param string $owner The new owner for the view + * @param string $schema Schema name + * @param string $comment The comment on the view * * @return int 0 success */ @@ -250,7 +250,7 @@ trait ViewTrait * Rename a view. * * @param \PHPPgAdmin\ADORecordSet $vwrs The view recordSet returned by getView() - * @param string $name The new view's name + * @param string $name The new view's name * * @return int 0 if operation was successful */ diff --git a/src/decorators/ActionUrlDecorator.php b/src/decorators/ActionUrlDecorator.php index 05dbb311..36cecc98 100644 --- a/src/decorators/ActionUrlDecorator.php +++ b/src/decorators/ActionUrlDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/ArrayMergeDecorator.php b/src/decorators/ArrayMergeDecorator.php index 26c73849..909ecde4 100644 --- a/src/decorators/ArrayMergeDecorator.php +++ b/src/decorators/ArrayMergeDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/BranchUrlDecorator.php b/src/decorators/BranchUrlDecorator.php index bff6ea3b..fd0c54b4 100644 --- a/src/decorators/BranchUrlDecorator.php +++ b/src/decorators/BranchUrlDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/CallbackDecorator.php b/src/decorators/CallbackDecorator.php index e5158223..34bd307b 100644 --- a/src/decorators/CallbackDecorator.php +++ b/src/decorators/CallbackDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/ConcatDecorator.php b/src/decorators/ConcatDecorator.php index d7364a22..23840548 100644 --- a/src/decorators/ConcatDecorator.php +++ b/src/decorators/ConcatDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/Decorator.php b/src/decorators/Decorator.php index a37e28e6..e34cc184 100644 --- a/src/decorators/Decorator.php +++ b/src/decorators/Decorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/FieldDecorator.php b/src/decorators/FieldDecorator.php index f4eac7b5..5cf0af88 100644 --- a/src/decorators/FieldDecorator.php +++ b/src/decorators/FieldDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/IfEmptyDecorator.php b/src/decorators/IfEmptyDecorator.php index ffd5a1f9..723e6e08 100644 --- a/src/decorators/IfEmptyDecorator.php +++ b/src/decorators/IfEmptyDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/RedirectUrlDecorator.php b/src/decorators/RedirectUrlDecorator.php index 142ef6df..c8ded432 100644 --- a/src/decorators/RedirectUrlDecorator.php +++ b/src/decorators/RedirectUrlDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/ReplaceDecorator.php b/src/decorators/ReplaceDecorator.php index 3c1deb04..ede61793 100644 --- a/src/decorators/ReplaceDecorator.php +++ b/src/decorators/ReplaceDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/UrlDecorator.php b/src/decorators/UrlDecorator.php index 6549c29c..95d3bddf 100644 --- a/src/decorators/UrlDecorator.php +++ b/src/decorators/UrlDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Decorators; diff --git a/src/help/PostgresDoc74.php b/src/help/PostgresDoc74.php index ccdadb31..729f6b3a 100644 --- a/src/help/PostgresDoc74.php +++ b/src/help/PostgresDoc74.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc80.php b/src/help/PostgresDoc80.php index 814f2289..5f3589de 100644 --- a/src/help/PostgresDoc80.php +++ b/src/help/PostgresDoc80.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc81.php b/src/help/PostgresDoc81.php index 089c2ef7..9d9658c3 100644 --- a/src/help/PostgresDoc81.php +++ b/src/help/PostgresDoc81.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc82.php b/src/help/PostgresDoc82.php index d80894fa..95551399 100644 --- a/src/help/PostgresDoc82.php +++ b/src/help/PostgresDoc82.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc83.php b/src/help/PostgresDoc83.php index 1d45d809..1f8276e2 100644 --- a/src/help/PostgresDoc83.php +++ b/src/help/PostgresDoc83.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc84.php b/src/help/PostgresDoc84.php index 5de08adf..5d45d039 100644 --- a/src/help/PostgresDoc84.php +++ b/src/help/PostgresDoc84.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc90.php b/src/help/PostgresDoc90.php index 563762d7..c03c073d 100644 --- a/src/help/PostgresDoc90.php +++ b/src/help/PostgresDoc90.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc91.php b/src/help/PostgresDoc91.php index a13b3810..469050b1 100644 --- a/src/help/PostgresDoc91.php +++ b/src/help/PostgresDoc91.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc92.php b/src/help/PostgresDoc92.php index 4d8feb9c..70fabdda 100644 --- a/src/help/PostgresDoc92.php +++ b/src/help/PostgresDoc92.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc93.php b/src/help/PostgresDoc93.php index 3e8af9e8..f40ab8c2 100644 --- a/src/help/PostgresDoc93.php +++ b/src/help/PostgresDoc93.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc94.php b/src/help/PostgresDoc94.php index 313f51ac..46a580ae 100644 --- a/src/help/PostgresDoc94.php +++ b/src/help/PostgresDoc94.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc95.php b/src/help/PostgresDoc95.php index 84dfaccb..70d15bde 100644 --- a/src/help/PostgresDoc95.php +++ b/src/help/PostgresDoc95.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc96.php b/src/help/PostgresDoc96.php index 6bc3d7c7..b472a3db 100644 --- a/src/help/PostgresDoc96.php +++ b/src/help/PostgresDoc96.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\Help; diff --git a/src/lib.inc.php b/src/lib.inc.php index 3c83c58a..93db0a30 100644 --- a/src/lib.inc.php +++ b/src/lib.inc.php @@ -120,6 +120,10 @@ $container['errors'] = []; $container['requestobj'] = $container['request']; $container['responseobj'] = $container['response']; +$container->offsetSet('server', isset($_REQUEST['server']) ? $_REQUEST['server'] : null); +$container->offsetSet('database', isset($_REQUEST['database']) ? $_REQUEST['database'] : null); +$container->offsetSet('schema', isset($_REQUEST['schema']) ? $_REQUEST['schema'] : null); + $container['utils'] = function ($c) { $utils = new \PHPPgAdmin\ContainerUtils($c); return $utils; diff --git a/src/views/acinsert.php b/src/views/acinsert.php index 31928844..55d7736a 100644 --- a/src/views/acinsert.php +++ b/src/views/acinsert.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ $do_render = false; if (!defined('BASE_PATH')) { diff --git a/src/views/aggregates.php b/src/views/aggregates.php index fdb22c73..60e7936a 100644 --- a/src/views/aggregates.php +++ b/src/views/aggregates.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ // Include application functions diff --git a/src/views/alldb.php b/src/views/alldb.php index 08ab7c24..193dcc4a 100644 --- a/src/views/alldb.php +++ b/src/views/alldb.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ // Include application functions diff --git a/src/views/browser.php b/src/views/browser.php index 87c6a154..3e670081 100644 --- a/src/views/browser.php +++ b/src/views/browser.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ $do_render = false; if (!defined('BASE_PATH')) { diff --git a/src/views/casts.php b/src/views/casts.php index 8bba8a94..74fada42 100644 --- a/src/views/casts.php +++ b/src/views/casts.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ // Include application functions diff --git a/src/views/colproperties.php b/src/views/colproperties.php index 5887ad05..ee836928 100644 --- a/src/views/colproperties.php +++ b/src/views/colproperties.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ // Include application functions diff --git a/src/views/constraints.php b/src/views/constraints.php index 83fc7db1..ea7cb0c4 100644 --- a/src/views/constraints.php +++ b/src/views/constraints.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ // Include application functions diff --git a/src/views/conversions.php b/src/views/conversions.php index aebefeea..51e41d38 100644 --- a/src/views/conversions.php +++ b/src/views/conversions.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ // Include application functions diff --git a/src/views/database.php b/src/views/database.php index 2b8ffb15..6410fd25 100644 --- a/src/views/database.php +++ b/src/views/database.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ // Include application functions diff --git a/src/views/dataexport.php b/src/views/dataexport.php index 0522bb4e..a25e7d35 100644 --- a/src/views/dataexport.php +++ b/src/views/dataexport.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ $do_render = false; if (!defined('BASE_PATH')) { diff --git a/src/views/dataimport.php b/src/views/dataimport.php index 6f428902..06a77614 100644 --- a/src/views/dataimport.php +++ b/src/views/dataimport.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ $do_render = false; if (!defined('BASE_PATH')) { diff --git a/src/views/dbexport.php b/src/views/dbexport.php index 75bf2854..eb8763e9 100644 --- a/src/views/dbexport.php +++ b/src/views/dbexport.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ $do_render = false; if (!defined('BASE_PATH')) { diff --git a/src/views/display.php b/src/views/display.php index fd059c0a..29176692 100644 --- a/src/views/display.php +++ b/src/views/display.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ // Include application functions diff --git a/src/views/domains.php b/src/views/domains.php index 5c80a99b..2d293da2 100644 --- a/src/views/domains.php +++ b/src/views/domains.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ // Include application functions diff --git a/src/views/fulltext.php b/src/views/fulltext.php index 5107f2df..05fcbdf9 100644 --- a/src/views/fulltext.php +++ b/src/views/fulltext.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ // Include application functions diff --git a/src/views/functions.php b/src/views/functions.php index f55dca35..cbc466ea 100644 --- a/src/views/functions.php +++ b/src/views/functions.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ // Include application functions diff --git a/src/views/groups.php b/src/views/groups.php index 94730503..4cf6504f 100644 --- a/src/views/groups.php +++ b/src/views/groups.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ // Include application functions diff --git a/src/views/help.php b/src/views/help.php index 98b71366..4393b32f 100644 --- a/src/views/help.php +++ b/src/views/help.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ // Include application functions diff --git a/src/views/history.php b/src/views/history.php index d095a4b9..462f7398 100644 --- a/src/views/history.php +++ b/src/views/history.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ // Include application functions diff --git a/src/views/indexes.php b/src/views/indexes.php index 36838f77..2c1a22a8 100644 --- a/src/views/indexes.php +++ b/src/views/indexes.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ // Include application functions diff --git a/src/views/info.php b/src/views/info.php index 1f52d67b..1df2cd71 100644 --- a/src/views/info.php +++ b/src/views/info.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ // Include application functions diff --git a/src/views/intro.php b/src/views/intro.php index c1839965..635f0cd0 100644 --- a/src/views/intro.php +++ b/src/views/intro.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ $do_render = false; if (!defined('BASE_PATH')) { diff --git a/src/views/languages.php b/src/views/languages.php index 2a3547fe..65a02b80 100644 --- a/src/views/languages.php +++ b/src/views/languages.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ // Include application functions diff --git a/src/views/login.php b/src/views/login.php index 401e912a..8e1da7db 100644 --- a/src/views/login.php +++ b/src/views/login.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ $do_render = false; if (!defined('BASE_PATH')) { diff --git a/src/views/materializedviewproperties.php b/src/views/materializedviewproperties.php index 2354b944..c3042bce 100644 --- a/src/views/materializedviewproperties.php +++ b/src/views/materializedviewproperties.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ // Include application functions diff --git a/src/views/materializedviews.php b/src/views/materializedviews.php index c51bb1c6..597e6228 100644 --- a/src/views/materializedviews.php +++ b/src/views/materializedviews.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ // Include application functions diff --git a/src/views/opclasses.php b/src/views/opclasses.php index ed5036ee..3fde3ab6 100644 --- a/src/views/opclasses.php +++ b/src/views/opclasses.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ // Include application functions diff --git a/src/views/operators.php b/src/views/operators.php index 6999e915..6921fb15 100644 --- a/src/views/operators.php +++ b/src/views/operators.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ // Include application functions diff --git a/src/views/privileges.php b/src/views/privileges.php index 6e123dca..3050a9be 100644 --- a/src/views/privileges.php +++ b/src/views/privileges.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ $do_render = false; if (!defined('BASE_PATH')) { diff --git a/src/views/roles.php b/src/views/roles.php index 304ab859..146d9e93 100644 --- a/src/views/roles.php +++ b/src/views/roles.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ // Include application functions diff --git a/src/views/rules.php b/src/views/rules.php index e9389961..e5ca794b 100644 --- a/src/views/rules.php +++ b/src/views/rules.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ // Include application functions diff --git a/src/views/schemas.php b/src/views/schemas.php index 9f9f43ed..9a5328dd 100644 --- a/src/views/schemas.php +++ b/src/views/schemas.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ // Include application functions diff --git a/src/views/sequences.php b/src/views/sequences.php index 5d6e5304..f738819a 100644 --- a/src/views/sequences.php +++ b/src/views/sequences.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ // Include application functions diff --git a/src/views/servers.php b/src/views/servers.php index 616ac467..59995851 100644 --- a/src/views/servers.php +++ b/src/views/servers.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ $do_render = false; if (!defined('BASE_PATH')) { diff --git a/src/views/sql.php b/src/views/sql.php index 54ceb6ad..5479d80a 100644 --- a/src/views/sql.php +++ b/src/views/sql.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ // Include application functions diff --git a/src/views/sqledit.php b/src/views/sqledit.php index c5b8a2e4..c74005cb 100644 --- a/src/views/sqledit.php +++ b/src/views/sqledit.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ // Include application functions diff --git a/src/views/tables.php b/src/views/tables.php index bef4a0c2..0811e459 100644 --- a/src/views/tables.php +++ b/src/views/tables.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ $do_render = false; if (!defined('BASE_PATH')) { diff --git a/src/views/tablespaces.php b/src/views/tablespaces.php index aee637b6..02040516 100644 --- a/src/views/tablespaces.php +++ b/src/views/tablespaces.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ // Include application functions diff --git a/src/views/tblproperties.php b/src/views/tblproperties.php index 6138a80f..51fef151 100644 --- a/src/views/tblproperties.php +++ b/src/views/tblproperties.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ // Include application functions diff --git a/src/views/triggers.php b/src/views/triggers.php index 344e873f..1ca7ce36 100644 --- a/src/views/triggers.php +++ b/src/views/triggers.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ // Include application functions diff --git a/src/views/types.php b/src/views/types.php index ea054b91..cdd5280c 100644 --- a/src/views/types.php +++ b/src/views/types.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ // Include application functions diff --git a/src/views/users.php b/src/views/users.php index 91eb0cd7..4e32098f 100644 --- a/src/views/users.php +++ b/src/views/users.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ // Include application functions diff --git a/src/views/viewproperties.php b/src/views/viewproperties.php index 0ce32a24..20d50dfe 100644 --- a/src/views/viewproperties.php +++ b/src/views/viewproperties.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ // Include application functions diff --git a/src/views/views.php b/src/views/views.php index 1dcbc6d2..dc91b048 100644 --- a/src/views/views.php +++ b/src/views/views.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ // Include application functions diff --git a/src/xhtml/HTMLController.php b/src/xhtml/HTMLController.php index c78bde72..b87a4f6a 100644 --- a/src/xhtml/HTMLController.php +++ b/src/xhtml/HTMLController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\XHtml; @@ -90,6 +90,12 @@ class HTMLController $database = $this->container->database; $schema = $this->container->schema; + /* + $server = $this->container->has('server') ? $this->container->server : $_REQUEST['server']; + $database = $this->container->has('database') ? $this->container->database : $_REQUEST['database']; + $schema = $this->container->has('schema') ? $this->container->schema : $_REQUEST['schema']; + */ + //$this->prtrace('server', $server, 'database', $database, 'schema', $schema); if ($server && !isset($urlvars['server']) && 'root' != $subject) { diff --git a/src/xhtml/HTMLFooterController.php b/src/xhtml/HTMLFooterController.php index 84b99641..c59cd124 100644 --- a/src/xhtml/HTMLFooterController.php +++ b/src/xhtml/HTMLFooterController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/HTMLHeaderController.php b/src/xhtml/HTMLHeaderController.php index abe647d5..9e46439f 100644 --- a/src/xhtml/HTMLHeaderController.php +++ b/src/xhtml/HTMLHeaderController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/HTMLNavbarController.php b/src/xhtml/HTMLNavbarController.php index f0af7492..2b8577e0 100644 --- a/src/xhtml/HTMLNavbarController.php +++ b/src/xhtml/HTMLNavbarController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/HTMLTableController.php b/src/xhtml/HTMLTableController.php index 41302606..803c71db 100644 --- a/src/xhtml/HTMLTableController.php +++ b/src/xhtml/HTMLTableController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/TreeController.php b/src/xhtml/TreeController.php index 3d7be67c..5e49e9f5 100644 --- a/src/xhtml/TreeController.php +++ b/src/xhtml/TreeController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/XHtmlButton.php b/src/xhtml/XHtmlButton.php index 66977628..75395f8f 100644 --- a/src/xhtml/XHtmlButton.php +++ b/src/xhtml/XHtmlButton.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/XHtmlElement.php b/src/xhtml/XHtmlElement.php index a237c680..11a00e79 100644 --- a/src/xhtml/XHtmlElement.php +++ b/src/xhtml/XHtmlElement.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/XHtmlOption.php b/src/xhtml/XHtmlOption.php index 18fd07b8..9eebfba6 100644 --- a/src/xhtml/XHtmlOption.php +++ b/src/xhtml/XHtmlOption.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/XHtmlSelect.php b/src/xhtml/XHtmlSelect.php index 1b09e0ae..28bb3c53 100644 --- a/src/xhtml/XHtmlSelect.php +++ b/src/xhtml/XHtmlSelect.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/XHtmlSimpleElement.php b/src/xhtml/XHtmlSimpleElement.php index faab7bc7..e5759624 100644 --- a/src/xhtml/XHtmlSimpleElement.php +++ b/src/xhtml/XHtmlSimpleElement.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.40 + * PHPPgAdmin v6.0.0-beta.41 */ namespace PHPPgAdmin\XHtml; |