lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Work on website

Browse Source
This commit is contained in:
Laurent Destailleur 2018-09-26 15:20:37 +02:00
parent 0987db765c
commit 79ade6a1af
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/lib/website.lib.php
View File

@ -52,6 +52,11 @@ function dolWebsiteReplacementOfLinks($website, $content, $removephppart=0)
if ($removephppart) $replacewith=''; if ($removephppart) $replacewith='';
$content = preg_replace('/src="<\?php((?!\?>).)*\?>\n*/ims', $replacewith, $content); $content = preg_replace('/src="<\?php((?!\?>).)*\?>\n*/ims', $replacewith, $content);
$replacewith='href="php';
if ($removephppart) $replacewith='';
$content = preg_replace('/href="<\?php((?!\?>).)*\?>\n*/ims', $replacewith, $content);
//$replacewith='<span class="phptag">...php...</span>';
$replacewith='<span class="phptag">...php...</span>'; $replacewith='<span class="phptag">...php...</span>';
if ($removephppart) $replacewith=''; if ($removephppart) $replacewith='';
$content = preg_replace('/<\?php((?!\?>).)*\?>\n*/ims', $replacewith, $content); $content = preg_replace('/<\?php((?!\?>).)*\?>\n*/ims', $replacewith, $content);
@ -89,7 +94,7 @@ function dolWebsiteReplacementOfLinks($website, $content, $removephppart=0)
* *
* @param string $content Content string * @param string $content Content string
* @return void * @return void
* @see dolWebsiteReplacementOfLinks for function used to replace content in the backoffice editor context * @see dolWebsiteReplacementOfLinks for function used to replace content in the backoffice context when USEDOLIBARREDITOR is not on
*/ */
function dolWebsiteOutput($content) function dolWebsiteOutput($content)
{ {

2
htdocs/user/class/user.class.php
View File

@ -62,7 +62,7 @@ class User extends CommonObject
public $birth; public $birth;
public $email; public $email;
public $skype; public $skype;
public $job; public $job; // job position
public $signature; public $signature;
public $address; public $address;
public $zip; public $zip;