From 21c5e6ebc0fd99c00007273058e65ece52fc7dcf Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Tue, 7 Aug 2018 20:55:18 -0500 Subject: [PATCH] Progress: continue work on database, refactor database from 'base' into 'database' --- common/base/classes/base_database.php | 10 +- common/base/classes/base_debug.php | 2 +- common/base/classes/base_defaults_global.php | 2 +- common/base/classes/base_email.php | 28 +- common/base/classes/base_error.php | 12 +- .../base/classes/base_error_messages_english.php | 50 +- .../base/classes/base_error_messages_japanese.php | 48 +- common/base/classes/base_html.php | 4 +- common/base/classes/base_http.php | 270 ++++---- common/base/classes/base_markup.php | 6 +- common/base/classes/base_menu.php | 8 +- common/base/classes/base_mime.php | 122 ++-- common/base/classes/base_path.php | 2 +- common/base/classes/base_paths.php | 2 +- common/base/classes/base_query_alter_domain.php | 70 -- common/base/classes/base_query_alter_group.php | 70 -- common/base/classes/base_query_alter_index.php | 70 -- common/base/classes/base_query_alter_language.php | 70 -- .../base/classes/base_query_alter_large_object.php | 70 -- .../classes/base_query_alter_materialized_view.php | 70 -- common/base/classes/base_query_alter_operator.php | 70 -- .../classes/base_query_alter_operator_class.php | 70 -- .../classes/base_query_alter_operator_family.php | 70 -- common/base/classes/base_query_alter_policy.php | 70 -- .../base/classes/base_query_alter_publication.php | 70 -- common/base/classes/base_query_alter_role.php | 70 -- common/base/classes/base_query_alter_rule.php | 70 -- common/base/classes/base_query_alter_schema.php | 70 -- common/base/classes/base_query_alter_table.php | 70 -- .../base/classes/base_query_alter_tablespace.php | 70 -- .../base_query_alter_text_search_configuration.php | 70 -- .../base_query_alter_text_search_dictionary.php | 70 -- .../base_query_alter_text_search_parser.php | 70 -- .../base_query_alter_text_search_template.php | 70 -- common/base/classes/base_query_alter_trigger.php | 70 -- common/base/classes/base_query_alter_type.php | 70 -- common/base/classes/base_query_alter_user.php | 70 -- .../base/classes/base_query_alter_user_mapping.php | 70 -- common/base/classes/base_query_alter_view.php | 70 -- common/base/classes/base_query_analyze.php | 70 -- common/base/classes/base_query_begin.php | 70 -- common/base/classes/base_query_checkpoint.php | 70 -- common/base/classes/base_query_close.php | 70 -- common/base/classes/base_query_cluster.php | 70 -- common/base/classes/base_query_comment.php | 70 -- common/base/classes/base_query_commit.php | 70 -- common/base/classes/base_query_commit_prepared.php | 70 -- common/base/classes/base_query_copy.php | 70 -- .../classes/base_query_create_access_method.php | 70 -- .../base/classes/base_query_create_aggregate.php | 70 -- common/base/classes/base_query_create_cast.php | 70 -- .../base/classes/base_query_create_collation.php | 70 -- .../base/classes/base_query_create_conversion.php | 70 -- common/base/classes/base_query_create_database.php | 70 -- common/base/classes/base_query_create_domain.php | 70 -- .../classes/base_query_create_event_trigger.php | 70 -- .../base/classes/base_query_create_extension.php | 70 -- common/base/classes/base_query_create_foreign.php | 70 -- .../base_query_create_foreign_data_wrapper.php | 70 -- common/base/classes/base_query_create_function.php | 70 -- common/base/classes/base_query_create_group.php | 70 -- common/base/classes/base_query_create_index.php | 70 -- common/base/classes/base_query_create_language.php | 70 -- .../base_query_create_materialized_view.php | 70 -- common/base/classes/base_query_create_operator.php | 70 -- .../classes/base_query_create_operator_class.php | 70 -- .../classes/base_query_create_operator_family.php | 70 -- common/base/classes/base_query_create_policy.php | 70 -- .../base/classes/base_query_create_publication.php | 70 -- common/base/classes/base_query_create_role.php | 70 -- common/base/classes/base_query_create_rule.php | 70 -- common/base/classes/base_query_create_schema.php | 70 -- common/base/classes/base_query_create_sequence.php | 70 -- common/base/classes/base_query_create_server.php | 70 -- .../base/classes/base_query_create_statistics.php | 70 -- .../classes/base_query_create_subscription.php | 70 -- common/base/classes/base_query_create_table.php | 70 -- common/base/classes/base_query_create_table_as.php | 70 -- .../base/classes/base_query_create_tablespace.php | 70 -- ...base_query_create_text_search_configuration.php | 70 -- .../base_query_create_text_search_dictionary.php | 70 -- .../base_query_create_text_search_parser.php | 70 -- .../base_query_create_text_search_template.php | 70 -- .../base/classes/base_query_create_transform.php | 70 -- common/base/classes/base_query_create_trigger.php | 70 -- common/base/classes/base_query_create_type.php | 70 -- common/base/classes/base_query_create_user.php | 70 -- .../classes/base_query_create_user_mapping.php | 70 -- common/base/classes/base_query_create_view.php | 70 -- common/base/classes/base_query_deallocate.php | 70 -- common/base/classes/base_query_declare.php | 70 -- common/base/classes/base_query_delete.php | 70 -- common/base/classes/base_query_discard.php | 70 -- common/base/classes/base_query_do.php | 70 -- .../base/classes/base_query_drop_access_method.php | 70 -- common/base/classes/base_query_drop_aggregate.php | 70 -- common/base/classes/base_query_drop_cast.php | 70 -- common/base/classes/base_query_drop_collation.php | 70 -- common/base/classes/base_query_drop_conversion.php | 70 -- common/base/classes/base_query_drop_database.php | 70 -- common/base/classes/base_query_drop_domain.php | 70 -- .../base/classes/base_query_drop_event_trigger.php | 70 -- common/base/classes/base_query_drop_extension.php | 70 -- .../base_query_drop_foreign_data_wrapper.php | 70 -- .../base/classes/base_query_drop_foreign_table.php | 70 -- common/base/classes/base_query_drop_function.php | 70 -- common/base/classes/base_query_drop_group.php | 70 -- common/base/classes/base_query_drop_index.php | 70 -- common/base/classes/base_query_drop_language.php | 70 -- .../classes/base_query_drop_materialized_view.php | 70 -- common/base/classes/base_query_drop_operator.php | 70 -- .../classes/base_query_drop_operator_class.php | 70 -- .../classes/base_query_drop_operator_family.php | 70 -- common/base/classes/base_query_drop_owned.php | 70 -- common/base/classes/base_query_drop_policy.php | 70 -- .../base/classes/base_query_drop_publication.php | 70 -- common/base/classes/base_query_drop_role.php | 70 -- common/base/classes/base_query_drop_rule.php | 70 -- common/base/classes/base_query_drop_schema.php | 70 -- common/base/classes/base_query_drop_sequence.php | 70 -- common/base/classes/base_query_drop_server.php | 70 -- common/base/classes/base_query_drop_statistics.php | 70 -- .../base/classes/base_query_drop_subscription.php | 70 -- common/base/classes/base_query_drop_table.php | 70 -- common/base/classes/base_query_drop_tablespace.php | 70 -- .../base_query_drop_text_search_configuration.php | 70 -- .../base_query_drop_text_search_dictionary.php | 70 -- .../classes/base_query_drop_text_search_parser.php | 70 -- .../base_query_drop_text_search_template.php | 70 -- common/base/classes/base_query_drop_transform.php | 70 -- common/base/classes/base_query_drop_trigger.php | 70 -- common/base/classes/base_query_drop_type.php | 70 -- common/base/classes/base_query_drop_user.php | 70 -- .../base/classes/base_query_drop_user_mapping.php | 70 -- common/base/classes/base_query_drop_view.php | 70 -- common/base/classes/base_query_end.php | 70 -- common/base/classes/base_query_execute.php | 70 -- common/base/classes/base_query_explain.php | 70 -- common/base/classes/base_query_fetch.php | 70 -- common/base/classes/base_query_grant.php | 70 -- .../classes/base_query_import_foreign_schema.php | 70 -- common/base/classes/base_query_insert.php | 70 -- common/base/classes/base_query_listen.php | 70 -- common/base/classes/base_query_load.php | 70 -- common/base/classes/base_query_lock.php | 70 -- common/base/classes/base_query_move.php | 70 -- common/base/classes/base_query_notify.php | 70 -- common/base/classes/base_query_prepare.php | 70 -- .../classes/base_query_prepare_transaction.php | 70 -- common/base/classes/base_query_reassign_owned.php | 70 -- .../classes/base_query_refresh_materialized.php | 70 -- common/base/classes/base_query_reindex.php | 70 -- .../base/classes/base_query_release_savepoint.php | 70 -- common/base/classes/base_query_reset.php | 70 -- common/base/classes/base_query_revoke.php | 70 -- .../base/classes/base_query_rollback_prepared.php | 70 -- .../classes/base_query_rollback_to_savepoint.php | 70 -- common/base/classes/base_query_savepoint.php | 70 -- common/base/classes/base_query_security_label.php | 70 -- common/base/classes/base_query_select.php | 70 -- common/base/classes/base_query_select_into.php | 70 -- common/base/classes/base_query_set.php | 70 -- common/base/classes/base_query_set_constraints.php | 70 -- common/base/classes/base_query_set_role.php | 70 -- .../base_query_set_session_authorization.php | 70 -- common/base/classes/base_query_set_transaction.php | 70 -- common/base/classes/base_query_show.php | 70 -- .../base/classes/base_query_start_transaction.php | 70 -- common/base/classes/base_query_string.php | 80 --- common/base/classes/base_query_truncate.php | 70 -- common/base/classes/base_query_unlisten.php | 70 -- common/base/classes/base_query_update.php | 70 -- common/base/classes/base_query_vacuum.php | 70 -- common/base/classes/base_query_values.php | 70 -- common/base/classes/base_return.php | 14 +- common/base/classes/base_roles.php | 76 +-- common/base/classes/base_session.php | 4 +- common/base/traits/base_query.php | 746 --------------------- common/base/traits/base_rfc_string.php | 124 ++-- .../classes/database_alter_aggregate.php} | 50 +- .../classes/database_alter_coalation.php} | 28 +- .../classes/database_alter_conversion.php} | 22 +- .../classes/database_alter_database.php} | 80 ++- .../classes/database_alter_default_privileges.php} | 207 ++---- common/database/classes/database_alter_domain.php | 367 ++++++++++ .../classes/database_alter_event_trigger.php} | 5 +- .../classes/database_alter_extension.php} | 5 +- .../database_alter_foreign_data_wrapper.php} | 5 +- .../classes/database_alter_foreign_table.php} | 5 +- .../classes/database_alter_function.php} | 5 +- common/database/classes/database_alter_group.php | 71 ++ common/database/classes/database_alter_index.php | 71 ++ .../database/classes/database_alter_language.php | 71 ++ .../classes/database_alter_large_object.php | 71 ++ .../classes/database_alter_materialized_view.php | 71 ++ .../database/classes/database_alter_operator.php | 71 ++ .../classes/database_alter_operator_class.php | 71 ++ .../classes/database_alter_operator_family.php | 71 ++ common/database/classes/database_alter_policy.php | 71 ++ .../classes/database_alter_publication.php | 71 ++ common/database/classes/database_alter_role.php | 71 ++ common/database/classes/database_alter_rule.php | 71 ++ common/database/classes/database_alter_schema.php | 71 ++ common/database/classes/database_alter_table.php | 71 ++ .../database/classes/database_alter_tablespace.php | 71 ++ .../database_alter_text_search_configuration.php | 71 ++ .../database_alter_text_search_dictionary.php | 71 ++ .../classes/database_alter_text_search_parser.php | 71 ++ .../database_alter_text_search_template.php | 71 ++ common/database/classes/database_alter_trigger.php | 71 ++ common/database/classes/database_alter_type.php | 71 ++ common/database/classes/database_alter_user.php | 71 ++ .../classes/database_alter_user_mapping.php | 71 ++ common/database/classes/database_alter_view.php | 71 ++ common/database/classes/database_analyze.php | 71 ++ common/database/classes/database_begin.php | 71 ++ common/database/classes/database_checkpoint.php | 71 ++ common/database/classes/database_close.php | 71 ++ common/database/classes/database_cluster.php | 71 ++ .../classes/database_code.php} | 8 +- common/database/classes/database_comment.php | 71 ++ common/database/classes/database_commit.php | 71 ++ .../database/classes/database_commit_prepared.php | 71 ++ common/database/classes/database_copy.php | 71 ++ .../classes/database_create_access_method.php | 71 ++ .../database/classes/database_create_aggregate.php | 71 ++ common/database/classes/database_create_cast.php | 71 ++ .../database/classes/database_create_collation.php | 71 ++ .../classes/database_create_conversion.php | 71 ++ .../database/classes/database_create_database.php | 71 ++ common/database/classes/database_create_domain.php | 71 ++ .../classes/database_create_event_trigger.php | 71 ++ .../database/classes/database_create_extension.php | 71 ++ .../database/classes/database_create_foreign.php | 71 ++ .../database_create_foreign_data_wrapper.php | 71 ++ .../database/classes/database_create_function.php | 71 ++ common/database/classes/database_create_group.php | 71 ++ common/database/classes/database_create_index.php | 71 ++ .../database/classes/database_create_language.php | 71 ++ .../classes/database_create_materialized_view.php | 71 ++ .../database/classes/database_create_operator.php | 71 ++ .../classes/database_create_operator_class.php | 71 ++ .../classes/database_create_operator_family.php | 71 ++ common/database/classes/database_create_policy.php | 71 ++ .../classes/database_create_publication.php | 71 ++ common/database/classes/database_create_role.php | 71 ++ common/database/classes/database_create_rule.php | 71 ++ common/database/classes/database_create_schema.php | 71 ++ .../database/classes/database_create_sequence.php | 71 ++ common/database/classes/database_create_server.php | 71 ++ .../classes/database_create_statistics.php | 71 ++ .../classes/database_create_subscription.php | 71 ++ common/database/classes/database_create_table.php | 71 ++ .../database/classes/database_create_table_as.php | 71 ++ .../classes/database_create_tablespace.php | 71 ++ .../database_create_text_search_configuration.php | 71 ++ .../database_create_text_search_dictionary.php | 71 ++ .../classes/database_create_text_search_parser.php | 71 ++ .../database_create_text_search_template.php | 71 ++ .../database/classes/database_create_transform.php | 71 ++ .../database/classes/database_create_trigger.php | 71 ++ common/database/classes/database_create_type.php | 71 ++ common/database/classes/database_create_user.php | 71 ++ .../classes/database_create_user_mapping.php | 71 ++ common/database/classes/database_create_view.php | 71 ++ common/database/classes/database_deallocate.php | 71 ++ common/database/classes/database_declare.php | 71 ++ common/database/classes/database_delete.php | 71 ++ common/database/classes/database_discard.php | 71 ++ common/database/classes/database_do.php | 71 ++ .../classes/database_drop_access_method.php | 71 ++ .../database/classes/database_drop_aggregate.php | 71 ++ common/database/classes/database_drop_cast.php | 71 ++ .../database/classes/database_drop_collation.php | 71 ++ .../database/classes/database_drop_conversion.php | 71 ++ common/database/classes/database_drop_database.php | 71 ++ common/database/classes/database_drop_domain.php | 71 ++ .../classes/database_drop_event_trigger.php | 71 ++ .../database/classes/database_drop_extension.php | 71 ++ .../classes/database_drop_foreign_data_wrapper.php | 71 ++ .../classes/database_drop_foreign_table.php | 71 ++ common/database/classes/database_drop_function.php | 71 ++ common/database/classes/database_drop_group.php | 71 ++ common/database/classes/database_drop_index.php | 71 ++ common/database/classes/database_drop_language.php | 71 ++ .../classes/database_drop_materialized_view.php | 71 ++ common/database/classes/database_drop_operator.php | 71 ++ .../classes/database_drop_operator_class.php | 71 ++ .../classes/database_drop_operator_family.php | 71 ++ common/database/classes/database_drop_owned.php | 71 ++ common/database/classes/database_drop_policy.php | 71 ++ .../database/classes/database_drop_publication.php | 71 ++ common/database/classes/database_drop_role.php | 71 ++ common/database/classes/database_drop_rule.php | 71 ++ common/database/classes/database_drop_schema.php | 71 ++ common/database/classes/database_drop_sequence.php | 71 ++ common/database/classes/database_drop_server.php | 71 ++ .../database/classes/database_drop_statistics.php | 71 ++ .../classes/database_drop_subscription.php | 71 ++ common/database/classes/database_drop_table.php | 71 ++ .../database/classes/database_drop_tablespace.php | 71 ++ .../database_drop_text_search_configuration.php | 71 ++ .../database_drop_text_search_dictionary.php | 71 ++ .../classes/database_drop_text_search_parser.php | 71 ++ .../classes/database_drop_text_search_template.php | 71 ++ .../database/classes/database_drop_transform.php | 71 ++ common/database/classes/database_drop_trigger.php | 71 ++ common/database/classes/database_drop_type.php | 71 ++ common/database/classes/database_drop_user.php | 71 ++ .../classes/database_drop_user_mapping.php | 71 ++ common/database/classes/database_drop_view.php | 71 ++ common/database/classes/database_end.php | 71 ++ common/database/classes/database_execute.php | 71 ++ common/database/classes/database_explain.php | 71 ++ common/database/classes/database_fetch.php | 71 ++ common/database/classes/database_grant.php | 71 ++ .../classes/database_import_foreign_schema.php | 71 ++ common/database/classes/database_insert.php | 71 ++ common/database/classes/database_listen.php | 71 ++ common/database/classes/database_load.php | 71 ++ common/database/classes/database_lock.php | 71 ++ common/database/classes/database_move.php | 71 ++ common/database/classes/database_notify.php | 71 ++ common/database/classes/database_prepare.php | 71 ++ .../classes/database_prepare_transaction.php | 71 ++ .../classes/database_query.php} | 70 +- .../database/classes/database_reassign_owned.php | 71 ++ .../classes/database_refresh_materialized.php | 71 ++ common/database/classes/database_reindex.php | 71 ++ .../classes/database_release_savepoint.php | 71 ++ common/database/classes/database_reset.php | 71 ++ common/database/classes/database_revoke.php | 71 ++ .../classes/database_rollback.php} | 5 +- .../classes/database_rollback_prepared.php | 71 ++ .../classes/database_rollback_to_savepoint.php | 71 ++ common/database/classes/database_savepoint.php | 71 ++ .../database/classes/database_security_label.php | 71 ++ common/database/classes/database_select.php | 71 ++ common/database/classes/database_select_into.php | 71 ++ common/database/classes/database_set.php | 71 ++ .../database/classes/database_set_constraints.php | 71 ++ common/database/classes/database_set_role.php | 71 ++ .../classes/database_set_session_authorization.php | 71 ++ .../database/classes/database_set_transaction.php | 71 ++ common/database/classes/database_show.php | 71 ++ .../classes/database_start_transaction.php | 71 ++ common/database/classes/database_string.php | 74 ++ common/database/classes/database_truncate.php | 71 ++ common/database/classes/database_unlisten.php | 71 ++ common/database/classes/database_update.php | 71 ++ common/database/classes/database_vacuum.php | 71 ++ common/database/classes/database_values.php | 71 ++ .../interfaces/database_query.php} | 4 +- common/database/traits/database_action.php | 116 ++++ common/database/traits/database_group_by.php | 67 ++ common/database/traits/database_in_schema.php | 100 +++ common/database/traits/database_name.php | 67 ++ common/database/traits/database_option.php | 62 ++ common/database/traits/database_order_by.php | 67 ++ common/database/traits/database_owner_to.php | 121 ++++ common/database/traits/database_rename_to.php | 62 ++ common/database/traits/database_reset.php | 111 +++ common/database/traits/database_set.php | 144 ++++ common/database/traits/database_set_schema.php | 64 ++ common/database/traits/database_set_tablespace.php | 62 ++ common/standard/classes/standard_database.php | 6 +- common/standard/classes/standard_index.php | 6 +- common/standard/classes/standard_menu.php | 12 +- common/standard/classes/standard_path.php | 104 +-- common/standard/classes/standard_path_user.php | 16 +- common/standard/classes/standard_paths.php | 24 +- common/standard/classes/standard_users.php | 2 +- common/standard/paths/u/user_login.php | 32 +- common/standard/paths/u/user_settings.php | 2 +- common/standard/paths/u/user_view.php | 2 +- common/theme/classes/theme_html.php | 566 ++++++++-------- common/theme/classes/theme_markup.php | 100 +-- examples/test.php | 10 +- ...tocreate_ldap_accounts_in_postgresql-client.php | 2 +- program/reservation/index.php | 2 + .../reservation/reservation_defaults_global.php | 2 +- .../source/php/sessionize_accounts-client.php | 4 +- .../source/php/sessionize_accounts-server.php | 2 +- 383 files changed, 13767 insertions(+), 13068 deletions(-) delete mode 100644 common/base/classes/base_query_alter_domain.php delete mode 100644 common/base/classes/base_query_alter_group.php delete mode 100644 common/base/classes/base_query_alter_index.php delete mode 100644 common/base/classes/base_query_alter_language.php delete mode 100644 common/base/classes/base_query_alter_large_object.php delete mode 100644 common/base/classes/base_query_alter_materialized_view.php delete mode 100644 common/base/classes/base_query_alter_operator.php delete mode 100644 common/base/classes/base_query_alter_operator_class.php delete mode 100644 common/base/classes/base_query_alter_operator_family.php delete mode 100644 common/base/classes/base_query_alter_policy.php delete mode 100644 common/base/classes/base_query_alter_publication.php delete mode 100644 common/base/classes/base_query_alter_role.php delete mode 100644 common/base/classes/base_query_alter_rule.php delete mode 100644 common/base/classes/base_query_alter_schema.php delete mode 100644 common/base/classes/base_query_alter_table.php delete mode 100644 common/base/classes/base_query_alter_tablespace.php delete mode 100644 common/base/classes/base_query_alter_text_search_configuration.php delete mode 100644 common/base/classes/base_query_alter_text_search_dictionary.php delete mode 100644 common/base/classes/base_query_alter_text_search_parser.php delete mode 100644 common/base/classes/base_query_alter_text_search_template.php delete mode 100644 common/base/classes/base_query_alter_trigger.php delete mode 100644 common/base/classes/base_query_alter_type.php delete mode 100644 common/base/classes/base_query_alter_user.php delete mode 100644 common/base/classes/base_query_alter_user_mapping.php delete mode 100644 common/base/classes/base_query_alter_view.php delete mode 100644 common/base/classes/base_query_analyze.php delete mode 100644 common/base/classes/base_query_begin.php delete mode 100644 common/base/classes/base_query_checkpoint.php delete mode 100644 common/base/classes/base_query_close.php delete mode 100644 common/base/classes/base_query_cluster.php delete mode 100644 common/base/classes/base_query_comment.php delete mode 100644 common/base/classes/base_query_commit.php delete mode 100644 common/base/classes/base_query_commit_prepared.php delete mode 100644 common/base/classes/base_query_copy.php delete mode 100644 common/base/classes/base_query_create_access_method.php delete mode 100644 common/base/classes/base_query_create_aggregate.php delete mode 100644 common/base/classes/base_query_create_cast.php delete mode 100644 common/base/classes/base_query_create_collation.php delete mode 100644 common/base/classes/base_query_create_conversion.php delete mode 100644 common/base/classes/base_query_create_database.php delete mode 100644 common/base/classes/base_query_create_domain.php delete mode 100644 common/base/classes/base_query_create_event_trigger.php delete mode 100644 common/base/classes/base_query_create_extension.php delete mode 100644 common/base/classes/base_query_create_foreign.php delete mode 100644 common/base/classes/base_query_create_foreign_data_wrapper.php delete mode 100644 common/base/classes/base_query_create_function.php delete mode 100644 common/base/classes/base_query_create_group.php delete mode 100644 common/base/classes/base_query_create_index.php delete mode 100644 common/base/classes/base_query_create_language.php delete mode 100644 common/base/classes/base_query_create_materialized_view.php delete mode 100644 common/base/classes/base_query_create_operator.php delete mode 100644 common/base/classes/base_query_create_operator_class.php delete mode 100644 common/base/classes/base_query_create_operator_family.php delete mode 100644 common/base/classes/base_query_create_policy.php delete mode 100644 common/base/classes/base_query_create_publication.php delete mode 100644 common/base/classes/base_query_create_role.php delete mode 100644 common/base/classes/base_query_create_rule.php delete mode 100644 common/base/classes/base_query_create_schema.php delete mode 100644 common/base/classes/base_query_create_sequence.php delete mode 100644 common/base/classes/base_query_create_server.php delete mode 100644 common/base/classes/base_query_create_statistics.php delete mode 100644 common/base/classes/base_query_create_subscription.php delete mode 100644 common/base/classes/base_query_create_table.php delete mode 100644 common/base/classes/base_query_create_table_as.php delete mode 100644 common/base/classes/base_query_create_tablespace.php delete mode 100644 common/base/classes/base_query_create_text_search_configuration.php delete mode 100644 common/base/classes/base_query_create_text_search_dictionary.php delete mode 100644 common/base/classes/base_query_create_text_search_parser.php delete mode 100644 common/base/classes/base_query_create_text_search_template.php delete mode 100644 common/base/classes/base_query_create_transform.php delete mode 100644 common/base/classes/base_query_create_trigger.php delete mode 100644 common/base/classes/base_query_create_type.php delete mode 100644 common/base/classes/base_query_create_user.php delete mode 100644 common/base/classes/base_query_create_user_mapping.php delete mode 100644 common/base/classes/base_query_create_view.php delete mode 100644 common/base/classes/base_query_deallocate.php delete mode 100644 common/base/classes/base_query_declare.php delete mode 100644 common/base/classes/base_query_delete.php delete mode 100644 common/base/classes/base_query_discard.php delete mode 100644 common/base/classes/base_query_do.php delete mode 100644 common/base/classes/base_query_drop_access_method.php delete mode 100644 common/base/classes/base_query_drop_aggregate.php delete mode 100644 common/base/classes/base_query_drop_cast.php delete mode 100644 common/base/classes/base_query_drop_collation.php delete mode 100644 common/base/classes/base_query_drop_conversion.php delete mode 100644 common/base/classes/base_query_drop_database.php delete mode 100644 common/base/classes/base_query_drop_domain.php delete mode 100644 common/base/classes/base_query_drop_event_trigger.php delete mode 100644 common/base/classes/base_query_drop_extension.php delete mode 100644 common/base/classes/base_query_drop_foreign_data_wrapper.php delete mode 100644 common/base/classes/base_query_drop_foreign_table.php delete mode 100644 common/base/classes/base_query_drop_function.php delete mode 100644 common/base/classes/base_query_drop_group.php delete mode 100644 common/base/classes/base_query_drop_index.php delete mode 100644 common/base/classes/base_query_drop_language.php delete mode 100644 common/base/classes/base_query_drop_materialized_view.php delete mode 100644 common/base/classes/base_query_drop_operator.php delete mode 100644 common/base/classes/base_query_drop_operator_class.php delete mode 100644 common/base/classes/base_query_drop_operator_family.php delete mode 100644 common/base/classes/base_query_drop_owned.php delete mode 100644 common/base/classes/base_query_drop_policy.php delete mode 100644 common/base/classes/base_query_drop_publication.php delete mode 100644 common/base/classes/base_query_drop_role.php delete mode 100644 common/base/classes/base_query_drop_rule.php delete mode 100644 common/base/classes/base_query_drop_schema.php delete mode 100644 common/base/classes/base_query_drop_sequence.php delete mode 100644 common/base/classes/base_query_drop_server.php delete mode 100644 common/base/classes/base_query_drop_statistics.php delete mode 100644 common/base/classes/base_query_drop_subscription.php delete mode 100644 common/base/classes/base_query_drop_table.php delete mode 100644 common/base/classes/base_query_drop_tablespace.php delete mode 100644 common/base/classes/base_query_drop_text_search_configuration.php delete mode 100644 common/base/classes/base_query_drop_text_search_dictionary.php delete mode 100644 common/base/classes/base_query_drop_text_search_parser.php delete mode 100644 common/base/classes/base_query_drop_text_search_template.php delete mode 100644 common/base/classes/base_query_drop_transform.php delete mode 100644 common/base/classes/base_query_drop_trigger.php delete mode 100644 common/base/classes/base_query_drop_type.php delete mode 100644 common/base/classes/base_query_drop_user.php delete mode 100644 common/base/classes/base_query_drop_user_mapping.php delete mode 100644 common/base/classes/base_query_drop_view.php delete mode 100644 common/base/classes/base_query_end.php delete mode 100644 common/base/classes/base_query_execute.php delete mode 100644 common/base/classes/base_query_explain.php delete mode 100644 common/base/classes/base_query_fetch.php delete mode 100644 common/base/classes/base_query_grant.php delete mode 100644 common/base/classes/base_query_import_foreign_schema.php delete mode 100644 common/base/classes/base_query_insert.php delete mode 100644 common/base/classes/base_query_listen.php delete mode 100644 common/base/classes/base_query_load.php delete mode 100644 common/base/classes/base_query_lock.php delete mode 100644 common/base/classes/base_query_move.php delete mode 100644 common/base/classes/base_query_notify.php delete mode 100644 common/base/classes/base_query_prepare.php delete mode 100644 common/base/classes/base_query_prepare_transaction.php delete mode 100644 common/base/classes/base_query_reassign_owned.php delete mode 100644 common/base/classes/base_query_refresh_materialized.php delete mode 100644 common/base/classes/base_query_reindex.php delete mode 100644 common/base/classes/base_query_release_savepoint.php delete mode 100644 common/base/classes/base_query_reset.php delete mode 100644 common/base/classes/base_query_revoke.php delete mode 100644 common/base/classes/base_query_rollback_prepared.php delete mode 100644 common/base/classes/base_query_rollback_to_savepoint.php delete mode 100644 common/base/classes/base_query_savepoint.php delete mode 100644 common/base/classes/base_query_security_label.php delete mode 100644 common/base/classes/base_query_select.php delete mode 100644 common/base/classes/base_query_select_into.php delete mode 100644 common/base/classes/base_query_set.php delete mode 100644 common/base/classes/base_query_set_constraints.php delete mode 100644 common/base/classes/base_query_set_role.php delete mode 100644 common/base/classes/base_query_set_session_authorization.php delete mode 100644 common/base/classes/base_query_set_transaction.php delete mode 100644 common/base/classes/base_query_show.php delete mode 100644 common/base/classes/base_query_start_transaction.php delete mode 100644 common/base/classes/base_query_string.php delete mode 100644 common/base/classes/base_query_truncate.php delete mode 100644 common/base/classes/base_query_unlisten.php delete mode 100644 common/base/classes/base_query_update.php delete mode 100644 common/base/classes/base_query_vacuum.php delete mode 100644 common/base/classes/base_query_values.php delete mode 100644 common/base/traits/base_query.php rename common/{base/classes/base_query_alter_aggregate.php => database/classes/database_alter_aggregate.php} (84%) rename common/{base/classes/base_query_alter_coalation.php => database/classes/database_alter_coalation.php} (83%) rename common/{base/classes/base_query_alter_conversion.php => database/classes/database_alter_conversion.php} (78%) rename common/{base/classes/base_query_alter_database.php => database/classes/database_alter_database.php} (56%) rename common/{base/classes/base_query_alter_default_privileges.php => database/classes/database_alter_default_privileges.php} (75%) create mode 100644 common/database/classes/database_alter_domain.php rename common/{base/classes/base_query_alter_event_trigger.php => database/classes/database_alter_event_trigger.php} (92%) rename common/{base/classes/base_query_alter_function.php => database/classes/database_alter_extension.php} (92%) rename common/{base/classes/base_query_alter_foreign_table.php => database/classes/database_alter_foreign_data_wrapper.php} (92%) rename common/{base/classes/base_query_alter_extension.php => database/classes/database_alter_foreign_table.php} (92%) rename common/{base/classes/base_query_alter_foreign_data_wrapper.php => database/classes/database_alter_function.php} (92%) create mode 100644 common/database/classes/database_alter_group.php create mode 100644 common/database/classes/database_alter_index.php create mode 100644 common/database/classes/database_alter_language.php create mode 100644 common/database/classes/database_alter_large_object.php create mode 100644 common/database/classes/database_alter_materialized_view.php create mode 100644 common/database/classes/database_alter_operator.php create mode 100644 common/database/classes/database_alter_operator_class.php create mode 100644 common/database/classes/database_alter_operator_family.php create mode 100644 common/database/classes/database_alter_policy.php create mode 100644 common/database/classes/database_alter_publication.php create mode 100644 common/database/classes/database_alter_role.php create mode 100644 common/database/classes/database_alter_rule.php create mode 100644 common/database/classes/database_alter_schema.php create mode 100644 common/database/classes/database_alter_table.php create mode 100644 common/database/classes/database_alter_tablespace.php create mode 100644 common/database/classes/database_alter_text_search_configuration.php create mode 100644 common/database/classes/database_alter_text_search_dictionary.php create mode 100644 common/database/classes/database_alter_text_search_parser.php create mode 100644 common/database/classes/database_alter_text_search_template.php create mode 100644 common/database/classes/database_alter_trigger.php create mode 100644 common/database/classes/database_alter_type.php create mode 100644 common/database/classes/database_alter_user.php create mode 100644 common/database/classes/database_alter_user_mapping.php create mode 100644 common/database/classes/database_alter_view.php create mode 100644 common/database/classes/database_analyze.php create mode 100644 common/database/classes/database_begin.php create mode 100644 common/database/classes/database_checkpoint.php create mode 100644 common/database/classes/database_close.php create mode 100644 common/database/classes/database_cluster.php rename common/{base/classes/base_query_code.php => database/classes/database_code.php} (87%) create mode 100644 common/database/classes/database_comment.php create mode 100644 common/database/classes/database_commit.php create mode 100644 common/database/classes/database_commit_prepared.php create mode 100644 common/database/classes/database_copy.php create mode 100644 common/database/classes/database_create_access_method.php create mode 100644 common/database/classes/database_create_aggregate.php create mode 100644 common/database/classes/database_create_cast.php create mode 100644 common/database/classes/database_create_collation.php create mode 100644 common/database/classes/database_create_conversion.php create mode 100644 common/database/classes/database_create_database.php create mode 100644 common/database/classes/database_create_domain.php create mode 100644 common/database/classes/database_create_event_trigger.php create mode 100644 common/database/classes/database_create_extension.php create mode 100644 common/database/classes/database_create_foreign.php create mode 100644 common/database/classes/database_create_foreign_data_wrapper.php create mode 100644 common/database/classes/database_create_function.php create mode 100644 common/database/classes/database_create_group.php create mode 100644 common/database/classes/database_create_index.php create mode 100644 common/database/classes/database_create_language.php create mode 100644 common/database/classes/database_create_materialized_view.php create mode 100644 common/database/classes/database_create_operator.php create mode 100644 common/database/classes/database_create_operator_class.php create mode 100644 common/database/classes/database_create_operator_family.php create mode 100644 common/database/classes/database_create_policy.php create mode 100644 common/database/classes/database_create_publication.php create mode 100644 common/database/classes/database_create_role.php create mode 100644 common/database/classes/database_create_rule.php create mode 100644 common/database/classes/database_create_schema.php create mode 100644 common/database/classes/database_create_sequence.php create mode 100644 common/database/classes/database_create_server.php create mode 100644 common/database/classes/database_create_statistics.php create mode 100644 common/database/classes/database_create_subscription.php create mode 100644 common/database/classes/database_create_table.php create mode 100644 common/database/classes/database_create_table_as.php create mode 100644 common/database/classes/database_create_tablespace.php create mode 100644 common/database/classes/database_create_text_search_configuration.php create mode 100644 common/database/classes/database_create_text_search_dictionary.php create mode 100644 common/database/classes/database_create_text_search_parser.php create mode 100644 common/database/classes/database_create_text_search_template.php create mode 100644 common/database/classes/database_create_transform.php create mode 100644 common/database/classes/database_create_trigger.php create mode 100644 common/database/classes/database_create_type.php create mode 100644 common/database/classes/database_create_user.php create mode 100644 common/database/classes/database_create_user_mapping.php create mode 100644 common/database/classes/database_create_view.php create mode 100644 common/database/classes/database_deallocate.php create mode 100644 common/database/classes/database_declare.php create mode 100644 common/database/classes/database_delete.php create mode 100644 common/database/classes/database_discard.php create mode 100644 common/database/classes/database_do.php create mode 100644 common/database/classes/database_drop_access_method.php create mode 100644 common/database/classes/database_drop_aggregate.php create mode 100644 common/database/classes/database_drop_cast.php create mode 100644 common/database/classes/database_drop_collation.php create mode 100644 common/database/classes/database_drop_conversion.php create mode 100644 common/database/classes/database_drop_database.php create mode 100644 common/database/classes/database_drop_domain.php create mode 100644 common/database/classes/database_drop_event_trigger.php create mode 100644 common/database/classes/database_drop_extension.php create mode 100644 common/database/classes/database_drop_foreign_data_wrapper.php create mode 100644 common/database/classes/database_drop_foreign_table.php create mode 100644 common/database/classes/database_drop_function.php create mode 100644 common/database/classes/database_drop_group.php create mode 100644 common/database/classes/database_drop_index.php create mode 100644 common/database/classes/database_drop_language.php create mode 100644 common/database/classes/database_drop_materialized_view.php create mode 100644 common/database/classes/database_drop_operator.php create mode 100644 common/database/classes/database_drop_operator_class.php create mode 100644 common/database/classes/database_drop_operator_family.php create mode 100644 common/database/classes/database_drop_owned.php create mode 100644 common/database/classes/database_drop_policy.php create mode 100644 common/database/classes/database_drop_publication.php create mode 100644 common/database/classes/database_drop_role.php create mode 100644 common/database/classes/database_drop_rule.php create mode 100644 common/database/classes/database_drop_schema.php create mode 100644 common/database/classes/database_drop_sequence.php create mode 100644 common/database/classes/database_drop_server.php create mode 100644 common/database/classes/database_drop_statistics.php create mode 100644 common/database/classes/database_drop_subscription.php create mode 100644 common/database/classes/database_drop_table.php create mode 100644 common/database/classes/database_drop_tablespace.php create mode 100644 common/database/classes/database_drop_text_search_configuration.php create mode 100644 common/database/classes/database_drop_text_search_dictionary.php create mode 100644 common/database/classes/database_drop_text_search_parser.php create mode 100644 common/database/classes/database_drop_text_search_template.php create mode 100644 common/database/classes/database_drop_transform.php create mode 100644 common/database/classes/database_drop_trigger.php create mode 100644 common/database/classes/database_drop_type.php create mode 100644 common/database/classes/database_drop_user.php create mode 100644 common/database/classes/database_drop_user_mapping.php create mode 100644 common/database/classes/database_drop_view.php create mode 100644 common/database/classes/database_end.php create mode 100644 common/database/classes/database_execute.php create mode 100644 common/database/classes/database_explain.php create mode 100644 common/database/classes/database_fetch.php create mode 100644 common/database/classes/database_grant.php create mode 100644 common/database/classes/database_import_foreign_schema.php create mode 100644 common/database/classes/database_insert.php create mode 100644 common/database/classes/database_listen.php create mode 100644 common/database/classes/database_load.php create mode 100644 common/database/classes/database_lock.php create mode 100644 common/database/classes/database_move.php create mode 100644 common/database/classes/database_notify.php create mode 100644 common/database/classes/database_prepare.php create mode 100644 common/database/classes/database_prepare_transaction.php rename common/{base/classes/base_query.php => database/classes/database_query.php} (94%) create mode 100644 common/database/classes/database_reassign_owned.php create mode 100644 common/database/classes/database_refresh_materialized.php create mode 100644 common/database/classes/database_reindex.php create mode 100644 common/database/classes/database_release_savepoint.php create mode 100644 common/database/classes/database_reset.php create mode 100644 common/database/classes/database_revoke.php rename common/{base/classes/base_query_rollback.php => database/classes/database_rollback.php} (90%) create mode 100644 common/database/classes/database_rollback_prepared.php create mode 100644 common/database/classes/database_rollback_to_savepoint.php create mode 100644 common/database/classes/database_savepoint.php create mode 100644 common/database/classes/database_security_label.php create mode 100644 common/database/classes/database_select.php create mode 100644 common/database/classes/database_select_into.php create mode 100644 common/database/classes/database_set.php create mode 100644 common/database/classes/database_set_constraints.php create mode 100644 common/database/classes/database_set_role.php create mode 100644 common/database/classes/database_set_session_authorization.php create mode 100644 common/database/classes/database_set_transaction.php create mode 100644 common/database/classes/database_show.php create mode 100644 common/database/classes/database_start_transaction.php create mode 100644 common/database/classes/database_string.php create mode 100644 common/database/classes/database_truncate.php create mode 100644 common/database/classes/database_unlisten.php create mode 100644 common/database/classes/database_update.php create mode 100644 common/database/classes/database_vacuum.php create mode 100644 common/database/classes/database_values.php rename common/{base/interfaces/base_query.php => database/interfaces/database_query.php} (95%) create mode 100644 common/database/traits/database_action.php create mode 100644 common/database/traits/database_group_by.php create mode 100644 common/database/traits/database_in_schema.php create mode 100644 common/database/traits/database_name.php create mode 100644 common/database/traits/database_option.php create mode 100644 common/database/traits/database_order_by.php create mode 100644 common/database/traits/database_owner_to.php create mode 100644 common/database/traits/database_rename_to.php create mode 100644 common/database/traits/database_reset.php create mode 100644 common/database/traits/database_set.php create mode 100644 common/database/traits/database_set_schema.php create mode 100644 common/database/traits/database_set_tablespace.php diff --git a/common/base/classes/base_database.php b/common/base/classes/base_database.php index 9ad24d6..4b5ba9e 100644 --- a/common/base/classes/base_database.php +++ b/common/base/classes/base_database.php @@ -1830,7 +1830,7 @@ class c_base_database extends c_base_return { return c_base_return_string::s_new($result); } } - elseif ($result === TRUE) { + else if ($result === TRUE) { unset($result); return new c_base_return_true(); } @@ -1919,7 +1919,7 @@ class c_base_database extends c_base_return { return c_base_return_string::s_new($result); } } - elseif ($result === TRUE) { + else if ($result === TRUE) { unset($result); return new c_base_return_true(); } @@ -2004,10 +2004,10 @@ class c_base_database extends c_base_return { return c_base_return_string::s_new($result); } } - elseif (is_array($result)) { + else if (is_array($result)) { return c_base_return_array::s_new($result); } - elseif ($result === TRUE) { + else if ($result === TRUE) { unset($result); return new c_base_return_true(); } @@ -2088,7 +2088,7 @@ class c_base_database extends c_base_return { return c_base_return_string::s_new($result); } } - elseif ($result === TRUE) { + else if ($result === TRUE) { unset($result); return new c_base_return_true(); } diff --git a/common/base/classes/base_debug.php b/common/base/classes/base_debug.php index 5a30b60..777efce 100644 --- a/common/base/classes/base_debug.php +++ b/common/base/classes/base_debug.php @@ -249,7 +249,7 @@ class c_base_debug extends c_base_return { return c_base_return_int::s_new($this->memory_usage_peak); } - elseif ($option == 2) { + else if ($option == 2) { if (is_null($this->time_stop)) { $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'this->time_stop', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); return c_base_return_error::s_false($error); diff --git a/common/base/classes/base_defaults_global.php b/common/base/classes/base_defaults_global.php index 2c23be7..5885a58 100644 --- a/common/base/classes/base_defaults_global.php +++ b/common/base/classes/base_defaults_global.php @@ -329,7 +329,7 @@ class c_base_defaults_global { if (array_key_exists('REQUEST_TIME_FLOAT', $_SERVER)) { self::$s_timestamp_session = $_SERVER['REQUEST_TIME_FLOAT']; } - elseif (array_key_exists('REQUEST_TIME', $_SERVER)) { + else if (array_key_exists('REQUEST_TIME', $_SERVER)) { self::$s_timestamp_session = $_SERVER['REQUEST_TIME']; } } diff --git a/common/base/classes/base_email.php b/common/base/classes/base_email.php index bcd32b5..ab36726 100644 --- a/common/base/classes/base_email.php +++ b/common/base/classes/base_email.php @@ -150,7 +150,7 @@ class c_base_email extends c_base_return_string { unset($parsed); break; } - elseif ($email_text['codepoints'][$current] == c_base_ascii::QUOTE_DOUBLE) { + else if ($email_text['codepoints'][$current] == c_base_ascii::QUOTE_DOUBLE) { if ($is_quoted || $is_named_human || $is_named_machine) { // cannot have more than one quoted or unquoted string and human names cannot follow machine names. $result['invalid'] = TRUE; @@ -179,11 +179,11 @@ class c_base_email extends c_base_return_string { break; } } - elseif ($email_text['codepoints'][$current] == c_base_ascii::QUOTE_DOUBLE) { + else if ($email_text['codepoints'][$current] == c_base_ascii::QUOTE_DOUBLE) { $closing_quote = TRUE; break; } - elseif ($this->pr_rfc_char_is_crlf($email_text['codepoints'][$current])) { + else if ($this->pr_rfc_char_is_crlf($email_text['codepoints'][$current])) { // not allowed inside a quoted string. $result['invalid'] = TRUE; break; @@ -204,13 +204,13 @@ class c_base_email extends c_base_return_string { continue; } - elseif ($this->pr_rfc_char_is_fws($email_text['codepoints'][$current])) { + else if ($this->pr_rfc_char_is_fws($email_text['codepoints'][$current])) { // though unusual, starting with whitespace appears to be technically allowed unless I am misunderstanding or overlooking something. if (!$is_named_human && !$is_named_machine && is_null($current_string)) { continue; } } - elseif ($email_text['codepoints'][$current] == c_base_ascii::PARENTHESIS_OPEN) { + else if ($email_text['codepoints'][$current] == c_base_ascii::PARENTHESIS_OPEN) { if ($has_found_comment) { // there may be only one comment between non-comments. $result['invalid'] = TRUE; @@ -236,7 +236,7 @@ class c_base_email extends c_base_return_string { unset($parsed); continue; } - elseif ($email_text['codepoints'][$current] == c_base_ascii::COLON) { + else if ($email_text['codepoints'][$current] == c_base_ascii::COLON) { if ($is_named_human || $is_named_machine) { // A colon may not be specified following human or machine names. $result['invalid'] = TRUE; @@ -253,7 +253,7 @@ class c_base_email extends c_base_return_string { // do not nullify $current_string because it is needed to define/provide the name of the group. // @todo: if the colon is supplied, but double quotes were used, then does this mean it is a double quoted group name? (in which case the test against $is_named_human is invalid.) } - elseif ($email_text['codepoints'][$current] == c_base_ascii::AT) { + else if ($email_text['codepoints'][$current] == c_base_ascii::AT) { if ($is_named_human || $is_named_machine) { // when a human name is supplied, then the e-mail address must be inside of '<' and '>'. // multiple machine names may not be specified. @@ -395,7 +395,7 @@ class c_base_email extends c_base_return_string { // there may be multiple comments, so do not break at this point. } - elseif (!$this->pr_rfc_char_is_fws($code)) { + else if (!$this->pr_rfc_char_is_fws($code)) { // the first non-comment, non-fws char should be the start of the [name_machine]. break; } @@ -445,7 +445,7 @@ class c_base_email extends c_base_return_string { continue; } - elseif ($this->pr_rfc_char_is_fws($code)) { + else if ($this->pr_rfc_char_is_fws($code)) { if (!$started || $stopped) { // ignore leading/trailing whitespace. continue; @@ -456,7 +456,7 @@ class c_base_email extends c_base_return_string { $stopped = TRUE; $comments = FALSE; } - elseif ($code != c_base_ascii::PERIOD && !$this->pr_rfc_char_is_atext($code)) { + else if ($code != c_base_ascii::PERIOD && !$this->pr_rfc_char_is_atext($code)) { if ($code != c_base_ascii::AT) { $result['invalid'] = TRUE; break; @@ -465,12 +465,12 @@ class c_base_email extends c_base_return_string { $result['current']++; break; } - elseif ($stopped) { + else if ($stopped) { // comments or whitespace may not appear between text. $result['invalid'] = TRUE; break; } - elseif (!$started) { + else if (!$started) { $comments = FALSE; $started = TRUE; } @@ -514,7 +514,7 @@ class c_base_email extends c_base_return_string { // there may be multiple comments, so do not break at this point. } - elseif (!$this->pr_rfc_char_is_fws($code)) { + else if (!$this->pr_rfc_char_is_fws($code)) { // the first non-comment, non-fws char should be the start of the [ip_address]. break; } @@ -609,7 +609,7 @@ class c_base_email extends c_base_return_string { // there may be multiple comments, so do not break at this point. } - elseif (!$this->pr_rfc_char_is_fws($code)) { + else if (!$this->pr_rfc_char_is_fws($code)) { // the first non-comment, non-fws char should be the start of the [ip_address]. break; } diff --git a/common/base/classes/base_error.php b/common/base/classes/base_error.php index c3c7247..72db8ce 100644 --- a/common/base/classes/base_error.php +++ b/common/base/classes/base_error.php @@ -136,28 +136,28 @@ class c_base_error { if (is_string($message)) { $entry->set_message($message); } - elseif (is_null($message)) { + else if (is_null($message)) { $entry->set_message(''); } if (is_array($details)) { $entry->set_details($details); } - elseif (is_null($details)) { + else if (is_null($details)) { $entry->set_details([]); } if (is_int($code)) { $entry->set_code($code); } - elseif (is_null($code)) { + else if (is_null($code)) { $entry->set_code(0); } if (is_int($severity) && $severity >= static::SEVERITY_EMERGENCY && $severity < static::SEVERITY_UNKNOWN) { $entry->set_severity($severity); } - elseif (is_null($severity)) { + else if (is_null($severity)) { $entry->set_severity(static::SEVERITY_ERROR); } @@ -269,10 +269,10 @@ class c_base_error { if (is_null($count)) { $this->p_backtrace(1); } - elseif (is_int($count)) { + else if (is_int($count)) { $this->p_backtrace($count + 1); } - elseif ($count === FALSE) { + else if ($count === FALSE) { $this->backtrace = []; } else { diff --git a/common/base/classes/base_error_messages_english.php b/common/base/classes/base_error_messages_english.php index f43e5c5..563e3fa 100644 --- a/common/base/classes/base_error_messages_english.php +++ b/common/base/classes/base_error_messages_english.php @@ -154,7 +154,7 @@ final class c_base_error_messages_english implements i_base_error_messages { return c_base_return_string::s_new('An invalid argument has been specified' . $function_name_string . $error_message_string . '.'); } } - elseif ($code === static::INVALID_FORMAT) { + else if ($code === static::INVALID_FORMAT) { if ($arguments === TRUE) { return c_base_return_string::s_new('The argument, :{format_name}, has an invalid format' . $function_name_string . $error_message_string . '.:{expected_format}'); } @@ -162,7 +162,7 @@ final class c_base_error_messages_english implements i_base_error_messages { return c_base_return_string::s_new('An invalid format has been specified' . $function_name_string . $error_message_string . '.'); } } - elseif ($code === static::INVALID_SESSION) { + else if ($code === static::INVALID_SESSION) { if ($arguments === TRUE) { return c_base_return_string::s_new('The requested session is invalid' . $function_name_string . $error_message_string . '.'); } @@ -170,7 +170,7 @@ final class c_base_error_messages_english implements i_base_error_messages { return c_base_return_string::s_new('The requested session is invalid' . $function_name_string . $error_message_string . '.'); } } - elseif ($code === static::INVALID_VARIABLE) { + else if ($code === static::INVALID_VARIABLE) { if ($arguments === TRUE) { return c_base_return_string::s_new('The variable, :{variable_name}, is invalid' . $function_name_string . $error_message_string . '.'); } @@ -178,7 +178,7 @@ final class c_base_error_messages_english implements i_base_error_messages { return c_base_return_string::s_new('An invalid variable has been specified' . $function_name_string . $error_message_string . '.'); } } - elseif ($code === static::OPERATION_FAILURE) { + else if ($code === static::OPERATION_FAILURE) { if ($arguments === TRUE) { return c_base_return_string::s_new('Failed to perform operation, :{operation_name}' . $function_name_prepend . $function_name_string . $error_message_string . '.'); } @@ -186,7 +186,7 @@ final class c_base_error_messages_english implements i_base_error_messages { return c_base_return_string::s_new('Failed to perform operation' . $function_name_string . $error_message_string . '.'); } } - elseif ($code === static::OPERATION_UNECESSARY) { + else if ($code === static::OPERATION_UNECESSARY) { if ($arguments === TRUE) { return c_base_return_string::s_new('Did not perform unnecessary operation, :{operation_name}' . $function_name_prepend . $function_name_string . $error_message_string . '.'); } @@ -194,7 +194,7 @@ final class c_base_error_messages_english implements i_base_error_messages { return c_base_return_string::s_new('Did not perform unnecessary operation' . $function_name_string . $error_message_string . '.'); } } - elseif ($code === static::FUNCTION_FAILURE) { + else if ($code === static::FUNCTION_FAILURE) { if ($arguments === TRUE) { return c_base_return_string::s_new('The function, :{function_name}, has failed execution' . $error_message_string . '.'); } @@ -202,7 +202,7 @@ final class c_base_error_messages_english implements i_base_error_messages { return c_base_return_string::s_new('A function has failed execution' . $error_message_string . '.'); } } - elseif ($code === static::NOT_FOUND) { + else if ($code === static::NOT_FOUND) { if ($arguments === TRUE) { return c_base_return_string::s_new('Not found' . $function_name_string . $error_message_string . '.'); } @@ -210,7 +210,7 @@ final class c_base_error_messages_english implements i_base_error_messages { return c_base_return_string::s_new('Not found' . $function_name_string . $error_message_string . '.'); } } - elseif ($code === static::NOT_FOUND_ARRAY_INDEX) { + else if ($code === static::NOT_FOUND_ARRAY_INDEX) { if ($arguments === TRUE) { return c_base_return_string::s_new('The index, :{index_name}, was not found in the array, :{array_name}' . $function_name_string . $error_message_string . '.'); } @@ -218,7 +218,7 @@ final class c_base_error_messages_english implements i_base_error_messages { return c_base_return_string::s_new('Failed to find index within specified array' . $function_name_string . $error_message_string . '.'); } } - elseif ($code === static::NOT_FOUND_FILE) { + else if ($code === static::NOT_FOUND_FILE) { if ($arguments === TRUE) { return c_base_return_string::s_new('The file, :{file_name}, was not found or cannot be accessed' . $function_name_string . $error_message_string . '.'); } @@ -226,7 +226,7 @@ final class c_base_error_messages_english implements i_base_error_messages { return c_base_return_string::s_new('File not found or cannot be accessed' . $function_name_string . $error_message_string . '.'); } } - elseif ($code === static::NOT_FOUND_DIRECTORY) { + else if ($code === static::NOT_FOUND_DIRECTORY) { if ($arguments === TRUE) { return c_base_return_string::s_new('The directory, :{directory_name}, was not found or cannot be accessed' . $function_name_string . $error_message_string . '.'); } @@ -234,7 +234,7 @@ final class c_base_error_messages_english implements i_base_error_messages { return c_base_return_string::s_new('File not found or cannot be accessed' . $function_name_string . $error_message_string . '.'); } } - elseif ($code === static::NOT_FOUND_PATH) { + else if ($code === static::NOT_FOUND_PATH) { if ($arguments === TRUE) { return c_base_return_string::s_new('The path, :{path_name}, was not found or cannot be accessed' . $function_name_string . $error_message_string . '.'); } @@ -242,7 +242,7 @@ final class c_base_error_messages_english implements i_base_error_messages { return c_base_return_string::s_new('Path not found or cannot be accessed' . $function_name_string . $error_message_string . '.'); } } - elseif ($code === static::NOT_DEFINED) { + else if ($code === static::NOT_DEFINED) { if ($arguments === TRUE) { return c_base_return_string::s_new('The requested data, :{data_name}, is not defined' . $function_name_string . $error_message_string . '.'); } @@ -250,7 +250,7 @@ final class c_base_error_messages_english implements i_base_error_messages { return c_base_return_string::s_new('The requested data is not defined' . $function_name_string . $error_message_string . '.'); } } - elseif ($code === static::NO_CONNECTION) { + else if ($code === static::NO_CONNECTION) { if ($arguments === TRUE) { return c_base_return_string::s_new('The resource, :{resource_name}, is not connected' . $function_name_string . $error_message_string . '.'); } @@ -258,7 +258,7 @@ final class c_base_error_messages_english implements i_base_error_messages { return c_base_return_string::s_new('The resource is not connected' . $function_name_string . $error_message_string . '.'); } } - elseif ($code === static::NO_SUPPORT) { + else if ($code === static::NO_SUPPORT) { if ($arguments === TRUE) { return c_base_return_string::s_new('The functionality, :{functionality_name}, is currently not supported.' . $function_name_string . $error_message_string . '.'); } @@ -266,7 +266,7 @@ final class c_base_error_messages_english implements i_base_error_messages { return c_base_return_string::s_new('The requested functionality is not supported' . $function_name_string . $error_message_string . '.'); } } - elseif ($code === static::POSTGRESQL_CONNECTION_FAILURE) { + else if ($code === static::POSTGRESQL_CONNECTION_FAILURE) { if ($arguments === TRUE) { return c_base_return_string::s_new('Failed to connect to the database, :{database_name}' . $function_name_prepend . $function_name_string . $error_message_string . '.'); } @@ -274,7 +274,7 @@ final class c_base_error_messages_english implements i_base_error_messages { return c_base_return_string::s_new('Failed to connect to the database' . $function_name_string . $error_message_string . '.'); } } - elseif ($code === static::POSTGRESQL_NO_ACCOUNT) { + else if ($code === static::POSTGRESQL_NO_ACCOUNT) { if ($arguments === TRUE) { return c_base_return_string::s_new('Database access denied: the account :{database_account} does not exist or does not have the required access' . $function_name_string . $error_message_string . '.'); } @@ -282,7 +282,7 @@ final class c_base_error_messages_english implements i_base_error_messages { return c_base_return_string::s_new('Database access denied: the account does not exist or does not have the required access' . $function_name_string . $error_message_string . '.'); } } - elseif ($code === static::POSTGRESQL_NO_CONNECTION) { + else if ($code === static::POSTGRESQL_NO_CONNECTION) { if ($arguments === TRUE) { return c_base_return_string::s_new('The database, :{database_name}, is not connected' . $function_name_string . $error_message_string . '.'); } @@ -290,7 +290,7 @@ final class c_base_error_messages_english implements i_base_error_messages { return c_base_return_string::s_new('The database is not connected' . $function_name_string . $error_message_string . '.'); } } - elseif ($code === static::POSTGRESQL_NO_RESOURCE) { + else if ($code === static::POSTGRESQL_NO_RESOURCE) { if ($arguments === TRUE) { return c_base_return_string::s_new('No database resource is available' . $function_name_string . $error_message_string . '.'); } @@ -298,7 +298,7 @@ final class c_base_error_messages_english implements i_base_error_messages { return c_base_return_string::s_new('No database resource is available' . $function_name_string . $error_message_string . '.'); } } - elseif ($code === static::POSTGRESQL_ERROR) { + else if ($code === static::POSTGRESQL_ERROR) { if ($arguments === TRUE) { return c_base_return_string::s_new('Database query error: :{database_error_message}' . $function_name_string . $error_message_string . '.'); } @@ -306,7 +306,7 @@ final class c_base_error_messages_english implements i_base_error_messages { return c_base_return_string::s_new('Failed to perform database query' . $function_name_string . $error_message_string . '.'); } } - elseif ($code === static::SOCKET_FAILURE) { + else if ($code === static::SOCKET_FAILURE) { if ($arguments === TRUE) { return c_base_return_string::s_new('Failed to perform socket operation, :{operation_name}, socket error (:{socket_error}) \':{socket_error_message}\'' . $function_name_prepend . $function_name_string . $error_message_string . '.'); } @@ -314,7 +314,7 @@ final class c_base_error_messages_english implements i_base_error_messages { return c_base_return_string::s_new('Failed to perform socket operation' . $function_name_string . $error_message_string . '.'); } } - elseif ($code === static::ACCESS_DENIED) { + else if ($code === static::ACCESS_DENIED) { if ($arguments === TRUE) { return c_base_return_string::s_new('Access is denied, :{operation_name}' . $function_name_prepend . $function_name_string . $error_message_string . '.'); } @@ -322,7 +322,7 @@ final class c_base_error_messages_english implements i_base_error_messages { return c_base_return_string::s_new('Access is denied' . $function_name_string . $error_message_string . '.'); } } - elseif ($code === static::ACCESS_DENIED_UNAVAILABLE) { + else if ($code === static::ACCESS_DENIED_UNAVAILABLE) { if ($arguments === TRUE) { return c_base_return_string::s_new('Access is denied due to unavailability, :{operation_name} ' . $function_name_prepend . $function_name_string . $error_message_string . '.'); } @@ -330,7 +330,7 @@ final class c_base_error_messages_english implements i_base_error_messages { return c_base_return_string::s_new('Access is denied due to unavailability' . $function_name_string . $error_message_string . '.'); } } - elseif ($code === static::ACCESS_DENIED_USER) { + else if ($code === static::ACCESS_DENIED_USER) { if ($arguments === TRUE) { return c_base_return_string::s_new('Access is denied for user :name_machine_user (:{id_user}), :{operation_name} ' . $function_name_prepend . $function_name_string . $error_message_string . '.'); } @@ -338,7 +338,7 @@ final class c_base_error_messages_english implements i_base_error_messages { return c_base_return_string::s_new('Access is denied for user' . $function_name_string . $error_message_string . '.'); } } - elseif ($code === static::ACCESS_DENIED_ADMINISTRATION) { + else if ($code === static::ACCESS_DENIED_ADMINISTRATION) { if ($arguments === TRUE) { return c_base_return_string::s_new('Access is denied for administrative reasons, :{operation_name} ' . $function_name_prepend . $function_name_string . $error_message_string . '.'); } @@ -346,7 +346,7 @@ final class c_base_error_messages_english implements i_base_error_messages { return c_base_return_string::s_new('Access is denied for administrative reasons' . $function_name_string . $error_message_string . '.'); } } - elseif ($code === static::SERVER_ERROR) { + else if ($code === static::SERVER_ERROR) { if ($arguments === TRUE) { return c_base_return_string::s_new('A server error has occurred, :{operation_name} ' . $function_name_prepend . $function_name_string . $error_message_string . '.'); } diff --git a/common/base/classes/base_error_messages_japanese.php b/common/base/classes/base_error_messages_japanese.php index 01c1cfd..206e56e 100644 --- a/common/base/classes/base_error_messages_japanese.php +++ b/common/base/classes/base_error_messages_japanese.php @@ -158,7 +158,7 @@ final class c_base_error_messages_japanese implements i_base_error_messages { return c_base_return_string::s_new('無効な引数が指定されています' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } } - elseif ($code === static::INVALID_FORMAT) { + else if ($code === static::INVALID_FORMAT) { if ($arguments === TRUE) { return c_base_return_string::s_new('引数 :{format_name} の形式が無効です' . $function_name_prepend . $function_name_string . $error_message_string . '。:{expected_format}'); } @@ -166,7 +166,7 @@ final class c_base_error_messages_japanese implements i_base_error_messages { return c_base_return_string::s_new('無効な形式が指定されています' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } } - elseif ($code === static::INVALID_SESSION) { + else if ($code === static::INVALID_SESSION) { if ($arguments === TRUE) { return c_base_return_string::s_new('要求されたセッションは無効です' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } @@ -174,7 +174,7 @@ final class c_base_error_messages_japanese implements i_base_error_messages { return c_base_return_string::s_new('要求されたセッションは無効です' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } } - elseif ($code === static::INVALID_VARIABLE) { + else if ($code === static::INVALID_VARIABLE) { if ($arguments === TRUE) { return c_base_return_string::s_new('変数 :{variable_name} は無効です' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } @@ -182,7 +182,7 @@ final class c_base_error_messages_japanese implements i_base_error_messages { return c_base_return_string::s_new('無効な変数が指定されています' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } } - elseif ($code === static::OPERATION_FAILURE) { + else if ($code === static::OPERATION_FAILURE) { if ($arguments === TRUE) { return c_base_return_string::s_new('操作の実行に失敗しました :{operation_name}' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } @@ -190,7 +190,7 @@ final class c_base_error_messages_japanese implements i_base_error_messages { return c_base_return_string::s_new('操作を実行できませんでした' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } } - elseif ($code === static::OPERATION_UNECESSARY) { + else if ($code === static::OPERATION_UNECESSARY) { if ($arguments === TRUE) { return c_base_return_string::s_new('不要な操作を実行しませんでした :{operation_name}' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } @@ -198,7 +198,7 @@ final class c_base_error_messages_japanese implements i_base_error_messages { return c_base_return_string::s_new('不要な操作を実行しませんでした' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } } - elseif ($code === static::FUNCTION_FAILURE) { + else if ($code === static::FUNCTION_FAILURE) { if ($arguments === TRUE) { return c_base_return_string::s_new('関数 :{function_name} は実行に失敗しました' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } @@ -206,7 +206,7 @@ final class c_base_error_messages_japanese implements i_base_error_messages { return c_base_return_string::s_new('関数の実行に失敗しました' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } } - elseif ($code === static::NOT_FOUND) { + else if ($code === static::NOT_FOUND) { if ($arguments === TRUE) { return c_base_return_string::s_new('見つかりません' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } @@ -214,7 +214,7 @@ final class c_base_error_messages_japanese implements i_base_error_messages { return c_base_return_string::s_new('見つかりません' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } } - elseif ($code === static::NOT_FOUND_ARRAY_INDEX) { + else if ($code === static::NOT_FOUND_ARRAY_INDEX) { if ($arguments === TRUE) { return c_base_return_string::s_new('配列 :{index_name} に索引 :{array_name} が見つかりませんでした' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } @@ -222,7 +222,7 @@ final class c_base_error_messages_japanese implements i_base_error_messages { return c_base_return_string::s_new('指定された配列内のインデックスの検索に失敗しました' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } } - elseif ($code === static::NOT_FOUND_FILE) { + else if ($code === static::NOT_FOUND_FILE) { if ($arguments === TRUE) { return c_base_return_string::s_new('ファイル :{file_name} が見つかりませんでした、またはアクセスできません' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } @@ -230,7 +230,7 @@ final class c_base_error_messages_japanese implements i_base_error_messages { return c_base_return_string::s_new('ファイルが見つからないか、アクセスできません' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } } - elseif ($code === static::NOT_FOUND_DIRECTORY) { + else if ($code === static::NOT_FOUND_DIRECTORY) { if ($arguments === TRUE) { return c_base_return_string::s_new('ディレクトリ :{directory_name} が見つかりませんでした、またはアクセスできません' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } @@ -238,7 +238,7 @@ final class c_base_error_messages_japanese implements i_base_error_messages { return c_base_return_string::s_new('ファイルが見つからないか、アクセスできません' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } } - elseif ($code === static::NOT_FOUND_FILE) { + else if ($code === static::NOT_FOUND_FILE) { if ($arguments === TRUE) { return c_base_return_string::s_new('パス ：{path_name} が見つかりませんでした' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } @@ -246,7 +246,7 @@ final class c_base_error_messages_japanese implements i_base_error_messages { return c_base_return_string::s_new('パスが見つかりません' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } } - elseif ($code === static::NOT_DEFINED) { + else if ($code === static::NOT_DEFINED) { if ($arguments === TRUE) { return c_base_return_string::s_new('要求されたデータ：{data_name}は定義されていません' . $function_name_string . $error_message_string . '.'); } @@ -254,7 +254,7 @@ final class c_base_error_messages_japanese implements i_base_error_messages { return c_base_return_string::s_new('要求されたデータは定義されていません' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } } - elseif ($code === static::NO_CONNECTION) { + else if ($code === static::NO_CONNECTION) { if ($arguments === TRUE) { return c_base_return_string::s_new('リソース :{resource_name} は接続されていません' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } @@ -262,7 +262,7 @@ final class c_base_error_messages_japanese implements i_base_error_messages { return c_base_return_string::s_new('リソースが接続されていません' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } } - elseif ($code === static::NO_SUPPORT) { + else if ($code === static::NO_SUPPORT) { if ($arguments === TRUE) { return c_base_return_string::s_new('機能 :{functionality_name} は現在サポートされていません' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } @@ -270,7 +270,7 @@ final class c_base_error_messages_japanese implements i_base_error_messages { return c_base_return_string::s_new('要求された機能はサポートされていません' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } } - elseif ($code === static::POSTGRESQL_CONNECTION_FAILURE) { + else if ($code === static::POSTGRESQL_CONNECTION_FAILURE) { if ($arguments === TRUE) { return c_base_return_string::s_new('データベースへの接続に失敗しました。 :{database_name}' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } @@ -278,7 +278,7 @@ final class c_base_error_messages_japanese implements i_base_error_messages { return c_base_return_string::s_new('データベースに接続できませんでした' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } } - elseif ($code === static::POSTGRESQL_NO_ACCOUNT) { + else if ($code === static::POSTGRESQL_NO_ACCOUNT) { if ($arguments === TRUE) { return c_base_return_string::s_new('データベースアクセスが拒否されました：アカウント：{database_account}が存在しないか、必要なアクセス権' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } @@ -286,7 +286,7 @@ final class c_base_error_messages_japanese implements i_base_error_messages { return c_base_return_string::s_new('データベースアクセスが拒否されました：アカウントが存在しないか、必要なアクセス権がありません' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } } - elseif ($code === static::POSTGRESQL_NO_CONNECTION) { + else if ($code === static::POSTGRESQL_NO_CONNECTION) { if ($arguments === TRUE) { return c_base_return_string::s_new('データベース :{database_name} は接続されていません' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } @@ -294,7 +294,7 @@ final class c_base_error_messages_japanese implements i_base_error_messages { return c_base_return_string::s_new('データベースが接続されていません' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } } - elseif ($code === static::POSTGRESQL_NO_RESOURCE) { + else if ($code === static::POSTGRESQL_NO_RESOURCE) { if ($arguments === TRUE) { return c_base_return_string::s_new('データベースリソースがありません' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } @@ -302,7 +302,7 @@ final class c_base_error_messages_japanese implements i_base_error_messages { return c_base_return_string::s_new('データベースリソースは使用できません' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } } - elseif ($code === static::SOCKET_FAILURE) { + else if ($code === static::SOCKET_FAILURE) { if ($arguments === TRUE) { return c_base_return_string::s_new('ソケット操作の実行に失敗しました。 :{operation_name} 、ソケットエラー（:{socket_error} \':{socket_error_message}\'' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } @@ -310,7 +310,7 @@ final class c_base_error_messages_japanese implements i_base_error_messages { return c_base_return_string::s_new('ソケット操作を実行できませんでした' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } } - elseif ($code === static::ACCESS_DENIED) { + else if ($code === static::ACCESS_DENIED) { if ($arguments === TRUE) { return c_base_return_string::s_new('アクセスが拒否されました。 :{operation_name}' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } @@ -318,7 +318,7 @@ final class c_base_error_messages_japanese implements i_base_error_messages { return c_base_return_string::s_new('アクセスは拒否されました' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } } - elseif ($code === static::ACCESS_DENIED_UNAVAILABLE) { + else if ($code === static::ACCESS_DENIED_UNAVAILABLE) { if ($arguments === TRUE) { return c_base_return_string::s_new('利用できないためアクセスが拒否されましたが、 :{operation_name} ' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } @@ -326,7 +326,7 @@ final class c_base_error_messages_japanese implements i_base_error_messages { return c_base_return_string::s_new('利用できないためアクセスが拒否されました' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } } - elseif ($code === static::ACCESS_DENIED_USER) { + else if ($code === static::ACCESS_DENIED_USER) { if ($arguments === TRUE) { return c_base_return_string::s_new('ユーザーのアクセスが拒否されました :name_machine_user (:{id_user}), :{operation_name} ' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } @@ -334,7 +334,7 @@ final class c_base_error_messages_japanese implements i_base_error_messages { return c_base_return_string::s_new('ユーザーのアクセスが拒否されました' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } } - elseif ($code === static::ACCESS_DENIED_ADMINISTRATION) { + else if ($code === static::ACCESS_DENIED_ADMINISTRATION) { if ($arguments === TRUE) { return c_base_return_string::s_new('管理上の理由でアクセスが拒否されました, :{operation_name} ' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } @@ -342,7 +342,7 @@ final class c_base_error_messages_japanese implements i_base_error_messages { return c_base_return_string::s_new('管理上の理由からアクセスが拒否されました' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } } - elseif ($code === static::SERVER_ERROR) { + else if ($code === static::SERVER_ERROR) { if ($arguments === TRUE) { return c_base_return_string::s_new('サーバーエラーが発生しました, :{operation_name} ' . $function_name_prepend . $function_name_string . $error_message_string . '。'); } diff --git a/common/base/classes/base_html.php b/common/base/classes/base_html.php index e4e3d3d..37f1b09 100644 --- a/common/base/classes/base_html.php +++ b/common/base/classes/base_html.php @@ -1353,7 +1353,7 @@ class c_base_html extends c_base_return { if (is_int($this->attributes_body[$attribute])) { return c_base_return_int::s_new($this->attributes_body[$attribute]); } - elseif (is_null($this->attributes_body[$attribute])) { + else if (is_null($this->attributes_body[$attribute])) { return new c_base_return_null(); } } @@ -1361,7 +1361,7 @@ class c_base_html extends c_base_return { if (is_int($this->attributes[$attribute])) { return c_base_return_int::s_new($this->attributes[$attribute]); } - elseif (is_null($this->attributes[$attribute])) { + else if (is_null($this->attributes[$attribute])) { return new c_base_return_null(); } } diff --git a/common/base/classes/base_http.php b/common/base/classes/base_http.php index 718c297..5070e58 100644 --- a/common/base/classes/base_http.php +++ b/common/base/classes/base_http.php @@ -2193,7 +2193,7 @@ class c_base_http extends c_base_return { $content_type_string = array_shift($result); unset($result); } - elseif (!is_string($content_type)) { + else if (!is_string($content_type)) { $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'content_type', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); return c_base_return_error::s_false($error); } @@ -2401,7 +2401,7 @@ class c_base_http extends c_base_return { $response['tag'] = hash('sha256', $this->content, FALSE); } } - elseif ($entity_tag !== FALSE) { + else if ($entity_tag !== FALSE) { $response['tag'] = $entity_tag; } @@ -3415,7 +3415,7 @@ class c_base_http extends c_base_return { // static:: cannot be used as a default function parameter because it may be used in compile-time constants (which is what default parameters are). $action = static::CHECKSUM_ACTION_AUTO; } - elseif (!is_int($action)) { + else if (!is_int($action)) { $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'action', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); return c_base_return_error::s_false($error); } @@ -5377,52 +5377,52 @@ class c_base_http extends c_base_return { $this->request[static::REQUEST_ACCEPT_ENCODING]['data']['weight'][$weight][static::ENCODING_CHUNKED] = $lowercase; unset($c['choice']); } - elseif ($lowercase == 'compress') { + else if ($lowercase == 'compress') { $c['encoding'] = static::ENCODING_COMPRESS; $this->request[static::REQUEST_ACCEPT_ENCODING]['data']['weight'][$weight][static::ENCODING_COMPRESS] = $lowercase; unset($c['choice']); } - elseif ($lowercase == 'deflate') { + else if ($lowercase == 'deflate') { $c['encoding'] = static::ENCODING_DEFLATE; $this->request[static::REQUEST_ACCEPT_ENCODING]['data']['weight'][$weight][static::ENCODING_DEFLATE] = $lowercase; unset($c['choice']); } - elseif ($lowercase == 'gzip') { + else if ($lowercase == 'gzip') { $c['encoding'] = static::ENCODING_GZIP; $this->request[static::REQUEST_ACCEPT_ENCODING]['data']['weight'][$weight][static::ENCODING_GZIP] = $lowercase; unset($c['choice']); } - elseif ($lowercase == 'bzip') { + else if ($lowercase == 'bzip') { $c['encoding'] = static::ENCODING_BZIP; $this->request[static::REQUEST_ACCEPT_ENCODING]['data']['weight'][$weight][static::ENCODING_BZIP] = $lowercase; unset($c['choice']); } - elseif ($lowercase == 'lzo') { + else if ($lowercase == 'lzo') { $c['encoding'] = static::ENCODING_LZO; $this->request[static::REQUEST_ACCEPT_ENCODING]['data']['weight'][$weight][static::ENCODING_LZO] = $lowercase; unset($c['choice']); } - elseif ($lowercase == 'xz') { + else if ($lowercase == 'xz') { $c['encoding'] = static::ENCODING_XZ; $this->request[static::REQUEST_ACCEPT_ENCODING]['data']['weight'][$weight][static::ENCODING_XZ] = $lowercase; unset($c['choice']); } - elseif ($lowercase == 'exit') { + else if ($lowercase == 'exit') { $c['encoding'] = static::ENCODING_EXI; $this->request[static::REQUEST_ACCEPT_ENCODING]['data']['weight'][$weight][static::ENCODING_EXI] = $lowercase; unset($c['choice']); } - elseif ($lowercase == 'identity') { + else if ($lowercase == 'identity') { $c['encoding'] = static::ENCODING_IDENTITY; $this->request[static::REQUEST_ACCEPT_ENCODING]['data']['weight'][$weight][static::ENCODING_IDENTITY] = $lowercase; unset($c['choice']); } - elseif ($lowercase == 'sdch') { + else if ($lowercase == 'sdch') { $c['encoding'] = static::ENCODING_SDCH; $this->request[static::REQUEST_ACCEPT_ENCODING]['data']['weight'][$weight][static::ENCODING_SDCH] = $lowercase; unset($c['choice']); } - elseif ($lowercase == 'pg') { + else if ($lowercase == 'pg') { $c['encoding'] = static::ENCODING_PG; $this->request[static::REQUEST_ACCEPT_ENCODING]['data']['weight'][$weight][static::ENCODING_PG] = $lowercase; unset($c['choice']); @@ -5488,97 +5488,97 @@ class c_base_http extends c_base_return { $this->request[static::REQUEST_ACCEPT_CHARSET]['data']['weight'][$weight][c_base_charset::ASCII] = $lowercase; unset($c['choice']); } - elseif ($lowercase == 'utf-8') { + else if ($lowercase == 'utf-8') { $c['charset'] = c_base_charset::UTF_8; $this->request[static::REQUEST_ACCEPT_CHARSET]['data']['weight'][$weight][c_base_charset::UTF_8] = $lowercase; unset($c['choice']); } - elseif ($lowercase == 'utf-16') { + else if ($lowercase == 'utf-16') { $c['charset'] = c_base_charset::UTF_16; $this->request[static::REQUEST_ACCEPT_CHARSET]['data']['weight'][$weight][c_base_charset::UTF_16] = $lowercase; unset($c['choice']); } - elseif ($lowercase == 'utf-32') { + else if ($lowercase == 'utf-32') { $c['charset'] = c_base_charset::UTF_32; $this->request[static::REQUEST_ACCEPT_CHARSET]['data']['weight'][$weight][c_base_charset::UTF_32] = $lowercase; unset($c['choice']); } - elseif ($lowercase == 'iso-8859-1') { + else if ($lowercase == 'iso-8859-1') { $c['charset'] = c_base_charset::ISO_8859_1; $this->request[static::REQUEST_ACCEPT_CHARSET]['data']['weight'][$weight][c_base_charset::ISO_8859_1] = $lowercase; unset($c['choice']); } - elseif ($lowercase == 'iso-8859-2') { + else if ($lowercase == 'iso-8859-2') { $c['charset'] = c_base_charset::ISO_8859_2; $this->request[static::REQUEST_ACCEPT_CHARSET]['data']['weight'][$weight][c_base_charset::ISO_8859_2] = $lowercase; unset($c['choice']); } - elseif ($lowercase == 'iso-8859-3') { + else if ($lowercase == 'iso-8859-3') { $c['charset'] = c_base_charset::ISO_8859_3; $this->request[static::REQUEST_ACCEPT_CHARSET]['data']['weight'][$weight][c_base_charset::ISO_8859_3] = $lowercase; unset($c['choice']); } - elseif ($lowercase == 'iso-8859-4') { + else if ($lowercase == 'iso-8859-4') { $c['charset'] = c_base_charset::ISO_8859_4; $this->request[static::REQUEST_ACCEPT_CHARSET]['data']['weight'][$weight][c_base_charset::ISO_8859_4] = $lowercase; unset($c['choice']); } - elseif ($lowercase == 'iso-8859-5') { + else if ($lowercase == 'iso-8859-5') { $c['charset'] = c_base_charset::ISO_8859_5; $this->request[static::REQUEST_ACCEPT_CHARSET]['data']['weight'][$weight][c_base_charset::ISO_8859_5] = $lowercase; unset($c['choice']); } - elseif ($lowercase == 'iso-8859-6') { + else if ($lowercase == 'iso-8859-6') { $c['charset'] = c_base_charset::ISO_8859_6; $this->request[static::REQUEST_ACCEPT_CHARSET]['data']['weight'][$weight][c_base_charset::ISO_8859_6] = $lowercase; unset($c['choice']); } - elseif ($lowercase == 'iso-8859-7') { + else if ($lowercase == 'iso-8859-7') { $c['charset'] = c_base_charset::ISO_8859_7; $this->request[static::REQUEST_ACCEPT_CHARSET]['data']['weight'][$weight][c_base_charset::ISO_8859_7] = $lowercase; unset($c['choice']); } - elseif ($lowercase == 'iso-8859-8') { + else if ($lowercase == 'iso-8859-8') { $c['charset'] = c_base_charset::ISO_8859_8; $this->request[static::REQUEST_ACCEPT_CHARSET]['data']['weight'][$weight][c_base_charset::ISO_8859_8] = $lowercase; unset($c['choice']); } - elseif ($lowercase == 'iso-8859-9') { + else if ($lowercase == 'iso-8859-9') { $c['charset'] = c_base_charset::ISO_8859_9; $this->request[static::REQUEST_ACCEPT_CHARSET]['data']['weight'][$weight][c_base_charset::ISO_8859_9] = $lowercase; unset($c['choice']); } - elseif ($lowercase == 'iso-8859-10') { + else if ($lowercase == 'iso-8859-10') { $c['charset'] = c_base_charset::ISO_8859_10; $this->request[static::REQUEST_ACCEPT_CHARSET]['data']['weight'][$weight][c_base_charset::ISO_8859_10] = $lowercase; unset($c['choice']); } - elseif ($lowercase == 'iso-8859-11') { + else if ($lowercase == 'iso-8859-11') { $c['charset'] = c_base_charset::ISO_8859_11; $this->request[static::REQUEST_ACCEPT_CHARSET]['data']['weight'][$weight][c_base_charset::ISO_8859_11] = $lowercase; unset($c['choice']); } - elseif ($lowercase == 'iso-8859-12') { + else if ($lowercase == 'iso-8859-12') { $c['charset'] = c_base_charset::ISO_8859_12; $this->request[static::REQUEST_ACCEPT_CHARSET]['data']['weight'][$weight][c_base_charset::ISO_8859_12] = $lowercase; unset($c['choice']); } - elseif ($lowercase == 'iso-8859-13') { + else if ($lowercase == 'iso-8859-13') { $c['charset'] = c_base_charset::ISO_8859_13; $this->request[static::REQUEST_ACCEPT_CHARSET]['data']['weight'][$weight][c_base_charset::ISO_8859_13] = $lowercase; unset($c['choice']); } - elseif ($lowercase == 'iso-8859-14') { + else if ($lowercase == 'iso-8859-14') { $c['charset'] = c_base_charset::ISO_8859_14; $this->request[static::REQUEST_ACCEPT_CHARSET]['data']['weight'][$weight][c_base_charset::ISO_8859_14] = $lowercase; unset($c['choice']); } - elseif ($lowercase == 'iso-8859-15') { + else if ($lowercase == 'iso-8859-15') { $c['charset'] = c_base_charset::ISO_8859_15; $this->request[static::REQUEST_ACCEPT_CHARSET]['data']['weight'][$weight][c_base_charset::ISO_8859_15] = $lowercase; unset($c['choice']); } - elseif ($lowercase == 'iso-8859-16') { + else if ($lowercase == 'iso-8859-16') { $c['charset'] = c_base_charset::ISO_8859_16; $this->request[static::REQUEST_ACCEPT_CHARSET]['data']['weight'][$weight][c_base_charset::ISO_8859_16] = $lowercase; unset($c['choice']); @@ -5821,15 +5821,15 @@ class c_base_http extends c_base_return { $this->request[static::REQUEST_CACHE_CONTROL]['defined'] = TRUE; $this->request[static::REQUEST_CACHE_CONTROL]['data']['methods'][SELF::CACHE_CONTROL_NO_CACHE] = SELF::CACHE_CONTROL_NO_CACHE; } - elseif ($cleaned_up == 'no-store') { + else if ($cleaned_up == 'no-store') { $this->request[static::REQUEST_CACHE_CONTROL]['defined'] = TRUE; $this->request[static::REQUEST_CACHE_CONTROL]['data']['methods'][SELF::CACHE_CONTROL_NO_STORE] = SELF::CACHE_CONTROL_NO_STORE; } - elseif ($cleaned_up == 'no-transform') { + else if ($cleaned_up == 'no-transform') { $this->request[static::REQUEST_CACHE_CONTROL]['defined'] = TRUE; $this->request[static::REQUEST_CACHE_CONTROL]['data']['methods'][SELF::CACHE_CONTROL_NO_TRANSFORM] = SELF::CACHE_CONTROL_NO_TRANSFORM; } - elseif ($cleaned_up == 'only-if-cached') { + else if ($cleaned_up == 'only-if-cached') { $this->request[static::REQUEST_CACHE_CONTROL]['defined'] = TRUE; $this->request[static::REQUEST_CACHE_CONTROL]['data']['methods'][SELF::CACHE_CONTROL_ONLY_IF_CACHED] = SELF::CACHE_CONTROL_ONLY_IF_CACHED; } @@ -6379,34 +6379,34 @@ class c_base_http extends c_base_return { if ($method_string == 'get') { $this->request[static::REQUEST_METHOD]['data'] = static::HTTP_METHOD_GET; } - elseif ($method_string == 'head') { + else if ($method_string == 'head') { $this->request[static::REQUEST_METHOD]['data'] = static::HTTP_METHOD_HEAD; } - elseif ($method_string == 'post') { + else if ($method_string == 'post') { $this->request[static::REQUEST_METHOD]['data'] = static::HTTP_METHOD_POST; } - elseif ($method_string == 'put') { + else if ($method_string == 'put') { $this->request[static::REQUEST_METHOD]['data'] = static::HTTP_METHOD_PUT; } - elseif ($method_string == 'delete') { + else if ($method_string == 'delete') { $this->request[static::REQUEST_METHOD]['data'] = static::HTTP_METHOD_DELETE; } - elseif ($method_string == 'trace') { + else if ($method_string == 'trace') { $this->request[static::REQUEST_METHOD]['data'] = static::HTTP_METHOD_TRACE; } - elseif ($method_string == 'options') { + else if ($method_string == 'options') { $this->request[static::REQUEST_METHOD]['data'] = static::HTTP_METHOD_OPTIONS; } - elseif ($method_string == 'connect') { + else if ($method_string == 'connect') { $this->request[static::REQUEST_METHOD]['data'] = static::HTTP_METHOD_CONNECT; } - elseif ($method_string == 'patch') { + else if ($method_string == 'patch') { $this->request[static::REQUEST_METHOD]['data'] = static::HTTP_METHOD_PATCH; } - elseif ($method_string == 'track') { + else if ($method_string == 'track') { $this->request[static::REQUEST_METHOD]['data'] = static::HTTP_METHOD_TRACK; } - elseif ($method_string == 'debug') { + else if ($method_string == 'debug') { $this->request[static::REQUEST_METHOD]['data'] = static::HTTP_METHOD_DEBUG; } else { @@ -6559,31 +6559,31 @@ class c_base_http extends c_base_return { if ($c['choice'] == 'compress') { $c['encoding'] = static::ENCODING_COMPRESS; } - elseif ($c['choice'] == 'deflate') { + else if ($c['choice'] == 'deflate') { $c['encoding'] = static::ENCODING_DEFLATE; } - elseif ($c['choice'] == 'gzip') { + else if ($c['choice'] == 'gzip') { $c['encoding'] = static::ENCODING_GZIP; } - elseif ($c['choice'] == 'bzip') { + else if ($c['choice'] == 'bzip') { $c['encoding'] = static::ENCODING_BZIP; } - elseif ($c['choice'] == 'lzo') { + else if ($c['choice'] == 'lzo') { $c['encoding'] = static::ENCODING_LZO; } - elseif ($c['choice'] == 'xz') { + else if ($c['choice'] == 'xz') { $c['encoding'] = static::ENCODING_XZ; } - elseif ($c['choice'] == 'exit') { + else if ($c['choice'] == 'exit') { $c['encoding'] = static::ENCODING_EXI; } - elseif ($c['choice'] == 'identity') { + else if ($c['choice'] == 'identity') { $c['encoding'] = static::ENCODING_IDENTITY; } - elseif ($c['choice'] == 'sdch') { + else if ($c['choice'] == 'sdch') { $c['encoding'] = static::ENCODING_SDCH; } - elseif ($c['choice'] == 'pg') { + else if ($c['choice'] == 'pg') { $c['encoding'] = static::ENCODING_PG; } else { @@ -7363,7 +7363,7 @@ class c_base_http extends c_base_return { $result['invalid'] = TRUE; break; } - elseif ($text['ordinals'][$current] == c_base_ascii::QUOTE_DOUBLE) { + else if ($text['ordinals'][$current] == c_base_ascii::QUOTE_DOUBLE) { $current++; if ($current >= $stop) { $result['invalid'] = TRUE; @@ -7512,12 +7512,12 @@ class c_base_http extends c_base_return { $result['name_machine'] = 'ie'; $result['name_human'] = 'Internet Explorer'; } - elseif ($lower_piece_1 == 'gecko') { + else if ($lower_piece_1 == 'gecko') { $result['engine_name_machine'] = 'gecko'; $result['engine_name_human'] = 'Gecko'; $result['version_engine'] = (int) preg_replace('/\..*$/iu', '', $lower_piece_2); } - elseif ($lower_piece_1 == 'presto') { + else if ($lower_piece_1 == 'presto') { $result['engine_name_machine'] = 'presto'; $result['engine_name_human'] = 'Presto'; $result['version_engine'] = (int) preg_replace('/\..*$/iu', '', $lower_piece_2); @@ -7526,7 +7526,7 @@ class c_base_http extends c_base_return { unset($lower_piece_1); unset($lower_piece_2); } - elseif (isset($pieces[0])) { + else if (isset($pieces[0])) { $lower_cased = c_base_utf8::s_lowercase($pieces[0])->get_value_exact(); $lower_piece_1 = preg_replace('/(^\s+)|(\s+$)/us', '', $lower_cased); unset($lower_cased); @@ -7542,7 +7542,7 @@ class c_base_http extends c_base_return { $result['version_major'] = (int) preg_replace('/\..*$/iu', '', $lower_piece_2); } } - elseif (strpos($lower_piece_1, 'midori')) { + else if (strpos($lower_piece_1, 'midori')) { $result['name_machine'] = 'midori'; $result['name_human'] = 'Midori'; $result['engine_name_machine'] = 'webkit'; @@ -7597,7 +7597,7 @@ class c_base_http extends c_base_return { $result['version_major'] = (int) preg_replace('/\..*$/iu', '', $lower_piece_2); } } - elseif ($lower_piece_1 == 'safari') { + else if ($lower_piece_1 == 'safari') { // safari is used in a lot of places that is not safari, so use safari only if it is the only agent detected. if (is_null($result['name_machine'])) { $result['name_machine'] = 'safari'; @@ -7613,7 +7613,7 @@ class c_base_http extends c_base_return { } } } - elseif ($lower_piece_1 == 'firefox') { + else if ($lower_piece_1 == 'firefox') { $result['name_machine'] = 'firefox'; $result['name_human'] = 'Firefox'; @@ -7624,7 +7624,7 @@ class c_base_http extends c_base_return { $result['engine_name_machine'] = 'gecko'; $result['engine_name_human'] = 'Gecko'; } - elseif ($lower_piece_1 == 'seamonkey') { + else if ($lower_piece_1 == 'seamonkey') { $result['name_machine'] = 'seamonkey'; $result['name_human'] = 'Seamonkey'; @@ -7635,14 +7635,14 @@ class c_base_http extends c_base_return { $result['engine_name_machine'] = 'gecko'; $result['engine_name_human'] = 'Gecko'; } - elseif ($lower_piece_1 == 'gecko') { + else if ($lower_piece_1 == 'gecko') { if (is_null($result['version_engine']) && (is_null($result['engine_name_machine']) || $result['engine_name_machine'] == 'gecko')) { $result['version_engine'] = (int) preg_replace('/\..*$/iu', '', $lower_piece_2); $result['engine_name_machine'] = 'gecko'; $result['engine_name_human'] = 'Gecko'; } } - elseif ($lower_piece_1 == 'chrome') { + else if ($lower_piece_1 == 'chrome') { // the newer internet explorer uses safari/webkit based agent names, assign chrome conditionally. if (is_null($result['name_machine']) || $result['name_machine'] == 'safari') { $result['name_machine'] = 'chrome'; @@ -7653,7 +7653,7 @@ class c_base_http extends c_base_return { } } } - elseif ($lower_piece_1 == 'chromium') { + else if ($lower_piece_1 == 'chromium') { $result['name_machine'] = 'chrome'; $result['name_human'] = 'Google Chrome'; @@ -7661,7 +7661,7 @@ class c_base_http extends c_base_return { $result['version_major'] = (int) preg_replace('/\..*$/iu', '', $lower_piece_2); } } - elseif ($lower_piece_1 == 'epiphany') { + else if ($lower_piece_1 == 'epiphany') { $result['name_machine'] = 'epiphany'; $result['name_human'] = 'Ephiphany'; @@ -7674,7 +7674,7 @@ class c_base_http extends c_base_return { $result['engine_name_human'] = 'Gecko'; } } - elseif ($lower_piece_1 == 'konqueror') { + else if ($lower_piece_1 == 'konqueror') { $result['name_machine'] = 'konqueror'; $result['name_human'] = 'Konqueror'; @@ -7687,7 +7687,7 @@ class c_base_http extends c_base_return { $result['engine_name_human'] = 'Gecko'; } } - elseif ($lower_piece_1 == 'khtml') { + else if ($lower_piece_1 == 'khtml') { $result['name_machine'] = 'konqueror'; $result['name_human'] = 'Konqueror'; @@ -7695,7 +7695,7 @@ class c_base_http extends c_base_return { $result['version_major'] = (int) preg_replace('/\..*$/iu', '', $lower_piece_2); } } - elseif ($lower_piece_1 == 'opr') { + else if ($lower_piece_1 == 'opr') { $result['name_machine'] = 'opera'; $result['name_human'] = 'Opera'; @@ -7708,7 +7708,7 @@ class c_base_http extends c_base_return { $result['engine_name_human'] = 'Presto'; } } - elseif ($lower_piece_1 == 'edge') { + else if ($lower_piece_1 == 'edge') { $result['name_machine'] = 'ie'; $result['name_human'] = 'Internet Explorer'; @@ -7718,7 +7718,7 @@ class c_base_http extends c_base_return { $result['is_ie_edge'] = TRUE; } - elseif ($lower_piece_1 == 'midori') { + else if ($lower_piece_1 == 'midori') { $result['name_machine'] = 'midori'; $result['name_human'] = 'Midori'; @@ -7730,7 +7730,7 @@ class c_base_http extends c_base_return { unset($lower_piece_1); unset($lower_piece_2); } - elseif (isset($pieces[0])) { + else if (isset($pieces[0])) { $lower_cased = c_base_utf8::s_lowercase($pieces[0])->get_value_exact(); $lower_piece_1 = preg_replace('/(^\s+)|(\s+$)/us', '', $lower_cased); unset($lower_cased); @@ -7744,7 +7744,7 @@ class c_base_http extends c_base_return { $result['engine_name_human'] = 'Presto'; } } - elseif ($lower_piece_1 == '(khtml,') { + else if ($lower_piece_1 == '(khtml,') { // khtml is used in a lot of places that is not safari, so use only when necessary. if (is_null($result['engine_name_machine']) || $result['name_machine'] == 'epiphany' || $result['name_machine'] == 'konqueror') { $result['engine_name_machine'] = 'webkit'; @@ -7774,16 +7774,16 @@ class c_base_http extends c_base_return { if (isset($result['is_ie_edge'])) { $result['version_major'] = 12; } - elseif ($result['version_engine'] == 7) { + else if ($result['version_engine'] == 7) { $result['version_major'] = 11; } - elseif ($result['version_engine'] == 6) { + else if ($result['version_engine'] == 6) { $result['version_major'] = 10; } - elseif ($result['version_engine'] == 5) { + else if ($result['version_engine'] == 5) { $result['version_major'] = 9; } - elseif ($result['version_engine'] == 4) { + else if ($result['version_engine'] == 4) { $result['version_major'] = 8; } } @@ -7804,19 +7804,19 @@ class c_base_http extends c_base_return { if (isset($result['is_ie_edge'])) { $result['version_major'] = 12; } - elseif ($result['version_engine'] == 7) { + else if ($result['version_engine'] == 7) { $result['version_major'] = 11; } - elseif ($result['version_engine'] == 6) { + else if ($result['version_engine'] == 6) { $result['version_major'] = 10; } - elseif ($result['version_engine'] == 5) { + else if ($result['version_engine'] == 5) { $result['version_major'] = 9; } - elseif ($result['version_engine'] == 4) { + else if ($result['version_engine'] == 4) { $result['version_major'] = 8; } - elseif (preg_match("/; EIE10;/iu", $agent) > 0) { + else if (preg_match("/; EIE10;/iu", $agent) > 0) { $result['version_major'] = 10; } } @@ -7854,7 +7854,7 @@ class c_base_http extends c_base_return { $result['human_name'] = 'Curl'; $result['version_major'] = (int) $lower_piece_2; } - elseif ($lower_piece_1 == 'wget') { + else if ($lower_piece_1 == 'wget') { $result['engine_name_machine'] = 'wget'; $result['engine_name_human'] = 'WGet'; @@ -7869,7 +7869,7 @@ class c_base_http extends c_base_return { $result['human_name'] = 'WGet'; $result['version_major'] = (int) $lower_piece_2; } - elseif ($lower_piece_1 == 'elinks') { + else if ($lower_piece_1 == 'elinks') { $result['engine_name_machine'] = 'elinks'; $result['engine_name_human'] = 'Elimks'; @@ -7884,7 +7884,7 @@ class c_base_http extends c_base_return { $result['human_name'] = 'Elimks'; $result['version_major'] = (int) $lower_piece_2; } - elseif ($lower_piece_1 == 'lynx') { + else if ($lower_piece_1 == 'lynx') { $result['engine_name_machine'] = 'lynx'; $result['engine_name_human'] = 'Lynx'; @@ -7903,7 +7903,7 @@ class c_base_http extends c_base_return { unset($lower_piece_1); unset($lower_piece_2); } - elseif ($total_pieces == 1) { + else if ($total_pieces == 1) { $lower_piece = preg_replace('/(^\s+)|(\s+$)/us', '', c_base_utf8::s_lowercase($pieces[0])->get_value_exact()); if ($lower_piece == 'links') { @@ -7992,7 +7992,7 @@ class c_base_http extends c_base_return { if ($parsed['text'] == 'partial') { $result['what'] = static::CHECKSUM_WHAT_FULL; } - elseif ($parsed['text'] == 'complete') { + else if ($parsed['text'] == 'complete') { $result['what'] = static::CHECKSUM_WHAT_COMPLETE; } else { @@ -8026,31 +8026,31 @@ class c_base_http extends c_base_return { if ($parsed['text'] == 'md2') { $result['type'] = static::CHECKSUM_MD2; } - elseif ($parsed['text'] == 'md4') { + else if ($parsed['text'] == 'md4') { $result['type'] = static::CHECKSUM_MD4; } - elseif ($parsed['text'] == 'md5') { + else if ($parsed['text'] == 'md5') { $result['type'] = static::CHECKSUM_MD5; } - elseif ($parsed['text'] == 'sha1') { + else if ($parsed['text'] == 'sha1') { $result['type'] = static::CHECKSUM_SHA1; } - elseif ($parsed['text'] == 'sha224') { + else if ($parsed['text'] == 'sha224') { $result['type'] = static::CHECKSUM_SHA224; } - elseif ($parsed['text'] == 'sha256') { + else if ($parsed['text'] == 'sha256') { $result['type'] = static::CHECKSUM_SHA256; } - elseif ($parsed['text'] == 'sha384') { + else if ($parsed['text'] == 'sha384') { $result['type'] = static::CHECKSUM_SHA384; } - elseif ($parsed['text'] == 'sha512') { + else if ($parsed['text'] == 'sha512') { $result['type'] = static::CHECKSUM_SHA512; } - elseif ($parsed['text'] == 'crc32') { + else if ($parsed['text'] == 'crc32') { $result['type'] = static::CHECKSUM_CRC32; } - elseif ($parsed['text'] == 'crc32b') { + else if ($parsed['text'] == 'crc32b') { $result['type'] = static::CHECKSUM_CRC32B; } else { @@ -9684,13 +9684,13 @@ class c_base_http extends c_base_return { if ($this->response[static::RESPONSE_CHECKSUM_CONTENT]['what'] == static::CHECKSUM_WHAT_FULL) { $what = 'full'; } - elseif ($this->response[static::RESPONSE_CHECKSUM_CONTENT]['what'] == static::CHECKSUM_WHAT_PARTIAL) { + else if ($this->response[static::RESPONSE_CHECKSUM_CONTENT]['what'] == static::CHECKSUM_WHAT_PARTIAL) { $what = 'partial'; } - elseif ($this->response[static::RESPONSE_CHECKSUM_CONTENT]['what'] == static::CHECKSUM_WHAT_SIGNED) { + else if ($this->response[static::RESPONSE_CHECKSUM_CONTENT]['what'] == static::CHECKSUM_WHAT_SIGNED) { $what = 'signed'; } - elseif ($this->response[static::RESPONSE_CHECKSUM_CONTENT]['what'] == static::CHECKSUM_WHAT_UNSIGNED) { + else if ($this->response[static::RESPONSE_CHECKSUM_CONTENT]['what'] == static::CHECKSUM_WHAT_UNSIGNED) { $what = 'unsigned'; } @@ -9800,7 +9800,7 @@ class c_base_http extends c_base_return { } } } - elseif ($this->response[static::RESPONSE_CHECKSUM_CONTENT]['action'] == static::CHECKSUM_ACTION_MANUAL) { + else if ($this->response[static::RESPONSE_CHECKSUM_CONTENT]['action'] == static::CHECKSUM_ACTION_MANUAL) { if (!is_null($this->response[static::RESPONSE_CHECKSUM_CONTENT]['checksum'])) { $header_output[static::RESPONSE_CHECKSUM_CONTENT] = 'Checksum_Content: ' . $what . ':' . $algorithm . ':' . $this->response[static::RESPONSE_CHECKSUM_CONTENT]['checksum']; } @@ -9936,40 +9936,40 @@ class c_base_http extends c_base_return { if ($this->response[static::RESPONSE_CHECKSUM_HEADER]['type'] === static::CHECKSUM_MD2) { $checkum_header = hash('md2', $header_string); } - elseif ($this->response[static::RESPONSE_CHECKSUM_HEADER]['type'] === static::CHECKSUM_MD4) { + else if ($this->response[static::RESPONSE_CHECKSUM_HEADER]['type'] === static::CHECKSUM_MD4) { $checkum_header = hash('md4', $header_string); } - elseif ($this->response[static::RESPONSE_CHECKSUM_HEADER]['type'] === static::CHECKSUM_MD5) { + else if ($this->response[static::RESPONSE_CHECKSUM_HEADER]['type'] === static::CHECKSUM_MD5) { $checkum_header = hash('md5', $header_string); } - elseif ($this->response[static::RESPONSE_CHECKSUM_HEADER]['type'] === static::CHECKSUM_SHA1) { + else if ($this->response[static::RESPONSE_CHECKSUM_HEADER]['type'] === static::CHECKSUM_SHA1) { $checkum_header = hash('sha1', $header_string); } - elseif ($this->response[static::RESPONSE_CHECKSUM_HEADER]['type'] === static::CHECKSUM_SHA224) { + else if ($this->response[static::RESPONSE_CHECKSUM_HEADER]['type'] === static::CHECKSUM_SHA224) { $checkum_header = hash('sha224', $header_string); } - elseif ($this->response[static::RESPONSE_CHECKSUM_HEADER]['type'] === static::CHECKSUM_SHA256) { + else if ($this->response[static::RESPONSE_CHECKSUM_HEADER]['type'] === static::CHECKSUM_SHA256) { $checkum_header = hash('sha256', $header_string); } - elseif ($this->response[static::RESPONSE_CHECKSUM_HEADER]['type'] === static::CHECKSUM_SHA384) { + else if ($this->response[static::RESPONSE_CHECKSUM_HEADER]['type'] === static::CHECKSUM_SHA384) { $checkum_header = hash('sha384', $header_string); } - elseif ($this->response[static::RESPONSE_CHECKSUM_HEADER]['type'] === static::CHECKSUM_SHA512) { + else if ($this->response[static::RESPONSE_CHECKSUM_HEADER]['type'] === static::CHECKSUM_SHA512) { $checkum_header = hash('sha512', $header_string); } - elseif ($this->response[static::RESPONSE_CHECKSUM_HEADER]['type'] === static::CHECKSUM_CRC32) { + else if ($this->response[static::RESPONSE_CHECKSUM_HEADER]['type'] === static::CHECKSUM_CRC32) { $checkum_header = hash('crc32', $header_string); } - elseif ($this->response[static::RESPONSE_CHECKSUM_HEADER]['type'] === static::CHECKSUM_CRC32B) { + else if ($this->response[static::RESPONSE_CHECKSUM_HEADER]['type'] === static::CHECKSUM_CRC32B) { $checkum_header = hash('crc32b', $header_string); } - elseif ($this->response[static::RESPONSE_CHECKSUM_HEADER]['type'] === static::CHECKSUM_PG) { + else if ($this->response[static::RESPONSE_CHECKSUM_HEADER]['type'] === static::CHECKSUM_PG) { // @todo: #$checkum_header = ; } unset($header_string); } - elseif ($this->response[static::RESPONSE_CHECKSUM_HEADER]['action'] == static::CHECKSUM_ACTION_MANUAL) { + else if ($this->response[static::RESPONSE_CHECKSUM_HEADER]['action'] == static::CHECKSUM_ACTION_MANUAL) { $checkum_header = $this->response[static::RESPONSE_CHECKSUM_HEADER]['checksum']; } else { @@ -9982,15 +9982,15 @@ class c_base_http extends c_base_return { if ($this->response[static::RESPONSE_CHECKSUM_HEADER]['what'] === static::CHECKSUM_WHAT_FULL) { $header_output[static::RESPONSE_CHECKSUM_HEADER] .= 'full:'; } - elseif ($this->response[static::RESPONSE_CHECKSUM_HEADER]['what'] === static::CHECKSUM_WHAT_PARTIAL) { + else if ($this->response[static::RESPONSE_CHECKSUM_HEADER]['what'] === static::CHECKSUM_WHAT_PARTIAL) { $header_output[static::RESPONSE_CHECKSUM_HEADER] .= 'partial:'; $checkum_header = mt_substr($checkum_header, 0, static::CHECKSUM_LENGTH_SHORTSUM); } - elseif ($this->response[static::RESPONSE_CHECKSUM_HEADER]['what'] === static::CHECKSUM_WHAT_SIGNED) { + else if ($this->response[static::RESPONSE_CHECKSUM_HEADER]['what'] === static::CHECKSUM_WHAT_SIGNED) { $header_output[static::RESPONSE_CHECKSUM_HEADER] .= 'signed:'; // @todo } - elseif ($this->response[static::RESPONSE_CHECKSUM_HEADER]['what'] === static::CHECKSUM_WHAT_UNSIGNED) { + else if ($this->response[static::RESPONSE_CHECKSUM_HEADER]['what'] === static::CHECKSUM_WHAT_UNSIGNED) { $header_output[static::RESPONSE_CHECKSUM_HEADER] .= 'unsigned:'; // @todo } @@ -9998,34 +9998,34 @@ class c_base_http extends c_base_return { if ($this->response[static::RESPONSE_CHECKSUM_HEADER]['type'] === static::CHECKSUM_MD2) { $header_output[static::RESPONSE_CHECKSUM_HEADER] .= 'md2:'; } - elseif ($this->response[static::RESPONSE_CHECKSUM_HEADER]['type'] === static::CHECKSUM_MD4) { + else if ($this->response[static::RESPONSE_CHECKSUM_HEADER]['type'] === static::CHECKSUM_MD4) { $header_output[static::RESPONSE_CHECKSUM_HEADER] .= 'md4:'; } - elseif ($this->response[static::RESPONSE_CHECKSUM_HEADER]['type'] === static::CHECKSUM_MD5) { + else if ($this->response[static::RESPONSE_CHECKSUM_HEADER]['type'] === static::CHECKSUM_MD5) { $header_output[static::RESPONSE_CHECKSUM_HEADER] .= 'md5:'; } - elseif ($this->response[static::RESPONSE_CHECKSUM_HEADER]['type'] === static::CHECKSUM_SHA1) { + else if ($this->response[static::RESPONSE_CHECKSUM_HEADER]['type'] === static::CHECKSUM_SHA1) { $header_output[static::RESPONSE_CHECKSUM_HEADER] .= 'sha1:'; } - elseif ($this->response[static::RESPONSE_CHECKSUM_HEADER]['type'] === static::CHECKSUM_SHA224) { + else if ($this->response[static::RESPONSE_CHECKSUM_HEADER]['type'] === static::CHECKSUM_SHA224) { $header_output[static::RESPONSE_CHECKSUM_HEADER] .= 'sha224:'; } - elseif ($this->response[static::RESPONSE_CHECKSUM_HEADER]['type'] === static::CHECKSUM_SHA256) { + else if ($this->response[static::RESPONSE_CHECKSUM_HEADER]['type'] === static::CHECKSUM_SHA256) { $header_output[static::RESPONSE_CHECKSUM_HEADER] .= 'sha256:'; } - elseif ($this->response[static::RESPONSE_CHECKSUM_HEADER]['type'] === static::CHECKSUM_SHA384) { + else if ($this->response[static::RESPONSE_CHECKSUM_HEADER]['type'] === static::CHECKSUM_SHA384) { $header_output[static::RESPONSE_CHECKSUM_HEADER] .= 'sha384:'; } - elseif ($this->response[static::RESPONSE_CHECKSUM_HEADER]['type'] === static::CHECKSUM_SHA512) { + else if ($this->response[static::RESPONSE_CHECKSUM_HEADER]['type'] === static::CHECKSUM_SHA512) { $header_output[static::RESPONSE_CHECKSUM_HEADER] .= 'sha512:'; } - elseif ($this->response[static::RESPONSE_CHECKSUM_HEADER]['type'] === static::CHECKSUM_CRC32) { + else if ($this->response[static::RESPONSE_CHECKSUM_HEADER]['type'] === static::CHECKSUM_CRC32) { $header_output[static::RESPONSE_CHECKSUM_HEADER] .= 'crc32:'; } - elseif ($this->response[static::RESPONSE_CHECKSUM_HEADER]['type'] === static::CHECKSUM_CRC32B) { + else if ($this->response[static::RESPONSE_CHECKSUM_HEADER]['type'] === static::CHECKSUM_CRC32B) { $header_output[static::RESPONSE_CHECKSUM_HEADER] .= 'crc32b:'; } - elseif ($this->response[static::RESPONSE_CHECKSUM_HEADER]['type'] === static::CHECKSUM_PG) { + else if ($this->response[static::RESPONSE_CHECKSUM_HEADER]['type'] === static::CHECKSUM_PG) { // @todo: #$checkum_header = ; } @@ -10177,7 +10177,7 @@ class c_base_http extends c_base_return { if (is_null($compression) || $compression < -1) { $compression = -1; } - elseif ($compression > 9) { + else if ($compression > 9) { $compression = 9; } @@ -10191,11 +10191,11 @@ class c_base_http extends c_base_return { return TRUE; } - elseif ($encoding == static::ENCODING_DEFLATE) { + else if ($encoding == static::ENCODING_DEFLATE) { if (is_null($compression) || $compression < -1) { $compression = -1; } - elseif ($compression > 9) { + else if ($compression > 9) { $compression = 9; } @@ -10209,11 +10209,11 @@ class c_base_http extends c_base_return { return TRUE; } - elseif ($encoding == static::ENCODING_BZIP) { + else if ($encoding == static::ENCODING_BZIP) { if (is_null($compression) || $compression < -1) { $compression = 4; } - elseif ($compression > 9) { + else if ($compression > 9) { $compression = 9; } @@ -10227,7 +10227,7 @@ class c_base_http extends c_base_return { return TRUE; } - elseif ($encoding == static::ENCODING_LZO) { + else if ($encoding == static::ENCODING_LZO) { switch ($compression) { case LZO1X_1: case LZO1_1: @@ -10282,19 +10282,19 @@ class c_base_http extends c_base_return { return TRUE; } - elseif ($encoding == static::ENCODING_XZ) { + else if ($encoding == static::ENCODING_XZ) { // @fixme: php-xz module is currently not working. } - elseif ($encoding == static::ENCODING_EXI) { + else if ($encoding == static::ENCODING_EXI) { // @todo, maybe? (cannot seem to find a php library at this time) } - elseif ($encoding == static::ENCODING_IDENTITY) { + else if ($encoding == static::ENCODING_IDENTITY) { // @todo, maybe? (cannot seem to find a php library at this time) } - elseif ($encoding == static::ENCODING_SDCH) { + else if ($encoding == static::ENCODING_SDCH) { // @todo, maybe? (cannot seem to find a php library at this time) } - elseif ($encoding == static::ENCODING_PG) { + else if ($encoding == static::ENCODING_PG) { // @todo, using ascii armor on entire body. // should be a header field containing the public key. } diff --git a/common/base/classes/base_markup.php b/common/base/classes/base_markup.php index 297242f..b5ce1c6 100644 --- a/common/base/classes/base_markup.php +++ b/common/base/classes/base_markup.php @@ -1337,7 +1337,7 @@ class c_base_markup_tag extends c_base_return { if (is_int($this->attributes[$attribute])) { return c_base_return_int::s_new($this->attributes[$attribute]); } - elseif (is_null($this->attributes[$attribute])) { + else if (is_null($this->attributes[$attribute])) { return new c_base_return_null(); } break; @@ -1555,7 +1555,7 @@ class c_base_markup_tag extends c_base_return { if ($type === c_base_markup_filters::FILTER_TEXT) { return $this->pr_check_attribute_as_text($sanitize); } - elseif ($type === c_base_markup_filters::FILTER_NUMERIC) { + else if ($type === c_base_markup_filters::FILTER_NUMERIC) { return $this->pr_check_attribute_as_numeric($sanitize); } @@ -1952,7 +1952,7 @@ class c_base_markup_tag extends c_base_return { if (is_string($this->attributes[$attribute])) { $value = $this->attributes[$attribute]; } - elseif (is_numeric($this->attributes[$attribute])) { + else if (is_numeric($this->attributes[$attribute])) { $value = (string) $this->attributes[$attribute]; } else { diff --git a/common/base/classes/base_menu.php b/common/base/classes/base_menu.php index 3636efc..337ac1f 100644 --- a/common/base/classes/base_menu.php +++ b/common/base/classes/base_menu.php @@ -48,19 +48,19 @@ class c_base_menu extends c_base_return { $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'http', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); return c_base_return_error::s_false($error); } - elseif (!($database instanceof c_base_database)) { + else if (!($database instanceof c_base_database)) { $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'database', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); return c_base_return_error::s_false($error); } - elseif (!($session instanceof c_base_session)) { + else if (!($session instanceof c_base_session)) { $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'session', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); return c_base_return_error::s_false($error); } - elseif (!is_array($settings)) { + else if (!is_array($settings)) { $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'settings', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); return c_base_return_error::s_false($error); } - elseif (!is_null($items) && !is_array($items)) { + else if (!is_null($items) && !is_array($items)) { $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'items', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); return c_base_return_error::s_false($error); } diff --git a/common/base/classes/base_mime.php b/common/base/classes/base_mime.php index 29b7c78..d26980e 100644 --- a/common/base/classes/base_mime.php +++ b/common/base/classes/base_mime.php @@ -327,37 +327,37 @@ class c_base_mime { return c_base_return_array::s_new(static::$s_names_provided[$id]); } } - elseif ($category == static::CATEGORY_TEXT) { + else if ($category == static::CATEGORY_TEXT) { if (array_key_exists($id, static::$s_names_text)) { return c_base_return_array::s_new(static::$s_names_text[$id]); } } - elseif ($category == static::CATEGORY_IMAGE) { + else if ($category == static::CATEGORY_IMAGE) { if (array_key_exists($id, static::$s_names_text)) { return c_base_return_array::s_new(static::$s_names_text[$id]); } } - elseif ($category == static::CATEGORY_AUDIO) { + else if ($category == static::CATEGORY_AUDIO) { if (array_key_exists($id, static::$s_names_audio)) { return c_base_return_array::s_new(static::$s_names_audio[$id]); } } - elseif ($category == static::CATEGORY_VIDEO) { + else if ($category == static::CATEGORY_VIDEO) { if (array_key_exists($id, static::$s_names_video)) { return c_base_return_array::s_new(static::$s_names_video[$id]); } } - elseif ($category == static::CATEGORY_DOCUMENT) { + else if ($category == static::CATEGORY_DOCUMENT) { if (array_key_exists($id, static::$s_names_document)) { return c_base_return_array::s_new(static::$s_names_document[$id]); } } - elseif ($category == static::CATEGORY_CONTAINER) { + else if ($category == static::CATEGORY_CONTAINER) { if (array_key_exists($id, static::$s_names_container)) { return c_base_return_array::s_new(static::$s_names_container[$id]); } } - elseif ($category == static::CATEGORY_APPLICATION) { + else if ($category == static::CATEGORY_APPLICATION) { if (array_key_exists($id, static::$s_names_application)) { return c_base_return_array::s_new(static::$s_names_application[$id]); } @@ -435,133 +435,133 @@ class c_base_mime { if ($parts[1] == '*') { // nothing to change. } - elseif ($parts[1] == 'html') { + else if ($parts[1] == 'html') { $information['id_type'] = static::TYPE_TEXT_HTML; } - elseif ($parts[1] == 'plain') { + else if ($parts[1] == 'plain') { $information['id_type'] = static::TYPE_TEXT_PLAIN; } - elseif ($parts[1] == 'calendar') { + else if ($parts[1] == 'calendar') { $information['id_type'] = static::TYPE_TEXT_ICAL; } - elseif ($parts[1] == 'csv') { + else if ($parts[1] == 'csv') { $information['id_type'] = static::TYPE_TEXT_CSV; } - elseif ($parts[1] == 'xml') { + else if ($parts[1] == 'xml') { $information['id_type'] = static::TYPE_TEXT_XML; } - elseif ($parts[1] == 'css') { + else if ($parts[1] == 'css') { $information['id_type'] = static::TYPE_TEXT_CSS; } - elseif ($parts[1] == 'rtf') { + else if ($parts[1] == 'rtf') { $information['id_type'] = static::TYPE_TEXT_RICH; } - elseif ($parts[1] == 'javascript') { + else if ($parts[1] == 'javascript') { $information['id_type'] = static::TYPE_TEXT_JS; } else { $information['id_type'] = static::TYPE_UNKNOWN; } } - elseif ($parts[0] == 'application') { + else if ($parts[0] == 'application') { $information['id_category'] = static::CATEGORY_APPLICATION; if ($parts[1] == '*') { // nothing to change. } - elseif ($parts[1] == 'octet-stream') { + else if ($parts[1] == 'octet-stream') { $information['id_category'] = static::CATEGORY_STREAM; $information['id_type'] = static::TYPE_STREAM; } - elseif ($parts[1] == 'pdf') { + else if ($parts[1] == 'pdf') { $information['id_category'] = static::CATEGORY_DOCUMENT; $information['id_type'] = static::TYPE_APPLICATION_PDF; } - elseif ($parts[1] == 'rss' || $parts[1] == 'rss+xml' || $parts[1] == 'rdf+xml' || $parts[1] == 'atom+xml') { + else if ($parts[1] == 'rss' || $parts[1] == 'rss+xml' || $parts[1] == 'rdf+xml' || $parts[1] == 'atom+xml') { $information['id_category'] = static::CATEGORY_TEXT; $information['id_type'] = static::TYPE_TEXT_RSS; } - elseif ($parts[1] == 'xml') { + else if ($parts[1] == 'xml') { $information['id_category'] = static::CATEGORY_TEXT; $information['id_type'] = static::TYPE_TEXT_XML; } - elseif ($parts[1] == 'javascript') { + else if ($parts[1] == 'javascript') { $information['id_category'] = static::CATEGORY_TEXT; $information['id_type'] = static::TYPE_TEXT_JS; } - elseif ($parts[1] == 'json') { + else if ($parts[1] == 'json') { $information['id_category'] = static::CATEGORY_TEXT; $information['id_type'] = static::TYPE_TEXT_JSON; } - elseif ($parts[1] == 'xhtml' || $parts[1] == 'xhtml+xml') { + else if ($parts[1] == 'xhtml' || $parts[1] == 'xhtml+xml') { $information['id_category'] = static::CATEGORY_TEXT; $information['id_type'] = static::TYPE_TEXT_XHTML; } - elseif ($parts[1] == 'ps') { + else if ($parts[1] == 'ps') { $information['id_category'] = static::CATEGORY_TEXT; $information['id_type'] = static::TYPE_TEXT_PS; } - elseif ($parts[1] == 'tar') { + else if ($parts[1] == 'tar') { $information['id_category'] = static::CATEGORY_CONTAINER; $information['id_type'] = static::TYPE_CONTAINER_TAR; } - elseif ($parts[1] == 'cpio') { + else if ($parts[1] == 'cpio') { $information['id_category'] = static::CATEGORY_CONTAINER; $information['id_type'] = static::TYPE_CONTAINER_CPIO; } - elseif ($parts[1] == 'vnd.oasis.opendocument.chart') { + else if ($parts[1] == 'vnd.oasis.opendocument.chart') { $information['id_category'] = static::CATEGORY_DOCUMENT; $information['id_type'] = static::TYPE_DOCUMENT_LIBRECHART; } - elseif ($parts[1] == 'vnd.oasis.opendocument.formula') { + else if ($parts[1] == 'vnd.oasis.opendocument.formula') { $information['id_category'] = static::CATEGORY_DOCUMENT; $information['id_type'] = static::TYPE_DOCUMENT_LIBREFORMULA; } - elseif ($parts[1] == 'vnd.oasis.opendocument.graphics') { + else if ($parts[1] == 'vnd.oasis.opendocument.graphics') { $information['id_category'] = static::CATEGORY_DOCUMENT; $information['id_type'] = static::TYPE_DOCUMENT_LIBREGRAPHIC; } - elseif ($parts[1] == 'vnd.oasis.opendocument.presentation') { + else if ($parts[1] == 'vnd.oasis.opendocument.presentation') { $information['id_category'] = static::CATEGORY_DOCUMENT; $information['id_type'] = static::TYPE_DOCUMENT_LIBREPRESENTATION; } - elseif ($parts[1] == 'vnd.oasis.opendocument.spreadsheet') { + else if ($parts[1] == 'vnd.oasis.opendocument.spreadsheet') { $information['id_category'] = static::CATEGORY_DOCUMENT; $information['id_type'] = static::TYPE_DOCUMENT_LIBRESPREADSHEET; } - elseif ($parts[1] == 'vnd.oasis.opendocument.text') { + else if ($parts[1] == 'vnd.oasis.opendocument.text') { $information['id_category'] = static::CATEGORY_DOCUMENT; $information['id_type'] = static::TYPE_DOCUMENT_LIBRETEXT; } - elseif ($parts[1] == 'vnd.oasis.opendocument.text-web') { + else if ($parts[1] == 'vnd.oasis.opendocument.text-web') { $information['id_category'] = static::CATEGORY_DOCUMENT; $information['id_type'] = static::TYPE_DOCUMENT_LIBREHTML; } - elseif ($parts[1] == 'abiword' || $parts[1] == 'abiword-compressed') { + else if ($parts[1] == 'abiword' || $parts[1] == 'abiword-compressed') { $information['id_category'] = static::CATEGORY_DOCUMENT; $information['id_type'] = static::TYPE_DOCUMENT_ABIWORD; } - elseif ($parts[1] == 'msword' || $parts[1] == 'vnd.openxmlformats-officedocument.wordprocessingml.document') { + else if ($parts[1] == 'msword' || $parts[1] == 'vnd.openxmlformats-officedocument.wordprocessingml.document') { $information['id_category'] = static::CATEGORY_DOCUMENT; $information['id_type'] = static::TYPE_DOCUMENT_MSWORD; } - elseif ($parts[1] == 'ms-excel' || $parts[1] == 'vnd.openxmlformats-officedocument.spreadsheetml.sheet') { + else if ($parts[1] == 'ms-excel' || $parts[1] == 'vnd.openxmlformats-officedocument.spreadsheetml.sheet') { $information['id_category'] = static::CATEGORY_DOCUMENT; $information['id_type'] = static::TYPE_DOCUMENT_MSEXCEL; } - elseif ($parts[1] == 'ms-powerpoint' || $parts[1] == 'vnd.openxmlformats-officedocument.presentationml.presentation') { + else if ($parts[1] == 'ms-powerpoint' || $parts[1] == 'vnd.openxmlformats-officedocument.presentationml.presentation') { $information['id_category'] = static::CATEGORY_DOCUMENT; $information['id_type'] = static::TYPE_DOCUMENT_MSPOWERPOINT; } - elseif ($parts[1] == 'java') { + else if ($parts[1] == 'java') { $information['id_category'] = static::CATEGORY_CONTAINER; $information['id_type'] = static::TYPE_CONTAINER_JAVA; } - elseif ($parts[1] == 'ocsp-request') { + else if ($parts[1] == 'ocsp-request') { $information['id_category'] = static::CATEGORY_APPLICATION; $information['id_type'] = static::TYPE_PACKET_OCSP_REQUEST; } - elseif ($parts[1] == 'ocsp-response') { + else if ($parts[1] == 'ocsp-response') { $information['id_category'] = static::CATEGORY_APPLICATION; $information['id_type'] = static::TYPE_PACKET_OCSP_RESPONSE; } @@ -569,84 +569,84 @@ class c_base_mime { $information['id_type'] = static::TYPE_UNKNOWN; } } - elseif ($parts[0] == 'image') { + else if ($parts[0] == 'image') { $information['id_category'] = static::CATEGORY_IMAGE; if ($parts[1] == '*') { // nothing to change. } - elseif ($parts[1] == 'png') { + else if ($parts[1] == 'png') { $information['id_type'] = static::TYPE_IMAGE_PNG; } - elseif ($parts[1] == 'jpeg' || $parts[1] == 'jpg' || $parts[1] == 'jpx') { + else if ($parts[1] == 'jpeg' || $parts[1] == 'jpg' || $parts[1] == 'jpx') { $information['id_type'] = static::TYPE_IMAGE_JPEG; } - elseif ($parts[1] == 'gif') { + else if ($parts[1] == 'gif') { $information['id_type'] = static::TYPE_IMAGE_GIF; } - elseif ($parts[1] == 'bmp') { + else if ($parts[1] == 'bmp') { $information['id_type'] = static::TYPE_IMAGE_BMP; } - elseif ($parts[1] == 'svg') { + else if ($parts[1] == 'svg') { $information['id_type'] = static::TYPE_IMAGE_SVG; } - elseif ($parts[1] == 'tiff' || $parts[1] == 'tiff-fx') { + else if ($parts[1] == 'tiff' || $parts[1] == 'tiff-fx') { $information['id_type'] = static::TYPE_IMAGE_TIFF; } else { $information['id_type'] = static::TYPE_UNKNOWN; } } - elseif ($parts[0] == 'audio') { + else if ($parts[0] == 'audio') { $information['id_category'] = static::CATEGORY_AUDIO; if ($parts[1] == '*') { // nothing to change. } - elseif ($parts[1] == 'ogg') { + else if ($parts[1] == 'ogg') { $information['id_type'] = static::TYPE_AUDIO_OGG; } - elseif ($parts[1] == 'mpeg') { + else if ($parts[1] == 'mpeg') { $information['id_type'] = static::TYPE_AUDIO_MP3; } - elseif ($parts[1] == 'mp4') { + else if ($parts[1] == 'mp4') { $information['id_type'] = static::TYPE_AUDIO_MP4; } - elseif ($parts[1] == 'wav') { + else if ($parts[1] == 'wav') { $information['id_type'] = static::TYPE_AUDIO_WAV; } - elseif ($parts[1] == 'midi') { + else if ($parts[1] == 'midi') { $information['id_type'] = static::TYPE_AUDIO_MIDI; } else { $information['id_type'] = static::TYPE_UNKNOWN; } } - elseif ($parts[0] == 'video') { + else if ($parts[0] == 'video') { $information['id_category'] = static::CATEGORY_VIDEO; if ($parts[1] == '*') { // nothing to change. } - elseif ($parts[1] == 'mp4' || $parts[1] == 'mpeg') { + else if ($parts[1] == 'mp4' || $parts[1] == 'mpeg') { $information['id_type'] = static::TYPE_VIDEO_MPEG; } - elseif ($parts[1] == 'ogg') { + else if ($parts[1] == 'ogg') { $information['id_type'] = static::TYPE_VIDEO_OGG; } - elseif ($parts[1] == 'h264') { + else if ($parts[1] == 'h264') { $information['id_type'] = static::TYPE_VIDEO_H264; } - elseif ($parts[1] == 'quicktime') { + else if ($parts[1] == 'quicktime') { $information['id_type'] = static::TYPE_VIDEO_QUICKTIME; } - elseif ($parts[1] == 'dv') { + else if ($parts[1] == 'dv') { $information['id_type'] = static::TYPE_VIDEO_DV; } - elseif ($parts[1] == 'jpeg' || $parts[1] == 'jpeg2000') { + else if ($parts[1] == 'jpeg' || $parts[1] == 'jpeg2000') { $information['id_type'] = static::TYPE_VIDEO_JPEG; } - elseif ($parts[1] == 'webm') { + else if ($parts[1] == 'webm') { $information['id_type'] = static::TYPE_VIDEO_WEBM; } else { diff --git a/common/base/classes/base_path.php b/common/base/classes/base_path.php index f660317..19b2476 100644 --- a/common/base/classes/base_path.php +++ b/common/base/classes/base_path.php @@ -1409,7 +1409,7 @@ class c_base_path extends c_base_return_string { if ($type == ':') { $sanitized = $replacement; } - elseif ($type == '@') { + else if ($type == '@') { $sanitized = htmlspecialchars($replacement, $this->sanitize_html['flags'], $this->sanitize_html['encoding']); } else { diff --git a/common/base/classes/base_paths.php b/common/base/classes/base_paths.php index 8e148b0..f3e7251 100644 --- a/common/base/classes/base_paths.php +++ b/common/base/classes/base_paths.php @@ -371,7 +371,7 @@ class c_base_paths extends c_base_return { $path_tree = &$path_tree['paths'][$path_part]; $depth_current++; } - elseif (array_key_exists('%', $path_tree['paths'])) { + else if (array_key_exists('%', $path_tree['paths'])) { $path_tree = &$path_tree['paths']['%']; $depth_current++; } diff --git a/common/base/classes/base_query_alter_domain.php b/common/base/classes/base_query_alter_domain.php deleted file mode 100644 index 5e59587..0000000 --- a/common/base/classes/base_query_alter_domain.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_alter_group.php b/common/base/classes/base_query_alter_group.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_alter_group.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_alter_index.php b/common/base/classes/base_query_alter_index.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_alter_index.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_alter_language.php b/common/base/classes/base_query_alter_language.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_alter_language.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_alter_large_object.php b/common/base/classes/base_query_alter_large_object.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_alter_large_object.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_alter_materialized_view.php b/common/base/classes/base_query_alter_materialized_view.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_alter_materialized_view.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_alter_operator.php b/common/base/classes/base_query_alter_operator.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_alter_operator.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_alter_operator_class.php b/common/base/classes/base_query_alter_operator_class.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_alter_operator_class.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_alter_operator_family.php b/common/base/classes/base_query_alter_operator_family.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_alter_operator_family.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_alter_policy.php b/common/base/classes/base_query_alter_policy.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_alter_policy.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_alter_publication.php b/common/base/classes/base_query_alter_publication.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_alter_publication.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_alter_role.php b/common/base/classes/base_query_alter_role.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_alter_role.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_alter_rule.php b/common/base/classes/base_query_alter_rule.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_alter_rule.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_alter_schema.php b/common/base/classes/base_query_alter_schema.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_alter_schema.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_alter_table.php b/common/base/classes/base_query_alter_table.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_alter_table.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_alter_tablespace.php b/common/base/classes/base_query_alter_tablespace.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_alter_tablespace.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_alter_text_search_configuration.php b/common/base/classes/base_query_alter_text_search_configuration.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_alter_text_search_configuration.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_alter_text_search_dictionary.php b/common/base/classes/base_query_alter_text_search_dictionary.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_alter_text_search_dictionary.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_alter_text_search_parser.php b/common/base/classes/base_query_alter_text_search_parser.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_alter_text_search_parser.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_alter_text_search_template.php b/common/base/classes/base_query_alter_text_search_template.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_alter_text_search_template.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_alter_trigger.php b/common/base/classes/base_query_alter_trigger.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_alter_trigger.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_alter_type.php b/common/base/classes/base_query_alter_type.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_alter_type.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_alter_user.php b/common/base/classes/base_query_alter_user.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_alter_user.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_alter_user_mapping.php b/common/base/classes/base_query_alter_user_mapping.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_alter_user_mapping.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_alter_view.php b/common/base/classes/base_query_alter_view.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_alter_view.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_analyze.php b/common/base/classes/base_query_analyze.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_analyze.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_begin.php b/common/base/classes/base_query_begin.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_begin.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_checkpoint.php b/common/base/classes/base_query_checkpoint.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_checkpoint.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_close.php b/common/base/classes/base_query_close.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_close.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_cluster.php b/common/base/classes/base_query_cluster.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_cluster.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_comment.php b/common/base/classes/base_query_comment.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_comment.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_commit.php b/common/base/classes/base_query_commit.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_commit.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_commit_prepared.php b/common/base/classes/base_query_commit_prepared.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_commit_prepared.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_copy.php b/common/base/classes/base_query_copy.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_copy.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_create_access_method.php b/common/base/classes/base_query_create_access_method.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_create_access_method.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_create_aggregate.php b/common/base/classes/base_query_create_aggregate.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_create_aggregate.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_create_cast.php b/common/base/classes/base_query_create_cast.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_create_cast.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_create_collation.php b/common/base/classes/base_query_create_collation.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_create_collation.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_create_conversion.php b/common/base/classes/base_query_create_conversion.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_create_conversion.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_create_database.php b/common/base/classes/base_query_create_database.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_create_database.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_create_domain.php b/common/base/classes/base_query_create_domain.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_create_domain.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_create_event_trigger.php b/common/base/classes/base_query_create_event_trigger.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_create_event_trigger.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_create_extension.php b/common/base/classes/base_query_create_extension.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_create_extension.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_create_foreign.php b/common/base/classes/base_query_create_foreign.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_create_foreign.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_create_foreign_data_wrapper.php b/common/base/classes/base_query_create_foreign_data_wrapper.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_create_foreign_data_wrapper.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_create_function.php b/common/base/classes/base_query_create_function.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_create_function.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_create_group.php b/common/base/classes/base_query_create_group.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_create_group.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_create_index.php b/common/base/classes/base_query_create_index.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_create_index.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_create_language.php b/common/base/classes/base_query_create_language.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_create_language.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_create_materialized_view.php b/common/base/classes/base_query_create_materialized_view.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_create_materialized_view.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_create_operator.php b/common/base/classes/base_query_create_operator.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_create_operator.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_create_operator_class.php b/common/base/classes/base_query_create_operator_class.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_create_operator_class.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_create_operator_family.php b/common/base/classes/base_query_create_operator_family.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_create_operator_family.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_create_policy.php b/common/base/classes/base_query_create_policy.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_create_policy.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_create_publication.php b/common/base/classes/base_query_create_publication.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_create_publication.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_create_role.php b/common/base/classes/base_query_create_role.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_create_role.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_create_rule.php b/common/base/classes/base_query_create_rule.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_create_rule.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_create_schema.php b/common/base/classes/base_query_create_schema.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_create_schema.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_create_sequence.php b/common/base/classes/base_query_create_sequence.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_create_sequence.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_create_server.php b/common/base/classes/base_query_create_server.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_create_server.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_create_statistics.php b/common/base/classes/base_query_create_statistics.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_create_statistics.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_create_subscription.php b/common/base/classes/base_query_create_subscription.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_create_subscription.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_create_table.php b/common/base/classes/base_query_create_table.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_create_table.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_create_table_as.php b/common/base/classes/base_query_create_table_as.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_create_table_as.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_create_tablespace.php b/common/base/classes/base_query_create_tablespace.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_create_tablespace.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_create_text_search_configuration.php b/common/base/classes/base_query_create_text_search_configuration.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_create_text_search_configuration.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_create_text_search_dictionary.php b/common/base/classes/base_query_create_text_search_dictionary.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_create_text_search_dictionary.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_create_text_search_parser.php b/common/base/classes/base_query_create_text_search_parser.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_create_text_search_parser.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_create_text_search_template.php b/common/base/classes/base_query_create_text_search_template.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_create_text_search_template.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_create_transform.php b/common/base/classes/base_query_create_transform.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_create_transform.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_create_trigger.php b/common/base/classes/base_query_create_trigger.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_create_trigger.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_create_type.php b/common/base/classes/base_query_create_type.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_create_type.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_create_user.php b/common/base/classes/base_query_create_user.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_create_user.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_create_user_mapping.php b/common/base/classes/base_query_create_user_mapping.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_create_user_mapping.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_create_view.php b/common/base/classes/base_query_create_view.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_create_view.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_deallocate.php b/common/base/classes/base_query_deallocate.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_deallocate.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_declare.php b/common/base/classes/base_query_declare.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_declare.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_delete.php b/common/base/classes/base_query_delete.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_delete.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_discard.php b/common/base/classes/base_query_discard.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_discard.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_do.php b/common/base/classes/base_query_do.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_do.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_drop_access_method.php b/common/base/classes/base_query_drop_access_method.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_drop_access_method.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_drop_aggregate.php b/common/base/classes/base_query_drop_aggregate.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_drop_aggregate.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_drop_cast.php b/common/base/classes/base_query_drop_cast.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_drop_cast.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_drop_collation.php b/common/base/classes/base_query_drop_collation.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_drop_collation.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_drop_conversion.php b/common/base/classes/base_query_drop_conversion.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_drop_conversion.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_drop_database.php b/common/base/classes/base_query_drop_database.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_drop_database.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_drop_domain.php b/common/base/classes/base_query_drop_domain.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_drop_domain.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_drop_event_trigger.php b/common/base/classes/base_query_drop_event_trigger.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_drop_event_trigger.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_drop_extension.php b/common/base/classes/base_query_drop_extension.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_drop_extension.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_drop_foreign_data_wrapper.php b/common/base/classes/base_query_drop_foreign_data_wrapper.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_drop_foreign_data_wrapper.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_drop_foreign_table.php b/common/base/classes/base_query_drop_foreign_table.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_drop_foreign_table.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_drop_function.php b/common/base/classes/base_query_drop_function.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_drop_function.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_drop_group.php b/common/base/classes/base_query_drop_group.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_drop_group.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_drop_index.php b/common/base/classes/base_query_drop_index.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_drop_index.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_drop_language.php b/common/base/classes/base_query_drop_language.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_drop_language.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_drop_materialized_view.php b/common/base/classes/base_query_drop_materialized_view.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_drop_materialized_view.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_drop_operator.php b/common/base/classes/base_query_drop_operator.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_drop_operator.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_drop_operator_class.php b/common/base/classes/base_query_drop_operator_class.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_drop_operator_class.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_drop_operator_family.php b/common/base/classes/base_query_drop_operator_family.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_drop_operator_family.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_drop_owned.php b/common/base/classes/base_query_drop_owned.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_drop_owned.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_drop_policy.php b/common/base/classes/base_query_drop_policy.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_drop_policy.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_drop_publication.php b/common/base/classes/base_query_drop_publication.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_drop_publication.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_drop_role.php b/common/base/classes/base_query_drop_role.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_drop_role.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_drop_rule.php b/common/base/classes/base_query_drop_rule.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_drop_rule.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_drop_schema.php b/common/base/classes/base_query_drop_schema.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_drop_schema.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_drop_sequence.php b/common/base/classes/base_query_drop_sequence.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_drop_sequence.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_drop_server.php b/common/base/classes/base_query_drop_server.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_drop_server.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_drop_statistics.php b/common/base/classes/base_query_drop_statistics.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_drop_statistics.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_drop_subscription.php b/common/base/classes/base_query_drop_subscription.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_drop_subscription.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_drop_table.php b/common/base/classes/base_query_drop_table.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_drop_table.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_drop_tablespace.php b/common/base/classes/base_query_drop_tablespace.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_drop_tablespace.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_drop_text_search_configuration.php b/common/base/classes/base_query_drop_text_search_configuration.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_drop_text_search_configuration.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_drop_text_search_dictionary.php b/common/base/classes/base_query_drop_text_search_dictionary.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_drop_text_search_dictionary.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_drop_text_search_parser.php b/common/base/classes/base_query_drop_text_search_parser.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_drop_text_search_parser.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_drop_text_search_template.php b/common/base/classes/base_query_drop_text_search_template.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_drop_text_search_template.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_drop_transform.php b/common/base/classes/base_query_drop_transform.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_drop_transform.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_drop_trigger.php b/common/base/classes/base_query_drop_trigger.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_drop_trigger.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_drop_type.php b/common/base/classes/base_query_drop_type.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_drop_type.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_drop_user.php b/common/base/classes/base_query_drop_user.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_drop_user.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_drop_user_mapping.php b/common/base/classes/base_query_drop_user_mapping.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_drop_user_mapping.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_drop_view.php b/common/base/classes/base_query_drop_view.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_drop_view.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_end.php b/common/base/classes/base_query_end.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_end.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_execute.php b/common/base/classes/base_query_execute.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_execute.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_explain.php b/common/base/classes/base_query_explain.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_explain.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_fetch.php b/common/base/classes/base_query_fetch.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_fetch.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_grant.php b/common/base/classes/base_query_grant.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_grant.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_import_foreign_schema.php b/common/base/classes/base_query_import_foreign_schema.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_import_foreign_schema.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_insert.php b/common/base/classes/base_query_insert.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_insert.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_listen.php b/common/base/classes/base_query_listen.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_listen.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_load.php b/common/base/classes/base_query_load.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_load.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_lock.php b/common/base/classes/base_query_lock.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_lock.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_move.php b/common/base/classes/base_query_move.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_move.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_notify.php b/common/base/classes/base_query_notify.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_notify.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_prepare.php b/common/base/classes/base_query_prepare.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_prepare.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_prepare_transaction.php b/common/base/classes/base_query_prepare_transaction.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_prepare_transaction.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_reassign_owned.php b/common/base/classes/base_query_reassign_owned.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_reassign_owned.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_refresh_materialized.php b/common/base/classes/base_query_refresh_materialized.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_refresh_materialized.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_reindex.php b/common/base/classes/base_query_reindex.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_reindex.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_release_savepoint.php b/common/base/classes/base_query_release_savepoint.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_release_savepoint.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_reset.php b/common/base/classes/base_query_reset.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_reset.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_revoke.php b/common/base/classes/base_query_revoke.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_revoke.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_rollback_prepared.php b/common/base/classes/base_query_rollback_prepared.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_rollback_prepared.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_rollback_to_savepoint.php b/common/base/classes/base_query_rollback_to_savepoint.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_rollback_to_savepoint.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_savepoint.php b/common/base/classes/base_query_savepoint.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_savepoint.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_security_label.php b/common/base/classes/base_query_security_label.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_security_label.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_select.php b/common/base/classes/base_query_select.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_select.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_select_into.php b/common/base/classes/base_query_select_into.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_select_into.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_set.php b/common/base/classes/base_query_set.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_set.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_set_constraints.php b/common/base/classes/base_query_set_constraints.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_set_constraints.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_set_role.php b/common/base/classes/base_query_set_role.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_set_role.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_set_session_authorization.php b/common/base/classes/base_query_set_session_authorization.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_set_session_authorization.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_set_transaction.php b/common/base/classes/base_query_set_transaction.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_set_transaction.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_show.php b/common/base/classes/base_query_show.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_show.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_start_transaction.php b/common/base/classes/base_query_start_transaction.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_start_transaction.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_string.php b/common/base/classes/base_query_string.php deleted file mode 100644 index 0034734..0000000 --- a/common/base/classes/base_query_string.php +++ /dev/null @@ -1,80 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_unlisten.php b/common/base/classes/base_query_unlisten.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_unlisten.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_update.php b/common/base/classes/base_query_update.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_update.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_vacuum.php b/common/base/classes/base_query_vacuum.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_vacuum.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_query_values.php b/common/base/classes/base_query_values.php deleted file mode 100644 index 9b81516..0000000 --- a/common/base/classes/base_query_values.php +++ /dev/null @@ -1,70 +0,0 @@ -value = NULL; - - // @todo - - return new c_base_return_true(); - } -} diff --git a/common/base/classes/base_return.php b/common/base/classes/base_return.php index 1e2f643..201d07c 100644 --- a/common/base/classes/base_return.php +++ b/common/base/classes/base_return.php @@ -154,10 +154,10 @@ class c_base_return { } unset($error_object); } - elseif (is_null($delta)) { + else if (is_null($delta)) { $this->errors[] = $error; } - elseif (is_int($delta) && $delta >= 0) { + else if (is_int($delta) && $delta >= 0) { $this->errors[$delta] = $error; } else { @@ -1493,7 +1493,7 @@ class c_base_return_error { if (is_null($error)) { $object_return->set_error(NULL); } - elseif (is_array($error)) { + else if (is_array($error)) { foreach ($error as $delta => $value) { $object_return->set_error($error, $delta); } @@ -1524,7 +1524,7 @@ class c_base_return_error { if (is_null($error)) { $object_return->set_error(null); } - elseif (is_array($error)) { + else if (is_array($error)) { foreach ($error as $delta => $value) { $object_return->set_error($error, $delta); } @@ -1555,7 +1555,7 @@ class c_base_return_error { if (is_null($error)) { $object_return->set_error(null); } - elseif (is_array($error)) { + else if (is_array($error)) { foreach ($error as $delta => $value) { $object_return->set_error($error, $delta); } @@ -1601,7 +1601,7 @@ class c_base_return_error { $object_return->set_error($object_error); unset($object_error); } - elseif (is_array($error)) { + else if (is_array($error)) { foreach ($error as $delta => $value) { $object_return->set_error($error, $delta); } @@ -1646,7 +1646,7 @@ class c_base_return_error { $object_return->set_error($object_error); unset($object_error); } - elseif (is_array($error)) { + else if (is_array($error)) { foreach ($error as $delta => $value) { $object_return->set_error($error, $delta); } diff --git a/common/base/classes/base_roles.php b/common/base/classes/base_roles.php index 6f6feca..14d9f5b 100644 --- a/common/base/classes/base_roles.php +++ b/common/base/classes/base_roles.php @@ -169,43 +169,43 @@ class c_base_roles extends c_base_return { $this->administer = FALSE; } } - elseif ($role === static::PUBLIC) { + else if ($role === static::PUBLIC) { $this->public = $value; } - elseif ($role === static::SYSTEM) { + else if ($role === static::SYSTEM) { $this->system = $value; } - elseif ($role === static::USER) { + else if ($role === static::USER) { $this->user = $value; } - elseif ($role === static::REQUESTER) { + else if ($role === static::REQUESTER) { $this->requester = $value; } - elseif ($role === static::DRAFTER) { + else if ($role === static::DRAFTER) { $this->drafter = $value; } - elseif ($role === static::EDITOR) { + else if ($role === static::EDITOR) { $this->editer = $value; } - elseif ($role === static::REVIEWER) { + else if ($role === static::REVIEWER) { $this->reviewer = $value; } - elseif ($role === static::INSURER) { + else if ($role === static::INSURER) { $this->insurer = $value; } - elseif ($role === static::FINANCER) { + else if ($role === static::FINANCER) { $this->financer = $value; } - elseif ($role === static::PUBLISHER) { + else if ($role === static::PUBLISHER) { $this->publisher = $value; } - elseif ($role === static::AUDITOR) { + else if ($role === static::AUDITOR) { $this->auditor = $value; } - elseif ($role === static::MANAGER) { + else if ($role === static::MANAGER) { $this->manager = $value; } - elseif ($role === static::ADMINISTER) { + else if ($role === static::ADMINISTER) { $this->administer = $value; } else { @@ -252,40 +252,40 @@ class c_base_roles extends c_base_return { if ($role === static::PUBLIC) { $this->public = TRUE; } - elseif ($role === static::SYSTEM) { + else if ($role === static::SYSTEM) { $this->system = TRUE; } - elseif ($role === static::USER) { + else if ($role === static::USER) { $this->user = TRUE; } - elseif ($role === static::REQUESTER) { + else if ($role === static::REQUESTER) { $this->requester = TRUE; } - elseif ($role === static::DRAFTER) { + else if ($role === static::DRAFTER) { $this->drafter = TRUE; } - elseif ($role === static::EDITOR) { + else if ($role === static::EDITOR) { $this->editer = TRUE; } - elseif ($role === static::REVIEWER) { + else if ($role === static::REVIEWER) { $this->reviewer = TRUE; } - elseif ($role === static::INSURER) { + else if ($role === static::INSURER) { $this->insurer = TRUE; } - elseif ($role === static::FINANCER) { + else if ($role === static::FINANCER) { $this->financer = TRUE; } - elseif ($role === static::PUBLISHER) { + else if ($role === static::PUBLISHER) { $this->publisher = TRUE; } - elseif ($role === static::AUDITOR) { + else if ($role === static::AUDITOR) { $this->auditor = TRUE; } - elseif ($role === static::MANAGER) { + else if ($role === static::MANAGER) { $this->manager = TRUE; } - elseif ($role === static::ADMINISTER) { + else if ($role === static::ADMINISTER) { $this->administer = TRUE; } } @@ -319,67 +319,67 @@ class c_base_roles extends c_base_return { return new c_base_return_true(); } } - elseif ($role === static::PUBLIC) { + else if ($role === static::PUBLIC) { if ($this->public) { return new c_base_return_true(); } } - elseif ($role === static::SYSTEM) { + else if ($role === static::SYSTEM) { if ($this->system) { return new c_base_return_true(); } } - elseif ($role === static::USER) { + else if ($role === static::USER) { if ($this->user) { return new c_base_return_true(); } } - elseif ($role === static::REQUESTER) { + else if ($role === static::REQUESTER) { if ($this->requester) { return new c_base_return_true(); } } - elseif ($role === static::DRAFTER) { + else if ($role === static::DRAFTER) { if ($this->drafter) { return new c_base_return_true(); } } - elseif ($role === static::EDITOR) { + else if ($role === static::EDITOR) { if ($this->editer) { return new c_base_return_true(); } } - elseif ($role === static::REVIEWER) { + else if ($role === static::REVIEWER) { if ($this->reviewer) { return new c_base_return_true(); } } - elseif ($role === static::FINANCER) { + else if ($role === static::FINANCER) { if ($this->financer) { return new c_base_return_true(); } } - elseif ($role === static::INSURER) { + else if ($role === static::INSURER) { if ($this->insurer) { return new c_base_return_true(); } } - elseif ($role === static::PUBLISHER) { + else if ($role === static::PUBLISHER) { if ($this->publisher) { return new c_base_return_true(); } } - elseif ($role === static::AUDITOR) { + else if ($role === static::AUDITOR) { if ($this->auditor) { return new c_base_return_true(); } } - elseif ($role === static::MANAGER) { + else if ($role === static::MANAGER) { if ($this->manager) { return new c_base_return_true(); } } - elseif ($role === static::ADMINISTER) { + else if ($role === static::ADMINISTER) { if ($this->administer) { return new c_base_return_true(); } diff --git a/common/base/classes/base_session.php b/common/base/classes/base_session.php index c164e63..c7bf923 100644 --- a/common/base/classes/base_session.php +++ b/common/base/classes/base_session.php @@ -1234,7 +1234,7 @@ class c_base_session extends c_base_return { return c_base_return_error::s_false($error); } - elseif (empty($response['result']) || !is_array($response['result'])) { + else if (empty($response['result']) || !is_array($response['result'])) { unset($response); $error = c_base_error::s_log(NULL, ['arguments' => [':{operation_name}' => 'this->p_transfer', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::OPERATION_FAILURE); @@ -1375,7 +1375,7 @@ class c_base_session extends c_base_return { $error = c_base_error::s_log(NULL, ['arguments' => [':{operation_name}' => 'socket_write', ':{socket_error}' => $this->socket_error, ':{socket_error_message}' => @socket_strerror($this->socket_error), ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::SOCKET_FAILURE); return c_base_return_error::s_false($error); } - elseif ($written == 0) { + else if ($written == 0) { unset($written); $error = c_base_error::s_log(NULL, ['arguments' => [':{operation_name}' => 'socket_write', ':{socket_error}' => NULL, ':{socket_error_message}' => 'No bytes written.', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::SOCKET_FAILURE); diff --git a/common/base/traits/base_query.php b/common/base/traits/base_query.php deleted file mode 100644 index c6eb14e..0000000 --- a/common/base/traits/base_query.php +++ /dev/null @@ -1,746 +0,0 @@ -query_owner_to = NULL; - $this->query_owner_to_user_name = NULL; - return new c_base_return_true(); - } - - if (!is_int($owner_to)) { - $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'owner_to', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); - return c_base_return_error::s_false($error); - } - - if ($owner_type == c_base_query_code_user::USER_NAME) { - if (!is_null($user_name) && !is_string($user_name)) { - $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'user_name', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); - return c_base_return_error::s_false($error); - } - - $this->query_owner_to = $owner_to; - $this->query_owner_to_user_name = $user_name; - return new c_base_return_true(); - } - - if (!is_null($user_name)) { - $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'user_name', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); - return c_base_return_error::s_false($error); - } - - $this->query_owner_to = $owner_to; - $this->query_owner_to_user_name = NULL; - - if ($owner_type == c_base_query_code_user::USER_CURRENT) { - $this->query_owner_to_user_name = c_base_query_string::USER_CURRENT; - } - elseif ($owner_type == c_base_query_code_user::USER_SESSION) { - $this->query_owner_to_user_name = c_base_query_string::USER_SESSION; - } - - return new c_base_return_true(); - } - - /** - * Get the currently assigned sql owner to. - * - * @return c_base_return_int|c_base_return_null - * A (c_base_query_code_user) code representing the owner on success. - * NULL without error bit set is returned if not assigned. - * NULL with the error bit set is returned on error. - */ - public function get_query_owner_to() { - if (is_null($this->query_owner_to)) { - return new c_base_return_null(); - } - - if (is_int($this->query_owner_to)) { - return c_base_return_int::s_new($this->query_owner_to); - } - - $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_owner_to', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); - return c_base_return_error::s_null($error); - } - - /** - * Get the currently assigned sql owner to specified name. - * - * @return c_base_return_string|c_base_return_null - * An owner to name on success. - * NULL without error bit set is returned if not assigned. - * NULL with the error bit set is returned on error. - */ - public function get_query_owner_to_user_name() { - if (is_null($this->query_owner_to_user_name)) { - return new c_base_return_null(); - } - - if (is_string($this->query_owner_to_user_name)) { - return c_base_return_string::s_new($this->query_owner_to_user_name); - } - - $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_owner_to_user_name', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); - return c_base_return_error::s_null($error); - } -} - -/** - * Provide the sql RENAME TO functionality. - */ -trait t_base_query_rename_to { - protected $query_rename_to; - - /** - * Set the RENAME TO settings. - * - * @param string|null $rename_to - * The name to rename to. - * Set to NULL to disable. - * - * @return c_base_return_status - * TRUE on success, FALSE otherwise. - * FALSE with the error bit set is returned on error. - */ - public function set_query_rename_to($rename_to) { - if (!is_null($rename_to) && !is_string($rename_to)) { - $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'rename_to', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); - return c_base_return_error::s_false($error); - } - - $this->query_rename_to = $rename_to; - return new c_base_return_true(); - } - - /** - * Get the currently assigned name to rename to. - * - * @return c_base_return_string|c_base_return_null - * A name on success. - * NULL is returned if not set (rename to is not to be used). - * NULL with the error bit set is returned on error. - */ - public function get_query_rename_to() { - if (is_null($this->query_rename_to)) { - return new c_base_return_null(); - } - - if (is_string($this->query_rename_to)) { - return c_base_return_string::s_new($this->query_rename_to); - } - - $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_rename_to', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); - return c_base_return_error::s_null($error); - } -} - -/** - * Provide the sql SET SCHEMA functionality. - */ -trait t_base_query_set_schema { - protected $query_set_schema; - - /** - * Set the RENAME TO settings. - * - * @param string|null $set_schema - * The name to rename to. - * Set to NULL to disable. - * - * @return c_base_return_status - * TRUE on success, FALSE otherwise. - * FALSE with the error bit set is returned on error. - */ - public function set_query_set_schema($set_schema) { - if (!is_null($set_schema) && !is_string($set_schema)) { - $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'set_schema', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); - return c_base_return_error::s_false($error); - } - - $this->query_set_schema = $set_schema; - return new c_base_return_true(); - } - - /** - * Get the currently assigned schema name to set to. - * - * @return c_base_return_string|c_base_return_null - * A schema name on success. - * NULL is returned if not set (set schema is not to be used). - * NULL with the error bit set is returned on error. - */ - public function get_query_set_schema() { - if (is_null($this->query_set_schema)) { - return new c_base_return_null(); - } - - if (is_string($this->query_set_schema)) { - return c_base_return_string::s_new($this->query_set_schema); - } - - $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_set_schema', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); - return c_base_return_error::s_null($error); - } -} - -/** - * Provide the sql ORDER BY functionality. - */ -trait t_base_query_order_by { - protected $query_order_by; - - /** - * Set the ORDER BY settings. - * - * @param string|null $order_by - * The name to rename to. - * Set to NULL to disable. - * - * @return c_base_return_status - * TRUE on success, FALSE otherwise. - * FALSE with the error bit set is returned on error. - */ - public function set_query_order_by($order_by) { - if (is_null($order_by)) { - $this->query_order_by = NULL; - return new c_base_return_true(); - } - - if (is_string($order_by)) { - $this->query_order_by = $order_by; - return new c_base_return_true(); - } - - $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'order_by', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); - return c_base_return_error::s_false($error); - } - - /** - * Get the currently assigned name to rename to. - * - * @return c_base_return_string|c_base_return_null - * A name on success. - * NULL is returned if not set (rename to is not to be used). - * NULL with the error bit set is returned on error. - */ - public function get_query_order_by() { - if (is_null($this->query_order_by)) { - return new c_base_return_null(); - } - - if (is_string($this->query_order_by)) { - return c_base_return_string::s_new($this->query_order_by); - } - - $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_order_by', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); - return c_base_return_error::s_null($error); - } -} - -/** - * Provide the sql GROUP BY functionality. - */ -trait t_base_query_group_by { - protected $query_group_by; - - /** - * Set the RENAME TO settings. - * - * @param string|null $group_by - * The name to rename to. - * Set to NULL to disable. - * - * @return c_base_return_status - * TRUE on success, FALSE otherwise. - * FALSE with the error bit set is returned on error. - */ - public function set_query_group_by($group_by) { - if (is_null($group_by)) { - $this->query_group_by = NULL; - return new c_base_return_true(); - } - - if (is_string($group_by)) { - $this->query_group_by = $group_by; - return new c_base_return_true(); - } - - $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'group_by', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); - return c_base_return_error::s_false($error); - } - - /** - * Get the currently assigned name to rename to. - * - * @return c_base_return_string|c_base_return_null - * A name on success. - * NULL is returned if not set (rename to is not to be used). - * NULL with the error bit set is returned on error. - */ - public function get_query_group_by() { - if (is_null($this->query_group_by)) { - return new c_base_return_null(); - } - - if (is_string($this->query_group_by)) { - return c_base_return_string::s_new($this->query_group_by); - } - - $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_group_by', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); - return c_base_return_error::s_null($error); - } -} - - -/** - * Provide the sql NAME functionality. - */ -trait t_base_query_name { - protected $query_name; - - /** - * Set the NAME settings. - * - * @param string|null $name - * The name to use. - * Set to NULL to disable. - * - * @return c_base_return_status - * TRUE on success, FALSE otherwise. - * FALSE with the error bit set is returned on error. - */ - public function set_query_name($name) { - if (is_null($name)) { - $this->query_name = NULL; - return new c_base_return_true(); - } - - if (is_string($name)) { - $this->query_name = $name; - return new c_base_return_true(); - } - - $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'name', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); - return c_base_return_error::s_false($error); - } - - /** - * Get the currently assigned name. - * - * @return c_base_return_string|c_base_return_null - * A name on success. - * NULL is returned if not set. - * NULL with the error bit set is returned on error. - */ - public function get_query_name() { - if (is_null($this->query_name)) { - return new c_base_return_null(); - } - - if (is_string($this->query_name)) { - return c_base_return_string::s_new($this->query_name); - } - - $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_name', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); - return c_base_return_error::s_null($error); - } -} - -/** - * Provide the sql SET TABLESPACE functionality. - */ -trait t_base_query_set_tablespace { - protected $query_set_tablespace; - - /** - * Set the SET TABLESPACE settings. - * - * @param string|null $set_tablespace - * The tablespace name to set to. - * Set to NULL to disable. - * - * @return c_base_return_status - * TRUE on success, FALSE otherwise. - * FALSE with the error bit set is returned on error. - */ - public function set_query_set_tablespace($set_tablespace) { - if (!is_null($set_tablespace) && !is_string($set_tablespace)) { - $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'set_tablespace', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); - return c_base_return_error::s_false($error); - } - - $this->query_set_tablespace = $set_tablespace; - return new c_base_return_true(); - } - - /** - * Get the currently assigned tablespace name to set to. - * - * @return c_base_return_string|c_base_return_null - * A tablespace name on success. - * NULL is returned if not set (set tablespace is not to be used). - * NULL with the error bit set is returned on error. - */ - public function get_query_set_tablespace() { - if (is_null($this->query_set_tablespace)) { - return new c_base_return_null(); - } - - if (is_string($this->query_set_tablespace)) { - return c_base_return_string::s_new($this->query_set_tablespace); - } - - $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_set_tablespace', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); - return c_base_return_error::s_null($error); - } -} - -/** - * Provide the sql SET functionality. - */ -trait t_base_query_set { - protected $query_set; - protected $query_set_parameter; - protected $query_set_value; - - /** - * Set the SET settings. - * - * @param int|null $set - * The SET code to assign. - * Should be one of: c_base_query_code_set. - * Set to NULL to disable. - * @param string|null $parameter - * (optional) When non-NULL this is the configuration parameter. - * When NULL, DEFAULT is used if applicablem otherwise this is ignored. - * @param string|null $value - * (optional) When non-NULL this is the value. - * When NULL, this is ignored. - * - * @return c_base_return_status - * TRUE on success, FALSE otherwise. - * FALSE with the error bit set is returned on error. - */ - public function set_query_set($set, $parameter = NULL, $value = NULL) { - if (is_null($set)) { - $this->query_set = NULL; - $this->query_set_parameter = NULL; - $this->query_set_value = NULL; - return new c_base_return_true(); - } - - if (!is_int($set)) { - $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'set', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); - return c_base_return_error::s_false($error); - } - - if ($set == c_base_query_code_set::TO || $set == c_base_query_code_set::EQUAL) { - if (!is_null($parameter) || !is_string($parameter)) { - $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'parameter', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); - return c_base_return_error::s_false($error); - } - - if (!is_null($value) || !is_string($value)) { - $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'value', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); - return c_base_return_error::s_false($error); - } - - $this->query_set = $set; - $this->query_set_parameter = $parameter; - $this->query_set_value = $value; - return new c_base_return_true(); - } - elseif ($set == c_base_query_code_set::FROM_CURRENT) { - $this->query_set = $set; - $this->query_set_parameter = NULL; - $this->query_set_value = NULL; - return new c_base_return_true(); - } - - return new c_base_return_false(); - } - - /** - * Get the currently assigned sql set. - * - * @return c_base_return_int|c_base_return_null - * A (c_base_query_set) code representing the set on success. - * NULL is returned if not set (set tablespace is not to be used). - * NULL with the error bit set is returned on error. - */ - public function get_query_set() { - if (is_null($this->query_set)) { - return new c_base_return_null(); - } - - if (is_int($this->query_set)) { - return c_base_return_int::s_new($this->query_set); - } - - $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_set', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); - return c_base_return_error::s_null($error); - } - - /** - * Get the currently assigned sql set parameter value. - * - * @return c_base_return_string|c_base_return_null - * A set parameter value on success. - * NULL without error bit set is returned if not assigned. - * NULL with the error bit set is returned on error. - */ - public function get_query_set_parameter() { - if (is_null($this->query_set_parameter)) { - return new c_base_return_null(); - } - - if (is_string($this->query_set_parameter)) { - return c_base_return_string::s_new($this->query_set_parameter); - } - - $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_set_parameter', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); - return c_base_return_error::s_null($error); - } - - /** - * Get the currently assigned sql set value value. - * - * @return c_base_return_string|c_base_return_null - * A set value value on success. - * NULL without error bit set is returned if not assigned. - * NULL with the error bit set is returned on error. - */ - public function get_query_set_value() { - if (is_null($this->query_set_value)) { - return new c_base_return_null(); - } - - if (is_string($this->query_set_value)) { - return c_base_return_string::s_new($this->query_set_value); - } - - $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_set_value', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); - return c_base_return_error::s_null($error); - } -} - -/** - * Provide the sql RESET functionality. - */ -trait t_base_query_reset { - protected $query_reset; - protected $query_reset_parameter; - - /** - * Set the RESET settings. - * - * @param int|null $reset - * The reset code to assign. - * Should be one of: c_base_query_code_reset. - * Set to NULL to disable. - * @param string|null $parameter - * (optional) When non-NULL this is the configuration parameter. - * When NULL, DEFAULT is used if applicablem otherwise this is ignored. - * - * @return c_base_return_status - * TRUE on success, FALSE otherwise. - * FALSE with the error bit set is returned on error. - */ - public function set_query_reset($reset, $parameter = NULL) { - if (is_null($reset)) { - $this->query_reset = NULL; - $this->query_reset_parameter = NULL; - return new c_base_return_true(); - } - - if (!is_int($reset)) { - $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'reset', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); - return c_base_return_error::s_false($error); - } - - if ($reset == c_base_query_code_reset::PARAMETER) { - if (!is_null($parameter) || !is_string($parameter)) { - $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'parameter', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); - return c_base_return_error::s_false($error); - } - - $this->query_reset = $reset; - $this->query_reset_parameter = $parameter; - return new c_base_return_true(); - } - elseif ($reset == c_base_query_code_reset::ALL) { - $this->query_reset = $reset; - $this->query_reset_parameter = NULL; - return new c_base_return_true(); - } - - return new c_base_return_false(); - } - - /** - * Get the currently assigned sql reset. - * - * @return c_base_return_int|c_base_return_null - * A (c_base_query_reset) code representing the reset on success. - * NULL is returned if not set (reset tablespace is not to be used). - * NULL with the error bit set is returned on error. - */ - public function get_query_reset() { - if (is_null($this->query_reset)) { - return new c_base_return_null(); - } - - if (is_int($this->query_reset)) { - return c_base_return_int::s_new($this->query_reset); - } - - $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_reset', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); - return c_base_return_error::s_null($error); - } - - /** - * Get the currently assigned sql reset parameter value. - * - * @return c_base_return_string|c_base_return_null - * A reset parameter value on success. - * NULL without error bit reset is returned if not assigned. - * NULL with the error bit reset is returned on error. - */ - public function get_query_reset_parameter() { - if (is_null($this->query_reset_parameter)) { - return new c_base_return_null(); - } - - if (is_string($this->query_reset_parameter)) { - return c_base_return_string::s_new($this->query_reset_parameter); - } - - $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_reset_parameter', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); - return c_base_return_error::s_null($error); - } -} - -/** - * Provide the sql IN SCHEMA functionality. - */ -trait t_base_query_in_schema { - protected $query_in_schema; - - /** - * Set the in schema, schema names. - * - * @param string|null $schema_name - * The schema name to use. - * Set to NULL to disable. - * When NULL, this will remove all schema names regardless of the $append parameter. - * @param bool $append - * (optional) When TRUE, the schema name will be appended. - * When FALSE, any existing schema names will be cleared before appending the schema name. - * - * @return c_base_return_status - * TRUE on success, FALSE otherwise. - * FALSE with error bit set is returned on error. - */ - public function set_query_in_schema($schema_name, $append = TRUE) { - if (is_null($schema_name)) { - $this->query_in_schema = NULL; - return new c_base_return_true(); - } - - if (!is_bool($append)) { - $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'append', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); - return c_base_return_error::s_false($error); - } - - if (is_string($schema_name)) { - if ($append) { - if (!is_array($this->query_in_schema)) { - $this->query_in_schema = []; - } - - $this->query_in_schema[] = $schema_name; - } - else { - $this->query_in_schema = [$schema_name]; - } - - return new c_base_return_true(); - } - - $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'schema_name', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); - return c_base_return_error::s_false($error); - } - - /** - * Get the in schema, schema names. - * - * @param int|null $index - * (optional) Get the schema name at the specified index. - * When NULL, all schema names are returned. - * - * @return c_base_return_string|c_base_return_array|c_base_return_null - * An array of schema names or NULL if not defined. - * A single schema name is returned if $index is an integer. - * NULL with the error bit set is returned on error. - */ - public function get_query_in_schema($index = NULL) { - if (is_null($this->query_in_schema)) { - return new c_base_return_null(); - } - - if (is_null($index)) { - if (is_array($this->query_in_schema)) { - return c_bse_return_array::s_new($this->query_in_schema); - } - } - else { - if (is_int($index) && array_key_exists($index, $this->query_in_schema) && is_string($this->query_in_schema[$index])) { - return c_base_return_string::s_new($this->query_in_schema[$index]); - } - - $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_in_schema[index]', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); - return c_base_return_error::s_null($error); - } - - $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_in_schema', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); - return c_base_return_error::s_null($error); - } -} diff --git a/common/base/traits/base_rfc_string.php b/common/base/traits/base_rfc_string.php index 02a0d32..a1f1230 100644 --- a/common/base/traits/base_rfc_string.php +++ b/common/base/traits/base_rfc_string.php @@ -226,7 +226,7 @@ trait t_base_rfc_string { $result['current']--; } - elseif ($code === c_base_ascii::QUOTE_DOUBLE) { + else if ($code === c_base_ascii::QUOTE_DOUBLE) { if ($quote_closed) { // double quote may be supplied only once. $result['invalid'] = TRUE; @@ -240,7 +240,7 @@ trait t_base_rfc_string { $quote_closed = TRUE; continue; } - elseif ($code === c_base_ascii::PARENTHESIS_OPEN) { + else if ($code === c_base_ascii::PARENTHESIS_OPEN) { if ($comment_first || $comment_last) { // there may be only 1 comment at the start and only 1 comment at the end. $result['invalid'] = TRUE; @@ -266,12 +266,12 @@ trait t_base_rfc_string { } unset($parsed); } - elseif ($code === c_base_ascii::PARENTHESIS_CLOSE) { + else if ($code === c_base_ascii::PARENTHESIS_CLOSE) { // an isolated parenthesis is invald. $result['invalid'] = TRUE; break; } - elseif ($quote_closed) { + else if ($quote_closed) { if ($this->pr_rfc_char_is_fws($code)) { continue; } @@ -357,7 +357,7 @@ trait t_base_rfc_string { if ($code === c_base_ascii::QUOTE_DOUBLE) { break; } - elseif (!$this->pr_rfc_char_is_vchar($code)) { + else if (!$this->pr_rfc_char_is_vchar($code)) { $result['invalid'] = TRUE; break; } @@ -433,11 +433,11 @@ trait t_base_rfc_string { $result['current']--; } - elseif ($code === c_base_ascii::PARENTHESIS_OPEN) { + else if ($code === c_base_ascii::PARENTHESIS_OPEN) { // look for open-parenthesis to handle comments within a comment. $comment_depth++; } - elseif ($code === c_base_ascii::PARENTHESIS_CLOSE) { + else if ($code === c_base_ascii::PARENTHESIS_CLOSE) { // handle end of comment. if ($comment_depth == 0) { // the current position will remain on the closing ')'. @@ -449,7 +449,7 @@ trait t_base_rfc_string { $comment_depth--; } } - elseif (!$this->pr_rfc_char_is_ctext($code) && !$this->pr_rfc_char_is_fws($code)) { + else if (!$this->pr_rfc_char_is_ctext($code) && !$this->pr_rfc_char_is_fws($code)) { $result['invalid'] = TRUE; break; } @@ -734,7 +734,7 @@ trait t_base_rfc_string { break; } - elseif (!$this->pr_rfc_char_is_tchar($code)) { + else if (!$this->pr_rfc_char_is_tchar($code)) { $result['invalid'] = TRUE; break; } @@ -810,7 +810,7 @@ trait t_base_rfc_string { break; } - elseif (!$this->pr_rfc_char_is_tchar($ordinals[$result['current']])) { + else if (!$this->pr_rfc_char_is_tchar($ordinals[$result['current']])) { $result['invalid'] = TRUE; return $result; } @@ -846,7 +846,7 @@ trait t_base_rfc_string { return $result; } - elseif (!$this->pr_rfc_char_is_tchar($ordinals[$result['current']])) { + else if (!$this->pr_rfc_char_is_tchar($ordinals[$result['current']])) { $result['invalid'] = TRUE; return $result; } @@ -1573,7 +1573,7 @@ trait t_base_rfc_string { $result['invalid'] = TRUE; break; } - elseif ($code === c_base_ascii::COMMA) { + else if ($code === c_base_ascii::COMMA) { // this is an unweighted choice. $choice['weight'] = NULL; if (!isset($result['choices'][NULL])) { @@ -1592,7 +1592,7 @@ trait t_base_rfc_string { continue; } - elseif (!$this->pr_rfc_char_is_atext($code) && !$this->pr_rfc_char_is_wsp($code)) { + else if (!$this->pr_rfc_char_is_atext($code) && !$this->pr_rfc_char_is_wsp($code)) { $result['invalid'] = TRUE; break; } @@ -1689,7 +1689,7 @@ trait t_base_rfc_string { continue; } } - elseif ($code === c_base_ascii::COLON_SEMI || $found_slash && $this->pr_rfc_char_is_wsp($code)) { + else if ($code === c_base_ascii::COLON_SEMI || $found_slash && $this->pr_rfc_char_is_wsp($code)) { if ($found_slash && $this->pr_rfc_char_is_wsp($code)) { // in this case, the semi-colon has yet to be found, so seek until a semi-colon is found. // any and all non-semi-colon and non-whitespace means that the string is invalid. @@ -1733,7 +1733,7 @@ trait t_base_rfc_string { $processed_token = TRUE; continue; } - elseif ($subcode === c_base_ascii::EQUAL) { + else if ($subcode === c_base_ascii::EQUAL) { if ($found_equal || $process_whitespace) { // it cannot start with an equal sign, so if $process_whitespace is TRUE, then this is an invalid equal sign. $result['invalid'] = TRUE; @@ -1828,7 +1828,7 @@ trait t_base_rfc_string { continue; } - elseif (!$this->pr_rfc_char_is_tchar($subcode)) { + else if (!$this->pr_rfc_char_is_tchar($subcode)) { if ($found_equal) { if ($subcode === c_base_ascii::COLON_SEMI) { // save parameter and value and continue. @@ -1846,7 +1846,7 @@ trait t_base_rfc_string { $result['invalid'] = TRUE; break; } - elseif ($processed_token) { + else if ($processed_token) { // processed token is set to TRUE after the first space following the token is found. // spaces are not allowed inside an unqouted token and is therefore invalid. $result['invalid'] = TRUE; @@ -1885,7 +1885,7 @@ trait t_base_rfc_string { break; } - elseif (!$this->pr_rfc_char_is_tchar($code)) { + else if (!$this->pr_rfc_char_is_tchar($code)) { $result['invalid'] = TRUE; break; } @@ -1995,7 +1995,7 @@ trait t_base_rfc_string { continue; } - elseif ($ordinals[$result['current']] === c_base_ascii::EQUAL && !$processed_name) { + else if ($ordinals[$result['current']] === c_base_ascii::EQUAL && !$processed_name) { $processed_name = TRUE; // skip past all whitespace following the equal. @@ -2016,7 +2016,7 @@ trait t_base_rfc_string { $result['invalid'] = TRUE; break; } - elseif ($code === c_base_ascii::COLON_SEMI) { + else if ($code === c_base_ascii::COLON_SEMI) { $result['tokens'][$token_name] = $token_value; $token_name = NULL; $token_value = NULL; @@ -2036,7 +2036,7 @@ trait t_base_rfc_string { continue; } - elseif ($code === c_base_ascii::QUOTE_DOUBLE) { + else if ($code === c_base_ascii::QUOTE_DOUBLE) { if (!$processed_name) { // the token name is not allowed to be a quoted string. $result['invalid'] = TRUE; @@ -2073,7 +2073,7 @@ trait t_base_rfc_string { continue; } - elseif (!$this->pr_rfc_char_is_tchar($code)) { + else if (!$this->pr_rfc_char_is_tchar($code)) { $result['invalid'] = TRUE; break; } @@ -2195,7 +2195,7 @@ trait t_base_rfc_string { continue; } - elseif ($ordinals[$result['current']] === c_base_ascii::EQUAL && !$processed_name) { + else if ($ordinals[$result['current']] === c_base_ascii::EQUAL && !$processed_name) { $processed_name = TRUE; // skip past all whitespace following the equal. @@ -2216,7 +2216,7 @@ trait t_base_rfc_string { $result['invalid'] = TRUE; break; } - elseif ($code === c_base_ascii::COMMA) { + else if ($code === c_base_ascii::COMMA) { $result['tokens'][$token_name] = $token_value; $token_name = NULL; $token_value = NULL; @@ -2236,7 +2236,7 @@ trait t_base_rfc_string { continue; } - elseif ($code === c_base_ascii::QUOTE_DOUBLE) { + else if ($code === c_base_ascii::QUOTE_DOUBLE) { if (!$processed_name) { // the token name is not allowed to be a quoted string. $result['invalid'] = TRUE; @@ -2273,7 +2273,7 @@ trait t_base_rfc_string { continue; } - elseif (!$this->pr_rfc_char_is_tchar($code)) { + else if (!$this->pr_rfc_char_is_tchar($code)) { $result['invalid'] = TRUE; break; } @@ -2381,7 +2381,7 @@ trait t_base_rfc_string { $result['invalid'] = TRUE; break; } - elseif ($code === c_base_ascii::COMMA) { + else if ($code === c_base_ascii::COMMA) { if (is_null($token_value)) { // empty values separated by commas are to be ignored. continue; @@ -2391,7 +2391,7 @@ trait t_base_rfc_string { $tokan_value = NULL; continue; } - elseif (!$this->pr_rfc_char_is_tchar($code)) { + else if (!$this->pr_rfc_char_is_tchar($code)) { $result['invalid'] = TRUE; break; } @@ -2479,10 +2479,10 @@ trait t_base_rfc_string { break; } } - elseif (self::pr_rfc_char_is_pchar($code)) { + else if (self::pr_rfc_char_is_pchar($code)) { // do nothing, valid. } - elseif ($code === c_base_ascii::SLASH_FORWARD) { + else if ($code === c_base_ascii::SLASH_FORWARD) { // do nothing, valid. } else { @@ -2569,10 +2569,10 @@ trait t_base_rfc_string { break; } } - elseif (self::pr_rfc_char_is_pchar($code)) { + else if (self::pr_rfc_char_is_pchar($code)) { // do nothing, valid. } - elseif ($code === c_base_ascii::SLASH_FORWARD || $code === c_base_ascii::QUESTION_MARK) { + else if ($code === c_base_ascii::SLASH_FORWARD || $code === c_base_ascii::QUESTION_MARK) { // do nothing, valid. } else { @@ -2638,7 +2638,7 @@ trait t_base_rfc_string { if ($ordinals[$result['current']] === c_base_ascii::LOWER_V || $ordinals[$result['current']] === c_base_ascii::UPPER_V) { $result['is_future'] = TRUE; } - elseif (!self::pr_rfc_char_is_hexdigit($ordinals[$result['current']])) { + else if (!self::pr_rfc_char_is_hexdigit($ordinals[$result['current']])) { $result['invalid'] = TRUE; return $result; } @@ -2690,13 +2690,13 @@ trait t_base_rfc_string { if (self::pr_rfc_char_is_unreserved($code)) { // do nothing, valid. } - elseif (self::pr_rfc_char_is_sub_delims($code)) { + else if (self::pr_rfc_char_is_sub_delims($code)) { // do nothing, valid. } - elseif ($code === c_base_ascii::COLON) { + else if ($code === c_base_ascii::COLON) { // do nothing, valid. } - elseif ($code === c_base_ascii::BRACKET_CLOSE) { + else if ($code === c_base_ascii::BRACKET_CLOSE) { break; } else { @@ -2715,10 +2715,10 @@ trait t_base_rfc_string { if (self::pr_rfc_char_is_hexdigit($code)) { $result['address'] .= $characters[$result['current']]; } - elseif ($code === c_base_ascii::COLON) { + else if ($code === c_base_ascii::COLON) { $result['address'] .= $characters[$result['current']]; } - elseif ($code === c_base_ascii::BRACKET_CLOSE) { + else if ($code === c_base_ascii::BRACKET_CLOSE) { break; } else { @@ -2894,7 +2894,7 @@ trait t_base_rfc_string { $found_period = TRUE; } - elseif (!$this->pr_rfc_char_is_digit($ordinals[$result['current']])) { + else if (!$this->pr_rfc_char_is_digit($ordinals[$result['current']])) { // ignore trailing whitespaces if ($this->pr_rfc_char_is_wsp($ordinals[$result['current']])) { $result = $this->p_rfc_string_skip_past_whitespace($ordinals, $characters, $stop, $result); @@ -3025,7 +3025,7 @@ trait t_base_rfc_string { $found_period = TRUE; } - elseif (!$this->pr_rfc_char_is_hexdigit($ordinals[$result['current']])) { + else if (!$this->pr_rfc_char_is_hexdigit($ordinals[$result['current']])) { // ignore trailing whitespaces if ($this->pr_rfc_char_is_wsp($ordinals[$result['current']])) { $result = $this->p_rfc_string_skip_past_whitespace($ordinals, $characters, $stop, $result); @@ -3334,10 +3334,10 @@ trait t_base_rfc_string { if ($this->pr_rfc_char_is_alpha($code)) { // allowed in: scheme, authority, path } - elseif ($this->pr_rfc_char_is_digit($code)) { + else if ($this->pr_rfc_char_is_digit($code)) { // allowed in: scheme, authority, path } - elseif ($code === c_base_ascii::COLON) { + else if ($code === c_base_ascii::COLON) { $not_path = TRUE; if ($not_scheme) { @@ -3357,15 +3357,15 @@ trait t_base_rfc_string { $not_authority = TRUE; } } - elseif ($code === c_base_ascii::PLUS || $code === c_base_ascii::MINUS || $code === c_base_ascii::PERIOD) { + else if ($code === c_base_ascii::PLUS || $code === c_base_ascii::MINUS || $code === c_base_ascii::PERIOD) { // allowed in: scheme, authority, path } - elseif ($code === c_base_ascii::AT) { + else if ($code === c_base_ascii::AT) { // allowed in: authority, path $not_scheme = TRUE; } - elseif ($code === c_base_ascii::SLASH_FORWARD) { + else if ($code === c_base_ascii::SLASH_FORWARD) { // allowed in: path $not_scheme = TRUE; @@ -3374,12 +3374,12 @@ trait t_base_rfc_string { // the slash is part of the path. $processed_string .= $characters[$result['current']]; } - elseif ($this->pr_rfc_char_is_unreserved($code)) { + else if ($this->pr_rfc_char_is_unreserved($code)) { // allowed in: authority, path $not_scheme = TRUE; } - elseif ($code === c_base_ascii::BRACKET_OPEN) { + else if ($code === c_base_ascii::BRACKET_OPEN) { // allowed in: authority $not_scheme = TRUE; @@ -3510,10 +3510,10 @@ trait t_base_rfc_string { $result['url'] = TRUE; break; } - elseif ($code === c_base_ascii::COLON) { + else if ($code === c_base_ascii::COLON) { $result['url'] = FALSE; } - elseif (!$this->pr_rfc_char_is_pchar($code)) { + else if (!$this->pr_rfc_char_is_pchar($code)) { unset($code); $result['invalid'] = TRUE; @@ -3558,7 +3558,7 @@ trait t_base_rfc_string { return $result; } - elseif ($not_scheme && $not_path) { + else if ($not_scheme && $not_path) { unset($not_scheme); unset($not_authority); unset($not_path); @@ -3611,7 +3611,7 @@ trait t_base_rfc_string { } } } - elseif ($not_scheme && $not_authority) { + else if ($not_scheme && $not_authority) { unset($not_scheme); unset($not_authority); unset($not_path); @@ -3726,7 +3726,7 @@ trait t_base_rfc_string { if (is_string($uri_array['query'])) { $combined .= '?' . $uri_array['query']; } - elseif (is_array($uri_array['query'])) { + else if (is_array($uri_array['query'])) { $combined .= '?' . http_build_query($uri_array['query'], '', '&', PHP_QUERY_RFC3986); } } @@ -3800,7 +3800,7 @@ trait t_base_rfc_string { // the slash designates the end of the authority. break; } - elseif ($code === c_base_ascii::PERCENT) { + else if ($code === c_base_ascii::PERCENT) { // valid only if two hex digits immediately follow. $result['current']++; if ($result['current'] >= $stop) { @@ -3828,16 +3828,16 @@ trait t_base_rfc_string { break; } } - elseif ($code === c_base_ascii::AT || $code === c_base_ascii::COLON) { + else if ($code === c_base_ascii::AT || $code === c_base_ascii::COLON) { // this is valid. } - elseif ($code === c_base_ascii::BRACKET_OPEN || $code === c_base_ascii::BRACKET_CLOSE) { + else if ($code === c_base_ascii::BRACKET_OPEN || $code === c_base_ascii::BRACKET_CLOSE) { // this is valid. } - elseif ($this->pr_rfc_char_is_unreserved($code)) { + else if ($this->pr_rfc_char_is_unreserved($code)) { // this is valid. } - elseif ($this->pr_rfc_char_is_sub_delims($code)) { + else if ($this->pr_rfc_char_is_sub_delims($code)) { // this is valid. } else { @@ -3882,10 +3882,10 @@ trait t_base_rfc_string { // found possible query or fragment. break; } - elseif ($code === c_base_ascii::SLASH_FORWARD) { + else if ($code === c_base_ascii::SLASH_FORWARD) { // this is valid. } - elseif (!$this->pr_rfc_char_is_pchar($code)) { + else if (!$this->pr_rfc_char_is_pchar($code)) { unset($code); $result['invalid'] = TRUE; @@ -3935,7 +3935,7 @@ trait t_base_rfc_string { // hash is not part of the query but does mark the end of the query as it is the start of the fragment. break; } - elseif ($code === c_base_ascii::AMPERSAND) { + else if ($code === c_base_ascii::AMPERSAND) { // The '&' designates a new name and value, separate each individual value inside the array. $result['query'][$query_name] = $query_value; @@ -3945,7 +3945,7 @@ trait t_base_rfc_string { continue; } - elseif ($code === c_base_ascii::EQUAL) { + else if ($code === c_base_ascii::EQUAL) { // The '=' designates a value for the current name. if ($no_value || is_null($query_name)) { $query_name .= $characters[$result['current']]; @@ -3956,7 +3956,7 @@ trait t_base_rfc_string { $query_value = ''; continue; } - elseif (!$this->pr_rfc_char_is_query($code)) { + else if (!$this->pr_rfc_char_is_query($code)) { unset($code); unset($query_name); unset($query_value); diff --git a/common/base/classes/base_query_alter_aggregate.php b/common/database/classes/database_alter_aggregate.php similarity index 84% rename from common/base/classes/base_query_alter_aggregate.php rename to common/database/classes/database_alter_aggregate.php index a25fd43..279b728 100644 --- a/common/base/classes/base_query_alter_aggregate.php +++ b/common/database/classes/database_alter_aggregate.php @@ -7,9 +7,13 @@ namespace n_koopa; require_once('common/base/classes/base_error.php'); require_once('common/base/classes/base_return.php'); -require_once('common/base/classes/base_query.php'); -require_once('common/base/traits/base_query.php'); +require_once('common/database/classes/database_query.php'); + +require_once('common/database/traits/database_name.php'); +require_once('common/database/traits/database_rename_to.php'); +require_once('common/database/traits/database_owner_to.php'); +require_once('common/database/traits/database_set_schema.php'); /** * The class for building and returning a Postgresql ALTER AGGREGATE query string. @@ -18,11 +22,11 @@ require_once('common/base/traits/base_query.php'); * * @see: https://www.postgresql.org/docs/current/static/sql-alteraggregate.html */ -class c_base_query_alter_aggregate extends c_base_query { - use t_base_query_name; - use t_base_query_rename_to; - use t_base_query_owner_to; - use t_base_query_set_schema; +class c_database_alter_aggregate extends c_database_query { + use t_database_name; + use t_database_rename_to; + use t_database_owner_to; + use t_database_set_schema; protected const pr_QUERY_COMMAND = 'alter aggregate'; @@ -84,7 +88,7 @@ class c_base_query_alter_aggregate extends c_base_query { /** * Set the aggregate signatures. * - * @param c_base_query_argument_aggregate_signature|null $aggregate_signature + * @param c_database_argument_aggregate_signature|null $aggregate_signature * The aggregate signatures to use. * Set to NULL to disable. * When NULL, this will remove all aggregate signatures regardless of the $append parameter. @@ -107,7 +111,7 @@ class c_base_query_alter_aggregate extends c_base_query { return c_base_return_error::s_false($error); } - if ($aggregate_signature instanceof c_base_query_argument_aggregate_signature) { + if ($aggregate_signature instanceof c_database_argument_aggregate_signature) { if ($append) { if (!is_array($this->aggregate_signatures)) { $this->aggregate_signatures = []; @@ -129,7 +133,7 @@ class c_base_query_alter_aggregate extends c_base_query { /** * Set the order by aggregate signatures. * - * @param c_base_query_argument_aggregate_signature_base|null $order_by_signature + * @param c_database_argument_aggregate_signature_base|null $order_by_signature * The order by aggregate signature to use. * Set to NULL to disable. * When NULL, this will remove all modes regardless of the $append parameter. @@ -152,7 +156,7 @@ class c_base_query_alter_aggregate extends c_base_query { return c_base_return_error::s_false($error); } - if ($order_by_signature instanceof c_base_query_argument_aggregate_signature_base) { + if ($order_by_signature instanceof c_database_argument_aggregate_signature_base) { if ($append) { if (!is_array($this->order_by_signature)) { $this->order_by_signatures = []; @@ -178,7 +182,7 @@ class c_base_query_alter_aggregate extends c_base_query { * (optional) Get the argument signature at the specified index. * When NULL, all argument signatures are returned. * - * @return c_base_query_argument_aggregate_signature|c_base_return_array|c_base_return_null + * @return c_database_argument_aggregate_signature|c_base_return_array|c_base_return_null * An array of aggregate signatures or NULL if not defined. * A single aggregate signature is returned if $index is an integer. * NULL with the error bit set is returned on error. @@ -194,7 +198,7 @@ class c_base_query_alter_aggregate extends c_base_query { } } else { - if (is_int($index) && array_key_exists($index, $this->aggregate_signatures) && $this->aggregate_signatures[$index] instanceof c_base_query_argument_aggregate_signature) { + if (is_int($index) && array_key_exists($index, $this->aggregate_signatures) && $this->aggregate_signatures[$index] instanceof c_database_argument_aggregate_signature) { return clone($this->aggregate_signatures[$index]); } @@ -213,7 +217,7 @@ class c_base_query_alter_aggregate extends c_base_query { * (optional) Get the argument signature at the specified index. * When NULL, all argument signatures are returned. * - * @return c_base_query_argument_aggregate_signature|c_base_return_array|c_base_return_null + * @return c_database_argument_aggregate_signature|c_base_return_array|c_base_return_null * An array of order by aggregate signatures or NULL if not defined. * A single order by aggregate signature is returned if $index is an integer. * NULL with the error bit set is returned on error. @@ -229,7 +233,7 @@ class c_base_query_alter_aggregate extends c_base_query { } } else { - if (is_int($index) && array_key_exists($index, $this->order_by_signatures) && $this->order_by_signatures[$index] instanceof c_base_query_argument_aggregate_signature_base) { + if (is_int($index) && array_key_exists($index, $this->order_by_signatures) && $this->order_by_signatures[$index] instanceof c_database_argument_aggregate_signature_base) { return clone($this->order_by_signatures[$index]); } @@ -260,7 +264,7 @@ class c_base_query_alter_aggregate extends c_base_query { else { // [ argument_mode ] [ argument_name ] argument_type [, ...] foreach ($this->aggregate_signatures as $aggregate_signature) { - if ($aggregate_signature instanceof c_base_query_argument_aggregate_signature) { + if ($aggregate_signature instanceof c_database_argument_aggregate_signature) { if (is_null($aggregate_signatures)) { $aggregate_signatures = ''; } @@ -277,7 +281,7 @@ class c_base_query_alter_aggregate extends c_base_query { // ORDER BY [ argument_mode ] [ argument_name ] argument_type [, ...] $order_by_signatures = NULL; foreach ($this->order_by_signatures as $order_by_signature) { - if ($order_by_signature instanceof c_base_query_argument_aggregate_signature_base) { + if ($order_by_signature instanceof c_database_argument_aggregate_signature_base) { if (is_null($order_by_signatures)) { $order_by_signatures = ''; } @@ -294,7 +298,7 @@ class c_base_query_alter_aggregate extends c_base_query { if (is_string($aggregate_signatures)) { $aggregate_signatures = ' (' . $aggregate_signatures; if (is_string($order_by_signatures)) { - $aggregate_signatures = ' ' . c_base_query_string::ORDER_BY . ' ' . $order_by_signatures . ''; + $aggregate_signatures = ' ' . c_database_string::ORDER_BY . ' ' . $order_by_signatures . ''; } $aggregate_signatures .= ')'; } @@ -302,13 +306,13 @@ class c_base_query_alter_aggregate extends c_base_query { } if (is_string($this->query_rename_to)) { - $this->value .= ' ' . $aggregate_signatures . ' ' . c_base_query_string::RENAME_TO . ' (' . $this->query_rename_to . ')'; + $this->value .= ' ' . $aggregate_signatures . ' ' . c_database_string::RENAME_TO . ' (' . $this->query_rename_to . ')'; } - elseif (is_string($this->query_owner_to_user_name)) { - $this->value .= ' ' . $aggregate_signatures . ' ' . c_base_query_string::OWNER_TO . ' (' . $this->query_owner_to_user_name . ')'; + else if (is_string($this->query_owner_to_user_name)) { + $this->value .= ' ' . $aggregate_signatures . ' ' . c_database_string::OWNER_TO . ' (' . $this->query_owner_to_user_name . ')'; } - elseif (is_string($this->query_set_schema)) { - $this->value .= ' ' . $aggregate_signatures . ' ' . c_base_query_string::SET_SCHEMA . ' (' . $this->query_set_schema . ')'; + else if (is_string($this->query_set_schema)) { + $this->value .= ' ' . $aggregate_signatures . ' ' . c_database_string::SET_SCHEMA . ' (' . $this->query_set_schema . ')'; } else { unset($aggregate_signatures); diff --git a/common/base/classes/base_query_alter_coalation.php b/common/database/classes/database_alter_coalation.php similarity index 83% rename from common/base/classes/base_query_alter_coalation.php rename to common/database/classes/database_alter_coalation.php index 253998d..8c96f95 100644 --- a/common/base/classes/base_query_alter_coalation.php +++ b/common/database/classes/database_alter_coalation.php @@ -7,21 +7,25 @@ namespace n_koopa; require_once('common/base/classes/base_error.php'); require_once('common/base/classes/base_return.php'); -require_once('common/base/classes/base_query.php'); -require_once('common/base/classes/base_query_string.php'); -require_once('common/base/traits/base_query.php'); +require_once('common/database/classes/database_query.php'); +require_once('common/database/classes/database_string.php'); + +require_once('common/database/traits/database_name.php'); +require_once('common/database/traits/database_rename_to.php'); +require_once('common/database/traits/database_owner_to.php'); +require_once('common/database/traits/database_set_schema.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. * * @see: https://www.postgresql.org/docs/current/static/sql-altercoalation.html */ -class c_base_query_alter_coalation extends c_base_query { - use t_base_query_name; - use t_base_query_rename_to; - use t_base_query_owner_to; - use t_base_query_set_schema; +class c_database_alter_coalation extends c_database_query { + use t_database_name; + use t_database_rename_to; + use t_database_owner_to; + use t_database_set_schema; protected const pr_QUERY_COMMAND = 'alter coalation'; @@ -134,16 +138,16 @@ class c_base_query_alter_coalation extends c_base_query { if (is_bool($this->refresh_version)) { if ($this->refresh_version) { - $this->value .= ' ' . c_base_query_string::REFRESH_VERSION; + $this->value .= ' ' . c_database_string::REFRESH_VERSION; } } - elseif (is_string($this->query_rename_to)) { + else if (is_string($this->query_rename_to)) { $this->value .= ' ' . $this->pr_QUERY_RENAME_TO . ' (' . $this->query_rename_to . ')'; } - elseif (is_string($this->query_owner_to_user_name)) { + else if (is_string($this->query_owner_to_user_name)) { $this->value .= ' ' . $this->pr_QUERY_OWNER_TO . ' (' . $this->query_owner_to_user_name . ')'; } - elseif (is_string($this->query_set_schema)) { + else if (is_string($this->query_set_schema)) { $this->value .= ' ' . $this->pr_QUERY_SET_SCHEMA . ' (' . $this->query_set_schema . ')'; } else { diff --git a/common/base/classes/base_query_alter_conversion.php b/common/database/classes/database_alter_conversion.php similarity index 78% rename from common/base/classes/base_query_alter_conversion.php rename to common/database/classes/database_alter_conversion.php index b06b9da..100527a 100644 --- a/common/base/classes/base_query_alter_conversion.php +++ b/common/database/classes/database_alter_conversion.php @@ -7,20 +7,24 @@ namespace n_koopa; require_once('common/base/classes/base_error.php'); require_once('common/base/classes/base_return.php'); -require_once('common/base/classes/base_query.php'); -require_once('common/base/traits/base_query.php'); +require_once('common/database/classes/database_query.php'); + +require_once('common/database/traits/database_name.php'); +require_once('common/database/traits/database_rename_to.php'); +require_once('common/database/traits/database_owner_to.php'); +require_once('common/database/traits/database_set_schema.php'); /** * The class for building and returning a Postgresql ALTER CONVERSION query string. * * @see: https://www.postgresql.org/docs/current/static/sql-alterconversion.html */ -class c_base_query_alter_conversion extends c_base_query { - use t_base_query_name; - use t_base_query_rename_to; - use t_base_query_owner_to; - use t_base_query_set_schema; +class c_database_alter_conversion extends c_database_query { + use t_database_name; + use t_database_rename_to; + use t_database_owner_to; + use t_database_set_schema; protected const pr_QUERY_COMMAND = 'alter conversion'; @@ -85,10 +89,10 @@ class c_base_query_alter_conversion extends c_base_query { if (is_string($this->query_rename_to)) { $this->value .= ' ' . $this->pr_QUERY_RENAME_TO . ' (' . $this->query_rename_to . ')'; } - elseif (is_string($this->query_owner_to_user_name)) { + else if (is_string($this->query_owner_to_user_name)) { $this->value .= ' ' . $this->pr_QUERY_OWNER_TO . ' (' . $this->query_owner_to_user_name . ')'; } - elseif (is_string($this->query_set_schema)) { + else if (is_string($this->query_set_schema)) { $this->value .= ' ' . $this->pr_QUERY_SET_SCHEMA . ' (' . $this->query_set_schema . ')'; } else { diff --git a/common/base/classes/base_query_alter_database.php b/common/database/classes/database_alter_database.php similarity index 56% rename from common/base/classes/base_query_alter_database.php rename to common/database/classes/database_alter_database.php index 99eee7f..1f23293 100644 --- a/common/base/classes/base_query_alter_database.php +++ b/common/database/classes/database_alter_database.php @@ -7,23 +7,29 @@ namespace n_koopa; require_once('common/base/classes/base_error.php'); require_once('common/base/classes/base_return.php'); -require_once('common/base/classes/base_query.php'); -require_once('common/base/classes/base_query_string.php'); -require_once('common/base/traits/base_query.php'); +require_once('common/database/classes/database_query.php'); +require_once('common/database/classes/database_string.php'); + +require_once('common/database/traits/database_name.php'); +require_once('common/database/traits/database_rename_to.php'); +require_once('common/database/traits/database_owner_to.php'); +require_once('common/database/traits/database_set_tablespace.php'); +require_once('common/database/traits/database_set.php'); +require_once('common/database/traits/database_reset.php'); /** * The class for building and returning a Postgresql ALTER DATABASE query string. * * @see: https://www.postgresql.org/docs/current/static/sql-alterdatabase.html */ -class c_base_query_alter_database extends c_base_query { - use t_base_query_name; - use t_base_query_rename_to; - use t_base_query_owner_to; - use t_base_query_set_tablespace; - use t_base_query_set; - use t_base_query_reset; +class c_database_alter_database extends c_database_query { + use t_database_name; + use t_database_rename_to; + use t_database_owner_to; + use t_database_set_tablespace; + use t_database_set; + use t_database_reset; protected const pr_QUERY_COMMAND = 'alter database'; @@ -91,7 +97,7 @@ class c_base_query_alter_database extends c_base_query { /** * Set the option. * - * @param c_base_query_argument_database_option|null $option + * @param c_database_argument_database_option|null $option * The database options to use. * Set to NULL to disable. * @@ -105,7 +111,7 @@ class c_base_query_alter_database extends c_base_query { return new c_base_return_true(); } - if (!($option instanceof c_base_query_argument_database_option)) { + if (!($option instanceof c_database_argument_database_option)) { $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'option', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); return c_base_return_error::s_false($error); } @@ -117,7 +123,7 @@ class c_base_query_alter_database extends c_base_query { /** * Get assigned option. * - * @return c_base_query_argument_database_option|c_base_return_null + * @return c_database_argument_database_option|c_base_return_null * The assigned option or NULL if not defined. * NULL with the error bit set is returned on error. */ @@ -126,7 +132,7 @@ class c_base_query_alter_database extends c_base_query { return new c_base_return_null(); } - if ($this->option instanceof c_base_query_argument_database_option) { + if ($this->option instanceof c_database_argument_database_option) { return clone($this->option); } @@ -146,50 +152,50 @@ class c_base_query_alter_database extends c_base_query { $this->value = static::pr_QUERY_COMMAND; $this->value .= ' ' . $this->query_name; - if ($this->option instanceof c_base_query_argument_database_option) { + if ($this->option instanceof c_database_argument_database_option) { $this->option->do_build_argument(); $this->value .= ' ' . $this->option->get_value_exact(); } - elseif (is_string($this->query_rename_to)) { - $this->value .= ' ' . c_base_query_string::RENAME_TO . ' (' . $this->query_rename_to . ')'; + else if (is_string($this->query_rename_to)) { + $this->value .= ' ' . c_database_string::RENAME_TO . ' (' . $this->query_rename_to . ')'; } - elseif (is_string($this->query_owner_to_user_name)) { - $this->value .= ' ' . c_base_query_string::OWNER_TO . ' (' . $this->query_owner_to_user_name . ')'; + else if (is_string($this->query_owner_to_user_name)) { + $this->value .= ' ' . c_database_string::OWNER_TO . ' (' . $this->query_owner_to_user_name . ')'; } - elseif (is_string($this->query_set_tablespace)) { - $this->value .= ' ' . c_base_query_string::SET_TABLESPACE . ' (' . $this->query_set_tablespace . ')'; + else if (is_string($this->query_set_tablespace)) { + $this->value .= ' ' . c_database_string::SET_TABLESPACE . ' (' . $this->query_set_tablespace . ')'; } - elseif (is_int($this->query_set)) { - if ($this->query_set == c_base_query_code_set::TO) { + else if (is_int($this->query_set)) { + if ($this->query_set == c_database_code_set::TO) { if (is_null($this->query_set_parameter)) { - $this->value .= ' ' . c_base_query_string::SET . ' ' . $this->query_set_parameter . ' ' . c_base_query_string::TO . ' ' . c_base_query_string::DEFAULT; + $this->value .= ' ' . c_database_string::SET . ' ' . $this->query_set_parameter . ' ' . c_database_string::TO . ' ' . c_database_string::DEFAULT; } - elseif (is_string($this->query_set_parameter) && is_string($this->query_set_value)) { - $this->value .= ' ' . c_base_query_string::SET . ' ' . $this->query_set_parameter . ' ' . c_base_query_string::TO . ' ' . $this->query_set_value; + else if (is_string($this->query_set_parameter) && is_string($this->query_set_value)) { + $this->value .= ' ' . c_database_string::SET . ' ' . $this->query_set_parameter . ' ' . c_database_string::TO . ' ' . $this->query_set_value; } } - elseif ($this->query_set == c_base_query_code_set::EQUAL) { + else if ($this->query_set == c_database_code_set::EQUAL) { if (is_null($this->query_set_parameter)) { - $this->value .= ' ' . c_base_query_string::SET . ' ' . $this->query_set_parameter . ' = ' . c_base_query_string::DEFAULT; + $this->value .= ' ' . c_database_string::SET . ' ' . $this->query_set_parameter . ' = ' . c_database_string::DEFAULT; } - elseif (is_string($this->query_set_parameter) && is_string($this->query_set_value)) { - $this->value .= ' ' . c_base_query_string::SET . ' ' . $this->query_set_parameter . ' = ' . $this->query_set_value; + else if (is_string($this->query_set_parameter) && is_string($this->query_set_value)) { + $this->value .= ' ' . c_database_string::SET . ' ' . $this->query_set_parameter . ' = ' . $this->query_set_value; } } - elseif ($this->query_set == c_base_query_code_set::FROM_CURRENT) { + else if ($this->query_set == c_database_code_set::FROM_CURRENT) { if (is_string($this->query_set_parameter)) { - $this->value .= ' ' . c_base_query_string::SET . ' ' . $this->query_set_parameter . ' = ' . c_base_query_string::FROM_CURRENT; + $this->value .= ' ' . c_database_string::SET . ' ' . $this->query_set_parameter . ' = ' . c_database_string::FROM_CURRENT; } } } - elseif (is_string($this->query_reset)) { - if ($this->query_set == c_base_query_code_reset::PARAMETER) { + else if (is_string($this->query_reset)) { + if ($this->query_set == c_database_code_reset::PARAMETER) { if (is_string($this->query_set_parameter)) { - $this->value .= ' ' . c_base_query_string::RESET . ' ' . $this->query_set_parameter; + $this->value .= ' ' . c_database_string::RESET . ' ' . $this->query_set_parameter; } } - elseif ($this->query_set == c_base_query_code_reset::ALL) { - $this->value .= ' ' . c_base_query_string::RESET . ' ' . c_base_query_string::ALL; + else if ($this->query_set == c_database_code_reset::ALL) { + $this->value .= ' ' . c_database_string::RESET . ' ' . c_database_string::ALL; } } diff --git a/common/base/classes/base_query_alter_default_privileges.php b/common/database/classes/database_alter_default_privileges.php similarity index 75% rename from common/base/classes/base_query_alter_default_privileges.php rename to common/database/classes/database_alter_default_privileges.php index 04eaf5f..8261d6d 100644 --- a/common/base/classes/base_query_alter_default_privileges.php +++ b/common/database/classes/database_alter_default_privileges.php @@ -7,24 +7,27 @@ namespace n_koopa; require_once('common/base/classes/base_error.php'); require_once('common/base/classes/base_return.php'); -require_once('common/base/classes/base_query.php'); -require_once('common/base/traits/base_query.php'); +require_once('common/database/classes/database_query.php'); + +require_once('common/database/traits/database_in_schema.php'); +require_once('common/database/traits/database_action.php'); +require_once('common/database/traits/database_option.php'); /** * The class for building and returning a Postgresql ALTER DEFAULT PRIVILEGES query string. * * @see: https://www.postgresql.org/docs/current/static/sql-alterdefaultpriveleges.html */ -class c_base_query_alter_default_priveleges extends c_base_query { +class c_database_alter_default_priveleges extends c_database_query { + use t_database_in_schema; + use t_database_action; + use t_database_option; + public const ACTION_NONE = 0; public const ACTION_GRANT = 1; public const ACTION_REVOKE = 2; - public const OPTION_NONE = 0; - public const OPTION_CASCADE = 1; - public const OPTION_RESTRICT = 2; - public const ON_NONE = 0; public const ON_TABLES_TO = 1; public const ON_SEQUENCES = 2; @@ -45,13 +48,13 @@ class c_base_query_alter_default_priveleges extends c_base_query { public const PRIVILEGE_CREATE = 10; public const PRIVILEGE_ALL = 11; - use t_base_query_in_schema; + public const OPTION_NONE = 0; + public const OPTION_CASCADE = 1; + public const OPTION_RESTRICT = 2; protected const pr_QUERY_COMMAND = 'alter default privileges'; protected $abbreviated; - protected $action; - protected $option; protected $option_grant; protected $on; protected $privileges; @@ -64,12 +67,11 @@ class c_base_query_alter_default_priveleges extends c_base_query { parent::__construct(); $this->query_in_schema = NULL; + $this->query_action = NULL; + $this->query_option = NULL; $this->for_targets = NULL; $this->abbreviated = NULL; - $this->action = NULL; - $this->action_scope = NULL; - $this->option = NULL; $this->option_grant = NULL; $this->on = NULL; $this->privileges = NULL; @@ -83,10 +85,9 @@ class c_base_query_alter_default_priveleges extends c_base_query { parent::__destruct(); unset($this->query_in_schema); + unset($this->query_action); unset($this->abbreviated); - unset($this->action); - unset($this->option); unset($this->option_grant); unset($this->privileges); unset($this->role_names); @@ -149,7 +150,7 @@ class c_base_query_alter_default_priveleges extends c_base_query { return new c_base_return_true(); } - elseif ($target === TRUE) { + else if ($target === TRUE) { $this->for_role_targets = TRUE; } @@ -158,58 +159,6 @@ class c_base_query_alter_default_priveleges extends c_base_query { } /** - * Assigns this SQL to be a GRANT/REVOKE operation. - * - * @param int|null $action - * Whether or not to use GRANT or REVOKE in the query. - * Set to NULL to disable. - * - * @return c_base_return_status - * TRUE on success, FALSE otherwise. - * FALSE with error bit set is returned on error. - */ - public function set_action($action) { - if (is_null($grant)) { - $this->action = NULL; - return new c_base_return_true(); - } - - if ($action === static::ACTION_GRANT || $action === static::ACTION_REVOKE) { - $this->action = $action; - return new c_base_return_true(); - } - - $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'action', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); - return c_base_return_error::s_false($error); - } - - /** - * Assigns this SQL to be a CASCADE/RESTRICT operation. - * - * @param int|null $option - * Whether or not to use CASCADE or RESTRICT in the query. - * Set to NULL to disable. - * - * @return c_base_return_status - * TRUE on success, FALSE otherwise. - * FALSE with error bit set is returned on error. - */ - public function set_option($option) { - if (is_null($option)) { - $this->option = NULL; - return new c_base_return_true(); - } - - if ($option === static::OPTION_CASCADE || $option === static::OPTION_RESTRICT) { - $this->option = $option; - return new c_base_return_true(); - } - - $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'option', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); - return c_base_return_error::s_false($error); - } - - /** * Enables/Disables the SQL WITH GRANT OPTION. * * @param bool|null $option_grant @@ -312,7 +261,7 @@ class c_base_query_alter_default_priveleges extends c_base_query { /** * Set the role names. * - * @param c_base_query_argument_role_name|null $role_name + * @param c_database_argument_role_name|null $role_name * The role name to use. * Set to NULL to disable. * When NULL, this will remove all role names regardless of the $append parameter. @@ -335,7 +284,7 @@ class c_base_query_alter_default_priveleges extends c_base_query { return c_base_return_error::s_false($error); } - if ($role_name instanceof c_base_query_argument_role_name) { + if ($role_name instanceof c_database_argument_role_name) { if ($append) { if (!is_array($this->role_names)) { $this->role_names = []; @@ -361,7 +310,7 @@ class c_base_query_alter_default_priveleges extends c_base_query { * (optional) Get the role name at the specified index. * When NULL, all role names are returned. * - * @return c_base_query_argument_role_name|c_base_return_array|c_base_return_null + * @return c_database_argument_role_name|c_base_return_array|c_base_return_null * An array of role names or NULL if not defined. * A single role name is returned if $index is an integer. * NULL with the error bit set is returned on error. @@ -377,7 +326,7 @@ class c_base_query_alter_default_priveleges extends c_base_query { } } else { - if (is_int($index) && array_key_exists($index, $this->role_names) && $this->role_names[$index] instanceof c_base_query_argument_role_name) { + if (is_int($index) && array_key_exists($index, $this->role_names) && $this->role_names[$index] instanceof c_database_argument_role_name) { return $this->role_names[$index]; } @@ -431,38 +380,6 @@ class c_base_query_alter_default_priveleges extends c_base_query { } /** - * Get the GRANT/REVOKE status. - * - * @return c_base_return_int|c_base_return_null - * Integer representing the action is returned on success. - * NULL is returned if undefined. - * FALSE with error bit set is returned on error. - */ - protected function get_action() { - if (is_null($this->action)) { - return new c_base_return_null(); - } - - return c_base_return_int::s_new($this->action); - } - - /** - * Get the CASCADE/RESTRICT status. - * - * @return c_base_return_int|c_base_return_null - * An integer representing the CASCADE/RESTRICT option. - * NULL is returned if undefined. - * FALSE with error bit set is returned on error. - */ - protected function get_option() { - if (is_null($this->option)) { - return new c_base_return_null(); - } - - return c_base_return_int::s_new($this->option); - } - - /** * Get the WITH GRANT OPTION status. * * @return c_base_return_bool|c_base_return_null @@ -518,7 +435,7 @@ class c_base_query_alter_default_priveleges extends c_base_query { } } else { - if (is_int($index) && array_key_exists($index, $this->aggregate_signatures) && $this->aggregate_signatures[$index] instanceof c_base_query_argument_aggregate_signature) { + if (is_int($index) && array_key_exists($index, $this->aggregate_signatures) && $this->aggregate_signatures[$index] instanceof c_database_argument_aggregate_signature) { return clone($this->privileges[$index]); } @@ -538,11 +455,19 @@ class c_base_query_alter_default_priveleges extends c_base_query { return new c_base_return_false(); } + switch ($this->query_action) { + case static::ACTION_GRANT: + case static::ACTION_REVOKE: + break; + default: + return new c_base_return_false(); + } + $this->value = static::pr_QUERY_COMMAND; // [ FOR ROLE target_role [, ... ] ] if (is_array($this->for_role_targets) && !empty($this->for_role_targets)) { - $this->value .= ' ' . c_base_query_string::FOR . ' ' . c_base_query_string::ROLE; + $this->value .= ' ' . c_database_string::FOR . ' ' . c_database_string::ROLE; $names = NULL; foreach ($this->for_role_targets as $schema_name) { @@ -555,7 +480,7 @@ class c_base_query_alter_default_priveleges extends c_base_query { // [ IN SCHEMA schema_name [, ... ] ] if (is_array($this->query_in_schema) && !empty($this->query_in_schema)) { - $this->value .= ' ' . c_base_query_string::IN . ' ' . c_base_query_string::SCHEMA; + $this->value .= ' ' . c_database_string::IN . ' ' . c_database_string::SCHEMA; $names = NULL; foreach ($this->query_in_schema as $schema_name) { @@ -566,14 +491,14 @@ class c_base_query_alter_default_priveleges extends c_base_query { unset($names); } - if ($this->action === static::ACTION_GRANT) { - $this->value .= ' ' . c_base_query_string::GRANT; + if ($this->query_action === static::ACTION_GRANT) { + $this->value .= ' ' . c_database_string::GRANT; } - else if ($this->action === static::ACTION_REVOKE) { - $this->value .= ' ' . c_base_query_string::REVOKE; + else if ($this->query_action === static::ACTION_REVOKE) { + $this->value .= ' ' . c_database_string::REVOKE; if ($this->option_grant) { - $this->value .= ' ' . c_base_query_string::GRANT_OPTION_FOR; + $this->value .= ' ' . c_database_string::GRANT_OPTION_FOR; } } @@ -583,37 +508,37 @@ class c_base_query_alter_default_priveleges extends c_base_query { $privileges .= ', '; switch ($privilege) { case static::PRIVILEGE_SELECT: - $privileges .= c_base_query_string::SELECT; + $privileges .= c_database_string::SELECT; break; case static::PRIVILEGE_INSERT: - $privileges .= c_base_query_string::INSERT; + $privileges .= c_database_string::INSERT; break; case static::PRIVILEGE_UPDATE: - $privileges .= c_base_query_string::UPDATE; + $privileges .= c_database_string::UPDATE; break; case static::PRIVILEGE_DELETE: - $privileges .= c_base_query_string::DELETE; + $privileges .= c_database_string::DELETE; break; case static::PRIVILEGE_TRUNCATE: - $privileges .= c_base_query_string::TRUNCATE; + $privileges .= c_database_string::TRUNCATE; break; case static::PRIVILEGE_REFERENCES: - $privileges .= c_base_query_string::REFERENCES; + $privileges .= c_database_string::REFERENCES; break; case static::PRIVILEGE_TRIGGER: - $privileges .= c_base_query_string::TRIGGER; + $privileges .= c_database_string::TRIGGER; break; case static::PRIVILEGE_USAGE: - $privileges .= c_base_query_string::USAGE; + $privileges .= c_database_string::USAGE; break; case static::PRIVILEGE_EXECUTE: - $privileges .= c_base_query_string::EXECUTE; + $privileges .= c_database_string::EXECUTE; break; case static::PRIVILEGE_CREATE: - $privileges .= c_base_query_string::CREATE; + $privileges .= c_database_string::CREATE; break; case static::PRIVILEGE_ALL: - $privileges .= c_base_query_string::ALL; + $privileges .= c_database_string::ALL; break; default: break; @@ -621,56 +546,58 @@ class c_base_query_alter_default_priveleges extends c_base_query { } $this->value .= ltrim($privileges, ','); + unset($privileges); // ON ... switch($this->on) { case static::ON_TABLES_TO: - $this->value .= ' ' . c_base_query_string::ON_TABLES_TO; + $this->value .= ' ' . c_database_string::ON_TABLES_TO; break; case static::ON_SEQUENCES: - $this->value .= ' ' . c_base_query_string::ON_SEQUENCES; + $this->value .= ' ' . c_database_string::ON_SEQUENCES; break; case static::ON_FUNCTIONS: - $this->value .= ' ' . c_base_query_string::ON_FUNCTIONS; + $this->value .= ' ' . c_database_string::ON_FUNCTIONS; break; case static::ON_TYPES: - $this->value .= ' ' . c_base_query_string::ON_TYPES; + $this->value .= ' ' . c_database_string::ON_TYPES; break; case static::ON_SCHEMAS: - $this->value .= ' ' . c_base_query_string::ON_SCHEMAS; + $this->value .= ' ' . c_database_string::ON_SCHEMAS; break; } // [ TO | FROM ] ... role names ... - if ($this->action === static::ACTION_GRANT) { - $this->value .= ' ' . c_base_query_string::TO; + if ($this->query_action === static::ACTION_GRANT) { + $this->value .= ' ' . c_database_string::TO; } - else if ($this->action === static::ACTION_REVOKE) { - $this->value .= ' ' . c_base_query_string::FROM; + else if ($this->query_action === static::ACTION_REVOKE) { + $this->value .= ' ' . c_database_string::FROM; } foreach ($this->role_names as $role_name) { - if (!($role_name instanceof c_base_query_argument_role_name)) { + if (!($role_name instanceof c_database_argument_role_name)) { continue; } $role_name->do_build_argument(); $this->value .= ' ' . $role_name->get_value_exact(); } + unset($role_name); - if ($this->action === static::ACTION_GRANT) { + if ($this->query_action === static::ACTION_GRANT) { // [ WITH GRANT OPTION ] if ($this->option_grant) { - $this->value .= ' ' . c_base_query_string::WITH_GRANT_OPTION; + $this->value .= ' ' . c_database_string::WITH_GRANT_OPTION; } } - else if ($this->action === static::ACTION_REVOKE) { + else if ($this->query_action === static::ACTION_REVOKE) { // [ CASCADE | RESTRICT ] - if ($this->option === static::OPTION_CASCADE) { - $this->value .= ' ' . c_base_query_string::CASCADE; + if ($this->query_option === static::OPTION_CASCADE) { + $this->value .= ' ' . c_database_string::CASCADE; } - else if ($this->option === static::OPTION_RESTRICT) { - $this->value .= ' ' . c_base_query_string::RESTRICT; + else if ($this->query_option === static::OPTION_RESTRICT) { + $this->value .= ' ' . c_database_string::RESTRICT; } } diff --git a/common/database/classes/database_alter_domain.php b/common/database/classes/database_alter_domain.php new file mode 100644 index 0000000..5d71104 --- /dev/null +++ b/common/database/classes/database_alter_domain.php @@ -0,0 +1,367 @@ +query_name = NULL; + $this->query_owner_to = NULL; + $this->query_rename_to = NULL; + $this->query_set_schema = NULL; + $this->query_action = NULL; + $this->query_action_property = NULL; + $this->query_option = NULL; + + $this->expression = NULL; + $this->contraint = NULL; + $this->contraint_new = NULL; + } + + /** + * Class destructor. + */ + public function __destruct() { + unset($this->query_name); + unset($this->query_owner_to); + unset($this->query_rename_to); + unset($this->query_set_schema); + unset($this->query_action); + unset($this->query_action_property); + unset($this->query_option); + + unset($this->expression); + unset($this->contraint); + unset($this->contraint_new); + + parent::__destruct(); + } + + /** + * @see: t_base_return_value::p_s_new() + */ + public static function s_new($value) { + return self::p_s_new($value, __CLASS__); + } + + /** + * @see: t_base_return_value::p_s_value() + */ + public static function s_value($return) { + return self::p_s_value($return, __CLASS__); + } + + /** + * @see: t_base_return_value_exact::p_s_value_exact() + */ + public static function s_value_exact($return) { + return self::p_s_value_exact($return, __CLASS__, ''); + } + + /** + * Assigns the expression. + * + * The expression is required by the SET_DEFAULT action. + * + * @param string|null $expression + * The expression string to use. + * Set to NULL to disable. + * + * @return c_base_return_status + * TRUE on success, FALSE otherwise. + * FALSE with error bit set is returned on error. + */ + public function set_expression($expression) { + if (is_null($expression)) { + $this->expression = NULL; + return new c_base_return_true(); + } + + if (is_string($expression)) { + $this->expression = $expression; + return new c_base_return_true(); + } + + $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'expression', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); + return c_base_return_error::s_false($error); + } + + /** + * Assigns the constraint name or domain constraint string. + * + * @param string|null $constraint + * The constraint string to use. + * Set to NULL to disable. + * @param string|null $constraint_new + * When the constraint + * Set to NULL to disable. + * + * @return c_base_return_status + * TRUE on success, FALSE otherwise. + * FALSE with error bit set is returned on error. + */ + public function set_constraint($constraint, $constraint_new = NULL) { + if (is_null($constraint)) { + if (is_null($constraint_new)) { + $this->constraint = NULL; + $this->constraint_new = NULL; + return new c_base_return_true(); + } + + if (is_string($constraint_new)) { + $this->constraint = NULL; + $this->constraint_new = $constraint_new; + return new c_base_return_true(); + } + } + else if (is_string($constraint)) { + if (is_null($constraint_new)) { + $this->constraint = $constraint; + $this->constraint_new = NULL; + return new c_base_return_true(); + } + else if (is_string($constraint_new)) { + $this->constraint = $constraint; + $this->constraint_new = $constraint_new; + return new c_base_return_true(); + } + } + + $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'expression', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); + return c_base_return_error::s_false($error); + } + + /** + * Get expression. + * + * @return c_base_return_string|c_base_return_null + * An string representing the expression. + * NULL is returned if undefined. + * FALSE with error bit set is returned on error. + */ + protected function get_expression() { + if (is_null($this->expression)) { + return new c_base_return_null(); + } + + return c_base_return_string::s_new($this->expression); + } + + /** + * Get constraint. + * + * @return c_base_return_string|c_base_return_null + * An string representing the constraint. + * NULL is returned if undefined. + * FALSE with error bit set is returned on error. + */ + public function get_constraint() { + if (is_null($this->constraint)) { + return new c_base_return_null(); + } + + return c_base_return_string::s_new($this->constraint); + } + + /** + * Get constraint (new name). + * + * This is only relevant when action is set to self::ACTION_RENAME_CONSTRAINT. + * + * @return c_base_return_string|c_base_return_null + * An string representing the new constraint name. + * NULL is returned if undefined. + * FALSE with error bit set is returned on error. + */ + public function get_constraint_new() { + if (is_null($this->constraint_new)) { + return new c_base_return_null(); + } + + return c_base_return_string::s_new($this->constraint_new); + } + + /** + * Implements do_build(). + */ + public function do_build() { + if (is_null($this->query_name)) { + return new c_base_return_false(); + } + + $action = NULL; + switch ($this->query_action) { + case static::ACTION_ADD: + if (!is_string($this->constraint)) { + unset($action); + return new c_base_return_false(); + } + + $action = c_database_string::ADD; + $action .= ' ' . $this->constraint; + + if ($this->property === static::PROPERTY_NOT_VALID) { + $action .= ' ' . c_database_string::NOT_VALID; + } + break; + + case static::ACTION_DROP: + $action = c_database_string::DROP; + if ($this->property === static::PROPERTY_NOT_NULL) { + $action .= ' ' . c_database_string::NOT_NULL; + } + break; + + case static::ACTION_DROP_CONSTRAINT: + if (!is_string($this->constraint)) { + unset($action); + return new c_base_return_false(); + } + + $action = c_database_string::DROP_CONSTRAINT; + if ($this->property === static::PROPERTY_IF_EXISTS) { + $action .= ' ' . c_database_string::IF_EXISTS; + } + + $action .= ' ' . $this->constraint; + + if ($this->option === static::OPTION_RESTRICT) { + $action .= ' ' . c_database_string::RESTRICT; + } + else if ($this->option === static::OPTION_CASCADE) { + $action .= ' ' . c_database_string::CASCADE; + } + break; + + case static::ACTION_DROP_DEFAULT: + $action = c_database_string::DROP_DEFAULT; + break; + + case static::ACTION_OWNER_TO: + if (!is_string($this->query_owner_to_user_name)) { + unset($action); + return new c_base_return_false(); + } + + $action = c_database_string::OWNER_TO . ' (' . $this->query_owner_to_user_name . ')'; + break; + + case static::ACTION_RENAME_CONSTRAINT: + if (!is_string($this->constraint) || !is_string($this->constraint_new)) { + unset($action); + return new c_base_return_false(); + } + + $action = c_database_string::RENAME_CONSTRAINT . ' ' . $this->constraint . ' ' . c_database_string::TO . ' ' . $this->constraint_new; + break; + + case static::ACTION_RENAME_TO: + if (!is_string($this->query_rename_to)) { + unset($action); + return new c_base_return_false(); + } + + $action = c_database_string::RENAME_TO . ' (' . $this->query_rename_to . ')'; + break; + + case static::ACTION_SET: + $action = c_database_string::SET; + if ($this->property === static::PROPERTY_NOT_NULL) { + $action .= ' ' . c_database_string::NOT_NULL; + } + break; + + case static::ACTION_SET_DEFAULT: + if (!is_string($this->expression)) { + unset($action); + return new c_base_return_false(); + } + + $action = c_database_string::SET_DEFAULT . ' ' . $this->expression; + break; + + case static::ACTION_SET_SCHEMA: + if (!is_string($this->query_set_schema)) { + unset($action); + return new c_base_return_false(); + } + + $action = ' ' . c_database_string::SET_SCHEMA . ' (' . $this->query_set_schema . ')'; + break; + + case static::ACTION_VALIDATE_CONSTRAINT: + if (!is_string($this->constraint)) { + unset($action); + return new c_base_return_false(); + } + + $action = c_database_string::VALIDATE_CONSTRAINT . ' ' . $this->constraint; + break; + + default: + unset($action); + return new c_base_return_false(); + } + + $this->value = static::pr_QUERY_COMMAND; + $this->value .= ' ' . $this->query_name; + $this->value .= ' ' . $action; + + return new c_base_return_true(); + } +} diff --git a/common/base/classes/base_query_alter_event_trigger.php b/common/database/classes/database_alter_event_trigger.php similarity index 92% rename from common/base/classes/base_query_alter_event_trigger.php rename to common/database/classes/database_alter_event_trigger.php index 735b60e..98f4f0e 100644 --- a/common/base/classes/base_query_alter_event_trigger.php +++ b/common/database/classes/database_alter_event_trigger.php @@ -7,7 +7,8 @@ namespace n_koopa; require_once('common/base/classes/base_error.php'); require_once('common/base/classes/base_return.php'); -require_once('common/base/classes/base_query.php'); + +require_once('common/database/classes/database_query.php'); require_once('common/base/traits/base_query.php'); @@ -18,7 +19,7 @@ require_once('common/base/traits/base_query.php'); * * @see: https://www.postgresql.org/docs/current/static/sql-alteraggregate.html */ -class c_base_query_alter_coalation extends c_base_query { +class c_database_alter_coalation extends c_database_query { protected const pr_QUERY_COMMAND = 'alter event trigger'; diff --git a/common/base/classes/base_query_alter_function.php b/common/database/classes/database_alter_extension.php similarity index 92% rename from common/base/classes/base_query_alter_function.php rename to common/database/classes/database_alter_extension.php index 9b81516..92ac008 100644 --- a/common/base/classes/base_query_alter_function.php +++ b/common/database/classes/database_alter_extension.php @@ -7,7 +7,8 @@ namespace n_koopa; require_once('common/base/classes/base_error.php'); require_once('common/base/classes/base_return.php'); -require_once('common/base/classes/base_query.php'); + +require_once('common/database/classes/database_query.php'); require_once('common/base/traits/base_query.php'); @@ -18,7 +19,7 @@ require_once('common/base/traits/base_query.php'); * * @see: https://www.postgresql.org/docs/current/static/sql-alteraggregate.html */ -class c_base_query_alter_coalation extends c_base_query { +class c_database_alter_coalation extends c_database_query { protected const pr_QUERY_COMMAND = 'alter coalation'; diff --git a/common/base/classes/base_query_alter_foreign_table.php b/common/database/classes/database_alter_foreign_data_wrapper.php similarity index 92% rename from common/base/classes/base_query_alter_foreign_table.php rename to common/database/classes/database_alter_foreign_data_wrapper.php index 9b81516..92ac008 100644 --- a/common/base/classes/base_query_alter_foreign_table.php +++ b/common/database/classes/database_alter_foreign_data_wrapper.php @@ -7,7 +7,8 @@ namespace n_koopa; require_once('common/base/classes/base_error.php'); require_once('common/base/classes/base_return.php'); -require_once('common/base/classes/base_query.php'); + +require_once('common/database/classes/database_query.php'); require_once('common/base/traits/base_query.php'); @@ -18,7 +19,7 @@ require_once('common/base/traits/base_query.php'); * * @see: https://www.postgresql.org/docs/current/static/sql-alteraggregate.html */ -class c_base_query_alter_coalation extends c_base_query { +class c_database_alter_coalation extends c_database_query { protected const pr_QUERY_COMMAND = 'alter coalation'; diff --git a/common/base/classes/base_query_alter_extension.php b/common/database/classes/database_alter_foreign_table.php similarity index 92% rename from common/base/classes/base_query_alter_extension.php rename to common/database/classes/database_alter_foreign_table.php index 9b81516..92ac008 100644 --- a/common/base/classes/base_query_alter_extension.php +++ b/common/database/classes/database_alter_foreign_table.php @@ -7,7 +7,8 @@ namespace n_koopa; require_once('common/base/classes/base_error.php'); require_once('common/base/classes/base_return.php'); -require_once('common/base/classes/base_query.php'); + +require_once('common/database/classes/database_query.php'); require_once('common/base/traits/base_query.php'); @@ -18,7 +19,7 @@ require_once('common/base/traits/base_query.php'); * * @see: https://www.postgresql.org/docs/current/static/sql-alteraggregate.html */ -class c_base_query_alter_coalation extends c_base_query { +class c_database_alter_coalation extends c_database_query { protected const pr_QUERY_COMMAND = 'alter coalation'; diff --git a/common/base/classes/base_query_alter_foreign_data_wrapper.php b/common/database/classes/database_alter_function.php similarity index 92% rename from common/base/classes/base_query_alter_foreign_data_wrapper.php rename to common/database/classes/database_alter_function.php index 9b81516..92ac008 100644 --- a/common/base/classes/base_query_alter_foreign_data_wrapper.php +++ b/common/database/classes/database_alter_function.php @@ -7,7 +7,8 @@ namespace n_koopa; require_once('common/base/classes/base_error.php'); require_once('common/base/classes/base_return.php'); -require_once('common/base/classes/base_query.php'); + +require_once('common/database/classes/database_query.php'); require_once('common/base/traits/base_query.php'); @@ -18,7 +19,7 @@ require_once('common/base/traits/base_query.php'); * * @see: https://www.postgresql.org/docs/current/static/sql-alteraggregate.html */ -class c_base_query_alter_coalation extends c_base_query { +class c_database_alter_coalation extends c_database_query { protected const pr_QUERY_COMMAND = 'alter coalation'; diff --git a/common/database/classes/database_alter_group.php b/common/database/classes/database_alter_group.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_alter_group.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_alter_index.php b/common/database/classes/database_alter_index.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_alter_index.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_alter_language.php b/common/database/classes/database_alter_language.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_alter_language.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_alter_large_object.php b/common/database/classes/database_alter_large_object.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_alter_large_object.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_alter_materialized_view.php b/common/database/classes/database_alter_materialized_view.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_alter_materialized_view.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_alter_operator.php b/common/database/classes/database_alter_operator.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_alter_operator.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_alter_operator_class.php b/common/database/classes/database_alter_operator_class.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_alter_operator_class.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_alter_operator_family.php b/common/database/classes/database_alter_operator_family.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_alter_operator_family.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_alter_policy.php b/common/database/classes/database_alter_policy.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_alter_policy.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_alter_publication.php b/common/database/classes/database_alter_publication.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_alter_publication.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_alter_role.php b/common/database/classes/database_alter_role.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_alter_role.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_alter_rule.php b/common/database/classes/database_alter_rule.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_alter_rule.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_alter_schema.php b/common/database/classes/database_alter_schema.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_alter_schema.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_alter_table.php b/common/database/classes/database_alter_table.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_alter_table.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_alter_tablespace.php b/common/database/classes/database_alter_tablespace.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_alter_tablespace.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_alter_text_search_configuration.php b/common/database/classes/database_alter_text_search_configuration.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_alter_text_search_configuration.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_alter_text_search_dictionary.php b/common/database/classes/database_alter_text_search_dictionary.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_alter_text_search_dictionary.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_alter_text_search_parser.php b/common/database/classes/database_alter_text_search_parser.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_alter_text_search_parser.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_alter_text_search_template.php b/common/database/classes/database_alter_text_search_template.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_alter_text_search_template.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_alter_trigger.php b/common/database/classes/database_alter_trigger.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_alter_trigger.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_alter_type.php b/common/database/classes/database_alter_type.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_alter_type.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_alter_user.php b/common/database/classes/database_alter_user.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_alter_user.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_alter_user_mapping.php b/common/database/classes/database_alter_user_mapping.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_alter_user_mapping.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_alter_view.php b/common/database/classes/database_alter_view.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_alter_view.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_analyze.php b/common/database/classes/database_analyze.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_analyze.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_begin.php b/common/database/classes/database_begin.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_begin.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_checkpoint.php b/common/database/classes/database_checkpoint.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_checkpoint.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_close.php b/common/database/classes/database_close.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_close.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_cluster.php b/common/database/classes/database_cluster.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_cluster.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/base/classes/base_query_code.php b/common/database/classes/database_code.php similarity index 87% rename from common/base/classes/base_query_code.php rename to common/database/classes/database_code.php index e9a03ad..f862448 100644 --- a/common/base/classes/base_query_code.php +++ b/common/database/classes/database_code.php @@ -10,7 +10,7 @@ namespace n_koopa; /** * Codes associated with postgresql user/session information. */ -class c_base_query_code_user { +class c_database_code_user { public const NONE = 0; public const CURRENT = 1; public const SESSION = 2; @@ -20,7 +20,7 @@ class c_base_query_code_user { /** * Codes associated with GROUP BY, ORDER BY, and related queries. */ -class c_base_query_code_direction { +class c_database_code_direction { public const NONE = 0; public const ASCEND = 1; public const DESCEND = 2; @@ -29,7 +29,7 @@ class c_base_query_code_direction { /** * Codes associated with SET and related queries. */ -class c_base_query_code_set { +class c_database_code_set { public const NONE = 0; public const TO = 1; public const EQUAL = 2; @@ -39,7 +39,7 @@ class c_base_query_code_set { /** * Codes associated with RESET and related queries. */ -class c_base_query_code_reset { +class c_database_code_reset { public const NONE = 0; public const ALL = 1; public const PARAMETER = 2; diff --git a/common/database/classes/database_comment.php b/common/database/classes/database_comment.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_comment.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_commit.php b/common/database/classes/database_commit.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_commit.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_commit_prepared.php b/common/database/classes/database_commit_prepared.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_commit_prepared.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_copy.php b/common/database/classes/database_copy.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_copy.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_create_access_method.php b/common/database/classes/database_create_access_method.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_create_access_method.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_create_aggregate.php b/common/database/classes/database_create_aggregate.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_create_aggregate.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_create_cast.php b/common/database/classes/database_create_cast.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_create_cast.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_create_collation.php b/common/database/classes/database_create_collation.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_create_collation.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_create_conversion.php b/common/database/classes/database_create_conversion.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_create_conversion.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_create_database.php b/common/database/classes/database_create_database.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_create_database.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_create_domain.php b/common/database/classes/database_create_domain.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_create_domain.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_create_event_trigger.php b/common/database/classes/database_create_event_trigger.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_create_event_trigger.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_create_extension.php b/common/database/classes/database_create_extension.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_create_extension.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_create_foreign.php b/common/database/classes/database_create_foreign.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_create_foreign.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_create_foreign_data_wrapper.php b/common/database/classes/database_create_foreign_data_wrapper.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_create_foreign_data_wrapper.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_create_function.php b/common/database/classes/database_create_function.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_create_function.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_create_group.php b/common/database/classes/database_create_group.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_create_group.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_create_index.php b/common/database/classes/database_create_index.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_create_index.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_create_language.php b/common/database/classes/database_create_language.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_create_language.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_create_materialized_view.php b/common/database/classes/database_create_materialized_view.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_create_materialized_view.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_create_operator.php b/common/database/classes/database_create_operator.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_create_operator.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_create_operator_class.php b/common/database/classes/database_create_operator_class.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_create_operator_class.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_create_operator_family.php b/common/database/classes/database_create_operator_family.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_create_operator_family.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_create_policy.php b/common/database/classes/database_create_policy.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_create_policy.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_create_publication.php b/common/database/classes/database_create_publication.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_create_publication.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_create_role.php b/common/database/classes/database_create_role.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_create_role.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_create_rule.php b/common/database/classes/database_create_rule.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_create_rule.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_create_schema.php b/common/database/classes/database_create_schema.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_create_schema.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_create_sequence.php b/common/database/classes/database_create_sequence.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_create_sequence.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_create_server.php b/common/database/classes/database_create_server.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_create_server.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_create_statistics.php b/common/database/classes/database_create_statistics.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_create_statistics.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_create_subscription.php b/common/database/classes/database_create_subscription.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_create_subscription.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_create_table.php b/common/database/classes/database_create_table.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_create_table.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_create_table_as.php b/common/database/classes/database_create_table_as.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_create_table_as.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_create_tablespace.php b/common/database/classes/database_create_tablespace.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_create_tablespace.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_create_text_search_configuration.php b/common/database/classes/database_create_text_search_configuration.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_create_text_search_configuration.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_create_text_search_dictionary.php b/common/database/classes/database_create_text_search_dictionary.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_create_text_search_dictionary.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_create_text_search_parser.php b/common/database/classes/database_create_text_search_parser.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_create_text_search_parser.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_create_text_search_template.php b/common/database/classes/database_create_text_search_template.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_create_text_search_template.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_create_transform.php b/common/database/classes/database_create_transform.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_create_transform.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_create_trigger.php b/common/database/classes/database_create_trigger.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_create_trigger.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_create_type.php b/common/database/classes/database_create_type.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_create_type.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_create_user.php b/common/database/classes/database_create_user.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_create_user.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_create_user_mapping.php b/common/database/classes/database_create_user_mapping.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_create_user_mapping.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_create_view.php b/common/database/classes/database_create_view.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_create_view.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_deallocate.php b/common/database/classes/database_deallocate.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_deallocate.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_declare.php b/common/database/classes/database_declare.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_declare.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_delete.php b/common/database/classes/database_delete.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_delete.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_discard.php b/common/database/classes/database_discard.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_discard.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_do.php b/common/database/classes/database_do.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_do.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_drop_access_method.php b/common/database/classes/database_drop_access_method.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_drop_access_method.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_drop_aggregate.php b/common/database/classes/database_drop_aggregate.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_drop_aggregate.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_drop_cast.php b/common/database/classes/database_drop_cast.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_drop_cast.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_drop_collation.php b/common/database/classes/database_drop_collation.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_drop_collation.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_drop_conversion.php b/common/database/classes/database_drop_conversion.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_drop_conversion.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_drop_database.php b/common/database/classes/database_drop_database.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_drop_database.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_drop_domain.php b/common/database/classes/database_drop_domain.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_drop_domain.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_drop_event_trigger.php b/common/database/classes/database_drop_event_trigger.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_drop_event_trigger.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_drop_extension.php b/common/database/classes/database_drop_extension.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_drop_extension.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_drop_foreign_data_wrapper.php b/common/database/classes/database_drop_foreign_data_wrapper.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_drop_foreign_data_wrapper.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_drop_foreign_table.php b/common/database/classes/database_drop_foreign_table.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_drop_foreign_table.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_drop_function.php b/common/database/classes/database_drop_function.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_drop_function.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_drop_group.php b/common/database/classes/database_drop_group.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_drop_group.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_drop_index.php b/common/database/classes/database_drop_index.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_drop_index.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_drop_language.php b/common/database/classes/database_drop_language.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_drop_language.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_drop_materialized_view.php b/common/database/classes/database_drop_materialized_view.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_drop_materialized_view.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_drop_operator.php b/common/database/classes/database_drop_operator.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_drop_operator.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_drop_operator_class.php b/common/database/classes/database_drop_operator_class.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_drop_operator_class.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_drop_operator_family.php b/common/database/classes/database_drop_operator_family.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_drop_operator_family.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_drop_owned.php b/common/database/classes/database_drop_owned.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_drop_owned.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_drop_policy.php b/common/database/classes/database_drop_policy.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_drop_policy.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_drop_publication.php b/common/database/classes/database_drop_publication.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_drop_publication.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_drop_role.php b/common/database/classes/database_drop_role.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_drop_role.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_drop_rule.php b/common/database/classes/database_drop_rule.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_drop_rule.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_drop_schema.php b/common/database/classes/database_drop_schema.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_drop_schema.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_drop_sequence.php b/common/database/classes/database_drop_sequence.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_drop_sequence.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_drop_server.php b/common/database/classes/database_drop_server.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_drop_server.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_drop_statistics.php b/common/database/classes/database_drop_statistics.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_drop_statistics.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_drop_subscription.php b/common/database/classes/database_drop_subscription.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_drop_subscription.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_drop_table.php b/common/database/classes/database_drop_table.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_drop_table.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_drop_tablespace.php b/common/database/classes/database_drop_tablespace.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_drop_tablespace.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_drop_text_search_configuration.php b/common/database/classes/database_drop_text_search_configuration.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_drop_text_search_configuration.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_drop_text_search_dictionary.php b/common/database/classes/database_drop_text_search_dictionary.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_drop_text_search_dictionary.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_drop_text_search_parser.php b/common/database/classes/database_drop_text_search_parser.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_drop_text_search_parser.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_drop_text_search_template.php b/common/database/classes/database_drop_text_search_template.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_drop_text_search_template.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_drop_transform.php b/common/database/classes/database_drop_transform.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_drop_transform.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_drop_trigger.php b/common/database/classes/database_drop_trigger.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_drop_trigger.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_drop_type.php b/common/database/classes/database_drop_type.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_drop_type.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_drop_user.php b/common/database/classes/database_drop_user.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_drop_user.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_drop_user_mapping.php b/common/database/classes/database_drop_user_mapping.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_drop_user_mapping.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_drop_view.php b/common/database/classes/database_drop_view.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_drop_view.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_end.php b/common/database/classes/database_end.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_end.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_execute.php b/common/database/classes/database_execute.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_execute.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_explain.php b/common/database/classes/database_explain.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_explain.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_fetch.php b/common/database/classes/database_fetch.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_fetch.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_grant.php b/common/database/classes/database_grant.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_grant.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_import_foreign_schema.php b/common/database/classes/database_import_foreign_schema.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_import_foreign_schema.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_insert.php b/common/database/classes/database_insert.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_insert.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_listen.php b/common/database/classes/database_listen.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_listen.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_load.php b/common/database/classes/database_load.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_load.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_lock.php b/common/database/classes/database_lock.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_lock.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_move.php b/common/database/classes/database_move.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_move.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_notify.php b/common/database/classes/database_notify.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_notify.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_prepare.php b/common/database/classes/database_prepare.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_prepare.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_prepare_transaction.php b/common/database/classes/database_prepare_transaction.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_prepare_transaction.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/base/classes/base_query.php b/common/database/classes/database_query.php similarity index 94% rename from common/base/classes/base_query.php rename to common/database/classes/database_query.php index b67b550..a3491f7 100644 --- a/common/base/classes/base_query.php +++ b/common/database/classes/database_query.php @@ -18,18 +18,18 @@ namespace n_koopa; require_once('common/base/classes/base_error.php'); require_once('common/base/classes/base_return.php'); -require_once('common/base/interfaces/base_query.php'); +require_once('common/database/interfaces/database_query.php'); /** * The base class for building and returning a Postgresql query string. * * The built query is stored in value. * Strings should not be allowed to be assigned to this class. - * Instead, only other c_base_query objects may be assigned to the value. + * Instead, only other c_database_query objects may be assigned to the value. * * @todo: redesign and move all parameter settings to traits. */ -abstract class c_base_query extends c_base_return_string implements i_base_query { +abstract class c_database_query extends c_base_return_string implements i_database_query { public const PARAMETER_NONE = 0; protected const pr_QUERY_COMMAND = ''; @@ -78,17 +78,17 @@ abstract class c_base_query extends c_base_return_string implements i_base_query /** * Assign the value. * - * This changes the behavior of the extended class from accepting only strings to accepting only c_base_query. + * This changes the behavior of the extended class from accepting only strings to accepting only c_database_query. * - * @param c_base_query $value - * Any value so long as it is a c_base_query. + * @param c_database_query $value + * Any value so long as it is a c_database_query. * NULL is not allowed. * * @return bool * TRUE on success, FALSE otherwise. */ public function set_value($value) { - if (!($value instanceof c_base_query)) { + if (!($value instanceof c_database_query)) { return FALSE; } @@ -237,7 +237,7 @@ abstract class c_base_query extends c_base_return_string implements i_base_query * SQL queries may be passed to other SQL queries, marking them as sub-queries. * This will most commonly be added to other expressions. */ -class c_base_query_argument_query extends c_base_return_string implements i_base_query_argument { +class c_database_argument_query extends c_base_return_string implements i_database_argument { protected $query; /** @@ -282,7 +282,7 @@ class c_base_query_argument_query extends c_base_return_string implements i_base /** * Set the SQL query. * - * @param c_base_query|null $query + * @param c_database_query|null $query * A fully configured query. * Set to NULL to remove the assigned query. * @@ -296,7 +296,7 @@ class c_base_query_argument_query extends c_base_return_string implements i_base return new c_base_return_true(); } - if ($query instanceof c_base_query) { + if ($query instanceof c_database_query) { $this->query = clone($query); return new c_base_return_true(); } @@ -308,8 +308,8 @@ class c_base_query_argument_query extends c_base_return_string implements i_base /** * Get the assigned SQL query. * - * @return c_base_query|c_base_return_null - * A valid c_base_query. + * @return c_database_query|c_base_return_null + * A valid c_database_query. * NULL is returned if not assigned. * NULL with the error bit set is returned on error. */ @@ -318,7 +318,7 @@ class c_base_query_argument_query extends c_base_return_string implements i_base return new c_base_return_null(); } - if ($this->query instanceof c_base_query) { + if ($this->query instanceof c_database_query) { return clone($this->query); } @@ -364,7 +364,7 @@ class c_base_query_argument_query extends c_base_return_string implements i_base /** * Provide an SQL expression argument. */ -class c_base_query_argument_expression extends c_base_return_string implements i_base_query_argument { +class c_database_argument_expression extends c_base_return_string implements i_database_argument { protected const pr_QUERY_AS = 'as'; protected $expression; @@ -417,7 +417,7 @@ class c_base_query_argument_expression extends c_base_return_string implements i * Expression are usually fields but also be other expressions. * Expressions may even be SQL queries. * - * @param i_base_query_argument|null $expression + * @param i_database_argument|null $expression * The expression to assign. * Set to NULL to remove the assigned expression. * @@ -431,7 +431,7 @@ class c_base_query_argument_expression extends c_base_return_string implements i return new c_base_return_true(); } - if ($expression instanceof i_base_query_argument) { + if ($expression instanceof i_database_argument) { $this->expression = $expression; return new c_base_return_true(); } @@ -470,7 +470,7 @@ class c_base_query_argument_expression extends c_base_return_string implements i /** * Get the assigned SQL expression. * - * @return i_base_query_argument|null + * @return i_database_argument|null * A valid query argument. * NULL is returned if not assigned. * NULL with the error bit set is returned on error. @@ -480,7 +480,7 @@ class c_base_query_argument_expression extends c_base_return_string implements i return new c_base_return_null(); } - if ($this->expression instanceof i_base_query_argument) { + if ($this->expression instanceof i_database_argument) { return clone($this->expression); } @@ -540,7 +540,7 @@ class c_base_query_argument_expression extends c_base_return_string implements i /** * Provide an SQL expression argument, specific to column types. */ -class c_base_query_argument_expression_column extends c_base_query_argument_expression { +class c_database_argument_expression_column extends c_database_argument_expression { protected $column; /** @@ -673,7 +673,7 @@ class c_base_query_argument_expression_column extends c_base_query_argument_expr * This is essentially an aggregate_signature without the wildcard and ORDER BY support. * The ORDER BY support can then utilize this base without having its own wildcard and ORDER BY. */ -class c_base_query_argument_aggregate_signature_base extends c_base_return_string implements i_base_query_argument { +class c_database_argument_aggregate_signature_base extends c_base_return_string implements i_database_argument { public const QUERY_ARGUMENT_MODE_NONE = 0; public const QUERY_ARGUMENT_MODE_IN = 1; public const QUERY_ARGUMENT_MODE_VARIADIC = 2; @@ -909,7 +909,7 @@ class c_base_query_argument_aggregate_signature_base extends c_base_return_strin /** * Provide an SQL argument aggregate signature. */ -class c_base_query_argument_aggregate_signature extends c_base_query_argument_aggregate_signature_base { +class c_database_argument_aggregate_signature extends c_database_argument_aggregate_signature_base { protected $argument_all; /** @@ -1017,10 +1017,10 @@ class c_base_query_argument_aggregate_signature extends c_base_query_argument_ag $this->value = ''; if ($this->argument_mode === static::QUERY_MODE_IN) { - $this->value .= c_base_query_string::IN; + $this->value .= c_database_string::IN; } else if ($this->argument_mode === static::QUERY_MODE_VARIADIC) { - $this->value .= c_base_query_string::VARIADIC; + $this->value .= c_database_string::VARIADIC; } if (is_string($this->argument_name)) { @@ -1049,7 +1049,7 @@ class c_base_query_argument_aggregate_signature extends c_base_query_argument_ag /** * Provide an SQL argument database option. */ -class c_base_query_argument_database_option extends c_base_return_string implements i_base_query_argument { +class c_database_argument_database_option extends c_base_return_string implements i_database_argument { protected $argument_allow_connection; protected $argument_connection_limit; protected $argument_is_template; @@ -1248,26 +1248,26 @@ class c_base_query_argument_database_option extends c_base_return_string impleme public function do_build_argument() { $this->value = NULL; if (is_bool($this->argument_allow_connection)) { - $this->value .= ' ' . c_base_query_string::ALLOW_CONNECTION; + $this->value .= ' ' . c_database_string::ALLOW_CONNECTION; if ($this->argument_connection_limit) { - $this->value .= ' ' . c_base_query_string::TRUE; + $this->value .= ' ' . c_database_string::TRUE; } else { - $this->value .= ' ' . c_base_query_string::FALSE; + $this->value .= ' ' . c_database_string::FALSE; } } if (is_int($this->argument_connection_limit)) { - $this->value .= ' ' . c_base_query_string::CONNECTION_LIMIT . ' ' . $this->argument_connection_limit; + $this->value .= ' ' . c_database_string::CONNECTION_LIMIT . ' ' . $this->argument_connection_limit; } if (is_bool($this->argument_is_template)) { - $this->value .= ' ' . c_base_query_string::IS_TEMPLATE; + $this->value .= ' ' . c_database_string::IS_TEMPLATE; if ($this->argument_is_template) { - $this->value .= ' ' . c_base_query_string::TRUE; + $this->value .= ' ' . c_database_string::TRUE; } else { - $this->value .= ' ' . c_base_query_string::FALSE; + $this->value .= ' ' . c_database_string::FALSE; } } @@ -1275,7 +1275,7 @@ class c_base_query_argument_database_option extends c_base_return_string impleme return new c_base_return_false(); } - $this->value = c_base_query_string::WITH . ' ' . $this->value; + $this->value = c_database_string::WITH . ' ' . $this->value; return new c_base_return_true(); } @@ -1296,7 +1296,7 @@ class c_base_query_argument_database_option extends c_base_return_string impleme /** * Provide an SQL role name base structure. */ -class c_base_query_argument_role_name extends c_base_return_string implements i_base_query_argument { +class c_database_argument_role_name extends c_base_return_string implements i_database_argument { public const QUERY_ARGUMENT_MODE_NONE = 0; public const QUERY_ARGUMENT_MODE_PUBLIC = 1; public const QUERY_ARGUMENT_MODE_NAME = 2; @@ -1450,7 +1450,7 @@ class c_base_query_argument_role_name extends c_base_return_string implements i_ $this->value = ''; if ($this->argument_mode === static::QUERY_ARGUMENT_MODE_PUBLIC) { - $this->value .= ' ' . c_base_query_string::PUBLIC; + $this->value .= ' ' . c_database_string::PUBLIC; } else if ($this->argument_mode === static::QUERY_ARGUMENT_MODE_NAME) { if (is_string($this->argument_name)) { @@ -1458,7 +1458,7 @@ class c_base_query_argument_role_name extends c_base_return_string implements i_ } } else if ($this->argument_mode === static::QUERY_ARGUMENT_MODE_GROUP) { - $this->value .= ' ' . c_base_query_string::GROUP; + $this->value .= ' ' . c_database_string::GROUP; if (is_string($this->argument_name)) { $this->value .= ' ' . $this->argument_name; diff --git a/common/database/classes/database_reassign_owned.php b/common/database/classes/database_reassign_owned.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_reassign_owned.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_refresh_materialized.php b/common/database/classes/database_refresh_materialized.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_refresh_materialized.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_reindex.php b/common/database/classes/database_reindex.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_reindex.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_release_savepoint.php b/common/database/classes/database_release_savepoint.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_release_savepoint.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_reset.php b/common/database/classes/database_reset.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_reset.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_revoke.php b/common/database/classes/database_revoke.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_revoke.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/base/classes/base_query_rollback.php b/common/database/classes/database_rollback.php similarity index 90% rename from common/base/classes/base_query_rollback.php rename to common/database/classes/database_rollback.php index 25e3c5a..7cd92a5 100644 --- a/common/base/classes/base_query_rollback.php +++ b/common/database/classes/database_rollback.php @@ -9,7 +9,8 @@ namespace n_koopa; require_once('common/base/classes/base_error.php'); require_once('common/base/classes/base_return.php'); -require_once('common/base/classes/base_query.php'); + +require_once('common/database/classes/database_query.php'); require_once('common/base/traits/base_query.php'); @@ -20,7 +21,7 @@ require_once('common/base/traits/base_query.php'); * * @see: https://www.postgresql.org/docs/current/static/sql-rollback.html */ -class c_base_query_rollback extends c_base_query { +class c_database_rollback extends c_database_query { protected const pr_QUERY_COMMAND = 'rollback'; /** diff --git a/common/database/classes/database_rollback_prepared.php b/common/database/classes/database_rollback_prepared.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_rollback_prepared.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_rollback_to_savepoint.php b/common/database/classes/database_rollback_to_savepoint.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_rollback_to_savepoint.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_savepoint.php b/common/database/classes/database_savepoint.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_savepoint.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_security_label.php b/common/database/classes/database_security_label.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_security_label.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_select.php b/common/database/classes/database_select.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_select.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_select_into.php b/common/database/classes/database_select_into.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_select_into.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_set.php b/common/database/classes/database_set.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_set.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_set_constraints.php b/common/database/classes/database_set_constraints.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_set_constraints.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_set_role.php b/common/database/classes/database_set_role.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_set_role.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_set_session_authorization.php b/common/database/classes/database_set_session_authorization.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_set_session_authorization.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_set_transaction.php b/common/database/classes/database_set_transaction.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_set_transaction.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_show.php b/common/database/classes/database_show.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_show.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_start_transaction.php b/common/database/classes/database_start_transaction.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_start_transaction.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_string.php b/common/database/classes/database_string.php new file mode 100644 index 0000000..149f876 --- /dev/null +++ b/common/database/classes/database_string.php @@ -0,0 +1,74 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_unlisten.php b/common/database/classes/database_unlisten.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_unlisten.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_update.php b/common/database/classes/database_update.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_update.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_vacuum.php b/common/database/classes/database_vacuum.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_vacuum.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/database/classes/database_values.php b/common/database/classes/database_values.php new file mode 100644 index 0000000..92ac008 --- /dev/null +++ b/common/database/classes/database_values.php @@ -0,0 +1,71 @@ +value = NULL; + + // @todo + + return new c_base_return_true(); + } +} diff --git a/common/base/interfaces/base_query.php b/common/database/interfaces/database_query.php similarity index 95% rename from common/base/interfaces/base_query.php rename to common/database/interfaces/database_query.php index 628b380..1e23129 100644 --- a/common/base/interfaces/base_query.php +++ b/common/database/interfaces/database_query.php @@ -10,7 +10,7 @@ namespace n_koopa; /** * An interface for building SQL queries. */ -interface i_base_query { +interface i_database_query { /** * Build the Postgresql query string. @@ -35,7 +35,7 @@ interface i_base_query { /** * An interface for passing arguments to a query that may or may not have SQL functions. */ -interface i_base_query_argument { +interface i_database_argument { /** * Build the Postgresql query argument. diff --git a/common/database/traits/database_action.php b/common/database/traits/database_action.php new file mode 100644 index 0000000..bfa6ecf --- /dev/null +++ b/common/database/traits/database_action.php @@ -0,0 +1,116 @@ +query_action = NULL; + return new c_base_return_true(); + } + + if (is_int($action)) { + $this->query_action = $action; + return new c_base_return_true(); + } + + $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'action', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); + return c_base_return_error::s_false($error); + } + + /** + * Get the currently assigned action. + * + * @return c_base_return_int|c_base_return_null + * Integer representing the action is returned on success. + * NULL is returned if undefined. + * FALSE with error bit set is returned on error. + */ + protected function get_action() { + if (is_null($this->action)) { + return new c_base_return_null(); + } + + return c_base_return_int::s_new($this->action); + } +} + +/** + * Provide property support for an SQL query. + * + * A single property that is associated with a particular class-specific property such as SELECT, INSERT, etc... + */ +trait t_database_action_property { + protected $query_action_property; + + /** + * Assigns this query action property. + * + * @param int|null $property + * Whether or not to use a property associated with a particular class-specific action such as SELECT, INSERT, etc... + * Set to NULL to disable. + * + * @return c_base_return_status + * TRUE on success, FALSE otherwise. + * FALSE with error bit set is returned on error. + */ + public function set_query_action_property($property) { + if (is_null($property)) { + $this->query_action_property = NULL; + return new c_base_return_true(); + } + + if (is_int($property)) { + $this->query_action_property = $property; + return new c_base_return_true(); + } + + $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'property', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); + return c_base_return_error::s_false($error); + } + + /** + * Get the currently assigned action property. + * + * @return c_base_return_int|c_base_return_null + * Integer representing the action property is returned on success. + * NULL is returned if undefined. + * FALSE with error bit set is returned on error. + */ + protected function get_action_property() { + if (is_null($this->query_action_property)) { + return new c_base_return_null(); + } + + return c_base_return_int::s_new($this->query_action_property); + } +} diff --git a/common/database/traits/database_group_by.php b/common/database/traits/database_group_by.php new file mode 100644 index 0000000..0aad14d --- /dev/null +++ b/common/database/traits/database_group_by.php @@ -0,0 +1,67 @@ +query_group_by = NULL; + return new c_base_return_true(); + } + + if (is_string($group_by)) { + $this->query_group_by = $group_by; + return new c_base_return_true(); + } + + $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'group_by', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); + return c_base_return_error::s_false($error); + } + + /** + * Get the currently assigned name to rename to. + * + * @return c_base_return_string|c_base_return_null + * A name on success. + * NULL is returned if not set (rename to is not to be used). + * NULL with the error bit set is returned on error. + */ + public function get_query_group_by() { + if (is_null($this->query_group_by)) { + return new c_base_return_null(); + } + + if (is_string($this->query_group_by)) { + return c_base_return_string::s_new($this->query_group_by); + } + + $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_group_by', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); + return c_base_return_error::s_null($error); + } +} diff --git a/common/database/traits/database_in_schema.php b/common/database/traits/database_in_schema.php new file mode 100644 index 0000000..fced173 --- /dev/null +++ b/common/database/traits/database_in_schema.php @@ -0,0 +1,100 @@ +query_in_schema = NULL; + return new c_base_return_true(); + } + + if (!is_bool($append)) { + $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'append', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); + return c_base_return_error::s_false($error); + } + + if (is_string($schema_name)) { + if ($append) { + if (!is_array($this->query_in_schema)) { + $this->query_in_schema = []; + } + + $this->query_in_schema[] = $schema_name; + } + else { + $this->query_in_schema = [$schema_name]; + } + + return new c_base_return_true(); + } + + $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'schema_name', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); + return c_base_return_error::s_false($error); + } + + /** + * Get the in schema, schema names. + * + * @param int|null $index + * (optional) Get the schema name at the specified index. + * When NULL, all schema names are returned. + * + * @return c_base_return_string|c_base_return_array|c_base_return_null + * An array of schema names or NULL if not defined. + * A single schema name is returned if $index is an integer. + * NULL with the error bit set is returned on error. + */ + public function get_query_in_schema($index = NULL) { + if (is_null($this->query_in_schema)) { + return new c_base_return_null(); + } + + if (is_null($index)) { + if (is_array($this->query_in_schema)) { + return c_bse_return_array::s_new($this->query_in_schema); + } + } + else { + if (is_int($index) && array_key_exists($index, $this->query_in_schema) && is_string($this->query_in_schema[$index])) { + return c_base_return_string::s_new($this->query_in_schema[$index]); + } + + $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_in_schema[index]', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); + return c_base_return_error::s_null($error); + } + + $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_in_schema', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); + return c_base_return_error::s_null($error); + } +} diff --git a/common/database/traits/database_name.php b/common/database/traits/database_name.php new file mode 100644 index 0000000..f35462e --- /dev/null +++ b/common/database/traits/database_name.php @@ -0,0 +1,67 @@ +query_name = NULL; + return new c_base_return_true(); + } + + if (is_string($name)) { + $this->query_name = $name; + return new c_base_return_true(); + } + + $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'name', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); + return c_base_return_error::s_false($error); + } + + /** + * Get the currently assigned name. + * + * @return c_base_return_string|c_base_return_null + * A name on success. + * NULL is returned if not set. + * NULL with the error bit set is returned on error. + */ + public function get_query_name() { + if (is_null($this->query_name)) { + return new c_base_return_null(); + } + + if (is_string($this->query_name)) { + return c_base_return_string::s_new($this->query_name); + } + + $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_name', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); + return c_base_return_error::s_null($error); + } +} diff --git a/common/database/traits/database_option.php b/common/database/traits/database_option.php new file mode 100644 index 0000000..d3cec62 --- /dev/null +++ b/common/database/traits/database_option.php @@ -0,0 +1,62 @@ +query_option = NULL; + return new c_base_return_true(); + } + + if (is_int($option)) { + $this->query_option = $option; + return new c_base_return_true(); + } + + $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'option', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); + return c_base_return_error::s_false($error); + } + + /** + * Get the currently assigned option. + * + * @return c_base_return_int|c_base_return_null + * Integer representing the option is returned on success. + * NULL is returned if undefined. + * FALSE with error bit set is returned on error. + */ + protected function get_option() { + if (is_null($this->query_option)) { + return new c_base_return_null(); + } + + return c_base_return_int::s_new($this->query_option); + } +} diff --git a/common/database/traits/database_order_by.php b/common/database/traits/database_order_by.php new file mode 100644 index 0000000..5798fe8 --- /dev/null +++ b/common/database/traits/database_order_by.php @@ -0,0 +1,67 @@ +query_order_by = NULL; + return new c_base_return_true(); + } + + if (is_string($order_by)) { + $this->query_order_by = $order_by; + return new c_base_return_true(); + } + + $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'order_by', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); + return c_base_return_error::s_false($error); + } + + /** + * Get the currently assigned name to rename to. + * + * @return c_base_return_string|c_base_return_null + * A name on success. + * NULL is returned if not set (rename to is not to be used). + * NULL with the error bit set is returned on error. + */ + public function get_query_order_by() { + if (is_null($this->query_order_by)) { + return new c_base_return_null(); + } + + if (is_string($this->query_order_by)) { + return c_base_return_string::s_new($this->query_order_by); + } + + $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_order_by', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); + return c_base_return_error::s_null($error); + } +} diff --git a/common/database/traits/database_owner_to.php b/common/database/traits/database_owner_to.php new file mode 100644 index 0000000..4b343c2 --- /dev/null +++ b/common/database/traits/database_owner_to.php @@ -0,0 +1,121 @@ +query_owner_to = NULL; + $this->query_owner_to_user_name = NULL; + return new c_base_return_true(); + } + + if (!is_int($owner_to)) { + $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'owner_to', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); + return c_base_return_error::s_false($error); + } + + if ($owner_type == c_database_code_user::USER_NAME) { + if (!is_null($user_name) && !is_string($user_name)) { + $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'user_name', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); + return c_base_return_error::s_false($error); + } + + $this->query_owner_to = $owner_to; + $this->query_owner_to_user_name = $user_name; + return new c_base_return_true(); + } + + if (!is_null($user_name)) { + $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'user_name', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); + return c_base_return_error::s_false($error); + } + + $this->query_owner_to = $owner_to; + $this->query_owner_to_user_name = NULL; + + if ($owner_type == c_database_code_user::USER_CURRENT) { + $this->query_owner_to_user_name = c_database_string::USER_CURRENT; + } + else if ($owner_type == c_database_code_user::USER_SESSION) { + $this->query_owner_to_user_name = c_database_string::USER_SESSION; + } + + return new c_base_return_true(); + } + + /** + * Get the currently assigned sql owner to. + * + * @return c_base_return_int|c_base_return_null + * A (c_database_code_user) code representing the owner on success. + * NULL without error bit set is returned if not assigned. + * NULL with the error bit set is returned on error. + */ + public function get_query_owner_to() { + if (is_null($this->query_owner_to)) { + return new c_base_return_null(); + } + + if (is_int($this->query_owner_to)) { + return c_base_return_int::s_new($this->query_owner_to); + } + + $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_owner_to', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); + return c_base_return_error::s_null($error); + } + + /** + * Get the currently assigned sql owner to specified name. + * + * @return c_base_return_string|c_base_return_null + * An owner to name on success. + * NULL without error bit set is returned if not assigned. + * NULL with the error bit set is returned on error. + */ + public function get_query_owner_to_user_name() { + if (is_null($this->query_owner_to_user_name)) { + return new c_base_return_null(); + } + + if (is_string($this->query_owner_to_user_name)) { + return c_base_return_string::s_new($this->query_owner_to_user_name); + } + + $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_owner_to_user_name', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); + return c_base_return_error::s_null($error); + } +} diff --git a/common/database/traits/database_rename_to.php b/common/database/traits/database_rename_to.php new file mode 100644 index 0000000..7b987cc --- /dev/null +++ b/common/database/traits/database_rename_to.php @@ -0,0 +1,62 @@ + [':{argument_name}' => 'rename_to', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); + return c_base_return_error::s_false($error); + } + + $this->query_rename_to = $rename_to; + return new c_base_return_true(); + } + + /** + * Get the currently assigned name to rename to. + * + * @return c_base_return_string|c_base_return_null + * A name on success. + * NULL is returned if not set (rename to is not to be used). + * NULL with the error bit set is returned on error. + */ + public function get_query_rename_to() { + if (is_null($this->query_rename_to)) { + return new c_base_return_null(); + } + + if (is_string($this->query_rename_to)) { + return c_base_return_string::s_new($this->query_rename_to); + } + + $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_rename_to', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); + return c_base_return_error::s_null($error); + } +} diff --git a/common/database/traits/database_reset.php b/common/database/traits/database_reset.php new file mode 100644 index 0000000..a7d097b --- /dev/null +++ b/common/database/traits/database_reset.php @@ -0,0 +1,111 @@ +query_reset = NULL; + $this->query_reset_parameter = NULL; + return new c_base_return_true(); + } + + if (!is_int($reset)) { + $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'reset', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); + return c_base_return_error::s_false($error); + } + + if ($reset == c_database_code_reset::PARAMETER) { + if (!is_null($parameter) || !is_string($parameter)) { + $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'parameter', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); + return c_base_return_error::s_false($error); + } + + $this->query_reset = $reset; + $this->query_reset_parameter = $parameter; + return new c_base_return_true(); + } + else if ($reset == c_database_code_reset::ALL) { + $this->query_reset = $reset; + $this->query_reset_parameter = NULL; + return new c_base_return_true(); + } + + return new c_base_return_false(); + } + + /** + * Get the currently assigned sql reset. + * + * @return c_base_return_int|c_base_return_null + * A (c_database_reset) code representing the reset on success. + * NULL is returned if not set (reset tablespace is not to be used). + * NULL with the error bit set is returned on error. + */ + public function get_query_reset() { + if (is_null($this->query_reset)) { + return new c_base_return_null(); + } + + if (is_int($this->query_reset)) { + return c_base_return_int::s_new($this->query_reset); + } + + $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_reset', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); + return c_base_return_error::s_null($error); + } + + /** + * Get the currently assigned sql reset parameter value. + * + * @return c_base_return_string|c_base_return_null + * A reset parameter value on success. + * NULL without error bit reset is returned if not assigned. + * NULL with the error bit reset is returned on error. + */ + public function get_query_reset_parameter() { + if (is_null($this->query_reset_parameter)) { + return new c_base_return_null(); + } + + if (is_string($this->query_reset_parameter)) { + return c_base_return_string::s_new($this->query_reset_parameter); + } + + $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_reset_parameter', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); + return c_base_return_error::s_null($error); + } +} diff --git a/common/database/traits/database_set.php b/common/database/traits/database_set.php new file mode 100644 index 0000000..d7b2053 --- /dev/null +++ b/common/database/traits/database_set.php @@ -0,0 +1,144 @@ +query_set = NULL; + $this->query_set_parameter = NULL; + $this->query_set_value = NULL; + return new c_base_return_true(); + } + + if (!is_int($set)) { + $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'set', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); + return c_base_return_error::s_false($error); + } + + if ($set == c_database_code_set::TO || $set == c_database_code_set::EQUAL) { + if (!is_null($parameter) || !is_string($parameter)) { + $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'parameter', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); + return c_base_return_error::s_false($error); + } + + if (!is_null($value) || !is_string($value)) { + $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'value', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); + return c_base_return_error::s_false($error); + } + + $this->query_set = $set; + $this->query_set_parameter = $parameter; + $this->query_set_value = $value; + return new c_base_return_true(); + } + else if ($set == c_database_code_set::FROM_CURRENT) { + $this->query_set = $set; + $this->query_set_parameter = NULL; + $this->query_set_value = NULL; + return new c_base_return_true(); + } + + return new c_base_return_false(); + } + + /** + * Get the currently assigned sql set. + * + * @return c_base_return_int|c_base_return_null + * A (c_database_set) code representing the set on success. + * NULL is returned if not set (set tablespace is not to be used). + * NULL with the error bit set is returned on error. + */ + public function get_query_set() { + if (is_null($this->query_set)) { + return new c_base_return_null(); + } + + if (is_int($this->query_set)) { + return c_base_return_int::s_new($this->query_set); + } + + $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_set', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); + return c_base_return_error::s_null($error); + } + + /** + * Get the currently assigned sql set parameter value. + * + * @return c_base_return_string|c_base_return_null + * A set parameter value on success. + * NULL without error bit set is returned if not assigned. + * NULL with the error bit set is returned on error. + */ + public function get_query_set_parameter() { + if (is_null($this->query_set_parameter)) { + return new c_base_return_null(); + } + + if (is_string($this->query_set_parameter)) { + return c_base_return_string::s_new($this->query_set_parameter); + } + + $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_set_parameter', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); + return c_base_return_error::s_null($error); + } + + /** + * Get the currently assigned sql set value value. + * + * @return c_base_return_string|c_base_return_null + * A set value value on success. + * NULL without error bit set is returned if not assigned. + * NULL with the error bit set is returned on error. + */ + public function get_query_set_value() { + if (is_null($this->query_set_value)) { + return new c_base_return_null(); + } + + if (is_string($this->query_set_value)) { + return c_base_return_string::s_new($this->query_set_value); + } + + $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_set_value', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); + return c_base_return_error::s_null($error); + } +} diff --git a/common/database/traits/database_set_schema.php b/common/database/traits/database_set_schema.php new file mode 100644 index 0000000..4886690 --- /dev/null +++ b/common/database/traits/database_set_schema.php @@ -0,0 +1,64 @@ + [':{argument_name}' => 'set_schema', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); + return c_base_return_error::s_false($error); + } + + $this->query_set_schema = $set_schema; + return new c_base_return_true(); + } + + /** + * Get the currently assigned schema name to set to. + * + * @return c_base_return_string|c_base_return_null + * A schema name on success. + * NULL is returned if not set (set schema is not to be used). + * NULL with the error bit set is returned on error. + */ + public function get_query_set_schema() { + if (is_null($this->query_set_schema)) { + return new c_base_return_null(); + } + + if (is_string($this->query_set_schema)) { + return c_base_return_string::s_new($this->query_set_schema); + } + + $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_set_schema', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); + return c_base_return_error::s_null($error); + } +} diff --git a/common/database/traits/database_set_tablespace.php b/common/database/traits/database_set_tablespace.php new file mode 100644 index 0000000..c25e2c6 --- /dev/null +++ b/common/database/traits/database_set_tablespace.php @@ -0,0 +1,62 @@ + [':{argument_name}' => 'set_tablespace', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); + return c_base_return_error::s_false($error); + } + + $this->query_set_tablespace = $set_tablespace; + return new c_base_return_true(); + } + + /** + * Get the currently assigned tablespace name to set to. + * + * @return c_base_return_string|c_base_return_null + * A tablespace name on success. + * NULL is returned if not set (set tablespace is not to be used). + * NULL with the error bit set is returned on error. + */ + public function get_query_set_tablespace() { + if (is_null($this->query_set_tablespace)) { + return new c_base_return_null(); + } + + if (is_string($this->query_set_tablespace)) { + return c_base_return_string::s_new($this->query_set_tablespace); + } + + $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_set_tablespace', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); + return c_base_return_error::s_null($error); + } +} diff --git a/common/standard/classes/standard_database.php b/common/standard/classes/standard_database.php index 89f4849..63bd050 100644 --- a/common/standard/classes/standard_database.php +++ b/common/standard/classes/standard_database.php @@ -62,7 +62,7 @@ class c_standard_database extends c_base_database { unset($expires); } } - elseif ($log_type === c_base_log::TYPE_DISCONNECT) { + else if ($log_type === c_base_log::TYPE_DISCONNECT) { $query_parameters[0] = "Logging out of the system."; $query_parameters[1] = c_base_log::TYPE_SESSION; $query_parameters[2] = c_base_log::TYPE_DISCONNECT; @@ -70,7 +70,7 @@ class c_standard_database extends c_base_database { $query_parameters[4] = c_base_defaults_global::LOG_FACILITY; $query_parameters[9] = NULL; } - elseif ($log_type === c_base_log::TYPE_CREATE) { + else if ($log_type === c_base_log::TYPE_CREATE) { $query_parameters[0] = "Created the user account."; $query_parameters[1] = c_base_log::TYPE_CREATE; $query_parameters[2] = c_base_log::TYPE_NONE; @@ -78,7 +78,7 @@ class c_standard_database extends c_base_database { $query_parameters[4] = c_base_defaults_global::LOG_FACILITY; $query_parameters[9] = NULL; } - elseif ($log_type === c_base_log::TYPE_FAILURE) { + else if ($log_type === c_base_log::TYPE_FAILURE) { $user_name = NULL; if (isset($data['user_name']) && is_string($data['user_name'])) { $user_name = $data['user_name']; diff --git a/common/standard/classes/standard_index.php b/common/standard/classes/standard_index.php index fc64e8e..554d3d8 100644 --- a/common/standard/classes/standard_index.php +++ b/common/standard/classes/standard_index.php @@ -679,12 +679,12 @@ class c_standard_index extends c_base_return { $this->output = $theme->get_markup()->get_value_exact(); $this->output_type = static::OUTPUT_TYPE_HTML; } - elseif ($this->processed instanceof c_base_file) { + else if ($this->processed instanceof c_base_file) { // @todo: write a class, such as c_theme_file, to handle formatting the file output. $this->output = ''; $this->output_type = static::OUTPUT_TYPE_FILE; } - elseif ($this->processed instanceof c_base_ajax) { + else if ($this->processed instanceof c_base_ajax) { // all ajax needs to respond with is a jsonized string. $this->output = $this->processed->get_items_jsonized()->get_value_exact(); if (!is_string($this->output)) { @@ -770,7 +770,7 @@ class c_standard_index extends c_base_return { // @todo: assign file-specific headers } - elseif ($this->output_type === static::OUTPUT_TYPE_AJAX) { + else if ($this->output_type === static::OUTPUT_TYPE_AJAX) { $this->http->set_response_date(); $this->http->set_response_pragma('no-cache'); $this->http->set_response_vary('Host'); diff --git a/common/standard/classes/standard_menu.php b/common/standard/classes/standard_menu.php index c957d67..7d2d568 100644 --- a/common/standard/classes/standard_menu.php +++ b/common/standard/classes/standard_menu.php @@ -77,19 +77,19 @@ class c_standard_menu extends c_base_menu { if ($depth == 1) { $type = c_base_markup_tag::TYPE_H1; } - elseif ($depth == 2) { + else if ($depth == 2) { $type = c_base_markup_tag::TYPE_H2; } - elseif ($depth == 3) { + else if ($depth == 3) { $type = c_base_markup_tag::TYPE_H3; } - elseif ($depth == 4) { + else if ($depth == 4) { $type = c_base_markup_tag::TYPE_H4; } - elseif ($depth == 5) { + else if ($depth == 5) { $type = c_base_markup_tag::TYPE_H5; } - elseif ($depth == 6) { + else if ($depth == 6) { $type = c_base_markup_tag::TYPE_H6; } else { @@ -261,7 +261,7 @@ class c_standard_menu extends c_base_menu { if ($type == ':') { $sanitized = $replacement; } - elseif ($type == '@') { + else if ($type == '@') { $sanitized = htmlspecialchars($replacement, $this->sanitize_html['flags'], $this->sanitize_html['encoding']); } else { diff --git a/common/standard/classes/standard_path.php b/common/standard/classes/standard_path.php index f69dd4e..643230f 100644 --- a/common/standard/classes/standard_path.php +++ b/common/standard/classes/standard_path.php @@ -383,7 +383,7 @@ class c_standard_path extends c_base_path { if (is_string($extra_class)) { $classes[] = $extra_class; } - elseif (is_array($extra_class)) { + else if (is_array($extra_class)) { foreach ($extra_class as $class) { $classes[] = $class; } @@ -421,7 +421,7 @@ class c_standard_path extends c_base_path { if (is_string($extra_class)) { $classes[] = $extra_class; } - elseif (is_array($extra_class)) { + else if (is_array($extra_class)) { foreach ($extra_class as $class) { $classes[] = $class; } @@ -450,7 +450,7 @@ class c_standard_path extends c_base_path { if (is_string($extra_class)) { $classes[] = $extra_class; } - elseif (is_array($extra_class)) { + else if (is_array($extra_class)) { foreach ($extra_class as $class) { $classes[] = $class; } @@ -483,7 +483,7 @@ class c_standard_path extends c_base_path { if (is_string($extra_class)) { $classes[] = $extra_class; } - elseif (is_array($extra_class)) { + else if (is_array($extra_class)) { foreach ($extra_class as $class) { $classes[] = $class; } @@ -520,7 +520,7 @@ class c_standard_path extends c_base_path { if (is_string($extra_class)) { $classes[] = $extra_class; } - elseif (is_array($extra_class)) { + else if (is_array($extra_class)) { foreach ($extra_class as $class) { $classes[] = $class; } @@ -557,7 +557,7 @@ class c_standard_path extends c_base_path { if (is_string($extra_class)) { $classes[] = $extra_class; } - elseif (is_array($extra_class)) { + else if (is_array($extra_class)) { foreach ($extra_class as $class) { $classes[] = $class; } @@ -594,7 +594,7 @@ class c_standard_path extends c_base_path { if (is_string($extra_class)) { $classes[] = $extra_class; } - elseif (is_array($extra_class)) { + else if (is_array($extra_class)) { foreach ($extra_class as $class) { $classes[] = $class; } @@ -631,7 +631,7 @@ class c_standard_path extends c_base_path { if (is_string($extra_class)) { $classes[] = $extra_class; } - elseif (is_array($extra_class)) { + else if (is_array($extra_class)) { foreach ($extra_class as $class) { $classes[] = $class; } @@ -668,7 +668,7 @@ class c_standard_path extends c_base_path { if (is_string($extra_class)) { $classes[] = $extra_class; } - elseif (is_array($extra_class)) { + else if (is_array($extra_class)) { foreach ($extra_class as $class) { $classes[] = $class; } @@ -705,7 +705,7 @@ class c_standard_path extends c_base_path { if (is_string($extra_class)) { $classes[] = $extra_class; } - elseif (is_array($extra_class)) { + else if (is_array($extra_class)) { foreach ($extra_class as $class) { $classes[] = $class; } @@ -742,7 +742,7 @@ class c_standard_path extends c_base_path { if (is_string($extra_class)) { $classes[] = $extra_class; } - elseif (is_array($extra_class)) { + else if (is_array($extra_class)) { foreach ($extra_class as $class) { $classes[] = $class; } @@ -779,7 +779,7 @@ class c_standard_path extends c_base_path { if (is_string($extra_class)) { $classes[] = $extra_class; } - elseif (is_array($extra_class)) { + else if (is_array($extra_class)) { foreach ($extra_class as $class) { $classes[] = $class; } @@ -816,7 +816,7 @@ class c_standard_path extends c_base_path { if (is_string($extra_class)) { $classes[] = $extra_class; } - elseif (is_array($extra_class)) { + else if (is_array($extra_class)) { foreach ($extra_class as $class) { $classes[] = $class; } @@ -853,7 +853,7 @@ class c_standard_path extends c_base_path { if (is_string($extra_class)) { $classes[] = $extra_class; } - elseif (is_array($extra_class)) { + else if (is_array($extra_class)) { foreach ($extra_class as $class) { $classes[] = $class; } @@ -890,7 +890,7 @@ class c_standard_path extends c_base_path { if (is_string($extra_class)) { $classes[] = $extra_class; } - elseif (is_array($extra_class)) { + else if (is_array($extra_class)) { foreach ($extra_class as $class) { $classes[] = $class; } @@ -927,7 +927,7 @@ class c_standard_path extends c_base_path { if (is_string($extra_class)) { $classes[] = $extra_class; } - elseif (is_array($extra_class)) { + else if (is_array($extra_class)) { foreach ($extra_class as $class) { $classes[] = $class; } @@ -964,7 +964,7 @@ class c_standard_path extends c_base_path { if (is_string($extra_class)) { $classes[] = $extra_class; } - elseif (is_array($extra_class)) { + else if (is_array($extra_class)) { foreach ($extra_class as $class) { $classes[] = $class; } @@ -1001,7 +1001,7 @@ class c_standard_path extends c_base_path { if (is_string($extra_class)) { $classes[] = $extra_class; } - elseif (is_array($extra_class)) { + else if (is_array($extra_class)) { foreach ($extra_class as $class) { $classes[] = $class; } @@ -1038,7 +1038,7 @@ class c_standard_path extends c_base_path { if (is_string($extra_class)) { $classes[] = $extra_class; } - elseif (is_array($extra_class)) { + else if (is_array($extra_class)) { foreach ($extra_class as $class) { $classes[] = $class; } @@ -1080,7 +1080,7 @@ class c_standard_path extends c_base_path { if (is_string($extra_class)) { $classes[] = $extra_class; } - elseif (is_array($extra_class)) { + else if (is_array($extra_class)) { foreach ($extra_class as $class) { $classes[] = $class; } @@ -1090,19 +1090,19 @@ class c_standard_path extends c_base_path { if ($header == 1) { $type = c_base_markup_tag::TYPE_H1; } - elseif ($header == 2) { + else if ($header == 2) { $type = c_base_markup_tag::TYPE_H2; } - elseif ($header == 3) { + else if ($header == 3) { $type = c_base_markup_tag::TYPE_H3; } - elseif ($header == 4) { + else if ($header == 4) { $type = c_base_markup_tag::TYPE_H4; } - elseif ($header == 5) { + else if ($header == 5) { $type = c_base_markup_tag::TYPE_H5; } - elseif ($header == 6) { + else if ($header == 6) { $type = c_base_markup_tag::TYPE_H6; } else { @@ -1162,7 +1162,7 @@ class c_standard_path extends c_base_path { if (is_string($extra_class)) { $classes[] = $extra_class; } - elseif (is_array($extra_class)) { + else if (is_array($extra_class)) { foreach ($extra_class as $class) { $classes[] = $class; } @@ -1239,7 +1239,7 @@ class c_standard_path extends c_base_path { if (is_string($extra_class)) { $classes[] = $extra_class; } - elseif (is_array($extra_class)) { + else if (is_array($extra_class)) { foreach ($extra_class as $class) { $classes[] = $class; } @@ -1277,7 +1277,7 @@ class c_standard_path extends c_base_path { if (is_string($extra_class)) { $classes[] = $extra_class; } - elseif (is_array($extra_class)) { + else if (is_array($extra_class)) { foreach ($extra_class as $class) { $classes[] = $class; } @@ -1328,7 +1328,7 @@ class c_standard_path extends c_base_path { if (is_string($extra_class)) { $classes[] = $extra_class; } - elseif (is_array($extra_class)) { + else if (is_array($extra_class)) { foreach ($extra_class as $class) { $classes[] = $class; } @@ -1384,7 +1384,7 @@ class c_standard_path extends c_base_path { if (is_string($extra_class)) { $classes[] = $extra_class; } - elseif (is_array($extra_class)) { + else if (is_array($extra_class)) { foreach ($extra_class as $class) { $classes[] = $class; } @@ -1416,7 +1416,7 @@ class c_standard_path extends c_base_path { if (is_int($tooltip)) { $tag->set_attribute(c_base_markup_attributes::ATTRIBUTE_TITLE, $this->pr_get_text($tooltip, $arguments)); } - elseif (is_string($tooltip)) { + else if (is_string($tooltip)) { $tag->set_attribute(c_base_markup_attributes::ATTRIBUTE_TITLE, $tooltip); } } @@ -1460,7 +1460,7 @@ class c_standard_path extends c_base_path { if (is_string($extra_class)) { $classes[] = $extra_class; } - elseif (is_array($extra_class)) { + else if (is_array($extra_class)) { foreach ($extra_class as $class) { $classes[] = $class; } @@ -1480,19 +1480,19 @@ class c_standard_path extends c_base_path { if ($header == 1) { $type = c_base_markup_tag::TYPE_H1; } - elseif ($header == 2) { + else if ($header == 2) { $type = c_base_markup_tag::TYPE_H2; } - elseif ($header == 3) { + else if ($header == 3) { $type = c_base_markup_tag::TYPE_H3; } - elseif ($header == 4) { + else if ($header == 4) { $type = c_base_markup_tag::TYPE_H4; } - elseif ($header == 5) { + else if ($header == 5) { $type = c_base_markup_tag::TYPE_H5; } - elseif ($header == 6) { + else if ($header == 6) { $type = c_base_markup_tag::TYPE_H6; } else { @@ -1554,7 +1554,7 @@ class c_standard_path extends c_base_path { if (is_string($extra_class)) { $classes[] = $extra_class; } - elseif (is_array($extra_class)) { + else if (is_array($extra_class)) { foreach ($extra_class as $class) { $classes[] = $class; } @@ -1606,7 +1606,7 @@ class c_standard_path extends c_base_path { if (is_string($extra_class)) { $classes[] = $extra_class; } - elseif (is_array($extra_class)) { + else if (is_array($extra_class)) { foreach ($extra_class as $class) { $classes[] = $class; } @@ -1662,7 +1662,7 @@ class c_standard_path extends c_base_path { if (is_string($extra_class)) { $classes[] = $extra_class; } - elseif (is_array($extra_class)) { + else if (is_array($extra_class)) { foreach ($extra_class as $class) { $classes[] = $class; } @@ -1718,7 +1718,7 @@ class c_standard_path extends c_base_path { if (is_string($extra_class)) { $classes[] = $extra_class; } - elseif (is_array($extra_class)) { + else if (is_array($extra_class)) { foreach ($extra_class as $class) { $classes[] = $class; } @@ -1767,7 +1767,7 @@ class c_standard_path extends c_base_path { if (is_string($extra_class)) { $classes[] = $extra_class; } - elseif (is_array($extra_class)) { + else if (is_array($extra_class)) { foreach ($extra_class as $class) { $classes[] = $class; } @@ -1804,7 +1804,7 @@ class c_standard_path extends c_base_path { if (is_string($extra_class)) { $classes[] = $extra_class; } - elseif (is_array($extra_class)) { + else if (is_array($extra_class)) { foreach ($extra_class as $class) { $classes[] = $class; } @@ -1833,7 +1833,7 @@ class c_standard_path extends c_base_path { if (is_string($extra_class)) { $classes[] = $extra_class; } - elseif (is_array($extra_class)) { + else if (is_array($extra_class)) { foreach ($extra_class as $class) { $classes[] = $class; } @@ -1862,7 +1862,7 @@ class c_standard_path extends c_base_path { if (is_string($extra_class)) { $classes[] = $extra_class; } - elseif (is_array($extra_class)) { + else if (is_array($extra_class)) { foreach ($extra_class as $class) { $classes[] = $class; } @@ -1897,7 +1897,7 @@ class c_standard_path extends c_base_path { if (is_string($extra_class)) { $classes[] = $extra_class; } - elseif (is_array($extra_class)) { + else if (is_array($extra_class)) { foreach ($extra_class as $class) { $classes[] = $class; } @@ -1934,7 +1934,7 @@ class c_standard_path extends c_base_path { if (is_string($extra_class)) { $classes[] = $extra_class; } - elseif (is_array($extra_class)) { + else if (is_array($extra_class)) { foreach ($extra_class as $class) { $classes[] = $class; } @@ -1963,7 +1963,7 @@ class c_standard_path extends c_base_path { if (is_string($extra_class)) { $classes[] = $extra_class; } - elseif (is_array($extra_class)) { + else if (is_array($extra_class)) { foreach ($extra_class as $class) { $classes[] = $class; } @@ -1998,7 +1998,7 @@ class c_standard_path extends c_base_path { if (is_string($extra_class)) { $classes[] = $extra_class; } - elseif (is_array($extra_class)) { + else if (is_array($extra_class)) { foreach ($extra_class as $class) { $classes[] = $class; } @@ -2035,7 +2035,7 @@ class c_standard_path extends c_base_path { if (is_string($extra_class)) { $classes[] = $extra_class; } - elseif (is_array($extra_class)) { + else if (is_array($extra_class)) { foreach ($extra_class as $class) { $classes[] = $class; } @@ -2075,7 +2075,7 @@ class c_standard_path extends c_base_path { if (is_string($extra_class)) { $classes[] = $extra_class; } - elseif (is_array($extra_class)) { + else if (is_array($extra_class)) { foreach ($extra_class as $class) { $classes[] = $class; } @@ -2125,7 +2125,7 @@ class c_standard_path extends c_base_path { if (is_string($extra_class)) { $classes[] = $extra_class; } - elseif (is_array($extra_class)) { + else if (is_array($extra_class)) { foreach ($extra_class as $class) { $classes[] = $class; } diff --git a/common/standard/classes/standard_path_user.php b/common/standard/classes/standard_path_user.php index 200c18c..795191a 100644 --- a/common/standard/classes/standard_path_user.php +++ b/common/standard/classes/standard_path_user.php @@ -153,25 +153,25 @@ class c_standard_path_user extends c_standard_path { if ($argument == 'print') { $this->output_format = 'print'; } - elseif ($argument == 'html') { + else if ($argument == 'html') { $this->output_format = c_base_mime::TYPE_TEXT_HTML; } - elseif ($argument == 'pdf') { + else if ($argument == 'pdf') { $this->output_format = c_base_mime::TYPE_DOCUMENT_PDF; } - elseif ($argument == 'ps') { + else if ($argument == 'ps') { $this->output_format = c_base_mime::TYPE_TEXT_PS; } - elseif ($argument == 'rss') { + else if ($argument == 'rss') { $this->output_format = c_base_mime::TYPE_TEXT_RSS; } - elseif ($argument == 'ical') { + else if ($argument == 'ical') { $this->output_format = c_base_mime::TYPE_TEXT_ICAL; } - elseif ($argument == 'text') { + else if ($argument == 'text') { $this->output_format = c_base_mime::TYPE_TEXT_PLAIN; } - elseif ($argument == 'json') { + else if ($argument == 'json') { $this->output_format = c_base_mime::TYPE_TEXT_JSON; } else { @@ -343,7 +343,7 @@ class c_standard_path_user extends c_standard_path { if ($this->path_user_id === $user->get_id()->get_value_exact()) { $deny_access = FALSE; } - elseif (isset($roles_current[c_base_roles::MANAGER]) || isset($roles_current[c_base_roles::ADMINISTER])) { + else if (isset($roles_current[c_base_roles::MANAGER]) || isset($roles_current[c_base_roles::ADMINISTER])) { $deny_access = FALSE; } unset($user); diff --git a/common/standard/classes/standard_paths.php b/common/standard/classes/standard_paths.php index 16a875c..8b9f3c8 100644 --- a/common/standard/classes/standard_paths.php +++ b/common/standard/classes/standard_paths.php @@ -417,28 +417,28 @@ class c_standard_paths extends c_base_return { if ($id_group === c_base_ascii::LOWER_A) { $this->pr_paths_create_administer(); } - elseif ($id_group === c_base_ascii::LOWER_C) { + else if ($id_group === c_base_ascii::LOWER_C) { $this->pr_paths_create_cache(); } - elseif ($id_group === c_base_ascii::LOWER_D) { + else if ($id_group === c_base_ascii::LOWER_D) { $this->pr_paths_create_data(); } - elseif ($id_group === c_base_ascii::LOWER_F) { + else if ($id_group === c_base_ascii::LOWER_F) { $this->pr_paths_create_file(); } - elseif ($id_group === c_base_ascii::LOWER_M) { + else if ($id_group === c_base_ascii::LOWER_M) { $this->pr_paths_create_management(); } - elseif ($id_group === c_base_ascii::LOWER_S) { + else if ($id_group === c_base_ascii::LOWER_S) { $this->pr_paths_create_submit(); } - elseif ($id_group === c_base_ascii::LOWER_T) { + else if ($id_group === c_base_ascii::LOWER_T) { $this->pr_paths_create_theme(); } - elseif ($id_group === c_base_ascii::LOWER_U) { + else if ($id_group === c_base_ascii::LOWER_U) { $this->pr_paths_create_user(); } - elseif ($id_group === c_base_ascii::LOWER_X) { + else if ($id_group === c_base_ascii::LOWER_X) { $this->pr_paths_create_ajax(); } else { @@ -602,7 +602,7 @@ class c_standard_paths extends c_base_return { return $path_server_error; } - elseif (is_string($this->language_alias)) { + else if (is_string($this->language_alias)) { @include_once($handler_settings['include_directory'] . $this->language_alias . '/' . $handler_settings['include_name'] . static::SCRIPT_EXTENSION); $handler_class = $handler_settings['handler'] . '_' . $this->language_alias; @@ -908,7 +908,7 @@ class c_standard_paths extends c_base_return { unset($id_group); return $this->p_handle_execution_errors($this->handler->do_execute($this->http, $this->database, $this->session, $this->settings)); } - elseif ($this->handler->is_root()->get_value_exact()) { + else if ($this->handler->is_root()->get_value_exact()) { unset($id_group); $this->http->set_response_status(c_base_http_status::FORBIDDEN); @@ -972,7 +972,7 @@ class c_standard_paths extends c_base_return { // these always return not found for these paths. $path_failsafe = $this->get_handler_not_found(); } - elseif ($this->handler->is_private()->get_value_exact() && $id_group !== c_base_ascii::NULL) { + else if ($this->handler->is_private()->get_value_exact() && $id_group !== c_base_ascii::NULL) { // non private, and non-special case paths should return access denied as per normal behavior. $path_failsafe = $this->get_handler_access_denied(); } @@ -1132,7 +1132,7 @@ class c_standard_paths extends c_base_return { if ($error_code === i_base_error_messages::NOT_FOUND_PATH || $error_code === i_base_error_messages::INVALID_ARGUMENT) { $handler_error = $this->get_handler_not_found(); } - elseif ($error_code === i_base_error_messages::ACCESS_DENIED) { + else if ($error_code === i_base_error_messages::ACCESS_DENIED) { $handler_error = $this->get_handler_access_denied(); } else { diff --git a/common/standard/classes/standard_users.php b/common/standard/classes/standard_users.php index 8c6eb61..e13dd9a 100644 --- a/common/standard/classes/standard_users.php +++ b/common/standard/classes/standard_users.php @@ -77,7 +77,7 @@ class c_standard_users_user extends c_base_users_user { if (is_null($user_name_or_id)) { $query_string .= 'from v_users_self'; } - elseif ($user_name_or_id === TRUE) { + else if ($user_name_or_id === TRUE) { $query_string .= 'from v_users_self_session'; } else { diff --git a/common/standard/paths/u/user_login.php b/common/standard/paths/u/user_login.php index 4f8c7c4..c80ccf3 100644 --- a/common/standard/paths/u/user_login.php +++ b/common/standard/paths/u/user_login.php @@ -141,7 +141,7 @@ class c_standard_path_user_login extends c_standard_path { } unset($problem); } - elseif ($login_result === TRUE) { + else if ($login_result === TRUE) { // successfully logged in. $destination = $this->pr_do_login_redirect(); @@ -344,11 +344,11 @@ class c_standard_path_user_login extends c_standard_path { if (empty($_POST['login_form-user_name']) || !is_string($_POST['login_form-user_name'])) { $problems[] = c_base_form_problem::s_create_error('login_form-user_name', self::pr_get_text(10)); } - elseif ($_POST['login_form-user_name'] == static::USER_PUBLIC) { + else if ($_POST['login_form-user_name'] == static::USER_PUBLIC) { // explicitly deny access to internal user accounts $problems[] = c_base_form_problem::s_create_error('login_form-user_name', self::pr_get_text(10)); } - elseif (empty($_POST['login_form-password']) || !is_string($_POST['login_form-user_name'])) { + else if (empty($_POST['login_form-password']) || !is_string($_POST['login_form-user_name'])) { $problems[] = c_base_form_problem::s_create_error('login_form-password', self::pr_get_text(10)); } @@ -394,12 +394,12 @@ class c_standard_path_user_login extends c_standard_path { $problems[] = c_base_form_problem::s_create_error(NULL, 'Unable to login, cannot connect to the database.'); return $problems; } - elseif (preg_match('/no pg_hba\.conf entry for host/i', $error_message) > 0) { + else if (preg_match('/no pg_hba\.conf entry for host/i', $error_message) > 0) { // the account either does note exist or is not authorized. // it is a pity that postgresql doesn't differentiate the two. $access_denied = TRUE; } - elseif (preg_match('/password authentication failed for user /i', $error_message) > 0) { + else if (preg_match('/password authentication failed for user /i', $error_message) > 0) { $access_denied = TRUE; } else { @@ -428,37 +428,37 @@ class c_standard_path_user_login extends c_standard_path { } } } - elseif ($ensure_result === 1) { + else if ($ensure_result === 1) { // invalid user name, bad characters, or name too long. } - elseif ($ensure_result === 2) { + else if ($ensure_result === 2) { // failed to connect to the ldap server and could not query the ldap name. } - elseif ($ensure_result === 3) { + else if ($ensure_result === 3) { // user name not found in ldap database. } - elseif ($ensure_result === 4) { + else if ($ensure_result === 4) { // failed to connect to the database. } - elseif ($ensure_result === 5) { + else if ($ensure_result === 5) { // error returned while executing the SQL command. } - elseif ($ensure_result === 6) { + else if ($ensure_result === 6) { // error occured while reading input from the user (such as via recv()). } - elseif ($ensure_result === 7) { + else if ($ensure_result === 7) { // error occured while writing input from the user (such as via send()). } - elseif ($ensure_result === 8) { + else if ($ensure_result === 8) { // the received packet is invalid, such as wrong length. } - elseif ($ensure_result === 9) { + else if ($ensure_result === 9) { // connection timed out when reading or writing. } - elseif ($ensure_result === 10) { + else if ($ensure_result === 10) { // the connection is being forced closed. } - elseif ($ensure_result === 11) { + else if ($ensure_result === 11) { // the connection is closing because the service is quitting. } } diff --git a/common/standard/paths/u/user_settings.php b/common/standard/paths/u/user_settings.php index ca10d99..bcf5b87 100644 --- a/common/standard/paths/u/user_settings.php +++ b/common/standard/paths/u/user_settings.php @@ -321,7 +321,7 @@ class c_standard_path_user_settings extends c_standard_path_user { if ($this->path_user_id === $this->session->get_user_current()->get_id()->get_value_exact()) { $full_view_access = TRUE; } - elseif (isset($roles_current[c_base_roles::MANAGER]) || isset($roles_current[c_base_roles::ADMINISTER])) { + else if (isset($roles_current[c_base_roles::MANAGER]) || isset($roles_current[c_base_roles::ADMINISTER])) { $full_view_access = TRUE; } diff --git a/common/standard/paths/u/user_view.php b/common/standard/paths/u/user_view.php index f336c60..150d224 100644 --- a/common/standard/paths/u/user_view.php +++ b/common/standard/paths/u/user_view.php @@ -115,7 +115,7 @@ class c_standard_path_user_view extends c_standard_path_user { if ($this->path_user_id === $this->session->get_user_current()->get_id()->get_value_exact()) { $full_view_access = TRUE; } - elseif (isset($roles_current[c_base_roles::MANAGER]) || isset($roles_current[c_base_roles::ADMINISTER])) { + else if (isset($roles_current[c_base_roles::MANAGER]) || isset($roles_current[c_base_roles::ADMINISTER])) { $full_view_access = TRUE; } unset($roles_current); diff --git a/common/theme/classes/theme_html.php b/common/theme/classes/theme_html.php index c2edd3b..d56c9c0 100644 --- a/common/theme/classes/theme_html.php +++ b/common/theme/classes/theme_html.php @@ -332,514 +332,514 @@ class c_theme_html extends c_base_return { $class_1 = 'text'; $class_2 = 'text-link'; } - elseif ($type === c_base_markup_tag::TYPE_ABBR) { + else if ($type === c_base_markup_tag::TYPE_ABBR) { $class_1 = 'text'; $class_2 = 'text-abbreviation'; } - elseif ($type === c_base_markup_tag::TYPE_ADDRESS) { + else if ($type === c_base_markup_tag::TYPE_ADDRESS) { $class_1 = 'structure'; $class_2 = 'structure-address'; } - elseif ($type === c_base_markup_tag::TYPE_AREA) { + else if ($type === c_base_markup_tag::TYPE_AREA) { $class_1 = 'datum'; $class_2 = 'datum-area'; } - elseif ($type === c_base_markup_tag::TYPE_ARTICLE) { + else if ($type === c_base_markup_tag::TYPE_ARTICLE) { $class_1 = 'structure'; $class_2 = 'structure-article'; } - elseif ($type === c_base_markup_tag::TYPE_ASIDE) { + else if ($type === c_base_markup_tag::TYPE_ASIDE) { $class_1 = 'structure'; $class_2 = 'structure-aside'; } - elseif ($type === c_base_markup_tag::TYPE_AUDIO) { + else if ($type === c_base_markup_tag::TYPE_AUDIO) { $class_1 = 'media'; $class_2 = 'media-audio'; } - elseif ($type === c_base_markup_tag::TYPE_BOLD) { + else if ($type === c_base_markup_tag::TYPE_BOLD) { $class_1 = 'format'; $class_2 = 'format-strong'; } - elseif ($type === c_base_markup_tag::TYPE_BDI) { + else if ($type === c_base_markup_tag::TYPE_BDI) { $class_1 = 'text'; $class_2 = 'text-bdi'; $class_3 = 'text-direction'; } - elseif ($type === c_base_markup_tag::TYPE_BDO) { + else if ($type === c_base_markup_tag::TYPE_BDO) { $class_1 = 'text'; $class_2 = 'text-bdo'; $class_3 = 'text-direction'; } - elseif ($type === c_base_markup_tag::TYPE_BLOCKQUOTE) { + else if ($type === c_base_markup_tag::TYPE_BLOCKQUOTE) { $class_1 = 'text'; $class_2 = 'text-blockquote'; $class_3 = 'text-quote'; } - elseif ($type === c_base_markup_tag::TYPE_BREAK) { + else if ($type === c_base_markup_tag::TYPE_BREAK) { $class_1 = 'structure'; $class_2 = 'structure-break'; } - elseif ($type === c_base_markup_tag::TYPE_BUTTON) { + else if ($type === c_base_markup_tag::TYPE_BUTTON) { $class_1 = 'field'; $class_2 = 'field-button'; } - elseif ($type === c_base_markup_tag::TYPE_CANVAS) { + else if ($type === c_base_markup_tag::TYPE_CANVAS) { $class_1 = 'structure'; $class_2 = 'structure-canvas'; } - elseif ($type === c_base_markup_tag::TYPE_CAPTION) { + else if ($type === c_base_markup_tag::TYPE_CAPTION) { $class_1 = 'text'; $class_2 = 'text-caption'; } - elseif ($type === c_base_markup_tag::TYPE_CHECKBOX) { + else if ($type === c_base_markup_tag::TYPE_CHECKBOX) { $class_1 = 'field'; $class_2 = 'field-checkbox'; } - elseif ($type === c_base_markup_tag::TYPE_CITE) { + else if ($type === c_base_markup_tag::TYPE_CITE) { $class_1 = 'text'; $class_2 = 'text-cite'; } - elseif ($type === c_base_markup_tag::TYPE_CODE) { + else if ($type === c_base_markup_tag::TYPE_CODE) { $class_1 = 'text'; $class_2 = 'text-code'; } - elseif ($type === c_base_markup_tag::TYPE_COLUMN) { + else if ($type === c_base_markup_tag::TYPE_COLUMN) { $class_1 = 'structure'; $class_2 = 'structure-column'; } - elseif ($type === c_base_markup_tag::TYPE_COLOR) { + else if ($type === c_base_markup_tag::TYPE_COLOR) { $class_1 = 'field'; $class_2 = 'field-color'; } - elseif ($type === c_base_markup_tag::TYPE_COLUMN_GROUP) { + else if ($type === c_base_markup_tag::TYPE_COLUMN_GROUP) { $class_1 = 'structure'; $class_2 = 'structure-column_group'; } - elseif ($type === c_base_markup_tag::TYPE_DATA) { + else if ($type === c_base_markup_tag::TYPE_DATA) { $class_1 = 'datum'; $class_2 = 'datum-data'; } - elseif ($type === c_base_markup_tag::TYPE_DATA) { + else if ($type === c_base_markup_tag::TYPE_DATA) { $class_1 = 'datum'; $class_2 = 'datum-data_list'; } - elseif ($type === c_base_markup_tag::TYPE_DATE) { + else if ($type === c_base_markup_tag::TYPE_DATE) { $class_1 = 'field'; $class_2 = 'field-date'; } - elseif ($type === c_base_markup_tag::TYPE_DATE_TIME_LOCAL) { + else if ($type === c_base_markup_tag::TYPE_DATE_TIME_LOCAL) { $class_1 = 'field'; $class_2 = 'field-date_local_time'; } - elseif ($type === c_base_markup_tag::TYPE_TERM_DESCRIPTION) { + else if ($type === c_base_markup_tag::TYPE_TERM_DESCRIPTION) { $class_1 = 'text'; $class_2 = 'text-term_description'; } - elseif ($type === c_base_markup_tag::TYPE_DEL) { + else if ($type === c_base_markup_tag::TYPE_DEL) { $class_1 = 'format'; $class_2 = 'format-delete'; } - elseif ($type === c_base_markup_tag::TYPE_DETAILS) { + else if ($type === c_base_markup_tag::TYPE_DETAILS) { $class_1 = 'structure'; $class_2 = 'structure-details'; } - elseif ($type === c_base_markup_tag::TYPE_DFN) { + else if ($type === c_base_markup_tag::TYPE_DFN) { $class_1 = 'text'; $class_2 = 'text-definition'; } - elseif ($type === c_base_markup_tag::TYPE_DIALOG) { + else if ($type === c_base_markup_tag::TYPE_DIALOG) { $class_1 = 'structure'; $class_2 = 'structure-dialog'; } - elseif ($type === c_base_markup_tag::TYPE_DIVIDER) { + else if ($type === c_base_markup_tag::TYPE_DIVIDER) { $class_1 = 'structure'; $class_2 = 'structure-divider'; } - elseif ($type === c_base_markup_tag::TYPE_DIVIDER) { + else if ($type === c_base_markup_tag::TYPE_DIVIDER) { $class_1 = 'structure'; $class_2 = 'structure-divider'; } - elseif ($type === c_base_markup_tag::TYPE_DEFINITION_LIST) { + else if ($type === c_base_markup_tag::TYPE_DEFINITION_LIST) { $class_1 = 'structure'; $class_2 = 'structure-definition_list'; } - elseif ($type === c_base_markup_tag::TYPE_TERM_NAME) { + else if ($type === c_base_markup_tag::TYPE_TERM_NAME) { $class_1 = 'text'; $class_2 = 'text-term_name'; } - elseif ($type === c_base_markup_tag::TYPE_EM) { + else if ($type === c_base_markup_tag::TYPE_EM) { $class_1 = 'format'; $class_2 = 'format-emphasis'; } - elseif ($type === c_base_markup_tag::TYPE_EMAIL) { + else if ($type === c_base_markup_tag::TYPE_EMAIL) { $class_1 = 'field'; $class_2 = 'field-email'; } - elseif ($type === c_base_markup_tag::TYPE_EMBED) { + else if ($type === c_base_markup_tag::TYPE_EMBED) { $class_1 = 'media'; $class_2 = 'media-embed'; } - elseif ($type === c_base_markup_tag::TYPE_FIELD_SET) { + else if ($type === c_base_markup_tag::TYPE_FIELD_SET) { $class_1 = 'structure'; $class_2 = 'structure-field_set'; } - elseif ($type === c_base_markup_tag::TYPE_FIGURE) { + else if ($type === c_base_markup_tag::TYPE_FIGURE) { $class_1 = 'structure'; $class_2 = 'structure-figure'; } - elseif ($type === c_base_markup_tag::TYPE_FIGURE_CAPTION) { + else if ($type === c_base_markup_tag::TYPE_FIGURE_CAPTION) { $class_1 = 'text'; $class_2 = 'text-figure_caption'; $class_3 = 'text-caption'; } - elseif ($type === c_base_markup_tag::TYPE_FILE) { + else if ($type === c_base_markup_tag::TYPE_FILE) { $class_1 = 'field'; $class_2 = 'field-file'; } - elseif ($type === c_base_markup_tag::TYPE_FOOTER) { + else if ($type === c_base_markup_tag::TYPE_FOOTER) { $class_1 = 'structure'; $class_2 = 'structure-footer'; } - elseif ($type === c_base_markup_tag::TYPE_FORM) { + else if ($type === c_base_markup_tag::TYPE_FORM) { $class_1 = 'structure'; $class_2 = 'structure-form'; } - elseif ($type === c_base_markup_tag::TYPE_H1) { + else if ($type === c_base_markup_tag::TYPE_H1) { $class_1 = 'text'; $class_2 = 'text-heading'; $class_3 = 'text-heading_1'; } - elseif ($type === c_base_markup_tag::TYPE_H2) { + else if ($type === c_base_markup_tag::TYPE_H2) { $class_1 = 'text'; $class_2 = 'text-heading'; $class_3 = 'text-heading_2'; } - elseif ($type === c_base_markup_tag::TYPE_H3) { + else if ($type === c_base_markup_tag::TYPE_H3) { $class_1 = 'text'; $class_2 = 'text-heading'; $class_3 = 'text-heading_3'; } - elseif ($type === c_base_markup_tag::TYPE_H4) { + else if ($type === c_base_markup_tag::TYPE_H4) { $class_1 = 'text'; $class_2 = 'text-heading'; $class_3 = 'text-heading_4'; } - elseif ($type === c_base_markup_tag::TYPE_H5) { + else if ($type === c_base_markup_tag::TYPE_H5) { $class_1 = 'text'; $class_2 = 'text-heading'; $class_3 = 'text-heading_5'; } - elseif ($type === c_base_markup_tag::TYPE_H6) { + else if ($type === c_base_markup_tag::TYPE_H6) { $class_1 = 'text'; $class_2 = 'text-heading'; $class_3 = 'text-heading_6'; } - elseif ($type === c_base_markup_tag::TYPE_HX) { + else if ($type === c_base_markup_tag::TYPE_HX) { $class_1 = 'text'; $class_2 = 'text-heading'; } - elseif ($type === c_base_markup_tag::TYPE_HEADER) { + else if ($type === c_base_markup_tag::TYPE_HEADER) { $class_1 = 'structure'; $class_2 = 'structure-header'; } - elseif ($type === c_base_markup_tag::TYPE_HIDDEN) { + else if ($type === c_base_markup_tag::TYPE_HIDDEN) { $class_1 = 'field'; $class_2 = 'field-hidden'; } - elseif ($type === c_base_markup_tag::TYPE_HORIZONTAL_RULER) { + else if ($type === c_base_markup_tag::TYPE_HORIZONTAL_RULER) { $class_1 = 'structure'; $class_2 = 'structure-horizontal_ruler'; } - elseif ($type === c_base_markup_tag::TYPE_ITALICS) { + else if ($type === c_base_markup_tag::TYPE_ITALICS) { $class_1 = 'format'; $class_2 = 'format-emphasis'; } - elseif ($type === c_base_markup_tag::TYPE_HORIZONTAL_RULER) { + else if ($type === c_base_markup_tag::TYPE_HORIZONTAL_RULER) { $class_1 = 'structure'; $class_2 = 'structure-horizontal_ruler'; } - elseif ($type === c_base_markup_tag::TYPE_INLINE_FRAME) { + else if ($type === c_base_markup_tag::TYPE_INLINE_FRAME) { $class_1 = 'structure'; $class_2 = 'structure-inline_frame'; } - elseif ($type === c_base_markup_tag::TYPE_IMAGE) { + else if ($type === c_base_markup_tag::TYPE_IMAGE) { $class_1 = 'media'; $class_2 = 'media-image'; } - elseif ($type === c_base_markup_tag::TYPE_INPUT) { + else if ($type === c_base_markup_tag::TYPE_INPUT) { $class_1 = 'field'; $class_2 = 'field-input'; } - elseif ($type === c_base_markup_tag::TYPE_INS) { + else if ($type === c_base_markup_tag::TYPE_INS) { $class_1 = 'text'; $class_2 = 'text-insert'; } - elseif ($type === c_base_markup_tag::TYPE_KEYBOARD) { + else if ($type === c_base_markup_tag::TYPE_KEYBOARD) { $class_1 = 'text'; $class_2 = 'text-keyboard'; } - elseif ($type === c_base_markup_tag::TYPE_KEY_GEN) { + else if ($type === c_base_markup_tag::TYPE_KEY_GEN) { $class_1 = 'field'; $class_2 = 'field-key_generator'; } - elseif ($type === c_base_markup_tag::TYPE_LABEL) { + else if ($type === c_base_markup_tag::TYPE_LABEL) { $class_1 = 'field'; $class_2 = 'field-label'; } - elseif ($type === c_base_markup_tag::TYPE_LEGEND) { + else if ($type === c_base_markup_tag::TYPE_LEGEND) { $class_1 = 'text'; $class_2 = 'text-legend'; } - elseif ($type === c_base_markup_tag::TYPE_LIST_ITEM) { + else if ($type === c_base_markup_tag::TYPE_LIST_ITEM) { $class_1 = 'text'; $class_2 = 'text-list_item'; } - elseif ($type === c_base_markup_tag::TYPE_MAIN) { + else if ($type === c_base_markup_tag::TYPE_MAIN) { $class_1 = 'structure'; $class_2 = 'structure-main'; } - elseif ($type === c_base_markup_tag::TYPE_MAP) { + else if ($type === c_base_markup_tag::TYPE_MAP) { $class_1 = 'structure'; $class_2 = 'structure-image_map'; } - elseif ($type === c_base_markup_tag::TYPE_MARK) { + else if ($type === c_base_markup_tag::TYPE_MARK) { $class_1 = 'format'; $class_2 = 'format-mark'; } - elseif ($type === c_base_markup_tag::TYPE_MENU) { + else if ($type === c_base_markup_tag::TYPE_MENU) { $class_1 = 'structure'; $class_2 = 'structure-menu'; } - elseif ($type === c_base_markup_tag::TYPE_MENU_ITEM) { + else if ($type === c_base_markup_tag::TYPE_MENU_ITEM) { $class_1 = 'structure'; $class_2 = 'structure-menu_item'; } - elseif ($type === c_base_markup_tag::TYPE_METER) { + else if ($type === c_base_markup_tag::TYPE_METER) { $class_1 = 'field'; $class_2 = 'field-meter'; } - elseif ($type === c_base_markup_tag::TYPE_MONTH) { + else if ($type === c_base_markup_tag::TYPE_MONTH) { $class_1 = 'field'; $class_2 = 'field-month'; } - elseif ($type === c_base_markup_tag::TYPE_NAVIGATION) { + else if ($type === c_base_markup_tag::TYPE_NAVIGATION) { $class_1 = 'structure'; $class_2 = 'structure-navigation'; } - elseif ($type === c_base_markup_tag::TYPE_NO_SCRIPT) { + else if ($type === c_base_markup_tag::TYPE_NO_SCRIPT) { $class_1 = 'structure'; $class_2 = 'structure-no_script'; } - elseif ($type === c_base_markup_tag::TYPE_NUMBER) { + else if ($type === c_base_markup_tag::TYPE_NUMBER) { $class_1 = 'field'; $class_2 = 'field-number'; } - elseif ($type === c_base_markup_tag::TYPE_OBJECT) { + else if ($type === c_base_markup_tag::TYPE_OBJECT) { $class_1 = 'media'; $class_2 = 'media-object'; } - elseif ($type === c_base_markup_tag::TYPE_ORDERED_LIST) { + else if ($type === c_base_markup_tag::TYPE_ORDERED_LIST) { $class_1 = 'structure'; $class_2 = 'structure-ordered_list'; } - elseif ($type === c_base_markup_tag::TYPE_OPTIONS_GROUP) { + else if ($type === c_base_markup_tag::TYPE_OPTIONS_GROUP) { $class_1 = 'structure'; $class_2 = 'structure-options_group'; } - elseif ($type === c_base_markup_tag::TYPE_OPTION) { + else if ($type === c_base_markup_tag::TYPE_OPTION) { $class_1 = 'datum'; $class_2 = 'datum-option'; } - elseif ($type === c_base_markup_tag::TYPE_OUTPUT) { + else if ($type === c_base_markup_tag::TYPE_OUTPUT) { $class_1 = 'datum'; $class_2 = 'datum-output'; } - elseif ($type === c_base_markup_tag::TYPE_PARAGRAPH) { + else if ($type === c_base_markup_tag::TYPE_PARAGRAPH) { $class_1 = 'text'; $class_2 = 'text-paragraph'; } - elseif ($type === c_base_markup_tag::TYPE_PARAM) { + else if ($type === c_base_markup_tag::TYPE_PARAM) { $class_1 = 'datum'; $class_2 = 'datum-parameter'; } - elseif ($type === c_base_markup_tag::TYPE_PASSWORD) { + else if ($type === c_base_markup_tag::TYPE_PASSWORD) { $class_1 = 'field'; $class_2 = 'field-password'; } - elseif ($type === c_base_markup_tag::TYPE_PICTURE) { + else if ($type === c_base_markup_tag::TYPE_PICTURE) { $class_1 = 'structure'; $class_2 = 'structure-picture'; } - elseif ($type === c_base_markup_tag::TYPE_PREFORMATTED) { + else if ($type === c_base_markup_tag::TYPE_PREFORMATTED) { $class_1 = 'format'; $class_2 = 'format-preformatted'; } - elseif ($type === c_base_markup_tag::TYPE_PROGRESS) { + else if ($type === c_base_markup_tag::TYPE_PROGRESS) { // note: 'media' is the closest thing I can think of for this tag (as in, it is like an image). $class_1 = 'media'; $class_2 = 'media-progress'; } - elseif ($type === c_base_markup_tag::TYPE_PREFORMATTED) { + else if ($type === c_base_markup_tag::TYPE_PREFORMATTED) { $class_1 = 'format'; $class_2 = 'format-preformatted'; } - elseif ($type === c_base_markup_tag::TYPE_QUOTE) { + else if ($type === c_base_markup_tag::TYPE_QUOTE) { $class_1 = 'text'; $class_2 = 'text-quote'; } - elseif ($type === c_base_markup_tag::TYPE_RADIO) { + else if ($type === c_base_markup_tag::TYPE_RADIO) { $class_1 = 'field'; $class_2 = 'field-radio'; } - elseif ($type === c_base_markup_tag::TYPE_RANGE) { + else if ($type === c_base_markup_tag::TYPE_RANGE) { $class_1 = 'field'; $class_2 = 'field-range'; } - elseif ($type === c_base_markup_tag::TYPE_RESET) { + else if ($type === c_base_markup_tag::TYPE_RESET) { $class_1 = 'field'; $class_2 = 'field-reset'; } - elseif ($type === c_base_markup_tag::TYPE_RUBY_PARENTHESIS) { + else if ($type === c_base_markup_tag::TYPE_RUBY_PARENTHESIS) { $class_1 = 'format'; $class_2 = 'format-ruby_parenthesis'; } - elseif ($type === c_base_markup_tag::TYPE_RUBY_PRONUNCIATION) { + else if ($type === c_base_markup_tag::TYPE_RUBY_PRONUNCIATION) { $class_1 = 'format'; $class_2 = 'format-ruby_pronunciation'; } - elseif ($type === c_base_markup_tag::TYPE_RUBY) { + else if ($type === c_base_markup_tag::TYPE_RUBY) { $class_1 = 'format'; $class_2 = 'format-ruby'; } - elseif ($type === c_base_markup_tag::TYPE_STRIKE_THROUGH) { + else if ($type === c_base_markup_tag::TYPE_STRIKE_THROUGH) { $class_1 = 'format'; $class_2 = 'format-strike_through'; } - elseif ($type === c_base_markup_tag::TYPE_SAMPLE) { + else if ($type === c_base_markup_tag::TYPE_SAMPLE) { $class_1 = 'text'; $class_2 = 'text-sample'; } - elseif ($type === c_base_markup_tag::TYPE_SEARCH) { + else if ($type === c_base_markup_tag::TYPE_SEARCH) { $class_1 = 'field'; $class_2 = 'field-search'; } - elseif ($type === c_base_markup_tag::TYPE_SECTION) { + else if ($type === c_base_markup_tag::TYPE_SECTION) { $class_1 = 'structure'; $class_2 = 'structure-section'; } - elseif ($type === c_base_markup_tag::TYPE_SELECT) { + else if ($type === c_base_markup_tag::TYPE_SELECT) { $class_1 = 'field'; $class_2 = 'field-select'; } - elseif ($type === c_base_markup_tag::TYPE_SMALL) { + else if ($type === c_base_markup_tag::TYPE_SMALL) { $class_1 = 'format'; $class_2 = 'format-small'; } - elseif ($type === c_base_markup_tag::TYPE_SOURCE) { + else if ($type === c_base_markup_tag::TYPE_SOURCE) { $class_1 = 'datum'; $class_2 = 'datum-source'; } - elseif ($type === c_base_markup_tag::TYPE_SPAN) { + else if ($type === c_base_markup_tag::TYPE_SPAN) { $class_1 = 'structure'; $class_2 = 'structure-span'; } - elseif ($type === c_base_markup_tag::TYPE_STRONG) { + else if ($type === c_base_markup_tag::TYPE_STRONG) { $class_1 = 'format'; $class_2 = 'format-strong'; } - elseif ($type === c_base_markup_tag::TYPE_SUB_SCRIPT) { + else if ($type === c_base_markup_tag::TYPE_SUB_SCRIPT) { $class_1 = 'format'; $class_2 = 'format-sub_script'; } - elseif ($type === c_base_markup_tag::TYPE_SUBMIT) { + else if ($type === c_base_markup_tag::TYPE_SUBMIT) { $class_1 = 'field'; $class_2 = 'field-submit'; } - elseif ($type === c_base_markup_tag::TYPE_SUPER_SCRIPT) { + else if ($type === c_base_markup_tag::TYPE_SUPER_SCRIPT) { $class_1 = 'format'; $class_2 = 'format-super_script'; } - elseif ($type === c_base_markup_tag::TYPE_SVG) { + else if ($type === c_base_markup_tag::TYPE_SVG) { $class_1 = 'media'; $class_2 = 'media-svg'; } - elseif ($type === c_base_markup_tag::TYPE_TABLE) { + else if ($type === c_base_markup_tag::TYPE_TABLE) { $class_1 = 'structure'; $class_2 = 'structure-table'; } - elseif ($type === c_base_markup_tag::TYPE_TABLE_BODY) { + else if ($type === c_base_markup_tag::TYPE_TABLE_BODY) { $class_1 = 'structure'; $class_2 = 'structure-table_body'; } - elseif ($type === c_base_markup_tag::TYPE_TABLE_CELL) { + else if ($type === c_base_markup_tag::TYPE_TABLE_CELL) { $class_1 = 'structure'; $class_2 = 'structure-table_cell'; } - elseif ($type === c_base_markup_tag::TYPE_TABLE_FOOTER) { + else if ($type === c_base_markup_tag::TYPE_TABLE_FOOTER) { $class_1 = 'structure'; $class_2 = 'structure-table_footer'; } - elseif ($type === c_base_markup_tag::TYPE_TABLE_HEADER) { + else if ($type === c_base_markup_tag::TYPE_TABLE_HEADER) { $class_1 = 'structure'; $class_2 = 'structure-table_header'; } - elseif ($type === c_base_markup_tag::TYPE_TABLE_HEADER_CELL) { + else if ($type === c_base_markup_tag::TYPE_TABLE_HEADER_CELL) { $class_1 = 'structure'; $class_2 = 'structure-table_header_cell'; } - elseif ($type === c_base_markup_tag::TYPE_TABLE_ROW) { + else if ($type === c_base_markup_tag::TYPE_TABLE_ROW) { $class_1 = 'structure'; $class_2 = 'structure-table_row'; } - elseif ($type === c_base_markup_tag::TYPE_TELEPHONE) { + else if ($type === c_base_markup_tag::TYPE_TELEPHONE) { $class_1 = 'field'; $class_2 = 'field-telephone'; } - elseif ($type === c_base_markup_tag::TYPE_TEMPLATE) { + else if ($type === c_base_markup_tag::TYPE_TEMPLATE) { $class_1 = 'datum'; $class_2 = 'datum-template'; } - elseif ($type === c_base_markup_tag::TYPE_TEXT) { + else if ($type === c_base_markup_tag::TYPE_TEXT) { $class_1 = 'field'; $class_2 = 'field-text'; } - elseif ($type === c_base_markup_tag::TYPE_TEXT_AREA) { + else if ($type === c_base_markup_tag::TYPE_TEXT_AREA) { $class_1 = 'field'; $class_2 = 'field-text_area'; } - elseif ($type === c_base_markup_tag::TYPE_TIME) { + else if ($type === c_base_markup_tag::TYPE_TIME) { $class_1 = 'field'; $class_2 = 'field-time'; } - elseif ($type === c_base_markup_tag::TYPE_TRACK) { + else if ($type === c_base_markup_tag::TYPE_TRACK) { $class_1 = 'datum'; $class_2 = 'datum-track'; } - elseif ($type === c_base_markup_tag::TYPE_UNDERLINE) { + else if ($type === c_base_markup_tag::TYPE_UNDERLINE) { $class_1 = 'format'; $class_2 = 'format-underline'; } - elseif ($type === c_base_markup_tag::TYPE_UNORDERED_LIST) { + else if ($type === c_base_markup_tag::TYPE_UNORDERED_LIST) { $class_1 = 'structure'; $class_2 = 'structure-unordered_list'; } - elseif ($type === c_base_markup_tag::TYPE_URL) { + else if ($type === c_base_markup_tag::TYPE_URL) { $class_1 = 'text'; $class_2 = 'text-url'; } - elseif ($type === c_base_markup_tag::TYPE_VARIABLE) { + else if ($type === c_base_markup_tag::TYPE_VARIABLE) { $class_1 = 'text'; $class_2 = 'text-variable'; } - elseif ($type === c_base_markup_tag::TYPE_VIDEO) { + else if ($type === c_base_markup_tag::TYPE_VIDEO) { $class_1 = 'media'; $class_2 = 'media-video'; } - elseif ($type === c_base_markup_tag::TYPE_WEEK) { + else if ($type === c_base_markup_tag::TYPE_WEEK) { $class_1 = 'field'; $class_2 = 'field-week'; } - elseif ($type === c_base_markup_tag::TYPE_WIDE_BREAK) { + else if ($type === c_base_markup_tag::TYPE_WIDE_BREAK) { $class_1 = 'structure'; $class_2 = 'structure-wide_break'; } @@ -946,7 +946,7 @@ class c_theme_html extends c_base_return { unset($is_ltr); } - elseif (is_null($attribute)) { + else if (is_null($attribute)) { $markup .= ' dir="auto"'; } unset($attribute); @@ -1308,7 +1308,7 @@ class c_theme_html extends c_base_return { unset($is_ltr); } - elseif (is_null($attribute)) { + else if (is_null($attribute)) { $markup .= ' dir="auto"'; } unset($attribute); @@ -1478,33 +1478,33 @@ class c_theme_html extends c_base_return { if ($tag_type === c_base_markup_tag::TYPE_BASE) { $markup .= 'p_render_markup_attributes_global($header_tag) . $this->p_render_markup_attributes_base($header_tag) . '>'; } - elseif ($tag_type === c_base_markup_tag::TYPE_LINK) { + else if ($tag_type === c_base_markup_tag::TYPE_LINK) { $markup .= 'p_render_markup_attributes_global($header_tag) . $this->p_render_markup_attributes_link($header_tag) . '>'; } - elseif ($tag_type === c_base_markup_tag::TYPE_META) { + else if ($tag_type === c_base_markup_tag::TYPE_META) { $markup .= 'p_render_markup_attributes_global($header_tag) . $this->p_render_markup_attributes_meta($header_tag) . '>'; } - elseif ($tag_type === c_base_markup_tag::TYPE_NO_SCRIPT) { + else if ($tag_type === c_base_markup_tag::TYPE_NO_SCRIPT) { $markup .= 'p_render_markup_attributes_global($header_tag) . '>'; $markup .= $header_tag->get_text()->get_value_exact(); $markup .= ''; } - elseif ($tag_type === c_base_markup_tag::TYPE_SCRIPT) { + else if ($tag_type === c_base_markup_tag::TYPE_SCRIPT) { $markup .= 'p_render_markup_attributes_global($header_tag) . $this->p_render_markup_attributes_script($header_tag) . '>'; $markup .= $header_tag->get_text()->get_value_exact(); $markup .= ''; } - elseif ($tag_type === c_base_markup_tag::TYPE_STYLE) { + else if ($tag_type === c_base_markup_tag::TYPE_STYLE) { $markup .= 'p_render_markup_attributes_global($header_tag) . $this->p_render_markup_attributes_style($header_tag) . '>'; $markup .= $header_tag->get_text()->get_value_exact(); $markup .= ''; } - elseif ($tag_type === c_base_markup_tag::TYPE_TEMPLATE) { + else if ($tag_type === c_base_markup_tag::TYPE_TEMPLATE) { $markup .= 'p_render_markup_attributes_global($header_tag) . '>'; $markup .= $header_tag->get_text()->get_value_exact(); $markup .= ''; } - elseif ($tag_type === c_base_markup_tag::TYPE_TITLE) { + else if ($tag_type === c_base_markup_tag::TYPE_TITLE) { $markup .= 'p_render_markup_attributes_global($header_tag) . '>'; $markup .= $header_tag->get_text()->get_value_exact(); $markup .= ''; @@ -1606,889 +1606,889 @@ class c_theme_html extends c_base_return { $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_ABBR) { + else if ($type === c_base_markup_tag::TYPE_ABBR) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_ADDRESS) { + else if ($type === c_base_markup_tag::TYPE_ADDRESS) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_ALTERNATE_GLYPH) { + else if ($type === c_base_markup_tag::TYPE_ALTERNATE_GLYPH) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_alternate_glyph($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_ALTERNATE_GLYPH_DEFINITION) { + else if ($type === c_base_markup_tag::TYPE_ALTERNATE_GLYPH_DEFINITION) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_ALTERNATE_GLYPH_ITEM) { + else if ($type === c_base_markup_tag::TYPE_ALTERNATE_GLYPH_ITEM) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_ANIMATE) { + else if ($type === c_base_markup_tag::TYPE_ANIMATE) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_animate($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_ANIMATE_MOTION) { + else if ($type === c_base_markup_tag::TYPE_ANIMATE_MOTION) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_animate_motion($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_ANIMATE_TRANSFORM) { + else if ($type === c_base_markup_tag::TYPE_ANIMATE_TRANSFORM) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_animate_transform($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_AREA) { + else if ($type === c_base_markup_tag::TYPE_AREA) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_area($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_ARTICLE) { + else if ($type === c_base_markup_tag::TYPE_ARTICLE) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_ASIDE) { + else if ($type === c_base_markup_tag::TYPE_ASIDE) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_AUDIO) { + else if ($type === c_base_markup_tag::TYPE_AUDIO) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_audio($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_BOLD) { + else if ($type === c_base_markup_tag::TYPE_BOLD) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_BDI) { + else if ($type === c_base_markup_tag::TYPE_BDI) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_BDO) { + else if ($type === c_base_markup_tag::TYPE_BDO) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_BLOCKQUOTE) { + else if ($type === c_base_markup_tag::TYPE_BLOCKQUOTE) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_blockquote($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_BREAK) { + else if ($type === c_base_markup_tag::TYPE_BREAK) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; } - elseif ($type === c_base_markup_tag::TYPE_BUTTON) { + else if ($type === c_base_markup_tag::TYPE_BUTTON) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_button($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_CANVAS) { + else if ($type === c_base_markup_tag::TYPE_CANVAS) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_canvas($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_CAPTION) { + else if ($type === c_base_markup_tag::TYPE_CAPTION) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_CHECKBOX) { + else if ($type === c_base_markup_tag::TYPE_CHECKBOX) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_input($tag, 'checkbox') . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_CIRCLE) { + else if ($type === c_base_markup_tag::TYPE_CIRCLE) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_circle($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_CITE) { + else if ($type === c_base_markup_tag::TYPE_CITE) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_CLIP_PATH) { + else if ($type === c_base_markup_tag::TYPE_CLIP_PATH) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_clip_path($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_CODE) { + else if ($type === c_base_markup_tag::TYPE_CODE) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_COLUMN) { + else if ($type === c_base_markup_tag::TYPE_COLUMN) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_col($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_COLUMN_GROUP) { + else if ($type === c_base_markup_tag::TYPE_COLUMN_GROUP) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_colgroup($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_COLOR) { + else if ($type === c_base_markup_tag::TYPE_COLOR) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_input($tag, 'color') . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_COLOR_PROFILE) { + else if ($type === c_base_markup_tag::TYPE_COLOR_PROFILE) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_color_profile($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_CURSOR) { + else if ($type === c_base_markup_tag::TYPE_CURSOR) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_cursor($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_DATA) { + else if ($type === c_base_markup_tag::TYPE_DATA) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_data($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_DATA_LIST) { + else if ($type === c_base_markup_tag::TYPE_DATA_LIST) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_DATE) { + else if ($type === c_base_markup_tag::TYPE_DATE) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_input($tag, 'date') . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_DATE_TIME_LOCAL) { + else if ($type === c_base_markup_tag::TYPE_DATE_TIME_LOCAL) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_input($tag, 'datetime-local') . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_TERM_DESCRIPTION) { + else if ($type === c_base_markup_tag::TYPE_TERM_DESCRIPTION) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_DEFS) { + else if ($type === c_base_markup_tag::TYPE_DEFS) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_DEL) { + else if ($type === c_base_markup_tag::TYPE_DEL) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_del($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_DESCRIPTION) { + else if ($type === c_base_markup_tag::TYPE_DESCRIPTION) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_DETAILS) { + else if ($type === c_base_markup_tag::TYPE_DETAILS) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_details($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_DFN) { + else if ($type === c_base_markup_tag::TYPE_DFN) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_DIALOG) { + else if ($type === c_base_markup_tag::TYPE_DIALOG) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_dialog($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_DIVIDER) { + else if ($type === c_base_markup_tag::TYPE_DIVIDER) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_DEFINITION_LIST) { + else if ($type === c_base_markup_tag::TYPE_DEFINITION_LIST) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_TERM_NAME) { + else if ($type === c_base_markup_tag::TYPE_TERM_NAME) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_ELLIPSE) { + else if ($type === c_base_markup_tag::TYPE_ELLIPSE) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_ellipse($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_EM) { + else if ($type === c_base_markup_tag::TYPE_EM) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_EMAIL) { + else if ($type === c_base_markup_tag::TYPE_EMAIL) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_input($tag, 'email') . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_EMBED) { + else if ($type === c_base_markup_tag::TYPE_EMBED) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_embed($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_FE_BLEND) { + else if ($type === c_base_markup_tag::TYPE_FE_BLEND) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_fe_blend($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_FIELD_SET) { + else if ($type === c_base_markup_tag::TYPE_FIELD_SET) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_fieldset($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_FIGURE) { + else if ($type === c_base_markup_tag::TYPE_FIGURE) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_FIGURE_CAPTION) { + else if ($type === c_base_markup_tag::TYPE_FIGURE_CAPTION) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_GROUP) { + else if ($type === c_base_markup_tag::TYPE_GROUP) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_group($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_FILE) { + else if ($type === c_base_markup_tag::TYPE_FILE) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_input($tag, 'file') . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_FOOTER) { + else if ($type === c_base_markup_tag::TYPE_FOOTER) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_FORM) { + else if ($type === c_base_markup_tag::TYPE_FORM) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_form($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_H1) { + else if ($type === c_base_markup_tag::TYPE_H1) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_H2) { + else if ($type === c_base_markup_tag::TYPE_H2) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_H3) { + else if ($type === c_base_markup_tag::TYPE_H3) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_H4) { + else if ($type === c_base_markup_tag::TYPE_H4) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_H5) { + else if ($type === c_base_markup_tag::TYPE_H5) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities($tag-get_text()->get_value_exact()); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_H6) { + else if ($type === c_base_markup_tag::TYPE_H6) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_HX) { + else if ($type === c_base_markup_tag::TYPE_HX) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_HEADER) { + else if ($type === c_base_markup_tag::TYPE_HEADER) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_HIDDEN) { + else if ($type === c_base_markup_tag::TYPE_HIDDEN) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_input($tag, 'hidden') . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_HORIZONTAL_RULER) { + else if ($type === c_base_markup_tag::TYPE_HORIZONTAL_RULER) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; } - elseif ($type === c_base_markup_tag::TYPE_ITALICS) { + else if ($type === c_base_markup_tag::TYPE_ITALICS) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_INLINE_FRAME) { + else if ($type === c_base_markup_tag::TYPE_INLINE_FRAME) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_iframe($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_IMAGE) { + else if ($type === c_base_markup_tag::TYPE_IMAGE) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_image($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_IMAGE_SVG) { + else if ($type === c_base_markup_tag::TYPE_IMAGE_SVG) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_image_svg($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_INPUT) { + else if ($type === c_base_markup_tag::TYPE_INPUT) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_input($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_INS) { + else if ($type === c_base_markup_tag::TYPE_INS) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_ins($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_KEYBOARD) { + else if ($type === c_base_markup_tag::TYPE_KEYBOARD) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_KEY_GEN) { + else if ($type === c_base_markup_tag::TYPE_KEY_GEN) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_key_gen($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_LABEL) { + else if ($type === c_base_markup_tag::TYPE_LABEL) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_label($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_LEGEND) { + else if ($type === c_base_markup_tag::TYPE_LEGEND) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_LIST_ITEM) { + else if ($type === c_base_markup_tag::TYPE_LIST_ITEM) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_li($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_LINE) { + else if ($type === c_base_markup_tag::TYPE_LINE) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_line($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_LINEAR_GRADIENT) { + else if ($type === c_base_markup_tag::TYPE_LINEAR_GRADIENT) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_linear_gradient($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_MAIN) { + else if ($type === c_base_markup_tag::TYPE_MAIN) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_MAP) { + else if ($type === c_base_markup_tag::TYPE_MAP) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_map($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_MARK) { + else if ($type === c_base_markup_tag::TYPE_MARK) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_MARKER) { + else if ($type === c_base_markup_tag::TYPE_MARKER) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_marker($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_MASK) { + else if ($type === c_base_markup_tag::TYPE_MASK) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_mask($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_MENU) { + else if ($type === c_base_markup_tag::TYPE_MENU) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_menu($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_MENU_ITEM) { + else if ($type === c_base_markup_tag::TYPE_MENU_ITEM) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_menuitem($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_METER) { + else if ($type === c_base_markup_tag::TYPE_METER) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_meter($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_MONTH) { + else if ($type === c_base_markup_tag::TYPE_MONTH) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_input($tag, 'month') . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_NAVIGATION) { + else if ($type === c_base_markup_tag::TYPE_NAVIGATION) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_NUMBER) { + else if ($type === c_base_markup_tag::TYPE_NUMBER) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_input($tag, 'number') . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_OBJECT) { + else if ($type === c_base_markup_tag::TYPE_OBJECT) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_object($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_ORDERED_LIST) { + else if ($type === c_base_markup_tag::TYPE_ORDERED_LIST) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_ol($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_OPTIONS_GROUP) { + else if ($type === c_base_markup_tag::TYPE_OPTIONS_GROUP) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_opt_group($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_OPTION) { + else if ($type === c_base_markup_tag::TYPE_OPTION) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_option($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_OUTPUT) { + else if ($type === c_base_markup_tag::TYPE_OUTPUT) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_output($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_PARAGRAPH) { + else if ($type === c_base_markup_tag::TYPE_PARAGRAPH) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= '

'; } - elseif ($type === c_base_markup_tag::TYPE_PARAM) { + else if ($type === c_base_markup_tag::TYPE_PARAM) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_param($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_PASSWORD) { + else if ($type === c_base_markup_tag::TYPE_PASSWORD) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_input($tag, 'password') . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_PATH) { + else if ($type === c_base_markup_tag::TYPE_PATH) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_path($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_PATTERN) { + else if ($type === c_base_markup_tag::TYPE_PATTERN) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_pattern($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_PICTURE) { + else if ($type === c_base_markup_tag::TYPE_PICTURE) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_POLYGON) { + else if ($type === c_base_markup_tag::TYPE_POLYGON) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_polygon($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_POLYLINE) { + else if ($type === c_base_markup_tag::TYPE_POLYLINE) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_polyline($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_PREFORMATTED) { + else if ($type === c_base_markup_tag::TYPE_PREFORMATTED) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_PROGRESS) { + else if ($type === c_base_markup_tag::TYPE_PROGRESS) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_progress($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_QUOTE) { + else if ($type === c_base_markup_tag::TYPE_QUOTE) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_q($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_RADIAL_GRADIENT) { + else if ($type === c_base_markup_tag::TYPE_RADIAL_GRADIENT) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_radial_gradient($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_RADIO) { + else if ($type === c_base_markup_tag::TYPE_RADIO) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_input($tag, 'radio') . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_RANGE) { + else if ($type === c_base_markup_tag::TYPE_RANGE) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_input($tag, 'range') . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_RECTANGLE) { + else if ($type === c_base_markup_tag::TYPE_RECTANGLE) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_rectangle($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_RESET) { + else if ($type === c_base_markup_tag::TYPE_RESET) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_input($tag, 'reset') . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_RUBY_PARENTHESIS) { + else if ($type === c_base_markup_tag::TYPE_RUBY_PARENTHESIS) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_RUBY_PRONUNCIATION) { + else if ($type === c_base_markup_tag::TYPE_RUBY_PRONUNCIATION) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_RUBY) { + else if ($type === c_base_markup_tag::TYPE_RUBY) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_STRIKE_THROUGH) { + else if ($type === c_base_markup_tag::TYPE_STRIKE_THROUGH) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_SAMPLE) { + else if ($type === c_base_markup_tag::TYPE_SAMPLE) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_SEARCH) { + else if ($type === c_base_markup_tag::TYPE_SEARCH) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_input($tag, 'search') . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_SECTION) { + else if ($type === c_base_markup_tag::TYPE_SECTION) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_SELECT) { + else if ($type === c_base_markup_tag::TYPE_SELECT) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_input($tag, 'select') . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_SMALL) { + else if ($type === c_base_markup_tag::TYPE_SMALL) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_SOURCE) { + else if ($type === c_base_markup_tag::TYPE_SOURCE) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_source($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_SPAN) { + else if ($type === c_base_markup_tag::TYPE_SPAN) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_STOP) { + else if ($type === c_base_markup_tag::TYPE_STOP) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_stop($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_STRONG) { + else if ($type === c_base_markup_tag::TYPE_STRONG) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_SUB_SCRIPT) { + else if ($type === c_base_markup_tag::TYPE_SUB_SCRIPT) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_SUBMIT) { + else if ($type === c_base_markup_tag::TYPE_SUBMIT) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_input($tag, 'submit') . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_SVG) { + else if ($type === c_base_markup_tag::TYPE_SVG) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_svg($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_TABLE) { + else if ($type === c_base_markup_tag::TYPE_TABLE) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_table($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_TABLE_BODY) { + else if ($type === c_base_markup_tag::TYPE_TABLE_BODY) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_TABLE_CELL) { + else if ($type === c_base_markup_tag::TYPE_TABLE_CELL) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_TABLE_FOOTER) { + else if ($type === c_base_markup_tag::TYPE_TABLE_FOOTER) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_TABLE_HEADER) { + else if ($type === c_base_markup_tag::TYPE_TABLE_HEADER) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_TABLE_HEADER_CELL) { + else if ($type === c_base_markup_tag::TYPE_TABLE_HEADER_CELL) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_table_header_cell($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_TABLE_ROW) { + else if ($type === c_base_markup_tag::TYPE_TABLE_ROW) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_TEXT) { + else if ($type === c_base_markup_tag::TYPE_TEXT) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_input($tag, 'text') . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_TEXT_AREA) { + else if ($type === c_base_markup_tag::TYPE_TEXT_AREA) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_text_area($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_TEXT_REFERENCE) { + else if ($type === c_base_markup_tag::TYPE_TEXT_REFERENCE) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_TEXT_SPAN) { + else if ($type === c_base_markup_tag::TYPE_TEXT_SPAN) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_TEXT_SVG) { + else if ($type === c_base_markup_tag::TYPE_TEXT_SVG) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_text_svg($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_TIME) { + else if ($type === c_base_markup_tag::TYPE_TIME) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_time($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_TRACK) { + else if ($type === c_base_markup_tag::TYPE_TRACK) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_track($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_UNDERLINE) { + else if ($type === c_base_markup_tag::TYPE_UNDERLINE) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_UNORDERED_LIST) { + else if ($type === c_base_markup_tag::TYPE_UNORDERED_LIST) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_URL) { + else if ($type === c_base_markup_tag::TYPE_URL) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_input($tag, 'url') . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_USE) { + else if ($type === c_base_markup_tag::TYPE_USE) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_use($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_VARIABLE) { + else if ($type === c_base_markup_tag::TYPE_VARIABLE) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_VIDEO) { + else if ($type === c_base_markup_tag::TYPE_VIDEO) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_video($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_WEEK) { + else if ($type === c_base_markup_tag::TYPE_WEEK) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_input($tag, 'week') . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; $markup .= ''; } - elseif ($type === c_base_markup_tag::TYPE_WIDE_BREAK) { + else if ($type === c_base_markup_tag::TYPE_WIDE_BREAK) { $markup .= 'p_render_markup_attributes_global($tag) . $this->p_render_markup_attributes_event_handler($tag) . '>'; $markup .= $this->p_html_entities_tag($tag); $markup .= $child_markup; diff --git a/common/theme/classes/theme_markup.php b/common/theme/classes/theme_markup.php index f82c408..1f449c1 100644 --- a/common/theme/classes/theme_markup.php +++ b/common/theme/classes/theme_markup.php @@ -160,7 +160,7 @@ class c_theme_tag { if ($this->tags_length > 0) { return new c_base_return_false(); } - elseif (!is_null($this->tags_length)) { + else if (!is_null($this->tags_length)) { $this->tags_length = NULL; } @@ -191,17 +191,17 @@ class c_theme_tag { if ($this->type === $type) { return new c_base_return_true(); } - elseif ($type === static::TYPE_NONE) { + else if ($type === static::TYPE_NONE) { $new_attributes = []; } - elseif ($type === static::TYPE_TITLE) { + else if ($type === static::TYPE_TITLE) { $new_attributes = []; if (array_key_exists('id', $this->attributes)) { $new_attributes['id'] = $this->attributes['id']; } } - elseif ($type === static::TYPE_HEADING) { + else if ($type === static::TYPE_HEADING) { $new_attributes = []; if (array_key_exists('id', $this->attributes)) { @@ -216,7 +216,7 @@ class c_theme_tag { $new_attributes['name'] = $this->attributes['name']; } } - elseif ($type === static::TYPE_FILES) { + else if ($type === static::TYPE_FILES) { $new_attributes = []; if (array_key_exists('id', $this->attributes)) { @@ -227,14 +227,14 @@ class c_theme_tag { $new_attributes['type'] = $this->attributes['type']; } } - elseif ($type === static::TYPE_CONTEXT) { + else if ($type === static::TYPE_CONTEXT) { $new_attributes = []; if (array_key_exists('id', $this->attributes)) { $new_attributes['id'] = $this->attributes['id']; } } - elseif ($type === static::TYPE_PRESENTATION) { + else if ($type === static::TYPE_PRESENTATION) { $new_attributes = []; if (array_key_exists('id', $this->attributes)) { @@ -261,7 +261,7 @@ class c_theme_tag { $new_attributes['file'] = $this->attributes['file']; } } - elseif ($type === static::TYPE_CONTENT) { + else if ($type === static::TYPE_CONTENT) { $new_attributes = []; if (array_key_exists('id', $this->attributes)) { @@ -843,7 +843,7 @@ class c_theme_tag { $markup .= ' id="' . $this->attributes['id'] . '"'; } } - elseif ($this->type === static::TYPE_HEADING) { + else if ($this->type === static::TYPE_HEADING) { if (isset($this->attributes['id'])) { $markup .= ' id="' . $this->attributes['id'] . '"'; } @@ -856,7 +856,7 @@ class c_theme_tag { $markup .= ' name="' . $this->attributes['name'] . '"'; } } - elseif ($this->type === static::TYPE_FILES) { + else if ($this->type === static::TYPE_FILES) { if (isset($this->attributes['id'])) { $markup .= ' id="' . $this->attributes['id'] . '"'; } @@ -865,12 +865,12 @@ class c_theme_tag { $markup .= ' type="' . $this->attributes['type'] . '"'; } } - elseif ($this->type === static::TYPE_CONTEXT) { + else if ($this->type === static::TYPE_CONTEXT) { if (isset($this->attributes['id'])) { $markup .= ' id="' . $this->attributes['id'] . '"'; } } - elseif ($this->type === static::TYPE_PRESENTATION) { + else if ($this->type === static::TYPE_PRESENTATION) { if (isset($this->attributes['id'])) { $markup .= ' id="' . $this->attributes['id'] . '"'; } @@ -895,7 +895,7 @@ class c_theme_tag { $markup .= ' file="' . $this->attributes['file'] . '"'; } } - elseif ($this->type === static::TYPE_CONTENT) { + else if ($this->type === static::TYPE_CONTENT) { if (isset($this->attributes['id'])) { $markup .= ' id="' . $this->attributes['id'] . '"'; } @@ -997,7 +997,7 @@ class c_theme_tag { // @todo: does this need to be sanitized, or would that result in double-sanitization? $this->text = $node->textContent; } - elseif ($this->type === static::TYPE_TAGS && $node->hasChildNodes()) { + else if ($this->type === static::TYPE_TAGS && $node->hasChildNodes()) { foreach ($node->childNodes as $child_node) { if (!($child_node instanceof DOMNode)) { continue; @@ -1018,7 +1018,7 @@ class c_theme_tag { $this->set_tag($child_tag); unset($child_tag); } - elseif ($child_node->nodeName == 'tags') { + else if ($child_node->nodeName == 'tags') { $child_tag = new c_theme_tag(); if ($child_node->hasAttributes()) { foreach ($child_node->attributes as $child_attribute) { @@ -1091,7 +1091,7 @@ class c_theme_tag { unset($allowed); return c_base_return_error::s_false(); } - elseif ($allowed) { + else if ($allowed) { unset($allowed); } else { @@ -1138,7 +1138,7 @@ class c_theme_tag { unset($allowed); return c_base_return_error::s_false(); } - elseif ($allowed) { + else if ($allowed) { unset($allowed); } else { @@ -1179,7 +1179,7 @@ class c_theme_tag { unset($allowed); return c_base_return_error::s_false(); } - elseif ($allowed) { + else if ($allowed) { unset($allowed); } else { @@ -1215,7 +1215,7 @@ class c_theme_tag { unset($allowed); return c_base_return_error::s_false(); } - elseif ($allowed) { + else if ($allowed) { unset($allowed); } else { @@ -1261,7 +1261,7 @@ class c_theme_tag { return FALSE; } } - elseif ($this->type === static::TYPE_HEADING) { + else if ($this->type === static::TYPE_HEADING) { switch ($attribute_name) { case 'id': case 'type': @@ -1271,7 +1271,7 @@ class c_theme_tag { return FALSE; } } - elseif ($this->type === static::TYPE_FILES) { + else if ($this->type === static::TYPE_FILES) { switch ($attribute_name) { case 'id': case 'type': @@ -1280,7 +1280,7 @@ class c_theme_tag { return FALSE; } } - elseif ($this->type === static::TYPE_CONTEXT) { + else if ($this->type === static::TYPE_CONTEXT) { switch ($attribute_name) { case 'id': return TRUE; @@ -1288,7 +1288,7 @@ class c_theme_tag { return FALSE; } } - elseif ($this->type === static::TYPE_PRESENTATION) { + else if ($this->type === static::TYPE_PRESENTATION) { switch ($attribute_name) { case 'id': case 'class': @@ -1301,7 +1301,7 @@ class c_theme_tag { return FALSE; } } - elseif ($this->type === static::TYPE_CONTENT) { + else if ($this->type === static::TYPE_CONTENT) { switch ($attribute_name) { case 'id': case 'context': @@ -1368,7 +1368,7 @@ class c_theme_tag { $this->type = static::TYPE_TAGS; } } - elseif (!is_null($this->text)) { + else if (!is_null($this->text)) { if ($this->type !== static::TYPE_TAG) { $this->type = static::TYPE_TAG; } @@ -1427,7 +1427,7 @@ class c_theme_tag { $element->setAttribute('id', $this->attributes['id']); } } - elseif ($this->type === static::TYPE_HEADING) { + else if ($this->type === static::TYPE_HEADING) { if (isset($this->attributes['id'])) { $element->setAttribute('id', $this->attributes['id']); } @@ -1440,7 +1440,7 @@ class c_theme_tag { $element->setAttribute('name', $this->attributes['name']); } } - elseif ($this->type === static::TYPE_FILES) { + else if ($this->type === static::TYPE_FILES) { if (isset($this->attributes['id'])) { $element->setAttribute('id', $this->attributes['id']); } @@ -1449,12 +1449,12 @@ class c_theme_tag { $element->setAttribute('type', $this->attributes['type']); } } - elseif ($this->type === static::TYPE_CONTEXT) { + else if ($this->type === static::TYPE_CONTEXT) { if (isset($this->attributes['id'])) { $element->setAttribute('id', $this->attributes['id']); } } - elseif ($this->type === static::TYPE_PRESENTATION) { + else if ($this->type === static::TYPE_PRESENTATION) { if (isset($this->attributes['id'])) { $element->setAttribute('id', $this->attributes['id']); } @@ -1479,7 +1479,7 @@ class c_theme_tag { $element->setAttribute('file', $this->attributes['file']); } } - elseif ($this->type === static::TYPE_CONTENT) { + else if ($this->type === static::TYPE_CONTENT) { if (isset($this->attributes['id'])) { $element->setAttribute('id', $this->attributes['id']); } @@ -1657,23 +1657,23 @@ class c_theme_markup { unset($type); return $this->title->set_tag($tag, $index); } - elseif ($type === c_theme_tag::TYPE_HEADING) { + else if ($type === c_theme_tag::TYPE_HEADING) { unset($type); return $this->heading->set_tag($tag, $index); } - elseif ($type === c_theme_tag::TYPE_FILES) { + else if ($type === c_theme_tag::TYPE_FILES) { unset($type); return $this->files->set_tag($tag, $index); } - elseif ($type === c_theme_tag::TYPE_CONTEXT) { + else if ($type === c_theme_tag::TYPE_CONTEXT) { unset($type); return $this->context->set_tag($tag, $index); } - elseif ($type === c_theme_tag::TYPE_PRESENTATION) { + else if ($type === c_theme_tag::TYPE_PRESENTATION) { unset($type); return $this->presentation->set_tag($tag, $index); } - elseif ($type === c_theme_tag::TYPE_CONTENT) { + else if ($type === c_theme_tag::TYPE_CONTENT) { unset($type); return $this->content->set_tag($tag, $index); } @@ -1723,19 +1723,19 @@ class c_theme_markup { if ($type === c_theme_tag::TYPE_TITLE) { $result = $this->title->set_tag($tag, $index); } - elseif ($type === c_theme_tag::TYPE_HEADING) { + else if ($type === c_theme_tag::TYPE_HEADING) { $result = $this->heading->set_tag($tag, $index); } - elseif ($type === c_theme_tag::TYPE_FILES) { + else if ($type === c_theme_tag::TYPE_FILES) { $result = $this->files->set_tag($tag, $index); } - elseif ($type === c_theme_tag::TYPE_CONTEXT) { + else if ($type === c_theme_tag::TYPE_CONTEXT) { $result = $this->context->set_tag($tag, $index); } - elseif ($type === c_theme_tag::TYPE_PRESENTATION) { + else if ($type === c_theme_tag::TYPE_PRESENTATION) { $result = $this->presentation->set_tag($tag, $index); } - elseif ($type === c_theme_tag::TYPE_CONTENT) { + else if ($type === c_theme_tag::TYPE_CONTENT) { $result = $this->content->set_tag($tag, $index); } else { @@ -1793,19 +1793,19 @@ class c_theme_markup { if ($type === c_theme_tag::TYPE_TITLE) { return $this->title->get_tag($index); } - elseif ($type === c_theme_tag::TYPE_HEADING) { + else if ($type === c_theme_tag::TYPE_HEADING) { return $this->heading->get_tag($index); } - elseif ($type === c_theme_tag::TYPE_FILES) { + else if ($type === c_theme_tag::TYPE_FILES) { return $this->files->get_tag($index); } - elseif ($type === c_theme_tag::TYPE_CONTEXT) { + else if ($type === c_theme_tag::TYPE_CONTEXT) { return $this->context->get_tag($index); } - elseif ($type === c_theme_tag::TYPE_PRESENTATION) { + else if ($type === c_theme_tag::TYPE_PRESENTATION) { return $this->presentation->get_tag($index); } - elseif ($type === c_theme_tag::TYPE_CONTENT) { + else if ($type === c_theme_tag::TYPE_CONTENT) { return $this->content->get_tag($index); } @@ -1840,19 +1840,19 @@ class c_theme_markup { if ($type === c_theme_tag::TYPE_TITLE) { return $this->title->delete_tag($index); } - elseif ($type === c_theme_tag::TYPE_HEADING) { + else if ($type === c_theme_tag::TYPE_HEADING) { return $this->heading->delete_tag($index); } - elseif ($type === c_theme_tag::TYPE_FILES) { + else if ($type === c_theme_tag::TYPE_FILES) { return $this->files->delete_tag($index); } - elseif ($type === c_theme_tag::TYPE_CONTEXT) { + else if ($type === c_theme_tag::TYPE_CONTEXT) { return $this->context->delete_tag($index); } - elseif ($type === c_theme_tag::TYPE_PRESENTATION) { + else if ($type === c_theme_tag::TYPE_PRESENTATION) { return $this->presentation->delete_tag($index); } - elseif ($type === c_theme_tag::TYPE_CONTENT) { + else if ($type === c_theme_tag::TYPE_CONTENT) { return $this->content->delete_tag($index); } diff --git a/examples/test.php b/examples/test.php index 39e340b..bd653ec 100755 --- a/examples/test.php +++ b/examples/test.php @@ -62,7 +62,7 @@ if ($language_chosen === i_base_languages::ENGLISH || $language_chosen === i_base_languages::ENGLISH_US) { require_once('common/base/classes/base_error_messages_english.php'); } - elseif ($language_chosen === i_base_languages::JAPANESE) { + else if ($language_chosen === i_base_languages::JAPANESE) { require_once('common/base/classes/base_error_messages_japanese.php'); $stuff['http']->set_response_content_language(i_base_languages::JAPANESE); } @@ -233,7 +233,7 @@ print("4) A new existence cookie has been created.
"); print($stuff['cookie_existence']['new']); } - elseif (isset($stuff['cookie_existence']['exists'])) { + else if (isset($stuff['cookie_existence']['exists'])) { print("4) The existence cookie has been loaded.
"); print($stuff['cookie_existence']['exists']); } @@ -818,19 +818,19 @@ $query_parameters[2] = 1; $query_parameters[7] = json_encode(array('expires' => $expires)); } - elseif ($type == 'logout') { + else if ($type == 'logout') { $query_parameters[0] = "Logging out of the system."; $query_parameters[1] = 18; $query_parameters[2] = 1; $query_parameters[7] = NULL; } - elseif ($type == 'create') { + else if ($type == 'create') { $query_parameters[0] = "Created the user account."; $query_parameters[1] = 27; $query_parameters[2] = 1; $query_parameters[7] = NULL; } - elseif ($type == 'login_failure') { + else if ($type == 'login_failure') { $query_parameters[0] = "Failed to login as the user '" . $user_name . "'."; $query_parameters[1] = 17; $query_parameters[2] = 2; diff --git a/program/autocreate_ldap_accounts_in_postgresql/source/php/autocreate_ldap_accounts_in_postgresql-client.php b/program/autocreate_ldap_accounts_in_postgresql/source/php/autocreate_ldap_accounts_in_postgresql-client.php index fedbe58..3432aa5 100644 --- a/program/autocreate_ldap_accounts_in_postgresql/source/php/autocreate_ldap_accounts_in_postgresql-client.php +++ b/program/autocreate_ldap_accounts_in_postgresql/source/php/autocreate_ldap_accounts_in_postgresql-client.php @@ -61,7 +61,7 @@ socket_close($socket); return; } - elseif ($written == 0) { + else if ($written == 0) { print("Nothing was written to the socket using socket_write().\n"); socket_close($socket); return; diff --git a/program/reservation/index.php b/program/reservation/index.php index ec98537..3597228 100644 --- a/program/reservation/index.php +++ b/program/reservation/index.php @@ -10,6 +10,8 @@ require_once('program/reservation/reservation_defaults_global.php'); require_once('common/standard/classes/standard_index.php'); +// @todo: add documentation that accounts with login access need either u_reservation_public or u_reservation role to properly login. + /** * The standard class for use in index.php or equivalent. diff --git a/program/reservation/reservation_defaults_global.php b/program/reservation/reservation_defaults_global.php index ecca2c3..6f053aa 100644 --- a/program/reservation/reservation_defaults_global.php +++ b/program/reservation/reservation_defaults_global.php @@ -329,7 +329,7 @@ class c_base_defaults_global { if (array_key_exists('REQUEST_TIME_FLOAT', $_SERVER)) { self::$s_timestamp_session = $_SERVER['REQUEST_TIME_FLOAT']; } - elseif (array_key_exists('REQUEST_TIME', $_SERVER)) { + else if (array_key_exists('REQUEST_TIME', $_SERVER)) { self::$s_timestamp_session = $_SERVER['REQUEST_TIME']; } } diff --git a/program/sessionize_accounts/source/php/sessionize_accounts-client.php b/program/sessionize_accounts/source/php/sessionize_accounts-client.php index 0b2a315..23ff3dc 100644 --- a/program/sessionize_accounts/source/php/sessionize_accounts-client.php +++ b/program/sessionize_accounts/source/php/sessionize_accounts-client.php @@ -48,7 +48,7 @@ socket_close($socket); return; } - elseif ($written == 0) { + else if ($written == 0) { print("Session Request: Nothing was written to the socket using socket_write().\n"); socket_close($socket); return; @@ -109,7 +109,7 @@ socket_close($socket); return; } - elseif ($written == 0) { + else if ($written == 0) { print("Password Request: Nothing was written to the socket using socket_write().\n"); socket_close($socket); return; diff --git a/program/sessionize_accounts/source/php/sessionize_accounts-server.php b/program/sessionize_accounts/source/php/sessionize_accounts-server.php index 4674420..b0fa6de 100644 --- a/program/sessionize_accounts/source/php/sessionize_accounts-server.php +++ b/program/sessionize_accounts/source/php/sessionize_accounts-server.php @@ -468,7 +468,7 @@ function main($argc, $argv) { continue; } // store password. - elseif (array_key_exists('password', $decoded_packet) && (is_null($decoded_packet['password']) || is_string($decoded_packet['password']))) { + else if (array_key_exists('password', $decoded_packet) && (is_null($decoded_packet['password']) || is_string($decoded_packet['password']))) { if (!isset($decoded_packet['name']) || strlen($decoded_packet['name']) == 0 || preg_match('/^(\w|-)+$/i', $decoded_packet['name']) != 1) { $response['error'] = array( 'target' => 'decoded_packet[name]', -- 1.8.3.1