From 3fdbcc8991706d4d2eec48d3e275930244e17583 Mon Sep 17 00:00:00 2001 From: Johan Janssens Date: Tue, 23 Jun 2015 22:15:22 +0200 Subject: [PATCH 1/4] #149 - Cleanup configuration file and rename to configuration.example --- ...uration.php-dist => configuration.example} | 47 ++++++++++--------- 1 file changed, 24 insertions(+), 23 deletions(-) rename config/{configuration.php-dist => configuration.example} (60%) diff --git a/config/configuration.php-dist b/config/configuration.example similarity index 60% rename from config/configuration.php-dist rename to config/configuration.example index c629d26737..72dc0ccfe7 100644 --- a/config/configuration.php-dist +++ b/config/configuration.example @@ -13,36 +13,37 @@ * database. */ class JConfig { - /* Site Settings */ - public $sitename = 'Joomla!'; // Name of Joomla site - public $editor = 'tinymce'; + /* Site */ + public $sitename = 'Joomla!'; // Name of Joomla site + public $editor = 'tinymce'; public $captcha = '0'; public $list_limit = '20'; + + /* User */ public $root_user = '42'; - public $access = '1'; + public $access = '1'; - /* Database Settings */ - public $dbtype = 'mysql'; // Normally mysql - public $host = 'localhost'; // This is normally set to localhost - public $user = ''; // DB username - public $password = ''; // DB password - public $db = ''; // DB database name + /* Database */ + public $dbtype = 'mysqli'; // Normally mysqli + public $host = 'localhost'; // This is normally set to localhost + public $user = ''; // DB username + public $password = ''; // DB password + public $db = ''; // DB database name - /* Server Settings */ - public $secret = 'FBVtggIk5lAzEU9H'; // Change this to something more secure + /* Server */ + public $secret = ''; // Change this to something more secure public $tmp_path = '/tmp'; public $log_path = '/var/logs'; - public $live_site = ''; // Optional, Full url to Joomla install. - public $force_ssl = 0; // Force areas of the site to be SSL ONLY. 0 = None, 1 = Administrator, 2 = Both Site and Administrator + public $force_ssl = 0; // Force areas of the site to be SSL ONLY. 0 = None, 1 = Administrator, 2 = Both Site and Administrator - /* Locale Settings */ + /* Locale */ public $offset = 'UTC'; - /* Session settings */ - public $lifetime = '15'; // Session time + /* Session */ + public $lifetime = '15'; // Session time public $session_handler = 'database'; - /* Mail Settings */ + /* Mail */ public $mailer = 'mail'; public $mailfrom = ''; public $fromname = ''; @@ -52,16 +53,16 @@ class JConfig { public $smtppass = ''; public $smtphost = 'localhost'; - /* Cache Settings */ + /* Cache */ public $caching = '0'; public $cachetime = '15'; public $cache_handler = 'file'; - /* Debug Settings */ + /* Debug */ public $debug = '0'; public $debug_lang = '0'; - /* Meta Settings */ + /* Meta */ public $MetaDesc = 'Joomla! - the dynamic portal engine and content management system'; public $MetaKeys = 'joomla, Joomla'; public $MetaTitle = '1'; @@ -69,13 +70,13 @@ class JConfig { public $MetaVersion = '0'; public $robots = ''; - /* SEO Settings */ + /* SEO */ public $sef = '1'; public $sef_rewrite = '0'; public $sef_suffix = '0'; public $unicodeslugs = '0'; - /* Feed Settings */ + /* Feed */ public $feed_limit = 10; public $feed_email = 'author'; } From 086e21f9a81d7a005f237fbf1eb6e897473a76a2 Mon Sep 17 00:00:00 2001 From: Johan Janssens Date: Tue, 23 Jun 2015 22:34:10 +0200 Subject: [PATCH 2/4] #149 - Remove meta config options. --- config/configuration.example | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/config/configuration.example b/config/configuration.example index 72dc0ccfe7..0e41fbe50b 100644 --- a/config/configuration.example +++ b/config/configuration.example @@ -12,7 +12,7 @@ * Now edit this file and configure the parameters for your site and * database. */ -class JConfig { +class JConfig /* Site */ public $sitename = 'Joomla!'; // Name of Joomla site public $editor = 'tinymce'; @@ -62,14 +62,6 @@ class JConfig { public $debug = '0'; public $debug_lang = '0'; - /* Meta */ - public $MetaDesc = 'Joomla! - the dynamic portal engine and content management system'; - public $MetaKeys = 'joomla, Joomla'; - public $MetaTitle = '1'; - public $MetaAuthor = '1'; - public $MetaVersion = '0'; - public $robots = ''; - /* SEO */ public $sef = '1'; public $sef_rewrite = '0'; From 6d251285c47842cb850e0d31ea9fee8a3ea7355e Mon Sep 17 00:00:00 2001 From: Johan Janssens Date: Tue, 23 Jun 2015 23:08:01 +0200 Subject: [PATCH 3/4] #149 - Remove the global configuration user interface. --- .../com_config/models/application.php | 18 -- .../com_config/models/component.php | 18 -- .../view/application/tmpl/default.php | 40 +---- .../view/application/tmpl/default_cache.php | 14 -- .../view/application/tmpl/default_cookie.php | 14 -- .../application/tmpl/default_database.php | 14 -- .../view/application/tmpl/default_debug.php | 14 -- .../view/application/tmpl/default_ftp.php | 14 -- .../application/tmpl/default_ftplogin.php | 30 ---- .../view/application/tmpl/default_locale.php | 14 -- .../view/application/tmpl/default_mail.php | 14 -- .../application/tmpl/default_metadata.php | 14 -- .../view/application/tmpl/default_seo.php | 14 -- .../view/application/tmpl/default_server.php | 14 -- .../view/application/tmpl/default_session.php | 14 -- .../view/application/tmpl/default_site.php | 14 -- .../language/en-GB/en-GB.com_config.ini | 157 +----------------- .../language/en-GB/en-GB.com_config.sys.ini | 4 - 18 files changed, 9 insertions(+), 426 deletions(-) delete mode 100644 app/administrator/components/com_config/models/application.php delete mode 100644 app/administrator/components/com_config/models/component.php delete mode 100644 app/administrator/components/com_config/view/application/tmpl/default_cache.php delete mode 100644 app/administrator/components/com_config/view/application/tmpl/default_cookie.php delete mode 100644 app/administrator/components/com_config/view/application/tmpl/default_database.php delete mode 100644 app/administrator/components/com_config/view/application/tmpl/default_debug.php delete mode 100644 app/administrator/components/com_config/view/application/tmpl/default_ftp.php delete mode 100644 app/administrator/components/com_config/view/application/tmpl/default_ftplogin.php delete mode 100644 app/administrator/components/com_config/view/application/tmpl/default_locale.php delete mode 100644 app/administrator/components/com_config/view/application/tmpl/default_mail.php delete mode 100644 app/administrator/components/com_config/view/application/tmpl/default_metadata.php delete mode 100644 app/administrator/components/com_config/view/application/tmpl/default_seo.php delete mode 100644 app/administrator/components/com_config/view/application/tmpl/default_server.php delete mode 100644 app/administrator/components/com_config/view/application/tmpl/default_session.php delete mode 100644 app/administrator/components/com_config/view/application/tmpl/default_site.php diff --git a/app/administrator/components/com_config/models/application.php b/app/administrator/components/com_config/models/application.php deleted file mode 100644 index 4e6ebf19ed..0000000000 --- a/app/administrator/components/com_config/models/application.php +++ /dev/null @@ -1,18 +0,0 @@ -
    -
    • -
    • -
    • -
    • +
-
-
-
- loadTemplate('site'); ?> - loadTemplate('metadata'); ?> -
-
- loadTemplate('seo'); ?> - loadTemplate('cookie'); ?> -
-
-
-
-
-
- loadTemplate('debug'); ?> - loadTemplate('cache'); ?> - loadTemplate('session'); ?> -
-
-
-
-
-
- loadTemplate('server'); ?> - loadTemplate('locale'); ?> -
-
- loadTemplate('database'); ?> - loadTemplate('mail'); ?> -
-
-
-
+
loadTemplate('permissions'); ?>
diff --git a/app/administrator/components/com_config/view/application/tmpl/default_cache.php b/app/administrator/components/com_config/view/application/tmpl/default_cache.php deleted file mode 100644 index 16829a3f49..0000000000 --- a/app/administrator/components/com_config/view/application/tmpl/default_cache.php +++ /dev/null @@ -1,14 +0,0 @@ -name = JText::_('COM_CONFIG_CACHE_SETTINGS'); -$this->fieldsname = 'cache'; -echo JLayoutHelper::render('joomla.content.options_default', $this); diff --git a/app/administrator/components/com_config/view/application/tmpl/default_cookie.php b/app/administrator/components/com_config/view/application/tmpl/default_cookie.php deleted file mode 100644 index 302e35ebe5..0000000000 --- a/app/administrator/components/com_config/view/application/tmpl/default_cookie.php +++ /dev/null @@ -1,14 +0,0 @@ -name = JText::_('COM_CONFIG_COOKIE_SETTINGS'); -$this->fieldsname = 'cookie'; -echo JLayoutHelper::render('joomla.content.options_default', $this); diff --git a/app/administrator/components/com_config/view/application/tmpl/default_database.php b/app/administrator/components/com_config/view/application/tmpl/default_database.php deleted file mode 100644 index 675ea6fa5c..0000000000 --- a/app/administrator/components/com_config/view/application/tmpl/default_database.php +++ /dev/null @@ -1,14 +0,0 @@ -name = JText::_('COM_CONFIG_DATABASE_SETTINGS'); -$this->fieldsname = 'database'; -echo JLayoutHelper::render('joomla.content.options_default', $this); diff --git a/app/administrator/components/com_config/view/application/tmpl/default_debug.php b/app/administrator/components/com_config/view/application/tmpl/default_debug.php deleted file mode 100644 index d343e419d1..0000000000 --- a/app/administrator/components/com_config/view/application/tmpl/default_debug.php +++ /dev/null @@ -1,14 +0,0 @@ -name = JText::_('COM_CONFIG_DEBUG_SETTINGS'); -$this->fieldsname = 'debug'; -echo JLayoutHelper::render('joomla.content.options_default', $this); diff --git a/app/administrator/components/com_config/view/application/tmpl/default_ftp.php b/app/administrator/components/com_config/view/application/tmpl/default_ftp.php deleted file mode 100644 index 5025c3d3d9..0000000000 --- a/app/administrator/components/com_config/view/application/tmpl/default_ftp.php +++ /dev/null @@ -1,14 +0,0 @@ -name = JText::_('COM_CONFIG_FTP_SETTINGS'); -$this->fieldsname = 'ftp'; -echo JLayoutHelper::render('joomla.content.options_default', $this); diff --git a/app/administrator/components/com_config/view/application/tmpl/default_ftplogin.php b/app/administrator/components/com_config/view/application/tmpl/default_ftplogin.php deleted file mode 100644 index a287d95598..0000000000 --- a/app/administrator/components/com_config/view/application/tmpl/default_ftplogin.php +++ /dev/null @@ -1,30 +0,0 @@ - -
- - - ftp instanceof Exception) : ?> -

ftp->message); ?>

- -
-
-
- -
-
-
-
-
- -
-
-
diff --git a/app/administrator/components/com_config/view/application/tmpl/default_locale.php b/app/administrator/components/com_config/view/application/tmpl/default_locale.php deleted file mode 100644 index a850963c18..0000000000 --- a/app/administrator/components/com_config/view/application/tmpl/default_locale.php +++ /dev/null @@ -1,14 +0,0 @@ -name = JText::_('COM_CONFIG_LOCATION_SETTINGS'); -$this->fieldsname = 'locale'; -echo JLayoutHelper::render('joomla.content.options_default', $this); diff --git a/app/administrator/components/com_config/view/application/tmpl/default_mail.php b/app/administrator/components/com_config/view/application/tmpl/default_mail.php deleted file mode 100644 index d4c242fadf..0000000000 --- a/app/administrator/components/com_config/view/application/tmpl/default_mail.php +++ /dev/null @@ -1,14 +0,0 @@ -name = JText::_('COM_CONFIG_MAIL_SETTINGS'); -$this->fieldsname = 'mail'; -echo JLayoutHelper::render('joomla.content.options_default', $this); diff --git a/app/administrator/components/com_config/view/application/tmpl/default_metadata.php b/app/administrator/components/com_config/view/application/tmpl/default_metadata.php deleted file mode 100644 index f31ae1523e..0000000000 --- a/app/administrator/components/com_config/view/application/tmpl/default_metadata.php +++ /dev/null @@ -1,14 +0,0 @@ -name = JText::_('COM_CONFIG_METADATA_SETTINGS'); -$this->fieldsname = 'metadata'; -echo JLayoutHelper::render('joomla.content.options_default', $this); diff --git a/app/administrator/components/com_config/view/application/tmpl/default_seo.php b/app/administrator/components/com_config/view/application/tmpl/default_seo.php deleted file mode 100644 index b637c840bb..0000000000 --- a/app/administrator/components/com_config/view/application/tmpl/default_seo.php +++ /dev/null @@ -1,14 +0,0 @@ -name = JText::_('COM_CONFIG_SEO_SETTINGS'); -$this->fieldsname = 'seo'; -echo JLayoutHelper::render('joomla.content.options_default', $this); diff --git a/app/administrator/components/com_config/view/application/tmpl/default_server.php b/app/administrator/components/com_config/view/application/tmpl/default_server.php deleted file mode 100644 index 5ca15b210e..0000000000 --- a/app/administrator/components/com_config/view/application/tmpl/default_server.php +++ /dev/null @@ -1,14 +0,0 @@ -name = JText::_('COM_CONFIG_SERVER_SETTINGS'); -$this->fieldsname = 'server'; -echo JLayoutHelper::render('joomla.content.options_default', $this); diff --git a/app/administrator/components/com_config/view/application/tmpl/default_session.php b/app/administrator/components/com_config/view/application/tmpl/default_session.php deleted file mode 100644 index 564253a1bc..0000000000 --- a/app/administrator/components/com_config/view/application/tmpl/default_session.php +++ /dev/null @@ -1,14 +0,0 @@ -name = JText::_('COM_CONFIG_SESSION_SETTINGS'); -$this->fieldsname = 'session'; -echo JLayoutHelper::render('joomla.content.options_default', $this); diff --git a/app/administrator/components/com_config/view/application/tmpl/default_site.php b/app/administrator/components/com_config/view/application/tmpl/default_site.php deleted file mode 100644 index 7edae43800..0000000000 --- a/app/administrator/components/com_config/view/application/tmpl/default_site.php +++ /dev/null @@ -1,14 +0,0 @@ -name = JText::_('COM_CONFIG_SITE_SETTINGS'); -$this->fieldsname = 'site'; -echo JLayoutHelper::render('joomla.content.options_default', $this); diff --git a/app/administrator/language/en-GB/en-GB.com_config.ini b/app/administrator/language/en-GB/en-GB.com_config.ini index a579931f0b..62046251a8 100644 --- a/app/administrator/language/en-GB/en-GB.com_config.ini +++ b/app/administrator/language/en-GB/en-GB.com_config.ini @@ -13,167 +13,24 @@ COM_CONFIG_ACTION_EDITSTATE_DESC="Allows users in the group to edit the state of COM_CONFIG_ACTION_LOGIN_ADMIN_DESC="Allows users in the group to login to the backend administrator site." COM_CONFIG_ACTION_LOGIN_SITE_DESC="Allows users in the group to login to the frontend site." COM_CONFIG_ACTION_MANAGE_DESC="Allows users in the group to access all of the administration interface except Global Configuration" -COM_CONFIG_CACHE_SETTINGS="Cache Settings" -COM_CONFIG_CACHE_WARNING="Failed to clear cache automatically, you may need to do so manually." COM_CONFIG_COMPONENT_FIELDSET_LABEL="Component" -COM_CONFIG_COOKIE_SETTINGS="Cookie Settings" -COM_CONFIG_DATABASE_SETTINGS="Database Settings" -COM_CONFIG_DEBUG_SETTINGS="Debug Settings" -COM_CONFIG_ERROR_CACHE_PATH_NOTWRITABLE="The cache folder is not writable: %s" COM_CONFIG_ERROR_COMPONENT_ASSET_NOT_FOUND="The asset for the component could not be found. Permissions have not been saved." COM_CONFIG_ERROR_CONFIG_EXTENSION_NOT_FOUND="The Global Configuration extension could not be found. Text filter settings have not been saved." -COM_CONFIG_ERROR_CONFIGURATION_PHP_NOTUNWRITABLE="Could not make configuration.php unwritable." -COM_CONFIG_ERROR_CONFIGURATION_PHP_NOTWRITABLE="Could not make configuration.php writable." -COM_CONFIG_ERROR_HELPREFRESH_ERROR_STORE="The new Help Sites list could not be saved" -COM_CONFIG_ERROR_HELPREFRESH_FETCH="The current Help Sites list could not be fetched from the remote server" COM_CONFIG_ERROR_ROOT_ASSET_NOT_FOUND="The asset for global configuration could not be found. Permissions have not been saved." COM_CONFIG_ERROR_REMOVING_SUPER_ADMIN="You cannot remove your own Super User permissions." -COM_CONFIG_ERROR_WRITE_FAILED="Could not write to the configuration file" -COM_CONFIG_FIELD_CACHE_HANDLER_DESC="Choose cache handler to enable caching. Native caching mechanism is file-based. Please make sure the cache folders are writable." -COM_CONFIG_FIELD_CACHE_HANDLER_LABEL="Cache Handler" -COM_CONFIG_FIELD_CACHE_LABEL="Cache" -COM_CONFIG_FIELD_CACHE_DESC="Enable or disable caching and set caching level. Conservative level: smaller system cache, Progressive level (default): faster, bigger system cache, includes module renderers cache. Not appropriate for extremely large sites." -COM_CONFIG_FIELD_CACHE_TIME_DESC="The maximum length of time in minutes for a cache file to be stored before it is refreshed." -COM_CONFIG_FIELD_CACHE_TIME_LABEL="Cache Time" -COM_CONFIG_FIELD_COOKIE_DOMAIN_DESC="Domain to use when setting session cookies. Precede domain with '.' if cookie should be valid for all subdomains." -COM_CONFIG_FIELD_COOKIE_DOMAIN_LABEL="Cookie Domain" -COM_CONFIG_FIELD_COOKIE_PATH_DESC="Path the cookie should be valid for." -COM_CONFIG_FIELD_COOKIE_PATH_LABEL="Cookie Path" -COM_CONFIG_FIELD_DATABASE_HOST_DESC="The hostname for your database entered during the installation process. Do not edit this field unless absolutely necessary (e.g. the transfer of the database to a new hosting provider)." -COM_CONFIG_FIELD_DATABASE_HOST_LABEL="Host" -COM_CONFIG_FIELD_DATABASE_NAME_DESC="The name for your database entered during the installation process. Do not edit this field unless absolutely necessary (e.g. the transfer of the database to a new hosting provider)." -COM_CONFIG_FIELD_DATABASE_NAME_LABEL="Database Name" -COM_CONFIG_FIELD_DATABASE_PREFIX_DESC="The prefix used for your database tables entered during the installation process. Do not edit field unless absolutely necessary (e.g. the transfer of the database to a new hosting provider)." -COM_CONFIG_FIELD_DATABASE_PREFIX_LABEL="Database Tables Prefix" -COM_CONFIG_FIELD_DATABASE_TYPE_DESC="The type of database in use entered during the installation process. Do not edit this field unless you are having to migrate to a different type of database, perhaps due to changing your hosting provider." -COM_CONFIG_FIELD_DATABASE_TYPE_LABEL="Database Type" -COM_CONFIG_FIELD_DATABASE_USERNAME_DESC="The username for access to your database entered during the installation process. Do not edit this field unless absolutely necessary (e.g. the transfer of the database to a new hosting provider)." -COM_CONFIG_FIELD_DATABASE_USERNAME_LABEL="Database Username" -COM_CONFIG_FIELD_DEBUG_LANG_DESC="Select whether the debugging indicators (**...**) or (??...??) for the Joomla! Language files will be displayed. Debug Language will work without Debug System being activated, but you will not get the additional detailed references that will help you correct any errors." -COM_CONFIG_FIELD_DEBUG_LANG_LABEL="Debug Language" -COM_CONFIG_FIELD_DEBUG_SYSTEM_DESC="If enabled, diagnostic information, language translation, and SQL errors (if present) will be displayed. The information will be displayed at the foot of every page you view within the Joomla backend and frontend. It is not advisable to leave the debug mode activated when running a live Web site." -COM_CONFIG_FIELD_DEBUG_SYSTEM_LABEL="Debug System" -COM_CONFIG_FIELD_DEFAULT_ACCESS_LEVEL_DESC="Select the default access level for new content, menu items, and other items created on your site." -COM_CONFIG_FIELD_DEFAULT_ACCESS_LEVEL_LABEL="Default Access Level" -COM_CONFIG_FIELD_DEFAULT_EDITOR_DESC="Select the default text editor for your site. Registered Users will be able to change their preference in their personal details if you allow that option." -COM_CONFIG_FIELD_DEFAULT_EDITOR_LABEL="Default Editor" -COM_CONFIG_FIELD_DEFAULT_CAPTCHA_DESC="Select the default captcha for your site. You may need to enter required information for your captcha plugin in the Plugin Manager." -COM_CONFIG_FIELD_DEFAULT_CAPTCHA_LABEL="Default Captcha" -COM_CONFIG_FIELD_DEFAULT_FEED_LIMIT_DESC="Select the number of content items to show in the feed(s)." -COM_CONFIG_FIELD_DEFAULT_FEED_LIMIT_LABEL="Default Feed Limit" -COM_CONFIG_FIELD_DEFAULT_LIST_LIMIT_DESC="Sets the default length of lists in the Control Panel for all users" -COM_CONFIG_FIELD_DEFAULT_LIST_LIMIT_LABEL="Default List Limit" -COM_CONFIG_FIELD_FEED_EMAIL_DESC="The RSS and Atom newsfeeds include the author's email address. Select Author Email to use each author's email (from the User Manager) in the news feed. Select Site Email to include the site 'Mail from' email address for each article." -COM_CONFIG_FIELD_FEED_EMAIL_LABEL="Feed email" -COM_CONFIG_FIELD_FILTERS_DEFAULT_BLACK_LIST="Default Black List" -COM_CONFIG_FIELD_FILTERS_CUSTOM_BLACK_LIST="Custom Black List" -COM_CONFIG_FIELD_FILTERS_NO_HTML="No HTML" -COM_CONFIG_FIELD_FILTERS_NO_FILTER="No Filtering" -COM_CONFIG_FIELD_FILTERS_WHITE_LIST="White List" -COM_CONFIG_FRONTEDITING_DESC="Select if you want mouse-over edit icons for modules and menu items (support may depend on your template)" -COM_CONFIG_FRONTEDITING_LABEL="Mouse-over edit icons for" -COM_CONFIG_FRONTEDITING_MENUSANDMODULES="Modules & Menus" -COM_CONFIG_FRONTEDITING_MENUSANDMODULES_ADMIN_TOO="Modules & Menus (admin too)" -COM_CONFIG_FRONTEDITING_MODULES="Modules" -COM_CONFIG_FIELD_FORCE_SSL_DESC="Force site access to always occur under SSL (https) for selected areas. You will not be able to access selected areas under non-ssl. Note, you must have SSL enabled on your server to utilise this option." -COM_CONFIG_FIELD_FORCE_SSL_LABEL="Force SSL" -COM_CONFIG_FIELD_HELP_SERVER_DESC="Select the name of the help server from which your system will collect the help screen displays." -COM_CONFIG_FIELD_HELP_SERVER_LABEL="Help Server" -COM_CONFIG_FIELD_MAIL_FROM_EMAIL_DESC="The email address that will be used to send site email." -COM_CONFIG_FIELD_MAIL_FROM_EMAIL_LABEL="From email" -COM_CONFIG_FIELD_MAIL_FROM_NAME_DESC="Text displayed in the header "_QQ_"From:"_QQ_" field when sending a site email. Usually the site name." -COM_CONFIG_FIELD_MAIL_FROM_NAME_LABEL="From Name" -COM_CONFIG_FIELD_MAIL_MAILONLINE_DESC="Select Yes to turn on mail sending, select No to turn off mail sending. Warning: It is advised to put the site offline when disabling the mail function!" -COM_CONFIG_FIELD_MAIL_MAILONLINE_LABEL="Send mail" -COM_CONFIG_FIELD_MAIL_MAILER_DESC="Select which mailer for the delivery of site email." -COM_CONFIG_FIELD_MAIL_MAILER_LABEL="Mailer" -COM_CONFIG_FIELD_MAIL_SENDMAIL_PATH_DESC="Enter the path to the sendmail program directory on the host server." -COM_CONFIG_FIELD_MAIL_SENDMAIL_PATH_LABEL="Sendmail Path" -COM_CONFIG_FIELD_MAIL_SMTP_AUTH_DESC="Select Yes if your SMTP Host requires SMTP Authentication." -COM_CONFIG_FIELD_MAIL_SMTP_AUTH_LABEL="SMTP Authentication" -COM_CONFIG_FIELD_MAIL_SMTP_HOST_DESC="Enter the name of the SMTP host." -COM_CONFIG_FIELD_MAIL_SMTP_HOST_LABEL="SMTP Host" -COM_CONFIG_FIELD_MAIL_SMTP_PASSWORD_DESC="Enter the password for the SMTP host" -COM_CONFIG_FIELD_MAIL_SMTP_PASSWORD_LABEL="SMTP Password" -COM_CONFIG_FIELD_MAIL_SMTP_PORT_DESC="Enter the port number of your SMTP server. Use 25 for most unsecured servers and 465 for most secure servers." -COM_CONFIG_FIELD_MAIL_SMTP_PORT_LABEL="SMTP Port" -COM_CONFIG_FIELD_MAIL_SMTP_SECURE_DESC="Select the security model that your SMTP server uses." -COM_CONFIG_FIELD_MAIL_SMTP_SECURE_LABEL="SMTP Security" -COM_CONFIG_FIELD_MAIL_SMTP_USERNAME_DESC="Enter the username for access to the SMTP host." -COM_CONFIG_FIELD_MAIL_SMTP_USERNAME_LABEL="SMTP Username" -COM_CONFIG_FIELD_MEMCACHE_COMPRESSION_DESC="Memcache(d) Compression" -COM_CONFIG_FIELD_MEMCACHE_COMPRESSION_LABEL="Memcache(d) Compression" -COM_CONFIG_FIELD_MEMCACHE_HOST_DESC="Memcache(d) Server Host" -COM_CONFIG_FIELD_MEMCACHE_HOST_LABEL="Memcache(d) Server Host" -COM_CONFIG_FIELD_MEMCACHE_PERSISTENT_DESC="Persistent Memcache(d)" -COM_CONFIG_FIELD_MEMCACHE_PERSISTENT_LABEL="Persistent Memcache(d)" -COM_CONFIG_FIELD_MEMCACHE_PORT_DESC="Memcache(d) Server Port" -COM_CONFIG_FIELD_MEMCACHE_PORT_LABEL="Memcache(d) Server Port" -COM_CONFIG_FIELD_METAAUTHOR_DESC="Show the author meta tag when viewing articles" -COM_CONFIG_FIELD_METAAUTHOR_LABEL="Show Author Meta Tag" -COM_CONFIG_FIELD_METADESC_DESC="Enter a description of the overall Web site that is to be used by search engines. Generally, a maximum of 20 words is optimal." -COM_CONFIG_FIELD_METADESC_LABEL="Site Meta Description" -COM_CONFIG_FIELD_METAKEYS_DESC="Enter the keywords and phrases that best describe your Web site. Separate keywords and phrases with a comma." -COM_CONFIG_FIELD_METAKEYS_LABEL="Site Meta Keywords" -COM_CONFIG_FIELD_METALANGUAGE_DESC="Places the selected language in the metadata for the site." -COM_CONFIG_FIELD_METALANGUAGE_LABEL="Site Meta Language" -COM_CONFIG_FIELD_METAVERSION_LABEL="Show Joomla! Version" -COM_CONFIG_FIELD_METAVERSION_DESC="Show the Joomla! version number in the generator meta tag." -COM_CONFIG_FIELD_SECRET_DESC="This is an auto-generated, unique alphanumeric code for every Joomla! installation. It is used for security functions." -COM_CONFIG_FIELD_SECRET_LABEL="Secret" -COM_CONFIG_FIELD_SEF_REWRITE_DESC="Select to use a server's rewrite engine to catch URLs that meet specific conditions and rewrite them as directed. Available for IIS 7 and Apache.
Apache users only!
Rename htaccess.txt to .htaccess before activating.
IIS 7 users only!
Rename web.config.txt to web.config and install IIS URL Rewrite Module before activating.
" -COM_CONFIG_FIELD_SEF_REWRITE_LABEL="Use URL rewriting" -COM_CONFIG_FIELD_SEF_SUFFIX_DESC="If yes, the system will add a suffix to the URL based on the document type." -COM_CONFIG_FIELD_SEF_SUFFIX_LABEL="Adds Suffix to URL" -COM_CONFIG_FIELD_SEF_URL_DESC="Select whether or not the URLs are optimised for Search Engines." -COM_CONFIG_FIELD_SEF_URL_LABEL="Search Engine Friendly URLs" -COM_CONFIG_FIELD_SERVER_TIMEZONE_DESC="Choose a city in the list to configure the date and time for display." -COM_CONFIG_FIELD_SERVER_TIMEZONE_LABEL="Server Time Zone" -COM_CONFIG_FIELD_SESSION_HANDLER_DESC="The mechanism by which Joomla! identifies a User once they are connected to the web site using non-persistent cookies." -COM_CONFIG_FIELD_SESSION_HANDLER_LABEL="Session Handler" -COM_CONFIG_FIELD_SESSION_TIME_DESC="Auto log out a User after they have been inactive for the entered number of minutes. Do not set too high." -COM_CONFIG_FIELD_SESSION_TIME_LABEL="Session Lifetime" -COM_CONFIG_FIELD_SITE_NAME_DESC="Enter the name of your Web site. This will be used in various locations (e.g. the backend browser title bar)." -COM_CONFIG_FIELD_SITE_NAME_LABEL="Site Name" -COM_CONFIG_FIELD_SITENAME_PAGETITLES_DESC="Begin or end all Page Titles with the site name (for example, My Site Name - My Article Name)." -COM_CONFIG_FIELD_SITENAME_PAGETITLES_LABEL="Include Site Name in Page Titles" -COM_CONFIG_FIELD_TEMP_PATH_DESC="Please select a writable Temp folder." -COM_CONFIG_FIELD_TEMP_PATH_LABEL="Path to Temp Folder" -COM_CONFIG_FIELD_UNICODESLUGS_DESC="Choose between transliteration and unicode aliases. Transliteration is default." -COM_CONFIG_FIELD_UNICODESLUGS_LABEL="Unicode Aliases" -COM_CONFIG_FIELD_VALUE_ADMINISTRATOR_ONLY="Administrator Only" -COM_CONFIG_FIELD_VALUE_AFTER="After" -COM_CONFIG_FIELD_VALUE_AUTHOR_EMAIL="Author Email" -COM_CONFIG_FIELD_VALUE_BEFORE="Before" -COM_CONFIG_FIELD_VALUE_CACHE_OFF="OFF - Caching disabled" -COM_CONFIG_FIELD_VALUE_CACHE_CONSERVATIVE="ON - Conservative caching" -COM_CONFIG_FIELD_VALUE_CACHE_PROGRESSIVE="ON - Progressive caching" -COM_CONFIG_FIELD_VALUE_ENTIRE_SITE="Entire Site" -COM_CONFIG_FIELD_VALUE_NO_EMAIL="No Email" -COM_CONFIG_FIELD_VALUE_NONE="None" -COM_CONFIG_FIELD_VALUE_PHP_MAIL="PHP Mail" -COM_CONFIG_FIELD_VALUE_SENDMAIL="Sendmail" -COM_CONFIG_FIELD_VALUE_SITE_EMAIL="Site Email" -COM_CONFIG_FIELD_VALUE_SMTP="SMTP" -COM_CONFIG_FIELD_VALUE_SSL="SSL" -COM_CONFIG_FIELD_VALUE_TLS="TLS" COM_CONFIG_GLOBAL_CONFIGURATION="Global Configuration" -COM_CONFIG_HELPREFRESH_SUCCESS="The Help Sites list has been refreshed." -COM_CONFIG_LOCATION_SETTINGS="Location Settings" -COM_CONFIG_MAIL_SETTINGS="Mail Settings" -COM_CONFIG_METADATA_SETTINGS="Metadata Settings" COM_CONFIG_PERMISSION_SETTINGS="Permission Settings" COM_CONFIG_PERMISSIONS="Permissions" COM_CONFIG_SAVE_SUCCESS="Configuration successfully saved." -COM_CONFIG_SEO_SETTINGS="SEO Settings" -COM_CONFIG_SERVER="Server" -COM_CONFIG_SERVER_SETTINGS="Server Settings" -COM_CONFIG_SESSION_SETTINGS="Session Settings" -COM_CONFIG_SITE_SETTINGS="Site Settings" -COM_CONFIG_SYSTEM="System" -COM_CONFIG_SYSTEM_SETTINGS="System Settings" COM_CONFIG_TEXT_FILTER_SETTINGS="Text Filter Settings" COM_CONFIG_TEXT_FILTERS="Text Filters" COM_CONFIG_TEXT_FILTERS_DESC="These text filter settings will be applied to all text editor fields submitted by users in the selected groups.
These filtering options give more control over the HTML your content providers submit. You can be as strict or as liberal as you require to suit your site needs. The filtering is opt-in and the default settings provide good protection against markup commonly associated with Web site attacks." COM_CONFIG_XML_DESCRIPTION="Configuration Manager" +COM_CONFIG_SYSTEM="System" +COM_CONFIG_SYSTEM_SETTINGS="System Settings" +COM_CONFIG_FIELD_FILTERS_DEFAULT_BLACK_LIST="Default Black List" +COM_CONFIG_FIELD_FILTERS_CUSTOM_BLACK_LIST="Custom Black List" +COM_CONFIG_FIELD_FILTERS_NO_HTML="No HTML" +COM_CONFIG_FIELD_FILTERS_NO_FILTER="No Filtering" +COM_CONFIG_FIELD_FILTERS_WHITE_LIST="White List" JLIB_RULES_SETTING_NOTES="1. If you change the setting, it will apply to this and all child groups, components and content. Note that:
Inherited means that the permissions from the parent group will be used.
Denied means that no matter what the parent group's setting is, the group being edited cannot take this action.
Allowed means that the group being edited will be able to take this action (but if this is in conflict with the parent group it will have no impact; a conflict will be indicated by Not Allowed (Locked) under Calculated Settings).
Not Set is used only for the Public group in global configuration. The Public group is the parent of all other groups. If a permission is not set, it is treated as deny but can be changed for child groups, components, categories and items.
2. If you select a new setting, click Save to refresh the calculated settings." diff --git a/app/administrator/language/en-GB/en-GB.com_config.sys.ini b/app/administrator/language/en-GB/en-GB.com_config.sys.ini index 4f867d9812..33b304d4e3 100644 --- a/app/administrator/language/en-GB/en-GB.com_config.sys.ini +++ b/app/administrator/language/en-GB/en-GB.com_config.sys.ini @@ -5,7 +5,3 @@ COM_CONFIG="Configuration Manager" COM_CONFIG_XML_DESCRIPTION="Configuration Manager" -COM_CONFIG_CONFIG_VIEW_DEFAULT_DESC="Displays basic site configuration options" -COM_CONFIG_CONFIG_VIEW_DEFAULT_TITLE="Display Site Configuration Options" -COM_CONFIG_TEMPLATES_VIEW_DEFAULT_DESC="Displays template parameter options if the template allows this." -COM_CONFIG_TEMPLATES_VIEW_DEFAULT_TITLE="Display Template Options" From 7ca7a0e80a6542bf9df45a3ca90951d676969017 Mon Sep 17 00:00:00 2001 From: Johan Janssens Date: Tue, 23 Jun 2015 23:19:46 +0200 Subject: [PATCH 4/4] #149 - Remove the global configuration user interface. --- .../Pages/System/GlobalConfigurationPage.php | 251 ------------------ .../GlobalConfiguration0001Test.php | 56 ---- 2 files changed, 307 deletions(-) delete mode 100644 tests/system/webdriver/Pages/System/GlobalConfigurationPage.php delete mode 100644 tests/system/webdriver/tests/control_panel/GlobalConfiguration0001Test.php diff --git a/tests/system/webdriver/Pages/System/GlobalConfigurationPage.php b/tests/system/webdriver/Pages/System/GlobalConfigurationPage.php deleted file mode 100644 index 1ac2b0e39a..0000000000 --- a/tests/system/webdriver/Pages/System/GlobalConfigurationPage.php +++ /dev/null @@ -1,251 +0,0 @@ - 'toolbar-apply', - 'Save & Close' => 'toolbar-save', - 'Cancel' => 'toolbar-cancel', - ); - - /** - * Array of all input fields on the page (except for Permissions and Text Filters tabs). Each value is an associated array as follows: - * label: text of the label -- must be unique! - * id: id attribute of the input element - * type: type attribute of the input element: text, textarea, select, or fieldset (used for radio groups). - * - * This array is used to set values on the page. You can set a value with just the label text and the desired - * value. The id and element type are found here and the correct method is called to set the value. - * - * @var array - */ - public $inputFields = array( - array('label' => 'Site Name', 'id' => 'jform_sitename', 'type' => 'input', 'tab' => 'page-site'), - array('label' => 'Mouse-over edit icons for', 'id' => 'jform_frontediting', 'type' => 'select', 'tab' => 'page-site'), - array('label' => 'Default Editor', 'id' => 'jform_editor', 'type' => 'select', 'tab' => 'page-site'), - array('label' => 'Default Captcha', 'id' => 'jform_captcha', 'type' => 'select', 'tab' => 'page-site'), - array('label' => 'Default Access Level', 'id' => 'jform_access', 'type' => 'select', 'tab' => 'page-site'), - array('label' => 'Default List Limit', 'id' => 'jform_list_limit', 'type' => 'select', 'tab' => 'page-site'), - array('label' => 'Default Feed Limit', 'id' => 'jform_feed_limit', 'type' => 'select', 'tab' => 'page-site'), - array('label' => 'Feed email', 'id' => 'jform_feed_email', 'type' => 'select', 'tab' => 'page-site'), - array('label' => 'Site Meta Description', 'id' => 'jform_MetaDesc', 'type' => 'textarea', 'tab' => 'page-site'), - array('label' => 'Site Meta Keywords', 'id' => 'jform_MetaKeys', 'type' => 'textarea', 'tab' => 'page-site'), - array('label' => 'Robots', 'id' => 'jform_robots', 'type' => 'select', 'tab' => 'page-site'), - array('label' => 'Content Rights', 'id' => 'jform_MetaRights', 'type' => 'textarea', 'tab' => 'page-site'), - array('label' => 'Show Author Meta Tag', 'id' => 'jform_MetaAuthor', 'type' => 'fieldset', 'tab' => 'page-site'), - array('label' => 'Show Joomla! Version', 'id' => 'jform_MetaVersion', 'type' => 'fieldset', 'tab' => 'page-site'), - array('label' => 'Search Engine Friendly URLs', 'id' => 'jform_sef', 'type' => 'fieldset', 'tab' => 'page-site'), - array('label' => 'Use URL rewriting', 'id' => 'jform_sef_rewrite', 'type' => 'fieldset', 'tab' => 'page-site'), - array('label' => 'Adds Suffix to URL', 'id' => 'jform_sef_suffix', 'type' => 'fieldset', 'tab' => 'page-site'), - array('label' => 'Unicode Aliases', 'id' => 'jform_unicodeslugs', 'type' => 'fieldset', 'tab' => 'page-site'), - array('label' => 'Include Site Name in Page Titles', 'id' => 'jform_sitename_pagetitles', 'type' => 'select', 'tab' => 'page-site'), - array('label' => 'Cookie Domain', 'id' => 'jform_cookie_domain', 'type' => 'input', 'tab' => 'page-site'), - array('label' => 'Cookie Path', 'id' => 'jform_cookie_path', 'type' => 'input', 'tab' => 'page-site'), - array('label' => 'Debug System', 'id' => 'jform_debug', 'type' => 'fieldset', 'tab' => 'page-system'), - array('label' => 'Debug Language', 'id' => 'jform_debug_lang', 'type' => 'fieldset', 'tab' => 'page-system'), - array('label' => 'Cache', 'id' => 'jform_caching', 'type' => 'select', 'tab' => 'page-system'), - array('label' => 'Cache Handler', 'id' => 'jform_cache_handler', 'type' => 'select', 'tab' => 'page-system'), - array('label' => 'Cache Time', 'id' => 'jform_cachetime', 'type' => 'input', 'tab' => 'page-system'), - array('label' => 'Session Lifetime', 'id' => 'jform_lifetime', 'type' => 'input', 'tab' => 'page-system'), - array('label' => 'Session Handler', 'id' => 'jform_session_handler', 'type' => 'select', 'tab' => 'page-system'), - array('label' => 'Error Reporting', 'id' => 'jform_error_reporting', 'type' => 'select', 'tab' => 'page-server'), - array('label' => 'Force SSL', 'id' => 'jform_force_ssl', 'type' => 'select', 'tab' => 'page-server'), - array('label' => 'Server Time Zone', 'id' => 'jform_offset', 'type' => 'select', 'tab' => 'page-server'), - array('label' => 'Database Type', 'id' => 'jform_dbtype', 'type' => 'select', 'tab' => 'page-server'), - array('label' => 'Host', 'id' => 'jform_host', 'type' => 'input', 'tab' => 'page-server'), - array('label' => 'Database Username', 'id' => 'jform_user', 'type' => 'input', 'tab' => 'page-server'), - array('label' => 'Database Name', 'id' => 'jform_db', 'type' => 'input', 'tab' => 'page-server'), - array('label' => 'Database Tables Prefix', 'id' => 'jform_dbprefix', 'type' => 'input', 'tab' => 'page-server'), - array('label' => 'Send mail', 'id' => 'jform_mailonline', 'type' => 'fieldset', 'tab' => 'page-server'), - array('label' => 'Mailer', 'id' => 'jform_mailer', 'type' => 'select', 'tab' => 'page-server'), - array('label' => 'From email', 'id' => 'jform_mailfrom', 'type' => 'input', 'tab' => 'page-server'), - array('label' => 'From Name', 'id' => 'jform_fromname', 'type' => 'input', 'tab' => 'page-server'), - ); - - public $permissions = array('core.login.site', 'core.login.admin', 'core.admin', 'core.manage', 'core.create', 'core.delete', 'core.edit', 'core.edit.state', 'core.edit.own'); - - - - - - - public function getPermissionInputFields($groupId) - { - $this->selectTab('page-permissions'); - $this->driver->findElement(By::xPath("//a[@href='#permission-" . $groupId . "']"))->click(); - foreach ($this->permissions as $permission) - { - $id = 'jform_rules_' . $permission . '_' . $groupId; - $label = $this->driver->findElement(By::xPath("//label[@for='" . $id . "']")); - $text = $label->getText(); - $input = $this->driver->findElement(By::id($id)); - $this->driver->executeScript($this->moveToElementByAttribute, array('for', $id)); - sleep(1); - $tip = $label->findElement(By::xPath("//label[@class='tip'][@for='" . $id . "']")); - $tipText = $tip->getAttribute('title'); - $object = new stdClass(); - $object->tab = $this->driver->findElement(By::xPath("//a[@href='#page-permissions']"))->getText(); - $object->labelText = $label->getText(); - $object->tipText = $tipText; - $object->tag = $input->getTagName(); - $object->id = $id; - $object->type = $input->getAttribute('type'); - - $object->element = $input; - $result[] = $object; - } - return $result; - } - - public function getTabIds() - { - $tabs = $this->driver->findElements(By::xPath("//div[@id='config-document']/div")); - $return = array(); - foreach ($tabs as $tab) - { - $return[] = $tab->getAttribute('id'); - } - return $return; - } - - /** - * Output help screen for the page. - */ - public function toWikiHelp() - { - $inputFields = $this->getAllInputFields($this->getTabIds()); - $tabs = $this->tabs; - $helpText = array(); - foreach ($inputFields as $el) - { - $this->selectTab($el->tab); - $el->labelText = (substr($el->labelText, -2) == ' *') ? substr($el->labelText, 0, -2) : $el->labelText; - if ($el->tag == 'fieldset') - { - $helpText[$el->tab][] = $this->toWikiHelpRadio($el); - } - elseif ($el->tag == 'select') - { - $helpText[$el->tab][] = $this->toWikiHelpSelect($el); - } - else - { - $helpText[$el->tab][] = "*'''" . $el->labelText . ":''' " . $this->getToolTip($el->tab, $el->id . '-lbl') . "\n"; - } - } - - // Get permissions help just for the public group - $permissionsText = $this->driver->findElement(By::xPath("//a[@href='#page-permissions']"))->getText(); - $helpText[$permissionsText] = $this->toWikiHelpPermissions('1'); -// $filtersText = $this->driver->findElement(By::id('filters'))->getText(); -// $helpText[$filtersText] = $this->toWikiHelpFilters('1'); - foreach ($tabs as $tab) - { - $tabText = $this->driver->findElement(By::xPath("//a[@href='#" . $tab . "']"))->getText(); - $result[] = '===' . $tabText . "===\n"; - if (isset($helpText[$tabText])) - { - $result = array_merge($result, $helpText[$tabText]); - } - } - return implode("", $result); - - } - - - - /** - * Prepare wiki text for permissions tab - * - */ - public function toWikiHelpPermissions($groupId) - { - $objects = $this->getPermissionInputFields($groupId); - foreach ($objects as $object) - { - $listElement = str_replace('.', '_', $object->id); - $optionContainer = $this->driver->findElement(By::xPath("//div[@id='" . $listElement . "_chzn']")); - $optionContainer->findElement(By::tagName('a'))->click(); - $optionList = $optionContainer->findElement(By::tagName('ul')); - $optionText = $this->getOptionText($optionList); - $toolTip = $object->element->getAttribute('title') . ". " . $object->tipText; - $helpText[] = "*'''" . $object->labelText . ":''' (" . implode('/', $optionText) . "). " . $toolTip . "\n"; - $optionContainer->findElement(By::tagName('a'))->click(); - } - return $helpText; - } - - /** - * Prepare wiki text for filters tab - * - */ - public function toWikiHelpFilters($groupId) - { - $el = $this->driver->findElement(By::xPath("//a[contains(@href, '#page-filters')]")); - $el->click(); - $tabText = $el->getText(); - $heading = $this->driver->findElement(By::xPath("//div[@id='page-filters']//legend"))->getText(); - $subText = $this->driver->findElement(By::xPath("//div[@id='page-filters']//p"))->getText(); - $id = "jform_filters" . $groupId . "_filter_type"; - $toolTip = $this->getToolTip($tabText, $id); - - $subHeading = $this->driver->findElement(By::xPath("//table[@id='filter-config']//th[2]"))->getText(); - $filterOptions = $this->getOptionText($this->driver->findElement(By::id($id))); - sleep(1); - $helpText[] = "====" . $heading . "====\n"; - $helpText[] = $subText . "\n"; - $helpText[] = "*'''" . $subHeading . ":''' (" . implode("/", $filterOptions) . ")\n"; - $helpText[] = $toolTip; - - return $helpText; - } - - /** - * Change Editor Mode from the Configuration Page - * - * @param string $mode Editor Mode that the user wants to set - * - */ - public function changeEditorMode($mode='No Editor') - { - - switch (strtoupper($mode)) - { - case 'NO EDITOR': - case 'NONE': - $select = 'Editor - None'; - break; - - case 'TINYMCE': - case 'TINY': - default: - $select = 'Editor - TinyMCE'; - break; - } - $this->setFieldValues(array('Default Editor'=>$select)); - $this->clickButton('Save & Close'); - } -} diff --git a/tests/system/webdriver/tests/control_panel/GlobalConfiguration0001Test.php b/tests/system/webdriver/tests/control_panel/GlobalConfiguration0001Test.php deleted file mode 100644 index eba467c6ee..0000000000 --- a/tests/system/webdriver/tests/control_panel/GlobalConfiguration0001Test.php +++ /dev/null @@ -1,56 +0,0 @@ -doAdminLogin(); - $this->gcPage = $cpPage->clickMenu('Global Configuration', 'GlobalConfigurationPage'); - } - - public function tearDown() - { - $this->gcPage->saveAndClose('ControlPanelPage'); - $this->doAdminLogout(); - parent::tearDown(); - } - - /** - * @test - */ - public function getTabIds_ScreenLoaded_TabIdsShouldEqualExpected() - { - $textArray = $this->gcPage->getTabIds(); - $this->assertEquals($this->gcPage->tabs, $textArray, 'Tab labels should match expected values.'); - } - - /** - * @test - * Gets the actual input fields from the Control Panel page and checks them against the $inputFields property. - */ - public function getAllInputFields_ScreenLoaded_InputFieldsShouldMatchExpected() - { - $gc = $this->gcPage; - -// $gc->printFieldArray($gc->getAllInputFields($gc->tabs)); - - $testElements = $gc->getAllInputFields(array('page-site', 'page-system', 'page-server', 'page-permissions')); - $actualFields = $this->getActualFieldsFromElements($testElements); - $this->assertEquals($actualFields, $gc->inputFields); - } -} \ No newline at end of file