mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-29 10:50:25 +02:00
Code Issues Releases Wiki Activity

Forum view now uses PM shortcode rather than direct link.

Browse Source
This commit is contained in:
Cameron
2016-04-29 05:37:29 -07:00
parent 2915c8b1f5
commit 296fb35d2a
2 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
e107_plugins/forum/shortcodes/batch/view_shortcodes.php
View File

@@ -503,11 +503,17 @@ class plugin_forum_view_shortcodes extends e_shortcode
} }
$text .= "<li><a href='#'>".$this->sc_posts()."</a></li>"; $text .= "<li><a href='#'>".$this->sc_posts()."</a></li>";
$text .= "<li class='divider'></li>";
if(e107::isInstalled('pm') && ($this->postInfo['post_user'] > 0)) if(e107::isInstalled('pm') && ($this->postInfo['post_user'] > 0))
{ {
$text .= "<li><a href='".e_PLUGIN_ABS."pm/pm.php?send.{$this->postInfo['post_user']}'>".$tp->toGlyph('envelope')." ".LAN_FORUM_2036." </a></li>"; if($pmButton = $tp->parseTemplate("{SENDPM: user=".$this->postInfo['post_user']."&glyph=envelope&class=pm-send}",true))
{
$text .= "<li class='divider'></li>";
$text .= "<li>".$pmButton."</li>";
}
// $text .= "<li><a href='".e_PLUGIN_ABS."pm/pm.php?send.{$this->postInfo['post_user']}'>".$tp->toGlyph('envelope')." ".LAN_FORUM_2036." </a></li>";
} }
if($website = $this->sc_website()) if($website = $this->sc_website())

25
e107_plugins/pm/e_shortcode.php
View File

@@ -76,29 +76,42 @@ class pm_shortcodes extends e_shortcode
/** /**
* @param int $parm - User ID. * @param array|string $parm - User ID or array of values (see below)
* @param int $parm['user']
* @param string $parm['glyph']
* @param string $parm['class']
*
* @return null|string * @return null|string
*/ */
function sc_sendpm($parm='') function sc_sendpm($parm=null)
{ {
// global $sysprefs, $pm_prefs; // global $sysprefs, $pm_prefs;
// $pm_prefs = $sysprefs->getArray("pm_prefs"); // $pm_prefs = $sysprefs->getArray("pm_prefs");
if(is_string($parm))
{
$parm = array('user'=>$parm);
}
$pm_prefs = e107::getPlugPref('pm'); $pm_prefs = e107::getPlugPref('pm');
$url = e107::url('pm','index').'?send.'.$parm; $url = e107::url('pm','index').'?send.'.$parm['user'];
require_once(e_PLUGIN."pm/pm_class.php"); require_once(e_PLUGIN."pm/pm_class.php");
$pm = new private_message; $pm = new private_message;
$glyph = empty($parm['glyph']) ? 'fa-paper-plane' : $parm['glyph'];
$class = empty($parm['class']) ? 'btn btn-sm btn-default' : $parm['class'];
if(check_class($pm_prefs['pm_class']) && $pm->canSendTo($parm)) // check $this->pmPrefs['send_to_class'].
if(check_class($pm_prefs['pm_class']) && $pm->canSendTo($parm['user'])) // check $this->pmPrefs['send_to_class'].
{ {
if(deftrue('FONTAWESOME') && deftrue('BOOTSTRAP')) if(deftrue('FONTAWESOME') && deftrue('BOOTSTRAP'))
{ {
$img = e107::getParser()->toGlyph('fa-paper-plane',''); $img = e107::getParser()->toGlyph($glyph,'');
return "<a class='btn btn-sm btn-default' href='".$url ."'>{$img} ".LAN_PM_35."</a>"; return "<a class='".$class."' href='".$url ."'>{$img} ".LAN_PM_35."</a>";
} }