mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 20:30:39 +02:00
Code Issues Releases Wiki Activity

Email template simplification

Browse Source
This commit is contained in:
Cameron
2016-05-20 15:04:51 -07:00
parent efbd6c3c2c
commit 86143e2dff
6 changed files with 53 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_core/templates/email_template.php
View File

@@ -342,7 +342,7 @@ $EMAIL_TEMPLATE['monthly']['footer'] = $EMAIL_TEMPLATE['default']['footer'];
$EMAIL_TEMPLATE['whatsnew']['name'] = "What's New"; $EMAIL_TEMPLATE['whatsnew']['name'] = "What's New";
$EMAIL_TEMPLATE['whatsnew']['subject'] = '{SITENAME}: {SUBJECT} '; $EMAIL_TEMPLATE['whatsnew']['subject'] = '{SITENAME}: {SUBJECT} ';
$EMAIL_TEMPLATE['whatsnew']['header'] = $EMAIL_TEMPLATE['default']['header']; // will use default header above. $EMAIL_TEMPLATE['whatsnew']['header'] = $EMAIL_TEMPLATE['default']['header']; // will use default header above.
$EMAIL_TEMPLATE['whatsnew']['body'] = "All the latest news and updates.<br />{BODY}<br />To find out more, simply click on the links!"; $EMAIL_TEMPLATE['whatsnew']['body'] = "Hi {USERNAME},<br />{BODY}";
$EMAIL_TEMPLATE['whatsnew']['footer'] = $EMAIL_TEMPLATE['default']['footer']; $EMAIL_TEMPLATE['whatsnew']['footer'] = $EMAIL_TEMPLATE['default']['footer'];

10
e107_handlers/e_parse_class.php
View File

@@ -247,11 +247,12 @@ class e_parse extends e_parser
* Constructor - keep it public for backward compatibility * Constructor - keep it public for backward compatibility
still some new e_parse() in the core still some new e_parse() in the core
* *
* @return void
*/ */
public function __construct() public function __construct()
{ {
// initialise the type of UTF-8 processing methods depending on PHP version and mb string extension // initialise the type of UTF-8 processing methods depending on PHP version and mb string extension
parent::__construct();
$this->init(); $this->init();
$this->initCharset(); $this->initCharset();
@@ -3188,7 +3189,10 @@ class e_parser
private $scriptAccess = false; // nobody. private $scriptAccess = false; // nobody.
public function __construct() /**
* e_parser constructor.
*/
public function __construct()
{ {
$this->init(); $this->init();
@@ -4421,7 +4425,7 @@ return;
{ {
$value = preg_replace('/^<pre[^>]*>/', '', $value); $value = preg_replace('/^<pre[^>]*>/', '', $value);
$value = str_replace("</pre>", "", $value); $value = str_replace("</pre>", "", $value);
$value = str_replace("<br></br>", PHP_EOL, $value); $value = str_replace('<br></br>', PHP_EOL, $value);
} }
if($node->nodeName == 'code') if($node->nodeName == 'code')

2
e107_handlers/sitelinks_class.php
View File

@@ -1844,7 +1844,7 @@ class navigation_shortcodes extends e_shortcode
if(is_string($this->var['link_sub'])) // html override option. if(is_string($this->var['link_sub'])) // html override option.
{ {
e107::getDebug()->log($this->var); // e107::getDebug()->log($this->var);
return $this->var['link_sub']; return $this->var['link_sub'];
} }

2
e107_languages/English/admin/lan_mailout.php
View File

@@ -66,7 +66,7 @@ define("LAN_MAILOUT_52", "Last mod");
define("LAN_MAILOUT_53", "Admins"); define("LAN_MAILOUT_53", "Admins");
define("LAN_MAILOUT_54", "Self"); define("LAN_MAILOUT_54", "Self");
define("LAN_MAILOUT_55", "Userclass"); define("LAN_MAILOUT_55", "Userclass");
define("LAN_MAILOUT_56", "Last Visit (dd-mm-yy)"); define("LAN_MAILOUT_56", "Last Visit");
define("LAN_MAILOUT_57", "Send bulk SMTP emails in blocks"); // SMTP KeepAlive option define("LAN_MAILOUT_57", "Send bulk SMTP emails in blocks"); // SMTP KeepAlive option
//define("LAN_MAILOUT_58", "There is a problem with the attachment:"); //define("LAN_MAILOUT_58", "There is a problem with the attachment:");
//define("LAN_MAILOUT_59", "Mailing Progress"); //define("LAN_MAILOUT_59", "Mailing Progress");

29
e107_plugins/news/templates/news_template.php
View File

@@ -169,18 +169,43 @@ $NEWS_TEMPLATE['view']['item'] = '
</div> </div>
<hr> <hr>
<div class="options hidden-print "> <div class="options hidden-print ">
<div class="btn-group">{NEWSCOMMENTLINK: glyph=comments&class=btn btn-default}{PRINTICON: class=btn btn-default}{ADMINOPTIONS: class=btn btn-default}{SOCIALSHARE}</div> <div class="btn-group">{NEWSCOMMENTLINK: glyph=comments&class=btn btn-default}{PRINTICON: class=btn btn-default}{ADMINOPTIONS: class=btn btn-default}{SOCIALSHARE}</div>
</div> </div>
</div> </div>
<hr />
{NEWSRELATED} {NEWSRELATED}
<hr> <hr>
{NEWSNAVLINK} {NEWSNAVLINK}
'; ';
/*
* <hr />
<h3>About the Author</h3>
<div class="media">
<div class="media-left">{SETIMAGE: w=80&h=80&crop=1}{NEWS_AUTHOR_AVATAR: shape=circle}</div>
<div class="media-body">
<h4>{NEWS_AUTHOR}</h4>
{NEWS_AUTHOR_SIGNATURE}
<a class="btn btn-xs btn-primary" href="{NEWS_AUTHOR_ITEMS_URL}">My Articles</a>
</div>
</div>
*/
//$NEWS_MENU_TEMPLATE['view']['separator'] = '<br />'; //$NEWS_MENU_TEMPLATE['view']['separator'] = '<br />';
@@ -215,6 +240,6 @@ $NEWS_TEMPLATE['related']['start'] = "<hr><h4>".defset('LAN_RELATED', 'Related')
$NEWS_TEMPLATE['related']['item'] = "<li><a href='{RELATED_URL}'>{RELATED_TITLE}</a></li>"; $NEWS_TEMPLATE['related']['item'] = "<li><a href='{RELATED_URL}'>{RELATED_TITLE}</a></li>";
$NEWS_TEMPLATE['related']['end'] = "</ul>";*/ $NEWS_TEMPLATE['related']['end'] = "</ul>";*/
$NEWS_TEMPLATE['related']['start'] = '{SETIMAGE: w=350&h=350&crop=1}<h2 class="caption">YOU MIGHT ALSO LIKE</h2><div class="row">'; $NEWS_TEMPLATE['related']['start'] = '{SETIMAGE: w=350&h=350&crop=1}<h2 class="caption">You Might Also Like</h2><div class="row">';
$NEWS_TEMPLATE['related']['item'] = '<div class="col-md-4"><a href="{RELATED_URL}">{RELATED_IMAGE}</a><h3><a href="{RELATED_URL}">{RELATED_TITLE}</a></h3></div>'; $NEWS_TEMPLATE['related']['item'] = '<div class="col-md-4"><a href="{RELATED_URL}">{RELATED_IMAGE}</a><h3><a href="{RELATED_URL}">{RELATED_TITLE}</a></h3></div>';
$NEWS_TEMPLATE['related']['end'] = '</div>'; $NEWS_TEMPLATE['related']['end'] = '</div>';

33
e107_plugins/user/e_mailout.php
View File

@@ -169,28 +169,23 @@ class user_mailout
$where[]= "u.`".$selectVals['user_search_name']."` LIKE '%".$selectVals['user_search_value']."%' "; $where[]= "u.`".$selectVals['user_search_name']."` LIKE '%".$selectVals['user_search_value']."%' ";
} }
if (vartrue($selectVals['last_visit_match']) && vartrue($selectVals['last_visit_date'])) if (!empty($selectVals['last_visit_match']) && !empty($selectVals['last_visit_date']))
{ {
foreach(array(':', '-', ',') as $sep) $lvDate = $selectVals['last_visit_date'];
{
if (strpos($selectVals['last_visit_date'], ':')) e107::getDebug()->log(date('r',$lvDate));
{
$tmp = explode($sep, $selectVals['last_visit_date']);
break;
}
}
$lvDate = gmmktime(0, 0, 0, $tmp[1], $tmp[0], $tmp[2]); // Require dd-mm-yy for now
if (($lvDate > 0) && ($lvDate <= time())) if (($lvDate > 0) && ($lvDate <= time()))
{ {
switch ($selectVals['last_visit_match']) switch ($selectVals['last_visit_match'])
{ {
case '<' : case '<' :
case '>' : case '>' :
$where[]= "u.`user_lastvisit`".$selectVals['last_visit_match'].$lvDate; $where[]= "u.`user_lastvisit` ".$selectVals['last_visit_match']." ".$lvDate;
break; break;
case '=' : case '=' :
$where[]= "u.`user_lastvisit`>=".$lvDate; $where[]= "u.`user_lastvisit` >= ".$lvDate;
$where[]= "u.`user_lastvisit`<=".intval($lvDate + 86400); $where[]= "u.`user_lastvisit` <= ".intval($lvDate + 86400);
break; break;
} }
} }
@@ -219,6 +214,7 @@ class user_mailout
} }
} }
$qry .= " FROM `#user` AS u "; $qry .= " FROM `#user` AS u ";
if (count($incExtended)) if (count($incExtended))
{ {
$qry .= "LEFT JOIN `#user_extended` AS ue ON ue.`user_extended_id` = u.`user_id`"; $qry .= "LEFT JOIN `#user_extended` AS ue ON ue.`user_extended_id` = u.`user_id`";
@@ -229,9 +225,12 @@ class user_mailout
e107::getMessage()->addDebug("Selector query: ".$qry); e107::getMessage()->addDebug("Selector query: ".$qry);
if (!( $this->mail_count = $sql->gen($qry))) return FALSE; if (!( $this->mailCount = $sql->gen($qry))) return FALSE;
e107::getDebug()->log($this->mailCount);
$this->mail_read = 0; $this->mail_read = 0;
return $this->mail_count; return $this->mailCount;
} }
@@ -303,7 +302,7 @@ class user_mailout
$var[0]['html'] = $admin->userClassesTotals('email_to', varset($selectVals['email_to'], '')); $var[0]['html'] = $admin->userClassesTotals('email_to', varset($selectVals['email_to'], ''));
$var[1]['html'] = $frm->select('user_search_name', $u_array, varset($selectVals['user_search_name'], ''),'',TRUE)." ".LAN_MAILOUT_47." ".$frm->text('user_search_value', varset($selectVals['user_search_value'], '')); $var[1]['html'] = $frm->select('user_search_name', $u_array, varset($selectVals['user_search_name'], ''),'',TRUE)." ".LAN_MAILOUT_47." ".$frm->text('user_search_value', varset($selectVals['user_search_value'], ''));
//$var[2]['html'] = $admin->comparisonSelect('last_visit_match', varset($selectVals['last_visit_match'], ''))." ".$frm->text('last_visit_date', varset($selectVals['last_visit_date'], 0)); //$var[2]['html'] = $admin->comparisonSelect('last_visit_match', varset($selectVals['last_visit_match'], ''))." ".$frm->text('last_visit_date', varset($selectVals['last_visit_date'], 0));
$var[2]['html'] = $admin->comparisonSelect('last_visit_match', varset($selectVals['last_visit_match'], ''))." ".$admin->makeCalendar('last_visit_date', varset($selectVals['last_visit_date'], 0)); $var[2]['html'] = $admin->comparisonSelect('last_visit_match', varset($selectVals['last_visit_match'], ''))." ".e107::getForm()->datepicker('last_visit_date', varset($selectVals['last_visit_date'], 0), array('type'=>'datetime'));
$var[1]['caption'] = LAN_MAILOUT_46; // User Search Field. $var[1]['caption'] = LAN_MAILOUT_46; // User Search Field.
$var[2]['caption'] = LAN_MAILOUT_56; // User last visit $var[2]['caption'] = LAN_MAILOUT_56; // User last visit
@@ -347,7 +346,7 @@ class user_mailout
} }
if (vartrue($selectVals['last_visit_match']) && vartrue($selectVals['last_visit_date'])) if (vartrue($selectVals['last_visit_match']) && vartrue($selectVals['last_visit_date']))
{ {
$var[2]['html'] = $selectVals['last_visit_match'].' '.gmstrftime("%D-%M-%Y",$selectVals['last_visit_date']); //FIXME use e107 date function. $var[2]['html'] = $selectVals['last_visit_match'].' '.e107::getParser()->toDate($selectVals['last_visit_date'],'long'); //FIXME use e107 date function.
$var[2]['caption'] = LAN_MAILOUT_56; // User last visit $var[2]['caption'] = LAN_MAILOUT_56; // User last visit
} }
$extFields = $admin->ret_extended_field_list('extended_1_name', varset($selectVals['extended_1_name'], ''), TRUE); $extFields = $admin->ret_extended_field_list('extended_1_name', varset($selectVals['extended_1_name'], ''), TRUE);