Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[11117] XoopsModules/lexikon/trunk/lexikon
|
From: <be...@us...> - 2013-02-27 09:41:54
|
Revision: 11117
http://sourceforge.net/p/xoops/svn/11117
Author: beckmi
Date: 2013-02-27 09:41:47 +0000 (Wed, 27 Feb 2013)
Log Message:
-----------
Version 1.51 Beta 1: Updating to XOOPS 2.5.5 Admin GUI
Modified Paths:
--------------
XoopsModules/lexikon/trunk/lexikon/admin/about.php
XoopsModules/lexikon/trunk/lexikon/admin/admin_header.php
XoopsModules/lexikon/trunk/lexikon/admin/category.php
XoopsModules/lexikon/trunk/lexikon/admin/entry.php
XoopsModules/lexikon/trunk/lexikon/admin/functions.php
XoopsModules/lexikon/trunk/lexikon/admin/importdictionary.php
XoopsModules/lexikon/trunk/lexikon/admin/importglossaire.php
XoopsModules/lexikon/trunk/lexikon/admin/importwiwimod.php
XoopsModules/lexikon/trunk/lexikon/admin/importwordbook.php
XoopsModules/lexikon/trunk/lexikon/admin/importxwords.php
XoopsModules/lexikon/trunk/lexikon/admin/index.php
XoopsModules/lexikon/trunk/lexikon/admin/menu.php
XoopsModules/lexikon/trunk/lexikon/admin/myblocksadmin.php
XoopsModules/lexikon/trunk/lexikon/admin/myblocksadmin2.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/admin/submissions.php
XoopsModules/lexikon/trunk/lexikon/include/blocksadmin.inc.php
XoopsModules/lexikon/trunk/lexikon/include/comment_functions.php
XoopsModules/lexikon/trunk/lexikon/include/functions.php
XoopsModules/lexikon/trunk/lexikon/include/sitemap.plugin.php
XoopsModules/lexikon/trunk/lexikon/include/waiting.plugin.php
XoopsModules/lexikon/trunk/lexikon/language/english/admin.php
XoopsModules/lexikon/trunk/lexikon/language/english/main.php
XoopsModules/lexikon/trunk/lexikon/language/english/modinfo.php
XoopsModules/lexikon/trunk/lexikon/language/german/admin.php
XoopsModules/lexikon/trunk/lexikon/rss.php
XoopsModules/lexikon/trunk/lexikon/xoops_version.php
Added Paths:
-----------
XoopsModules/lexikon/trunk/lexikon/admin/admin_footer.php
XoopsModules/lexikon/trunk/lexikon/docs/
XoopsModules/lexikon/trunk/lexikon/docs/Backup-credits.txt
XoopsModules/lexikon/trunk/lexikon/docs/Backup-readme.txt
XoopsModules/lexikon/trunk/lexikon/docs/changelog.txt
XoopsModules/lexikon/trunk/lexikon/docs/credits.txt
XoopsModules/lexikon/trunk/lexikon/docs/index.html
XoopsModules/lexikon/trunk/lexikon/docs/install.txt
XoopsModules/lexikon/trunk/lexikon/docs/lang_diff.txt
XoopsModules/lexikon/trunk/lexikon/docs/license.txt
XoopsModules/lexikon/trunk/lexikon/docs/readme.txt
XoopsModules/lexikon/trunk/lexikon/language/english/help/
XoopsModules/lexikon/trunk/lexikon/language/english/help/help.html
XoopsModules/lexikon/trunk/lexikon/language/english/help/index.html
XoopsModules/lexikon/trunk/lexikon/language/german/help/
XoopsModules/lexikon/trunk/lexikon/language/german/help/help.html
XoopsModules/lexikon/trunk/lexikon/language/german/help/index.html
Removed Paths:
-------------
XoopsModules/lexikon/trunk/lexikon/changelog.txt
XoopsModules/lexikon/trunk/lexikon/gpl.txt
XoopsModules/lexikon/trunk/lexikon/lang.diff
XoopsModules/lexikon/trunk/lexikon/readme.txt
Modified: XoopsModules/lexikon/trunk/lexikon/admin/about.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/about.php 2013-02-27 09:15:29 UTC (rev 11116)
+++ XoopsModules/lexikon/trunk/lexikon/admin/about.php 2013-02-27 09:41:47 UTC (rev 11117)
@@ -1,159 +1,30 @@
-<?php
-/**
- * $Id: about.php v 1.5 23 August 2004 hsalazar Exp $
- * Module: Lexikon - glossary module
- * Version: v 1.5
- * Release Date:
- * Author: hsalazar
- * License: GNU
- */
-
-include 'admin_header.php';
-$myts =& MyTextSanitizer::getInstance();
-
-xoops_cp_header();
-
-$module_handler =& xoops_gethandler('module');
-$versioninfo =& $module_handler->get($xoopsModule->getVar('mid'));
-echo "
- <style type=\"text/css\">
- label,text {
- display: block;
- float: left;
- margin-bottom: 2px;
- margin-top: 2px;
- }
- label {
- text-align: right;
- width: 150px;
- padding-right: 20px;
- }
- br {
- clear: left;
- }
-</style>";
-/**
- * display module info
- */
-
-function about() {
- $op = 'default';
- global $xoopsConfig, $xoopsModuleConfig, $xoopsModule, $versioninfo;
-
- echo "<br clear=\"all\" />";
- echo "<img src='".XOOPS_URL."/modules/".$xoopsModule->dirname()."/".$versioninfo->getInfo('image')."' alt='' hspace='0' vspace='0' align='left' style='margin-right: 10px; '>";
- echo "<div style='margin-top: 10px; color: #33538e; margin-bottom: 4px; font-size: 18px; line-height: 18px; font-weight: bold; display: block;'>".$versioninfo->getInfo('name')." v. ".$versioninfo->getInfo('version')."</div>";
- if ($versioninfo->getInfo('author_realname') != '') {
- $author_name = $versioninfo->getInfo('author')." (".$versioninfo->getInfo('author_realname').")";
- } else {
- $author_name = $versioninfo->getInfo('author');
- }
- echo "<br clear=\"all\" /><BR />";
-
- echo "<div style='padding: 8px;'>";
- echo "<table width='100%' cellspacing='2' cellpadding='2' border='0' class='outer'>";
- echo "<tr>";
- echo "<td colspan='2' class='even' align='left'><b>" . $versioninfo->getInfo( 'name' ) . " " . $versioninfo->getInfo( 'version' ) . "</b></td>";
- echo "</tr></table>";
- echo "<br clear=\"all\" />";
-
- echo "<label>" . _AM_LX_ABOUT_RELEASEDATE . ":</label><text>" . $versioninfo->getInfo( 'release' ) . "</text><br />";
- echo "<label>" . _AM_LX_ABOUT_AUTHOR . ":</label><text>" . $versioninfo->getInfo( 'author' ) . "</text><br />";
- //echo "<label>" . _AM_LX_ABOUT_LICENSE . ":</label><text><a href=\"".$versioninfo->getInfo( 'license_file' )."\" target=\"_blank\" >" . $versioninfo->getInfo( 'license' ) . "</a></text>\n";
- echo "<label>" . _AM_LX_ABOUT_LICENSE . ":</label><text><a href=\"".$versioninfo->getInfo( 'license_file' )."\" target=\"_blank\" >" . $versioninfo->getInfo( 'license' ) . "</a></text>\n";
- echo "</div>";
- echo "<br clear=\"all\" />";
-
- // information
- echo "<div style='padding: 8px;'>";
- echo "<table width='100%' cellspacing='2' cellpadding='2' border='0' class='outer'>";
- echo "<tr>";
- echo "<td colspan='2' class='even' align='left'><b>". _AM_LX_ABOUT_MODULE_INFO ."</b></td>";
- echo "</tr></table>";
-
- echo "<label>" . _AM_LX_ABOUT_MODULE_STATUS . ":</label><text>" . $versioninfo->getInfo( 'module_status' ) . "</text><br />";
- echo "<label>" . _AM_LX_ABOUT_WEBSITE . ":</label><text>" . "<a href='" . $versioninfo->getInfo( 'module_website_url' ) . "' target='_blank'>" . $versioninfo->getInfo( 'module_website_name' ) . "</a>" . "</text><br />";
-
- If ($versioninfo->getInfo('submit_bug') != '') {
- echo "<label>" . _AM_LX_ABOUT_SUBMIT_BUG . "</label><text><a href='" . $versioninfo->getInfo('submit_bug') . "' target='blank'>" . _AM_LX_ABOUT_SUBMIT_BUG_TEXT . "</a></text><BR />";
- }
- If ($versioninfo->getInfo('submit_feature') != '') {
- echo "<label>" . _AM_LX_ABOUT_SUBMIT_FEATURE . "</label><text'><a href='" . $versioninfo->getInfo('submit_feature') . "' target='blank'>" . _AM_LX_ABOUT_SUBMIT_FEATURE_TEXT . "</a></text><BR />";
- }
- echo "</div>";
- echo "<br clear=\"all\" />";
-
-
- echo "<div style='padding: 8px;'>";
- echo "<table width='100%' cellspacing='2' cellpadding='2' border='0' class='outer'>";
- echo "<tr>";
- echo "<td colspan='2' class='even' align='left'><b>". _AM_LX_ABOUT_DISCLAIMER ."</b></td>";
- echo "</tr></table>";
- echo "<div>". _AM_LX_ABOUT_DISCLAIMER_TEXT . "</div>";
- echo "</div>";
- echo "<br clear=\"all\" />";
- $file = XOOPS_ROOT_PATH. "/modules/" . $xoopsModule->dirname()."/changelog.txt";
- if ( is_readable( $file ) ) {
- echo "<div style='padding: 8px;'>";
- echo "<table width='100%' cellspacing='2' cellpadding='2' border='0' class='outer'>";
- echo "<tr>";
- echo "<td colspan='2' class='even' align='left'><b>". _AM_LX_ABOUT_CHANGELOG ."</b></td>";
- echo "</tr></table>";
-
- echo "". implode("<br />", file( $file )) . "";
- echo "</div>";
-
- echo "<br clear=\"all\" />";
- }
-
-}
-
-/**
- * readme file
- */
-
-function readme() {
- global $xoopsConfig, $xoopsModuleConfig, $xoopsModule, $versioninfo;
-
- echo "<br clear=\"all\" />";
- echo "<img src='".XOOPS_URL."/modules/".$xoopsModule->dirname()."/".$versioninfo->getInfo('image')."' alt='' hspace='0' vspace='0' align='left' style='margin-right: 10px; '></a>";
- echo "<div style='margin-top: 10px; color: #33538e; margin-bottom: 4px; font-size: 18px; line-height: 18px; font-weight: bold; display: block;'>".$versioninfo->getInfo('name')." v. ".$versioninfo->getInfo('version')."</div>";
- if ($versioninfo->getInfo('author_realname') != '') {
- $author_name = $versioninfo->getInfo('author')." (".$versioninfo->getInfo('author_realname').")";
- } else {
- $author_name = $versioninfo->getInfo('author');
- }
- echo "<br clear=\"all\" /><BR />";
-
-
- $file = XOOPS_ROOT_PATH. "/modules/" . $xoopsModule->dirname()."/readme.txt";
- if ( is_readable( $file ) ) {
- echo "<div style='padding: 8px;'>";
- echo "<table width='100%' cellspacing='2' cellpadding='2' border='0' class='outer'>";
- echo "<tr>";
- echo "<td colspan='2' class='even' align='left'><b>". _AM_LX_ABOUT_README ."</b></td>";
- echo "</tr></table>";
-
-
- echo "". implode("<br />", file( $file )) . "";
- echo "</div>";
- echo "<br clear=\"all\" />";
- }
-
-}
-
-/* -- Available operations -- */
-$op = isset($_GET['op']) ? $_GET['op'] : (isset($_POST['op']) ? $_POST['op'] : '');
-switch ( $op ) {
- case "readme":
- lx_adminMenu(47);
- readme();
- break;
- case "about":
- default:
- lx_adminMenu(11);
- about();
- break;
-}
-xoops_cp_footer();
-?>
\ No newline at end of file
+<?php
+/*
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package
+ * @since
+ * @author XOOPS Development Team
+ * @version $Id $
+ */
+
+include_once dirname(__FILE__) . '/admin_header.php';
+
+xoops_cp_header();
+
+$aboutAdmin = new ModuleAdmin();
+
+echo $aboutAdmin->addNavigation('about.php');
+echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false);
+
+include 'admin_footer.php';
\ No newline at end of file
Added: XoopsModules/lexikon/trunk/lexikon/admin/admin_footer.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/admin_footer.php (rev 0)
+++ XoopsModules/lexikon/trunk/lexikon/admin/admin_footer.php 2013-02-27 09:41:47 UTC (rev 11117)
@@ -0,0 +1,28 @@
+<?php
+/*
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package
+ * @since
+ * @author XOOPS Development Team
+ * @version $Id $
+ */
+
+echo "<div class='adminfooter'>\n"
+ ." <div style='text-align: center;'>\n"
+ ." <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
+ ." </div>\n"
+ ." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
+ ."</div>";
+
+xoops_cp_footer();
\ No newline at end of file
Modified: XoopsModules/lexikon/trunk/lexikon/admin/admin_header.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/admin_header.php 2013-02-27 09:15:29 UTC (rev 11116)
+++ XoopsModules/lexikon/trunk/lexikon/admin/admin_header.php 2013-02-27 09:41:47 UTC (rev 11117)
@@ -1,38 +1,51 @@
-<?php
-/**
- * $Id: admin_header.php v 1.0 8 May 2004 hsalazar Exp $
- * Module: Lexikon - glossary module
- * Version: v 1.00
- * Release Date: 8 May 2004
- * Author: hsalazar
- * Licence: GNU
- */
-
-include("../../../mainfile.php");
-include '../../../include/cp_header.php';
-
-if ( file_exists("../language/".$xoopsConfig['language']."/main.php") ) {
- include "../language/".$xoopsConfig['language']."/main.php";
-} else {
- include "../language/english/main.php";
-}
-include_once XOOPS_ROOT_PATH."/modules/lexikon/include/functions.php";
-include_once XOOPS_ROOT_PATH."/modules/lexikon/admin/functions.php";
-include_once XOOPS_ROOT_PATH."/class/xoopsmodule.php";
-include_once XOOPS_ROOT_PATH."/class/xoopstree.php";
-include_once XOOPS_ROOT_PATH."/class/xoopslists.php";
-include_once XOOPS_ROOT_PATH."/class/xoopsformloader.php";
-$myts =& MyTextSanitizer::getInstance();
-
-if ( is_object( $xoopsUser) ) {
- $xoopsModule = XoopsModule::getByDirname("lexikon");
- if ( !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
- redirect_header(XOOPS_URL."/",1,_NOPERM);
- exit();
- }
-} else {
- redirect_header(XOOPS_URL."/",1,_NOPERM);
- exit();
-}
-
-?>
\ No newline at end of file
+<?php
+/*
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package
+ * @since
+ * @author XOOPS Development Team
+ * @version $Id $
+ */
+
+$path = dirname(dirname(dirname(dirname(__FILE__))));
+include_once $path . '/mainfile.php';
+include_once $path . '/include/cp_functions.php';
+require_once $path . '/include/cp_header.php';
+
+global $xoopsModule;
+
+$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
+
+//if functions.php file exist
+require_once dirname(dirname(__FILE__)) . '/include/functions.php';
+//include_once XOOPS_ROOT_PATH."/modules/lexikon/include/functions.php";
+include_once dirname(dirname(__FILE__)). "/admin/functions.php";
+include_once XOOPS_ROOT_PATH."/class/xoopsmodule.php";
+include_once XOOPS_ROOT_PATH."/class/xoopstree.php";
+include_once XOOPS_ROOT_PATH."/class/xoopslists.php";
+include_once XOOPS_ROOT_PATH."/class/xoopsformloader.php";
+
+
+// Load language files
+xoops_loadLanguage('admin', $thisModuleDir);
+xoops_loadLanguage('modinfo', $thisModuleDir);
+xoops_loadLanguage('main', $thisModuleDir);
+
+$pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
+$pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
+$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
+
+include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
+
+$myts =& MyTextSanitizer::getInstance();
\ No newline at end of file
Modified: XoopsModules/lexikon/trunk/lexikon/admin/category.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/category.php 2013-02-27 09:15:29 UTC (rev 11116)
+++ XoopsModules/lexikon/trunk/lexikon/admin/category.php 2013-02-27 09:41:47 UTC (rev 11117)
@@ -29,7 +29,7 @@
global $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule, $entryID;
$myts =& MyTextSanitizer::getInstance();
- lx_adminMenu(1, _AM_LX_CATS);
+// lx_adminMenu(1, _AM_LX_CATS);
$result01 = $xoopsDB -> query( "SELECT COUNT(*)
FROM " . $xoopsDB -> prefix( "lxcategories" ) . " " );
list( $totalcategories ) = $xoopsDB -> fetchRow( $result01 );
@@ -166,13 +166,13 @@
exit();
}
//$myts =& MyTextSanitizer::getInstance();
- lx_adminMenu(1, _AM_LX_CATS);
+// lx_adminMenu(1, _AM_LX_CATS);
echo "<h3 style=\"color: #2F5376; margin-top: 6px; \">" . _AM_LX_CATSHEADER . "</h3>";
$sform = new XoopsThemeForm( _AM_LX_MODCAT . ": $name" , "op", xoops_getenv( 'PHP_SELF' ) );
} else {
//$myts =& MyTextSanitizer::getInstance();
- lx_adminMenu(1, _AM_LX_CATS);
+// lx_adminMenu(1, _AM_LX_CATS);
$groups = true;
echo "<h3 style=\"color: #2F5376; margin-top: 6px; \">" . _AM_LX_CATSHEADER . "</h3>";
$sform = new XoopsThemeForm( _AM_LX_NEWCAT, "op", xoops_getenv( 'PHP_SELF' ) );
Modified: XoopsModules/lexikon/trunk/lexikon/admin/entry.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/entry.php 2013-02-27 09:15:29 UTC (rev 11116)
+++ XoopsModules/lexikon/trunk/lexikon/admin/entry.php 2013-02-27 09:41:47 UTC (rev 11117)
@@ -24,7 +24,7 @@
global $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule, $entryID;
include_once XOOPS_ROOT_PATH . "/class/xoopslists.php";
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
- lx_adminMenu(2, _AM_LX_ENTRIES);
+// lx_adminMenu(2, _AM_LX_ENTRIES);
$startentry = isset( $_GET['startentry'] ) ? intval( $_GET['startentry'] ) : 0;
$startcat = isset( $_GET['startcat'] ) ? intval( $_GET['startcat'] ) : 0;
@@ -185,7 +185,7 @@
}
$term = $myts->stripSlashesGPC($myts->htmlSpecialChars($term));
- lx_adminMenu(2, _AM_LX_ADMINENTRYMNGMT);
+// lx_adminMenu(2, _AM_LX_ADMINENTRYMNGMT);
echo "<h3 style=\"color: #2F5376; margin-top: 6px; \">" . _AM_LX_ADMINENTRYMNGMT . "</h3>";
$sform = new XoopsThemeForm( _AM_LX_MODENTRY . ": $term" , "op", xoops_getenv( 'PHP_SELF' ) );
@@ -197,7 +197,7 @@
redirect_header( "index.php", 1, _AM_LX_NEEDONECOLUMN );
exit();
}
- lx_adminMenu(2, _AM_LX_ADMINENTRYMNGMT);
+// lx_adminMenu(2, _AM_LX_ADMINENTRYMNGMT);
$uid = $xoopsUser->getVar('uid');
echo "<h3 style=\"color: #2F5376; margin-top: 6px; \">" . _AM_LX_ADMINENTRYMNGMT . "</h3>";
$sform = new XoopsThemeForm( _AM_LX_NEWENTRY, "op", xoops_getenv( 'PHP_SELF' ) );
Modified: XoopsModules/lexikon/trunk/lexikon/admin/functions.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/functions.php 2013-02-27 09:15:29 UTC (rev 11116)
+++ XoopsModules/lexikon/trunk/lexikon/admin/functions.php 2013-02-27 09:41:47 UTC (rev 11117)
@@ -45,7 +45,7 @@
include 'menu.php';
- $tpl =& new XoopsTpl();
+ $tpl = new XoopsTpl();
$tpl->assign( array(
'headermenu' => $headermenu,
'adminmenu' => $adminmenu,
@@ -249,11 +249,11 @@
*/
function lx_GetStatistics($limit){
$ret=array();
- $db =& Database::getInstance();
+ $db =& XoopsDatabaseFactory::getDatabaseConnection();
$tbls=$db->prefix('lxentries');
$tblt=$db->prefix('lxcategories');
- $db =& Database::getInstance();
+ $db =& XoopsDatabaseFactory::getDatabaseConnection();
// Number of Definitions per Category, including offline and submitted terms
$ret2=array();
$sql="SELECT count(s.entryID) as cpt, s.categoryID, t.name FROM $tbls s, $tblt t WHERE s.categoryID=t.categoryID GROUP BY s.categoryID ORDER BY t.name";
Modified: XoopsModules/lexikon/trunk/lexikon/admin/importdictionary.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/importdictionary.php 2013-02-27 09:15:29 UTC (rev 11116)
+++ XoopsModules/lexikon/trunk/lexikon/admin/importdictionary.php 2013-02-27 09:41:47 UTC (rev 11117)
@@ -35,7 +35,7 @@
xoops_cp_header();
global $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule;
$myts =& MyTextSanitizer::getInstance();
- lx_adminMenu(9, _AM_LX_IMPORT);
+// lx_adminMenu(9, _AM_LX_IMPORT);
}
/****
* Start Import
Modified: XoopsModules/lexikon/trunk/lexikon/admin/importglossaire.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/importglossaire.php 2013-02-27 09:15:29 UTC (rev 11116)
+++ XoopsModules/lexikon/trunk/lexikon/admin/importglossaire.php 2013-02-27 09:41:47 UTC (rev 11117)
@@ -37,7 +37,7 @@
xoops_cp_header();
global $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule, $entryID;
$myts =& MyTextSanitizer::getInstance();
- lx_adminMenu(9, _AM_LX_IMPORT);
+// lx_adminMenu(9, _AM_LX_IMPORT);
}
/****
Modified: XoopsModules/lexikon/trunk/lexikon/admin/importwiwimod.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/importwiwimod.php 2013-02-27 09:15:29 UTC (rev 11116)
+++ XoopsModules/lexikon/trunk/lexikon/admin/importwiwimod.php 2013-02-27 09:41:47 UTC (rev 11117)
@@ -35,7 +35,7 @@
xoops_cp_header();
global $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule;
$myts =& MyTextSanitizer::getInstance();
- lx_adminMenu(9, _AM_LX_IMPORT);
+// lx_adminMenu(9, _AM_LX_IMPORT);
}
/****
Modified: XoopsModules/lexikon/trunk/lexikon/admin/importwordbook.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/importwordbook.php 2013-02-27 09:15:29 UTC (rev 11116)
+++ XoopsModules/lexikon/trunk/lexikon/admin/importwordbook.php 2013-02-27 09:41:47 UTC (rev 11117)
@@ -35,7 +35,7 @@
xoops_cp_header();
global $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule;
$myts =& MyTextSanitizer::getInstance();
- lx_adminMenu(9, _AM_LX_IMPORT);
+// lx_adminMenu(9, _AM_LX_IMPORT);
}
/****
Modified: XoopsModules/lexikon/trunk/lexikon/admin/importxwords.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/importxwords.php 2013-02-27 09:15:29 UTC (rev 11116)
+++ XoopsModules/lexikon/trunk/lexikon/admin/importxwords.php 2013-02-27 09:41:47 UTC (rev 11117)
@@ -37,7 +37,7 @@
xoops_cp_header();
global $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule;
$myts =& MyTextSanitizer::getInstance();
- lx_adminMenu(9, _AM_LX_IMPORT);
+// lx_adminMenu(9, _AM_LX_IMPORT);
}
/****
* Start Import
Modified: XoopsModules/lexikon/trunk/lexikon/admin/index.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/index.php 2013-02-27 09:15:29 UTC (rev 11116)
+++ XoopsModules/lexikon/trunk/lexikon/admin/index.php 2013-02-27 09:41:47 UTC (rev 11117)
@@ -1,315 +1,32 @@
-<?php
-/**
- * $Id: main.php v 1.0 8 May 2011 yerres Exp $
- * Module: Lexikon - glossary module
- * Version: v 1.00
- * Release Date: 18 Dec 2011
- * Author: yerres
- * Licence: GNU
- */
-
-include( "admin_header.php" );
-xoops_cp_header();
-$myts =& MyTextSanitizer::getInstance();
-global $xoopsUser, $xoopsConfig, $xoopsModuleConfig, $xoopsModule, $entryID;
-
-lx_adminMenu(0, _AM_LX_INVENTORY);
-//include_once XOOPS_ROOT_PATH . "/class/xoopslists.php";
-include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
-
-$startentry = isset( $_GET['startentry'] ) ? intval( $_GET['startentry'] ) : 0;
-$entryID = isset($_POST['entryID']) ? intval($_POST['entryID']) : 0;
-$pick = isset($_GET['pick']) ? intval($_GET['pick']) : 0;
-$pick = isset($_POST['pick']) ? intval($_POST['pick']) : $pick;
-
-$statussel = isset($_GET['statussel']) ? intval($_GET['statussel']) : 0;
-$statussel = isset($_POST['statussel']) ? intval($_POST['statussel']) : $statussel;
-
-$sortsel = isset($_GET['sortsel']) ? $_GET['sortsel'] : 'entryID';
-$sortsel = isset($_POST['sortsel']) ? $_POST['sortsel'] : $sortsel;
-
-$ordersel = isset($_GET['ordersel']) ? $_GET['ordersel'] : 'DESC';
-$ordersel = isset($_POST['ordersel']) ? $_POST['ordersel'] : $ordersel;
-
-//--- inventory
-$result = $xoopsDB -> query( "SELECT COUNT(*)
- FROM " . $xoopsDB -> prefix( "lxcategories" ) . " " );
-list( $totalcategories ) = $xoopsDB -> fetchRow( $result );
-
-$result01 = $xoopsDB -> query( "SELECT COUNT(*)
- FROM " . $xoopsDB -> prefix( "lxentries" ) . "
- " );
-list( $totalterms ) = $xoopsDB -> fetchRow( $result01 );
-
-$result02 = $xoopsDB -> query( "SELECT COUNT(*)
- FROM " . $xoopsDB -> prefix( "lxentries" ) . "
- WHERE offline = 0 AND submit = 0 AND request = 0 " );
-list( $totalpublished ) = $xoopsDB -> fetchRow( $result02 );
-
-$result03 = $xoopsDB -> query( "SELECT COUNT(*)
- FROM " . $xoopsDB -> prefix( "lxentries" ) . "
- WHERE submit = '1' AND request = '0' " );
-list( $totalsubmitted ) = $xoopsDB -> fetchRow( $result03 );
-
-$result04 = $xoopsDB -> query( "SELECT COUNT(*)
- FROM " . $xoopsDB -> prefix( "lxentries" ) . "
- WHERE submit = '1' AND request = '1' " );
-list( $totalrequested ) = $xoopsDB -> fetchRow( $result04 );
-
-$result05 = $xoopsDB -> query( "SELECT COUNT(*)
- FROM " . $xoopsDB -> prefix( "lxentries" ) . "
- WHERE offline = '1' " );
-list( $totaloffline ) = $xoopsDB -> fetchRow( $result05 );
-
-// Adapted from Smartsection
-echo "<table width='100%' class='outer' style=\"margin-top: 6px; clear:both;\" ; cellspacing='2' cellpadding='3' border='0' ><tr>";
-echo "<td class='odd'>" . _AM_LX_TOTALENTRIES . "</td><td align='center' class='even'>" . $totalpublished . "</td>";
-if ($xoopsModuleConfig['multicats'] == 1) {
- echo "<td class='odd'>" . _AM_LX_TOTALCATS . "</td><td align='center' class='even'>" . $totalcategories . "</td>";
-}
-echo "<td class='odd'>" . _AM_LX_TOTALSUBM . "</td><td align='center' class='even'>" . $totalsubmitted . "</td>";
-echo "<td class='odd'>" . _AM_LX_TOTALREQ . "</td><td align='center' class='even'>" . $totalrequested . "</td>";
-echo "</tr></table>";
-echo "<br /><br />";
-//--- category dropdown
-if ($xoopsModuleConfig['multicats'] == 1) {
- $cattree = new XoopsTree( $xoopsDB->prefix("lxcategories"), "categoryID", "0" );
- echo "<table class='outer' width='100%'><tr ><td colspan=\"2\" class='even'><strong>" . _AM_LX_INVENTORY . "</strong></td></tr>";
- echo "<tr class=\"odd\" ><td width=\"30%\" align=\"left\">";
- echo '<form method=get action=\"category.php\">';
- $cattree -> makeMySelBox("name", "weight DESC",0,1,"",'window.location="category.php?op=mod&categoryID="+this.value');
- echo "</form>";
- echo "</td><td align=\"left\">";
- echo "<input type='button' name='button' onClick=\"location='category.php?op=addcat'\" value=' " . _AM_LX_CREATECAT . "' > ";
- echo "<input type='button' name='button' onclick=\"location='entry.php?op=add'\" value='" . _AM_LX_CREATEENTRY . "'> ";
- echo "</td></tr>";
- echo "</table><P><br/>";
-} else {
- //--- create button
- echo "<form><div style=\"margin-bottom: 12px;\">";
- echo "<input type='button' name='button' onclick=\"location='entry.php?op=add'\" value='" . _AM_LX_CREATEENTRY . "'> ";
- echo "</div></form>";
- echo "<br/><span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \"><b>" . _AM_LX_ALLITEMSMSG . "</b></span>";
-}
-// database update
-if (!lx_FieldExists('logourl',$xoopsDB->prefix('lxcategories')) || (lx_FieldExists('parent',$xoopsDB->prefix('lxcategories')))) {
- $i++;
- echo "<table><tr><td style='border-bottom: 1px dotted #cfcfcf; line-height: 16px;'><img src='".XOOPS_URL."/modules/".$xoopsModule->getVar('dirname')."/images/dialog-important.png"."' alt='' hspace='0' vspace='0' align='left' style='margin-right: 10px; '><A href='upgrade.php'>" . _AM_LX_PLEASE_UPGRADE. "</A></td></tr></table></P>";
-}
-
-//--- navigation bar
-$showingtxt = '';
-$selectedtxt = '';
-$cond = "";
-$selectedtxt0 = '';
-$selectedtxt1 = '';
-$selectedtxt2 = '';
-$selectedtxt3 = '';
-$selectedtxt4 = '';
-
-$sorttxtterm = "";
-$sorttxtcreated = "";
-$sorttxtauthor = "";
-$sorttxtentryID = "";
-$sorttxtcats = "";
-
-$ordertxtasc='';
-$ordertxtdesc='';
-
-switch ($sortsel) {
- case 'term':
- $sorttxtterm = "selected='selected'";
- break;
-
- case 'datesub':
- $sorttxtcreated = "selected='selected'";
- break;
-
- case 'uid':
- $sorttxtauthor = "selected='selected'";
- break;
-
- case 'categoryID':
- $sorttxtcats = "selected='selected'";
- break;
-
- default :
- $sorttxtentryID = "selected='selected'";
- break;
-}
-
-switch ($ordersel) {
- case 'ASC':
- $ordertxtasc = "selected='selected'";
- break;
-
- default :
- $ordertxtdesc = "selected='selected'";
- break;
-}
-
-switch ($statussel) {
- case '0' :
- //default:
- $selectedtxt0 = "selected='selected'";
- $caption = _ALL;
- $cond = "";
- $status_explanation = _AM_LX_ALL_EXP;
- break;
-
- case '1' :
- $selectedtxt1 = "selected='selected'";
- $caption = _AM_LX_SUBMITTED;
- $cond = " WHERE submit = 1 AND request = 0 ";
- $status_explanation = _AM_LX_SUBMITTED_EXP;
- break;
-
- case '2' :
- $selectedtxt2 = "selected='selected'";
- $caption = _AM_LX_PUBLISHED;
- $cond = " WHERE offline = 0 ";
- $status_explanation = _AM_LX_PUBLISHED_EXP;
- break;
-
- case '3' :
- $selectedtxt3 = "selected='selected'";
- $caption = _AM_LX_SHOWOFFLINE;
- $cond = " WHERE offline = 1 ";
- $status_explanation = _AM_LX_OFFLINE_EXP;
- break;
-
- case '4' :
- $selectedtxt4 = "selected='selected'";
- $caption = _AM_LX_SHOWREQUESTS;
- $cond = " WHERE submit= 1 AND request = 1 ";
- $status_explanation = _AM_LX_REQ_ITEM_EXP;
- break;
-}
-// -- Code to show selected terms
-echo "<form name='pick' id='pick' action='" . $_SERVER['PHP_SELF'] . "' method='POST' style='margin: 0;'>";
-
-echo "
- <table width='100%' cellspacing='1' cellpadding='2' border='0' style='border-left: 1px solid silver; border-top: 1px solid silver; border-right: 1px solid silver;'>
- <tr>
- <td><span style='font-weight: bold; font-variant: small-caps;'>" . _AM_LX_SHOWING . " " . $caption . "</span></td>
- <td align='right'>" . _AM_LX_SELECT_SORT . "
- <select name='sortsel' onchange='submit()'>
- <option value='entryID' $sorttxtentryID>" . _AM_LX_ENTRYID . "</option>
- <option value='term' $sorttxtterm>" . _AM_LX_TERM . "</option>
- <option value='uid' $sorttxtauthor>" . _AM_LX_AUTHOR . "</option>
- <option value='datesub' $sorttxtcreated>" . _DATE . "</option>
- <option value='categoryID' $sorttxtcats>" . _AM_LX_CATEGORY . "</option>
- </select>
- <select name='ordersel' onchange='submit()'>
- <option value='ASC' $ordertxtasc>" . _ASCENDING . "</option>
- <option value='DESC' $ordertxtdesc>" . _DESCENDING . "</option>
- </select>
- " . _AM_LX_STATUS . " :
- <select name='statussel' onchange='submit()'>
- <option value='0' $selectedtxt0>" . _ALL . " [$totalterms]</option>
- <option value='1' $selectedtxt1>" . _AM_LX_SUBMITS . " [$totalsubmitted]</option>
- <option value='2' $selectedtxt2>" . _AM_LX_PUBLISHED . " [$totalpublished]</option>
- <option value='3' $selectedtxt3>" . _AM_LX_SHOWOFFLINE . " [$totaloffline]</option>
- <option value='4' $selectedtxt4>" . _AM_LX_SHOWREQUESTS . " [$totalrequested]</option>
- </select>
- </td>
- </tr>
- </table>
- </form>";
-
-
-// Get number of entries in the selected state
-$statusSelected = ($statussel == 0) ? -1 : $statussel;
-$results = $xoopsDB -> query( "SELECT COUNT(*)
- FROM " . $xoopsDB -> prefix( "lxentries" ) . "
- " . $cond . "
- ORDER BY " . $sortsel . " " . $ordersel . "
- " );
-list( $numrows ) = $xoopsDB -> fetchRow( $results );
-// creating the content
-$sql = "SELECT entryID, categoryID, term, uid, datesub, offline
- FROM ".$xoopsDB->prefix('lxentries')."
- ".$cond."
- ORDER BY ".$sortsel." ".$ordersel." ";
-
-$items = $xoopsDB -> query( $sql, $xoopsModuleConfig['perpage'], $startentry );//missing nav. extras
-$totalItemsOnPage = count($numrows);
-
-lx_buildTable();
-
-if ($numrows > 0) {
- while ( list( $entryID, $categoryID, $term, $uid, $created, $offline) = $xoopsDB -> fetchrow( $items ) ) {
- // Creating the items
- $resultcn = $xoopsDB -> query( "SELECT name
- FROM " . $xoopsDB -> prefix( "lxcategories" ) . "
- WHERE categoryID = '$categoryID'" );
- list( $name ) = $xoopsDB -> fetchrow( $resultcn );
- $catname = $myts -> htmlSpecialChars( $name );
- $sentby = xoops_getLinkedUnameFromId($uid);
- $term = $myts -> htmlSpecialChars( $term );
- $created= formatTimestamp( $created, 's' );
- $modify = "<a href='entry.php?op=mod&entryID=" . $entryID . "'><img src=" . XOOPS_URL . "/modules/" . $xoopsModule->dirname() . "/images/icon/edit.gif width='24' height='24' ALT='"._AM_LX_EDITENTRY."'></a> ";
- $delete = "<a href='entry.php?op=del&entryID=" . $entryID . "'><img src=" . XOOPS_URL . "/modules/" . $xoopsModule->dirname() . "/images/icon/delete.gif width='24' height='24' ALT='"._AM_LX_DELETEENTRY."'></a>";
- for ( $i = 0; $i < $totalItemsOnPage; $i++ ) {
- $approve = '';
- switch ($items) {
- //case _LX_STATUS_SUBMITTED :
- case '1' :
- $statustxt = "<img src=" . XOOPS_URL . "/modules/" . $xoopsModule->dirname() . "/images/icon/off.gif alt='"._AM_LX_ENTRYISOFF."'>";
- break;
-
- //case _LX_STATUS_PUBLISHED :
- case '2' :
- $statustxt = "<img src=" . XOOPS_URL . "/modules/" . $xoopsModule->dirname() . "/images/icon/on.gif alt='"._AM_LX_ENTRYISON."'>";
- break;
-
- //case _LX_STATUS_OFFLINE :
- case '3' :
- $statustxt = "<img src=" . XOOPS_URL . "/modules/" . $xoopsModule->dirname() . "/images/icon/off.gif alt='"._AM_LX_ENTRYISOFF."'>";
- break;
-
- //case _LX_STATUS_REQ :
- case '4' :
- $statustxt = "<img src=" . XOOPS_URL . "/modules/" . $xoopsModule->dirname() . "/images/icon/off.gif alt='"._AM_LX_ENTRYISOFF."'>";
- break;
-
- case "default" :
- default :
- if ( $offline == 0 ) {
- $statustxt = "<img src=" . XOOPS_URL . "/modules/" . $xoopsModule->dirname() . "/images/icon/on.gif alt='"._AM_LX_ENTRYISON."'>";
- } else {
- $statustxt = "<img src=" . XOOPS_URL . "/modules/" . $xoopsModule->dirname() . "/images/icon/off.gif alt='"._AM_LX_ENTRYISOFF."'>";
- }
- $approve = "";
- break;
- }
-
- echo "<tr>";
- echo "<td class='even' align='center'>".$entryID."</td>";
- echo "<td class='odd' align='left'>" . $catname . "</td>";
- echo "<td class='odd'align='left'><a href='../entry.php?entryID=" . $entryID . "'>" . $term . "</td>";
- echo "<td class='odd' align='center'>" . $sentby . "</td>";
- echo "<td class='odd' align='center'>" . $created . "</td>";
- echo "<td class='odd' align='center'>" . $statustxt . "</td>";
- echo "<td class='even' align='center'> ". $approve . $modify . $delete . "</td>";
- echo "</tr>";
- }
- }
-} else {
- // that is no item corresponding the status
- echo "<tr>";
- echo "<td class='head' align='center' colspan= '7'>" . _AM_LX_NOITEMSSEL . "</td>";
- echo "</tr>";
-}
-echo "</table>\n";
-
-echo "<span style=\"color: #567; margin: 3px 0 18px 0; font-size: small; display: block; \">$status_explanation</span>";
-$pagenav = new XoopsPageNav($numrows, $xoopsModuleConfig['perpage'], $startentry, 'startentry', "statussel=$statussel&sortsel=$sortsel&ordersel=$ordersel");
-echo '<div style="text-align:right;">' . $pagenav -> renderNav(12) . '</div>';
-echo "<br /><BR>\n";
-echo "</div>";
-
-//----
-xoops_cp_footer();
-
-?>
\ No newline at end of file
+<?php
+/*
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package
+ * @since
+ * @author XOOPS Development Team
+ * @version $Id $
+ */
+
+
+require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
+include_once dirname(__FILE__) . '/admin_header.php';
+
+xoops_cp_header();
+
+ $indexAdmin = new ModuleAdmin();
+
+ echo $indexAdmin->addNavigation('index.php');
+ echo $indexAdmin->renderIndex();
+
+include "admin_footer.php";
\ No newline at end of file
Modified: XoopsModules/lexikon/trunk/lexikon/admin/menu.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/menu.php 2013-02-27 09:15:29 UTC (rev 11116)
+++ XoopsModules/lexikon/trunk/lexikon/admin/menu.php 2013-02-27 09:41:47 UTC (rev 11117)
@@ -4,66 +4,59 @@
* Module: lexikon
* Licence: GNU
*/
-$module_handler =& xoops_gethandler("module");
-$xoopsModule =& XoopsModule::getByDirname('lexikon');
-$moduleInfo =& $module_handler->get($xoopsModule->getVar("mid"));
-global $xoopsModule;
-$i = 0;
-$adminmenu[$i]['title'] = _MI_LX_ADMENU1;
+
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+
+$path = dirname(dirname(dirname(dirname(__FILE__))));
+include_once $path . '/mainfile.php';
+
+$dirname = basename(dirname(dirname(__FILE__)));
+$module_handler = xoops_gethandler('module');
+$module = $module_handler->getByDirname($dirname);
+$pathIcon32 = $module->getInfo('icons32');
+$pathModuleAdmin = $module->getInfo('dirmoduleadmin');
+$pathLanguage = $path . $pathModuleAdmin;
+
+
+if (!file_exists($fileinc = $pathLanguage . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/' . 'main.php')) {
+ $fileinc = $pathLanguage . '/language/english/main.php';
+}
+
+include_once $fileinc;
+
+$adminmenu = array();
+$i=0;
+$adminmenu[$i]["title"] = _AM_MODULEADMIN_HOME;
$adminmenu[$i]['link'] = "admin/index.php";
+$adminmenu[$i]["icon"] = $pathIcon32 . '/home.png';
$i++;
+$adminmenu[$i]['title'] = _MI_LX_ADMENU1;
+$adminmenu[$i]['link'] = "admin/main.php";
+$adminmenu[$i]["icon"] = $pathIcon32 . '/manage.png';
+$i++;
$adminmenu[$i]['title'] = _MI_LX_ADMENU2;
$adminmenu[$i]['link'] = "admin/category.php";
+$adminmenu[$i]["icon"] = $pathIcon32 . '/category.png';
$i++;
$adminmenu[$i]['title'] = _MI_LX_ADMENU3;
$adminmenu[$i]['link'] = "admin/entry.php";
+$adminmenu[$i]["icon"] = $pathIcon32 . '/add.png';
$i++;
$adminmenu[$i]['title'] = _MI_LX_ADMENU12;
$adminmenu[$i]['link'] = "admin/statistics.php";
+$adminmenu[$i]["icon"] = $pathIcon32 . '/stats.png';
$i++;
$adminmenu[$i]['title'] = _MI_LX_ADMENU9;
$adminmenu[$i]['link'] = "admin/permissions.php";
-// top bar
-//if (isset($xoopsModule)) {
-if (isset($xoopsModule) && ($xoopsModule->getVar('dirname') == 'lexikon')) {
- $i++;
- $adminmenu[$i]['title'] = _AM_LX_MCOMMENTS;
- $adminmenu[$i]['link'] = "../system/admin.php?module=" . $xoopsModule->getVar('mid') . "&status=0&limit=100&fct=comments&selsubmit=Go";
+$adminmenu[$i]["icon"] = $pathIcon32 . '/permissions.png';
- $i=0;
- $headermenu[$i]['title'] = _PREFERENCES;
- $headermenu[$i]['link'] = '../../system/admin.php?fct=preferences&op=showmod&mod=' . $xoopsModule->getVar('mid');
+$i++;
+$adminmenu[$i]['title'] = _AM_LX_IMPORT;
+$adminmenu[$i]['link'] = "/admin/importwordbook.php";
+$adminmenu[$i]["icon"] = $pathIcon32 . '/compfile.png';
- $i++;
- $headermenu[$i]['title'] = _AM_LX_GOMOD;
- $headermenu[$i]['link'] = XOOPS_URL . "/modules/lexikon";
- $i++;
- $headermenu[$i]['title'] = _AM_LX_IMPORT;
- $headermenu[$i]['link'] = XOOPS_URL . "/modules/lexikon/admin/importwordbook.php";
-
- $i++;
- $headermenu[$i]['title'] = _AM_LX_UPDATEMODULE;
- $headermenu[$i]['link'] = XOOPS_URL . "/modules/system/admin.php?fct=modulesadmin&op=update&module=" . $xoopsModule->getVar('dirname');
-
- // Blocks for Xoops versions 2.0/2.5
- if (strstr(XOOPS_VERSION, "XOOPS 2.0")){
- $i++;
- $headermenu[$i]['title'] = _MI_LX_ADMENU4;
- $headermenu[$i]['link'] = "myblocksadmin.php";
- } else {
- $i++;
- $headermenu[$i]['title'] = _MI_LX_ADMENU4;
- $headermenu[$i]['link'] = XOOPS_URL . "/modules/system/admin.php?fct=blocksadmin&op=list&filter=1&selgen=" . $xoopsModule->getVar('mid') . "&selmod=-2&selgrp=-1&selvis=-1";
- }
-
- $i++;
- $headermenu[$i]['title'] = _AM_LX_HELP;
- $headermenu[$i]['link'] = XOOPS_URL . "/modules/lexikon/admin/about.php?op=readme";
-
- $i++;
- $headermenu[$i]['title'] = _MI_LX_ADMENU10;
- $headermenu[$i]['link'] = XOOPS_URL . "/modules/lexikon/admin/about.php";
-
-}
-?>
\ No newline at end of file
+$i++;
+$adminmenu[$i]['title'] = _AM_MODULEADMIN_ABOUT;
+$adminmenu[$i]["link"] = "admin/about.php";
+$adminmenu[$i]["icon"] = $pathIcon32 . '/about.png';
\ No newline at end of file
Modified: XoopsModules/lexikon/trunk/lexikon/admin/myblocksadmin.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/myblocksadmin.php 2013-02-27 09:15:29 UTC (rev 11116)
+++ XoopsModules/lexikon/trunk/lexikon/admin/myblocksadmin.php 2013-02-27 09:41:47 UTC (rev 11117)
@@ -67,7 +67,7 @@
// get blocks owned by the module (Imported from xoopsblock.php then modified)
//$block_arr =& XoopsBlock::getByModule( $target_mid ) ;
-$db =& Database::getInstance();
+$db =& XoopsDatabaseFactory::getDatabaseConnection();
$sql = "SELECT * FROM ".$db->prefix("newblocks")." WHERE mid='$target_mid' ORDER BY visible DESC,side,weight";
$result = $db->query($sql);
$block_arr = array();
@@ -161,7 +161,7 @@
}
// target modules
- $db =& Database::getInstance();
+ $db =& XoopsDatabaseFactory::getDatabaseConnection();
$result = $db->query( "SELECT module_id FROM ".$db->prefix('block_module_link')." WHERE block_id='$bid'" ) ;
$selected_mids = array();
while ( list( $selected_mid ) = $db->fetchRow( $result ) ) {
@@ -324,7 +324,7 @@
xoops_cp_header() ;
include_once XOOPS_ROOT_PATH."/modules/".$xoopsModule->dirname()."/admin/functions.php";
-lx_adminMenu(3, _AM_LX_BLOCKS);
+//lx_adminMenu(3, _AM_LX_BLOCKS);
if( ! empty( $block_arr ) ) {
echo "<h4 style='text-align:left;'>$target_mname : "._AM_BADMIN."</h4>\n" ;
Modified: XoopsModules/lexikon/trunk/lexikon/admin/myblocksadmin2.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/myblocksadmin2.php 2013-02-27 09:15:29 UTC (rev 11116)
+++ XoopsModules/lexikon/trunk/lexikon/admin/myblocksadmin2.php 2013-02-27 09:41:47 UTC (rev 11117)
@@ -63,7 +63,7 @@
if (!$sysperm_handler->checkRight('system_admin', XOOPS_SYSTEM_BLOCK, $xoopsUser->getGroups())) redirect_header( XOOPS_URL.'/user.php' , 1 , _NOPERM ) ;
// get blocks owned by the module (Imported from xoopsblock.php then modified)
-$db =& Database::getInstance();
+$db =& XoopsDatabaseFactory::getDatabaseConnection();
$sql = "SELECT bid,name,show_func,func_file,template FROM ".$db->prefix("newblocks")." WHERE mid='$target_mid'";
$result = $db->query($sql);
$block_arr = array();
@@ -333,7 +333,7 @@
xoops_cp_header() ;
//if( file_exists( './mymenu.php' ) ) include( './mymenu.php' ) ;
include_once XOOPS_ROOT_PATH."/modules/".$xoopsModule->dirname()."/admin/functions.php";
-lx_adminMenu(3, _AM_LX_BLOCKS);
+//lx_adminMenu(3, _AM_LX_BLOCKS);
//echo "<h3 style='text-align:left;'>$target_mname</h3>\n" ;
Modified: XoopsModules/lexikon/trunk/lexikon/admin/permissions.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/permissions.php 2013-02-27 09:15:29 UTC (rev 11116)
+++ XoopsModules/lexikon/trunk/lexikon/admin/permissions.php 2013-02-27 09:41:47 UTC (rev 11117)
@@ -32,7 +32,7 @@
include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
$myts =& MyTextSanitizer::getInstance();
xoops_cp_header();
-lx_adminmenu(4, _AM_LX_PERMFORM);
+//lx_adminmenu(4, _AM_LX_PERMFORM);
$permtoset= isset($_POST['permtoset']) ? intval($_POST['permtoset']) : 1;
$selected=array('','','','');
Modified: XoopsModules/lexikon/trunk/lexikon/admin/preferences.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/preferences.php 2013-02-27 09:15:29 UTC (rev 11116)
+++ XoopsModules/lexikon/trunk/lexikon/admin/preferences.php 2013-02-27 09:41:47 UTC (rev 11117)
@@ -26,7 +26,7 @@
ob_start();
-lx_adminmenu(0, _PREFERENCES);
+//lx_adminmenu(0, _PREFERENCES);
$btnsbar = ob_get_contents();
ob_end_clean();
Modified: XoopsModules/lexikon/trunk/lexikon/admin/statistics.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/statistics.php 2013-02-27 09:15:29 UTC (rev 11116)
+++ XoopsModules/lexikon/trunk/lexikon/admin/statistics.php 2013-02-27 09:41:47 UTC (rev 11117)
@@ -44,7 +44,7 @@
xoops_cp_header();
$myts =& MyTextSanitizer::getInstance();
- lx_adminMenu(3, _INFO);
+// lx_adminMenu(3, _INFO);
$stats = array();
//$stats=lx_GetStatistics(10);
Modified: XoopsModules/lexikon/trunk/lexikon/admin/submissions.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/submissions.php 2013-02-27 09:15:29 UTC (rev 11116)
+++ XoopsModules/lexikon/trunk/lexikon/admin/submissions.php 2013-02-27 09:41:47 UTC (rev 11117)
@@ -32,7 +32,7 @@
global $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule, $entryID;
$myts =& MyTextSanitizer::getInstance();
- lx_adminMenu(3, _AM_LX_SUBMITS);
+// lx_adminMenu(3, _AM_LX_SUBMITS);
$result01 = $xoopsDB -> query( "SELECT COUNT(*)
FROM " . $xoopsDB -> prefix( "lxcategories" ) . " " );
Deleted: XoopsModules/lexikon/trunk/lexikon/changelog.txt
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/changelog.txt 2013-02-27 09:15:29 UTC (rev 11116)
+++ XoopsModules/lexikon/trunk/lexikon/changelog.txt 2013-02-27 09:41:47 UTC (rev 11117)
@@ -1,95 +0,0 @@
-Lexikon version 1.5 b
-=====================
-- Added XOOPS group permissions
-- Updated plugins with permission query
-- Added upload of category Image
-- Added text/ad-box to frontpage
-- Added tag support
-- Improved blocks
- . Added block pausescroller/ticker/marquee
- . Added marquee to block newest terms
-- modified some options (moved to xoops_version.php)
-
-Lexikon version 1.4
-===================
-- Improved blocks
- . Added block Authors
- . Updated block Spotlight
- . Added Marquee to latest/top terms
-- Improved Wysiwyg formoptions
- . Updated Xoopseditors
- . Added editors to user frontend
-- Added ModuleAdmin GUI
-- Added option to set category layout
-- Added notification by mail on approval
-- Added check for existing terms upon submission
-- Updated social bookmarks
-- Fixed a variety of small bugs
-- Fixed Captcha
-- Fixed RSS Feeds
-
-Lexikon version 1.3
-===================
-- Added block spotlight
-- Added search in glossary comments
-- Added sortable admin Items Summary
-- Added webmastercontent
-- Added Initial selection is now possible
-- Changed linkterms (more options)
-- Fixed pagenav pageinitial 'other'
-- Updated waiting.plugin.php
-- Added option RSS for user/guests
-
-Lexikon version 1.2
-===================
-- Improved blocks
- . Added block categories
- . Updated block alphabet
-- Updated increment author's posts count
-- Added statistics
-- Improved Usability
- . Added Keywords highlighting search
- . Added word censor
- . Added list and profile of authors
- . Added Xoops notifications
- . Added Addthis.com bookmarks option
-- Fixed assignment of terms with accented or umlaut initials
-- Changed linkterms (added option)
-- Changed captcha, rendernav (backend) and some other things
-
-Lexikon version 0.6
-===================
-- Improved system integration
- . Fixed user submissions to be displayed in userinfo.php
- . Added increment author's posts count on each submission
- . Updated waiting.plugin.php added sitemap.plugin.php
-- Fixed microlinks in block randomterm
-- Improved categoryhandling
- . Fixed category listings by weight
- . Changed Category-names are now clickable in all listings
- . Removed option catsperindex (unused)
-- Improved search
- . Added highlight reference (local)
- . Removed autocomplete function
- . Fixed searchresults' microlinks
-- Improved blocks
- . Added block alphabet
- . Fixed some errors in blocks
- . Updated gijoe's myblocksadmin to v. 0.43
- . Added clonable blocks
- . Fixed Terms option block 0/1 remained unused
-- Improved comments
- . Changed comments handling (added icon)
- . Fixed comments to non existent IDs
- . Fixed display comments icon only when allowed by module's options
-- Changed linkterms (added options popup and tooltip)
-- Changed use of HTML in field Reference
-- Added validations in entry.php
-- Added picture labels
-- Removed cleantags
-- Fixed offline terms were visible when accessed directly
-- Changed rendernav (number of pages) and some other things
-
-Lexikon version 0.5
-===================
-Initial Release
\ No newline at end of file
Added: XoopsModules/lexikon/trunk/lexikon/docs/Backup-credits.txt
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/docs/Backup-credits.txt (rev 0)
+++ XoopsModules/lexikon/trunk/lexikon/docs/Backup-credits.txt 2013-02-27 09:41:47 UTC (rev 11117)
@@ -0,0 +1,21 @@
+Credits and Thanks
+-----------------------------------------------------------------------
+This module is based on his module Wordbook 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,
+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
+either directly or indirectly.
+
+Dynamic Drive -> http://www.dynamicdrive.com
+DHTMLGoodies -> http://www.dhtmlgoodies.com
+OpenClipart -> http://www.openclipart.org
+Sweetie Icons -> http://sweetie.sublink.ca
+Mark James -> http://www.famfamfam.com/lab/icons/silk/
+Social Bookmark Icons -> http://www.iconarchive.com
+some icons are licenced to Creative Commons Attribution-ShareAlike 2.0.
+
+
+Version 1.51 was updated to XOOPS 2.5.5 Standard GUI by Michael Beck (Mamba)
\ No newline at end of file
Added: XoopsModules/lexikon/trunk/lexikon/docs/Backup-readme.txt
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/docs/Backup-readme.txt (rev 0)
+++ XoopsModules/lexikon/trunk/lexikon/docs/Backup-readme.txt 2013-02-27 09:41:47 UTC (rev 11117)
@@ -0,0 +1,61 @@
+
+Module Purpose
+-----------------------------------------------------------------------
+Lexikon is designed as a user-friendly glossary application for the XOOPS portal system.
+
+
+Installation Requirements
+-----------------------------------------------------------------------
+XOOPS 2.0.6 +
+
+
+Install Instructions
+-----------------------------------------------------------------------
+Lexikon is installed as a regular XOOPS module:
+1. Copy the complete lexikon folder into the /modules directory of your website.
+2. Upload the files to your website: XOOPS_ROOT_URL/modules/lexikon
+3. Log in to your site as administrator.
+4. Update (or Install) the module using the XOOPS module administration panel
+ at 'System Admin -> Modules'.
+
+5. In case you upgrade the module from a previous version run lexikon/admin/upgrade.php
+6. Don't forget to set the permissions for each category.
+
+Customize the module to suit your demands by setting the configuration options.
+Please note that some options can be set in lexikon/include/common.inc.php.
+
+
+Credits and Thanks
+-----------------------------------------------------------------------
+This module is based on his module Wordbook 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é 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
+either directly or indirectly.
+
+Dynamic Drive -> http://www.dynamicdrive.com
+DHTMLGoodies -> http://www.dhtmlgoodies.com
+OpenClipart -> http://www.openclipart.org
+Sweetie Icons -> http://sweetie.sublink.ca
+Mark James -> http://www.famfamfam.com/lab/icons/silk/
+Social Bookmark Icons -> http://www.iconarchive.com
+some icons are licenced to Creative Commons Attribution-ShareAlike 2.0.
+
+
+History
+-----------------------------------------------------------------------
+18 Dec 2011
+public release
+
+WARNING:
+-----------------------------------------------------------------------
+The Module is still in development. Use at your own risk.
+Some features may be missing or incomplete.
+Bugs may appear, even security holes.
+
+---
+END
+---
\ No newline at end of file
Added: XoopsModules/lexikon/trunk/lexikon/docs/changelog.txt
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/docs/changelog.txt (rev 0)
+++ XoopsModules/lexikon/trunk/lexikon/docs/changelog.txt 2013-02-27 09:41:47 UTC (rev 11117)
@@ -0,0 +1,101 @@
+---------------------------------------
+1.51 Beta 1 2013-02-27
+---------------------------------------
+
+- Converted to XOOPS 2.5.5 Admin GUI (Mamba)
+
+Lexikon version 1.5 b
+=====================
+- Added XOOPS group permissions
+- Updated plugins with permission query
+- Added upload of category Image
+- Added text/ad-box to frontpage
+- Added tag support
+- Improved blocks
+ . Added block pausescroller/ticker/marquee
+ . Added marquee to block newest terms
+- modified some options (moved to xoops_version.php)
+
+Lexikon version 1.4
+===================
+- Improved blocks
+ . Added block Authors
+ . Updated block Spotlight
+ . Added Marquee to latest/top terms
+- Improved Wysiwyg formoptions
+ . Updated Xoopseditors
+ . Added editors to user frontend
+- Added ModuleAdmin GUI
+- Added option to set category layout
+- Added notification by mail on approval
+- Added check for existing terms upon submission
+- Updated social bookmarks
+- Fixed a variety of small bugs
+- Fixed Captcha
+- Fixed RSS Feeds
+
+Lexikon version 1.3
+===================
+- Added block spotlight
+- Added search in glossary comments
+- Added sortable admin Items Summary
+- Added webmastercontent
+- Added Initial selection is now possible
+- Changed linkterms (more options)
+- Fixed pagenav pageinitial 'other'
+- Updated waiting.plugin.php
+- Added option RSS for user/guests
+
+Lexikon version 1.2
+===================
+- Improved blocks
+ . Added block categories
+ . Updated block alphabet
+- Updated increment author's posts count
+- Added statistics
+- Improved Usability
+ . Added Keywords highlighting search
+ . Added word censor
+ . Added list and profile of authors
+ . Added Xoops notifications
+ . Added Addthis.com bookmarks option
+- Fixed assignment of terms with accented or umlaut initials
+- Changed linkterms (added option)
+- Changed captcha, rendernav (backend) and some other things
+
+Lexikon version 0.6
+===================
+- Improved system integration
+ . Fixed user submissions to be displayed in userinfo.php
+ . Added increment author's posts count on each submission
+ . Updated waiting.plugin.php added sitemap.plugin.php
+- Fixed microlinks in block randomterm
+- Improved categoryhandling
+ . Fixed category listings by weight
+ . Changed Category-names are now clickable in all listings
+ . Removed option catsperindex (unused)
+- Improved search
+ . Added highlight reference (local)
+ . Removed autocomplete function
+ . Fixed searchresults' microlinks
+- Improved blocks
+ . Added block alphabet
+ . Fixed some errors in blocks
+ . Updated gijoe's myblocksadmin to v. 0.43
+ . Added clonable blocks
+ . Fixed Terms option block 0/1 remained unused
+- Improved comments
+ . Changed comments handling (added icon)
+ . Fixed comments to non existent IDs
+ . Fixed display comments icon only when allowed by module's options
+- Changed linkterms (added options popup and tooltip)
+- Changed use of HTML in field Reference
+- Added validations in entry.php
+- Added picture labels
+- Removed cleantags
+- Fixed offline terms were visible when accessed directly
+- Changed rendernav (number of pages) and some other things
+
+Lexikon version 0.5
+===================
+Initial Release
Added: XoopsModules/lexikon/trunk/lexikon/docs/credits.txt
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/docs/credits.txt (rev 0)
+++ XoopsModules/lexikon/trunk/lexikon/docs/credits.txt 2013-02-27 09:41:47 UTC (rev 11117)
@@ -0,0 +1,21 @@
+Credits and Thanks
+-----------------------------------------------------------------------
+This module is based on his module Wordbook 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,
+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
+either directly or indirectly.
+
+Dynamic Drive -> http://www.dynamicdrive.com
+DHTMLGoodies -> http://www.dhtmlgoodies.com
+OpenClipart -> http://www.openclipart.org
+Sweetie Icons -> http://sweetie.sublink.ca
+Mark James -> http://www.famfamfam.com/lab/icons/silk/
+Social Bookmark Icons -> http://www.iconarchive.com
+some icons are licenced to Creative Commons Attribution-ShareAlike 2.0.
+
+
+Version 1.51 was updated to XOOPS 2.5.5 Standard GUI by Michael Beck (Mamba)
\ No newline at end of file
Added: XoopsModules/lexikon/trunk/lexikon/docs/index.html
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/docs/index.html (rev 0)
+++ XoopsModules/lexikon/trunk/lexikon/docs/index.html 2013-02-27 09:41:47 UTC (rev 11117)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/lexikon/trunk/lexikon/docs/install.txt
===================================================================
--...
[truncated message content] |
