Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[10161] XoopsModules/lexikon/trunk/lexikon
|
From: <ye...@us...> - 2012-09-09 16:25:24
|
Revision: 10161
http://xoops.svn.sourceforge.net/xoops/?rev=10161&view=rev
Author: yerres2
Date: 2012-09-09 16:25:15 +0000 (Sun, 09 Sep 2012)
Log Message:
-----------
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/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_initial.php
XoopsModules/lexikon/trunk/lexikon/blocks/entries_new.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/changelog.txt
XoopsModules/lexikon/trunk/lexikon/comment_new.php
XoopsModules/lexikon/trunk/lexikon/comment_post.php
XoopsModules/lexikon/trunk/lexikon/content.php
XoopsModules/lexikon/trunk/lexikon/entry.php
XoopsModules/lexikon/trunk/lexikon/header.php
XoopsModules/lexikon/trunk/lexikon/images/bookmark/delicious.gif
XoopsModules/lexikon/trunk/lexikon/images/bookmark/newsvine.gif
XoopsModules/lexikon/trunk/lexikon/images/bookmark/technorati.png
XoopsModules/lexikon/trunk/lexikon/images/lx_slogo.png
XoopsModules/lexikon/trunk/lexikon/include/common.inc.php
XoopsModules/lexikon/trunk/lexikon/include/functions.php
XoopsModules/lexikon/trunk/lexikon/include/notification.inc.php
XoopsModules/lexikon/trunk/lexikon/include/search.inc.php
XoopsModules/lexikon/trunk/lexikon/include/sitemap.plugin.php
XoopsModules/lexikon/trunk/lexikon/include/storyform.inc.php
XoopsModules/lexikon/trunk/lexikon/include/syndication.inc.php
XoopsModules/lexikon/trunk/lexikon/include/waiting.plugin.php
XoopsModules/lexikon/trunk/lexikon/index.php
XoopsModules/lexikon/trunk/lexikon/js/index.html
XoopsModules/lexikon/trunk/lexikon/language/english/admin.php
XoopsModules/lexikon/trunk/lexikon/language/english/blocks.php
XoopsModules/lexikon/trunk/lexikon/language/english/mail_template/category_newterm_notify.tpl
XoopsModules/lexikon/trunk/lexikon/language/english/mail_template/category_termsubmit_notify.tpl
XoopsModules/lexikon/trunk/lexikon/language/english/mail_template/global_termrequest_notify.tpl
XoopsModules/lexikon/trunk/lexikon/language/english/mail_template/global_termsubmit_notify.tpl
XoopsModules/lexikon/trunk/lexikon/language/english/mail_template/lexikon_newcat_notify.tpl
XoopsModules/lexikon/trunk/lexikon/language/english/mail_template/lexikon_newpost_notify.tpl
XoopsModules/lexikon/trunk/lexikon/language/english/mail_template/term_approve_notify.tpl
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/mail_template/category_newterm_notify.tpl
XoopsModules/lexikon/trunk/lexikon/language/german/mail_template/category_termsubmit_notify.tpl
XoopsModules/lexikon/trunk/lexikon/language/german/mail_template/global_termrequest_notify.tpl
XoopsModules/lexikon/trunk/lexikon/language/german/mail_template/global_termsubmit_notify.tpl
XoopsModules/lexikon/trunk/lexikon/language/german/mail_template/lexikon_newcat_notify.tpl
XoopsModules/lexikon/trunk/lexikon/language/german/mail_template/lexikon_newpost_notify.tpl
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/linkterms.css
XoopsModules/lexikon/trunk/lexikon/popup.php
XoopsModules/lexikon/trunk/lexikon/print.php
XoopsModules/lexikon/trunk/lexikon/profile.php
XoopsModules/lexikon/trunk/lexikon/readme.txt
XoopsModules/lexikon/trunk/lexikon/request.php
XoopsModules/lexikon/trunk/lexikon/rss.php
XoopsModules/lexikon/trunk/lexikon/search.php
XoopsModules/lexikon/trunk/lexikon/sql/mysql.sql
XoopsModules/lexikon/trunk/lexikon/style.css
XoopsModules/lexikon/trunk/lexikon/submit.php
XoopsModules/lexikon/trunk/lexikon/syndication.php
XoopsModules/lexikon/trunk/lexikon/templates/blocks/entries_new.html
XoopsModules/lexikon/trunk/lexikon/templates/blocks/entries_spot.html
XoopsModules/lexikon/trunk/lexikon/templates/blocks/entries_top.html
XoopsModules/lexikon/trunk/lexikon/templates/lx_bookmark.html
XoopsModules/lexikon/trunk/lexikon/templates/lx_category.html
XoopsModules/lexikon/trunk/lexikon/templates/lx_entry.html
XoopsModules/lexikon/trunk/lexikon/templates/lx_index.html
XoopsModules/lexikon/trunk/lexikon/templates/lx_letter.html
XoopsModules/lexikon/trunk/lexikon/templates/lx_search.html
XoopsModules/lexikon/trunk/lexikon/xoops_version.php
Added Paths:
-----------
XoopsModules/lexikon/trunk/lexikon/admin/main.php
XoopsModules/lexikon/trunk/lexikon/admin/permissions.php
XoopsModules/lexikon/trunk/lexikon/blocks/.htaccess
XoopsModules/lexikon/trunk/lexikon/blocks/entries_authors.php
XoopsModules/lexikon/trunk/lexikon/blocks/entries_scrolling.php
XoopsModules/lexikon/trunk/lexikon/blocks/lexikon_block_tag.php
XoopsModules/lexikon/trunk/lexikon/images/bookmark/blinklist.png
XoopsModules/lexikon/trunk/lexikon/images/bookmark/digg.gif
XoopsModules/lexikon/trunk/lexikon/images/bookmark/facebook.gif
XoopsModules/lexikon/trunk/lexikon/images/bookmark/fark.png
XoopsModules/lexikon/trunk/lexikon/images/bookmark/google_bookmarks.gif
XoopsModules/lexikon/trunk/lexikon/images/bookmark/linkarena.gif
XoopsModules/lexikon/trunk/lexikon/images/bookmark/mrwong.gif
XoopsModules/lexikon/trunk/lexikon/images/bookmark/oneview.gif
XoopsModules/lexikon/trunk/lexikon/images/bookmark/reddit.png
XoopsModules/lexikon/trunk/lexikon/images/bookmark/studivz.png
XoopsModules/lexikon/trunk/lexikon/images/bookmark/stumbleupon.gif
XoopsModules/lexikon/trunk/lexikon/images/bookmark/twitter.gif
XoopsModules/lexikon/trunk/lexikon/images/bookmark/yigg.gif
XoopsModules/lexikon/trunk/lexikon/include/install_function.php
XoopsModules/lexikon/trunk/lexikon/include/plugin.tag.php
XoopsModules/lexikon/trunk/lexikon/js/domticker.js
XoopsModules/lexikon/trunk/lexikon/js/pausescroller.js
XoopsModules/lexikon/trunk/lexikon/lang.diff
XoopsModules/lexikon/trunk/lexikon/list.tag.php
XoopsModules/lexikon/trunk/lexikon/templates/blocks/entries_authors.html
XoopsModules/lexikon/trunk/lexikon/templates/blocks/entries_scrolling.html
XoopsModules/lexikon/trunk/lexikon/templates/blocks/lexikon_tag_block_cloud.html
XoopsModules/lexikon/trunk/lexikon/templates/blocks/lexikon_tag_block_top.html
XoopsModules/lexikon/trunk/lexikon/templates/lexikon_rss.html
XoopsModules/lexikon/trunk/lexikon/templates/lx_tag_bar.html
XoopsModules/lexikon/trunk/lexikon/templates/lx_topten.html
XoopsModules/lexikon/trunk/lexikon/view.tag.php
Modified: XoopsModules/lexikon/trunk/lexikon/admin/about.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/about.php 2012-09-09 10:41:11 UTC (rev 10160)
+++ XoopsModules/lexikon/trunk/lexikon/admin/about.php 2012-09-09 16:25:15 UTC (rev 10161)
@@ -1,7 +1,7 @@
<?php
/**
* $Id: about.php v 1.5 23 August 2004 hsalazar Exp $
- * Module: lexikon - glossary module
+ * Module: Lexikon - glossary module
* Version: v 1.5
* Release Date:
* Author: hsalazar
@@ -59,7 +59,7 @@
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_CREDITS . ":</label><text>" . $versioninfo->getInfo( 'credits' ) . "</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\" />";
Modified: XoopsModules/lexikon/trunk/lexikon/admin/admin_header.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/admin_header.php 2012-09-09 10:41:11 UTC (rev 10160)
+++ XoopsModules/lexikon/trunk/lexikon/admin/admin_header.php 2012-09-09 16:25:15 UTC (rev 10161)
@@ -1,7 +1,7 @@
<?php
/**
* $Id: admin_header.php v 1.0 8 May 2004 hsalazar Exp $
- * Module: lexikon - glossary module
+ * Module: Lexikon - glossary module
* Version: v 1.00
* Release Date: 8 May 2004
* Author: hsalazar
@@ -34,4 +34,5 @@
redirect_header(XOOPS_URL."/",1,_NOPERM);
exit();
}
+
?>
\ No newline at end of file
Modified: XoopsModules/lexikon/trunk/lexikon/admin/category.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/category.php 2012-09-09 10:41:11 UTC (rev 10160)
+++ XoopsModules/lexikon/trunk/lexikon/admin/category.php 2012-09-09 16:25:15 UTC (rev 10161)
@@ -1,7 +1,7 @@
<?php
/**
* $Id: category.php v 1.0 8 May 2004 hsalazar Exp $
- * Module: lexikon - glossary module
+ * Module: Lexikon - glossary module
* Version: v 1.00
* Release Date: 8 May 2004
* Author: hsalazar
@@ -14,7 +14,6 @@
xoops_cp_header();
$op = '';
-
/* -- Available operations -- */
function categoryDefault() {
@@ -65,9 +64,7 @@
* Code to show existing categories
**/
- lx_collapsableBar('lexikoncat', 'lexikoncaticon');
- echo " <img onclick=\"toggle('cattable'); toggleIcon('cattableicon');\" id='lexikoncaticon' name='lexikoncaticon' src='" . XOOPS_URL . "/modules/lexikon/images/close12.gif' alt='' /></a> <A href='category.php?op=addcat'>"._AM_LX_CREATECAT."</a><br /><br />";
- echo" <div id='lexikoncat' style='float:left; width:100%;'>
+ echo" <A href='category.php?op=addcat'>"._AM_LX_CREATECAT."</a><br /><br />
<table class='outer' width='100%' border='0'>
<tr>
<td colspan='7' class='odd'>
@@ -119,7 +116,7 @@
$categoryID = '0';
}
echo "</table>\n";
- $pagenav = new XoopsPageNav( $numrows, $xoopsModuleConfig['perpage'], $startcat, 'startcat');
+ $pagenav = new XoopsPageNav( $numrows, $xoopsModuleConfig['perpage'], $startcat, 'startcat' );
echo '<div style="text-align:right;">' . $pagenav -> renderNav(8) . '</div>';
echo "<br /><br />\n";
echo "</div>";
@@ -128,11 +125,14 @@
}
}
-
/**
* Code to edit categories
**/
function categoryEdit( $categoryID = '' ) {
+ include_once XOOPS_ROOT_PATH."/class/xoopsformloader.php";
+ include_once XOOPS_ROOT_PATH."/class/uploader.php";
+ include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
+
$weight = 1;
$name = '';
$description = '';
@@ -150,11 +150,21 @@
list( $categoryID, $name, $description, $total, $weight, $logourl ) = $xoopsDB -> fetchrow( $result );
$myts =& MyTextSanitizer::getInstance();
$name = $myts->htmlSpecialChars($name);
-
+ //permissions
+ $member_handler = & xoops_gethandler('member');
+ $group_list = & $member_handler -> getGroupList();
+ $gperm_handler = & xoops_gethandler('groupperm');
+
+ $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 );
exit();
}
+ if ( $xoopsDB -> getRowsNum( $result ) == 0 ) {
+ redirect_header( "index.php", 1, _AM_LX_NOCATTOEDIT );
+ exit();
+ }
//$myts =& MyTextSanitizer::getInstance();
lx_adminMenu(1, _AM_LX_CATS);
@@ -163,7 +173,7 @@
} else {
//$myts =& MyTextSanitizer::getInstance();
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' ) );
}
@@ -179,19 +189,34 @@
$sform -> addElement( new XoopsFormHidden( 'categoryID', $categoryID ) );
//CategoryImage
if ($xoopsModuleConfig['useshots'] == 1) {
- $mydirname = basename ( dirname( dirname( __FILE__ ) ) ) ;
- $uploadir="/modules/" . $mydirname. "/images/uploads/";
- $catimg_array = XoopsLists::getImgListAsArray(XOOPS_ROOT_PATH."/modules/".$mydirname."/images/uploads/");
+ //CategoryImage :: Common querys from Article module by phppp
+ $image_option_tray = new XoopsFormElementTray("<b>"._AM_LX_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_array =& XoopsLists::getImgListAsArray(XOOPS_ROOT_PATH."/".$path_catimg."/");
+ array_unshift($image_array, _NONE);
+
+ $image_select = new XoopsFormSelect("", "logourl", $logourl);
+ $image_select->addOptionArray($image_array);
+ $image_select->setExtra("onchange=\"showImgSelected('img', 'logourl', '/".$path_catimg."/', '', '" . XOOPS_URL . "')\"");
+ $image_tray = new XoopsFormElementTray("", " ");
+ $image_tray->addElement($image_select);
+ if (!empty($logourl) && file_exists(XOOPS_ROOT_PATH . "/" .$path_catimg."/" . $logourl)){
+ $image_tray->addElement(new XoopsFormLabel("", "<div style=\"padding: 4px;\"><img src=\"" . XOOPS_URL . "/" .$path_catimg."/" . $logourl . "\" name=\"img\" id=\"img\" alt=\"\" /></div>"));
+ } else {
+ $image_tray->addElement(new XoopsFormLabel("", "<div style=\"padding: 4px;\"><img src=\"" . XOOPS_URL . "/" .$path_catimg."/blank.gif\" name=\"img\" id=\"img\" alt=\"\" /></div>"));
+ }
+ $image_option_tray->addElement($image_tray);
+ $sform->addElement($image_option_tray);
+ }
+ $sform -> addElement(new XoopsFormSelectGroup(_AM_LX_CAT_GROUPSVIEW, "groups", true, $groups, 5, true));
- $image_option=new XoopsFormSelect('', 'logourl', $logourl);
- $image_option->addOption('',_AM_LX_NONE);
- $image_option->addOptionArray($catimg_array);
- $imgtray = new XoopsFormElementTray(_AM_LX_SHOTIMAGE,'');
- $image_option->setExtra("onchange='showImgSelected(\"logourlex\", \"logourl\", \"" . $uploadir . "\", \"\", \"" . XOOPS_URL . "\")'" );
- $imgtray->addElement($image_option,false);
- $imgtray -> addElement( new XoopsFormLabel( '', "<img src='../images/uploads/" . $logourl . "' name='logourlex' id='logourlex' alt='' />" ) );
- $sform->addElement($imgtray);
- }
$button_tray = new XoopsFormElementTray( '', '' );
$hidden = new XoopsFormHidden( 'op', 'addcategory' );
$button_tray -> addElement( $hidden );
@@ -253,9 +278,15 @@
}
$xoopsDB->query("DELETE FROM ".$xoopsDB->prefix('lxcategories')." WHERE categoryID='$idc'");
$result2 = $xoopsDB -> query( "DELETE FROM " .$xoopsDB -> prefix("lxentries")." WHERE categoryID = $idc");
+ // remove permissions
+ xoops_groupperm_deletebymoditem($xoopsModule->getVar('mid'), 'lexikon_view', $categoryID);
+ xoops_groupperm_deletebymoditem($xoopsModule->getVar('mid'), 'lexikon_submit', $categoryID);
+ xoops_groupperm_deletebymoditem($xoopsModule->getVar('mid'), 'lexikon_approve', $categoryID);
+ xoops_groupperm_deletebymoditem($xoopsModule->getVar('mid'), 'lexikon_request', $categoryID);
// delete notifications
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 ) );
exit();
} else {
@@ -267,18 +298,44 @@
function categorySave ($categoryID = '') {
- Global $xoopsUser, $xoopsModuleConfig, $xoopsConfig, $xoopsDB, $myts, $categoryID;
+ include_once XOOPS_ROOT_PATH."/class/xoopsformloader.php";
+ include_once XOOPS_ROOT_PATH."/class/uploader.php";
+ Global $xoopsUser, $xoopsConfig, $xoopsModuleConfig, $xoopsModule, $xoopsDB, $myts, $categoryID;
+ //print_r ($_POST);
$categoryID = isset( $_POST['categoryID'] ) ? intval( $_POST['categoryID'] ) : intval( $_GET['categoryID'] );
$weight = isset($_POST['weight'] ) ? intval($_POST['weight']) : intval($_GET['weight']);
$name = isset($_POST['name'] ) ? htmlSpecialChars($_POST['name']) : htmlSpecialChars($_GET['name']);
$description = isset($_POST['description'] ) ? htmlSpecialChars($_POST['description']) : htmlSpecialChars($_GET['description']);
+ //$description = $myts->xoopsCodeDecode($description, $allowimage = 0);
$description = $myts -> xoopsCodeDecode($myts->censorString($description), $allowimage = 1);
$name = $myts->addSlashes($_POST['name']);
$logourl = $myts->addSlashes($_POST["logourl"]);
-
+ $groups = isset($_POST['groups']) ? $_POST['groups'] : array();
+ // image upload
+ $logourl = "";
+ $maxfilesize = 30000;
+ $maxfilewidth = 128;
+ $maxfileheight = 128;
+ if (!empty($_FILES['userfile']['name'])) {
+ $allowed_mimetypes = array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png', 'image/png');
+ $uploader = new XoopsMediaUploader(XOOPS_ROOT_PATH ."/modules/".$xoopsModule->getVar('dirname')."/images/uploads/", $allowed_mimetypes, $maxfilesize, $maxfilewidth, $maxfileheight);
+ if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
+ if (!$uploader->upload()) {
+ echo $uploader->getErrors();
+ } else {
+ echo '<h4>'._AM_LX_FILESUCCESS.'</h4>';
+ $logourl = $uploader->getSavedFileName();
+ }
+ } else {
+ echo $uploader->getErrors();
+ }
+ }
+ $logourl = empty($logourl)?(empty($_POST['logourl'])?"":$_POST['logourl']):$logourl;
+
// Run the query and update the data
if ( !$_POST['categoryID'] ) {
- if ( $xoopsDB -> query( "INSERT INTO " . $xoopsDB -> prefix( "lxcategories" ) . " (categoryID, name, description, weight, logourl) VALUES ('', '$name', '$description', '$weight', '$logourl')" ) ) {
+ if ( $xoopsDB -> query( "INSERT INTO " . $xoopsDB -> prefix( "lxcategories" ) . " (categoryID, name, description, weight, logourl)
+ VALUES ('', '$name', '$description', '$weight', '$logourl')" ) ) {
$newid = $xoopsDB->getInsertId();
// Increment author's posts count (only if it's a new definition)
if (is_object($xoopsUser) && empty($categoryID)) {
@@ -302,6 +359,7 @@
$tags['ITEM_URL'] = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/category.php?categoryID=' . $newid;
$notification_handler->triggerEvent( 'global', 0, 'new_category', $tags);
}
+ lx_save_Permissions($groups, $categoryID, "lexikon_view");
redirect_header( "category.php", 1, _AM_LX_CATCREATED );
exit();
} else {
@@ -309,7 +367,11 @@
exit();
}
} else {
- if ( $xoopsDB -> queryF( "UPDATE " . $xoopsDB -> prefix( "lxcategories" ) . " SET name = '$name', description = '$description', weight = '$weight' , logourl = '$logourl' WHERE categoryID = '$categoryID'" ) ) {
+ if ( $xoopsDB -> queryF( "
+ UPDATE " . $xoopsDB -> prefix( "lxcategories" ) . "
+ 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 );
exit();
} else {
Modified: XoopsModules/lexikon/trunk/lexikon/admin/entry.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/entry.php 2012-09-09 10:41:11 UTC (rev 10160)
+++ XoopsModules/lexikon/trunk/lexikon/admin/entry.php 2012-09-09 16:25:15 UTC (rev 10161)
@@ -1,11 +1,11 @@
<?php
/**
* $Id: entry.php v 1.0 8 May 2004 hsalazar Exp $
- * Module: lexikon - glossary module
+ * Module: Lexikon - glossary module
* Version: v 1.00
* Release Date: 8 May 2004
* Author: hsalazar
- * Modifs: yerres
+ * Modifs: Yerres
* Licence: GNU
*/
@@ -15,10 +15,13 @@
xoops_cp_header();
$op = '';
-
+#if ( isset( $_GET['op'] ) ) $op = $_GET['op'];
+#if ( isset( $_POST['op'] ) ) $op = $_POST['op'];
+error_reporting(E_ALL);
+ error_reporting(E_ERROR | E_WARNING | E_PARSE);
/* -- Available operations -- */
function entryDefault() {
- global $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule, $entryID, $_GET;
+ 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);
@@ -27,7 +30,6 @@
$startcat = isset( $_GET['startcat'] ) ? intval( $_GET['startcat'] ) : 0;
$startsub = isset( $_GET['startsub'] ) ? intval( $_GET['startsub'] ) : 0;
$datesub = isset( $_GET['datesub'] ) ? intval( $_GET['datesub'] ) : 0;
- #$entryID =
$myts =& MyTextSanitizer::getInstance();
@@ -59,8 +61,7 @@
<td class='odd'>" . _AM_LX_TOTALREQ . "</td><td align='center' class='even'>" . $totalrequested . "</td>
</tr></table>
<br /><br />";
-
-
+
/**
* Code to show existing terms
**/
@@ -78,9 +79,7 @@
$resultA2 = $xoopsDB -> query( $sql, $xoopsModuleConfig['perpage'], $startentry );
$result = $xoopsDB->query($sql, $xoopsModuleConfig['perpage']);
- lx_collapsableBar('lexikonent', 'lexikonenticon');
- echo " <img onclick=\"toggle('toptable'); toggleIcon('toptableicon');\" id='lexikonenticon' name='lexikonenticon' src='" . XOOPS_URL . "/modules/lexikon/images/close12.gif' alt='' /></a> <A href='entry.php?op=add'>". _AM_LX_CREATEENTRY ."</A><br /><br/>";
- echo " <div id='lexikonent' style='float:left; width:100%;'>
+ echo " <A href='entry.php?op=add'>". _AM_LX_CREATEENTRY ."</A><br /><br/>
<table class='outer' width='100%' border='0'>
<tr>
<td colspan='7' class='odd'>
@@ -137,7 +136,7 @@
{
echo "<tr>";
echo "<td class='odd' align='center' colspan= '7'>"._AM_LX_NOTERMS."</td>";
- echo "</tr></DIV></DIV>";
+ echo "</tr></DIV>";
}
echo "</table>\n";
$pagenav = new XoopsPageNav( $numrows, $xoopsModuleConfig['perpage'], $startentry, 'startentry');
@@ -146,11 +145,10 @@
echo "</div>";
}
-
-// -- Edit function -- //
+// -- Edit function --
function entryEdit( $entryID = '' ) {
- global $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule, $XOOPS_URL;
-
+ global $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule, $init;
+ $myts =& MyTextSanitizer::getInstance();
/**
* Clear all variables before we start
*/
@@ -166,10 +164,9 @@
if(!isset($categoryID)) { $categoryID = 1; }
if(!isset($term)) { $term = ""; }
if(!isset($init)) { $init = ""; }
-
- if (!isset($definition)) {
- $definition = _AM_LX_WRITEHERE;
- }
+ if (!isset($definition)) {
+ $definition = _AM_LX_WRITEHERE;
+ }
if(!isset($ref)) { $ref = ""; }
if(!isset($url)) { $url = ""; }
if(!isset($datesub)) { $datesub = 0; }
@@ -181,16 +178,15 @@
FROM " . $xoopsDB -> prefix( "lxentries" ) . "
WHERE entryID = '$entryID'" );
list( $categoryID, $term, $init, $definition, $ref, $url, $uid, $submit, $datesub, $html, $smiley, $xcodes, $breaks, $block, $offline, $notifypub, $request ) = $xoopsDB -> fetchrow( $result );
-
- $myts =& MyTextSanitizer::getInstance();
- $term = $myts->stripSlashesGPC($myts->htmlSpecialChars($term));
if ( !$xoopsDB -> getRowsNum( $result ) ) {
redirect_header( "index.php", 1, _AM_LX_NOENTRYTOEDIT );
exit();
}
- lx_adminMenu(2, _AM_LX_ENTRIES);
+ $term = $myts->stripSlashesGPC($myts->htmlSpecialChars($term));
+ 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' ) );
} else // there's no parameter, so we're adding an entry
@@ -201,7 +197,7 @@
redirect_header( "index.php", 1, _AM_LX_NEEDONECOLUMN );
exit();
}
- lx_adminMenu(2, _AM_LX_ENTRIES);
+ 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' ) );
@@ -235,11 +231,11 @@
lx_getinit( intval($init) );
$sform -> addElement( new XoopsFormLabel( _AM_LX_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 );
- // set editor according to the module's form_options
+ // 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 -> setExtra( 'onfocus="this.select()"' );
@@ -250,6 +246,13 @@
$sform -> addElement( new XoopsFormTextArea( _AM_LX_ENTRYREFERENCE, 'ref', $ref, 5, 60 ), false );
$sform -> addElement( new XoopsFormText( _AM_LX_ENTRYURL, 'url', 50, 80, $url ), false );
+ // tags of this term - for module 'Tag'
+ $module_handler = xoops_gethandler('module');
+ $tagsModule = $module_handler->getByDirname("tag");
+ if (is_object($tagsModule)) {
+ include_once XOOPS_ROOT_PATH."/modules/tag/include/formtag.php";
+ $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.'');
$sform -> addElement($offline_radio);
@@ -260,7 +263,13 @@
// VARIOUS OPTIONS
$options_tray = new XoopsFormElementTray(_AM_LX_OPTIONS,'<br />');
-
+ if ($submit) {
+ $notify_checkbox = new XoopsFormCheckBox('', 'notifypub', $notifypub);
+ $notify_checkbox->addOption(1, _AM_LX_NOTIFYPUBLISH);
+ $options_tray->addElement($notify_checkbox);
+ }else{
+ $notifypub=0;
+ }
$html_checkbox = new XoopsFormCheckBox( '', 'html', $html );
$html_checkbox -> addOption( 1, _AM_LX_DOHTML );
$options_tray -> addElement( $html_checkbox );
@@ -318,14 +327,13 @@
/* Save */
function entrySave ($entryID = '') {
-
- Global $xoopsUser, $xoopsConfig, $xoopsModuleConfig, $xoopsDB, $myts;
-
+ Global $xoopsUser, $xoopsConfig, $xoopsModuleConfig, $xoopsModule, $xoopsDB;
+ $myts =& MyTextSanitizer::getInstance();
$entryID = isset($_POST['entryID']) ? intval($_POST['entryID']) : intval($_GET['entryID']);
if ($xoopsModuleConfig['multicats'] == 1) {
$categoryID = isset($_POST['categoryID']) ? intval($_POST['categoryID']) : intval($_GET['categoryID']);
} else {
- $categoryID = '';
+ $categoryID = 1;
}
$block = isset($_POST['block']) ? intval($_POST['block']) : intval($_GET['block']);
$breaks = isset($_POST['breaks']) ? intval($_POST['breaks']) : intval($_GET['breaks']);
@@ -335,13 +343,7 @@
$xcodes = isset($_POST['xcodes']) ? intval($_POST['xcodes']) : intval($_GET['xcodes']);
$offline = isset($_POST['offline']) ? intval($_POST['offline']) : intval($_GET['offline']);
$init= $myts->addslashes($_POST['init']);
- $term = $myts->addSlashes($myts->censorString($_POST['term']));
- /*
- // this is for terms with umlaut or accented initials
- $term4sql = lx_sanitizeFieldName($myts->htmlspecialchars($_POST['term']));
- $init = substr($term4sql, 0, 1);
- $init = ereg("[a-zA-Z]", $init) ? strtoupper($init) : '#';
- */
+ $term = $myts->addSlashes(xoops_trim($_POST['term']));
//$definition = $myts -> xoopsCodeDecode($_POST['definition'], $allowimage = 1);
//$ref = isset($_POST['ref']) ? $myts->addSlashes($_POST['ref']) : '';
$definition = $myts -> xoopsCodeDecode($myts->censorString($_POST['definition']), $allowimage = 1);
@@ -350,12 +352,22 @@
$date = time();
$submit = 0;
- $notifypub = 0;
+ //$notifypub = 0;
+ $notifypub = isset($_POST['notifypub']) ? intval($_POST['notifypub']) : intval($_GET['notifypub']);
$request = 0;
$uid = isset($_POST['author']) ? intval($_POST['author']) : $xoopsUser->uid();
+ //-- module Tag
+ $module_handler = xoops_gethandler('module');
+ $tagsModule = $module_handler->getByDirname("tag");
+ if (is_object($tagsModule)) {
+ $tag_handler = xoops_getmodulehandler('tag', 'tag');
+ $tag_handler->updateByItem($_POST["item_tag"], $entryID, $xoopsModule->getVar("dirname"), $catid =0);
+ }
// 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 ( $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)
@@ -388,17 +400,16 @@
$tags['CATEGORY_URL'] = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/category.php?categoryID=' . $categoryID;
$notification_handler->triggerEvent('global', 0, 'new_post', $tags);
$notification_handler->triggerEvent('category', $categoryID, 'new_post', $tags);
- $notification_handler->triggerEvent('term', $newid, 'approve', $tags);
+ //$notification_handler->triggerEvent('term', $newid, 'approve', $tags);
}
lx_calculateTotals();
redirect_header( "entry.php", 1, _AM_LX_ENTRYCREATEDOK );
} else {
redirect_header( "index.php", 1, _AM_LX_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'" ) ) {
- // trigger Notification only if it is a submission!
+ } 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'" ) ) {
+ // trigger Notification only if its a new submission
if(!empty($xoopsModuleConfig['notification_enabled']) ){
global $xoopsModule;
$notification_handler =& xoops_gethandler('notification');
@@ -413,9 +424,45 @@
$row = $xoopsDB->fetchArray($result);
$tags['CATEGORY_NAME'] = $row['name'];
$tags['CATEGORY_URL'] = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/category.php?categoryID=' . $categoryID;
+ $notification_handler->triggerEvent('global', 0, 'new_post', $tags);
+ $notification_handler->triggerEvent('category', $categoryID, 'new_post', $tags);
$notification_handler->triggerEvent('term', $entryID, 'approve', $tags);
}
- lx_calculateTotals();
+
+ lx_calculateTotals();
+ if ($notifypub == '0'){
+ redirect_header( "entry.php", 1, _AM_LX_ENTRYMODIFIED );
+ exit();
+ } else {
+ $user = new XoopsUser($uid);
+ $userMessage = sprintf(_MD_LX_GOODDAY2, $user->getVar('uname'));
+ $userMessage .= "\n\n";
+ if ($request == '1'){$userMessage .= sprintf(_MD_LX_CONFREQ,$xoopsConfig['sitename']);
+ } else { $userMessage .= sprintf(_MD_LX_CONFSUB);}
+ $userMessage .= "\n";
+ $userMessage .= sprintf(_MD_LX_APPROVED,$xoopsConfig['sitename']);
+ $userMessage .= "\n\n";
+ $userMessage .= sprintf(_MD_LX_REGARDS);
+ $userMessage .= "\n";
+ $userMessage .= "__________________\n";
+ $userMessage .= "".$xoopsConfig['sitename']." "._MD_LX_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']." - ".$xoopsModule->name());
+ if ($request == '1'){ $conf_subject = sprintf(_MD_LX_SUBJECTREQ,$xoopsConfig['sitename']);
+ } else { $conf_subject = sprintf(_MD_LX_SUBJECTSUB,$xoopsConfig['sitename']);}
+ $xoopsMailer->setSubject($conf_subject);
+ $xoopsMailer->setBody($userMessage);
+ $xoopsMailer->send();
+ $messagesent = sprintf(_AM_LX_SENTCONFIRMMAIL,$user->getVar('uname'));
+
+ redirect_header( "entry.php", 1, $messagesent );
+ exit();
+ }
redirect_header( "entry.php", 1, _AM_LX_ENTRYMODIFIED );
} else {
redirect_header( "index.php", 1, _AM_LX_ENTRYNOTUPDATED );
@@ -433,17 +480,15 @@
// confirmed, so delete
if ( $ok == 1 ) {
$result = $xoopsDB -> query( "DELETE FROM " .$xoopsDB -> prefix("lxentries")." WHERE entryID = $entryID");
- // delete comments (mondarse)
xoops_comment_delete( $xoopsModule->getVar('mid'), $entryID );
+ // delete notifications
+ xoops_notification_deletebyitem($xoopsModule->getVar('mid'), 'term', $entryID);
// update user posts
if (!empty($uid)) {
$submitter = new xoopsUser($uid);
$member_handler =& xoops_gethandler('member');
$member_handler->updateUserByField($submitter, 'posts', $submitter->getVar('posts') - 1);
}
- // delete notifications
- xoops_notification_deletebyitem($xoopsModule->getVar('mid'), 'term', $entryID);
-
redirect_header("entry.php",1,sprintf( _AM_LX_ENTRYISDELETED, $term ) );
exit();
} else {
Modified: XoopsModules/lexikon/trunk/lexikon/admin/functions.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/functions.php 2012-09-09 10:41:11 UTC (rev 10160)
+++ XoopsModules/lexikon/trunk/lexikon/admin/functions.php 2012-09-09 16:25:15 UTC (rev 10161)
@@ -1,10 +1,10 @@
<?php
/**
- * $Id: functions.php v 1.0 20 Mar 2011 yerres Exp $
+ * $Id: functions.php v 1.0 18 Dec 2011 Yerres Exp $
* Module: lexikon
* Version: v 1.00
* Release Date: 18 Dec 2011
- * Author: yerres
+ * Author: Yerres
* Licence: GNU
*/
@@ -60,7 +60,7 @@
/**
* Verify that a field exists inside a mysql table
*
- * @package Lexikon 1.0
+ * @package Lexikon
* @author Instant Zero (http://xoops.instant-zero.com)
* @copyright (c) Instant Zero
*/
@@ -73,7 +73,7 @@
/**
* Add a field to a mysql table
*
- * @package Lexikon 1.0
+ * @package Lexikon
* @author Instant Zero (http://xoops.instant-zero.com)
* @copyright (c) Instant Zero
*/
@@ -82,14 +82,12 @@
global $xoopsDB;
//naja !
$result=$xoopsDB->queryF("ALTER TABLE " . $table . " ADD ".$field."");
- //$result=$xoopsDB->queryF('ALTER TABLE ' . $table . ' ADD $field;');//ovp falsch
return $result;
}
-
/**
* Change a field to a mysql table
* desuet
- * @package Lexikon 1.0
+ * @package Lexikon
* @author Instant Zero (http://xoops.instant-zero.com)
* @copyright (c) Instant Zero
*/
@@ -111,7 +109,7 @@
/*
* Sub-Menu for Importscripts
* @package lexikon
- * @copyright (c) The Xoops Project - www.xoops.org
+ * @copyright (c) The Xoops Project - www.xoops.org
*/
function lx_importMenu ($currentoption = 0, $breadcrumb = '' ) {
@@ -190,11 +188,11 @@
}
-/*
+/**
* collapsable bar for items lists
* @package lexikon
* @copyright (c) The Xoops Project - www.xoops.org
-*/
+ */
function lx_collapsableBar($tablename = '', $iconname = '') {
@@ -276,7 +274,7 @@
$ret['readspercategory']=$ret2;
- // unused terms per category i.e. offline or submitted. Requests remain unconsidered
+ // unused terms per category i.e. offline or submitted
$ret2=array();
$sql="SELECT Count(entryID) as cpt, categoryID FROM $tbls WHERE offline > 0 OR submit > 0 GROUP BY categoryID ORDER BY categoryID";
$result = $db->query($sql);
@@ -357,19 +355,47 @@
echo "</tr>";
}
+
+/**
+ * save_permissions()
+ * adapted from WF-Downloads
+ */
+
+function lx_save_Permissions($groups, $id, $perm_name) {
+ $result = true;
+ $hModule = & xoops_gethandler('module');
+ $lxModule = & $hModule -> getByDirname('lexikon');
+
+ $module_id = $lxModule -> getVar('mid');
+ $gperm_handler = & xoops_gethandler('groupperm');
+
+ /*
+ * First, if the permissions are already there, delete them
+ */
+ $gperm_handler -> deleteByModule($module_id, $perm_name, $id);
+ /*
+ * Save the new permissions
+ */
+ if (is_array($groups)){
+ foreach ($groups as $group_id){
+ $gperm_handler -> addRight($perm_name, $id, $group_id, $module_id);
+ }
+ }
+ return $result;
+}
+
//-- Initial Selector
function lx_getinit($init) {
-
+ global $init;
echo "<select name='init'>";
- echo "<option value='#'>#</option>";
+ echo "<option value='#'> # </option>";
for ($a = 65; $a < (65+26); $a++ ) {
- $init = chr($a);
if ( chr($a) == $init) {
$opt_selected = "selected='selected'";
} else {
$opt_selected = "";
}
- echo "<option value='".chr($a)."' $opt_selected>".$init."</option>";
+ echo "<option value='".chr($a)."' $opt_selected> ".chr($a)." </option>";
}
echo "</select></div>";
}
Modified: XoopsModules/lexikon/trunk/lexikon/admin/importdictionary.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/importdictionary.php 2012-09-09 10:41:11 UTC (rev 10160)
+++ XoopsModules/lexikon/trunk/lexikon/admin/importdictionary.php 2012-09-09 16:25:15 UTC (rev 10161)
@@ -1,6 +1,6 @@
<?php
//////////////////////////////////////////////////////////////////////////////
-// $Id: importdictionary.php,v 1.1 18/03/2011 17:21:00 Yerres Exp $ //
+// $Id: importdictionary.php,v 1.2 18/03/2011 17:21:00 Yerres Exp $ //
// ------------------------------------------------------------------------ //
// This program is free software; you can redistribute it and/or modify //
// it under the terms of the GNU General Public License as published by //
@@ -17,17 +17,15 @@
// Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, //
// MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
-// coded bits stolen from Aiba //
+// code partially from Aiba and rmdp //
// ------------------------------------------------------------------------ //
-// import script dictionary -> Lexikon 1.00 //
+// import script dictionary -> Lexikon //
// ------------------------------------------------------------------------ //
//////////////////////////////////////////////////////////////////////////////
include("admin_header.php");
$op = '';
-$op = isset($_GET['op']) ? $_GET['op'] : (isset($_POST['op']) ? $_POST['op'] : '');
-
/****
* Available operations
****/
@@ -37,12 +35,19 @@
xoops_cp_header();
global $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule;
$myts =& MyTextSanitizer::getInstance();
- lx_adminMenu(7, _AM_LX_IMPORT);
+ lx_adminMenu(9, _AM_LX_IMPORT);
}
/****
* Start Import
****/
-
+function showerror($msg) {
+ global $xoopsDB;
+ if ($xoopsDB->error()!='') {
+ echo "<br>".$msg . " <BR><font size=1> - ERROR: ".$xoopsDB->error()."</font>.";
+ } else {
+ echo "<br>".$msg .' O.K.!';
+ }
+}
function import2db($text) {
return preg_replace(array("/'/i"), array("\'"), $text);
}
@@ -64,7 +69,6 @@
$delete=intval($_POST['delete']);
} else {
if (isset($delete)) {
- #$delete=1;
$delete=intval($_POST['delete']);
}
}
@@ -79,9 +83,16 @@
$result3=$xoopsDB->query("select entryID from ".$xoopsDB->prefix("lxentries")."");
//now for each entry, delete the coments
while ( list($entryID)=$xoopsDB->fetchRow($result3) ) {
- xoops_comment_delete(
- $xoopsModule->getVar('mid'), $entryID);
+ xoops_comment_delete( $xoopsModule->getVar('mid'), $entryID);
}
+ $resultC=$xoopsDB->query("SELECT categoryID FROM ".$xoopsDB->prefix("lxcategories")."");
+ while ( list($categoryID)=$xoopsDB->fetchRow($resultC) ) {
+ // delete permissions
+ xoops_groupperm_deletebymoditem($xoopsModule->getVar('mid'), 'lexikon_view', $categoryID);
+ xoops_groupperm_deletebymoditem($xoopsModule->getVar('mid'), 'lexikon_submit', $categoryID);
+ xoops_groupperm_deletebymoditem($xoopsModule->getVar('mid'), 'lexikon_approve', $categoryID);
+ xoops_groupperm_deletebymoditem($xoopsModule->getVar('mid'), 'lexikon_request', $categoryID);
+ }
// delete everything
$sqlquery1=$xoopsDB->queryF("TRUNCATE TABLE ".$xoopsDB->prefix("lxentries"));
$sqlquery2=$xoopsDB->queryF("TRUNCATE TABLE ".$xoopsDB->prefix("lxcategories"));
@@ -104,9 +115,7 @@
$init = $myts -> addSlashes($row2['letter']);
$term = $myts -> addSlashes(import2db($row2['name']));
$definition = $myts -> addSlashes(import2db($row2['definition']));
- #$request = intval($row2['request']);
$datesub = $fecha++;
- #$estado = intval($row2['state']);
$estado = import2db($row2['state']);
if ($estado == 'O') {
$row2['state'] = 0;
@@ -122,7 +131,6 @@
$glocounter = $glocounter + 1;
if ( $delete ) {
-
$ret1 = $xoopsDB->queryF("
INSERT INTO ".$xoopsDB->prefix("lxentries")."
(entryID, init, term, definition, url, submit, datesub, offline, comments)
@@ -137,8 +145,7 @@
}
if (!$ret1) {
$errorcounter = $errorcounter + 1;
- echo "<font color='red'>Error: entryID: ".$entryID."</font><br>$term<br>";
- echo "<font size='1'>". xoops_substr($definition,0,25) ."</FONT><br><br>";
+ showerror('<BR>Import term failed: <font color=red>entryID: '.$entryID.'</font>: '.$term.' ...');
}
// update user posts count
if ($ret1) {
@@ -163,7 +170,7 @@
WHERE dirname = 'dictionary'");
list( $dicID ) = $xoopsDB->fetchRow( $sqlquery ) ;
echo "<p>Dictionary Module ID: ".$dicID."</p>";
- echo "<p>Lexikon Module ID: ".$xoopsModule->getVar('mid')."</p>";
+ echo "<p>Lexikon Module ID: ".$xoopsModule->getVar('mid')."<br/>";
//echo "<p>delete is on/off: ".$delete."</p>";
$commentaire = $xoopsDB->queryF("
@@ -171,15 +178,15 @@
SET com_modid = '".$xoopsModule->getVar('mid')."'
WHERE com_modid = '".$dicID."'");
if (!$commentaire) {
- echo "<font color='red'>Error while moving Comments from Dictionary to Lexikon module.<br><br>";
+ showerror('Import comments failed: ...');
} else {
- echo "<p>Comments successfully moved from Dictionary to Lexikon</p>";
+ showerror('Import comments : ');
}
-
+ echo "<p>Update User Post count: O.K.!</p>";
echo "<p><font color='red'>Incorrectly: ".$errorcounter."</font></p>";
echo "<p>Processed: ".$glocounter."</p>";
- echo "<br /><B><a href='importwordbook.php'>Back to Admin</a></B><p>";
- CloseTable();
+ echo "<H3>Import finished!</H3>";
+ echo "<br /><B><a href='index.php'>Back to Admin</a></B><p>";
xoops_cp_footer();
}
@@ -188,20 +195,19 @@
****/
function FormImport() {
- global $xoopsConfig, $xoopsDB;
- lx_importMenu();
+ global $xoopsConfig, $xoopsDB, $xoopsModule;
+ lx_importMenu(9);
$module_handler = xoops_gethandler('module');
$dictionaryModule = $module_handler->getByDirname("dictionary");
$got_options = false;
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 "</tr>";
echo "<tr>";
- echo "<td class='head' width = '200' align='center'><img src='".XOOPS_URL."/modules/lexikon/images/dialog-important.png"."' alt='' hspace='0' vspace='0' align='middle' style='margin-right: 10px; '></td>";
+ 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 "</tr>";
@@ -219,10 +225,10 @@
} else {
echo "<BR><B><font color='red'>Module Dictionary not found on this site.</font></B><BR><A HREF='index.php'>Back</A><P>";
}
- CloseTable();
xoops_cp_footer();
}
+$op = isset($_GET['op']) ? $_GET['op'] : (isset($_POST['op']) ? $_POST['op'] : '');
switch ($op) {
case "import":
$delete = ( isset( $_GET['delete'] ) ) ? intval($_GET['delete']) : intval($_POST['delete']);
Modified: XoopsModules/lexikon/trunk/lexikon/admin/importglossaire.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/importglossaire.php 2012-09-09 10:41:11 UTC (rev 10160)
+++ XoopsModules/lexikon/trunk/lexikon/admin/importglossaire.php 2012-09-09 16:25:15 UTC (rev 10161)
@@ -1,18 +1,32 @@
<?php
-/**
- * $Id: index.php v 1.0 8 May 2004 hsalazar Exp $
- * Module: lexikon - a multicategory glossary
- * Version: v 1.00
- * Release Date: 8 May 2004
- * Author: hsalazar
- * Licence: GNU
- */
+//////////////////////////////////////////////////////////////////////////////
+// $Id: importglossaire.php,v 1.2 18/03/2011 17:21:00 Yerres Exp $ //
+// ------------------------------------------------------------------------ //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation; either version 2 of the License, or //
+// (at your option) any later version. //
+// //
+// 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. See the GNU //
+// General Public License for more details. //
+// //
+// You should have received a copy of the GNU General Public License //
+// along with this program; if not, write to the //
+// Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, //
+// MA 02111-1307 USA //
+// ------------------------------------------------------------------------ //
+// code partially from Aiba and rmdp //
+// ------------------------------------------------------------------------ //
+// import script glossaire -> Lexikon //
+// ------------------------------------------------------------------------ //
+//////////////////////////////////////////////////////////////////////////////
include( "admin_header.php" );
$myts =& MyTextSanitizer::getInstance();
$op = '';
-$op = isset($_GET['op']) ? $_GET['op'] : (isset($_POST['op']) ? $_POST['op'] : '');
/****
* Available operations
@@ -21,15 +35,22 @@
case "default":
default:
xoops_cp_header();
- global $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule, $entryID;
+ global $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule, $entryID;
$myts =& MyTextSanitizer::getInstance();
- lx_adminMenu(7, _AM_LX_IMPORT);
+ lx_adminMenu(9, _AM_LX_IMPORT);
}
/****
* Start Import
****/
-
+function showerror($msg) {
+ global $xoopsDB;
+ if ($xoopsDB->error()!='') {
+ echo "<br>".$msg . " <BR><font size=1> - ERROR: ".$xoopsDB->error()."</font>.";
+ } else {
+ echo "<br>".$msg .' O.K.!';
+ }
+}
function import2db($text) {
return preg_replace(array("/'/i"), array("\'"), $text);
}
@@ -51,7 +72,6 @@
$delete=intval($_POST['delete']);
} else {
if (isset($delete)) {
- #$delete=1;
$delete=intval($_POST['delete']);
}
}
@@ -66,18 +86,24 @@
$result3=$xoopsDB->query("SELECT entryID FROM ".$xoopsDB->prefix("lxentries")."");
//delete comments for each entry
while ( list($entryID)=$xoopsDB->fetchRow($result3) ) {
- xoops_comment_delete(
- $xoopsModule->getVar('mid'), $entryID);
+ xoops_comment_delete( $xoopsModule->getVar('mid'), $entryID);
}
-
+ $resultC=$xoopsDB->query("SELECT categoryID FROM ".$xoopsDB->prefix("lxcategories")."");
+ while ( list($categoryID)=$xoopsDB->fetchRow($resultC) ) {
+ // delete permissions
+ xoops_groupperm_deletebymoditem($xoopsModule->getVar('mid'), 'lexikon_view', $categoryID);
+ xoops_groupperm_deletebymoditem($xoopsModule->getVar('mid'), 'lexikon_submit', $categoryID);
+ xoops_groupperm_deletebymoditem($xoopsModule->getVar('mid'), 'lexikon_approve', $categoryID);
+ xoops_groupperm_deletebymoditem($xoopsModule->getVar('mid'), 'lexikon_request', $categoryID);
+ }
// delete everything
$sqlquery1=$xoopsDB->queryF("TRUNCATE TABLE ".$xoopsDB->prefix("lxentries"));
$sqlquery2=$xoopsDB->queryF("TRUNCATE TABLE ".$xoopsDB->prefix("lxcategories"));
}
+
/****
* Import ENTRIES
****/
-
$sqlquery=$xoopsDB->query("SELECT id, lettre, nom, definition, affiche
FROM ".$xoopsDB->prefix("glossaire"));
$fecha = time()-1;
@@ -104,20 +130,20 @@
}
if (!$insert) {
$errorcounter = $errorcounter + 1;
- echo "<font color='red'>Error: #".$glo['id']."</font><br>".$glo['nom']."<br>";
- echo "<font size='1'>". substr($glo['definition'],0,25) ."...</FONT><br><br>";
+ showerror('<BR>Import term failed: <font color=red>entryID: '.$glo['id'].'</font>: '.$glo['nom'].' ...');
}
- if ($ret1) {
- if ($uid) {
- $member_handler = &xoops_gethandler('member');
- $submitter =& $member_handler -> getUser($uid);
- if (is_object($submitter) ) {
- $submitter -> setVar('posts',$submitter -> getVar('posts') + 1);
- $res=$member_handler -> insertUser($submitter, true);
- unset($submitter);
- }
- }
- }
+ // update user posts count
+ if ($ret1) {
+ if ($uid) {
+ $member_handler = &xoops_gethandler('member');
+ $submitter =& $member_handler -> getUser($uid);
+ if (is_object($submitter) ) {
+ $submitter -> setVar('posts',$submitter -> getVar('posts') + 1);
+ $res=$member_handler -> insertUser($submitter, true);
+ unset($submitter);
+ }
+ }
+ }
}
$sqlquery=$xoopsDB->query("
@@ -126,44 +152,42 @@
WHERE dirname = 'glossaire'");
list( $gloID ) = $xoopsDB->fetchRow( $sqlquery ) ;
echo "<p>Glossaire Module ID: ".$gloID."</p>";
- echo "<p>Lexikon Module ID: ".$xoopsModule->getVar('mid')."</p>";
+ echo "<p>Lexikon Module ID: ".$xoopsModule->getVar('mid')."<br/>";
$comentario = $xoopsDB->queryF("UPDATE ".$xoopsDB->prefix("xoopscomments")."
SET com_modid = '".$xoopsModule->getVar('mid')."'
WHERE com_modid = '".$gloID."'");
if (!$comentario) {
- echo "<font color='red'>" . _AM_LX_MODULEIMPORTERNOCOM . "<br><br>";
+ showerror('Import comments failed: ...');
} else {
- echo "<p>" . _AM_LX_MODULEIMPORTERNOCOM . "</p>";
+ showerror('Import comments : ');
}
-
+ echo "<p>Update User Post count: O.K.!</p>";
echo "<p><font color='red'>Incorrectly: ".$errorcounter."</font></p>";
- echo "<p>Processed: ".$glocounter."</p>";
- echo "<br /><B><a href='importwordbook.php'>Back to Admin</a></B><p>";
- CloseTable();
+ echo "<p>Processed: ".$glocounter."<br/>";
+ echo "<H3>Import finished!</H3>";
+ echo "<br /><B><a href='index.php'>Back to Admin</a></B><p>";
xoops_cp_footer();
}
+
+/****
+ * IMPORT FORM
+ ****/
function FormImport() {
- global $xoopsConfig, $xoopsDB;
- lx_importMenu();
+ global $xoopsConfig, $xoopsDB, $xoopsModule;
+ lx_importMenu(9);
$module_handler = xoops_gethandler('module');
$glossaireModule = $module_handler->getByDirname("glossaire");
$got_options = false;
if (is_object($glossaireModule)) {
-
-
- /****
- * IMPORT FORM PLAIN HTML
- ****/
-
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 "</tr>";
echo "<tr>";
- echo "<td class='head' width = '200' align='center'><img src='".XOOPS_URL."/modules/lexikon/images/dialog-important.png"."' alt='' hspace='0' vspace='0' align='middle' style='margin-right: 10px; '></td>";
+ 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 "</tr>";
@@ -178,7 +202,6 @@
<input type='submit' name='button' id='import' value='"._AM_LX_IMPORT."'>
<input type='button' name='cancel' value='"._CANCEL."' onclick='javascript:history.go(-1);'></td>";
echo "</TR></table><br />\n";
-
} else {
echo "<BR><B><font color='red'>Module Glossaire not found on this site.</font></B><BR><A HREF='index.php'>Back</A><P>";
}
@@ -188,7 +211,7 @@
global $op;
-
+$op = isset($_GET['op']) ? $_GET['op'] : (isset($_POST['op']) ? $_POST['op'] : '');
switch ($op) {
case "import":
$delete = ( isset( $_GET['delete'] ) ) ? intval($_GET['delete']) : intval($_POST['delete']);
Modified: XoopsModules/lexikon/trunk/lexikon/admin/importwiwimod.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/importwiwimod.php 2012-09-09 10:41:11 UTC (rev 10160)
+++ XoopsModules/lexikon/trunk/lexikon/admin/importwiwimod.php 2012-09-09 16:25:15 UTC (rev 10161)
@@ -1,6 +1,6 @@
<?php
//////////////////////////////////////////////////////////////////////////////
-// $Id: importWiwimod.php,v 1.1 18/03/2011 17:21:00 Yerres Exp $ //
+// $Id: importwiwimod.php,v 1.2 18/03/2011 17:21:00 Yerres Exp $ //
// ------------------------------------------------------------------------ //
// This program is free software; you can redistribute it and/or modify //
// it under the terms of the GNU General Public License as published by //
@@ -17,16 +17,15 @@
// Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, //
// MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
-// code bits stolen from Aiba //
+// code partially from Aiba and rmdp //
// ------------------------------------------------------------------------ //
-// import script Wiwimod -> Lexikon 1.0 //
+// import script wiwimod -> Lexikon //
// ------------------------------------------------------------------------ //
//////////////////////////////////////////////////////////////////////////////
+
include("admin_header.php");
$op = '';
-$op = isset($_GET['op']) ? $_GET['op'] : (isset($_POST['op']) ? $_POST['op'] : '');
-
/****
* Available operations
****/
@@ -36,19 +35,25 @@
xoops_cp_header();
global $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule;
$myts =& MyTextSani...
[truncated message content] |
