extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-08-09 08:25:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

made all methods from html class static and removed the unnecessary singleton

Browse Source
This commit is contained in:
Ralf Becker
2008-03-09 14:35:48 +00:00
parent 97f63b43ff
commit 0da675bf6e
5 changed files with 145 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
notifications/inc/class.notifications_email.inc.php
View File

@ -54,13 +54,6 @@ class notifications_email implements notifications_iface {
*/
private $mail;
/**
* holds html object to render elements
*
* @var object
*/
private $html;
/**
* constructor of notifications_email
*
@ -80,7 +73,6 @@ class notifications_email implements notifications_iface {
{
$this->mail = new send();
}
$this->html = html::singleton();
}
/**
@ -131,12 +123,12 @@ class notifications_email implements notifications_iface {
if(is_null($_render_html)) { $_render_html = false; }
if(is_null($_render_external)) { $_render_external = true; }
$newline = $_render_html ? "<br />" : "\n";
$hruler = $_render_html ? $this->html->hr() : '';
$hruler = $_render_html ? html::hr() : '';
$rendered_links = array();
foreach($_links as $link) {
if($_render_external || ! $link->popup) { $link->view['no_popup'] = 1; }
$url = $this->html->link('/index.php', $link->view);
$url = html::link('/index.php', $link->view);
// do not expose sensitive data
$url = preg_replace('/(sessionid|kp3|domain)=[^&]+&?/','',$url);
// complete missing protocol and domain part if needed
@ -144,7 +136,7 @@ class notifications_email implements notifications_iface {
$url = ($_SERVER['HTTPS'] || $GLOBALS['egw_info']['server']['enforce_ssl'] ? 'https://' : 'http://').
($GLOBALS['egw_info']['server']['hostname'] ? $GLOBALS['egw_info']['server']['hostname'] : $_SERVER['HTTP_HOST']).$url;
}
$rendered_links[] = $_render_html ? $this->html->a_href($link->text, $url, false, 'target="_blank"') : $url;
$rendered_links[] = $_render_html ? html::a_href($link->text, $url, false, 'target="_blank"') : $url;
}
return $hruler.$newline.lang('Linked entries:').$newline.implode($newline,$rendered_links);