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

Private Messenger: Fix for replying

Browse Source
This commit is contained in:
Cameron
2016-04-03 17:30:39 -07:00
parent 9db9bd289f
commit c483617c52
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
e107_plugins/pm/pm_shortcodes.php
View File

@@ -120,6 +120,11 @@ if(!class_exists('plugin_pm_pm_shortcodes'))
$userTo = $this->sc_pm_form_touser(); $userTo = $this->sc_pm_form_touser();
$classTo = $this->sc_pm_form_toclass(); $classTo = $this->sc_pm_form_toclass();
if(!empty($this->var['pm_from']))
{
return e107::getForm()->hidden('pm_to', $this->var['pm_from']).$this->var['from_name'];
}
if(deftrue('BOOTSTRAP')) if(deftrue('BOOTSTRAP'))
{ {
@@ -153,9 +158,9 @@ if(!class_exists('plugin_pm_pm_shortcodes'))
// TODO Get rid of e107_handlers/user_select_class.php // TODO Get rid of e107_handlers/user_select_class.php
public function sc_pm_form_touser() public function sc_pm_form_touser()
{ {
if(vartrue($this->var['from_name'])) //TODO What's this? if(vartrue($this->var['from_name']))
{ {
// return "<input type='hidden' name='pm_to' value='{$this->var['from_name']}' />{$this->var['from_name']}"; return "<input type='hidden' name='pm_to' value='{$this->var['pm_from']}' />{$this->var['from_name']}";
} }
// require_once(e_HANDLER.'user_select_class.php'); // require_once(e_HANDLER.'user_select_class.php');
@@ -243,7 +248,7 @@ if(!class_exists('plugin_pm_pm_shortcodes'))
if(isset($_POST['quote'])) if(isset($_POST['quote']))
{ {
$t = time(); $t = time();
$value = "[quote{$t}={$this->var['from_name']}]\n{$this->var['pm_text']}\n[/quote{$t}]\n\n"; $value = "\n\n\n\n\n\n\n[quote{$t}={$this->var['from_name']}]\n".trim($this->var['pm_text'])."[/quote{$t}]";
} }
} }
return "<textarea class='tbox form-control' name='pm_message' cols='60' rows='10' onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this);'>{$value}</textarea>"; return "<textarea class='tbox form-control' name='pm_message' cols='60' rows='10' onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this);'>{$value}</textarea>";
@@ -252,7 +257,13 @@ if(!class_exists('plugin_pm_pm_shortcodes'))
public function sc_pm_emotes() public function sc_pm_emotes()
{ {
// require_once(e_HANDLER.'emote.php'); $active = e107::pref('core','smiley_activate');
if(empty($active))
{
return null;
}
return r_emote(); return r_emote();
} }