diff options
| author | Amenadiel <amenadiel@gmail.com> | 2018-04-24 12:04:25 +0300 |
|---|---|---|
| committer | Amenadiel <amenadiel@gmail.com> | 2018-04-24 12:04:25 +0300 |
| commit | 325a03ae0e357af32462966d461a5a4b6c7e25da (patch) | |
| tree | 72007747fcb0185549fefb4db02b86c720ef7ee7 | |
| parent | 1833d0ae53c78752fd05dc2b728e087eeb1536f1 (diff) | |
Tag v 6.0.0-beta.44v6.0.0-beta.44
187 files changed, 329 insertions, 358 deletions
@@ -73,7 +73,6 @@ $config = PhpCsFixer\Config::create() ->in(__DIR__.'/src/decorators') ->in(__DIR__.'/src/help') ->in(__DIR__.'/src/lang') - ->in(__DIR__.'/src/views') ->in(__DIR__.'/src/xhtml') ) ; diff --git a/.php_cs.cache b/.php_cs.cache index 2415e74b..9d1feeb9 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.43"},"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":3594010316,"src\/classes\/ADOdbException.php":608069209,"src\/classes\/PluginManager.php":2484160070,"src\/classes\/ADORecordSet.php":3350135193,"src\/classes\/ContainerUtils.php":1429362137,"src\/classes\/Highlight.php":1181983945,"src\/classes\/ArrayRecordSet.php":2419307787,"src\/classes\/Misc.php":1753906714,"src\/controllers\/GroupsController.php":2344001730,"src\/controllers\/DbexportController.php":2858156305,"src\/controllers\/RulesController.php":2661747739,"src\/controllers\/OperatorsController.php":570440999,"src\/controllers\/AlldbController.php":1535117376,"src\/controllers\/LanguagesController.php":1038246286,"src\/controllers\/TypesController.php":3720969330,"src\/controllers\/SequencesController.php":5880701,"src\/controllers\/ServersController.php":1603377231,"src\/controllers\/AcinsertController.php":102706979,"src\/controllers\/ConversionsController.php":3031685768,"src\/controllers\/SqleditController.php":1750215596,"src\/controllers\/ServersTrait.php":3751293547,"src\/controllers\/BaseController.php":2560791784,"src\/controllers\/UsersController.php":956544894,"src\/controllers\/SqlController.php":2891081860,"src\/controllers\/DatabaseController.php":2911005408,"src\/controllers\/TblpropertiesController.php":1332434040,"src\/controllers\/TablespacesController.php":874532535,"src\/controllers\/DataimportController.php":4241999946,"src\/controllers\/OpclassesController.php":1405631783,"src\/controllers\/HelpController.php":1705927549,"src\/controllers\/ViewsController.php":2210709837,"src\/controllers\/AdminTrait.php":4071302191,"src\/controllers\/DataexportController.php":286154541,"src\/controllers\/ColpropertiesController.php":2665995175,"src\/controllers\/TriggersController.php":2850846891,"src\/controllers\/FunctionsController.php":2271264659,"src\/controllers\/AggregatesController.php":2830788303,"src\/controllers\/SchemasController.php":1817563459,"src\/controllers\/IntroController.php":1047906169,"src\/controllers\/DisplayController.php":1431987788,"src\/controllers\/ViewpropertiesController.php":779193543,"src\/controllers\/InfoController.php":1105395465,"src\/controllers\/TablesController.php":1611971191,"src\/controllers\/FulltextController.php":817364239,"src\/controllers\/CastsController.php":2130252965,"src\/controllers\/LoginController.php":732716412,"src\/controllers\/DomainsController.php":2915156707,"src\/controllers\/MaterializedviewsController.php":2912122250,"src\/controllers\/BrowserController.php":298545945,"src\/controllers\/HistoryController.php":1383817703,"src\/controllers\/MaterializedviewpropertiesController.php":1507923254,"src\/controllers\/PrivilegesController.php":1310142247,"src\/controllers\/ConstraintsController.php":2382195562,"src\/controllers\/IndexesController.php":3410309695,"src\/controllers\/RolesController.php":3768014402,"src\/database\/Postgres84.php":1842726180,"src\/database\/SequenceTrait.php":7605023,"src\/database\/TableTrait.php":1002240842,"src\/database\/Postgres81.php":4028390003,"src\/database\/AggregateTrait.php":2631307300,"src\/database\/Postgres92.php":2108524081,"src\/database\/Postgres94.php":2933641880,"src\/database\/FtsTrait.php":2192768548,"src\/database\/Postgres93.php":3400638366,"src\/database\/Postgres83.php":3552345605,"src\/database\/Postgres95.php":1785123578,"src\/database\/DomainTrait.php":1139106391,"src\/database\/Postgres90.php":406371591,"src\/database\/Postgres96.php":1474171662,"src\/database\/RoleTrait.php":982032694,"src\/database\/Postgres74.php":2770352086,"src\/database\/Postgres80.php":2415246067,"src\/database\/ADOdbBase.php":1044111933,"src\/database\/Postgres10.php":3103642170,"src\/database\/Postgres82.php":3406083379,"src\/database\/Postgres91.php":1531413760,"src\/database\/IndexTrait.php":1335593634,"src\/database\/Postgres.php":334782462,"src\/database\/Connection.php":444400847,"src\/database\/ViewTrait.php":1670006937,"src\/decorators\/ReplaceDecorator.php":1543009527,"src\/decorators\/Decorator.php":3764193953,"src\/decorators\/IfEmptyDecorator.php":2014512736,"src\/decorators\/ActionUrlDecorator.php":3206671782,"src\/decorators\/BranchUrlDecorator.php":903970362,"src\/decorators\/UrlDecorator.php":3545975843,"src\/decorators\/ConcatDecorator.php":538408191,"src\/decorators\/RedirectUrlDecorator.php":4213281382,"src\/decorators\/ArrayMergeDecorator.php":931509962,"src\/decorators\/CallbackDecorator.php":317708371,"src\/decorators\/FieldDecorator.php":2152141417,"src\/help\/PostgresDoc96.php":2000174712,"src\/help\/PostgresDoc84.php":3258276569,"src\/help\/PostgresDoc80.php":1914352953,"src\/help\/PostgresDoc81.php":3421049236,"src\/help\/PostgresDoc90.php":2922419653,"src\/help\/PostgresDoc83.php":3424129367,"src\/help\/PostgresDoc92.php":847778155,"src\/help\/PostgresDoc82.php":3076201514,"src\/help\/PostgresDoc95.php":1864533024,"src\/help\/PostgresDoc94.php":163111816,"src\/help\/PostgresDoc91.php":969693993,"src\/help\/PostgresDoc74.php":3581431897,"src\/help\/PostgresDoc93.php":4028472972,"src\/views\/rules.php":1587279372,"src\/views\/info.php":2199540015,"src\/views\/intro.php":2557168293,"src\/views\/database.php":1030775543,"src\/views\/triggers.php":2108219382,"src\/views\/functions.php":3506089896,"src\/views\/dbexport.php":3207927965,"src\/views\/sql.php":3901876152,"src\/views\/display.php":2607166739,"src\/views\/acinsert.php":78291105,"src\/views\/languages.php":3983298650,"src\/views\/views.php":1328818630,"src\/views\/types.php":1726219675,"src\/views\/conversions.php":3451237428,"src\/views\/users.php":4051058047,"src\/views\/indexes.php":2123434252,"src\/views\/login.php":3851391264,"src\/views\/tables.php":2963262385,"src\/views\/servers.php":2032280471,"src\/views\/tblproperties.php":3530809669,"src\/views\/tablespaces.php":1511809046,"src\/views\/privileges.php":4070478822,"src\/views\/casts.php":3249259888,"src\/views\/sqledit.php":381439341,"src\/views\/fulltext.php":2185145671,"src\/views\/browser.php":3315236943,"src\/views\/colproperties.php":2068769756,"src\/views\/roles.php":930092802,"src\/views\/groups.php":3551375678,"src\/views\/operators.php":1098288323,"src\/views\/domains.php":3124584051,"src\/views\/materializedviews.php":2933746380,"src\/views\/history.php":1375070345,"src\/views\/alldb.php":557281311,"src\/views\/opclasses.php":1143971685,"src\/views\/constraints.php":1735217175,"src\/views\/sequences.php":929508641,"src\/views\/schemas.php":1016165931,"src\/views\/dataimport.php":3936631718,"src\/views\/help.php":1372962860,"src\/views\/dataexport.php":2985946481,"src\/views\/viewproperties.php":1985931180,"src\/views\/aggregates.php":2657194000,"src\/views\/materializedviewproperties.php":256017375,"src\/xhtml\/HTMLNavbarController.php":543939095,"src\/xhtml\/HTMLTableController.php":2343742668,"src\/xhtml\/HTMLController.php":3425638450,"src\/xhtml\/XHtmlOption.php":479931748,"src\/xhtml\/XHtmlButton.php":1216925089,"src\/xhtml\/XHtmlSimpleElement.php":3343966411,"src\/xhtml\/XHtmlSelect.php":3329561073,"src\/xhtml\/HTMLFooterController.php":2142193777,"src\/xhtml\/HTMLHeaderController.php":3165522337,"src\/xhtml\/TreeController.php":2533835476,"src\/xhtml\/XHtmlElement.php":331000589,"src\/help\/PostgresDoc10.php":2214921537,"src\/lang\/italian.php":1480994123,"src\/lang\/portuguese-br.php":1031481096,"src\/lang\/chinese-utf8-zh_TW.php":3650136156,"src\/lang\/russian-utf8.php":2171225023,"src\/lang\/danish.php":3722199543,"src\/lang\/catalan.php":88573356,"src\/lang\/swedish.php":3389902482,"src\/lang\/portuguese-pt.php":2823441265,"src\/lang\/chinese-tr.php":973722372,"src\/lang\/dutch.php":235222228,"src\/lang\/german.php":273316439,"src\/lang\/chinese-utf8-zh_CN.php":3587986327,"src\/lang\/english.php":2920883001,"src\/lang\/galician.php":1368004027,"src\/lang\/hebrew.php":1955636652,"src\/lang\/russian.php":2076275437,"src\/lang\/lithuanian.php":1429179494,"src\/lang\/french.php":140540686,"src\/lang\/polish.php":65726841,"src\/lang\/afrikaans.php":1951587724,"src\/lang\/arabic.php":2885127624,"src\/lang\/chinese-sim.php":3354400601,"src\/lang\/slovak.php":3478370610,"src\/lang\/spanish.php":3623877492,"src\/lang\/romanian.php":36848303,"src\/lang\/greek.php":819116305,"src\/lang\/czech.php":1851088165,"src\/lang\/hungarian.php":620517249,"src\/lang\/japanese.php":3974430711,"src\/lang\/turkish.php":1571270204,"src\/lang\/mongol.php":2766541785,"src\/lang\/ukrainian.php":1701083053}}
\ No newline at end of file +{"php":"7.1.16-1+ubuntu16.04.1+deb.sury.org+1","version":"2.11.1:v2.11.1#ad94441c17b8ef096e517acccdbf3238af8a2da8","rules":{"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.44"},"heredoc_to_nowdoc":true,"list_syntax":{"syntax":"long"},"method_chaining_indentation":true,"multiline_comment_opening_closing":true,"no_null_property_initialization":true,"no_short_echo_tag":true,"no_superfluous_elseif":true,"no_unreachable_default_argument_value":true,"no_useless_else":true,"no_useless_return":true,"ordered_imports":true,"php_unit_strict":true,"php_unit_test_annotation":true,"php_unit_test_class_requires_covers":true,"phpdoc_add_missing_param_annotation":true,"phpdoc_order":true,"phpdoc_types_order":true,"strict_param":true},"hashes":{"src\/classes\/ADOdbException.php":884641736,"src\/classes\/ArrayRecordSet.php":1252058240,"src\/classes\/ContainerUtils.php":2219494188,"src\/classes\/PluginManager.php":1743544939,"src\/classes\/Misc.php":1704694553,"src\/classes\/Highlight.php":1517343996,"src\/classes\/ADORecordSet.php":1857993113,"src\/controllers\/CastsController.php":1621480712,"src\/controllers\/RulesController.php":2463922930,"src\/controllers\/IndexesController.php":2995722684,"src\/controllers\/SequencesController.php":199534278,"src\/controllers\/HelpController.php":4243959020,"src\/controllers\/ConversionsController.php":4132449286,"src\/controllers\/LanguagesController.php":25606620,"src\/controllers\/DisplayController.php":3516588699,"src\/controllers\/FulltextController.php":2209469340,"src\/controllers\/TablesController.php":4196907796,"src\/controllers\/TblpropertiesController.php":1366473963,"src\/controllers\/LoginController.php":1796994348,"src\/controllers\/ColpropertiesController.php":1185770111,"src\/controllers\/PrivilegesController.php":2444217987,"src\/controllers\/ConstraintsController.php":1847522193,"src\/controllers\/BrowserController.php":3468294350,"src\/controllers\/AlldbController.php":3597738984,"src\/controllers\/ServersController.php":2114292302,"src\/controllers\/GroupsController.php":907424693,"src\/controllers\/SqleditController.php":782934103,"src\/controllers\/DomainsController.php":3721728188,"src\/controllers\/IntroController.php":1929663146,"src\/controllers\/ViewsController.php":962460344,"src\/controllers\/HistoryController.php":2336454207,"src\/controllers\/DataimportController.php":4027736188,"src\/controllers\/ViewpropertiesController.php":382856451,"src\/controllers\/AggregatesController.php":3373477936,"src\/controllers\/DbexportController.php":3272474463,"src\/controllers\/UsersController.php":2478960628,"src\/controllers\/InfoController.php":1883429839,"src\/controllers\/TriggersController.php":2540727067,"src\/controllers\/FunctionsController.php":682780711,"src\/controllers\/SqlController.php":1387649804,"src\/controllers\/MaterializedviewpropertiesController.php":973764984,"src\/controllers\/DatabaseController.php":2788540111,"src\/controllers\/TablespacesController.php":4171023765,"src\/controllers\/DataexportController.php":2583420187,"src\/controllers\/RolesController.php":3243333207,"src\/controllers\/OpclassesController.php":2433184861,"src\/controllers\/SchemasController.php":2576381307,"src\/controllers\/BaseController.php":1613312446,"src\/controllers\/OperatorsController.php":3804337570,"src\/controllers\/MaterializedviewsController.php":4048000315,"src\/controllers\/TypesController.php":2093436485,"src\/controllers\/AcinsertController.php":3511088277,"src\/database\/Postgres95.php":2039392713,"src\/database\/Postgres10.php":4060853330,"src\/database\/Postgres82.php":2089245390,"src\/database\/Postgres84.php":2927616953,"src\/database\/Postgres80.php":1953896992,"src\/database\/ADOdbBase.php":1422599965,"src\/database\/Postgres93.php":3823946915,"src\/database\/Postgres81.php":1466201701,"src\/database\/Postgres96.php":1945835844,"src\/database\/Postgres94.php":1465006123,"src\/database\/Postgres83.php":4074066528,"src\/database\/Postgres92.php":1690822075,"src\/database\/Postgres.php":3750418065,"src\/database\/Postgres90.php":401915765,"src\/database\/Connection.php":2614989187,"src\/database\/Postgres74.php":3292652798,"src\/database\/Postgres91.php":958249213,"src\/decorators\/UrlDecorator.php":1311539703,"src\/decorators\/IfEmptyDecorator.php":2874955742,"src\/decorators\/ActionUrlDecorator.php":732931489,"src\/decorators\/ConcatDecorator.php":1702173238,"src\/decorators\/BranchUrlDecorator.php":2520411644,"src\/decorators\/Decorator.php":949166635,"src\/decorators\/RedirectUrlDecorator.php":1514076176,"src\/decorators\/ArrayMergeDecorator.php":2923231820,"src\/decorators\/CallbackDecorator.php":1959288472,"src\/decorators\/FieldDecorator.php":3588032267,"src\/decorators\/ReplaceDecorator.php":3105124414,"src\/help\/PostgresDoc74.php":1014393115,"src\/help\/PostgresDoc81.php":1791722686,"src\/help\/PostgresDoc94.php":3379155010,"src\/help\/PostgresDoc93.php":4069522676,"src\/help\/PostgresDoc92.php":4281085969,"src\/help\/PostgresDoc95.php":1747573650,"src\/help\/PostgresDoc10.php":2708331710,"src\/help\/PostgresDoc96.php":1882415562,"src\/help\/PostgresDoc82.php":3425363639,"src\/help\/PostgresDoc90.php":1860281871,"src\/help\/PostgresDoc84.php":48523539,"src\/help\/PostgresDoc91.php":4179454179,"src\/help\/PostgresDoc83.php":1761813529,"src\/help\/PostgresDoc80.php":870732025,"src\/lang\/hebrew.php":2971883850,"src\/lang\/danish.php":2526364889,"src\/lang\/catalan.php":270697182,"src\/lang\/german.php":1707102362,"src\/lang\/greek.php":1976311339,"src\/lang\/afrikaans.php":663453750,"src\/lang\/russian-utf8.php":1051717908,"src\/lang\/portuguese-br.php":3192685714,"src\/lang\/chinese-tr.php":807724287,"src\/lang\/chinese-utf8-zh_CN.php":4097504970,"src\/lang\/english.php":2835104977,"src\/lang\/dutch.php":3609351123,"src\/lang\/ukrainian.php":236463125,"src\/lang\/polish.php":1375374966,"src\/lang\/slovak.php":2712233663,"src\/lang\/russian.php":3314640053,"src\/lang\/swedish.php":2324562918,"src\/lang\/mongol.php":2746377792,"src\/lang\/czech.php":3093061439,"src\/lang\/galician.php":581030878,"src\/lang\/hungarian.php":3444432400,"src\/lang\/japanese.php":86367584,"src\/lang\/arabic.php":2149254922,"src\/lang\/chinese-utf8-zh_TW.php":2715726245,"src\/lang\/italian.php":3721115629,"src\/lang\/chinese-sim.php":1946252887,"src\/lang\/romanian.php":2634721461,"src\/lang\/lithuanian.php":2958118947,"src\/lang\/turkish.php":3473644281,"src\/lang\/portuguese-pt.php":4249796043,"src\/lang\/spanish.php":2223576485,"src\/lang\/french.php":250805976,"src\/xhtml\/TreeController.php":3099028754,"src\/xhtml\/HTMLController.php":4091102225,"src\/xhtml\/XHtmlSimpleElement.php":89816014,"src\/xhtml\/XHtmlElement.php":2463566857,"src\/xhtml\/XHtmlSelect.php":467830906,"src\/xhtml\/HTMLFooterController.php":3386108996,"src\/xhtml\/XHtmlButton.php":2287599211,"src\/xhtml\/HTMLTableController.php":2964264010,"src\/xhtml\/XHtmlOption.php":834447920,"src\/xhtml\/HTMLHeaderController.php":1119641440,"src\/xhtml\/HTMLNavbarController.php":4277588687}}
\ No newline at end of file diff --git a/composer.json b/composer.json index f4c45414..8e506b9a 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "huasofoundries/phppgadmin6", - "version": "6.0.0-beta.43", + "version": "6.0.0-beta.44", "description": "Like phpmyadmin but for postgres", "type": "project", "license": "MIT", diff --git a/composer.lock b/composer.lock index 884c1618..81da7c78 100644 --- a/composer.lock +++ b/composer.lock @@ -1,10 +1,10 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "5290b0e026ae6a8d1bbc34aec63620ee", + "content-hash": "1dfe0dbaa016db0da8c902518d8b972e", "packages": [ { "name": "adodb/adodb-php", diff --git a/src/classes/ADORecordSet.php b/src/classes/ADORecordSet.php index 8dba1750..6834798a 100644 --- a/src/classes/ADORecordSet.php +++ b/src/classes/ADORecordSet.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin; diff --git a/src/classes/ADOdbException.php b/src/classes/ADOdbException.php index 3e2e156a..6de0822f 100644 --- a/src/classes/ADOdbException.php +++ b/src/classes/ADOdbException.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin; diff --git a/src/classes/ArrayRecordSet.php b/src/classes/ArrayRecordSet.php index 2abecc69..c0548d57 100644 --- a/src/classes/ArrayRecordSet.php +++ b/src/classes/ArrayRecordSet.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin; diff --git a/src/classes/ContainerUtils.php b/src/classes/ContainerUtils.php index 71d705c3..c2ef9b28 100644 --- a/src/classes/ContainerUtils.php +++ b/src/classes/ContainerUtils.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin; diff --git a/src/classes/Highlight.php b/src/classes/Highlight.php index 28d42e6e..68160805 100644 --- a/src/classes/Highlight.php +++ b/src/classes/Highlight.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin; diff --git a/src/classes/Misc.php b/src/classes/Misc.php index e5ef95d4..c9f0f43e 100644 --- a/src/classes/Misc.php +++ b/src/classes/Misc.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin; @@ -113,7 +113,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) { @@ -184,8 +184,8 @@ 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">'; - $str .= $this->lang['strhelpicon'] . '</a>'; + $str .= '<a class="help" href="'.$helplink.'" title="'.$this->lang['strhelp'].'" target="phppgadminhelp">'; + $str .= $this->lang['strhelpicon'].'</a>'; } if ($do_print) { echo $str; @@ -203,7 +203,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())); } /** @@ -332,7 +332,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); @@ -454,7 +454,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 || @@ -609,13 +609,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)); @@ -691,7 +691,7 @@ class Misc 'schema' => $_REQUEST['schema'], 'table' => $_REQUEST['table'], 'action' => 'confselectrows', - ]]; + ], ]; break; case 'view': @@ -778,7 +778,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()); @@ -790,10 +790,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']); } @@ -807,14 +807,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); @@ -871,7 +871,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; } } @@ -967,23 +967,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']; } } } @@ -1030,7 +1030,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; @@ -1281,7 +1281,7 @@ class Misc 'icon' => 'Views', ], 'matviews' => [ - 'title' => 'M ' . $lang['strviews'], + 'title' => 'M '.$lang['strviews'], 'url' => 'materializedviews', 'urlvars' => ['subject' => 'schema'], 'help' => 'pg.matview', @@ -1858,7 +1858,7 @@ class Misc * * @param mixed $strIniSize The PHP.INI variable * - * @return float|double|int size in bytes, false on failure + * @return float|float|int size in bytes, false on failure */ public function inisizeToBytes($strIniSize) { @@ -1913,43 +1913,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'; } } @@ -1996,7 +1996,7 @@ class Misc if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { $data->fieldClean($str); - return '"' . $str . '"'; + return '"'.$str.'"'; } return escapeshellcmd($str); @@ -2087,38 +2087,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 a5fb5b16..4662aed3 100644 --- a/src/classes/PluginManager.php +++ b/src/classes/PluginManager.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin; diff --git a/src/controllers/AcinsertController.php b/src/controllers/AcinsertController.php index 88632b07..682bf294 100644 --- a/src/controllers/AcinsertController.php +++ b/src/controllers/AcinsertController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/AggregatesController.php b/src/controllers/AggregatesController.php index 7a7a4ef6..3e2a0be5 100644 --- a/src/controllers/AggregatesController.php +++ b/src/controllers/AggregatesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/AlldbController.php b/src/controllers/AlldbController.php index 3e8577d1..d99caabb 100644 --- a/src/controllers/AlldbController.php +++ b/src/controllers/AlldbController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/BaseController.php b/src/controllers/BaseController.php index 0080394c..0a89c2a8 100644 --- a/src/controllers/BaseController.php +++ b/src/controllers/BaseController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/BrowserController.php b/src/controllers/BrowserController.php index 34c8d634..93679396 100644 --- a/src/controllers/BrowserController.php +++ b/src/controllers/BrowserController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/CastsController.php b/src/controllers/CastsController.php index 8b9819f6..062c6255 100644 --- a/src/controllers/CastsController.php +++ b/src/controllers/CastsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/ColpropertiesController.php b/src/controllers/ColpropertiesController.php index d69bbe89..441bae06 100644 --- a/src/controllers/ColpropertiesController.php +++ b/src/controllers/ColpropertiesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/ConstraintsController.php b/src/controllers/ConstraintsController.php index 37881815..0f27cd8f 100644 --- a/src/controllers/ConstraintsController.php +++ b/src/controllers/ConstraintsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/ConversionsController.php b/src/controllers/ConversionsController.php index 2048ff0f..f7318233 100644 --- a/src/controllers/ConversionsController.php +++ b/src/controllers/ConversionsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/DatabaseController.php b/src/controllers/DatabaseController.php index a15b6b6d..9b17802f 100644 --- a/src/controllers/DatabaseController.php +++ b/src/controllers/DatabaseController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/DataexportController.php b/src/controllers/DataexportController.php index bdbc6deb..93fd5a16 100644 --- a/src/controllers/DataexportController.php +++ b/src/controllers/DataexportController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/DataimportController.php b/src/controllers/DataimportController.php index 6bf8a9c3..ac039e86 100644 --- a/src/controllers/DataimportController.php +++ b/src/controllers/DataimportController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/DbexportController.php b/src/controllers/DbexportController.php index 56fb1fd8..4586afdd 100644 --- a/src/controllers/DbexportController.php +++ b/src/controllers/DbexportController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/DisplayController.php b/src/controllers/DisplayController.php index c5793574..459952b3 100644 --- a/src/controllers/DisplayController.php +++ b/src/controllers/DisplayController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/DomainsController.php b/src/controllers/DomainsController.php index a1c963e5..4f486cd7 100644 --- a/src/controllers/DomainsController.php +++ b/src/controllers/DomainsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/FulltextController.php b/src/controllers/FulltextController.php index a15ccb72..90a2bb63 100644 --- a/src/controllers/FulltextController.php +++ b/src/controllers/FulltextController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/FunctionsController.php b/src/controllers/FunctionsController.php index f946e135..136ee283 100644 --- a/src/controllers/FunctionsController.php +++ b/src/controllers/FunctionsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/GroupsController.php b/src/controllers/GroupsController.php index d6070e96..5529c7e6 100644 --- a/src/controllers/GroupsController.php +++ b/src/controllers/GroupsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/HelpController.php b/src/controllers/HelpController.php index 4e318287..786e7f4d 100644 --- a/src/controllers/HelpController.php +++ b/src/controllers/HelpController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/HistoryController.php b/src/controllers/HistoryController.php index 2a5ee6c6..99c90ec1 100644 --- a/src/controllers/HistoryController.php +++ b/src/controllers/HistoryController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/IndexesController.php b/src/controllers/IndexesController.php index e9451ff6..e9cf9e09 100644 --- a/src/controllers/IndexesController.php +++ b/src/controllers/IndexesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/InfoController.php b/src/controllers/InfoController.php index 55ad4a80..66783889 100644 --- a/src/controllers/InfoController.php +++ b/src/controllers/InfoController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/IntroController.php b/src/controllers/IntroController.php index 1be8fa32..e5450838 100644 --- a/src/controllers/IntroController.php +++ b/src/controllers/IntroController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/LanguagesController.php b/src/controllers/LanguagesController.php index 55a6b7ac..1ccd7e9d 100644 --- a/src/controllers/LanguagesController.php +++ b/src/controllers/LanguagesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/LoginController.php b/src/controllers/LoginController.php index f9144b74..9ff9d675 100644 --- a/src/controllers/LoginController.php +++ b/src/controllers/LoginController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/MaterializedviewpropertiesController.php b/src/controllers/MaterializedviewpropertiesController.php index 46d36ed5..3242587c 100644 --- a/src/controllers/MaterializedviewpropertiesController.php +++ b/src/controllers/MaterializedviewpropertiesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/MaterializedviewsController.php b/src/controllers/MaterializedviewsController.php index 4aafcbf3..fec4798f 100644 --- a/src/controllers/MaterializedviewsController.php +++ b/src/controllers/MaterializedviewsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/OpclassesController.php b/src/controllers/OpclassesController.php index 94c4e917..8d8db84f 100644 --- a/src/controllers/OpclassesController.php +++ b/src/controllers/OpclassesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/OperatorsController.php b/src/controllers/OperatorsController.php index a48d3807..a9b8eded 100644 --- a/src/controllers/OperatorsController.php +++ b/src/controllers/OperatorsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/PrivilegesController.php b/src/controllers/PrivilegesController.php index f3e83bec..0a7e6195 100644 --- a/src/controllers/PrivilegesController.php +++ b/src/controllers/PrivilegesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/RolesController.php b/src/controllers/RolesController.php index 29c79c30..846be739 100644 --- a/src/controllers/RolesController.php +++ b/src/controllers/RolesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/RulesController.php b/src/controllers/RulesController.php index 22010111..5d74f63a 100644 --- a/src/controllers/RulesController.php +++ b/src/controllers/RulesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/SchemasController.php b/src/controllers/SchemasController.php index 4c38092f..69631d7f 100644 --- a/src/controllers/SchemasController.php +++ b/src/controllers/SchemasController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/SequencesController.php b/src/controllers/SequencesController.php index 3ef667d5..b1684c62 100644 --- a/src/controllers/SequencesController.php +++ b/src/controllers/SequencesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/ServersController.php b/src/controllers/ServersController.php index e7c2723a..cf96e28f 100644 --- a/src/controllers/ServersController.php +++ b/src/controllers/ServersController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; @@ -96,7 +96,7 @@ class ServersController extends BaseController 'server' => [ 'title' => $this->lang['strserver'], 'field' => Decorator::field('desc'), - 'url' => \SUBFOLDER . '/redirect/server?', + 'url' => \SUBFOLDER.'/redirect/server?', 'vars' => ['server' => 'sha'], ], 'host' => [ diff --git a/src/controllers/SqlController.php b/src/controllers/SqlController.php index 00e1336f..4a1c511f 100644 --- a/src/controllers/SqlController.php +++ b/src/controllers/SqlController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ 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 ff6c8560..44b2ab99 100644 --- a/src/controllers/SqleditController.php +++ b/src/controllers/SqleditController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/TablesController.php b/src/controllers/TablesController.php index 4f051875..e733fa17 100644 --- a/src/controllers/TablesController.php +++ b/src/controllers/TablesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/TablespacesController.php b/src/controllers/TablespacesController.php index c68921aa..863c61ea 100644 --- a/src/controllers/TablespacesController.php +++ b/src/controllers/TablespacesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/TblpropertiesController.php b/src/controllers/TblpropertiesController.php index 4e557829..d3720514 100644 --- a/src/controllers/TblpropertiesController.php +++ b/src/controllers/TblpropertiesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/TriggersController.php b/src/controllers/TriggersController.php index 14026736..48193377 100644 --- a/src/controllers/TriggersController.php +++ b/src/controllers/TriggersController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/TypesController.php b/src/controllers/TypesController.php index 34544474..ff2b3882 100644 --- a/src/controllers/TypesController.php +++ b/src/controllers/TypesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/UsersController.php b/src/controllers/UsersController.php index ce31e3bf..476cabc9 100644 --- a/src/controllers/UsersController.php +++ b/src/controllers/UsersController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/ViewpropertiesController.php b/src/controllers/ViewpropertiesController.php index dbf5bbf9..71922e5d 100644 --- a/src/controllers/ViewpropertiesController.php +++ b/src/controllers/ViewpropertiesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/ViewsController.php b/src/controllers/ViewsController.php index a218e3dc..9d32c2dc 100644 --- a/src/controllers/ViewsController.php +++ b/src/controllers/ViewsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Controller; diff --git a/src/database/ADOdbBase.php b/src/database/ADOdbBase.php index 232477d1..c1618fc2 100644 --- a/src/database/ADOdbBase.php +++ b/src/database/ADOdbBase.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Database; @@ -755,7 +755,7 @@ class ADOdbBase */ public function phpBool($parameter) { - return $parameter; + return $parameter === 't'; } /** diff --git a/src/database/Connection.php b/src/database/Connection.php index 50f08f55..edb68dd3 100644 --- a/src/database/Connection.php +++ b/src/database/Connection.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres.php b/src/database/Postgres.php index 790230e2..14d1f898 100644 --- a/src/database/Postgres.php +++ b/src/database/Postgres.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Database; @@ -58,13 +58,13 @@ class Postgres extends ADOdbBase if (is_array($this->help_page[$help])) { $urls = []; foreach ($this->help_page[$help] as $link) { - $urls[] = $this->help_base . $link; + $urls[] = $this->help_base.$link; } return $urls; } - return $this->help_base . $this->help_page[$help]; + return $this->help_base.$this->help_page[$help]; } return null; @@ -78,7 +78,7 @@ class Postgres extends ADOdbBase public function getHelpPages() { if ($this->help_page === null || $this->help_base === null) { - $help_classname = '\PHPPgAdmin\Help\PostgresDoc' . str_replace('.', '', $this->major_version); + $help_classname = '\PHPPgAdmin\Help\PostgresDoc'.str_replace('.', '', $this->major_version); $help_class = new $help_classname($this->conf, $this->major_version); @@ -103,7 +103,7 @@ class Postgres extends ADOdbBase // Determine actions string $extra_str = ''; foreach ($extras as $k => $v) { - $extra_str .= " {$k}=\"" . htmlspecialchars($v) . '"'; + $extra_str .= " {$k}=\"".htmlspecialchars($v).'"'; } switch (substr($type, 0, 9)) { @@ -210,7 +210,7 @@ class Postgres extends ADOdbBase if (isset($server_info['hiddendbs']) && $server_info['hiddendbs']) { $hiddendbs = $server_info['hiddendbs']; - $not_in = "('" . implode("','", $hiddendbs) . "')"; + $not_in = "('".implode("','", $hiddendbs)."')"; $clause .= " AND pdb.datname NOT IN {$not_in} "; } @@ -804,7 +804,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); } @@ -987,7 +987,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'; @@ -1017,8 +1017,8 @@ class Postgres extends ADOdbBase * @param array $atts An array of attribute numbers * * @return array|int An array mapping attnum to attname or error code - * - -1 $atts must be an array - * - -2 wrong number of attributes found + * - -1 $atts must be an array + * - -2 wrong number of attributes found */ public function getAttributeNames($table, $atts) { @@ -1038,7 +1038,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)) { @@ -1953,7 +1953,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 .= ', '; @@ -2188,13 +2188,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)'; } @@ -2600,7 +2600,7 @@ class Postgres extends ADOdbBase $params[] = "autovacuum_vacuum_cost_limit='{$vaccostlimit}'"; } - $sql = $sql . implode(',', $params) . ');'; + $sql = $sql.implode(',', $params).');'; return $this->execute($sql); } @@ -2812,7 +2812,7 @@ class Postgres extends ADOdbBase ) { $in_quote = 0; } - } else if ($dol_quote) { + } elseif ($dol_quote) { $this->prtrace('dol_quote', $dol_quote, $line); if (strncmp(substr($line, $i), $dol_quote, strlen($dol_quote)) == 0) { $this->advance_1($i, $prevlen, $thislen); @@ -2822,8 +2822,7 @@ class Postgres extends ADOdbBase $dol_quote = null; } - } else if (substr($line, $i, 2) == '/*') { - + } elseif (substr($line, $i, 2) == '/*') { $this->prtrace('open_xcomment', $in_xcomment, $line, $i, $prevlen, $thislen); if ($in_xcomment == 0) { ++$in_xcomment; @@ -2831,18 +2830,18 @@ class Postgres extends ADOdbBase if ($finishpos === false) { $line = substr($line, 0, $i); /* remove comment */ break; - } else { - $pre = substr($line, 0, $i); - $post = substr($line, $i + 2 + $finishpos, $len); - $line = $pre . ' ' . $post; - $in_xcomment = 0; - $i = 0; } + $pre = substr($line, 0, $i); + $post = substr($line, $i + 2 + $finishpos, $len); + $line = $pre.' '.$post; + $in_xcomment = 0; + $i = 0; } - } else if ($in_xcomment) { + } elseif ($in_xcomment) { $position = strpos(substr($line, $i, $len), '*/'); if ($position === false) { $line = ''; + break; } @@ -2864,9 +2863,9 @@ class Postgres extends ADOdbBase // if ($substr == '*/' && !--$in_xcomment) { // $this->advance_1($i, $prevlen, $thislen); // } - } else if (substr($line, $i, 1) == '\'' || substr($line, $i, 1) == '"') { + } elseif (substr($line, $i, 1) == '\'' || substr($line, $i, 1) == '"') { $in_quote = substr($line, $i, 1); - } else if (!$dol_quote && $this->valid_dolquote(substr($line, $i))) { + } elseif (!$dol_quote && $this->valid_dolquote(substr($line, $i))) { $dol_end = strpos(substr($line, $i + 1), '$'); $dol_quote = substr($line, $i, $dol_end + 1); $this->advance_1($i, $prevlen, $thislen); @@ -2881,9 +2880,9 @@ class Postgres extends ADOdbBase if (substr($line, $i, 1) == '(') { ++$paren_level; - } else if (substr($line, $i, 1) == ')' && $paren_level > 0) { + } elseif (substr($line, $i, 1) == ')' && $paren_level > 0) { --$paren_level; - } else if (substr($line, $i, 1) == ';' && !$bslash_count && !$paren_level) { + } elseif (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 @@ -2925,7 +2924,7 @@ class Postgres extends ADOdbBase } $query_buf = null; $query_start = $i + $thislen; - } else if (preg_match('/^[_[:alpha:]]$/', substr($line, $i, 1))) { + } elseif (preg_match('/^[_[:alpha:]]$/', substr($line, $i, 1))) { $sub = substr($line, $i, $thislen); while (preg_match('/^[\$_A-Za-z0-9]$/', $sub)) { /* keep going while we still have identifier chars */ @@ -2937,7 +2936,6 @@ class Postgres extends ADOdbBase $i -= $prevlen; } } - } // end for /* Put the rest of the line in the query buffer. */ @@ -3134,7 +3132,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(); @@ -3176,7 +3174,7 @@ class Postgres extends ADOdbBase $sql = 'SELECT "'; } - $sql .= join('","', $show) . '" FROM '; + $sql .= join('","', $show).'" FROM '; } $this->fieldClean($table); @@ -3244,7 +3242,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 891093b2..fb2cb83d 100644 --- a/src/database/Postgres10.php +++ b/src/database/Postgres10.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres74.php b/src/database/Postgres74.php index f05c12ca..52afd5ab 100644 --- a/src/database/Postgres74.php +++ b/src/database/Postgres74.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres80.php b/src/database/Postgres80.php index 48385c15..f80e211c 100644 --- a/src/database/Postgres80.php +++ b/src/database/Postgres80.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres81.php b/src/database/Postgres81.php index b1e11d79..4c49e46e 100644 --- a/src/database/Postgres81.php +++ b/src/database/Postgres81.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres82.php b/src/database/Postgres82.php index f20ead67..a47e3478 100644 --- a/src/database/Postgres82.php +++ b/src/database/Postgres82.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres83.php b/src/database/Postgres83.php index 17c77aca..bcb67d69 100644 --- a/src/database/Postgres83.php +++ b/src/database/Postgres83.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres84.php b/src/database/Postgres84.php index 3268c811..ab7b8a68 100644 --- a/src/database/Postgres84.php +++ b/src/database/Postgres84.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres90.php b/src/database/Postgres90.php index 95a24ce6..c857ab67 100644 --- a/src/database/Postgres90.php +++ b/src/database/Postgres90.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres91.php b/src/database/Postgres91.php index 1baa6c59..a265cc82 100644 --- a/src/database/Postgres91.php +++ b/src/database/Postgres91.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres92.php b/src/database/Postgres92.php index 4315c53d..612b50e2 100644 --- a/src/database/Postgres92.php +++ b/src/database/Postgres92.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres93.php b/src/database/Postgres93.php index 5313cdbd..8a6c8bc7 100644 --- a/src/database/Postgres93.php +++ b/src/database/Postgres93.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres94.php b/src/database/Postgres94.php index df81e4a5..c4452b78 100644 --- a/src/database/Postgres94.php +++ b/src/database/Postgres94.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres95.php b/src/database/Postgres95.php index 7cd73936..1622f33b 100644 --- a/src/database/Postgres95.php +++ b/src/database/Postgres95.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Database; diff --git a/src/database/Postgres96.php b/src/database/Postgres96.php index 16eff77e..cb7722ec 100644 --- a/src/database/Postgres96.php +++ b/src/database/Postgres96.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Database; diff --git a/src/decorators/ActionUrlDecorator.php b/src/decorators/ActionUrlDecorator.php index 7e771c12..a3febdbf 100644 --- a/src/decorators/ActionUrlDecorator.php +++ b/src/decorators/ActionUrlDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/ArrayMergeDecorator.php b/src/decorators/ArrayMergeDecorator.php index 3d487ffc..2c73edd4 100644 --- a/src/decorators/ArrayMergeDecorator.php +++ b/src/decorators/ArrayMergeDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/BranchUrlDecorator.php b/src/decorators/BranchUrlDecorator.php index 8c6e0c6d..68a84497 100644 --- a/src/decorators/BranchUrlDecorator.php +++ b/src/decorators/BranchUrlDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/CallbackDecorator.php b/src/decorators/CallbackDecorator.php index 05c52a4e..815d84cf 100644 --- a/src/decorators/CallbackDecorator.php +++ b/src/decorators/CallbackDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/ConcatDecorator.php b/src/decorators/ConcatDecorator.php index 8ed13daa..1b65b3a8 100644 --- a/src/decorators/ConcatDecorator.php +++ b/src/decorators/ConcatDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/Decorator.php b/src/decorators/Decorator.php index ba615106..ad613363 100644 --- a/src/decorators/Decorator.php +++ b/src/decorators/Decorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/FieldDecorator.php b/src/decorators/FieldDecorator.php index 974b1629..6cac31b2 100644 --- a/src/decorators/FieldDecorator.php +++ b/src/decorators/FieldDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/IfEmptyDecorator.php b/src/decorators/IfEmptyDecorator.php index b76143c0..f7fa6df2 100644 --- a/src/decorators/IfEmptyDecorator.php +++ b/src/decorators/IfEmptyDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/RedirectUrlDecorator.php b/src/decorators/RedirectUrlDecorator.php index 02a66500..79aa5522 100644 --- a/src/decorators/RedirectUrlDecorator.php +++ b/src/decorators/RedirectUrlDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/ReplaceDecorator.php b/src/decorators/ReplaceDecorator.php index 8878d519..40935be9 100644 --- a/src/decorators/ReplaceDecorator.php +++ b/src/decorators/ReplaceDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/UrlDecorator.php b/src/decorators/UrlDecorator.php index 2d0d039b..5d5791fd 100644 --- a/src/decorators/UrlDecorator.php +++ b/src/decorators/UrlDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Decorators; diff --git a/src/help/PostgresDoc10.php b/src/help/PostgresDoc10.php index efed100a..ceb79bdf 100644 --- a/src/help/PostgresDoc10.php +++ b/src/help/PostgresDoc10.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc74.php b/src/help/PostgresDoc74.php index 4d410fc9..a6f30b97 100644 --- a/src/help/PostgresDoc74.php +++ b/src/help/PostgresDoc74.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc80.php b/src/help/PostgresDoc80.php index 94ee9a4b..17cdb056 100644 --- a/src/help/PostgresDoc80.php +++ b/src/help/PostgresDoc80.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc81.php b/src/help/PostgresDoc81.php index e465334c..c66f813f 100644 --- a/src/help/PostgresDoc81.php +++ b/src/help/PostgresDoc81.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc82.php b/src/help/PostgresDoc82.php index cba0d1a7..12cd9d97 100644 --- a/src/help/PostgresDoc82.php +++ b/src/help/PostgresDoc82.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc83.php b/src/help/PostgresDoc83.php index ce798dc1..85558db6 100644 --- a/src/help/PostgresDoc83.php +++ b/src/help/PostgresDoc83.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc84.php b/src/help/PostgresDoc84.php index d4980d24..75f2508c 100644 --- a/src/help/PostgresDoc84.php +++ b/src/help/PostgresDoc84.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc90.php b/src/help/PostgresDoc90.php index 6fee3b4f..8224df7b 100644 --- a/src/help/PostgresDoc90.php +++ b/src/help/PostgresDoc90.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc91.php b/src/help/PostgresDoc91.php index c710fa8c..4858b206 100644 --- a/src/help/PostgresDoc91.php +++ b/src/help/PostgresDoc91.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc92.php b/src/help/PostgresDoc92.php index 2ad70ae5..c86501f6 100644 --- a/src/help/PostgresDoc92.php +++ b/src/help/PostgresDoc92.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc93.php b/src/help/PostgresDoc93.php index 12c35484..77fbb772 100644 --- a/src/help/PostgresDoc93.php +++ b/src/help/PostgresDoc93.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc94.php b/src/help/PostgresDoc94.php index eeecda62..2469bb20 100644 --- a/src/help/PostgresDoc94.php +++ b/src/help/PostgresDoc94.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc95.php b/src/help/PostgresDoc95.php index 59ae6f28..d185726d 100644 --- a/src/help/PostgresDoc95.php +++ b/src/help/PostgresDoc95.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc96.php b/src/help/PostgresDoc96.php index c0f41621..c00aad0c 100644 --- a/src/help/PostgresDoc96.php +++ b/src/help/PostgresDoc96.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\Help; diff --git a/src/lang/afrikaans.php b/src/lang/afrikaans.php index b5f5312e..d5b19629 100644 --- a/src/lang/afrikaans.php +++ b/src/lang/afrikaans.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ // Language and character set diff --git a/src/lang/arabic.php b/src/lang/arabic.php index 7bdbb0aa..3d109549 100644 --- a/src/lang/arabic.php +++ b/src/lang/arabic.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ // Language and character set diff --git a/src/lang/catalan.php b/src/lang/catalan.php index 8c73eeeb..a591cf66 100644 --- a/src/lang/catalan.php +++ b/src/lang/catalan.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ // Language and character set diff --git a/src/lang/chinese-sim.php b/src/lang/chinese-sim.php index dd531e18..f4e8bcf6 100644 --- a/src/lang/chinese-sim.php +++ b/src/lang/chinese-sim.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ // Language and character set diff --git a/src/lang/chinese-tr.php b/src/lang/chinese-tr.php index 9a76344a..1f493894 100644 --- a/src/lang/chinese-tr.php +++ b/src/lang/chinese-tr.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ // Language and character set diff --git a/src/lang/chinese-utf8-zh_CN.php b/src/lang/chinese-utf8-zh_CN.php index e8a20165..2427103a 100644 --- a/src/lang/chinese-utf8-zh_CN.php +++ b/src/lang/chinese-utf8-zh_CN.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ // Language and character set diff --git a/src/lang/chinese-utf8-zh_TW.php b/src/lang/chinese-utf8-zh_TW.php index 3b933389..d6d442e5 100644 --- a/src/lang/chinese-utf8-zh_TW.php +++ b/src/lang/chinese-utf8-zh_TW.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ // Language and character set diff --git a/src/lang/czech.php b/src/lang/czech.php index a827aab6..b81e635d 100644 --- a/src/lang/czech.php +++ b/src/lang/czech.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ // Language and character set diff --git a/src/lang/danish.php b/src/lang/danish.php index c0596b26..8aa2d40e 100644 --- a/src/lang/danish.php +++ b/src/lang/danish.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ // Language and character set diff --git a/src/lang/dutch.php b/src/lang/dutch.php index 8fbe8d3f..80581e65 100644 --- a/src/lang/dutch.php +++ b/src/lang/dutch.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ $lang['applang'] = 'Nederlands'; $lang['applocale'] = 'nl-NL'; diff --git a/src/lang/english.php b/src/lang/english.php index f5bf113d..1f7227a6 100644 --- a/src/lang/english.php +++ b/src/lang/english.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ // Language and character set diff --git a/src/lang/french.php b/src/lang/french.php index e2ec3d9e..09af8a62 100644 --- a/src/lang/french.php +++ b/src/lang/french.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ // Language and character set diff --git a/src/lang/galician.php b/src/lang/galician.php index eba89431..42b201ec 100644 --- a/src/lang/galician.php +++ b/src/lang/galician.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ // Language and character set diff --git a/src/lang/german.php b/src/lang/german.php index 4ef92a39..efc65fcf 100644 --- a/src/lang/german.php +++ b/src/lang/german.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ // Language and character set diff --git a/src/lang/greek.php b/src/lang/greek.php index a56f9a3c..d99333fa 100644 --- a/src/lang/greek.php +++ b/src/lang/greek.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ // Language and character set diff --git a/src/lang/hebrew.php b/src/lang/hebrew.php index be84ed2a..bb80d8cd 100644 --- a/src/lang/hebrew.php +++ b/src/lang/hebrew.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ // Language and character set diff --git a/src/lang/hungarian.php b/src/lang/hungarian.php index 9532fa34..0270fb7b 100644 --- a/src/lang/hungarian.php +++ b/src/lang/hungarian.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ // Language and character set diff --git a/src/lang/italian.php b/src/lang/italian.php index d2c8a1ba..9472254d 100644 --- a/src/lang/italian.php +++ b/src/lang/italian.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ // Language and character set - Lingua e set di caratteri diff --git a/src/lang/japanese.php b/src/lang/japanese.php index ff8ffbe8..db99d7c7 100644 --- a/src/lang/japanese.php +++ b/src/lang/japanese.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ // Language and character set diff --git a/src/lang/lithuanian.php b/src/lang/lithuanian.php index 9bb3d341..bc64479e 100644 --- a/src/lang/lithuanian.php +++ b/src/lang/lithuanian.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ // Language and character set diff --git a/src/lang/mongol.php b/src/lang/mongol.php index 4a482a65..67f034e9 100644 --- a/src/lang/mongol.php +++ b/src/lang/mongol.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ // Language and character set diff --git a/src/lang/polish.php b/src/lang/polish.php index d0248e67..15058e79 100644 --- a/src/lang/polish.php +++ b/src/lang/polish.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ // Language and character set diff --git a/src/lang/portuguese-br.php b/src/lang/portuguese-br.php index 1da161bf..b7cfa47f 100644 --- a/src/lang/portuguese-br.php +++ b/src/lang/portuguese-br.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ // Language and character set diff --git a/src/lang/portuguese-pt.php b/src/lang/portuguese-pt.php index 3421f875..0d5994da 100644 --- a/src/lang/portuguese-pt.php +++ b/src/lang/portuguese-pt.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ // Language and character set diff --git a/src/lang/romanian.php b/src/lang/romanian.php index c44c93a4..79e1db6c 100644 --- a/src/lang/romanian.php +++ b/src/lang/romanian.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ // Language and character set diff --git a/src/lang/russian-utf8.php b/src/lang/russian-utf8.php index 872ea863..2e403f87 100644 --- a/src/lang/russian-utf8.php +++ b/src/lang/russian-utf8.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ // Language and character set diff --git a/src/lang/russian.php b/src/lang/russian.php index f4267cd9..3c5978d2 100644 --- a/src/lang/russian.php +++ b/src/lang/russian.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ // Language and character set diff --git a/src/lang/slovak.php b/src/lang/slovak.php index 46e2a8d2..e6b7dc26 100644 --- a/src/lang/slovak.php +++ b/src/lang/slovak.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ // Language and character set diff --git a/src/lang/spanish.php b/src/lang/spanish.php index 751d56d5..fea234a3 100644 --- a/src/lang/spanish.php +++ b/src/lang/spanish.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ // Language and character set diff --git a/src/lang/swedish.php b/src/lang/swedish.php index 09cdcf61..42d4199a 100644 --- a/src/lang/swedish.php +++ b/src/lang/swedish.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ // Language and character set diff --git a/src/lang/turkish.php b/src/lang/turkish.php index 37e45e56..abbb6003 100644 --- a/src/lang/turkish.php +++ b/src/lang/turkish.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ // Language and character set diff --git a/src/lang/ukrainian.php b/src/lang/ukrainian.php index 7e52098d..1c663173 100644 --- a/src/lang/ukrainian.php +++ b/src/lang/ukrainian.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ // Language and character set diff --git a/src/views/info.php b/src/views/info.php deleted file mode 100644 index e36efc3c..00000000 --- a/src/views/info.php +++ /dev/null @@ -1,17 +0,0 @@ -<?php - -/** - * PHPPgAdmin v6.0.0-beta.43 - */ - -// Include application functions - -$do_render = false; -if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; - $do_render = true; -} -$controller = new \PHPPgAdmin\Controller\InfoController($container); -if ($do_render) { - $controller->render(); -} diff --git a/src/xhtml/HTMLController.php b/src/xhtml/HTMLController.php index 5ed5d471..0fc4908a 100644 --- a/src/xhtml/HTMLController.php +++ b/src/xhtml/HTMLController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\XHtml; @@ -112,7 +112,7 @@ class HTMLController ksort($urlvars); foreach ($urlvars as $var => $varfield) { - $url .= $sep . Decorator::value_url($var, $fields) . '=' . Decorator::value_url($varfield, $fields); + $url .= $sep.Decorator::value_url($var, $fields).'='.Decorator::value_url($varfield, $fields); $sep = '&'; } @@ -157,12 +157,12 @@ class HTMLController $tag = '<a '; foreach ($link['attr'] as $attr => $value) { if ('href' == $attr and is_array($value)) { - $tag .= 'href="' . htmlentities($this->getActionUrl($value, $link['fields'], $from)) . '" '; + $tag .= 'href="'.htmlentities($this->getActionUrl($value, $link['fields'], $from)).'" '; } else { - $tag .= htmlentities($attr) . '="' . Decorator::get_sanitized_value($value, $link['fields'], 'html') . '" '; + $tag .= htmlentities($attr).'="'.Decorator::get_sanitized_value($value, $link['fields'], 'html').'" '; } } - $tag .= '>' . Decorator::get_sanitized_value($link['content'], $link['fields'], 'html') . "</a>\n"; + $tag .= '>'.Decorator::get_sanitized_value($link['content'], $link['fields'], 'html')."</a>\n"; if ($do_print) { echo $tag; @@ -193,9 +193,9 @@ class HTMLController $htmlOut = ''; if ($bMultiple) { // If multiple select combo - $htmlOut .= "<select rel=\"printCombo\" name=\"${szName}\" id=\"${szName}\" multiple=\"multiple\" size=\"${iSize}\">" . "\n"; + $htmlOut .= "<select rel=\"printCombo\" name=\"${szName}\" id=\"${szName}\" multiple=\"multiple\" size=\"${iSize}\">"."\n"; } else { - $htmlOut .= "<select rel=\"printCombo\" class=\"select2\" name=\"${szName}\" id=\"${szName}\">" . "\n"; + $htmlOut .= "<select rel=\"printCombo\" class=\"select2\" name=\"${szName}\" id=\"${szName}\">"."\n"; } if ($bBlankEntry) { diff --git a/src/xhtml/HTMLFooterController.php b/src/xhtml/HTMLFooterController.php index 0b905057..ffb63851 100644 --- a/src/xhtml/HTMLFooterController.php +++ b/src/xhtml/HTMLFooterController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/HTMLHeaderController.php b/src/xhtml/HTMLHeaderController.php index 58280f29..e5ef8186 100644 --- a/src/xhtml/HTMLHeaderController.php +++ b/src/xhtml/HTMLHeaderController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/HTMLNavbarController.php b/src/xhtml/HTMLNavbarController.php index 6adc012f..a8703de7 100644 --- a/src/xhtml/HTMLNavbarController.php +++ b/src/xhtml/HTMLNavbarController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/HTMLTableController.php b/src/xhtml/HTMLTableController.php index af4a5041..4467081a 100644 --- a/src/xhtml/HTMLTableController.php +++ b/src/xhtml/HTMLTableController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/TreeController.php b/src/xhtml/TreeController.php index 563dec62..a8ddb1e5 100644 --- a/src/xhtml/TreeController.php +++ b/src/xhtml/TreeController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/XHtmlButton.php b/src/xhtml/XHtmlButton.php index 3e5e8e54..8d2bc12a 100644 --- a/src/xhtml/XHtmlButton.php +++ b/src/xhtml/XHtmlButton.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/XHtmlElement.php b/src/xhtml/XHtmlElement.php index 3f7dfcb4..00b0984b 100644 --- a/src/xhtml/XHtmlElement.php +++ b/src/xhtml/XHtmlElement.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/XHtmlOption.php b/src/xhtml/XHtmlOption.php index 4e5697b3..5ab7b53c 100644 --- a/src/xhtml/XHtmlOption.php +++ b/src/xhtml/XHtmlOption.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/XHtmlSelect.php b/src/xhtml/XHtmlSelect.php index 8c4f11b8..b555363f 100644 --- a/src/xhtml/XHtmlSelect.php +++ b/src/xhtml/XHtmlSelect.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/XHtmlSimpleElement.php b/src/xhtml/XHtmlSimpleElement.php index b398939b..e05afead 100644 --- a/src/xhtml/XHtmlSimpleElement.php +++ b/src/xhtml/XHtmlSimpleElement.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.43 + * PHPPgAdmin v6.0.0-beta.44 */ namespace PHPPgAdmin\XHtml; diff --git a/templates/jstree.twig b/templates/jstree.twig index 187894fd..b116d144 100644 --- a/templates/jstree.twig +++ b/templates/jstree.twig @@ -32,19 +32,12 @@ } else { return node.original.url + '&json=true'; } - }/*, - "data": function (node) { - if (node.id === '#') { - return; - } - return node.original; - }*/ + } } } }); $('#lazy').on("activate_node.jstree", function (e, data) { - //console.log('activate_node',data); if(window.parent.frames.detail) { window.parent.frames.detail.location.replace(data.node.a_attr.href); } diff --git a/tests/unit/ViewTest.php b/tests/unit/ViewTest.php index a37601d1..8408fc75 100644 --- a/tests/unit/ViewTest.php +++ b/tests/unit/ViewTest.php @@ -20,9 +20,7 @@ class ViewTest extends \Codeception\Test\Unit //\Codeception\Util\Debug::debug('BASE_PATH is ' . \BASE_PATH); } - protected function _after() - { - } + protected function _after() {} // tests @@ -30,7 +28,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/acinsert.php'; + require BASE_PATH . '/tests/views/acinsert.php'; $this->assertTrue($controller->controller_name == 'AcinsertController'); } @@ -38,7 +36,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/aggregates.php'; + require BASE_PATH . '/tests/views/aggregates.php'; $this->assertTrue($controller->controller_name == 'AggregatesController'); } @@ -46,7 +44,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/alldb.php'; + require BASE_PATH . '/tests/views/alldb.php'; $this->assertTrue($controller->controller_name == 'AlldbController'); } @@ -54,7 +52,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/browser.php'; + require BASE_PATH . '/tests/views/browser.php'; $this->assertTrue($controller->controller_name == 'BrowserController'); } @@ -62,7 +60,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/casts.php'; + require BASE_PATH . '/tests/views/casts.php'; $this->assertTrue($controller->controller_name == 'CastsController'); } @@ -70,7 +68,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/colproperties.php'; + require BASE_PATH . '/tests/views/colproperties.php'; $this->assertTrue($controller->controller_name == 'ColpropertiesController'); } @@ -78,7 +76,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/constraints.php'; + require BASE_PATH . '/tests/views/constraints.php'; $this->assertTrue($controller->controller_name == 'ConstraintsController'); } @@ -86,7 +84,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/conversions.php'; + require BASE_PATH . '/tests/views/conversions.php'; $this->assertTrue($controller->controller_name == 'ConversionsController'); } @@ -94,7 +92,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/database.php'; + require BASE_PATH . '/tests/views/database.php'; $this->assertTrue($controller->controller_name == 'DatabaseController'); } @@ -102,7 +100,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/dataexport.php'; + require BASE_PATH . '/tests/views/dataexport.php'; $this->assertTrue($controller->controller_name == 'DataexportController'); } @@ -110,7 +108,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/dataimport.php'; + require BASE_PATH . '/tests/views/dataimport.php'; $this->assertTrue($controller->controller_name == 'DataimportController'); } @@ -118,7 +116,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/dbexport.php'; + require BASE_PATH . '/tests/views/dbexport.php'; $this->assertTrue($controller->controller_name == 'DbexportController'); } @@ -126,7 +124,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/display.php'; + require BASE_PATH . '/tests/views/display.php'; $this->assertTrue($controller->controller_name == 'DisplayController'); } @@ -134,7 +132,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/domains.php'; + require BASE_PATH . '/tests/views/domains.php'; $this->assertTrue($controller->controller_name == 'DomainsController'); } @@ -142,7 +140,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/fulltext.php'; + require BASE_PATH . '/tests/views/fulltext.php'; $this->assertTrue($controller->controller_name == 'FulltextController'); } @@ -150,7 +148,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/functions.php'; + require BASE_PATH . '/tests/views/functions.php'; $this->assertTrue($controller->controller_name == 'FunctionsController'); } @@ -158,7 +156,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/groups.php'; + require BASE_PATH . '/tests/views/groups.php'; $this->assertTrue($controller->controller_name == 'GroupsController'); } @@ -166,7 +164,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/help.php'; + require BASE_PATH . '/tests/views/help.php'; $this->assertTrue($controller->controller_name == 'HelpController'); } @@ -174,7 +172,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/history.php'; + require BASE_PATH . '/tests/views/history.php'; $this->assertTrue($controller->controller_name == 'HistoryController'); } @@ -182,7 +180,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/indexes.php'; + require BASE_PATH . '/tests/views/indexes.php'; $this->assertTrue($controller->controller_name == 'IndexesController'); } @@ -190,7 +188,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/info.php'; + require BASE_PATH . '/tests/views/info.php'; $this->assertTrue($controller->controller_name == 'InfoController'); } @@ -198,7 +196,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/intro.php'; + require BASE_PATH . '/tests/views/intro.php'; $this->assertTrue($controller->controller_name == 'IntroController'); } @@ -206,7 +204,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/languages.php'; + require BASE_PATH . '/tests/views/languages.php'; $this->assertTrue($controller->controller_name == 'LanguagesController'); } @@ -214,7 +212,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/login.php'; + require BASE_PATH . '/tests/views/login.php'; $this->assertTrue($controller->controller_name == 'LoginController'); } @@ -222,7 +220,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/materializedviewproperties.php'; + require BASE_PATH . '/tests/views/materializedviewproperties.php'; $this->assertTrue($controller->controller_name == 'MaterializedviewpropertiesController'); } @@ -230,7 +228,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/materializedviews.php'; + require BASE_PATH . '/tests/views/materializedviews.php'; $this->assertTrue($controller->controller_name == 'MaterializedviewsController'); } @@ -238,7 +236,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/opclasses.php'; + require BASE_PATH . '/tests/views/opclasses.php'; $this->assertTrue($controller->controller_name == 'OpclassesController'); } @@ -246,7 +244,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/operators.php'; + require BASE_PATH . '/tests/views/operators.php'; $this->assertTrue($controller->controller_name == 'OperatorsController'); } @@ -254,7 +252,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/privileges.php'; + require BASE_PATH . '/tests/views/privileges.php'; $this->assertTrue($controller->controller_name == 'PrivilegesController'); } @@ -262,7 +260,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/roles.php'; + require BASE_PATH . '/tests/views/roles.php'; $this->assertTrue($controller->controller_name == 'RolesController'); } @@ -270,7 +268,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/rules.php'; + require BASE_PATH . '/tests/views/rules.php'; $this->assertTrue($controller->controller_name == 'RulesController'); } @@ -278,7 +276,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/schemas.php'; + require BASE_PATH . '/tests/views/schemas.php'; $this->assertTrue($controller->controller_name == 'SchemasController'); } @@ -286,7 +284,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/sequences.php'; + require BASE_PATH . '/tests/views/sequences.php'; $this->assertTrue($controller->controller_name == 'SequencesController'); } @@ -294,7 +292,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/servers.php'; + require BASE_PATH . '/tests/views/servers.php'; $this->assertTrue($controller->controller_name == 'ServersController'); } @@ -302,7 +300,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/sqledit.php'; + require BASE_PATH . '/tests/views/sqledit.php'; $this->assertTrue($controller->controller_name == 'SqleditController'); } @@ -310,7 +308,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/sql.php'; + require BASE_PATH . '/tests/views/sql.php'; $this->assertTrue($controller->controller_name == 'SqlController'); } @@ -318,7 +316,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/tablespaces.php'; + require BASE_PATH . '/tests/views/tablespaces.php'; $this->assertTrue($controller->controller_name == 'TablespacesController'); } @@ -326,7 +324,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/tables.php'; + require BASE_PATH . '/tests/views/tables.php'; $this->assertTrue($controller->controller_name == 'TablesController'); } @@ -334,7 +332,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/tblproperties.php'; + require BASE_PATH . '/tests/views/tblproperties.php'; $this->assertTrue($controller->controller_name == 'TblpropertiesController'); } @@ -342,7 +340,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/triggers.php'; + require BASE_PATH . '/tests/views/triggers.php'; $this->assertTrue($controller->controller_name == 'TriggersController'); } @@ -350,7 +348,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/types.php'; + require BASE_PATH . '/tests/views/types.php'; $this->assertTrue($controller->controller_name == 'TypesController'); } @@ -358,7 +356,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/users.php'; + require BASE_PATH . '/tests/views/users.php'; $this->assertTrue($controller->controller_name == 'UsersController'); } @@ -366,7 +364,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/viewproperties.php'; + require BASE_PATH . '/tests/views/viewproperties.php'; $this->assertTrue($controller->controller_name == 'ViewpropertiesController'); } @@ -374,7 +372,7 @@ class ViewTest extends \Codeception\Test\Unit { $container = $this->container; $container->misc->setNoDBConnection(true); - require BASE_PATH . '/src/views/views.php'; + require BASE_PATH . '/tests/views/views.php'; $this->assertTrue($controller->controller_name == 'ViewsController'); } } diff --git a/src/views/acinsert.php b/tests/views/acinsert.php index f974e93d..f4702e38 100644 --- a/src/views/acinsert.php +++ b/tests/views/acinsert.php @@ -5,7 +5,7 @@ */ $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } echo 'Will instance controller'; diff --git a/src/views/aggregates.php b/tests/views/aggregates.php index 9f7778b4..ae6e2c2b 100644 --- a/src/views/aggregates.php +++ b/tests/views/aggregates.php @@ -7,7 +7,7 @@ // Include application functions $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } $controller = new \PHPPgAdmin\Controller\AggregatesController($container); diff --git a/src/views/alldb.php b/tests/views/alldb.php index c1425b65..fe4f2efc 100644 --- a/src/views/alldb.php +++ b/tests/views/alldb.php @@ -7,7 +7,7 @@ // Include application functions $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } $controller = new \PHPPgAdmin\Controller\AlldbController($container); diff --git a/src/views/browser.php b/tests/views/browser.php index 74dcf728..2a1e6ea4 100644 --- a/src/views/browser.php +++ b/tests/views/browser.php @@ -5,7 +5,7 @@ */ $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } $controller = new \PHPPgAdmin\Controller\BrowserController($container, true); diff --git a/src/views/casts.php b/tests/views/casts.php index e6dce3c7..e2e3531b 100644 --- a/src/views/casts.php +++ b/tests/views/casts.php @@ -7,7 +7,7 @@ // Include application functions $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } $controller = new \PHPPgAdmin\Controller\CastsController($container); diff --git a/src/views/colproperties.php b/tests/views/colproperties.php index 964ec71b..3af4690c 100644 --- a/src/views/colproperties.php +++ b/tests/views/colproperties.php @@ -7,7 +7,7 @@ // Include application functions $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } $controller = new \PHPPgAdmin\Controller\ColpropertiesController($container); diff --git a/src/views/constraints.php b/tests/views/constraints.php index 50d902b6..c62a9b1e 100644 --- a/src/views/constraints.php +++ b/tests/views/constraints.php @@ -8,7 +8,7 @@ $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } $controller = new \PHPPgAdmin\Controller\ConstraintsController($container); diff --git a/src/views/conversions.php b/tests/views/conversions.php index 8fee8754..481a0936 100644 --- a/src/views/conversions.php +++ b/tests/views/conversions.php @@ -8,7 +8,7 @@ $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } $controller = new \PHPPgAdmin\Controller\ConversionsController($container); diff --git a/src/views/database.php b/tests/views/database.php index 8df7f6a9..f9a2e2eb 100644 --- a/src/views/database.php +++ b/tests/views/database.php @@ -7,7 +7,7 @@ // Include application functions $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } $controller = new \PHPPgAdmin\Controller\DatabaseController($container); diff --git a/src/views/dataexport.php b/tests/views/dataexport.php index a7e24123..750015e1 100644 --- a/src/views/dataexport.php +++ b/tests/views/dataexport.php @@ -5,7 +5,7 @@ */ $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } $controller = new \PHPPgAdmin\Controller\DataexportController($container); diff --git a/src/views/dataimport.php b/tests/views/dataimport.php index 59ecbbb8..b3510eaa 100644 --- a/src/views/dataimport.php +++ b/tests/views/dataimport.php @@ -5,7 +5,7 @@ */ $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } $controller = new \PHPPgAdmin\Controller\DataimportController($container); diff --git a/src/views/dbexport.php b/tests/views/dbexport.php index 06280ae9..7a1163ab 100644 --- a/src/views/dbexport.php +++ b/tests/views/dbexport.php @@ -5,7 +5,7 @@ */ $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } $controller = new \PHPPgAdmin\Controller\DbexportController($container); diff --git a/src/views/display.php b/tests/views/display.php index 975a77d7..a58a3140 100644 --- a/src/views/display.php +++ b/tests/views/display.php @@ -8,7 +8,7 @@ $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } $controller = new \PHPPgAdmin\Controller\DisplayController($container); diff --git a/src/views/domains.php b/tests/views/domains.php index 7dc33c4e..5046aa82 100644 --- a/src/views/domains.php +++ b/tests/views/domains.php @@ -8,7 +8,7 @@ $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } $controller = new \PHPPgAdmin\Controller\DomainsController($container); diff --git a/src/views/fulltext.php b/tests/views/fulltext.php index 6266712a..50e949b7 100644 --- a/src/views/fulltext.php +++ b/tests/views/fulltext.php @@ -8,7 +8,7 @@ $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } $controller = new \PHPPgAdmin\Controller\FulltextController($container); diff --git a/src/views/functions.php b/tests/views/functions.php index 528c7769..d7f99ef3 100644 --- a/src/views/functions.php +++ b/tests/views/functions.php @@ -8,7 +8,7 @@ $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } $controller = new \PHPPgAdmin\Controller\FunctionsController($container); diff --git a/src/views/groups.php b/tests/views/groups.php index 6452b1e2..87dec4b8 100644 --- a/src/views/groups.php +++ b/tests/views/groups.php @@ -8,7 +8,7 @@ $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } $controller = new \PHPPgAdmin\Controller\GroupsController($container); diff --git a/src/views/help.php b/tests/views/help.php index fc27b28c..bbf8e67a 100644 --- a/src/views/help.php +++ b/tests/views/help.php @@ -8,7 +8,7 @@ $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } $controller = new \PHPPgAdmin\Controller\HelpController($container); diff --git a/src/views/history.php b/tests/views/history.php index f52d3b2b..2d722de8 100644 --- a/src/views/history.php +++ b/tests/views/history.php @@ -8,7 +8,7 @@ $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } $controller = new \PHPPgAdmin\Controller\HistoryController($container); diff --git a/src/views/indexes.php b/tests/views/indexes.php index c016abcd..91580a0d 100644 --- a/src/views/indexes.php +++ b/tests/views/indexes.php @@ -8,7 +8,7 @@ $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } $controller = new \PHPPgAdmin\Controller\IndexesController($container); diff --git a/src/views/intro.php b/tests/views/intro.php index 00911536..7516ec14 100644 --- a/src/views/intro.php +++ b/tests/views/intro.php @@ -5,7 +5,7 @@ */ $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } $controller = new \PHPPgAdmin\Controller\IntroController($container, true); diff --git a/src/views/languages.php b/tests/views/languages.php index a32516cd..74d429fd 100644 --- a/src/views/languages.php +++ b/tests/views/languages.php @@ -7,7 +7,7 @@ // Include application functions $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } $controller = new \PHPPgAdmin\Controller\LanguagesController($container); diff --git a/src/views/login.php b/tests/views/login.php index f0183cb0..3fc5c54b 100644 --- a/src/views/login.php +++ b/tests/views/login.php @@ -5,7 +5,7 @@ */ $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } $controller = new \PHPPgAdmin\Controller\LoginController($container, true); diff --git a/src/views/materializedviewproperties.php b/tests/views/materializedviewproperties.php index 294d31b7..64ff0c07 100644 --- a/src/views/materializedviewproperties.php +++ b/tests/views/materializedviewproperties.php @@ -7,7 +7,7 @@ // Include application functions $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } $controller = new \PHPPgAdmin\Controller\MaterializedviewpropertiesController($container); diff --git a/src/views/materializedviews.php b/tests/views/materializedviews.php index 9393d4db..82b09d18 100644 --- a/src/views/materializedviews.php +++ b/tests/views/materializedviews.php @@ -7,7 +7,7 @@ // Include application functions $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } $controller = new \PHPPgAdmin\Controller\MaterializedviewsController($container); diff --git a/src/views/opclasses.php b/tests/views/opclasses.php index bfa4c6a5..cd02815c 100644 --- a/src/views/opclasses.php +++ b/tests/views/opclasses.php @@ -7,7 +7,7 @@ // Include application functions $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } $controller = new \PHPPgAdmin\Controller\OpclassesController($container); diff --git a/src/views/operators.php b/tests/views/operators.php index cbc5c1f5..b3b9318e 100644 --- a/src/views/operators.php +++ b/tests/views/operators.php @@ -7,7 +7,7 @@ // Include application functions $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } $controller = new \PHPPgAdmin\Controller\OperatorsController($container); diff --git a/src/views/privileges.php b/tests/views/privileges.php index 1d61732d..a1374144 100644 --- a/src/views/privileges.php +++ b/tests/views/privileges.php @@ -5,7 +5,7 @@ */ $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } $controller = new \PHPPgAdmin\Controller\PrivilegesController($container); diff --git a/src/views/roles.php b/tests/views/roles.php index 78f11ab1..1b27caad 100644 --- a/src/views/roles.php +++ b/tests/views/roles.php @@ -8,7 +8,7 @@ $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } $controller = new \PHPPgAdmin\Controller\RolesController($container); diff --git a/src/views/rules.php b/tests/views/rules.php index 57eb2fc9..99296498 100644 --- a/src/views/rules.php +++ b/tests/views/rules.php @@ -8,7 +8,7 @@ $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } $controller = new \PHPPgAdmin\Controller\RulesController($container); diff --git a/src/views/schemas.php b/tests/views/schemas.php index 542c2e20..ccb3615a 100644 --- a/src/views/schemas.php +++ b/tests/views/schemas.php @@ -7,7 +7,7 @@ // Include application functions $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } $controller = new \PHPPgAdmin\Controller\SchemasController($container); diff --git a/src/views/sequences.php b/tests/views/sequences.php index 4dd9467c..d5a10009 100644 --- a/src/views/sequences.php +++ b/tests/views/sequences.php @@ -7,7 +7,7 @@ // Include application functions $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } $controller = new \PHPPgAdmin\Controller\SequencesController($container); diff --git a/src/views/servers.php b/tests/views/servers.php index 796dba2a..10898712 100644 --- a/src/views/servers.php +++ b/tests/views/servers.php @@ -5,7 +5,7 @@ */ $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } $controller = new \PHPPgAdmin\Controller\ServersController($container, true); diff --git a/src/views/sql.php b/tests/views/sql.php index d0ef0c17..1a848fd8 100644 --- a/src/views/sql.php +++ b/tests/views/sql.php @@ -8,7 +8,7 @@ $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } $controller = new \PHPPgAdmin\Controller\SqlController($container); diff --git a/src/views/sqledit.php b/tests/views/sqledit.php index 99efb139..f961a34c 100644 --- a/src/views/sqledit.php +++ b/tests/views/sqledit.php @@ -5,10 +5,10 @@ */ // Include application functions -//require_once '../lib.inc.php'; +//require_once '../../src/lib.inc.php'; $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } $controller = new \PHPPgAdmin\Controller\SqleditController($container); diff --git a/src/views/tables.php b/tests/views/tables.php index 696f3043..fcf2e06d 100644 --- a/src/views/tables.php +++ b/tests/views/tables.php @@ -5,7 +5,7 @@ */ $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } $controller = new \PHPPgAdmin\Controller\TablesController($container); diff --git a/src/views/tablespaces.php b/tests/views/tablespaces.php index d2b58627..6041bb46 100644 --- a/src/views/tablespaces.php +++ b/tests/views/tablespaces.php @@ -7,7 +7,7 @@ // Include application functions $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } $controller = new \PHPPgAdmin\Controller\TablespacesController($container); diff --git a/src/views/tblproperties.php b/tests/views/tblproperties.php index 3afc5738..db83fa38 100644 --- a/src/views/tblproperties.php +++ b/tests/views/tblproperties.php @@ -8,7 +8,7 @@ $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } $controller = new \PHPPgAdmin\Controller\TblpropertiesController($container); diff --git a/src/views/triggers.php b/tests/views/triggers.php index f648eabb..90da17ca 100644 --- a/src/views/triggers.php +++ b/tests/views/triggers.php @@ -8,7 +8,7 @@ $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } $controller = new \PHPPgAdmin\Controller\TriggersController($container); diff --git a/src/views/types.php b/tests/views/types.php index 4572a479..4273a8cf 100644 --- a/src/views/types.php +++ b/tests/views/types.php @@ -7,7 +7,7 @@ // Include application functions $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } $controller = new \PHPPgAdmin\Controller\TypesController($container); diff --git a/src/views/users.php b/tests/views/users.php index ff172b96..ea73733c 100644 --- a/src/views/users.php +++ b/tests/views/users.php @@ -7,7 +7,7 @@ // Include application functions $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } $controller = new \PHPPgAdmin\Controller\UsersController($container); diff --git a/src/views/viewproperties.php b/tests/views/viewproperties.php index 274cc376..890094b4 100644 --- a/src/views/viewproperties.php +++ b/tests/views/viewproperties.php @@ -7,7 +7,7 @@ // Include application functions $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } $controller = new \PHPPgAdmin\Controller\ViewpropertiesController($container); diff --git a/src/views/views.php b/tests/views/views.php index 423bfb84..8a288ef1 100644 --- a/src/views/views.php +++ b/tests/views/views.php @@ -7,7 +7,7 @@ // Include application functions $do_render = false; if (!defined('BASE_PATH')) { - require_once '../lib.inc.php'; + require_once '../../src/lib.inc.php'; $do_render = true; } $controller = new \PHPPgAdmin\Controller\ViewsController($container); |