1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 13:47:31 +02:00

List-new fixes for chatbox.

This commit is contained in:
Cameron
2016-12-03 13:07:14 -08:00
parent e3adc685ec
commit 6eefc91a9b
5 changed files with 27 additions and 9 deletions

View File

@@ -49,17 +49,18 @@ class list_chatbox_menu
$cb_id = substr($row['cb_nick'] , 0, strpos($row['cb_nick'] , ".")); $cb_id = substr($row['cb_nick'] , 0, strpos($row['cb_nick'] , "."));
$cb_nick = substr($row['cb_nick'] , (strpos($row['cb_nick'] , ".")+1)); $cb_nick = substr($row['cb_nick'] , (strpos($row['cb_nick'] , ".")+1));
$cb_message = ($row['cb_blocked'] ? CHATBOX_L6 : str_replace("<br />", " ", $tp->toHTML($row['cb_message']))); $cb_message = ($row['cb_blocked'] ? CHATBOX_L6 : str_replace("<br />", " ", $tp->toHTML($row['cb_message'])));
$rowheading = $this->parent->parse_heading($cb_message); // $rowheading = $this->parent->parse_heading($cb_message);
//<a href='".e_BASE."user.php?id.$cb_id'>".$cb_nick."</a> //<a href='".e_BASE."user.php?id.$cb_id'>".$cb_nick."</a>
$uparams = array('id' => $cb_id, 'name' => $cb_nick); $uparams = array('id' => $cb_id, 'name' => $cb_nick);
$link = e107::getUrl()->create('user/profile/view', $uparams); $link = e107::getUrl()->create('user/profile/view', $uparams);
$userlink = "<a href='".$link."'>".$cb_nick."</a>"; $userlink = "<a href='".$link."'>".$cb_nick."</a>";
$record['icon'] = $bullet; $record['icon'] = $bullet;
$record['heading'] = $rowheading; // $record['heading'] = $rowheading;
$record['author'] = ($this->parent->settings['author'] ? ($cb_id != 0 ? $userlink : $cb_nick) : ""); $record['author'] = ($this->parent->settings['author'] ? ($cb_id != 0 ? $userlink : $cb_nick) : "");
$record['category'] = ""; $record['category'] = "";
$record['date'] = ($this->parent->settings['date'] ? ($row['cb_datestamp'] ? $this->parent->getListDate($row['cb_datestamp']) : "") : ""); $record['date'] = ($this->parent->settings['date'] ? ($row['cb_datestamp'] ? $this->parent->getListDate($row['cb_datestamp']) : "") : "");
$record['info'] = ""; $record['info'] = $cb_message;
$list_data[] = $record; $list_data[] = $record;
} }

View File

@@ -83,4 +83,6 @@ define("LIST_FORUM_6", "on:");
define("LIST_LAN_1", "no items in"); define("LIST_LAN_1", "no items in");
define("LIST_DOWNLOAD_1", "downloads");
define("LIST_DOWNLOAD_2", "no downloads");
?> ?>

View File

@@ -68,6 +68,7 @@ class listclass
$this->shortcodes = new list_shortcodes(); $this->shortcodes = new list_shortcodes();
$this->shortcodes->rc = $this; $this->shortcodes->rc = $this;
if($mode=='admin') if($mode=='admin')
{ {
require_once($this->plugin_dir."list_admin_class.php"); require_once($this->plugin_dir."list_admin_class.php");
@@ -423,6 +424,7 @@ class listclass
//$this->shortcodes->rc->data = $this->data; //$this->shortcodes->rc->data = $this->data;
//set record variables //set record variables
$this->row = array(); $this->row = array();
$this->row['caption'] = ''; $this->row['caption'] = '';
@@ -797,8 +799,14 @@ class listclass
//display the sections //display the sections
$k=0; $k=0;
// print_a($arr);
foreach($arr as $sect) foreach($arr as $sect)
{ {
$this->shortcodes->plugin = $sect['section'];
if($sect['display'] == '1') if($sect['display'] == '1')
{ {
$sectiontext = $this->displaySection($sect); $sectiontext = $this->displaySection($sect);

View File

@@ -28,6 +28,7 @@ class list_shortcodes
var $e107; var $e107;
var $row; var $row;
var $list_pref; var $list_pref;
public $plugin;
function list_shortcodes() function list_shortcodes()
{ {
@@ -46,6 +47,12 @@ class list_shortcodes
} }
*/ */
function sc_list_css_id()
{
return eHelper::title2sef('list-new-'.$this->plugin, 'dashl');
}
function sc_list_date() function sc_list_date()
{ {
return e107::getParser()->toHTML($this->row['date'], true, ""); return e107::getParser()->toHTML($this->row['date'], true, "");

View File

@@ -57,8 +57,8 @@ $TEMPLATE_LIST_NEW['MENU_NEW_END'] = "
//LIST_MENU_RECENT TEMPLATE ------------------------------------------------------------------------- //LIST_MENU_RECENT TEMPLATE -------------------------------------------------------------------------
$TEMPLATE_LIST_NEW['MENU_RECENT_START'] = " $TEMPLATE_LIST_NEW['MENU_RECENT_START'] = "
<div class='fcaption' style='cursor:pointer;' onclick='expandit(this);'>{LIST_CAPTION}</div> <div class='{LIST_CSS_ID} fcaption' style='cursor:pointer;' onclick='expandit(this);'>{LIST_CAPTION}</div>
<div class='forumheader3' style='margin-bottom:5px; display:{LIST_DISPLAYSTYLE};'>\n"; <div class='{LIST_CSS_ID} forumheader3' style='margin-bottom:5px; display:{LIST_DISPLAYSTYLE};'>\n";
$TEMPLATE_LIST_NEW['MENU_RECENT'] = " $TEMPLATE_LIST_NEW['MENU_RECENT'] = "
<div> <div>
{LIST_ICON} {LIST_DATE} {LIST_HEADING} {LIST_AUTHOR} {LIST_CATEGORY} {LIST_ICON} {LIST_DATE} {LIST_HEADING} {LIST_AUTHOR} {LIST_CATEGORY}
@@ -69,8 +69,8 @@ $TEMPLATE_LIST_NEW['MENU_RECENT_END'] = "
//PAGE TEMPLATE ------------------------------------------------------------------------- //PAGE TEMPLATE -------------------------------------------------------------------------
$TEMPLATE_LIST_NEW['PAGE_RECENT_START'] = " $TEMPLATE_LIST_NEW['PAGE_RECENT_START'] = "
<div class='fcaption' style='cursor:pointer;' onclick='expandit(this);'>{LIST_CAPTION}</div> <div class='{LIST_CSS_ID} fcaption' style='cursor:pointer;' onclick='expandit(this);'>{LIST_CAPTION}</div>
<div class='forumheader3' style='margin-bottom:10px; display:{LIST_DISPLAYSTYLE};'>\n"; <div class='{LIST_CSS_ID} forumheader3' style='margin-bottom:10px; display:{LIST_DISPLAYSTYLE};'>\n";
$TEMPLATE_LIST_NEW['PAGE_RECENT'] = " $TEMPLATE_LIST_NEW['PAGE_RECENT'] = "
<div> <div>
{LIST_ICON} {LIST_DATE} {LIST_HEADING} {LIST_AUTHOR} {LIST_CATEGORY} {LIST_INFO} {LIST_ICON} {LIST_DATE} {LIST_HEADING} {LIST_AUTHOR} {LIST_CATEGORY} {LIST_INFO}
@@ -81,8 +81,8 @@ $TEMPLATE_LIST_NEW['PAGE_RECENT_END'] = "
//NEW TEMPLATE ------------------------------------------------------------------------- //NEW TEMPLATE -------------------------------------------------------------------------
$TEMPLATE_LIST_NEW['PAGE_NEW_START'] = " $TEMPLATE_LIST_NEW['PAGE_NEW_START'] = "
<div class='fcaption' style='cursor:pointer;' onclick='expandit(this);'>{LIST_CAPTION}</div> <div class='{LIST_CSS_ID} fcaption' style='cursor:pointer;' onclick='expandit(this);'>{LIST_CAPTION}</div>
<div class='forumheader3' style='margin-bottom:10px; display:{LIST_DISPLAYSTYLE};'>\n"; <div class='{LIST_CSS_ID} forumheader3' style='margin-bottom:10px; display:{LIST_DISPLAYSTYLE};'>\n";
$TEMPLATE_LIST_NEW['PAGE_NEW'] = " $TEMPLATE_LIST_NEW['PAGE_NEW'] = "
<div> <div>
{LIST_ICON} {LIST_DATE} {LIST_HEADING} {LIST_AUTHOR} {LIST_CATEGORY} {LIST_INFO} {LIST_ICON} {LIST_DATE} {LIST_HEADING} {LIST_AUTHOR} {LIST_CATEGORY} {LIST_INFO}