Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[11456] XoopsModules/lexikon/trunk/lexikon
|
From: <be...@us...> - 2013-04-26 14:39:04
|
Revision: 11456
http://sourceforge.net/p/xoops/svn/11456
Author: beckmi
Date: 2013-04-26 14:38:58 +0000 (Fri, 26 Apr 2013)
Log Message:
-----------
Updating to Beta 2 (see changelog)
Modified Paths:
--------------
XoopsModules/lexikon/trunk/lexikon/admin/admin.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/main.php
XoopsModules/lexikon/trunk/lexikon/admin/menu.php
XoopsModules/lexikon/trunk/lexikon/admin/myblockform.php
XoopsModules/lexikon/trunk/lexikon/admin/myblocksadmin.php
XoopsModules/lexikon/trunk/lexikon/admin/myblocksadmin2.php
XoopsModules/lexikon/trunk/lexikon/admin/mygrouppermform.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/admin/upgrade.php
XoopsModules/lexikon/trunk/lexikon/authorlist.php
XoopsModules/lexikon/trunk/lexikon/blocks/categories_block.php
XoopsModules/lexikon/trunk/lexikon/blocks/entries_authors.php
XoopsModules/lexikon/trunk/lexikon/blocks/entries_initial.php
XoopsModules/lexikon/trunk/lexikon/blocks/entries_new.php
XoopsModules/lexikon/trunk/lexikon/blocks/entries_scrolling.php
XoopsModules/lexikon/trunk/lexikon/blocks/entries_spot.php
XoopsModules/lexikon/trunk/lexikon/blocks/entries_top.php
XoopsModules/lexikon/trunk/lexikon/blocks/random_term.php
XoopsModules/lexikon/trunk/lexikon/category.php
XoopsModules/lexikon/trunk/lexikon/content.php
XoopsModules/lexikon/trunk/lexikon/docs/changelog.txt
XoopsModules/lexikon/trunk/lexikon/docs/lang_diff.txt
XoopsModules/lexikon/trunk/lexikon/entry.php
XoopsModules/lexikon/trunk/lexikon/include/functions.php
XoopsModules/lexikon/trunk/lexikon/include/requestform.php
XoopsModules/lexikon/trunk/lexikon/include/storyform.inc.php
XoopsModules/lexikon/trunk/lexikon/include/syndication.inc.php
XoopsModules/lexikon/trunk/lexikon/index.php
XoopsModules/lexikon/trunk/lexikon/language/english/admin.php
XoopsModules/lexikon/trunk/lexikon/language/english/blocks.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/language/german/blocks.php
XoopsModules/lexikon/trunk/lexikon/language/german/main.php
XoopsModules/lexikon/trunk/lexikon/language/german/modinfo.php
XoopsModules/lexikon/trunk/lexikon/letter.php
XoopsModules/lexikon/trunk/lexikon/popup.php
XoopsModules/lexikon/trunk/lexikon/print.php
XoopsModules/lexikon/trunk/lexikon/profile.php
XoopsModules/lexikon/trunk/lexikon/request.php
XoopsModules/lexikon/trunk/lexikon/rss.php
XoopsModules/lexikon/trunk/lexikon/search.php
XoopsModules/lexikon/trunk/lexikon/submit.php
XoopsModules/lexikon/trunk/lexikon/templates/blocks/entries_spot.html
XoopsModules/lexikon/trunk/lexikon/templates/lx_authorlist.html
XoopsModules/lexikon/trunk/lexikon/templates/lx_bookmark.html
XoopsModules/lexikon/trunk/lexikon/templates/lx_category.html
XoopsModules/lexikon/trunk/lexikon/templates/lx_content.html
XoopsModules/lexikon/trunk/lexikon/templates/lx_entry.html
XoopsModules/lexikon/trunk/lexikon/templates/lx_header.html
XoopsModules/lexikon/trunk/lexikon/templates/lx_index.html
XoopsModules/lexikon/trunk/lexikon/templates/lx_letter.html
XoopsModules/lexikon/trunk/lexikon/templates/lx_profile.html
XoopsModules/lexikon/trunk/lexikon/templates/lx_request.html
XoopsModules/lexikon/trunk/lexikon/templates/lx_search.html
XoopsModules/lexikon/trunk/lexikon/templates/lx_submit.html
XoopsModules/lexikon/trunk/lexikon/templates/lx_syndication.html
XoopsModules/lexikon/trunk/lexikon/templates/lx_topten.html
XoopsModules/lexikon/trunk/lexikon/xoops_version.php
Modified: XoopsModules/lexikon/trunk/lexikon/admin/admin.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/admin.php 2013-04-26 09:16:47 UTC (rev 11455)
+++ XoopsModules/lexikon/trunk/lexikon/admin/admin.php 2013-04-26 14:38:58 UTC (rev 11456)
@@ -41,7 +41,7 @@
// include "../../mainfile.php"; GIJ
include XOOPS_ROOT_PATH."/include/cp_functions.php";
-include_once XOOPS_ROOT_PATH."/class/xoopsmodule.php";
+include_once XOOPS_ROOT_PATH."/kernel/module.php";
include_once "../include/gtickets.php" ;// GIJ
$admintest = 0;
Modified: XoopsModules/lexikon/trunk/lexikon/admin/admin_header.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/admin_header.php 2013-04-26 09:16:47 UTC (rev 11455)
+++ XoopsModules/lexikon/trunk/lexikon/admin/admin_header.php 2013-04-26 14:38:58 UTC (rev 11456)
@@ -31,7 +31,7 @@
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."/kernel/module.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";
Modified: XoopsModules/lexikon/trunk/lexikon/admin/category.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/category.php 2013-04-26 09:16:47 UTC (rev 11455)
+++ XoopsModules/lexikon/trunk/lexikon/admin/category.php 2013-04-26 14:38:58 UTC (rev 11456)
@@ -12,6 +12,11 @@
include( "admin_header.php" );
$myts =& MyTextSanitizer::getInstance();
xoops_cp_header();
+xoops_load('XoopsUserUtility');
+$indexAdmin = new ModuleAdmin();
+echo $indexAdmin->addNavigation('category.php');
+$indexAdmin->addItemButton(_AM_LEXIKON_CREATECAT, 'category.php?op=addcat', 'add');
+echo $indexAdmin->renderButton('left');
$op = '';
/* -- Available operations -- */
@@ -29,7 +34,7 @@
global $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule, $entryID, $pathIcon16;
$myts =& MyTextSanitizer::getInstance();
-// lx_adminMenu(1, _AM_LX_CATS);
+// lx_adminMenu(1, _AM_LEXIKON_CATS);
$result01 = $xoopsDB -> query( "SELECT COUNT(*)
FROM " . $xoopsDB -> prefix( "lxcategories" ) . " " );
list( $totalcategories ) = $xoopsDB -> fetchRow( $result01 );
@@ -49,26 +54,25 @@
WHERE submit = '1' AND request = '1' " );
list( $totalrequested ) = $xoopsDB -> fetchRow( $result04 );
- 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>
- <td class='odd'>" . _AM_LX_TOTALREQ . "</td><td align='center' class='even'>" . $totalrequested . "</td>
- </tr></table>
- <br /><br />";
+// echo "<table width='100%' class='outer' style=\"margin-top: 6px; clear:both;\" cellspacing='2' cellpadding='3' border='0' ><tr>";
+// echo "<td class='odd'>" . _AM_LEXIKON_TOTALENTRIES . "</td><td align='center' class='even'>" . $totalpublished . "</td>";
+// if ($xoopsModuleConfig['multicats'] == 1) {
+// echo "<td class='odd'>" . _AM_LEXIKON_TOTALCATS . "</td><td align='center' class='even'>" . $totalcategories . "</td>";
+// }
+// echo "<td class='odd'>" . _AM_LEXIKON_TOTALSUBM . "</td><td align='center' class='even'>" . $totalsubmitted . "</td>
+// <td class='odd'>" . _AM_LEXIKON_TOTALREQ . "</td><td align='center' class='even'>" . $totalrequested . "</td>
+// </tr></table>
+// <br /><br />";
if ($xoopsModuleConfig['multicats'] == 1) {
/**
* Code to show existing categories
**/
- echo" <A href='category.php?op=addcat'>"._AM_LX_CREATECAT."</a><br /><br />
- <table class='outer' width='100%' border='0'>
+ echo" <table class='outer' width='100%' border='0'>
<tr>
<td colspan='7' class='odd'>
- <strong>". _AM_LX_SHOWCATS . ' (' . $totalcategories . ')'. "</strong></td></TR>";
+ <strong>". _AM_LEXIKON_SHOWCATS . ' (' . $totalcategories . ')'. "</strong></td></TR>";
echo "<tr>";
// create existing columns table //doppio
$resultC1 = $xoopsDB -> query( "SELECT COUNT(*)
@@ -80,14 +84,16 @@
ORDER BY weight";
$resultC2 = $xoopsDB -> query( $sql, $xoopsModuleConfig['perpage'], $startcat );
- echo "<td width='40' class='odd' align='center'><b>" . _AM_LX_ID . "</b></td>
- <td class='odd' align='center'><b>" . _AM_LX_WEIGHT . "</b></td>
- <td width='30%' class='odd' align='center'><b>" . _AM_LX_CATNAME . "</b></td>
- <td width='10' class='odd' align='center'><b>" . _AM_LX_ENTRIES . "</b></td>
- <td width='*' class='odd' align='center'><b>" . _AM_LX_DESCRIP . "</b></td>
- <td width='60' class='odd' align='center'><b>" . _AM_LX_ACTION . "</b></td>
+ echo "<th width='40' align='center'><b>" . _AM_LEXIKON_ID . "</b></td>
+ <th align='center'><b>" . _AM_LEXIKON_WEIGHT . "</b></td>
+ <th width='30%' align='center'><b>" . _AM_LEXIKON_CATNAME . "</b></td>
+ <th width='10' align='center'><b>" . _AM_LEXIKON_ENTRIES . "</b></td>
+ <th width='*' align='center'><b>" . _AM_LEXIKON_DESCRIP . "</b></td>
+ <th width='60' align='center'><b>" . _AM_LEXIKON_ACTION . "</b></td>
</tr>";
+
+ $class = "odd";
if ( $numrows > 0 ) // That is, if there ARE columns in the system
{
while ( list( $categoryID, $name, $description, $total, $weight ) = $xoopsDB -> fetchrow( $resultC2 ) )
@@ -95,23 +101,26 @@
{
$name = $myts -> htmlSpecialChars( $name );
$description = $myts -> htmlSpecialChars(xoops_substr( strip_tags( $description ),0,60));
- $modify = "<a href='category.php?op=mod&categoryID=" . $categoryID . "'><img src=" . $pathIcon16."/edit.png width='16' height='16' ALT='"._AM_LX_EDITCAT."'></a>";
- $delete = "<a href='category.php?op=del&categoryID=" . $categoryID . "'><img src=" . $pathIcon16."/delete.png width='16' height='16' ALT='"._AM_LX_DELETECAT."'></a>";
+ $modify = "<a href='category.php?op=mod&categoryID=" . $categoryID . "'><img src=" . $pathIcon16."/edit.png width='16' height='16' ALT='"._AM_LEXIKON_EDITCAT."'></a>";
+ $delete = "<a href='category.php?op=del&categoryID=" . $categoryID . "'><img src=" . $pathIcon16."/delete.png width='16' height='16' ALT='"._AM_LEXIKON_DELETECAT."'></a>";
- echo "<tr>
- <td class='even' align='center'>" . $categoryID . "</td>
- <td class='odd' width='10' align='center'>" . $weight . "</td>
- <td class='odd' align='left'><a href='../category.php?categoryID=" . $categoryID . "'>" . $name . "</td>
- <td class='odd' align='left'>" . $total . "</td>
- <td class='odd' align='left'>" . $description . "</td>
- <td class='even' align='center'> $modify $delete </td>
+ echo "<tr class='" . $class . "'>";
+ $class = ($class == "even") ? "odd" : "even";
+
+ echo "
+ <td align='center'>" . $categoryID . "</td>
+ <td width='10' align='center'>" . $weight . "</td>
+ <td align='left'><a href='../category.php?categoryID=" . $categoryID . "'>" . $name . "</td>
+ <td align='left'>" . $total . "</td>
+ <td align='left'>" . $description . "</td>
+ <td align='center'> $modify $delete </td>
</tr></DIV>";
}
}
else // that is, $numrows = 0, there's no columns yet
{
echo "<tr>";
- echo "<td class='odd' align='center' colspan= '7'>"._AM_LX_NOCATS."</td>";
+ echo "<td class='odd' align='center' colspan= '7'>"._AM_LEXIKON_NOCATS."</td>";
echo "</tr></DIV>";
$categoryID = '0';
}
@@ -121,7 +130,7 @@
echo "<br /><br />\n";
echo "</div>";
} else {
- redirect_header( "index.php", 1, sprintf( _AM_LX_SINGLECAT, '' ) );
+ redirect_header( "index.php", 1, sprintf( _AM_LEXIKON_SINGLECAT, '' ) );
}
}
@@ -158,47 +167,47 @@
$groups = $gperm_handler -> getGroupIds("lexikon_view", $categoryID, $xoopsModule -> getVar('mid'));
$groups = $groups;
if ( $xoopsDB -> getRowsNum( $result ) == 0 ) {
- redirect_header( "index.php", 1, _AM_LX_NOCATTOEDIT );
+ redirect_header( "index.php", 1, _AM_LEXIKON_NOCATTOEDIT );
exit();
}
if ( $xoopsDB -> getRowsNum( $result ) == 0 ) {
- redirect_header( "index.php", 1, _AM_LX_NOCATTOEDIT );
+ redirect_header( "index.php", 1, _AM_LEXIKON_NOCATTOEDIT );
exit();
}
//$myts =& MyTextSanitizer::getInstance();
-// lx_adminMenu(1, _AM_LX_CATS);
+// lx_adminMenu(1, _AM_LEXIKON_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' ) );
+ echo "<h3 style=\"color: #2F5376; margin-top: 6px; \">" . _AM_LEXIKON_CATSHEADER . "</h3>";
+ $sform = new XoopsThemeForm( _AM_LEXIKON_MODCAT . ": $name" , "op", xoops_getenv( 'PHP_SELF' ) );
} else {
//$myts =& MyTextSanitizer::getInstance();
-// lx_adminMenu(1, _AM_LX_CATS);
+// lx_adminMenu(1, _AM_LEXIKON_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' ) );
+ echo "<h3 style=\"color: #2F5376; margin-top: 6px; \">" . _AM_LEXIKON_CATSHEADER . "</h3>";
+ $sform = new XoopsThemeForm( _AM_LEXIKON_NEWCAT, "op", xoops_getenv( 'PHP_SELF' ) );
}
$sform -> setExtra( 'enctype="multipart/form-data"' );
- $sform -> addElement( new XoopsFormText( _AM_LX_CATNAME, 'name', 50, 80, $name ), true );
+ $sform -> addElement( new XoopsFormText( _AM_LEXIKON_CATNAME, 'name', 50, 80, $name ), true );
- $editor = lx_getWysiwygForm( _AM_LX_CATDESCRIPT, 'description', $description, 7, 60 );
+ $editor = lx_getWysiwygForm( _AM_LEXIKON_CATDESCRIPT, 'description', $description, 7, 60 );
$sform -> addElement( $editor,true );
unset($editor);
- $sform -> addElement( new XoopsFormText( _AM_LX_CATPOSIT, 'weight', 4, 4, $weight ), true );
+ $sform -> addElement( new XoopsFormText( _AM_LEXIKON_CATPOSIT, 'weight', 4, 4, $weight ), true );
$sform -> addElement( new XoopsFormHidden( 'categoryID', $categoryID ) );
//CategoryImage
if ($xoopsModuleConfig['useshots'] == 1) {
//CategoryImage :: Common querys from Article module by phppp
- $image_option_tray = new XoopsFormElementTray("<b>"._AM_LX_CATIMGUPLOAD."</b>", "<br />");
+ $image_option_tray = new XoopsFormElementTray("<b>"._AM_LEXIKON_CATIMGUPLOAD."</b>", "<br />");
$image_option_tray->addElement(new XoopsFormFile("", "userfile",""));
$sform->addElement($image_option_tray);
unset($image_tray);
unset($image_option_tray);
$path_catimg = "modules/".$xoopsModule->getVar('dirname')."/images/uploads";
- $image_option_tray = new XoopsFormElementTray(_AM_LX_CATIMAGE."<br />"._AM_LX_CATIMG_DSC."<br />".$path_catimg, "<br />");
- //$image_option_tray = new XoopsFormElementTray(_AM_LX_CATIMAGE.'');
+ $image_option_tray = new XoopsFormElementTray(_AM_LEXIKON_CATIMAGE."<br />"._AM_LEXIKON_CATIMG_DSC."<br />".$path_catimg, "<br />");
+ //$image_option_tray = new XoopsFormElementTray(_AM_LEXIKON_CATIMAGE.'');
$image_array =& XoopsLists::getImgListAsArray(XOOPS_ROOT_PATH."/".$path_catimg."/");
array_unshift($image_array, _NONE);
@@ -215,7 +224,7 @@
$image_option_tray->addElement($image_tray);
$sform->addElement($image_option_tray);
}
- $sform -> addElement(new XoopsFormSelectGroup(_AM_LX_CAT_GROUPSVIEW, "groups", true, $groups, 5, true));
+ $sform -> addElement(new XoopsFormSelectGroup(_AM_LEXIKON_CAT_GROUPSVIEW, "groups", true, $groups, 5, true));
$button_tray = new XoopsFormElementTray( '', '' );
$hidden = new XoopsFormHidden( 'op', 'addcategory' );
@@ -223,23 +232,23 @@
// No ID for column -- then it's new column, button says 'Create'
if ( !$categoryID ) {
- $butt_create = new XoopsFormButton( '', '', _AM_LX_CREATE, 'submit' );
+ $butt_create = new XoopsFormButton( '', '', _AM_LEXIKON_CREATE, 'submit' );
$butt_create->setExtra('onclick="this.form.elements.op.value=\'addcategory\'"');
$button_tray->addElement( $butt_create );
- $butt_clear = new XoopsFormButton( '', '', _AM_LX_CLEAR, 'reset' );
+ $butt_clear = new XoopsFormButton( '', '', _AM_LEXIKON_CLEAR, 'reset' );
$button_tray->addElement( $butt_clear );
- $butt_cancel = new XoopsFormButton( '', '', _AM_LX_CANCEL, 'button' );
+ $butt_cancel = new XoopsFormButton( '', '', _AM_LEXIKON_CANCEL, 'button' );
$butt_cancel->setExtra('onclick="history.go(-1)"');
$button_tray->addElement( $butt_cancel );
} else // button says 'Update'
{
- $butt_create = new XoopsFormButton( '', '', _AM_LX_MODIFY, 'submit' );
+ $butt_create = new XoopsFormButton( '', '', _AM_LEXIKON_MODIFY, 'submit' );
$butt_create->setExtra('onclick="this.form.elements.op.value=\'addcategory\'"');
$button_tray->addElement( $butt_create );
- $butt_cancel = new XoopsFormButton( '', '', _AM_LX_CANCEL, 'button' );
+ $butt_cancel = new XoopsFormButton( '', '', _AM_LEXIKON_CANCEL, 'button' );
$butt_cancel->setExtra('onclick="history.go(-1)"');
$button_tray->addElement( $butt_cancel );
}
@@ -287,11 +296,11 @@
xoops_notification_deletebyitem($xoopsModule->getVar('mid'), 'global', $categoryID);
xoops_notification_deletebyitem($xoopsModule->getVar('mid'), 'category', $categoryID);
- redirect_header("category.php",1,sprintf( _AM_LX_CATISDELETED, $name ) );
+ redirect_header("category.php",1,sprintf( _AM_LEXIKON_CATISDELETED, $name ) );
exit();
} else {
//xoops_cp_header();
- xoops_confirm(array('op' => 'del', 'categoryID' => $categoryID, 'ok' => 1, 'name' => $name ), 'category.php', _AM_LX_DELETETHISCAT . "<br /><br>" . $name, _AM_LX_DELETE );
+ xoops_confirm(array('op' => 'del', 'categoryID' => $categoryID, 'ok' => 1, 'name' => $name ), 'category.php', _AM_LEXIKON_DELETETHISCAT . "<br /><br>" . $name, _AM_LEXIKON_DELETE );
}
}
@@ -323,7 +332,7 @@
if (!$uploader->upload()) {
echo $uploader->getErrors();
} else {
- echo '<h4>'._AM_LX_FILESUCCESS.'</h4>';
+ echo '<h4>'._AM_LEXIKON_FILESUCCESS.'</h4>';
$logourl = $uploader->getSavedFileName();
}
} else {
@@ -360,10 +369,10 @@
$notification_handler->triggerEvent( 'global', 0, 'new_category', $tags);
}
lx_save_Permissions($groups, $categoryID, "lexikon_view");
- redirect_header( "category.php", 1, _AM_LX_CATCREATED );
+ redirect_header( "category.php", 1, _AM_LEXIKON_CATCREATED );
exit();
} else {
- redirect_header( "index.php", 1, _AM_LX_NOTUPDATED );
+ redirect_header( "index.php", 1, _AM_LEXIKON_NOTUPDATED );
exit();
}
} else {
@@ -372,10 +381,10 @@
SET name = '$name', description = '$description', weight = '$weight' , logourl = '$logourl'
WHERE categoryID = '$categoryID'" ) ) {
lx_save_Permissions($groups, $categoryID, "lexikon_view");
- redirect_header( "category.php", 1, _AM_LX_CATMODIFIED );
+ redirect_header( "category.php", 1, _AM_LEXIKON_CATMODIFIED );
exit();
} else {
- redirect_header( "index.php", 1, _AM_LX_NOTUPDATED );
+ redirect_header( "index.php", 1, _AM_LEXIKON_NOTUPDATED );
exit();
}
}
Modified: XoopsModules/lexikon/trunk/lexikon/admin/entry.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/entry.php 2013-04-26 09:16:47 UTC (rev 11455)
+++ XoopsModules/lexikon/trunk/lexikon/admin/entry.php 2013-04-26 14:38:58 UTC (rev 11456)
@@ -13,6 +13,10 @@
include( "admin_header.php" );
$myts =& MyTextSanitizer::getInstance();
xoops_cp_header();
+$indexAdmin = new ModuleAdmin();
+echo $indexAdmin->addNavigation('entry.php');
+$indexAdmin->addItemButton(_AM_LEXIKON_CREATEENTRY, 'entry.php?op=add', 'add');
+echo $indexAdmin->renderButton('left');
$op = '';
#if ( isset( $_GET['op'] ) ) $op = $_GET['op'];
@@ -24,7 +28,8 @@
global $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule, $entryID, $pathIcon16;
include_once XOOPS_ROOT_PATH . "/class/xoopslists.php";
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
-// lx_adminMenu(2, _AM_LX_ENTRIES);
+ xoops_load('XoopsUserUtility');
+// lx_adminMenu(2, _AM_LEXIKON_ENTRIES);
$startentry = isset( $_GET['startentry'] ) ? intval( $_GET['startentry'] ) : 0;
$startcat = isset( $_GET['startcat'] ) ? intval( $_GET['startcat'] ) : 0;
@@ -52,16 +57,16 @@
WHERE submit = '1' AND request = '1' " );
list( $totalrequested ) = $xoopsDB -> fetchRow( $result04 );
- 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>
- <td class='odd'>" . _AM_LX_TOTALREQ . "</td><td align='center' class='even'>" . $totalrequested . "</td>
- </tr></table>
- <br /><br />";
-
+// echo "<table width='100%' class='outer' style=\"margin-top: 6px; clear:both;\" cellspacing='2' cellpadding='3' border='0' ><tr>";
+// echo "<td class='odd'>" . _AM_LEXIKON_TOTALENTRIES . "</td><td align='center' class='even'>" . $totalpublished . "</td>";
+// if ($xoopsModuleConfig['multicats'] == 1) {
+// echo "<td class='odd'>" . _AM_LEXIKON_TOTALCATS . "</td><td align='center' class='even'>" . $totalcategories . "</td>";
+// }
+// echo "<td class='odd'>" . _AM_LEXIKON_TOTALSUBM . "</td><td align='center' class='even'>" . $totalsubmitted . "</td>
+// <td class='odd'>" . _AM_LEXIKON_TOTALREQ . "</td><td align='center' class='even'>" . $totalrequested . "</td>
+// </tr></table>
+// <br /><br />";
+//
/**
* Code to show existing terms
**/
@@ -79,25 +84,25 @@
$resultA2 = $xoopsDB -> query( $sql, $xoopsModuleConfig['perpage'], $startentry );
$result = $xoopsDB->query($sql, $xoopsModuleConfig['perpage']);
- echo " <A href='entry.php?op=add'>". _AM_LX_CREATEENTRY ."</A><br /><br/>
- <table class='outer' width='100%' border='0'>
+ echo " <table class='outer' width='100%' border='0'>
<tr>
<td colspan='7' class='odd'>
- <strong>". _AM_LX_SHOWENTRIES . ' (' . $totalpublished . ')'. "</strong></td></TR>";
+ <strong>". _AM_LEXIKON_SHOWENTRIES . ' (' . $totalpublished . ')'. "</strong></td></TR>";
echo "<tr>";
- echo "<td width='40' class='odd' align='center'><b>" . _AM_LX_ENTRYID . "</A></b></td>";
+ echo "<th width='40' align='center'><b>" . _AM_LEXIKON_ENTRYID . "</A></b></td>";
if ($xoopsModuleConfig['multicats'] == 1) {
- echo "<td width='20%' class='odd' align='center'><b>" . _AM_LX_ENTRYCATNAME . "</b></td>";
+ echo "<th width='20%' align='center'><b>" . _AM_LEXIKON_ENTRYCATNAME . "</b></td>";
}
- echo "<td width='*' class='odd' align='center'><b>" . _AM_LX_ENTRYTERM . "</b></td>
- <td width='90' class='odd' align='center'><b>" . _AM_LX_SUBMITTER . "</b></td>
- <td width='90' class='odd' align='center'><b>" . _AM_LX_ENTRYCREATED . "</b></td>
- <td width='30' class='odd' align='center'><b>" . _AM_LX_STATUS . "</b></td>
- <td width='60' class='odd' align='center'><b>" . _AM_LX_ACTION . "</b></td>
+ echo "<th width='*' align='center'><b>" . _AM_LEXIKON_ENTRYTERM . "</b></td>
+ <th width='90' align='center'><b>" . _AM_LEXIKON_SUBMITTER . "</b></td>
+ <th width='90' align='center'><b>" . _AM_LEXIKON_ENTRYCREATED . "</b></td>
+ <th width='30' align='center'><b>" . _AM_LEXIKON_STATUS . "</b></td>
+ <th width='60' align='center'><b>" . _AM_LEXIKON_ACTION . "</b></td>
</tr>";
+ $class = "odd";
+ if ( $numrows > 0 ) // That is, if there ARE entries in the system
- if ( $numrows > 0 ) // That is, if there ARE entries in the system
{
while ( list( $entryID, $categoryID, $term, $uid, $created, $offline ) = $xoopsDB -> fetchrow( $resultA2 ) ) {
$resultA3 = $xoopsDB -> query( "SELECT name
@@ -105,21 +110,23 @@
WHERE categoryID = '$categoryID'" );
list( $name ) = $xoopsDB -> fetchrow( $resultA3 );
- $sentby = xoops_getLinkedUnameFromId($uid);
+ $sentby = XoopsUserUtility::getUnameFromId($uid);
$catname = $myts -> htmlSpecialChars( $name );
$term = $myts -> htmlSpecialChars( $term );
$created= formatTimestamp( $created, 's' );
- $modify = "<a href='entry.php?op=mod&entryID=" . $entryID . "'><img src=" . $pathIcon16."/edit.png width='16' height='16' ALT='"._AM_LX_EDITENTRY."'></a>";
- $delete = "<a href='entry.php?op=del&entryID=" . $entryID . "'><img src=" . $pathIcon16."/delete.png width='16' height='16' ALT='"._AM_LX_DELETEENTRY."'></a>";
+ $modify = "<a href='entry.php?op=mod&entryID=" . $entryID . "'><img src=" . $pathIcon16."/edit.png width='16' height='16' ALT='"._AM_LEXIKON_EDITENTRY."'></a>";
+ $delete = "<a href='entry.php?op=del&entryID=" . $entryID . "'><img src=" . $pathIcon16."/delete.png width='16' height='16' ALT='"._AM_LEXIKON_DELETEENTRY."'></a>";
if ( $offline == 0 ) {
- $status = "<img src=" . XOOPS_URL . "/modules/" . $xoopsModule->dirname() . "/images/icon/on.gif alt='"._AM_LX_ENTRYISON."'>";
+ $status = "<img src=" . XOOPS_URL . "/modules/" . $xoopsModule->dirname() . "/images/icon/on.gif alt='"._AM_LEXIKON_ENTRYISON."'>";
} else {
- $status = "<img src=" . XOOPS_URL . "/modules/" . $xoopsModule->dirname() . "/images/icon/off.gif alt='"._AM_LX_ENTRYISOFF."'>";
+ $status = "<img src=" . XOOPS_URL . "/modules/" . $xoopsModule->dirname() . "/images/icon/off.gif alt='"._AM_LEXIKON_ENTRYISOFF."'>";
}
- echo "<tr>";
- echo "<td class='even' align='center'>" . $entryID . "</td>";
+ echo "<tr class='" . $class . "'>";
+ $class = ($class == "even") ? "odd" : "even";
+ echo "<td align='center'>" . $entryID . "</td>";
+
if ($xoopsModuleConfig['multicats'] == 1) {
echo "<td class='odd' align='left'>" . $catname . "</td>";
}
@@ -135,7 +142,7 @@
else // that is, $numrows = 0, there's no entries yet
{
echo "<tr>";
- echo "<td class='odd' align='center' colspan= '7'>"._AM_LX_NOTERMS."</td>";
+ echo "<td class='odd' align='center' colspan= '7'>"._AM_LEXIKON_NOTERMS."</td>";
echo "</tr></DIV>";
}
echo "</table>\n";
@@ -165,7 +172,7 @@
if(!isset($term)) { $term = ""; }
if(!isset($init)) { $init = ""; }
if (!isset($definition)) {
- $definition = _AM_LX_WRITEHERE;
+ $definition = _AM_LEXIKON_WRITEHERE;
}
if(!isset($ref)) { $ref = ""; }
if(!isset($url)) { $url = ""; }
@@ -180,34 +187,34 @@
list( $categoryID, $term, $init, $definition, $ref, $url, $uid, $submit, $datesub, $html, $smiley, $xcodes, $breaks, $block, $offline, $notifypub, $request ) = $xoopsDB -> fetchrow( $result );
if ( !$xoopsDB -> getRowsNum( $result ) ) {
- redirect_header( "index.php", 1, _AM_LX_NOENTRYTOEDIT );
+ redirect_header( "index.php", 1, _AM_LEXIKON_NOENTRYTOEDIT );
exit();
}
$term = $myts->stripSlashesGPC($myts->htmlSpecialChars($term));
-// lx_adminMenu(2, _AM_LX_ADMINENTRYMNGMT);
+// lx_adminMenu(2, _AM_LEXIKON_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' ) );
+ echo "<h3 style=\"color: #2F5376; margin-top: 6px; \">" . _AM_LEXIKON_ADMINENTRYMNGMT . "</h3>";
+ $sform = new XoopsThemeForm( _AM_LEXIKON_MODENTRY . ": $term" , "op", xoops_getenv( 'PHP_SELF' ) );
} else // there's no parameter, so we're adding an entry
{
$result01 = $xoopsDB -> query( "SELECT COUNT(*) FROM " . $xoopsDB -> prefix( "lxcategories" ) . " " );
list( $totalcats ) = $xoopsDB -> fetchRow( $result01 );
if ( $totalcats == 0 && $xoopsModuleConfig['multicats'] == 1 ) {
- redirect_header( "index.php", 1, _AM_LX_NEEDONECOLUMN );
+ redirect_header( "index.php", 1, _AM_LEXIKON_NEEDONECOLUMN );
exit();
}
-// lx_adminMenu(2, _AM_LX_ADMINENTRYMNGMT);
+// lx_adminMenu(2, _AM_LEXIKON_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' ) );
+ echo "<h3 style=\"color: #2F5376; margin-top: 6px; \">" . _AM_LEXIKON_ADMINENTRYMNGMT . "</h3>";
+ $sform = new XoopsThemeForm( _AM_LEXIKON_NEWENTRY, "op", xoops_getenv( 'PHP_SELF' ) );
}
$sform -> setExtra( 'enctype="multipart/form-data"' );
// Category selector
if ($xoopsModuleConfig['multicats'] == 1) {
$mytree = new XoopsTree( $xoopsDB->prefix( "lxcategories" ), "categoryID" , "0" );
- $categoryselect = new XoopsFormSelect(_AM_LX_CATNAME, 'categoryID', $categoryID);
+ $categoryselect = new XoopsFormSelect(_AM_LEXIKON_CATNAME, 'categoryID', $categoryID);
$tbl = array();
$tbl = $mytree->getChildTreeArray(0,'name');
foreach($tbl as $oneline) {
@@ -223,28 +230,28 @@
// Author selector
ob_start();
lx_getuserForm( intval($uid) );
- $sform -> addElement( new XoopsFormLabel( _AM_LX_AUTHOR, ob_get_contents() ) );
+ $sform -> addElement( new XoopsFormLabel( _AM_LEXIKON_AUTHOR, ob_get_contents() ) );
ob_end_clean();
// Initial selector
ob_start();
lx_getinit( intval($init) );
- $sform -> addElement( new XoopsFormLabel( _AM_LX_INIT, ob_get_contents() ) );
+ $sform -> addElement( new XoopsFormLabel( _AM_LEXIKON_INIT, ob_get_contents() ) );
ob_end_clean();
// Term, definition, reference and related URL
- $sform -> addElement( new XoopsFormText( _AM_LX_ENTRYTERM, 'term', 50, 80, $term ), true );
+ $sform -> addElement( new XoopsFormText( _AM_LEXIKON_ENTRYTERM, 'term', 50, 80, $term ), true );
// set editor according to the module's option "form_options"
- $editor = lx_getWysiwygForm( _AM_LX_ENTRYDEF, 'definition', $definition, 15, 60 );
- if ($definition == _MD_LX_WRITEHERE) {
+ $editor = lx_getWysiwygForm( _AM_LEXIKON_ENTRYDEF, 'definition', $definition, 15, 60 );
+ if ($definition == _MD_LEXIKON_WRITEHERE) {
$editor -> setExtra( 'onfocus="this.select()"' );
}
$sform -> addElement( $editor,true );
unset($editor);
- $sform -> addElement( new XoopsFormTextArea( _AM_LX_ENTRYREFERENCE, 'ref', $ref, 5, 60 ), false );
- $sform -> addElement( new XoopsFormText( _AM_LX_ENTRYURL, 'url', 50, 80, $url ), false );
+ $sform -> addElement( new XoopsFormTextArea( _AM_LEXIKON_ENTRYREFERENCE, 'ref', $ref, 5, 60 ), false );
+ $sform -> addElement( new XoopsFormText( _AM_LEXIKON_ENTRYURL, 'url', 50, 80, $url ), false );
// tags of this term - for module 'Tag'
$module_handler = xoops_gethandler('module');
@@ -254,36 +261,36 @@
$sform->addElement(new XoopsFormTag("item_tag", 60, 255, $entryID, $catid = 0));
}
// Code to take entry offline, for maintenance purposes
- $offline_radio = new XoopsFormRadioYN(_AM_LX_SWITCHOFFLINE, 'offline', $offline, ' '._AM_LX_YES.'', ' '._AM_LX_NO.'');
+ $offline_radio = new XoopsFormRadioYN(_AM_LEXIKON_SWITCHOFFLINE, 'offline', $offline, ' '._AM_LEXIKON_YES.'', ' '._AM_LEXIKON_NO.'');
$sform -> addElement($offline_radio);
// Code to put entry in block
- $block_radio = new XoopsFormRadioYN( _AM_LX_BLOCK, 'block', $block , ' ' . _AM_LX_YES . '', ' ' . _AM_LX_NO . '' );
+ $block_radio = new XoopsFormRadioYN( _AM_LEXIKON_BLOCK, 'block', $block , ' ' . _AM_LEXIKON_YES . '', ' ' . _AM_LEXIKON_NO . '' );
$sform -> addElement( $block_radio );
// VARIOUS OPTIONS
- $options_tray = new XoopsFormElementTray(_AM_LX_OPTIONS,'<br />');
+ $options_tray = new XoopsFormElementTray(_AM_LEXIKON_OPTIONS,'<br />');
if ($submit) {
$notify_checkbox = new XoopsFormCheckBox('', 'notifypub', $notifypub);
- $notify_checkbox->addOption(1, _AM_LX_NOTIFYPUBLISH);
+ $notify_checkbox->addOption(1, _AM_LEXIKON_NOTIFYPUBLISH);
$options_tray->addElement($notify_checkbox);
}else{
$notifypub=0;
}
$html_checkbox = new XoopsFormCheckBox( '', 'html', $html );
- $html_checkbox -> addOption( 1, _AM_LX_DOHTML );
+ $html_checkbox -> addOption( 1, _AM_LEXIKON_DOHTML );
$options_tray -> addElement( $html_checkbox );
$smiley_checkbox = new XoopsFormCheckBox( '', 'smiley', $smiley );
- $smiley_checkbox -> addOption( 1, _AM_LX_DOSMILEY );
+ $smiley_checkbox -> addOption( 1, _AM_LEXIKON_DOSMILEY );
$options_tray -> addElement( $smiley_checkbox );
$xcodes_checkbox = new XoopsFormCheckBox( '', 'xcodes', $xcodes );
- $xcodes_checkbox -> addOption( 1, _AM_LX_DOXCODE );
+ $xcodes_checkbox -> addOption( 1, _AM_LEXIKON_DOXCODE );
$options_tray -> addElement( $xcodes_checkbox );
$breaks_checkbox = new XoopsFormCheckBox( '', 'breaks', $breaks );
- $breaks_checkbox -> addOption( 1, _AM_LX_BREAKS );
+ $breaks_checkbox -> addOption( 1, _AM_LEXIKON_BREAKS );
$options_tray -> addElement( $breaks_checkbox );
$sform -> addElement( $options_tray );
@@ -298,23 +305,23 @@
if ( !$entryID ) // there's no entryID? Then it's a new entry
{
- $butt_create = new XoopsFormButton( '', '', _AM_LX_CREATE, 'submit' );
+ $butt_create = new XoopsFormButton( '', '', _AM_LEXIKON_CREATE, 'submit' );
$butt_create->setExtra('onclick="this.form.elements.op.value=\'addentry\'"');
$button_tray->addElement( $butt_create );
- $butt_clear = new XoopsFormButton( '', '', _AM_LX_CLEAR, 'reset' );
+ $butt_clear = new XoopsFormButton( '', '', _AM_LEXIKON_CLEAR, 'reset' );
$button_tray->addElement( $butt_clear );
- $butt_cancel = new XoopsFormButton( '', '', _AM_LX_CANCEL, 'button' );
+ $butt_cancel = new XoopsFormButton( '', '', _AM_LEXIKON_CANCEL, 'button' );
$butt_cancel->setExtra('onclick="history.go(-1)"');
$button_tray->addElement( $butt_cancel );
} else // else, we're editing an existing entry
{
- $butt_create = new XoopsFormButton( '', '', _AM_LX_MODIFY, 'submit' );
+ $butt_create = new XoopsFormButton( '', '', _AM_LEXIKON_MODIFY, 'submit' );
$butt_create->setExtra('onclick="this.form.elements.op.value=\'addentry\'"');
$button_tray->addElement( $butt_create );
- $butt_cancel = new XoopsFormButton( '', '', _AM_LX_CANCEL, 'button' );
+ $butt_cancel = new XoopsFormButton( '', '', _AM_LEXIKON_CANCEL, 'button' );
$butt_cancel->setExtra('onclick="history.go(-1)"');
$button_tray->addElement( $butt_cancel );
}
@@ -367,7 +374,7 @@
// Save to database
if ( !$entryID ) {
// verify that the term does not exists
- if (lx_TermExists($term,$xoopsDB->prefix('lxentries'))) redirect_header("javascript:history.go(-1)", 2, _AM_LX_ITEMEXISTS . "<br />" . $term );
+ if (lx_TermExists($term,$xoopsDB->prefix('lxentries'))) redirect_header("javascript:history.go(-1)", 2, _AM_LEXIKON_ITEMEXISTS . "<br />" . $term );
if ( $xoopsDB -> query( "INSERT INTO " . $xoopsDB -> prefix( "lxentries" ) . " (entryID, categoryID, term, init, definition, ref, url, uid, submit, datesub, html, smiley, xcodes, breaks, block, offline, notifypub, request ) VALUES ('', '$categoryID', '$term', '$init', '$definition', '$ref', '$url', '$uid', '$submit', '$date', '$html', '$smiley', '$xcodes', '$breaks', '$block', '$offline', '$notifypub', '$request' )" ) ) {
$newid = $xoopsDB->getInsertId();
// Increment author's posts count (only if it's a new definition)
@@ -403,9 +410,9 @@
//$notification_handler->triggerEvent('term', $newid, 'approve', $tags);
}
lx_calculateTotals();
- redirect_header( "entry.php", 1, _AM_LX_ENTRYCREATEDOK );
+ redirect_header( "entry.php", 1, _AM_LEXIKON_ENTRYCREATEDOK );
} else {
- redirect_header( "index.php", 1, _AM_LX_ENTRYNOTCREATED );
+ redirect_header( "index.php", 1, _AM_LEXIKON_ENTRYNOTCREATED );
}
} else { // That is, $entryID exists, thus we're editing an entry
if ( $xoopsDB -> query( "UPDATE " . $xoopsDB -> prefix( "lxentries" ) . " SET term = '$term', categoryID = '$categoryID', init = '$init', definition = '$definition', ref = '$ref', url = '$url', uid = '$uid', submit = '$submit', datesub = '$date', html = '$html', smiley = '$smiley', xcodes = '$xcodes', breaks = '$breaks', block = '$block', offline = '$offline', notifypub = '$notifypub', request = '$request' WHERE entryID = '$entryID'" ) ) {
@@ -431,41 +438,41 @@
lx_calculateTotals();
if ($notifypub == '0'){
- redirect_header( "entry.php", 1, _AM_LX_ENTRYMODIFIED );
+ redirect_header( "entry.php", 1, _AM_LEXIKON_ENTRYMODIFIED );
exit();
} else {
$user = new XoopsUser($uid);
- $userMessage = sprintf(_MD_LX_GOODDAY2, $user->getVar('uname'));
+ $userMessage = sprintf(_MD_LEXIKON_GOODDAY2, $user->getVar('uname'));
$userMessage .= "\n\n";
- if ($request == '1'){$userMessage .= sprintf(_MD_LX_CONFREQ,$xoopsConfig['sitename']);
- } else { $userMessage .= sprintf(_MD_LX_CONFSUB);}
+ if ($request == '1'){$userMessage .= sprintf(_MD_LEXIKON_CONFREQ,$xoopsConfig['sitename']);
+ } else { $userMessage .= sprintf(_MD_LEXIKON_CONFSUB);}
$userMessage .= "\n";
- $userMessage .= sprintf(_MD_LX_APPROVED,$xoopsConfig['sitename']);
+ $userMessage .= sprintf(_MD_LEXIKON_APPROVED,$xoopsConfig['sitename']);
$userMessage .= "\n\n";
- $userMessage .= sprintf(_MD_LX_REGARDS);
+ $userMessage .= sprintf(_MD_LEXIKON_REGARDS);
$userMessage .= "\n";
$userMessage .= "__________________\n";
- $userMessage .= "".$xoopsConfig['sitename']." "._MD_LX_WEBMASTER."\n";
+ $userMessage .= "".$xoopsConfig['sitename']." "._MD_LEXIKON_WEBMASTER."\n";
$userMessage .= "".$xoopsConfig['adminmail']."";
$xoopsMailer =& getMailer();
$xoopsMailer->useMail();
$xoopsMailer->setToEmails($user->getVar('email'));
$xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
- //$xoopsMailer->setFromName($xoopsConfig['sitename']." - "._MI_LX_MD_NAME);
+ //$xoopsMailer->setFromName($xoopsConfig['sitename']." - "._MI_LEXIKON_MD_NAME);
$xoopsMailer->setFromName($xoopsConfig['sitename']." - ".$xoopsModule->name());
- if ($request == '1'){ $conf_subject = sprintf(_MD_LX_SUBJECTREQ,$xoopsConfig['sitename']);
- } else { $conf_subject = sprintf(_MD_LX_SUBJECTSUB,$xoopsConfig['sitename']);}
+ if ($request == '1'){ $conf_subject = sprintf(_MD_LEXIKON_SUBJECTREQ,$xoopsConfig['sitename']);
+ } else { $conf_subject = sprintf(_MD_LEXIKON_SUBJECTSUB,$xoopsConfig['sitename']);}
$xoopsMailer->setSubject($conf_subject);
$xoopsMailer->setBody($userMessage);
$xoopsMailer->send();
- $messagesent = sprintf(_AM_LX_SENTCONFIRMMAIL,$user->getVar('uname'));
+ $messagesent = sprintf(_AM_LEXIKON_SENTCONFIRMMAIL,$user->getVar('uname'));
redirect_header( "entry.php", 1, $messagesent );
exit();
}
- redirect_header( "entry.php", 1, _AM_LX_ENTRYMODIFIED );
+ redirect_header( "entry.php", 1, _AM_LEXIKON_ENTRYMODIFIED );
} else {
- redirect_header( "index.php", 1, _AM_LX_ENTRYNOTUPDATED );
+ redirect_header( "index.php", 1, _AM_LEXIKON_ENTRYNOTUPDATED );
}
}
}
@@ -489,11 +496,11 @@
$member_handler =& xoops_gethandler('member');
$member_handler->updateUserByField($submitter, 'posts', $submitter->getVar('posts') - 1);
}
- redirect_header("entry.php",1,sprintf( _AM_LX_ENTRYISDELETED, $term ) );
+ redirect_header("entry.php",1,sprintf( _AM_LEXIKON_ENTRYISDELETED, $term ) );
exit();
} else {
//xoops_cp_header();
- xoops_confirm(array('op' => 'del', 'entryID' => $entryID, 'ok' => 1, 'term' => $term ), 'entry.php', _AM_LX_DELETETHISENTRY . "<br /><br>" . $term, _AM_LX_DELETE );
+ xoops_confirm(array('op' => 'del', 'entryID' => $entryID, 'ok' => 1, 'term' => $term ), 'entry.php', _AM_LEXIKON_DELETETHISENTRY . "<br /><br>" . $term, _AM_LEXIKON_DELETE );
xoops_cp_footer();
}
// break;
Modified: XoopsModules/lexikon/trunk/lexikon/admin/functions.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/functions.php 2013-04-26 09:16:47 UTC (rev 11455)
+++ XoopsModules/lexikon/trunk/lexikon/admin/functions.php 2013-04-26 14:38:58 UTC (rev 11456)
@@ -136,9 +136,9 @@
<TR><TD width='200' VALIGN='top'>
<h3>Import Menu</h3><FONT SIZE='1'>";
if ($cf < 5) {
- echo ""._AM_LX_OTHERMODS."";
+ echo ""._AM_LEXIKON_OTHERMODS."";
} else {
- echo ""._AM_LX_NOOTHERMODS."";
+ echo ""._AM_LEXIKON_NOOTHERMODS."";
}
echo "</FONT></TD><TD VALIGN='top'>
@@ -343,15 +343,15 @@
echo "<div style='color: #2F5376; margin: 6px 0 0 0; '>";
echo "<table width='100%' cellspacing='2' cellpadding='3' border='0' class='outer'>";
//echo "<tr><td colspan='7' class='odd'>";
- //echo "<strong>". _AM_LX_INVENTORY . "</strong></td></tr>";
+ //echo "<strong>". _AM_LEXIKON_INVENTORY . "</strong></td></tr>";
echo "<tr >";
- echo "<td width='40px' class='odd' align='center'><b>" . _AM_LX_ENTRYID . "</b></td>";
- echo "<td width='100px' class='odd' align='center'><b>" . _AM_LX_ENTRYCATNAME . "</b></td>";
- echo "<td class='odd' align='center'><b>" . _AM_LX_TERM . "</b></td>";
- echo "<td width='90px' class='odd' align='center'><b>" . _AM_LX_AUTHOR . "</b></td>";
- echo "<td width='90px' class='odd' align='center'><b>" . _AM_LX_ENTRYCREATED . "</b></td>";
- echo "<td width='40px' class='odd' align='center'><b>" . _AM_LX_STATUS . "</b></td>";
- echo "<td width='60px' class='odd' align='center'><b>" . _AM_LX_ACTION . "</b></td>";
+ echo "<th width='40px' align='center'><b>" . _AM_LEXIKON_ENTRYID . "</b></td>";
+ echo "<th width='100px' align='center'><b>" . _AM_LEXIKON_ENTRYCATNAME . "</b></td>";
+ echo "<th align='center'><b>" . _AM_LEXIKON_TERM . "</b></td>";
+ echo "<th width='90px' align='center'><b>" . _AM_LEXIKON_AUTHOR . "</b></td>";
+ echo "<th width='90px' align='center'><b>" . _AM_LEXIKON_ENTRYCREATED . "</b></td>";
+ echo "<th width='40px' align='center'><b>" . _AM_LEXIKON_STATUS . "</b></td>";
+ echo "<th width='60px' align='center'><b>" . _AM_LEXIKON_ACTION . "</b></td>";
echo "</tr>";
}
Modified: XoopsModules/lexikon/trunk/lexikon/admin/importdictionary.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/importdictionary.php 2013-04-26 09:16:47 UTC (rev 11455)
+++ XoopsModules/lexikon/trunk/lexikon/admin/importdictionary.php 2013-04-26 14:38:58 UTC (rev 11456)
@@ -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_LEXIKON_IMPORT);
}
/****
* Start Import
@@ -203,23 +203,23 @@
if (is_object($dictionaryModule)) {
echo "<table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'>";
echo "<tr>";
- echo "<td colspan='2' class='bg3' align='left'><FONT size='2'><b>"._AM_LX_MODULEHEADIMPORT."</b></FONT></td>";
+ echo "<td colspan='2' class='bg3' align='left'><FONT size='2'><b>"._AM_LEXIKON_MODULEHEADIMPORT."</b></FONT></td>";
echo "</tr>";
echo "<tr>";
echo "<td class='head' width = '200' align='center'><img src='".XOOPS_URL."/modules/".$xoopsModule->dirname(). "/images/dialog-important.png"."' alt='' hspace='0' vspace='0' align='middle' style='margin-right: 10px; margin-top: 20px;'></td>";
- echo "<td class='even' align='center'><BR><B><font size=2 color='red'>"._AM_LX_IMPORTWARN."</font></B><P></td>";
+ echo "<td class='even' align='center'><BR><B><font size=2 color='red'>"._AM_LEXIKON_IMPORTWARN."</font></B><P></td>";
echo "</tr>";
echo "<tr>";
- echo "<td class='head' width = '200' align='left'><font size=2>"._AM_LX_IMPORTDELWB."</FONT></td>";
+ echo "<td class='head' width = '200' align='left'><font size=2>"._AM_LEXIKON_IMPORTDELWB."</FONT></td>";
echo "<td class='even' align='center'><FORM ACTION='importdictionary.php?op=import' METHOD=POST>
<input type='radio' name='delete' value='1'> "._YES."
<input type='radio' name='delete' value='0' checked='checked'> "._NO."<BR />
</td>";
echo "</tr><tr><td width = '200' class='head' align='center'> </TD>";
echo "<td class='even' align='center'>
- <input type='submit' name='button' id='import' value='"._AM_LX_IMPORT."'>
+ <input type='submit' name='button' id='import' value='"._AM_LEXIKON_IMPORT."'>
<input type='button' name='cancel' value='"._CANCEL."' onclick='javascript:history.go(-1);'></td>";
echo "</TR></table><br />\n";
} else {
Modified: XoopsModules/lexikon/trunk/lexikon/admin/importglossaire.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/importglossaire.php 2013-04-26 09:16:47 UTC (rev 11455)
+++ XoopsModules/lexikon/trunk/lexikon/admin/importglossaire.php 2013-04-26 14:38:58 UTC (rev 11456)
@@ -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_LEXIKON_IMPORT);
}
/****
@@ -60,7 +60,7 @@
$sqlquery = $xoopsDB->query("SELECT count(id) as count FROM ".$xoopsDB->prefix("glossaire"));
list( $count ) = $xoopsDB->fetchRow( $sqlquery ) ;
if ( $count < 1 ) {
- redirect_header("importwordbook.php",1, _AM_LX_MODULEIMPORTEMPTY10);
+ redirect_header("importwordbook.php",1, _AM_LEXIKON_MODULEIMPORTEMPTY10);
exit();
}
@@ -183,23 +183,23 @@
if (is_object($glossaireModule)) {
echo "<table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'>";
echo "<tr>";
- echo "<td colspan='2' class='bg3' align='left'><FONT size='2'><b>"._AM_LX_MODULEHEADIMPORTGLO."</b></FONT></td>";
+ echo "<td colspan='2' class='bg3' align='left'><FONT size='2'><b>"._AM_LEXIKON_MODULEHEADIMPORTGLO."</b></FONT></td>";
echo "</tr>";
echo "<tr>";
echo "<td class='head' width = '200' align='center'><img src='".XOOPS_URL."/modules/".$xoopsModule->dirname(). "/images/dialog-important.png"."' alt='' hspace='0' vspace='0' align='middle' style='margin-right: 10px; margin-top: 20px; '></td>";
- echo "<td class='even' align='center'><BR><B><font size=2 color='red'>"._AM_LX_IMPORTWARN."</font></B><P></td>";
+ echo "<td class='even' align='center'><BR><B><font size=2 color='red'>"._AM_LEXIKON_IMPORTWARN."</font></B><P></td>";
echo "</tr>";
echo "<tr>";
- echo "<td class='head' width = '200' align='left'><font size=2>"._AM_LX_IMPORTDELWB."</FONT></td>";
+ echo "<td class='head' width = '200' align='left'><font size=2>"._AM_LEXIKON_IMPORTDELWB."</FONT></td>";
echo "<td class='even' align='center'><FORM ACTION='importglossaire.php?op=import' METHOD=POST>
<input type='radio' name='delete' value='1'> "._YES."
<input type='radio' name='delete' value='0' checked='checked'> "._NO."<BR />
</td>";
echo "</tr><tr><td width = '200' class='head' align='center'> </TD>";
echo "<td class='even' align='center'>
- <input type='submit' name='button' id='import' value='"._AM_LX_IMPORT."'>
+ <input type='submit' name='button' id='import' value='"._AM_LEXIKON_IMPORT."'>
<input type='button' name='cancel' value='"._CANCEL."' onclick='javascript:history.go(-1);'></td>";
echo "</TR></table><br />\n";
} else {
Modified: XoopsModules/lexikon/trunk/lexikon/admin/importwiwimod.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/importwiwimod.php 2013-04-26 09:16:47 UTC (rev 11455)
+++ XoopsModules/lexikon/trunk/lexikon/admin/importwiwimod.php 2013-04-26 14:38:58 UTC (rev 11456)
@@ -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_LEXIKON_IMPORT);
}
/****
@@ -60,7 +60,7 @@
$sqlquery = $xoopsDB->query("SELECT count(id) as count FROM ".$xoopsDB->prefix("wiwimod"));
list( $count ) = $xoopsDB->fetchRow( $sqlquery ) ;
if ( $count < 1 ) {
- redirect_header("index.php",1,_AM_LX_MODULEIMPORTEMPTY10);
+ redirect_header("index.php",1,_AM_LEXIKON_MODULEIMPORTEMPTY10);
exit();
}
@@ -177,23 +177,23 @@
if (is_object($wiwimodModule)) {
echo "<table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'>";
echo "<tr>";
- echo "<td colspan='2' class='bg3' align='left'><FONT size='2'><b>"._AM_LX_MODULEHEADIMPORTWW."</b></FONT></td>";
+ echo "<td colspan='2' class='bg3' align='left'><FONT size='2'><b>"._AM_LEXIKON_MODULEHEADIMPORTWW."</b></FONT></td>";
echo "</tr>";
echo "<tr>";
echo "<td class='head' width = '200' align='center'><img src='".XOOPS_URL."/modules/".$xoopsModule->dirname(). "/images/dialog-important.png"."' alt='' hspace='0' vspace='0' align='middle' style='margin-right: 10px; margin-top: 20px;'></td>";
- echo "<td class='even' align='center'><BR><B><font size=2 color='red'>"._AM_LX_IMPORTWARN."</font></B><P></td>";
+ echo "<td class='even' align='center'><BR><B><font size=2 color='red'>"._AM_LEXIKON_IMPORTWARN."</font></B><P></td>";
echo "</tr>";
echo "<tr>";
- echo "<td class='head' width = '200' align='left'><font size=2>"._AM_LX_IMPORTDELWB."</FONT></td>";
+ echo "<td class='head' width = '200' align='left'><font size=2>"._AM_LEXIKON_IMPORTDELWB."</FONT></td>";
echo "<td class='even' align='center'><FORM ACTION='importwiwimod.php?op=import' METHOD=POST>
<input type='radio' name='delete' value='1'> "._YES."
<input type='radio' name='delete' value='0' checked='checked'> "._NO."<BR />
</td>";
echo "</tr><tr><td width = '200' class='head' align='center'> </TD>";
echo "<td class='even' align='center'>
- <input type='submit' name='button' id='import' value='"._AM_LX_IMPORT."'>
+ <input type='submit' name='button' id='import' value='"._AM_LEXIKON_IMPORT."'>
<input type='button' name='cancel' value='"._CANCEL."' onclick='javascript:history.go(-1);'></td>";
echo "</TR></table><br />\n";
} else {
Modified: XoopsModules/lexikon/trunk/lexikon/admin/importwordbook.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/importwordbook.php 2013-04-26 09:16:47 UTC (rev 11455)
+++ XoopsModules/lexikon/trunk/lexikon/admin/importwordbook.php 2013-04-26 14:38:58 UTC (rev 11456)
@@ -33,9 +33,12 @@
case "default":
default:
xoops_cp_header();
+ $indexAdmin = new ModuleAdmin();
+ echo $indexAdmin->addNavigation('importwordbook.php');
+
global $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule;
$myts =& MyTextSanitizer::getInstance();
-// lx_adminMenu(9, _AM_LX_IMPORT);
+// lx_adminMenu(9, _AM_LEXIKON_IMPORT);
}
/****
@@ -58,7 +61,7 @@
$sqlquery = $xoopsDB->query("SELECT count(entryID) as count FROM ".$xoopsDB->prefix("wbentries"));
list( $count ) = $xoopsDB->fetchRow( $sqlquery ) ;
if ( $count < 1 ) {
- redirect_header("index.php",1, _AM_LX_MODULEIMPORTEMPTY10);
+ redirect_header("index.php",1, _AM_LEXIKON_MODULEIMPORTEMPTY10);
exit();
}
$delete = 0 ;
@@ -253,23 +256,23 @@
echo "<table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'>";
echo "<tr>";
- echo "<td colspan='2' class='bg3' align='left'><FONT size='2'><b>"._AM_LX_MODULEHEADIMPORTWB."</b></FONT></td>";
+ echo "<td colspan='2' class='bg3' align='left'><FONT size='2'><b>"._AM_LEXIKON_MODULEHEADIMPORTWB."</b></FONT></td>";
echo "</tr>";
echo "<tr>";
echo "<td class='head' width = '200' align='center'><img src='".XOOPS_URL."/modules/".$xoopsModule->dirname(). "/images/dialog-important.png"."' alt='' hspace='0' vspace='0' align='middle' style='margin-right: 10px; margin-top: 20px;'></td>";
- echo "<td class='even' align='center'><BR><B><font size=2 color='red'>"._AM_LX_IMPORTWARN."</font></B><P></td>";
+ echo "<td class='even' align='center'><BR><B><font size=2 color='red'>"._AM_LEXIKON_IMPORTWARN."</font></B><P></td>";
echo "</tr>";
echo "<tr>";
- echo "<td class='head' width = '200' align='left'><font size=2>"._AM_LX_IMPORTDELWB."</FONT></td>";
+ echo "<td class='head' width = '200' align='left'><font size=2>"._AM_LEXIKON_IMPORTDELWB."</FONT></td>";
echo "<td class='even' align='center'><FORM ACTION='importwordbook.php?op=import' METHOD=POST>
<input type='radio' name='delete' value='1'> "._YES."
<input type='radio' name='delete' value='0' checked='checked'> "._NO."<BR />
</td>";
echo "</tr><tr><td width = '200' class='head' align='center'> </TD>";
echo "<td class='even' align='center'>
- <input type='submit' name='button' id='import' value='"._AM_LX_IMPORT."'>
+ <input type='submit' name='button' id='import' value='"._AM_LEXIKON_IMPORT."'>
<input type='button' name='cancel' value='"._CANCEL."' onclick='javascript:history.go(-1);'></td>";
echo "</TR></table><br />\n";
} else {
Modified: XoopsModules/lexikon/trunk/lexikon/admin/importxwords.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/importxwords.php 2013-04-26 09:16:47 UTC (rev 11455)
+++ XoopsModules/lexikon/trunk/lexikon/admin/importxwords.php 2013-04-26 14:38:58 UTC (rev 11456)
@@ -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_LEXIKON_IMPORT);
}
/****
* Start Import
@@ -61,7 +61,7 @@
$sqlquery = $xoopsDB->query("SELECT count(entryID) as count FROM ".$xoopsDB->prefix("xwords_ent"));
list( $count ) = $xoopsDB->fetchRow( $sqlquery ) ;
if ( $count < 1 ) {
- redirect_header("index.php",1, _AM_LX_MODULEIMPORTEMPTY10);
+ redirect_header("index.php",1, _AM_LEXIKON_MODULEIMPORTEMPTY10);
exit();
}
@@ -239,23 +239,23 @@
if (is_object($xwordsModule)) {
echo "<table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'>";
echo "<tr>";
- echo "<td colspan='2' class='bg3' align='left'><FONT size='2'><b>"._AM_LX_MODULEHEADIMPORTXWO."</b></FONT></td>";
+ echo "<td colspan='2' class='bg3' align='left'><FONT size='2'><b>"._AM_LEXIKON_MODULEHEADIMPORTXWO."</b></FONT></td>";
echo "</tr>";
echo "<tr>";
echo "<td class='head' width = '200' align='center'><img src='".XOOPS_URL."/modules/".$xoopsModule->dirname(). "/images/dialog-important.png"."' alt='' hspace='0' vspace='0' align='middle' style='margin-right: 10px; margin-top: 20px;'></td>";
- echo "<td class='even' align='center'><BR><B><font size=2 color='red'>"._AM_LX_IMPORTWARN."</font></B><P></td>";
+ echo "<td class='even' align='center'><BR><B><font size=2 color='red'>"._AM_LEXIKON_IMPORTWARN."</font></B><P></td>";
echo "</tr>";
echo "<tr>";
- echo "<td class='head' width = '200' align='left'><font size=2>"._AM_LX_IMPORTDELWB."</FONT></td>";
+ echo "<td class='head' width = '200' align='left'><font size=2>"._AM_LEXIKON_IMPORTDELWB."</FONT></td>";
echo "<td class='even' align='center'><FORM ACTION='importxwords.php?op=import' METHOD=POST>
<input type='radio' name='delete' value='1'> "._YES."
<input type='radio' name='delete' value='0' checked='checked'> "._NO."<BR />
</td>";
echo "</tr><tr><td width = '200' class='head' align='center'> </TD>";
echo "<td class='even' align='center'>
- <input type='submit' name='button' id='import' value='"._AM_LX_IMPORT."'>
+ <input type='submit' name='button' id='import' value='"._AM_LEXIKON_IMPORT."'>
<input type='button' name='cancel' value='"._CANCEL."' onclick='javascript:history.go(-1);'></td>";
echo "</TR></table><br />\n";
} else {
Modified: XoopsModules/lexikon/trunk/lexikon/admin/index.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/index.php 2013-04-26 09:16:47 UTC (rev 11455)
+++ XoopsModules/lexikon/trunk/lex...
[truncated message content] |
