Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

FIX logo and escape in RSS

Browse Source 
Conflicts:
	htdocs/admin/external_rss.php
	htdocs/core/lib/functions.lib.php
This commit is contained in:
Laurent Destailleur
2024-04-18 20:17:10 +02:00
parent e95e2b1c1b
commit 557c723c27
3 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
htdocs/core/lib/functions.lib.php
View File

@@ -1594,7 +1594,7 @@ function dol_escape_js($stringtoescape, $mode = 0, $noescapebackslashn = 0)
* Returns text escaped for inclusion into javascript code
*
* @param string $stringtoescape String to escape
* @return string Escaped string for json content.
* @return string Escaped string for JSON content.
*/
function dol_escape_json($stringtoescape)
{
@@ -1605,8 +1605,8 @@ function dol_escape_json($stringtoescape)
* Returns text escaped for inclusion into a php string, build with double quotes " or '
*
* @param string $stringtoescape String to escape
* @param string $stringforquotes 2=String for doublequotes, 1=String for simple quotes
* @return string Escaped string for json content.
* @param int<1,2> $stringforquotes 2=String for doublequotes, 1=String for simple quotes
* @return string Escaped string for PHP content.
*/
function dol_escape_php($stringtoescape, $stringforquotes = 2)
{
@@ -1625,8 +1625,19 @@ function dol_escape_php($stringtoescape, $stringforquotes = 2)
}
/**
* Return a string label ready to be output on HTML content
* To use text inside an attribute, use can simply only dol_escape_htmltag()
* Returns text escaped for inclusion into a XML string
*
* @param string $stringtoescape String to escape
* @return string Escaped string for XML content.
*/
function dol_escape_xml($stringtoescape)
{
return $stringtoescape;
}
/**
* Return a string label (so on 1 line only and that should not contains any HTML) ready to be output on HTML page
* To use text that is not HTML content inside an attribute, use can simply only dol_escape_htmltag(). In doubt, use dolPrintHTMLForAttribute().
*
* @param string $s String to print
* @return string String ready for HTML output
@@ -4448,7 +4459,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
'margin', 'map-marker-alt', 'member', 'meeting', 'minus', 'money-bill-alt', 'movement', 'mrp', 'note', 'next',
'off', 'on', 'order',
'paiment', 'paragraph', 'play', 'pdf', 'phone', 'phoning', 'phoning_mobile', 'phoning_fax', 'playdisabled', 'previous', 'poll', 'pos', 'printer', 'product', 'propal', 'proposal', 'puce',
'stock', 'resize', 'service', 'stats', 'trip',
'stock', 'resize', 'service', 'stats',
'security', 'setup', 'share-alt', 'sign-out', 'split', 'stripe', 'stripe-s', 'switch_off', 'switch_on', 'switch_on_warning', 'switch_on_red', 'tools', 'unlink', 'uparrow', 'user', 'user-tie', 'vcard', 'wrench',
'github', 'google', 'jabber', 'microsoft', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp',
'generic', 'home', 'hrm', 'members', 'products', 'invoicing',
@@ -4458,7 +4469,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
'error', 'warning',
'recent', 'reception', 'recruitmentcandidature', 'recruitmentjobposition', 'replacement', 'resource', 'recurring','rss',
'shapes', 'skill', 'square', 'sort-numeric-down', 'stop-circle', 'supplier', 'supplier_proposal', 'supplier_order', 'supplier_invoice',
'timespent', 'title_setup', 'title_accountancy', 'title_bank', 'title_hrm', 'title_agenda',
'tick', 'timespent', 'title_setup', 'title_accountancy', 'title_bank', 'title_hrm', 'title_agenda',
'uncheck', 'url', 'user-cog', 'user-injured', 'user-md', 'vat', 'website', 'workstation', 'webhook', 'world', 'private',
'conferenceorbooth', 'eventorganization',
'stamp', 'signature'
@@ -4508,7 +4519,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
'service'=>'concierge-bell',
'skill'=>'shapes', 'state'=>'map-marked-alt', 'security'=>'key', 'salary'=>'wallet', 'shipment'=>'dolly', 'stock'=>'box-open', 'stats' => 'chart-bar', 'split'=>'code-branch', 'stripe'=>'stripe-s',
'supplier'=>'building', 'technic'=>'cogs',
'timespent'=>'clock', 'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'university', 'title_hrm'=>'umbrella-beach',
'timespent'=>'clock', 'tick' => 'check', 'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'university', 'title_hrm'=>'umbrella-beach',
'title_agenda'=>'calendar-alt',
'uncheck'=>'times', 'uparrow'=>'share', 'url'=>'external-link-alt', 'vat'=>'money-check-alt', 'vcard'=>'arrow-alt-circle-down',
'jabber'=>'comment-o',
@@ -4615,7 +4626,8 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
'other'=>'#ddd', 'world'=>'#986c6a',
'partnership'=>'#6c6aa8', 'playdisabled'=>'#ccc', 'printer'=>'#444', 'projectpub'=>'#986c6a', 'reception'=>'#a69944', 'resize'=>'#444', 'rss'=>'#cba',
//'shipment'=>'#a69944',
'security'=>'#999', 'square'=>'#888', 'stop-circle'=>'#888', 'stats'=>'#444', 'switch_off'=>'#999', 'technic'=>'#999', 'timespent'=>'#555',
'security'=>'#999', 'square'=>'#888', 'stop-circle'=>'#888', 'stats'=>'#444', 'switch_off'=>'#999',
'technic' => '#999', 'tick' => '#282', 'timespent' => '#555',
'uncheck'=>'#800', 'uparrow'=>'#555', 'user-cog'=>'#999', 'country'=>'#aaa', 'globe-americas'=>'#aaa', 'region'=>'#aaa', 'state'=>'#aaa',
'website'=>'#304', 'workstation'=>'#a69944'
);