Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12352] XoopsModules/lexikon/trunk/lexikon
|
From: <ce...@us...> - 2014-03-08 06:23:03
|
Revision: 12352
http://sourceforge.net/p/xoops/svn/12352
Author: cesag
Date: 2014-03-08 06:22:58 +0000 (Sat, 08 Mar 2014)
Log Message:
-----------
Fixed various bugs by lionhell
Modified Paths:
--------------
XoopsModules/lexikon/trunk/lexikon/admin/admin_header.php
XoopsModules/lexikon/trunk/lexikon/admin/entry.php
XoopsModules/lexikon/trunk/lexikon/admin/importwordbook.php
XoopsModules/lexikon/trunk/lexikon/admin/main.php
XoopsModules/lexikon/trunk/lexikon/admin/permissions.php
XoopsModules/lexikon/trunk/lexikon/admin/preferences.php
XoopsModules/lexikon/trunk/lexikon/admin/statistics.php
XoopsModules/lexikon/trunk/lexikon/category.php
XoopsModules/lexikon/trunk/lexikon/docs/changelog.txt
XoopsModules/lexikon/trunk/lexikon/include/storyform.inc.php
XoopsModules/lexikon/trunk/lexikon/language/english/admin.php
XoopsModules/lexikon/trunk/lexikon/sql/mysql.sql
Modified: XoopsModules/lexikon/trunk/lexikon/admin/admin_header.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/admin_header.php 2014-03-08 06:02:32 UTC (rev 12351)
+++ XoopsModules/lexikon/trunk/lexikon/admin/admin_header.php 2014-03-08 06:22:58 UTC (rev 12352)
@@ -32,7 +32,8 @@
//include_once XOOPS_ROOT_PATH."/modules/lexikon/include/functions.php";
include_once dirname(dirname(__FILE__)). "/admin/functions.php";
include_once XOOPS_ROOT_PATH."/kernel/module.php";
-include_once XOOPS_ROOT_PATH."/class/xoopstree.php";
+//include_once XOOPS_ROOT_PATH."/class/xoopstree.php"; -- LionHell
+include_once XOOPS_ROOT_PATH."/modules/lexikon/class/xoopstree.php"; // -- LionHell
include_once XOOPS_ROOT_PATH."/class/xoopslists.php";
include_once XOOPS_ROOT_PATH."/class/xoopsformloader.php";
Modified: XoopsModules/lexikon/trunk/lexikon/admin/entry.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/entry.php 2014-03-08 06:02:32 UTC (rev 12351)
+++ XoopsModules/lexikon/trunk/lexikon/admin/entry.php 2014-03-08 06:22:58 UTC (rev 12352)
@@ -213,7 +213,8 @@
$sform -> setExtra( 'enctype="multipart/form-data"' );
// Category selector
if ($xoopsModuleConfig['multicats'] == 1) {
- $mytree = new XoopsTree( $xoopsDB->prefix( "lxcategories" ), "categoryID" , "0" );
+ // $mytree = new XoopsTree( $xoopsDB->prefix( "lxcategories" ), "categoryID" , "0" );
+ $mytree = new LexikonTree( $xoopsDB->prefix( "lxcategories" ), "categoryID" , "0" );
$categoryselect = new XoopsFormSelect(_AM_LEXIKON_CATNAME, 'categoryID', $categoryID);
$tbl = array();
$tbl = $mytree->getChildTreeArray(0,'name');
@@ -349,8 +350,13 @@
$smiley = isset($_POST['smiley']) ? intval($_POST['smiley']) : intval($_GET['smiley']);
$xcodes = isset($_POST['xcodes']) ? intval($_POST['xcodes']) : intval($_GET['xcodes']);
$offline = isset($_POST['offline']) ? intval($_POST['offline']) : intval($_GET['offline']);
- $init= $myts->addslashes($_POST['init']);
+ // $init= $myts->addslashes($_POST['init']); -- LionHell supprim\xE9 pour auto cf ligne 354
$term = $myts->addSlashes(xoops_trim($_POST['term']));
+ // LionHell pour initiale automatique
+ $init = substr($term, 0, 1);
+ $init = preg_match("/[a-zA-Z]/", $init) ? strtoupper($init) : '#';
+ // Fin LionHell
+
//$definition = $myts -> xoopsCodeDecode($_POST['definition'], $allowimage = 1);
//$ref = isset($_POST['ref']) ? $myts->addSlashes($_POST['ref']) : '';
$definition = $myts -> xoopsCodeDecode($myts->censorString($_POST['definition']), $allowimage = 1);
Modified: XoopsModules/lexikon/trunk/lexikon/admin/importwordbook.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/importwordbook.php 2014-03-08 06:02:32 UTC (rev 12351)
+++ XoopsModules/lexikon/trunk/lexikon/admin/importwordbook.php 2014-03-08 06:22:58 UTC (rev 12352)
@@ -276,7 +276,7 @@
<input type='button' name='cancel' value='"._CANCEL."' onclick='javascript:history.go(-1);'></td>";
echo "</TR></table><br />\n";
} else {
- echo "<BR><B><font color='red'>Module Wordbook not found on this site.</font></B><BR><A HREF='index.php'>Back</A><P>";
+ echo "<BR><B><font color='red'>"._AM_LEXIKON_MODULEWORDBOOKNOTFOUND."</font></B><BR><A HREF='index.php'>"._AM_LEXIKON_BACK."</A><P>";
}
xoops_cp_footer();
Modified: XoopsModules/lexikon/trunk/lexikon/admin/main.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/main.php 2014-03-08 06:02:32 UTC (rev 12351)
+++ XoopsModules/lexikon/trunk/lexikon/admin/main.php 2014-03-08 06:22:58 UTC (rev 12352)
@@ -78,7 +78,8 @@
//echo "<br /><br />";
//--- category dropdown
if ($xoopsModuleConfig['multicats'] == 1) {
- $cattree = new XoopsTree( $xoopsDB->prefix("lxcategories"), "categoryID", "0" );
+ // $cattree = new XoopsTree( $xoopsDB->prefix("lxcategories"), "categoryID", "0" );
+ $cattree = new LexikonTree( $xoopsDB->prefix("lxcategories"), "categoryID", "0" );
echo "<table class='outer' width='100%'><tr ><td colspan=\"2\" class='even'><strong>" . _AM_LEXIKON_INVENTORY . "</strong></td></tr>";
echo "<tr class=\"odd\" ><td width=\"30%\" align=\"left\">";
echo '<form method=get action=\"category.php\">';
Modified: XoopsModules/lexikon/trunk/lexikon/admin/permissions.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/permissions.php 2014-03-08 06:02:32 UTC (rev 12351)
+++ XoopsModules/lexikon/trunk/lexikon/admin/permissions.php 2014-03-08 06:22:58 UTC (rev 12352)
@@ -27,7 +27,7 @@
// adapted from News 1.5
include( "admin_header.php" );
-include_once XOOPS_ROOT_PATH.'/class/xoopstree.php';
+include_once XOOPS_ROOT_PATH.'/modules/lexikon/class/xoopstree.php'; // -- LionHell
include_once XOOPS_ROOT_PATH."/class/xoopslists.php";
include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
$myts =& MyTextSanitizer::getInstance();
@@ -78,7 +78,8 @@
}
$modid = $xoopsModule->getVar('mid');
$permform = new XoopsGroupPermForm($title, $modid, $perm_name, $permdesc, "admin/permissions.php");
-$catstree = new XoopsTree($xoopsDB->prefix("lxcategories"), "categoryID", "");
+// $catstree = new XoopsTree($xoopsDB->prefix("lxcategories"), "categoryID", "");
+$catstree = new LexikonTree($xoopsDB->prefix("lxcategories"), "categoryID", "");
$catsresult=$xoopsDB->query("SELECT categoryID, name FROM ".$xoopsDB->prefix("lxcategories")." ORDER BY weight");
while($myrow = $xoopsDB->fetchArray($catsresult)) {
$catid = $myrow['categoryID'];
Modified: XoopsModules/lexikon/trunk/lexikon/admin/preferences.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/preferences.php 2014-03-08 06:02:32 UTC (rev 12351)
+++ XoopsModules/lexikon/trunk/lexikon/admin/preferences.php 2014-03-08 06:22:58 UTC (rev 12352)
@@ -9,7 +9,7 @@
include_once "../../../mainfile.php";
include_once XOOPS_ROOT_PATH . "/kernel/module.php";
-include_once XOOPS_ROOT_PATH . "/class/xoopstree.php";
+include_once XOOPS_ROOT_PATH . "/modules/lexikon/class/xoopstree.php"; // -- LionHell
include_once XOOPS_ROOT_PATH . "/class/xoopslists.php";
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
include_once XOOPS_ROOT_PATH . "/class/xoopsformloader.php";
Modified: XoopsModules/lexikon/trunk/lexikon/admin/statistics.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/statistics.php 2014-03-08 06:02:32 UTC (rev 12351)
+++ XoopsModules/lexikon/trunk/lexikon/admin/statistics.php 2014-03-08 06:22:58 UTC (rev 12352)
@@ -43,6 +43,7 @@
global $xoopsModule, $xoopsConfig, $xoopsModuleConfig;
xoops_cp_header();
$myts =& MyTextSanitizer::getInstance();
+ xoops_load('XoopsUserUtility'); // LionHell
// lx_adminMenu(3, _INFO);
@@ -85,10 +86,10 @@
$totals[1]+=$views;
$totals[2]+=$offline;
$class = ($class == 'even') ? 'odd' : 'even';
- printf("<tr class='".$class."'><td align='left'><a href='%s' target ='_blank'>%s</a></td><td align='right'>%u</td><td align='right'>%u</td><td align='right'>%u</td><td align='right'>%u</td></tr>\n",$url,$myts->displayTarea($data['name']),$terms,$views,$offline,$authors);
+ printf("<tr class='".$class."'><td align='center'><a href='%s' target ='_blank'>%s</a></td><td align='center'>%u</td><td align='center'>%u</td><td align='center'>%u</td><td align='center'>%u</td></tr>\n",$url,$myts->displayTarea($data['name']),$terms,$views,$offline,$authors);
}
$class = ($class == 'even') ? 'odd' : 'even';
- printf("<tr class='".$class."'><td align='center'><b>%s</b></td><td align='right'><b>%u</b></td><td align='right'><b>%u</b></td><td align='right'><b>%u</b></td><td> </td>\n",_AM_LEXIKON_STATS2,$totals[0],$totals[1],$totals[2]);
+ printf("<tr class='".$class."'><td align='center'><b>%s</b></td><td align='center'><b>%u</b></td><td align='center'><b>%u</b></td><td align='center'><b>%u</b></td><td> </td>\n",_AM_LEXIKON_STATS2,$totals[0],$totals[1],$totals[2]);
echo '</table></div><br /><br /><br />';
// Second part of the stats, everything about reads
Modified: XoopsModules/lexikon/trunk/lexikon/category.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/category.php 2014-03-08 06:02:32 UTC (rev 12351)
+++ XoopsModules/lexikon/trunk/lexikon/category.php 2014-03-08 06:22:58 UTC (rev 12352)
@@ -129,7 +129,7 @@
$singlecat['dir'] = $xoopsModule->dirname();
$singlecat['id'] = $categoryID;
$singlecat['name'] = $myts -> htmlSpecialChars( $name );
- $singlecat['description'] = $myts -> displayTarea( $description, 1, 1, 1, 1, 1 );
+ $singlecat['description'] = html_entity_decode($myts -> displayTarea( $description, 1, 1, 1, 1, 1 )); // LionHell ajout html_entity ...
$singlecat['image'] = $myts -> htmlSpecialChars( $logourl );
// Total entries in this category
Modified: XoopsModules/lexikon/trunk/lexikon/docs/changelog.txt
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/docs/changelog.txt 2014-03-08 06:02:32 UTC (rev 12351)
+++ XoopsModules/lexikon/trunk/lexikon/docs/changelog.txt 2014-03-08 06:22:58 UTC (rev 12352)
@@ -1,4 +1,25 @@
---------------------------------------
+1.51.8 2014-03-07
+---------------------------------------
+
+- Fixed XoopsTree deprecated, following Trabis dirty method found on xoops.org
+
+Remaining bugs: Tags keywords not saved on item creation. Must be re-entered on item edit.
+
+---------------------------------------
+1.51.7 2014-03-07
+---------------------------------------
+
+- Filter by letter (initial) fixed.
+- French translation by LionHell.
+- Replaced text by language constant in importwordbook.php
+- Category image by default fixed.
+- HTML bug on category startpage fixed.
+- XoopsUserUtlity bug in statistics.php fixed.
+
+Remaining bugs: XoopsTree deprecated , tags keywords not saved on item creation. Must be re-entered on item edit.
+
+---------------------------------------
1.51 Final 2013-07-11
---------------------------------------
Modified: XoopsModules/lexikon/trunk/lexikon/include/storyform.inc.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/include/storyform.inc.php 2014-03-08 06:02:32 UTC (rev 12351)
+++ XoopsModules/lexikon/trunk/lexikon/include/storyform.inc.php 2014-03-08 06:22:58 UTC (rev 12352)
@@ -11,13 +11,13 @@
global $term, $definition, $ref, $url, $xoopsUser, $xoopsModule, $xoopsModuleConfig;
-include_once XOOPS_ROOT_PATH . "/class/xoopstree.php";
+include_once XOOPS_ROOT_PATH . "/modules/lexikon/class/xoopstree.php"; // -- LionHell
include XOOPS_ROOT_PATH . "/class/xoopslists.php";
include XOOPS_ROOT_PATH . "/class/xoopsformloader.php";
$guesteditoruse = $xoopsModuleConfig['wysiwyg_guests'];
$myts =& MyTextSanitizer::getInstance();
-$mytree = new XoopsTree( $xoopsDB -> prefix( "lxcategories" ), "categoryID", "0" );
+$mytree = new LexikonTree( $xoopsDB -> prefix( "lxcategories" ), "categoryID", "0" );
$sform = new XoopsThemeForm( _MD_LEXIKON_SUB_SMNAME, "storyform", xoops_getenv( 'PHP_SELF' ) );
if ($xoopsModuleConfig['multicats'] == '1') {
@@ -26,7 +26,7 @@
$gperm_handler =& xoops_gethandler('groupperm');
$allowed_cats =& $gperm_handler->getItemIds("lexikon_submit", $groups, $xoopsModule->getVar('mid'));
if (is_array($allowed_cats)) {
- $mytree = new XoopsTree( $xoopsDB->prefix( "lxcategories" ), "categoryID" , "0" );
+ $mytree = new LexikonTree( $xoopsDB->prefix( "lxcategories" ), "categoryID" , "0" );
$categoryselect = new XoopsFormSelect(_MD_LEXIKON_ENTRYCATEGORY, 'categoryID', $allowed_cats);
$tbl = array();
$tbl = $mytree->getChildTreeArray(0,'name');
Modified: XoopsModules/lexikon/trunk/lexikon/language/english/admin.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/language/english/admin.php 2014-03-08 06:02:32 UTC (rev 12351)
+++ XoopsModules/lexikon/trunk/lexikon/language/english/admin.php 2014-03-08 06:22:58 UTC (rev 12352)
@@ -16,6 +16,7 @@
define("_AM_LEXIKON_AUTHENTRY","Authorize submission");
define("_AM_LEXIKON_AUTHOR","Author");
define("_AM_LEXIKON_AUTHORIZE","Authorize");
+define("_AM_LEXIKON_BACK","Back");
define("_AM_LEXIKON_BACK2IDX","Cancelled. Taking you back to the index");
define("_AM_LEXIKON_BLOCK"," Add to entries block?");
define("_AM_LEXIKON_BLOCKS","Blocks");
@@ -154,6 +155,7 @@
define("_AM_LEXIKON_IMPORTDELWB","delete entries before Import ?");
define("_AM_LEXIKON_OTHERMODS","To select the module you wish to import please click the corresponding image.");
define("_AM_LEXIKON_NOOTHERMODS","No corresponding modules could be located!");
+define("_AM_LEXIKON_MODULEWORDBOOKNOTFOUND","Module Wordbook not found on this site.");
// upgrade
define("_AM_LEXIKON_PLEASE_UPGRADE","<font color='#FF0000'>Please update the module !</font></a>");
Modified: XoopsModules/lexikon/trunk/lexikon/sql/mysql.sql
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/sql/mysql.sql 2014-03-08 06:02:32 UTC (rev 12351)
+++ XoopsModules/lexikon/trunk/lexikon/sql/mysql.sql 2014-03-08 06:22:58 UTC (rev 12352)
@@ -27,7 +27,7 @@
UNIQUE KEY columnID (`categoryID`)
) ENGINE=MyISAM;
-INSERT INTO lxcategories (categoryID, name, description, total, weight, logourl ) VALUES (1, 'Xoops', 'XOOPS is an extensible, OO (Object Oriented), easy to use dynamic web content management system written in PHP. XOOPS is the ideal tool for developing small to large dynamic community websites, intra company portals, corporate portals, weblogs and much more.', 0, 1, '');
+INSERT INTO lxcategories (categoryID, name, description, total, weight, logourl ) VALUES (1, 'Xoops', 'XOOPS est un système de gestion de contenu sur le web écrit en PHP, extensible, orienté objet et facile à utiliser. XOOPS est l outil idéal pour développer des sites web communautaires petits ou grands, des portails intranet pour les sociétés ou corporations, des weblogs et plus encore.', 0, 1, '');
#
# Dumping data for table `lxcategories`
|
