diff --git a/e107_plugins/chatbox_menu/e_list.php b/e107_plugins/chatbox_menu/e_list.php index 08f97702f..54e74a2c0 100644 --- a/e107_plugins/chatbox_menu/e_list.php +++ b/e107_plugins/chatbox_menu/e_list.php @@ -49,17 +49,18 @@ class list_chatbox_menu $cb_id = substr($row['cb_nick'] , 0, strpos($row['cb_nick'] , ".")); $cb_nick = substr($row['cb_nick'] , (strpos($row['cb_nick'] , ".")+1)); $cb_message = ($row['cb_blocked'] ? CHATBOX_L6 : str_replace("
", " ", $tp->toHTML($row['cb_message']))); - $rowheading = $this->parent->parse_heading($cb_message); + // $rowheading = $this->parent->parse_heading($cb_message); + //".$cb_nick." $uparams = array('id' => $cb_id, 'name' => $cb_nick); $link = e107::getUrl()->create('user/profile/view', $uparams); $userlink = "".$cb_nick.""; $record['icon'] = $bullet; - $record['heading'] = $rowheading; + // $record['heading'] = $rowheading; $record['author'] = ($this->parent->settings['author'] ? ($cb_id != 0 ? $userlink : $cb_nick) : ""); $record['category'] = ""; $record['date'] = ($this->parent->settings['date'] ? ($row['cb_datestamp'] ? $this->parent->getListDate($row['cb_datestamp']) : "") : ""); - $record['info'] = ""; + $record['info'] = $cb_message; $list_data[] = $record; } diff --git a/e107_plugins/list_new/languages/English.php b/e107_plugins/list_new/languages/English.php index aa0d3efc3..84946f903 100644 --- a/e107_plugins/list_new/languages/English.php +++ b/e107_plugins/list_new/languages/English.php @@ -83,4 +83,6 @@ define("LIST_FORUM_6", "on:"); define("LIST_LAN_1", "no items in"); +define("LIST_DOWNLOAD_1", "downloads"); +define("LIST_DOWNLOAD_2", "no downloads"); ?> \ No newline at end of file diff --git a/e107_plugins/list_new/list_class.php b/e107_plugins/list_new/list_class.php index e4d99c51b..b932be74d 100644 --- a/e107_plugins/list_new/list_class.php +++ b/e107_plugins/list_new/list_class.php @@ -68,6 +68,7 @@ class listclass $this->shortcodes = new list_shortcodes(); $this->shortcodes->rc = $this; + if($mode=='admin') { require_once($this->plugin_dir."list_admin_class.php"); @@ -423,6 +424,7 @@ class listclass //$this->shortcodes->rc->data = $this->data; + //set record variables $this->row = array(); $this->row['caption'] = ''; @@ -797,8 +799,14 @@ class listclass //display the sections $k=0; + + // print_a($arr); + foreach($arr as $sect) { + + $this->shortcodes->plugin = $sect['section']; + if($sect['display'] == '1') { $sectiontext = $this->displaySection($sect); diff --git a/e107_plugins/list_new/list_shortcodes.php b/e107_plugins/list_new/list_shortcodes.php index e9dde9d16..8b6197b5f 100644 --- a/e107_plugins/list_new/list_shortcodes.php +++ b/e107_plugins/list_new/list_shortcodes.php @@ -28,6 +28,7 @@ class list_shortcodes var $e107; var $row; var $list_pref; + public $plugin; 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() { return e107::getParser()->toHTML($this->row['date'], true, ""); diff --git a/e107_plugins/list_new/list_template.php b/e107_plugins/list_new/list_template.php index 923fb7da0..739e0e263 100644 --- a/e107_plugins/list_new/list_template.php +++ b/e107_plugins/list_new/list_template.php @@ -57,8 +57,8 @@ $TEMPLATE_LIST_NEW['MENU_NEW_END'] = " //LIST_MENU_RECENT TEMPLATE ------------------------------------------------------------------------- $TEMPLATE_LIST_NEW['MENU_RECENT_START'] = " -
{LIST_CAPTION}
-
\n"; +
{LIST_CAPTION}
+
\n"; $TEMPLATE_LIST_NEW['MENU_RECENT'] = "
{LIST_ICON} {LIST_DATE} {LIST_HEADING} {LIST_AUTHOR} {LIST_CATEGORY} @@ -69,8 +69,8 @@ $TEMPLATE_LIST_NEW['MENU_RECENT_END'] = " //PAGE TEMPLATE ------------------------------------------------------------------------- $TEMPLATE_LIST_NEW['PAGE_RECENT_START'] = " -
{LIST_CAPTION}
-
\n"; +
{LIST_CAPTION}
+
\n"; $TEMPLATE_LIST_NEW['PAGE_RECENT'] = "
{LIST_ICON} {LIST_DATE} {LIST_HEADING} {LIST_AUTHOR} {LIST_CATEGORY} {LIST_INFO} @@ -81,8 +81,8 @@ $TEMPLATE_LIST_NEW['PAGE_RECENT_END'] = " //NEW TEMPLATE ------------------------------------------------------------------------- $TEMPLATE_LIST_NEW['PAGE_NEW_START'] = " -
{LIST_CAPTION}
-
\n"; +
{LIST_CAPTION}
+
\n"; $TEMPLATE_LIST_NEW['PAGE_NEW'] = "
{LIST_ICON} {LIST_DATE} {LIST_HEADING} {LIST_AUTHOR} {LIST_CATEGORY} {LIST_INFO}