2fa handeling for mcrypt and openssl #12497

Merged
merged 2 commits into from Oct 21, 2016

Projects

None yet

7 participants

@rdeutz
Contributor
rdeutz commented Oct 20, 2016 edited

PR for issue #12458

Executive summary

This PR checks the data and if the data is crypted with mcyrpt it converts the data to openssl (the new default, when available) and saves the new data. It also saves the configuration data un-crypted because it isn’t more secure to save them crypted.

Background information

Since we merged an update for fof to make it compatible for PHP 7.x the default aes-adapter has changed.

Backwards compatibility

It is a fix for a B/C problem

Translation impact

nothing

Testing instruction

  • Create a 3.6.2 or lower site
  • Add a user and add either of the 2fa
  • check it works
  • Upgrade the site to 3.6.3 and try to login with the same user

This should fail

  • Create a new user and enable 2fa
  • try to log in, this should work

Apply patch

Now you should be able to login with all users using 2fa.

@rdeutz rdeutz handeling for mcrypt and openssl
d9d751f
@mbabker
Member
mbabker commented Oct 20, 2016

Question, since I didn't clearly grab this out of the report. Will this handle users who have saved new 2FA configs on 3.6.3 which were encrypted with OpenSSL as well as deal with the mcrypt stuff?

@rdeutz
Contributor
rdeutz commented Oct 20, 2016

@mbabker yes, it will.

@mbabker
Member
mbabker commented Oct 20, 2016

👍

-
- // Create an encryptor class
+
+ // Get the secret key, yes the thing that is save in the configuration file
@brianteeman
brianteeman Oct 20, 2016 Contributor

very pedantic (fussy) but this should be "is saved"

+
+ if (strpos($decryptedConfig, '{') !== false)
+ {
+ // Data crypted with mcrypt
@brianteeman
brianteeman Oct 20, 2016 Contributor

crypted=>encrypted

+ }
+ else
+ {
+ // Config data seems to be save crypted, this can happen with 3.6.3 and openssl, lets get the data
@brianteeman
brianteeman Oct 20, 2016 Contributor

crypted=>encrypted

@infograf768
Member

I have tested this item successfully on d9d751f

Tested with Google Authenticator.

I confirm it is now working fine with both a 362 and a 363 created user.


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/12497.

@maxibanki

workz 👍

@brianteeman
Contributor

I have tested this item successfully on d9d751f

Joomla 3.6.2
Admin login - key required
com_users - key required
mod_login - key required

Upgraded to Joomla 3.6.3
Admin login - key ignored
com_users - key ignored
mod_login - key ignored

Joomla 3.6.3 + pr
Admin login - key required
com_users - key required
mod_login - key required


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/12497.
@rdeutz rdeutz Language changes suggested bei Brian
b55727d
@rdeutz rdeutz added this to the Joomla! 3.6.4 milestone Oct 21, 2016
@Klipper
Klipper commented Oct 21, 2016

Maybe good to know:
I just found that an Akeeba Backup (.jpa) from Jooma 3.6.3 when 2FA is enabled can't be restored any more: Found in errorlog: PHP Fatal error: Uncaught Error: Class 'FOFUtilsPhpfunc' not found in D:\Buro\Aaa\flexbox\libraries\fof\encrypt\aes.php

Will report this also to Akeeba Backup ofcourse


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/12497.
@infograf768
Member

RTC as last changes only concerned typos in comments


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/12497.

@joomla-cms-bot joomla-cms-bot added the RTC label Oct 21, 2016
@mbabker mbabker merged commit 08d6728 into joomla:3.6.4 Oct 21, 2016

2 checks passed

continuous-integration/drone the build was successful
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@rdeutz rdeutz deleted the rdeutz:3.6.4-2fa-fix branch Oct 21, 2016
@rdeutz rdeutz added a commit that referenced this pull request Oct 25, 2016
@rdeutz rdeutz 2fa handeling for mcrypt and openssl (#12497)
* handeling for mcrypt and openssl

* Language changes suggested bei Brian
0e2cd37
@brianteeman brianteeman removed the RTC label Oct 28, 2016
@wilsonge wilsonge added a commit that referenced this pull request Oct 29, 2016
@mbabker @wilsonge mbabker + wilsonge [4.0] Merge staging (#12622)
* added show/hide introtext parameter to mod_articles_news

* added <?php if (!$params->get('intro_only')) : ?> back again since it might be a B/C setting/parameter

* added tabs in code

* Update mod_articles_news.xml

* Update _item.php

* corrected typo from last merge

* changed label and description

* Add JHtmlBootstrap for front-end editing. Fixes #11562

* Implementing Menu Items modals (New feature)

* Wrong class for chosen (#11820)

* 3.7.0: Using the new modal_menu field in various core places (#11694)

* Using the new modal_menu field in various core places

* Simplifying clearField

* Simplify conditional

* Parenthesis replaced by mdash

* Using modal_category field in various core locations

* 3.7.0: New Feature=>editor-xtd to insert menu items links in content (#11721)

* 3.7.0: New Feature=>editor-xtd to insert menu items links in content

* correcting some errors

* quoting for sql azure

* one more

* Changed icon + lang constants

* Chosen upgrade. Fixes #11779

Squashed commit of the following:

commit 48051c7
Author: Brian Teeman <brian@teeman.net>
Date:   Thu Aug 25 14:31:04 2016 +0100

    css change only

commit 90a89fd
Author: Brian Teeman <brian@teeman.net>
Date:   Thu Aug 25 14:28:58 2016 +0100

    Revert "css fix thanks @C-Lodder"

    This reverts commit f7320cf.

commit f7320cf
Author: Brian Teeman <brian@teeman.net>
Date:   Thu Aug 25 14:09:03 2016 +0100

    css fix thanks @C-Lodder

commit 42c9de3
Author: Brian Teeman <brian@teeman.net>
Date:   Wed Aug 24 18:10:33 2016 +0100

    fix permissions

commit b8fdd34
Author: Brian Teeman <brian@teeman.net>
Date:   Wed Aug 24 18:07:53 2016 +0100

    add minified version of js

commit 0ef056d
Author: Brian Teeman <brian@teeman.net>
Date:   Wed Aug 24 17:59:55 2016 +0100

    add documented js hacks

commit c68c275
Author: Brian Teeman <brian@teeman.net>
Date:   Wed Aug 24 17:48:01 2016 +0100

    add comment block

commit 983dbf5
Author: Brian Teeman <brian@teeman.net>
Date:   Wed Aug 24 17:08:47 2016 +0100

    rename liszt: chosen:

commit 8caad73
Author: Brian Teeman <brian@teeman.net>
Date:   Wed Aug 24 17:07:47 2016 +0100

    Revert "rename liszt: chosen: and add JUI hacks"

    This reverts commit 8611671.

commit 8611671
Author: Brian Teeman <brian@teeman.net>
Date:   Wed Aug 24 17:06:21 2016 +0100

    rename liszt: chosen: and add JUI hacks

commit 535bea0
Author: Brian Teeman <brian@teeman.net>
Date:   Wed Aug 24 16:45:14 2016 +0100

    replace chosen: with liszt:

commit 2686df5
Author: Brian Teeman <brian@teeman.net>
Date:   Wed Aug 24 16:43:35 2016 +0100

    replace _chosen with _chzn

commit 691be65
Author: Brian Teeman <brian@teeman.net>
Date:   Wed Aug 24 16:42:49 2016 +0100

    replace chosen- with chzn-

commit 863b5f9
Author: Brian Teeman <brian@teeman.net>
Date:   Wed Aug 24 16:37:20 2016 +0100

    update js with original version

commit 537735c
Author: Brian Teeman <brian@teeman.net>
Date:   Wed Aug 24 16:36:19 2016 +0100

    remove min js

commit e739562
Author: Brian Teeman <brian@teeman.net>
Date:   Wed Aug 24 16:35:21 2016 +0100

    replace chosen- with chzn-

commit db82431
Author: Brian Teeman <brian@teeman.net>
Date:   Wed Aug 24 16:33:46 2016 +0100

    update css file with original version

commit 24a955b
Author: Brian Teeman <brian@teeman.net>
Date:   Wed Aug 24 16:29:34 2016 +0100

    update sprites

commit 4856d5e
Merge: 4ddd833 f10ab35
Author: Brian Teeman <brian@teeman.net>
Date:   Tue Aug 23 16:23:34 2016 +0100

    Merge branch 'staging' of https://github.com/joomla/joomla-cms into staging

commit 4ddd833
Merge: b5ffa27 8258906
Author: Brian Teeman <brian@teeman.net>
Date:   Mon Aug 22 10:30:58 2016 +0100

    Merge branch 'staging' of https://github.com/joomla/joomla-cms into staging

commit b5ffa27
Merge: 24e6c45 e80e319
Author: Brian Teeman <brian@teeman.net>
Date:   Sun Aug 21 17:45:45 2016 +0100

    Merge branch 'staging' of https://github.com/joomla/joomla-cms into staging

commit 24e6c45
Merge: 962b424 c1b0295
Author: Brian Teeman <brian@teeman.net>
Date:   Fri Aug 19 21:08:30 2016 +0100

    Merge branch 'staging' of https://github.com/joomla/joomla-cms into staging

commit 962b424
Merge: 14f5b1c 4c539c4
Author: Brian Teeman <brian@teeman.net>
Date:   Thu Aug 18 12:06:49 2016 +0100

    Merge branch 'staging' of https://github.com/joomla/joomla-cms into staging

commit 14f5b1c
Merge: 2baa00b edb70c2
Author: Brian Teeman <brian@teeman.net>
Date:   Mon Aug 15 10:06:07 2016 +0100

    Merge branch 'staging' of https://github.com/joomla/joomla-cms into staging

commit 2baa00b
Merge: 97d1fb7 f827dfc
Author: Brian Teeman <brian@teeman.net>
Date:   Sun Aug 14 22:38:02 2016 +0100

    Merge branch 'staging' of https://github.com/joomla/joomla-cms into staging

commit 97d1fb7
Author: Brian Teeman <brian@teeman.net>
Date:   Sun Aug 14 16:28:13 2016 +0100

    Revert "toolbar"

    This reverts commit 8f995f1.

commit 8f995f1
Author: Brian Teeman <brian@teeman.net>
Date:   Sun Aug 14 16:27:57 2016 +0100

    toolbar

* Two search modules on same page: Invalid HTML. (#11229)

* Add postfix for unique id ($module->id)

* Respect postfixes for unique id in mod_search

* Reduce use of JFactory::getConfig() where practical

* Allow registering callback functions for the debug console. Fixes #11700

* Allow adding script options without inline JavaScript. Fixes #11671

* Adding "category on fly" functionality when create/edit contact. Fixes #11354

* New method for retrieving the strings from the store. Fixes #11692

* [html5] Hathor administrator template. Fixes #10634

* [Optimize] Generate thumbnail image method to avoid pixelated error in thumbnails. Fixes #7919

* Fix since tag

* Normalise Block this User button styling. Fixes #11421

* [html5] System administrator template. Fixes #10638

* URL checking improved in com_wrapper. Fixes #4670

    When adding the scheme to an URL use correct scheme (http or https) and port.
    Checking for "http" or "https" via strstr() in the URL matched also these strings embedded in the URL (e.g. in /static/http/index.html), due to that checks changed to strpos().

* Update en-GB.com_users.ini (#11909)

* Templates are in the scope of JDocument. Fixes #10847

* Small review/cleanup in JHtml. Fixes #10771

* Fix form field unit tests. Fixes #11910 Fixes #11413

* Improvements to article modals (with Create Article button). Fixes #11830

* [com_content] - Allow captcha when submit article. Fixes #10976

* Proxy JData to the Framework. Fixes #11588

* [newsfeed modal field] Adds Create News Feed button and other improvements. Fixes #11862

* Allow force refreshing the cache when getting fields in JTable. Fixes #11046

* Allow a custom page title to be defined for an article without a menu item. Fixes #10838

* Code review on com_content component. Fixes #10851

* [category modal field] Adds Create Category button and other improvements. Fixes #11857

* Joomla.JText uses scriptOptions 'joomla.jtext'. Fixes #11690

* Remove legacy frame breaking js code. Fixes #11679

* [contact modal field] Adds Create Contact button and other improvements. Fixes #11858

* Support collection of custom stats in admin stats module. Fixes #10870

* Use intro_image in newsfeed. Fixes #11402

* [com_tags] - Add count and link to tagged items. Fixes #10895

* Allow the vote plugin's position to be configured. Fixes #11375

* Return a 403 status code instead of a 404 for a not accessible category. Fixes #11624

* Add Sort by Modified Date in the Module mod_articles_news (#11128)

* Update mod_articles_news.xml

At present the sorting by date has the options to sort the articles by Published Up date and Created Date.  Adding another sort option to sort the articles by the Modified Date has been added.  This addition would be of help to list the articles that are modified recently.

* Update en-GB.mod_articles_news.ini

Added the following language string that would be used in the xml file of the module mod_articles_news.
MOD_ARTICLES_NEWS_FIELD_ORDERING_MODIFIED_DATE="Modified Date"

* Update mod_articles_news.xml

The value a.modified has been added to the Direction

* Cleanup deprecated unused files. Fixes #11762

* Add Polyfill js for legacy browsers (adds events and classlist polyfills). Fixes #11686

* [com_content] Add icons layout. Fixes #10423

* [3.7.x] Fixes issues with the category article view after #11624 (#11943)

* Update category.php

* Update category.php

* Fixing missing getItems in mock JMenu for (routing) unittests. Fixes #11936

* Enable caching of menu data in JMenuSite (#10797)

* Enable caching of menu data in JMenuSite

* Use a lambda function for the query instead

* Add Microseconds to JDate('now') (#11890)

* Update date.php

* Update date.php

* cleaner code

* simplify

* Update date.php

* Router options (#11962)

* Router options

* switch sentences

* [unit tests] Just need to check one microsecond now (3.7.x Branch) (#11966)

* Update JHtmlDateTest.php

* Update JFactoryTest.php

* Fix button classes (#11971)

* Fix javascript tests (#11993)

* fix javascript tests

* typo

* change the order to test Joomla.optionsStorage = null

* ordering again

* Add chosen to module order field (#11992)

* remove crap, add chosen

* s

* New Routing: Fix category routing without menu items

* [category item modal field] Apply on more fields for categories. Fixes #11920

* Patch #6712 - FieldCheckbox attribute default (#6794)

* Patch 6712 - FieldCheckbox attribute default

Checkbox field does not allow defining a value without being checked
#6712

* fix code style

* Added a clean line

Added a clean line befor the if @zero-24

* IS (list views) - Replace html/pagination.php::pagination_list_footer() by JLayouts. Fixes #11246

* Fix no menu item pages giving wrong links (#12020)

* Fix routing for non-sef menu items with Modern Routing (#12021)

* Phase out JString calls in libraries (#12058)

* Admin app - JString -> StringHelper (#12056)

* Site app & Plugins - JString -> StringHelper (#12057)

* New Feature, Multilanguage: Add the possibility of displaying associations in article info and in articles list. Replaces #11935 (#12042)

* Replaces

* Modifying to fit Thomas proposal

* modifying fetching flags param

* adding showon + some

* [JAccess] Improve ACL asset preloading performance/memory consumption (#12028)

* improve component asset preload speed

* Update user.php

* Update access.php

* Update access.php

* Update access.php

* Update access.php

* not convinced yet, but revert changes in juser

* make sure that components are always preloaded

* only a logged users (with user id) can be root.

* [com_content] - add articles ordering by votes, ratings (#11225)

* Add setDocumentTitle() function in JViewLegacy (#11399)

* setDocumentTitle() function in JViewLegacy

* PHPCS

* set new counts too center

* fir for  #11225

* There is no need for the extra spaces at the end of the line :)

* fix typo

fixed typo

* allow to hide session too in plugin system debug

* deprecate keychain for 3.0

* deprecate fof

* deprecate fof

* Update include.php

* deprecate old ciphers

* Fix Travis error in keychain (#12157)

* fix travis

* space

* Allow JHtmlDate::relative to set a custom format (#12164)

* Updated installation language files.

* Fix typo in cache memcached storage (#12150)

* div doesn't support type=button (#12131)

* JFile - error fix "Cannot pass parameter 2 by reference" (#11952)

* Fix of an error "Only variables should be passed by reference"

If you pass a string to methods ````append```` or ````write````, you will have an error ````Only variables should be passed by reference````

* Update file.php

* Update file.php

* Custom calendar is not applied to version history preview and compare dates (#12138)

* Custom calendar is not applied to version history preview and compare

* simplify code. Thanks Thomas.

* Update preview.php

* Update compare.php

* Update MediaElement.js to 2.23.0 (#11981)

* Allow JHtmlDate::relative to set a custom format

* Add doc block comment

* Proposed onAfterRenderModules event in modules rendering (#10113)

* Updated pull request #3105 to latest stage (2016-04-24) inclusive unit test

* CS fix

* Update JDocumentRendererHtmlModulesTest.php

* fix expected value for the unit test

in #10113 a unit test was added but failed, this is a fix

* Deprecate web router classes

* Localise the format for the calendar formfield (#12102)

* Localise the format for the calendar formfield

* Adding comment

* Support all formats

* Label - Mass Mail Users v2 (#12084)

* Added optional suffix text to Mass Mail Form page (#12078)

* Add Unpublished Content Language on Language Package Install (#11867)

* initial commit

* Update language.php

* Update en-GB.lib_joomla.ini

* Update en-GB.lib_joomla.ini

* ups

* Update language.php

* Update language.php

* Update language.php

* change native to $siteLanguageManifest['name']

* allow to install published content languages on install 1

* allow to install published content languages on install 2

* solve remaining issues

* cs

* fix language names and simplify

* cs

* improve code and deprecate unneed code

* fix title issues (as possible with current xml scenario)

* remove non existent metadata values

* shoudl not be row, it should be tableLanguage

* don't fallback to en-GB native title

* tinyMCE use document "scriptoptions", and allow to override tinyMCE Javascript parameters (#11157)

* tinymce initialization, use addScriptOptions and tinymce-init.js

* Finalize tinymce-init.js

* Small improve for code duplication

* Allow multiple editors with diferent options

* Setup default options for the editor script only once

* Minified version of tinymce-init

* code style

* Improve a bit

* Reply to email (#11015)

*  Reply to email

* Reply to email: configuration file chnages resolved

* #11015 Reply to email: suggested changes fixed

* Media form field bootstrapped with static preview (#10889)

* Bootstrap popup with mootols compatibility

* restore static preview

* 💩

* 😡

* fixes

- Delete extra </div>
- Move preview under the input field
- respect landscape/portrait images

* typo

* Utilise unionAll element in the select query, previously it was always being ignored. (#10817)

Rearrange union > unionAll > order to render a valid query when all these three are used together in a query.
Fix return type in method doc blocks.

Update test case for the JDatabaseQuery::toString method to test all the element for select query.

* Introduce new method isClient($identifier) in JApplicationCms class (#8971)

* Introduce new method isClient($identifier) in JApplicationCms class as a substitute for isSite and isAdmin methods.

Hence, remove usage of descendant class reference in the JApplication (legacy) and JApplicationCms for better OO structure and support more extensibility.

* Added unit tests for JApplicationCms::isClient($identifier);

* Fix, null == 0 passes. Avoiding strict check to allow use of '0' or '1' as string as well as integer.

* Removed support for integer argument which matched client_id as discussed with @mbabker, thanks.

* fix com_finder regression (#12236)

* Core.js AJAX method (#11585)

* Core.js even listeners

* Core.js: method for ajax requests

* Code style

* Some example and minified version

* Core.js even listeners, use IE fallback

* Core.js remove even listeners fallback

* 370: solving #11225 merge regression (#12238)

* 3.7.x: Porting #11225 to beez (#12240)

* Move keepalive to external js (#8545)

* Keepalive with data attributes

* cs

* cs

* cs empty line

* Not seconds ...

* object

* No double entities

We have to use JRoute without xhtml or else the admin keep alive URL get
double entities `&amp;amp;?`

* From chocolate to vanilla ...

Works with vanilla js!
Works if onload event is already fired when script is executed.
This way the js file can be loaded on render, asyncronous or deferered
to after the onload event.
Should be cross-browser compatible.

* improvements

* cs

* default options, move to jui folder, asynchronous loading

* simple correct to work with new script attributes PR (11289). Adds auto version hash.

* update to match #11289 JHtml script behaviour

* use __DEPLOY_VERSION__

* cs and simplify

* Update behavior.php

* Update keepalive.js

* Update keepalive.min.js

* Update keepalive.js

* Update keepalive.min.js

* fix conflicts 1

* use new addScriptOptions and Joomla.request methods

* fix unit tests

* fix last unit test

* [menu item modal field] Adds Create Menu Item button and other improvements (3.7.x branch) (#11916)

* Update modal.php

* Update edit.php

* Update view.html.php

* Update item_alias.xml

* Update default.xml

* Update logout.xml

* Update mod_login.xml

* Update mod_login.xml

* Update mod_menu.xml

* Update item.php

* Update menu.php

* Update menu.php

* Update en-GB.com_menus.ini

* minor cs

* corrections

* solve no item text issue

* New show_info option (hide/show) in com_contact and some minor changes (#8607)

* several improvments

* lang changes

* minor changes

* fix conflicts

* fix conflicts 2

* revert

* fix conflicts final

* [3.7.x] Lets use the correct API to get this string translated (com_postinstall) (#12247)

* add files joomla

* lets make the languagestring checker happy

* cs

* add missing string (#12246)

* fix missing string (#12245)

* Deprecate MooTools based helpers (#12268)

* Deprecate MooTools based helpers

* PHPCS sucks...

* fix redirect plugin messages (#12280)

* remove dublicate message (#12279)

* Allow users to share sessions between apps (#12068)

* Allow users to share sessions between apps

* Address all metadata related stuff

* warning (#12285)

merged on review

* [3.7.x] Fix Regression #12277: language selector blocked on edit when there are no associations (multilanguage) (#12283)

* category edit: check if there are associations

* contact edit: check if there are associations

* articles edit: check if there are associations

* menus edit: check if there are associations

* newsfeed edit: check if there are associations

* Admin - Simplify instantiation of Registry (#12270)

* [j3.7] New Feature Contact editor-xtd plugin (#12252)

* New editor-xtd contact plugin

* docs

* update sql

* add contact icon

* prevent loading in com_banners where it is useless

* Installation sql

* correct installation

* extra line feed

* __DEPLOY_VERSION__

* __DEPLOY_VERSION__

* com_admin script

* Update contact.php

* Update contact.php

* Update contact.php

* Update contact.xml

* Update en-GB.plg_editors-xtd_contact.sys.ini

* Update en-GB.plg_editors-xtd_contact.ini

* Update 3.7.0-2016-10-01.sql

* Update 3.7.0-2016-10-01.sql

* Update 3.7.0-2016-10-01.sql

* Routing: Remove IDs from SEF URLs (#11320)

Also fixes various bugs in the new router

* Run SEF plugin also when SEF URLs are not enabled (#11035)

* remove menu button

* Update note.xml

* string, not array

* Redo Isis flat repaint (Closes #11832) (#12319)

* Isis flat repaint - Initial commit

* Tags field refinement

* Fixed field height inconsistency

* RTL support added

* Minor fixes

* Installation flat repaint

* Revert install flat repaint

* Chzn flat styling separated to chzn-override.less

* Missing the in language string

* TinyMCE xtd-button close (again, really) and drop jquery (#12324)

* drop jquery, fix jModalClose()

* classList polyfill not needed here

* window.width (seriously?), merge options

* use Joomla.extend()

* my bad

* IE<9

* Add attribs to the script tag, add version to JHtml script methods and deprecate MD5SUM (alternative to 8540) (#11289)

* new method to add attrbibs to the script tag

* corrections

* defaultJsMimes

* add deprecated comment

* travis

* further simplify

* remove extra space

* forgot to convert mime to type

* add UTF-8, ENT_COMPAT to htmlspecialchars (like previous done in all other places)

* cs line size fix

* better coding

* small typo

* elseif

* deprecate MD5SUM and don't allow two version hashes

* add JLog deprected warnings for new method signatures

* cs line size

* fix conflicts 1

* fix conflicts 2

* refactor JHtml script method signature

* deprecate addScriptVersion add options for version and conditional statements

* Update head.php

* cs

* cs fix

* Change all self::getMd5Version to static::getMd5Version

* has changed

* has changed

* fix conflicts - part one

* fix conflicts

* correct unit test

* [3.7] Readme updates (#12387)

* [languages] Organize and new metadata (Native language and calendar type) (#12036)

* Update en-GB.xml

* Update en-GB.xml

* Update en-GB.xml

* Update en-GB.xml

* Update en-GB.xml

* Update en-GB.xml

* Update en-GB.xml

* fix unit tests

* add to install.xml in unit tests

* correct unit tests

* remove extra tab

* ident with tabs, not spaces!

* installation should have en-GB in name

* en-GB ...

* correct db jos_languages csv stub also

* add missing pkg_en-GB extension to extension stub and correct language extension names

* correct sql files

* correct sql files

* correct sql files

* add en-GB, instead of UK, to batch test

* correct JTableLanguageTest::testStore

* Update install.xml

* Update install.xml

* same replacements in test stub

* Update en-GB.com_languages.ini

* correct last unit test

* Update en-GB.xml

* Update JLanguageTest.php

* Update en-GB.xml

* Update en-GB.xml

* use the new nativeName is exists

* Make language flags in backend optional (#12051)

* Allow to select none image in language

* admin menu module: fall back to a label if no image is selected or image doesn't exist

* "Default" buttons in template styles and menuitems list views

* remove unneeded variable

* Remove empty flag span

* Show language code instead of flag in associations tooltip if no image is selected

* show language label instead of flag if no images is assigned

* Adjust Hathor overrides

* Codestyle fixes

* Missed contact JHtmlContact::association()

* Use a popover for the association tooltips

* Taking care of mod_languages

* Fix flag preview

* show sef in module assignments.

* Fixing frontend Associations

* Fixing menu assignment modal

* a e

* a i

* a o

* a u

* a a - javascript

* js

* Replace uses of JRegistry

* Simplify instantiation of Registry objects

* [3.7] Isis Flat Repaint - Minor Fixes (#12349)

* Removed text shadow

* Remove text-shadow

* Modal save mouseover fix

* Changed to individual removal of text-shadow

* sidebar-nav margin fix

* Fix hover color on all BS btn

* Re-align permissions chzn

* Show configured upload limit when uploading files (redo of #11255) (#12396)

* * Show configured upload limit when uploading installer package. Otherwise when uploading a larger file than the configured limit, the page reloads without any information about what went wrong.
* Show upload limits for file input everywhere. Refactor the calculation part to JUtility class.

* Honour template manager configuration to display upload size limit

* In Hathor: Honour template manager configuration to display upload size limit

* Add deprecated message that in 4.0 the html5 property will be default true (#12430)

* Will be replaced by $html5 and the default value will be true.

* Update html.php

* CodeMirror 5.19 (#12300)

* corrections/improvements (#12429)

* Fixing notice for non-existing views (#12434)

* [3.7.x] Admin login language field fix (#12442)

* Admin login lang fix

* Admin login lang field alignment

* New xtd_contact lang files missing in install.xml (#12452)

* Make more use of the autoloader (#12060)

* Fix error in mergeHeadData method for html document (#12013)

* Extend test for document html links

* Fix mergeHeadData method for html document->_links

* correct table html errors (#12129)

* [users list modal] ismoo parameter need to still exist after form submit (solve #12122) (#12137)

* ismoo parameter need to exist after form submit

* int

* default to 1

* Replaced rand() with mt_rand() projectwide (#12169)

* Replaced rand() with mt_rand() projectwide

* session package is from the framework so we need to revert that change at this point

* fof is an external lib so we need to revert that change at this point

* fof is an external lib so we need to revert that change at this point

* Use global as default option (#12186)

* Solving 12214 Plugin tooltip (#12215)

* JLayoutFile wrong type hint (#12231)

* JLayoutFile wrong type hint

* CS

* CS / Review for the editor plugins (#12260)

* cs review for the editor plugin

* cs

* Update image.php

* Call to undefined method stdClass::get()

* use the warning and error (#12265)

* error not notice (#12273)

* Remove deprecated function (#12296)

* Minor language string change for com_contact (#12339)

* Redo Isis flat repaint Installation (Closes #11917) (#12342)

* Installation flat repaint - Initial commit

* Install flat repaint - Initial commit

* Add missing period (#12356)

* Change language string (#12364)

* Allow loading plugin language strings from extension folder (#12403)

* some cs changes after #12396 (#12431)

* [3.7.x] Update js polyfills to 3.13.0 (#12513)

* Update polyfill.event-uncompressed.js

* Update polyfill.event.js

* update classlist polyfill

* Update polyfill.classlist.js

* minor changes

* minor changes in doc block

* move jquery to template (#12521)

* fixing typo in the comment (#12523)

Just a small typo in the comment.

* Update CREDITS (#12534)

* Update CREDITS

Removing old content that has been moved to a dedicated page on the Joomla! Documentation and adding a link to new contributors page on GitHub.

* Update CREDITS

* Updated installation language files

* 2fa handeling for mcrypt and openssl (#12497)

* handeling for mcrypt and openssl

* Language changes suggested bei Brian

* Prepare 3.6.4 Stable Release

* Mark _autoload function as public and not private. (#12478)

* Mark _autoload function public.

*  whitespace was hanging out

* Revert _load to private

* issing language strings in frontend lib.joomla.ini (#12468)

* forum link to https (#12467)

* [a11y] Protostar back to top (#12446)

* [a11y] Protostar - back to top link

* Oops Andre was right

* add anchor for non-js enabled browsers

* [3.7.x] Convert installation template to html5 (also move inline scripts to js) (#12444)

* convert to html5, use the api for inline scripts

* stupid mistake

* ok let's remove all that inline js ...

* Fix early exit from foreach in JForm::removeGroup (#11856)

* Fix early exit from foreach in JForm::removeGroup

The method is supposed to remove all instances of <fields> element but it exits the loop on first iteration only. Looks like a quick copy-paste from removeField may have caused this.

* Never returns false

* keepalive for editing forms (#12163)

* Remove retina 2x sprite (#12528)

* Set a proper default value for getParams always (#12463)

* Correct spelling (#12564)

* Remove JFilter mock (#12484)

We don't need JFilter hanging out in the JInstaller Adapter tests

* Stop allowing failures on PHP 7.1 (#12599)

* Improvements in the Associations Edit Workflow (#12344)

* changes in model preprocessForm to allow all associations fields to be dumped

* adjustement

* there is no need to block the language field now

* simplify association tab in the templates files

* let's make the layout more dynamic

* add the js behaviours

* solve one of strange bug ...

* improvements and allow associations on create

* correct language string

* render a warning message

* solve categoies issue

* add new language methods getContentLanguages and getInstalledLanguages

* let's now load all content languages, including the unpublished ones

* correct label for bug in categories modal field! all other model fields have this

* ups correction in js

* default pivot is language code

* doc blocks corrections

* cs

* language correction thanks brian

* fix conflicts final

* When $this->cursor is false, throw an Exception (#12359)

A call to pg_result_error_field() when $this->cursor is false from a query failing will result in an error `pg_result_error_field() expects parameter 1 to be resource, boolean given`

Try to get a valid error message and throw a JDatabaseExceptionExecuting Exception

* Implement a check / notification for an invalid or missing access file (#12608)

* Implement a check / notification for an invalid or missing access file

* Add language string for invalid or missing access file notification

* Add language string for invalid or missing access file notification

* Reduce log message as suggested by mbabker

* Reduce log message for #12608 as suggested by mbabker

* Reduce log message for #12608 as suggested by mbabker

* Change string to match actual translation text

* Grid within well changed to row-fluid (#11995)

* update doc block (#12569)

* Folder icons in front end (#12551)

* Add folder size to protostar .less

* compiled protostar

* rename folder value (#12579)

* [3.7.x] Regression Hathor modules and users manager (#12412)

* Native language (adjustments after 12036 merge) (#12394)

* restore native language

* remvoe space

* correct

* simplify

* improve code

* ups

* native language in unit test too

* Add detachObserver (#11037)

* Add detachObserver

Adds ability to detach observers

* Simple CS fix

* 3.6.4 Sample data: Escape quota in json data (#12501)

* [fix] new extensions not installed on already existing packages (#12545)

* $menu->params is already a Registry object. (#12557)

* Overridden strings in both back-end and front-end (#12576)

* [imp] remove hardcoded published column (#12585)

* Fix JUri path in language filter plugin (#12600)

* Custom fields (#11833)

* Update gallery.xml

* Update fields.php

* Update internal.php

* Update field.php

* Update dprules.php

* Update section.php

* Update base.php

* Update view.html.php

* Update view.html.php

* Update render.php

* Update modal_article.php

* Update sql.php

* Update fields.php

* Remove commented debug code

* Update fields.php

* #14 fixed Joomla Coding Standards and added function dock blocks code

* #14 fixed Joomla Conding Standards and added function dock blocks

* #14 Fixed class dock block mistake

* we did not require this any more

* #14 fixed Joomla Coding Standards and added function dock block in helper file at back-end

* #14 Fixed only Joomla Coding Standards in FieldsHelper file

* #14 removed where function, added dock blocks and fixed dock bocks coding standards errors

* #14 formatted as the function doc blocks

* #14 formatted as the function doc blocks

* Check the active menu correct

Closes #72

* Move the label field to the options tab

Closes #22

* Label has it's own field and must not stay in params

Regression from #22

* Backport from Digital-Peak/DPFields#32

* Fix the save and copy action

Closes #37

* Store data on reload

Closes #76

* Don't add always the All language to the query

Closes #38

* Count the items in the category manager from com_fields

Closes #61

* Corrected colspan when fields are assigned to a language

* #14 fixed conflict

* Don't save the All category

Closes #19

* Minor language updates

* Fix "Show On" tooltip's description

The tooltip's description for the 'Show On' field is not showing because it is currently looking for the label.

* Don't hardcode com_content.article

Closes #80

* Load the types form when the data is an array

* Create the links correct for the count item feature

Closes #82

* Show the value from com_fields instead of the the users helper

Closes #81

* Set the language correct on the fields cache

Closes #47

* Removed string conversion error

Closes #47

* Changed links to 3.7

* Remove legacy DPFields code

* Get data from state correctly

* Add joins to the com_fields in search plugin (#83)

Add joins to com_fields in the content search plugin

* Add new core rule core.edit.value (#75)

* Add 'onFieldBeforePrepare' and 'onFieldAfterPrepare' events

* Rename "Field Category" to "Field Group"

Closes #91

* Add option to disable custom fields per component

Closes #87

* Use select box to define the images directory

Closes #97

* Truncate correctly

Closes #101

* Change description field to plain textarea

Closes #94
CLoses #99

* Parameters are more clear and improved comment

Adapted change from
32c9048

* onFieldBeforePrepare and onFieldAfterPrepare events now triggered even when custom field value is empty

* Cast before access

* Create params even when they are empty

* Add com_fields menu entries on back end

Closes #109

* Extract the context correctly

Closes #112

* Add custom fields for contact

* Add inline group create

Closes #114

* Add simple context mapping

Closes #117

* Dont assign a not existing category when a field is saved with no catid

* Rename string with group and not category

Closes #124

* Category strings should be named Field Groups

Closes #126

* Show the fields on the blog listing

Closes #108

* Installer crashes somehow

Closes #132

* Merge the types set up into JFormField (#104)

* Merge field types into JFormFields

* Converting the rest of the fields

* Merge DP Field Rendering with Joomla Form Fields

* Remove the gallery scripts

* Rename the interface to JFormDomfieldinterface for auto loading

* Add article field as demo how a component can add fields

* Removing mustache, will be replaced later with a new parser

See #12 for the discussion

* Fixing composer setup, reverting to 3.6.x branch

* Fixing code style errors

Closes #14

* Rename upgrade file to 3.7

* Strip slashes from description

Related to #139

* Removing Simplepie from the database installer script

Reverts 8381e46
See comments for more information

* Show field group description in form

Closes #139

* List field changed key to value and value to name

Closes #121

* Use the first category as field filter when creating an article

Closes #144

* Dont show a user field on the front end

Closes #149

* Add always the fields path when adding the custom fields

Closes #150

* Added hint (placeholder) option

Closes #151

* Correct redirect after checkin action

Closes #154

* Check for group access levels when getting the fields (#153)

* Consider field group state

Closes #155

* Added missing language strings

Closes #129

* JArrayHelper => ArrayHelper

* reduce model method (#160)

* Fixing permission inheritance to edit the value of a field in the form (#157)

* Correct path for parameters folder when not in Joomla libraries

* Type selection (#162)

Closes #134

* Display class attributes (#143)

* User home (#161)

* Add home parameter to media field

* Correct path for paramneters folder when not in Joomla libraries

* Fixing code style errors

* Add new context for com_contact for contact form fields (#115)

* Add new context for com_contact for contact form fields

* Prepare the value on com_contact mail

* Fixing travis code style errors

* Use the correct variable name

Closes #163

* Show the all label when no category is assigned

Closes #165

* Don't set 0 as default hint when not present

Closes #166

* Fix Sniffer Whitespace errors

* Fix Sniffer Whitespace errors (#167)

* Cleanup field model

* Support fields plugins

* Add gallery plugin

* Moved since tag to 3.7

* Some brushup

* Update controller.php

* Update field.php

* Update fields.php

* Update controller.php

* Update fields.php

* Update internal.php

* Update fields.php

* Update fields.xml

* Update field.php

* Update fields.php

* Update type.php

* Update section.php

* Update field.php

* Update field.xml

* Update filter_fields.xml

* Update field.php

* Update view.html.php

* Update edit.php

* Update modal_options.php

* Update view.html.php

* Update default.php

* Update default_batch_body.php

* Update modal.php

* Update field.xml

* Update en-GB.com_fields.sys.ini

* Update en-GB.com_fields.ini

* Update en-GB.plg_fields_gallery.ini

* Update en-GB.plg_fields_gallery.sys.ini

* Update en-GB.plg_system_fields.ini

* Update en-GB.plg_system_fields.sys.ini

* Update modal_article.php

* Update controller.php

* Update field.php

* Update default_custom.php

* Update captcha.php

* Update editor.php

* Update media.php

* Update user.php

* Update editor.xml

* Update media.xml

* Update user.xml

* Update usergrouplist.xml

* Update abstractlist.php

* Update domfieldinterface.php

* Update field.php

* Update email.php

* Update file.php

* Update imagelist.php

* Update sql.php

* Update tel.php

* Update textarea.php

* Update url.php

* Update calendar.xml

* Update checkboxes.xml

* Update imagelist.xml

* Update integer.xml

* Update list.xml

* Update radio.xml

* Update sql.xml

* Update textarea.xml

* Update url.xml

* Update gallery.xml

* plugin

* plugin2

* typo

* Change to uft8mb4

* Add new extensions to the script file

* Revert merge conflict composer changes

* No needed changes

* Library form fields should be unaware of com_fields

* Default to https

* Order the tables correct

* Cleanup language strings

* Code errors from cleanup

* Remove tags support

* Add category filter

* Display fielg group label when editing a group

* Display all fields which are assigned to all languages correct

* Don't show fields on categories as it is not ready yet

* Update fields.php

* Don't transofrm the category name

* Correct quote name function used

* Revert "Display fielg group label when editing a group"

This reverts commit 1331332.

* Disable tags on custom field groups

* Don't include category state in filter on back end

* Remove debug code

* CS fix

* Shortening the line length

* Install SQL files for postgres

* Use JDatabaseQuery

* Option to show the user custom fields on the front on the contact view

* Comment for item_id table column

* Remove class for textareas

* Fix no menu item pages giving wrong links (#12020)

* [plg_system_logout] Load language files only when needed (#11736)

* Update logout.php

* cs and stuff

* Update logout.php

* Adding Options Button (#12033)

* fix paths (#12032)

* Fix routing for non-sef menu items with Modern Routing (#12021)

* [com_banners] - publishing time does not honor timezone (#11978)

* [com_banners ] -  publishing time does not honor timezone

* impress only when needed

impress only when needed

* CS fix

cs fix

* Order stylesheet attributes the same as link attributes (#12052)

* use joomla-projects docker

* Phase out JString calls in libraries (#12058)

* Admin app - JString -> StringHelper (#12056)

* Site app & Plugins - JString -> StringHelper (#12057)

* New Feature, Multilanguage: Add the possibility of displaying associations in article info and in articles list. Replaces #11935 (#12042)

* Replaces

* Modifying to fit Thomas proposal

* modifying fetching flags param

* adding showon + some

* [JAccess] Improve ACL asset preloading performance/memory consumption (#12028)

* improve component asset preload speed

* Update user.php

* Update access.php

* Update access.php

* Update access.php

* Update access.php

* not convinced yet, but revert changes in juser

* make sure that components are always preloaded

* only a logged users (with user id) can be root.

* [com_contact] - moved the captchaEnabled var from default to view (#11964)

* [com_contact] - moved the captchaEnabled var out of the default.php file to the view.html.php file

moved the captchaEnabled var out of the default.php file to the view.html.php file.

* moved captchaEnabled to the view

moved captchaEnabled to the view

* missed var  declarationi/initialization

missed var   $captchaSet  declarationi/initialization

* Session interaction refactoring (#10905)

* Allow lazy starting a session

* Defer starting sessions in the installer

* Defer starting session in JApplicationCms

* Deprecate creating sessions in JFactory

* Start restructuring session load sequence in JApplicationCms

* Add JSession object to onAfterSessionStart event trigger

* Override afterSessionStart for install app to not store the user

* Expand the database storage object for better API

* Fix session listener declaration

* Restructure session bootup and when the session metadata operations run

* 3.5 -> 3.6

* Remove option, out of scope

* Tweak things so the behavior is closer to current API

* Undefined variable

* Get store name from session object

* Remove this, out of scope

* PHPCS fix

* Deep rooted application dependencies are my absolute favorite

* Move comment, doc blocks, consistent method signature

* Again on the consistency, we don't like E_STRICT errors

* Nevermind, confused myself with checkSession, carry on...

* Until the day the unit tests no longer follow the doc block code styles...

* Lost line in merge

* One more merge conflict fix

* This internal coupling is addressed

* Fix query from merge

* [com_content] - add articles ordering by votes, ratings (#11225)

* Add setDocumentTitle() function in JViewLegacy (#11399)

* setDocumentTitle() function in JViewLegacy

* PHPCS

* JED turned to https (#12076)

* JED truned to https

JED truned to https
Minor fixes on proper use of Joomla!

* Update README.txt

Same as #12076

* JED turned https

* JED turned https

* JED turned https

* JED turned https

* JED turned https

* JED turned https

* JED turned https

* JED turned https

* JED turned https

* JED turned https

* JED turned https

* JED turned https

* JED turned https

* JED and community turned https

* JED, community and org turned https

* JED and community turned https

* JED and community turned https

* correct/add quotename (#12070)

* Label: Users Options: Login name > Username (#12073)

The language label "Change Login Name" is not consistent with the front-end label "Username".

This PR changes the language label to "Change Username" and the decription to "Allow users to change their Username when editing their profile."

The front-end login screens use the label "Username"
Login Component:
![login-component](https://cloud.githubusercontent.com/assets/1217850/18627996/579510ca-7e5e-11e6-9161-6268e9ccb213.png)

Login Module:
![login-module](https://cloud.githubusercontent.com/assets/1217850/18627997/579595ae-7e5e-11e6-8920-edf34631a3c7.png)

### Testing Instructions
#### Before the PR
Users > Manage > [Options] > [User Options]
The last entry is "Change Login Name" 
+ hover description "Allow users to change their Login name when editing their profile."

![login-back-end-options](https://cloud.githubusercontent.com/assets/1217850/18627995/5791ac32-7e5e-11e6-8b18-94a34372c422.png)


#### After the PR
Users > Manage > [Options] > [User Options]
The last entry is "Change Username" 
+ hover description "Allow users to change their Username when editing their profile."

![login-back-end-options-after](https://cloud.githubusercontent.com/assets/1217850/18627998/5799ceb2-7e5e-11e6-9a5e-234dcf2db14e.png)

* Update .travis.yml (#12079)

* Add vote order check

* [a11y] Protostar back to top (#12446)

* [a11y] Protostar - back to top link

* Oops Andre was right

* add anchor for non-js enabled browsers

* Added missing com_fields component from last merge

* Replace Platform version numbers in libraries/legacy (#12242)

* Remove variable declaration (Fix #12619)

* Misc. fixes

* Test fixes
27c090e
@rdeutz rdeutz added a commit that referenced this pull request Nov 5, 2016
@brianteeman @rdeutz brianteeman + rdeutz com_search on back-end: Results links opens in backend window instead…
… of new Tab (#12626)

* Updated installation language files

* 2fa handeling for mcrypt and openssl (#12497)

* handeling for mcrypt and openssl

* Language changes suggested bei Brian

* search results in new window

* 2fa handeling for mcrypt and openssl (#12497)

* handeling for mcrypt and openssl

* Language changes suggested bei Brian
 (reverted from commit 08d6728)

* Updated installation language files (reverted from commit e504f71)

* language string
e48389a
@nvyush nvyush added a commit to nvyush/joomla-cms that referenced this pull request Nov 9, 2016
@brianteeman @nvyush brianteeman + nvyush com_search on back-end: Results links opens in backend window instead…
… of new Tab (#12626)

* Updated installation language files

* 2fa handeling for mcrypt and openssl (#12497)

* handeling for mcrypt and openssl

* Language changes suggested bei Brian

* search results in new window

* 2fa handeling for mcrypt and openssl (#12497)

* handeling for mcrypt and openssl

* Language changes suggested bei Brian
 (reverted from commit 08d6728)

* Updated installation language files (reverted from commit e504f71)

* language string
0d8699e
@cpfeifer cpfeifer added a commit to cpfeifer/joomla-cms that referenced this pull request Dec 22, 2016
@cpfeifer cpfeifer Updating Fork (#1)
* Updated restore.php for updates

* Fix the generation of salt for crypt-blowfish

The salt for crypt-blowfish should be correctly formed as per the [php manual `crypt()` instructions](http://php.net/manual/en/function.crypt.php)

The expected size is at least 30 characters

* Pass hash crypt-blowfish without salt is length 60

* Increase Cost Factor for crypt-blowfish

Note that `getCryptedPassword()` and `getSalt()` are the old encryption methods

* Check to ensure user is not disabled before sending the email

* dont convert to integer - thanks @andrepereiradasilva

* Allow empty search - uses wrong value

* Updated installation language files

* 2fa handeling for mcrypt and openssl (#12497)

* handeling for mcrypt and openssl

* Language changes suggested bei Brian

* Prepare 3.6.4 Stable Release

* incorrect to check for an article

* space fixes

* SQL - FIELD_IN_SET() translation

[com_fields] - mysql dialect used FIND_IN_SET() #12636

* sql portability FIND_IN_SET()

sql portability FIND_IN_SET()

* portable SQL find_in_set()

portable SQL find_in_set()

* rename function to match CS rule

rename function to match CS rule
from  find_in_set() to findInSet()

* rename function to match CS rule 

rename function to match CS rule

* rename function to match CS rule

rename function to match CS rule

* prevent fatal error 

prevent fatal error on untranslated drivers

* delete old files from Joomla 3.2.3 version

delete old files in the update procedure

* remove option from config

* remove option from menu item

* mysql

* postrges

* sqlazure

* unit test

* Error in sr-YU installation ini file (#12984)

* Set correct default values for user creation in the backend (#12589)

* Update joomla.sql

* Update joomla.sql

* Update joomla.sql

* Updater follows Location headers for valid archive filename (#12817)

* made download() follow Location headers to resolve the valid filename of the update archive

* integrated suggestion of ggppdk, valid behavior if no query string

* strict type checking

* make Travis happy again... code style error

* Prepare 3.6.5 Stable Release

* Prepare 3.6.5 Stable Release

* Verify a pre-J3.2.1 crypt-blowfish without salt Password

* Improve the verification of a pre-J3.2.1 `getCryptedPassword()` Password

verify a pre-J3.2.1 Password that was hashed to crypt-blowfish without user specified salt

* verify a pre-phpass password hash

replicates the password hash creation used before 3.2.1 and #2683 implemented phpass

* Add one test with existing hash from old method

Good idea to include one existing hash rather than always generating a new hash for the test.

* Isis font-weight 200 override

* Update strings to be consistent with their use elsewhere in Joomla

* Make desc into a label

* Implement Countable interface in JFeed

* [com_content] - admin fix SQL error when apply empty filter

#13114

* models articles 

models articles fix

* model featured

model featured

* cs

cs

* ops

ops

* Check that extension that owns a category is enabled

* More calendar language files.

* changing en-US color to default en-GB colour

Easy fix on review
changing en-US `color` to default en-GB `colour`

* Fixing installation SQL for PostgreSQL

* Unit test fixes

* Fix placeholder showing "Select a User" when in readonly mode (e.g. modified_by) (#12627)

* Fix placeholder showing "Select a User" when in readonly mode (e.g. modified_by)

Additional changes:
- Remove obsolete extracted variables that are not present for this field type
- Correct variable name in doc block to match extracted name
- Refactor code to remove ternary overuse

* Changed getExcluded method return value to match doc block

Additional changes:
- Satisfy Code Sniffer (e.g. @since)
- Remove else block after variable initialisation

* Change htmlspecialchars($VARNAME, ENT_COMPAT, 'UTF-8') to $this->escape($VARNAME)

Additional changes:
- Change JHtml::script() call to JHtml::_('script' ...) to allow overrides via custom register method

*  Fix placeholder showing "Select a User" when in readonly mode (e.g. modified_by)

Additional changes:
- Change htmlspecialchars($VARNAME, ENT_COMPAT, 'UTF-8') to $this->escape($VARNAME)
- Refactor code to remove the ternary overuse
- Change JHtml::script call to JHtml::_('script' ...) to allow overrides via custom register method
- Correct variable name ($exclude) in doc block to match extracted name
- Remove obsolete extracted variables that are not present for this field type
- Removed the class suffix from the hidden field
- Remove (Fix) obsolete whitespace in class attribute for the visible field when no suffix was entered

* Move hidden field outside the condition for now

* Re-Added interface

Missed that in the manual merge process. While I was working on the PR, the custom fields code got merged. Thanks @wilsonge.

* Add custom class back to hidden field for potential b/c breaks

* Support for sqlsrv

* Mering calendar locales

* resolve conflict

* resolve conflict (reverted from commit 31e131f)

* resolve conflict

* [com_fields] No need for an alias in fields groups. (#13115)

* No need for an alias in fields groups.

* Remove alias from SQL structure.

* [com_menu] - delete reference on #_modules_menu deleting a menu item (#13126)

* Add a static flag to check if the event is registered (Fix #13124) (#13147)

* Coding style - com_newsfeeds (#13139)

* Leave one white-space before the PHP code closing tag.

* Fixed wrong place for space

* [plg_user] - delete messages from deleted user (#13052)

see #12883

* three more calendar languages

* Ensure we have a instance of JApplicationCms (#8166)

* Ensure we have a instance of JApplicationCms

This allows the creation of users via CLI scripts that currently error because the application object is an instance of JApplicationCli

* Change to method exists check

* [3.7.x] Input field invalid highlight (#12443)

* Session field invalid interger

* Input field invalid highlight

* Revert to original invalid highlighting

* [com_content] - deleted featured articles are not deleted from  #__content_frontpage table (#12505)

* [com_content] - deleted featured articles are not deleted from #__content_frontpage table

deleted featured articles are not deleted from #__content_frontpage table

* tabs

tabs

* tabs again

tabs again

* fully delete featured

delete featured from #__content_frontpage

* delete featured

delete featured

* moved to controller/models

moved to controller/models

* deploy version

deploy version

* 1 more space

1 more space

* travis CS

travis CS

* removed postDeleteHook() to solve conflicts

removed postDeleteHook() to solve conflicts and to make it better

* remove old pr way

remove old pr way

* implementation with a method override as suggested

implementation with a method override as suggested

* [NF] UX/UI Module menu assignment item type (#12752)

* Module menu assignment item type

UX UI improvment in module menu assignment to see menu item of type
separator, heading, alias

* add url type

* disabled attribute

* [categories] - respect  user level access for categories (#12931)

* [categories] - respcet  user level access

respcet category user level access

* [categories] - respect user access level

[categories] - respect user access level

* categories - respect user access level

respect user access level

* [categories] - respect categories access level when create a new article

respect categories access level when create a new article

* respect categories access level

search filter in article manager

* [com_installer] review config global default options (#12964)

* defaults

* sincronize with staging

* fix conflicts

* Regression: Bring back translateformat feature to JFormFieldCalendar (#12969)

* Regression: Bring back translateformat feature to JFormFieldCalendar

* Restore the missing part

* Two strings were missing in frontend.

* [com_menus] review config global default options (#12971)

* config.xml

* Update joomla.sql

* Update joomla.sql

* Update joomla.sql

* sincronize with staging

* fix conflicts

* Move the checkboxes to the leftmost column in detail view (#12997)

* [com_menus] - wrong group by when multilanguages enabled - postgresql (#12999)

Pull Request for fix regression from #12051 .

Summary of Changes

fixed wrong group by when multilanguages enabled

Testing Instructions

latest staging fresh multilanguage install

Go to Menu -> All menu items

* Displaying the correct tip in Global Configuration Permissions (#13143)

* Displaying the correct tip in Global Configuration Permissions

* simplification

* Disable Chosen.js for the rule field, again (#12877)

* Revert the check for instance type of data-chosen, to allow to disable Chosen for field with data-chosen="true"

* Add some explanation

* Replace deprecated isSite() and isAdmin() calls

* Fixed accidental replacements in tests

* Rev reverted replacements in external projects' files

* Corrected an oversight

* Resolve?

* Try to fix pagination-test failure

* Try to fix pagination-test failure, take2

* Try to fix pagination-test failure,  final (hopefully)

* Some more replacements

* Multilanguage: correcting saving menu item with same alias when language is changed to ALL (#13112)

* Multilanguage: correcting saving menu item with same alias when language
is changed to ALL

* not syncing anymore

* new string is no more necessary

* thanks @andre

* Coding style - PHP code tag and control structures (#13141)

* Leave one white-space after the PHP code opening tag.

* Leave one white-space before the PHP code closing tag.

* Fixed style for control structures alternative syntax.

* Removed unnecessary space before PHP closing tag

* Removed unnecessary space before php closing tag

* Added missing space before PHP code closing tag

* Multilingual: correcting alternates when associated menu items are com_users items (#13152)

* Multilingual: correcting alternates when associated menu items are
com_users items

* simplification

* Update languagefilter.php

oops

* [Unit Test improvements] Use getMockBuilder rather than getMock directly  (#12990)

* Use getMockBuilder rather than getMock directly

Avoid situations that would cause `PHP Fatal error:  Call to protected method PHPUnit_Framework_TestCase::getMock()` on newer versions of phpunit

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use the correct $this object

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Set up a more mock JTableExtension with getMockBuilder

* Use getMockBuilder rather than getMock directly

* Use the correct $this object

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* remove the method after replacing

* Use getMockBuilder rather than getMock directly

* More getMockBuilder in place of getMock

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Fix testParse mock Constructor Args

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* disableOriginalConstructor

* disableOriginalConstructor()

* disableOriginalConstructor()

* disableOriginalConstructor()

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* another spot for getMockBuilder

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* remove duplicate $this->transport

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Use getMockBuilder rather than getMock directly

* Add 'setUserState' to MockApplicationCms

Fixes 2 warnings on phpUnit 5.6:
1) JModelListTest::testGetuserstateUsesDefault
Trying to configure method "setUserState" which cannot be configured because it does not exist, has not been specified, is final, or is static
2) JModelListTest::testGetuserstateUsesRequestData
Trying to configure method "setUserState" which cannot be configured because it does not exist, has not been specified, is final, or is static

* mockDatabase fails for mockTableExtension on hhvm

Fixes 10 hhvm failures that have one of the following messages
```php
UnexpectedValueException: No columns found for #__extensions table

Expectation failed for method name is equal to <string:parseSchemaUpdates> when invoked 1 time(s).
Method was expected to be called 1 times, actually called 0 times.
```

* cs-fix extra semicolon

* remove trailing coma

* remove trailing comma

* Coding style - PHP code tag and control structures II (#13149)

* Removed unnecessary spaces after PHP code opening tag

* Removed unnecessary spaces before PHP code closing tag

* Added a white-space before PHP code closing tag where missing

* Fixed style for control structures alternative syntax

* Remove never needed nor used JED Update Server from new installs (#13047)

* Update joomla.sql

* Update joomla.sql

* Update joomla.sql

* Update joomla.sql

* Update joomla.xml

* Update jos_update_sites.csv

* Update jos_update_sites_extensions.csv

* Update script.php

* Update script.php

* Update joomla.sql

* Update script.php

* [PHP 7.1] Adapt JDate to reflect that php now sets DateTime() with microseconds (#13079)

* Update date.php

* Update date.php

* Update date.php

* Replacements for deprecated JFile::read() (#13160)

* Replacements for deprecated JFile::read()

* Removed replacements for FOF

* Type-safe comparison for isClient (#13157)

* Set correct default values for user creation in the backend also in the sample_learn.sql sample data (#13127)

The default value for the useractivation param is 2
https://github.com/joomla/joomla-cms/blob/3.6.4/administrator/components/com_users/config.xml#L45-L68

* Set correct default values for user creation in the backend also in the sample_learn.sql sample data (#13127)

The default value for the useractivation param is 2
https://github.com/joomla/joomla-cms/blob/3.6.4/administrator/components/com_users/config.xml#L45-L68

* Removed some unnecessary strtotime() calls (#13171)

* Fix unittest on cache - 5 seconds less (#11872)

* Run test at JCacheTest->testGc with not empty storage and caching enabled.

* Test if cache file after run gc does not exists.

* Fixed misuses of array_push() project wide (#12170)

* Replaced rand() with mt_rand() projectwide

* Fixed misuses of array_push()

* Fixed PHPMailer problems

* Reverted some changes, as they are in included external frameworks

* Removed changes which were irrelevant to this PR.

* Changed some recently added array_push calls

* Fixed accidental deletion of curly bracket

* revert e91177d

* Smart search parser leaking CSS and JS terms (#12411)

* Strip head first because of possible nested tags

* Remove chunking from indexer

* Responsive site title for protostar (#13064)

* Responsive site title for protostar

* Updated less file too

* Fixed less compling, added maximum of 40px for font-size

* Better scaling factor, removed calc on line-height it is not really needed and causes a little jumping

* Improve menu associations (#13086)

* Unittest fix - do not use PDO driver directly (#13097)

* Use database driver in the right way in unittests

* Fix unittests

* Allow packages to declare that their child extensions cannot be uninstalled (#13154)

* Allow packages to declare that their child extensions cannot be uninstalled

* Change tag name, fix bugged instanatiation of manifest class, add tag to English package manifest

* Remove language check

* Flag in JInstaller that a package is being uninstalled to allow its children to be removed

* Speed up hhvm unit tests - disable jit (#13169)

* Wrong color on active menu item in mobile view - Protostar (#12303)

* Update template.less

Fix css issue with menu active item in mobile screens

* Update template.css

CSS Fix for active menu item in mobile screens

* [com_fields] Include group state only when not on back end list (#12696)

* Include group state only when not on back end list

* Add comment

* Update default_permissions.php

* Remove senseless proxy functions

* Updating calendar locales

* Replacements for deprecated getCfg() (#13161)

* Replacements for deprecated getCfg()

* Replacements for deprecated AbstractRegistryFormat Class implementations

* Don't load authorised view levels in foreach for tags generation (#13140)

* Don't load authorised groups in foreach for tags generation

* Add $

* Use user method

* Change variable name

* Replacements for deprecated JApplication::getHash() (#13162)

* Replacements for deprecated JApplication::getHash()

* Replacements for deprecated JApplication::getHash()

* Replacements for deprecated JApplication::getHash()

* Coding style - PHP code tag and control structures III (#13173)

* Removed unnecessary spaces after PHP code opening tag

* Added a white-space before PHP code closing tag where missing

* Removed unnecessary spaces before PHP code closing tag

* Fixed style for control structures alternative syntax

* Fixed style for control structures alternative syntax

* Added a semicolon at the end of statement where missing

* Coding style - PHP code tag and control structures IV (#13176)

* Removed unnecessary spaces after PHP code opening tag

* Removed unnecessary spaces before PHP code closing tag

* Added a white-space before PHP code closing tag where missing

* Removed unnecessary spaces before PHP code closing tag

* Added a white-space before PHP code closing tag where missing

* Added a white-space before PHP code closing tag where missing

* Added a semicolon at the end of statement where missing

* Fixed style for control structures alternative syntax

* Copy and new should use the group_id (#13179)

* Unnecessary double quotes in site components (#13183)

* Replace unnecessary double quotes in site/components

* small correction

* Included a fix for an existing bug that @andrepereiradasilva pointed out

* Merged unset calls (#13186)

* Remove one-time-use variables (#13187)

* Remove unnecessary parentheses in site components (#13190)

* Remove unnecessary parentheses in site/components

* Insert space, wrongfully removed

* Re-added a pair, for readability as @andrepereiradasilva suggested not to have it ungrouped for readability

* Removed some whitespace, as noted in @shur's comment

* Use short syntax for applied operations (#13188)

* New Feature: add redirect option after article submission

* Remove DPFields leftover (#13229)

* [com_fields] Migrate from repeatable to subform field for list options (#13069)

* Migrate from repeatable to subform field for list options

* Adapt checkboxes and radio

* Merge regression

* Simplify ternary with elvis in site component (#13185)

* Simplify ternary with elvis operator

* Fixed indentation

* Forgot to remove these parentheses in merge from staging

* Removed silly assignments (#13196)

* Replace unnecessary double quotes (#13239)

* Replace unnecessary double quotes in libraries/cms (#13235)

* Replace unnecessary double quotes

* Reverted some double quotes-replacements

* Various changes in modules (#13216)

* Simplify ternary operation with elvis operator

* Remove unnecessary parentheses

* Remove redundant variables

* Code formatting

* Add cursor:pointer; for making dismiss alert work on ios devices (#11965)

* Simplify ternary operation using elvis operator

* Remove unneeded parentheses

* Media Manager Restyle (#12643)

* Media manager restyle - Initial commit

* Media Manager restyle

* Delete option added on image hover

* Center thumbnail X icon

* Media restyle added to xtd-button

* JS moved popup-imagemanager.js

* JS added to popup-imagemanager.min.js

* CS

* Revert iframe height increase

* Modal margin

* RTL support

* RTL - correcting image popup display

* cs fix travis built (#13255)

* Deleting unused lang strings (com_fields) (#13259)

* Deleting unused language string

* another

* Cleanups, fixes and a bit of optimizations for site/components batch #3 (#12292)

* Cleanups, fixes and a bit of optimizations for site/components batch #3

- com_content

Note: This is a single commit bundling all types of changes, since PR #12261 which had detailed commits, was rejected as a whole

* Ch-Ch-Ch-Changes!

Made some changes as pointed out by @andrepereiradasilva

* A bit more...

* Revert

* Removed empty function, as there is a fallback. Change made according to comment from @wilsonge

* Included @andrepereiradasilva's suggestions

* Inserting whitespace before php closing tag

* Replace unnecessary double quotes in templates (#13245)

* Replace unnecessary double quotes

* Revert overzealous replacements

* Formatting fix

* Replace unnecessary double quotes (#13215)

* Cleanups, fixes and a bit of optimizations for site/components batch #1 (#12290)

* Cleanups, fixes and a bit of optimizations for site/components batch #1

- com_ajax
- com_banners
- com_config
Note: This is a single commit bundling all types of changes, since PR #12261 which had detailed commits, was rejected as a whole

* Ch-Ch-Changes!

* Removed the query changes

* Fix for wrong merge resolve

* Replaced unnecessary double quotes in plugins (#13211)

* Replaced unnecessary double quotes in plugins

* spaces

* Revert change to 3rd party file.

* Removed unnecessary parentheses in plugins (#13212)

* Various changes in plugins (#13213)

* Remove one-time use variable

* Merge unset calls

* Remove obvious variants from ternary operation

* Use short syntax for applied operation

* Performance 5 (modules) (#12229)

* Use Elvis instead of full ternary

* Included nested positive if in parent

* Double quotes to single quotes

* Removed unnecessary parentheses

* Inline one-time use variables

* Type-safe string comparisons

* More type safe comparisons

* Replace is_null() with === null

* Replace strstr with strpos

* Replace substr with strpos

* Optimize non-optimal if conditions.

* Merged cascading str_replace calls

* Another type safe-comparison

* Fix multiple calls to callable in if condition

* Flip some conditions back after removing the condition call

* Fix codesniffer

* Fix codesniffer...

* This one is probably better left loose typed

* ... and this one, too.

* Use Elvis instead of full ternary

* Included nested positive if in parent

* Double quotes to single quotes

* Removed unnecessary parentheses

* Inline one-time use variables

* Type-safe string comparisons

* More type safe comparisons

* Replace is_null() with === null

* Replace strstr with strpos

* Replace substr with strpos

* Optimize non-optimal if conditions.

* Merged cascading str_replace calls

* Another type safe-comparison

* Fix multiple calls to callable in if condition

* Flip some conditions back after removing the condition call

* Fix codesniffer

* Fix codesniffer...

* This one is probably better left loose typed

* ... and this one, too.

* A few more changes based on discussion with @andrepereiradasilva

* Drop index idx_image in #__languages table (#13252)

* Update joomla.sql

* Update joomla.sql

* Update joomla.sql

* Update 3.7.0-2016-11-21.sql

* Update 3.7.0-2016-11-21.sql

* Update 3.7.0-2016-11-21.sql

* HTML5 pattern in validate.js (#13094)

* html5 pattern

* implement @ralain 's suggestion

Thank you @ralain

* Fixes for errors introduced with conflict resolution

* Fixes for errors introduced with conflict resolution

* Update head.php (#13081)

* [com_fields] Change extension variable to context for custom field groups (#13175)

* Change extension variable to context for custom field groups

* Stabilizing javascript

* Fixing code style error

* Check for admin permission of com_fields access correct

* Don't process value adjusting twice (#13233)

* Modals style cleanup (#13261)

* Variable names - naming conventions - testing the waters (#13170)

* Various changes in libraries legacy (#13241)

* Inline one-time use variables

* Removed unnecessary ternary operators

* Merge unset() calls

* Use modern day type-casting

* This can be replaced with type-casting

* Changes on continue statements (#13199)

* Remove unnecessary 'continue' function

* Change 'continue' so that it breaks out of the 'switch', as there is no need to compare against the rest.

* Fixed mistake

* Added a break in `separator` case, as there is nothing to execute under `heading`,  in that case.

* Revert changes in 3rd party file

* Fix vertical scroll (#13269)

* Type safe string comparison of strings in plugins

* Remove false param on fetching form data (#13254)

* Remove unneeded registry creation (#12571)

* Contact params already are Registry objects.

* Newsfeed params already are Registry objects.

* Menu params already are Registry objects.

* Fixing wrong merging

* Lazy session starting (#13074)

* Allow lazy starting a session

* Defer starting sessions in the installer

* Defer starting session in JApplicationCms

* Unit test fixes

* [com_fields] Normalise data structure for assigned categories (#13246)

* Normalise #__fields -> assigned_cat_ids

* Fixing typo in table name

* Fixed issue #11932

Removed an unnecessary range restriction on a SQL query, which caused an
invalid query to be generated for Microsoft SQL Server.

* fix CS after 3.6.5 ..

* Fix accidentally flipped comparison

* Replace unnecessary double quotes

* some more double quote replacements

* This one, too...

* Add context selector to fields groups

* Composer install

* Type-safe string comparison in site/templates

* prepare alpha1 release

* [com_fields] Migrate user groups from categories to field groups (#13103)

* Migrate user groups from categories to field groups

* Renamed variable from category to group

* Show only fields which are in selected groups

* Change identifier from extension to context

* [com_fields] - Creating a New field give SQL error on postgresql (#13155)

* [com_fields] - Creating a New field give SQL error on postgresql

Postgres: Inserting an image field fails with an error #13137

* xml default

xml default

* added JNONE

added JNONE

* Template menu assign fix n styling (#13280)

* Improve doc blocks for JMenu (#13274)

* Moved JPluginHelper::importPlugin() call outside loops. (#13248)

* Logout code needs to account for shared_session parameter (#13273)

* Fix subform chosen (#12993)

* Initialize chosen when adding rows in repeatable subforms

* Use JHtml::script and JHtml::stylesheet in the new way

* Subform does not need to fix chosen.

* Codemirror fluid height (#13266)

* Codemirror fluid height

* Min-height changed to 400px

* Moved less to _editors.less - added max-height

* Delete assigned categories when field is deleted (#13315)

* Remove unused local variables project wide (#13206)

* Remove unused or immediately overwritten variables

* Remove unused or immediately overwritten variables in tests

* Commented out some reference code, as it is not used in that scope

* Not sure on this removal. Added a TODO.

* Fixed accidentally removed $

* Fix codesniffer

* Revert changes in this file, as it is an external library

* Update field.php
fb3e6ba
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment