[xoops-svn] SF.net SVN: xoops-svn:[11826] XoopsModules/lexikon/trunk/lexikon

[<be...@us...>]

Revision: 11826
          http://sourceforge.net/p/xoops/svn/11826
Author:   beckmi
Date:     2013-07-11 22:26:24 +0000 (Thu, 11 Jul 2013)
Log Message:
-----------
Updating to 1.5.1 Final

Modified Paths:
--------------
    XoopsModules/lexikon/trunk/lexikon/admin/category.php
    XoopsModules/lexikon/trunk/lexikon/docs/changelog.txt
    XoopsModules/lexikon/trunk/lexikon/docs/credits.txt
    XoopsModules/lexikon/trunk/lexikon/xoops_version.php

Modified: XoopsModules/lexikon/trunk/lexikon/admin/category.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/category.php	2013-07-10 19:53:48 UTC (rev 11825)
+++ XoopsModules/lexikon/trunk/lexikon/admin/category.php	2013-07-11 22:26:24 UTC (rev 11826)
@@ -100,7 +100,8 @@
                 //while ( list( $categoryID, $name, $description, $total, $weight, ) = $xoopsDB -> fetchrow( $resultC2 ) )
             {
                 $name = $myts -> htmlSpecialChars( $name );
-                $description = $myts -> htmlSpecialChars(xoops_substr( strip_tags( $description ),0,60));
+//                $description = $myts -> htmlSpecialChars(xoops_substr( strip_tags( $description ),0,60));
+                $description = strip_tags(htmlspecialchars_decode($description));
                 $modify = "<a href='category.php?op=mod&categoryID=" . $categoryID . "'><img src=" . $pathIcon16."/edit.png width='16' height='16' ALT='"._AM_LEXIKON_EDITCAT."'></a>";
                 $delete = "<a href='category.php?op=del&categoryID=" . $categoryID . "'><img src=" . $pathIcon16."/delete.png  width='16' height='16' ALT='"._AM_LEXIKON_DELETECAT."'></a>";
 

Modified: XoopsModules/lexikon/trunk/lexikon/docs/changelog.txt
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/docs/changelog.txt	2013-07-10 19:53:48 UTC (rev 11825)
+++ XoopsModules/lexikon/trunk/lexikon/docs/changelog.txt	2013-07-11 22:26:24 UTC (rev 11826)
@@ -1,4 +1,11 @@
 ---------------------------------------
+1.51 Final  2013-07-11
+---------------------------------------
+
+- changed to standard Editor selection
+- added removal of HTML special characters/tags in Category list
+
+---------------------------------------
 1.51 Beta 2  2013-04-26
 ---------------------------------------
 
@@ -6,7 +13,7 @@
 - changed tables look & feel to follow XOOPS Standards
 - extracted summary to Dashboard
 - fixed deprecated notices
-- 
+-
 
 ---------------------------------------
 1.51 Beta 1  2013-02-27

Modified: XoopsModules/lexikon/trunk/lexikon/docs/credits.txt
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/docs/credits.txt	2013-07-10 19:53:48 UTC (rev 11825)
+++ XoopsModules/lexikon/trunk/lexikon/docs/credits.txt	2013-07-11 22:26:24 UTC (rev 11826)
@@ -1,9 +1,11 @@
 Credits and Thanks
 -----------------------------------------------------------------------
-This module is based on his module Wordbook written by hsalazar. 
+This module has been developed by Yerres.
+
+It is based on Wordbook module written by hsalazar.
 Wordbook  again is based on Soapbox (by him as well) which is 
 in turn based on Catzwolf's module called WF-FAQ.
-Thanks to Herv\xE9 Instant-Zero, Eric Juden & ackbarr Project XHelp, 
+Thanks to Herve Instant-Zero, Eric Juden & ackbarr Project XHelp,
 phppp, marcan The Smartfactory, frankblack, Zoullou, Aiba Kanpyo.net, 
 WF-Downloads Team, tcnet, BitC3R0 Xoops-Mexico and many others. 
 Of course thanks to anyone else who has contributed to this module 

Modified: XoopsModules/lexikon/trunk/lexikon/xoops_version.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/xoops_version.php	2013-07-10 19:53:48 UTC (rev 11825)
+++ XoopsModules/lexikon/trunk/lexikon/xoops_version.php	2013-07-11 22:26:24 UTC (rev 11826)
@@ -136,7 +136,7 @@
     $myts = & MyTextSanitizer ::getInstance();
     $sql = $xoopsDB->query( "SELECT categoryID, name FROM " . $xoopsDB->prefix( "lxcategories" ) . " ORDER BY weight ASC" );
     while ( list( $categoryID, $name ) = $xoopsDB->fetchRow( $sql ) ) {
-		if ($gperm_handler->checkRight('lexikon_view', $catID, $groups, $lexikon->getVar('mid'))) {
+		if ($gperm_handler->checkRight('lexikon_view', $categoryID, $groups, $lexikon->getVar('mid'))) {
 			$name = $myts->htmlSpecialChars($name);
 			$categoryID = intval($categoryID);
 			$modversion['sub'][$i]['name'] = $name;
@@ -451,16 +451,19 @@
 	'default' => 'dhtml');
 */
 // WYSIWYG - Form-Options for XOOPS
-include_once XOOPS_ROOT_PATH . "/class/xoopslists.php";
-$modversion['config'][] = array(
-	'name' 			=> 'form_options',
-	'title' 		=> '_MI_LEXIKON_FORM_OPTIONS',
-	'description' 	=> '_MI_LEXIKON_FORM_OPTIONSDSC',
-	'formtype' 		=> 'select',
-	'valuetype' 	=> 'text',
-	'options' 		=> XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . "/class/xoopseditor"),
-	'default' => 'dhtml');
+xoops_load('XoopsEditorHandler');
+$editor_handler = XoopsEditorHandler::getInstance();
+$editorList = array_flip($editor_handler->getList());
 
+$modversion['config'][] = array('name'        => 'form_options',
+                                'title'       => '_MI_LEXIKON_FORM_OPTIONS',
+                                'description' => '_MI_LEXIKON_FORM_OPTIONSDSC',
+                                'formtype'    => 'select',
+                                'valuetype'   => 'text',
+                                'options'     => $editorList,
+                                'default'     => 'dhtmltextarea');
+
+
 $modversion['config'][] = array(
 	'name' 			=> 'wysiwyg_guests',
 	'title' 		=> '_MI_LEXIKON_EDIGUEST',