Skip to content

[lib & admin & template & plugins] Always use htmlspecialchars($str, ENT_COMPAT, 'UTF-8')#10438

Closed
zero-24 wants to merge 105 commits intojoomla:stagingfrom
zero-24:patch-33
Closed

[lib & admin & template & plugins] Always use htmlspecialchars($str, ENT_COMPAT, 'UTF-8')#10438
zero-24 wants to merge 105 commits intojoomla:stagingfrom
zero-24:patch-33

Conversation

@zero-24
Copy link
Copy Markdown
Contributor

@zero-24 zero-24 commented May 12, 2016

Pull Request for Issue #10399 .

Summary of Changes

Always use htmlspecialchars($str, ENT_COMPAT, 'UTF-8')

Testing Instructions

Please do a code review or test all changed files.

@brianteeman
Copy link
Copy Markdown
Contributor

I have tested this item ✅ successfully on 6aa2082

on review


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

1 similar comment
@alikon
Copy link
Copy Markdown
Contributor

alikon commented May 12, 2016

I have tested this item ✅ successfully on 6aa2082

on review


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

@brianteeman
Copy link
Copy Markdown
Contributor

RTC


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

@joomla-cms-bot joomla-cms-bot added the RTC This Pull Request is Ready To Commit label May 12, 2016

$elShortName = $xml->createElementNs($osns, 'ShortName');
$elShortName->appendChild($xml->createTextNode(htmlspecialchars($this->_shortName)));
$elShortName->appendChild($xml->createTextNode(htmlspecialchars($this->_shortName), ENT_COMPAT, 'UTF-8'));
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is not correct!

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not?

Copy link
Copy Markdown
Contributor

@andrepereiradasilva andrepereiradasilva May 13, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

$xml->createTextNode(htmlspecialchars($this->_shortName), ENT_COMPAT, 'UTF-8')

should be

$xml->createTextNode(htmlspecialchars($this->_shortName, ENT_COMPAT, 'UTF-8'))

@andrepereiradasilva
Copy link
Copy Markdown
Contributor

@brianteeman please remove the RTC from this one. It as errors.

@brianteeman
Copy link
Copy Markdown
Contributor

Please explain the errors - saying it is not correct is not helpful

@andrepereiradasilva
Copy link
Copy Markdown
Contributor

andrepereiradasilva commented May 13, 2016

htmlspecialchars($image->data), ENT_COMPAT, 'UTF-8'

should be
htmlspecialchars($image->data, ENT_COMPAT, 'UTF-8)'

@brianteeman
Copy link
Copy Markdown
Contributor

Explain not quote ;)

@andrepereiradasilva
Copy link
Copy Markdown
Contributor

the parentisis is the wrong place

@andrepereiradasilva
Copy link
Copy Markdown
Contributor

travis is also telling that.

@brianteeman brianteeman removed the RTC This Pull Request is Ready To Commit label May 13, 2016
@joomla-cms-bot joomla-cms-bot added the RTC This Pull Request is Ready To Commit label May 13, 2016
@brianteeman
Copy link
Copy Markdown
Contributor

RTC removed as requested


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

@joomla-cms-bot joomla-cms-bot removed the RTC This Pull Request is Ready To Commit label May 13, 2016
@wojsmol
Copy link
Copy Markdown
Contributor

wojsmol commented May 14, 2016

@zero-24 see zero-24#12

* fix travis error

* CS
…oomla#10437)

* Update default_items.php

* Update list.php

* Update view.html.php

* Update view.html.php

* Update view.html.php

* Update route.php

* Update mysqli.php

* Update oauth.php

* Update mod_articles_category.php

* Update mysqli.php
@rdeutz
Copy link
Copy Markdown
Contributor

rdeutz commented May 16, 2016

@zero-24 could you have a look at the merge conflicts, thanks.

matrikular and others added 22 commits May 16, 2016 18:20
…i key if one was set (joomla#10439)

* Change api scheme to https

While the main change to this file is about setting the scheme to https, I've also refactored the uri handling and added the option to apply an api key as well.

* Remove urlencode from address since it will be handled automatically in toString()

* Create a new JUri instance instead of using $this->uri to prevent errors with e.g. isSercure()

* Remove the sensor parameter since it doesn't seem to be need any longer

Remove the sensor parameter since it doesn't seem to be need any longer. Thanks for pointing it out @robert.

* Satisfy Travis, maybe?!

* Add the sensor parameter back to the api url since the tests seem to rely on it

Add the sensor parameter back to the api url since the tests seem to rely on it. If that really is the case, we should implement be a better way of "parsing" the url and / or looking for an array index in the tests.

* Fix url parsing to properly handle query params

* Remove the sensor parameter since it doesn't seem to be needed any more

This time the test(s) shouldn't fail - fingers crossed.
…MPAT, 'UTF-8') (joomla#10440)

* Update default.php

* Update category_default.php

* Update pdomysql.php

* Update object.php

* Update default_items.php

* Update default_items.php

* Update default.php

* Update view.html.php

* Update categories.php

* codestyle https://travis-ci.org/joomla/joomla-cms/jobs/129754482
* Improve categories modal container

* Add modal viewport dimensions

* Remove single "double quote" in token

* Fix JS error Uncaught SyntaxError: Unexpected token )

* Array indent

* Add edit category as a modal and other improvements
* Use getState instead of direct property read

Use getState instead of direct property read to avoid any undefined property warnings.

* Fix test case

We're setting state manually for this test case. But since the flag is not set the populateState will be called and it will overwrite them.
…la#10515)

* Code style filter_categories.xml

Add empty line before opening tags for readability

* Code style category.xml + fix closing tag field "tags"

* Remove extra empty lines at end of categories.xml
* Simplify newsfeed modal, by setting edit layout

* Improve Select & Edit com_newsfeeds modals
* add close button to js messages

* type button
* cleaner tree

* new view

* and now?
)

* New lang string for successful language installation

* took off pack
[com_tags] use the same visual level structure as categories
…ories (joomla#10528)

* user groups tree

* forgot the *

* add space

* remove space
[com_config] filters tab: use the same tree level visual
* use layout

* add tree prefix to categories modal
@joomla-cms-bot
Copy link
Copy Markdown

This PR has received new commits.

CC: @alikon, @andrepereiradasilva, @brianteeman


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

@zero-24
Copy link
Copy Markdown
Contributor Author

zero-24 commented May 17, 2016

i did broken my branch please remove the milestone. @brianteeman

@zero-24 zero-24 closed this May 17, 2016
@joomla-cms-bot joomla-cms-bot removed the RTC This Pull Request is Ready To Commit label May 17, 2016
@zero-24 zero-24 deleted the patch-33 branch May 17, 2016 17:58
@rdeutz rdeutz removed this from the Joomla 3.6.0 milestone May 17, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.