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

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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&amp;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 . "' >&nbsp;&nbsp;";
-	echo "<input type='button' name='button' onclick=\"location='entry.php?op=add'\" value='" . _AM_LX_CREATEENTRY . "'>&nbsp;&nbsp;";
-	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 . "'>&nbsp;&nbsp;";
-	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 ...
 
[truncated message content]

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

The world's leading content management systems (CMS) written in PHP

xoops-svn