|
From: <be...@us...> - 2012-07-02 05:56:15
|
Revision: 9766
http://xoops.svn.sourceforge.net/xoops/?rev=9766&view=rev
Author: beckmi
Date: 2012-07-02 05:56:04 +0000 (Mon, 02 Jul 2012)
Log Message:
-----------
Updating Trunk to 1.66 (Trabis)
Modified Paths:
--------------
XoopsModules/news/trunk/news/admin/functions.php
XoopsModules/news/trunk/news/admin/groupperms.php
XoopsModules/news/trunk/news/admin/index.php
XoopsModules/news/trunk/news/archive.php
XoopsModules/news/trunk/news/article.php
XoopsModules/news/trunk/news/backendt.php
XoopsModules/news/trunk/news/changelog.txt
XoopsModules/news/trunk/news/fpdf/language/english.php
XoopsModules/news/trunk/news/images/news_slogo.png
XoopsModules/news/trunk/news/include/functions.php
XoopsModules/news/trunk/news/index.php
XoopsModules/news/trunk/news/micro_summary.php
XoopsModules/news/trunk/news/newsbythisauthor.php
XoopsModules/news/trunk/news/ratenews.php
XoopsModules/news/trunk/news/submit.php
XoopsModules/news/trunk/news/templates/news_article.html
XoopsModules/news/trunk/news/topics_directory.php
XoopsModules/news/trunk/news/whoswho.php
XoopsModules/news/trunk/news/xoops_version.php
Added Paths:
-----------
XoopsModules/news/trunk/news/language/german/
XoopsModules/news/trunk/news/language/german/admin.php
XoopsModules/news/trunk/news/language/german/blocks.php
XoopsModules/news/trunk/news/language/german/index.html
XoopsModules/news/trunk/news/language/german/mail_template/
XoopsModules/news/trunk/news/language/german/mail_template/category_newstory_notify.tpl
XoopsModules/news/trunk/news/language/german/mail_template/global_newcategory_notify.tpl
XoopsModules/news/trunk/news/language/german/mail_template/global_newstory_notify.tpl
XoopsModules/news/trunk/news/language/german/mail_template/global_storysubmit_notify.tpl
XoopsModules/news/trunk/news/language/german/mail_template/index.html
XoopsModules/news/trunk/news/language/german/mail_template/story_approve_notify.tpl
XoopsModules/news/trunk/news/language/german/mail_template/topic_newstory_notify.tpl
XoopsModules/news/trunk/news/language/german/main.php
XoopsModules/news/trunk/news/language/german/modinfo.php
XoopsModules/news/trunk/news/language/german/newsletter.php
Removed Paths:
-------------
XoopsModules/news/trunk/news/pdf/
Modified: XoopsModules/news/trunk/news/admin/functions.php
===================================================================
--- XoopsModules/news/trunk/news/admin/functions.php 2012-07-02 05:38:02 UTC (rev 9765)
+++ XoopsModules/news/trunk/news/admin/functions.php 2012-07-02 05:56:04 UTC (rev 9766)
@@ -32,71 +32,71 @@
*
* NOTE : Please give credits if you copy this code !
*
- * @package News
+ * @package News
* @author Instant Zero (http://www.instant-zero.com) & Dojo Javscript Toolkit
* @copyright (c) Instant Zero - http://www.instant-zero.com
*/
-function adminmenu($currentoption = 0, $breadcrumb = '')
+function news_adminmenu($currentoption = 0, $breadcrumb = '')
{
- global $xoopsModule, $xoopsConfig;
+ global $xoopsModule, $xoopsConfig;
- include XOOPS_ROOT_PATH.'/modules/news/config.php';
- if (file_exists(XOOPS_ROOT_PATH . '/modules/news/language/' . $xoopsConfig['language'] . '/modinfo.php')) {
- include_once XOOPS_ROOT_PATH. '/modules/news/language/' . $xoopsConfig['language'] . '/modinfo.php';
- } else {
- include_once XOOPS_ROOT_PATH . '/modules/news/language/english/modinfo.php';
- }
+ include XOOPS_ROOT_PATH . '/modules/news/config.php';
+ if (file_exists(XOOPS_ROOT_PATH . '/modules/news/language/' . $xoopsConfig['language'] . '/modinfo.php')) {
+ include_once XOOPS_ROOT_PATH . '/modules/news/language/' . $xoopsConfig['language'] . '/modinfo.php';
+ } else {
+ include_once XOOPS_ROOT_PATH . '/modules/news/language/english/modinfo.php';
+ }
- if(!$cfg['use_fun_menu']) {
- $tblColors = array('','','','','','','','','');
- if($currentoption>=0) {
- $tblColors[$currentoption] = 'current';
- }
+ if (!$cfg['use_fun_menu']) {
+ $tblColors = array('', '', '', '', '', '', '', '', '');
+ if ($currentoption >= 0) {
+ $tblColors[$currentoption] = 'current';
+ }
- /* Nice buttons styles */
- echo "
- <style type='text/css'>
- #buttontop { float:left; width:100%; background: #e7e7e7; font-size:93%; line-height:normal; border-top: 1px solid black; border-left: 1px solid black; border-right: 1px solid black; margin: 0; }
- #buttonbar { float:left; width:100%; background: #e7e7e7 url('" . XOOPS_URL . "/modules/news/images/bg.png') repeat-x left bottom; font-size:93%; line-height:normal; border-left: 1px solid black; border-right: 1px solid black; margin-bottom: 12px; }
- #buttonbar ul { margin:0; margin-top: 15px; padding:10px 10px 0; list-style:none; }
- #buttonbar li { display:inline; margin:0; padding:0; }
- #buttonbar a { float:left; background:url('" . XOOPS_URL . "/modules/news/images/left_both.png') no-repeat left top; margin:0; padding:0 0 0 9px; border-bottom:1px solid #000; text-decoration:none; }
- #buttonbar a span { float:left; display:block; background:url('" . XOOPS_URL . "/modules/news/images/right_both.png') no-repeat right top; padding:5px 15px 4px 6px; font-weight:bold; color:#765; }
- /* Commented Backslash Hack hides rule from IE5-Mac \*/
- #buttonbar a span {float:none;}
- /* End IE5-Mac hack */
- #buttonbar a:hover span { color:#333; }
- #buttonbar #current a { background-position:0 -150px; border-width:0; }
- #buttonbar #current a span { background-position:100% -150px; padding-bottom:5px; color:#333; }
- #buttonbar a:hover { background-position:0% -150px; }
- #buttonbar a:hover span { background-position:100% -150px; }
- </style>
- ";
+ /* Nice buttons styles */
+ echo "
+ <style type='text/css'>
+ #buttontop { float:left; width:100%; background: #e7e7e7; font-size:93%; line-height:normal; border-top: 1px solid black; border-left: 1px solid black; border-right: 1px solid black; margin: 0; }
+ #buttonbar { float:left; width:100%; background: #e7e7e7 url('" . XOOPS_URL . "/modules/news/images/bg.png') repeat-x left bottom; font-size:93%; line-height:normal; border-left: 1px solid black; border-right: 1px solid black; margin-bottom: 12px; }
+ #buttonbar ul { margin:0; margin-top: 15px; padding:10px 10px 0; list-style:none; }
+ #buttonbar li { display:inline; margin:0; padding:0; }
+ #buttonbar a { float:left; background:url('" . XOOPS_URL . "/modules/news/images/left_both.png') no-repeat left top; margin:0; padding:0 0 0 9px; border-bottom:1px solid #000; text-decoration:none; }
+ #buttonbar a span { float:left; display:block; background:url('" . XOOPS_URL . "/modules/news/images/right_both.png') no-repeat right top; padding:5px 15px 4px 6px; font-weight:bold; color:#765; }
+ /* Commented Backslash Hack hides rule from IE5-Mac \*/
+ #buttonbar a span {float:none;}
+ /* End IE5-Mac hack */
+ #buttonbar a:hover span { color:#333; }
+ #buttonbar #current a { background-position:0 -150px; border-width:0; }
+ #buttonbar #current a span { background-position:100% -150px; padding-bottom:5px; color:#333; }
+ #buttonbar a:hover { background-position:0% -150px; }
+ #buttonbar a:hover span { background-position:100% -150px; }
+ </style>
+ ";
- echo "<div id='buttontop'>";
- echo "<table style=\"width: 100%; padding: 0; \" cellspacing=\"0\"><tr>";
- echo "<td style=\"width: 60%; font-size: 10px; text-align: left; color: #2F5376; padding: 0 6px; line-height: 18px;\"><a class=\"nobutton\" href=\"".XOOPS_URL."/modules/system/admin.php?fct=preferences&op=showmod&mod=".$xoopsModule->getVar('mid')."\">" . _AM_NEWS_GENERALSET . "</a> | <a href=\"../index.php\">" . _AM_NEWS_GOTOMOD . "</a> | <a href=\"#\">" . _AM_NEWS_HELP . "</a> | <a href='index.php?op=verifydb'>". _AM_NEWS_VERIFY_TABLES ."</a></td>";
- echo "<td style=\"width: 40%; font-size: 10px; text-align: right; color: #2F5376; padding: 0 6px; line-height: 18px;\"><b>" . $xoopsModule->name() . " " . _AM_NEWS_MODULEADMIN . "</b> " . $breadcrumb . "</td>";
- echo '</tr></table>';
- echo '</div>';
+ echo "<div id='buttontop'>";
+ echo "<table style=\"width: 100%; padding: 0; \" cellspacing=\"0\"><tr>";
+ echo "<td style=\"width: 60%; font-size: 10px; text-align: left; color: #2F5376; padding: 0 6px; line-height: 18px;\"><a class=\"nobutton\" href=\"".XOOPS_URL."/modules/system/admin.php?fct=preferences&op=showmod&mod=".$xoopsModule->getVar('mid')."\">" . _AM_NEWS_GENERALSET . "</a> | <a href=\"../index.php\">" . _AM_NEWS_GOTOMOD . "</a> | <a href=\"#\">" . _AM_NEWS_HELP . "</a> | <a href='index.php?op=verifydb'>". _AM_NEWS_VERIFY_TABLES ."</a></td>";
+ echo "<td style=\"width: 40%; font-size: 10px; text-align: right; color: #2F5376; padding: 0 6px; line-height: 18px;\"><b>" . $xoopsModule->name() . " " . _AM_NEWS_MODULEADMIN . "</b> " . $breadcrumb . "</td>";
+ echo '</tr></table>';
+ echo '</div>';
- echo "<div id='buttonbar'>";
- echo '<ul>';
- echo "<li id='" . $tblColors[0] . "'><a href=\"index.php?op=topicsmanager\"\"><span>"._MI_NEWS_ADMENU2 ."</span></a></li>\n";
- echo "<li id='" . $tblColors[1] . "'><a href=\"index.php?op=newarticle\"><span>" . _MI_NEWS_ADMENU3 . "</span></a></li>\n";
- echo "<li id='" . $tblColors[2] . "'><a href=\"groupperms.php\"><span>" . _MI_NEWS_GROUPPERMS . "</span></a></li>\n";
- echo "<li id='" . $tblColors[3] . "'><a href=\"index.php?op=prune\"><span>" . _MI_NEWS_PRUNENEWS . "</span></a></li>\n";
- echo "<li id='" . $tblColors[4] . "'><a href=\"index.php?op=export\"><span>" . _MI_NEWS_EXPORT . "</span></a></li>\n";
- echo "<li id='" . $tblColors[5] . "'><a href=\"index.php?op=configurenewsletter\"><span>" . _MI_NEWS_NEWSLETTER . "</span></a></li>\n";
- echo "<li id='" . $tblColors[6] . "'><a href=\"index.php?op=stats\"><span>" . _MI_NEWS_STATS . "</span></a></li>\n";
- if ($xoopsModule->getVar('version') != 164) {
- echo "<li id='" . $tblColors[7] . "'><a href=\"upgrade.php\"><span>" . _AM_NEWS_UPGRADE . "</span></a></li>\n";
- }
- echo "<li id='" . $tblColors[8] . "'><a href=\"index.php?op=metagen\"><span>" . _MI_NEWS_METAGEN . "</span></a></li>\n";
- echo '</ul></div>';
- echo '<br /><br /><pre> </pre><pre> </pre>';
- } else {
-?>
+ echo "<div id='buttonbar'>";
+ echo '<ul>';
+ echo "<li id='" . $tblColors[0] . "'><a href=\"index.php?op=topicsmanager\"\"><span>"._MI_NEWS_ADMENU2 ."</span></a></li>\n";
+ echo "<li id='" . $tblColors[1] . "'><a href=\"index.php?op=newarticle\"><span>" . _MI_NEWS_ADMENU3 . "</span></a></li>\n";
+ echo "<li id='" . $tblColors[2] . "'><a href=\"groupperms.php\"><span>" . _MI_NEWS_GROUPPERMS . "</span></a></li>\n";
+ echo "<li id='" . $tblColors[3] . "'><a href=\"index.php?op=prune\"><span>" . _MI_NEWS_PRUNENEWS . "</span></a></li>\n";
+ echo "<li id='" . $tblColors[4] . "'><a href=\"index.php?op=export\"><span>" . _MI_NEWS_EXPORT . "</span></a></li>\n";
+ echo "<li id='" . $tblColors[5] . "'><a href=\"index.php?op=configurenewsletter\"><span>" . _MI_NEWS_NEWSLETTER . "</span></a></li>\n";
+ echo "<li id='" . $tblColors[6] . "'><a href=\"index.php?op=stats\"><span>" . _MI_NEWS_STATS . "</span></a></li>\n";
+ if ($xoopsModule->getVar('version') != 166) {
+ echo "<li id='" . $tblColors[7] . "'><a href=\"upgrade.php\"><span>" . _AM_NEWS_UPGRADE . "</span></a></li>\n";
+ }
+ echo "<li id='" . $tblColors[8] . "'><a href=\"index.php?op=metagen\"><span>" . _MI_NEWS_METAGEN . "</span></a></li>\n";
+ echo '</ul></div>';
+ echo '<br /><br /><pre> </pre><pre> </pre>';
+ } else {
+ ?>
<script type="text/javascript" src="../js/dojo.js"></script>
<script language="JavaScript" type="text/javascript">
dojo.require("dojo.widget.FisheyeList");
@@ -180,10 +180,9 @@
</div>
</div>
<?php
- }
+ }
}
-
function news_collapsableBar($tablename = '', $iconname = '')
{
@@ -227,7 +226,7 @@
//-->
</script>
<?php
- echo "<h4 style=\"color: #2F5376; margin: 6px 0 0 0; \"><a href='#' onClick=\"toggle('" . $tablename . "'); toggleIcon('" . $iconname . "');\">";
+echo "<h4 style=\"color: #2F5376; margin: 6px 0 0 0; \"><a href='#' onClick=\"toggle('" . $tablename . "'); toggleIcon('" . $iconname . "');\">";
}
-?>
+?>
\ No newline at end of file
Modified: XoopsModules/news/trunk/news/admin/groupperms.php
===================================================================
--- XoopsModules/news/trunk/news/admin/groupperms.php 2012-07-02 05:38:02 UTC (rev 9765)
+++ XoopsModules/news/trunk/news/admin/groupperms.php 2012-07-02 05:56:04 UTC (rev 9766)
@@ -32,42 +32,42 @@
xoops_cp_header();
-adminmenu(2);
+news_adminmenu(2);
echo '<br /><br /><br />';
-$permtoset= isset($_POST['permtoset']) ? intval($_POST['permtoset']) : 1;
-$selected=array('','','');
+$permtoset = isset($_POST['permtoset']) ? intval($_POST['permtoset']) : 1;
+$selected = array('', '', '');
$selected[$permtoset-1]=' selected';
echo "<form method='post' name='fselperm' action='groupperms.php'><select name='permtoset' onChange='javascript: document.fselperm.submit()'><option value='1'".$selected[0].">"._AM_APPROVEFORM."</option><option value='2'".$selected[1].">"._AM_SUBMITFORM."</option><option value='3'".$selected[2].">"._AM_VIEWFORM."</option></select> <input type='submit' name='go'></form>";
$module_id = $xoopsModule->getVar('mid');
switch($permtoset)
{
- case 1:
- $title_of_form = _AM_APPROVEFORM;
- $perm_name = 'news_approve';
- $perm_desc = _AM_APPROVEFORM_DESC;
- break;
- case 2:
- $title_of_form = _AM_SUBMITFORM;
- $perm_name = 'news_submit';
- $perm_desc = _AM_SUBMITFORM_DESC;
- break;
- case 3:
- $title_of_form = _AM_VIEWFORM;
- $perm_name = 'news_view';
- $perm_desc = _AM_VIEWFORM_DESC;
- break;
+ case 1:
+ $title_of_form = _AM_APPROVEFORM;
+ $perm_name = 'news_approve';
+ $perm_desc = _AM_APPROVEFORM_DESC;
+ break;
+ case 2:
+ $title_of_form = _AM_SUBMITFORM;
+ $perm_name = 'news_submit';
+ $perm_desc = _AM_SUBMITFORM_DESC;
+ break;
+ case 3:
+ $title_of_form = _AM_VIEWFORM;
+ $perm_name = 'news_view';
+ $perm_desc = _AM_VIEWFORM_DESC;
+ break;
}
-$permform = new XoopsGroupPermForm($title_of_form, $module_id, $perm_name, $perm_desc);
-$xt = new XoopsTopic( $xoopsDB -> prefix( 'topics' ) );
+$permform = new XoopsGroupPermForm($title_of_form, $module_id, $perm_name, $perm_desc,'admin/groupperms.php');
+$xt = new XoopsTopic($xoopsDB -> prefix('topics'));
$alltopics =& $xt->getTopicsList();
foreach ($alltopics as $topic_id => $topic) {
$permform->addItem($topic_id, $topic['title'], $topic['pid']);
}
echo $permform->render();
echo "<br /><br /><br /><br />\n";
-unset ($permform);
+unset($permform);
xoops_cp_footer();
-?>
+?>
\ No newline at end of file
Modified: XoopsModules/news/trunk/news/admin/index.php
===================================================================
--- XoopsModules/news/trunk/news/admin/index.php 2012-07-02 05:38:02 UTC (rev 9765)
+++ XoopsModules/news/trunk/news/admin/index.php 2012-07-02 05:56:04 UTC (rev 9766)
@@ -264,7 +264,7 @@
{
include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
xoops_cp_header();
- adminmenu(3);
+ news_adminmenu(3);
echo '<br /><br /><br />';
$sform = new XoopsThemeForm(_AM_NEWS_PRUNENEWS, 'pruneform', XOOPS_URL.'/modules/news/admin/index.php', 'post');
$sform->addElement(new XoopsFormTextDateSelect(_AM_NEWS_PRUNE_BEFORE, 'prune_date',15,time()), true);
@@ -357,7 +357,7 @@
{
include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
xoops_cp_header();
- adminmenu(5);
+ news_adminmenu(5);
echo '<br /><br /><br />';
$sform = new XoopsThemeForm(_AM_NEWS_NEWSLETTER, 'newsletterform', XOOPS_URL.'/modules/news/admin/index.php', 'post');
$dates_tray = new XoopsFormElementTray(_AM_NEWS_NEWSLETTER_BETWEEN);
@@ -400,7 +400,7 @@
{
global $xoopsConfig, $dateformat;
xoops_cp_header();
- adminmenu(5);
+ news_adminmenu(5);
$newslettertemplate = '';
if (file_exists(XOOPS_ROOT_PATH.'/modules/news/language/'.$xoopsConfig['language'].'/newsletter.php')) {
include_once XOOPS_ROOT_PATH.'/modules/news/language/'.$xoopsConfig['language'].'/newsletter.php';
@@ -472,7 +472,7 @@
{
include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
xoops_cp_header();
- adminmenu(4);
+ news_adminmenu(4);
echo '<br /><br /><br />';
$sform = new XoopsThemeForm(_AM_NEWS_EXPORT_NEWS, 'exportform', XOOPS_URL.'/modules/news/admin/index.php', 'post');
$dates_tray = new XoopsFormElementTray(_AM_NEWS_EXPORT_BETWEEN);
@@ -514,7 +514,7 @@
function LaunchExport()
{
xoops_cp_header();
- adminmenu(4);
+ news_adminmenu(4);
echo '<br />';
$story = new NewsStory();
$topic= new NewsTopic();
@@ -620,7 +620,7 @@
global $xoopsDB, $xoopsConfig, $xoopsModule, $myts;
include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
xoops_cp_header();
- adminmenu(0);
+ news_adminmenu(0);
$uploadfolder=sprintf(_AM_UPLOAD_WARNING,XOOPS_URL . '/modules/' . $xoopsModule->dirname().'/images/topics');
$uploadirectory='/modules/' . $xoopsModule -> dirname().'/images/topics';
$start = isset($_GET['start']) ? intval($_GET['start']) : 0;
@@ -1085,7 +1085,7 @@
} else {
include_once XOOPS_ROOT_PATH.'/modules/news/language/english/main.php';
}
- adminmenu(6);
+ news_adminmenu(6);
$news = new NewsStory();
$stats = array();
$stats=$news->GetStats(news_getmoduleoption('storycountadmin'));
@@ -1229,7 +1229,7 @@
} else {
include_once XOOPS_ROOT_PATH.'/modules/news/language/english/main.php';
}
- adminmenu(8);
+ news_adminmenu(8);
echo "<h1>"._AM_NEWS_METAGEN."</h1>";
echo _AM_NEWS_METAGEN_DESC."<br /><br />";
@@ -1369,7 +1369,7 @@
case 'newarticle':
xoops_cp_header();
- adminmenu(1);
+ news_adminmenu(1);
echo '<h4>' . _AM_CONFIG . '</h4>';
include_once XOOPS_ROOT_PATH . '/class/module.textsanitizer.php';
newSubmissions();
@@ -1516,7 +1516,7 @@
case 'verifydb':
xoops_cp_header();
- adminmenu();
+ news_adminmenu();
$tbllist = $xoopsDB->prefix('stories').','.$xoopsDB->prefix('topics').','.$xoopsDB->prefix('stories_files').','.$xoopsDB->prefix('stories_votedata');
$xoopsDB->queryF("OPTIMIZE TABLE ".$tbllist);
$xoopsDB->queryF("CHECK TABLE ".$tbllist);
@@ -1528,7 +1528,7 @@
case 'default':
default:
xoops_cp_header();
- adminmenu(-1);
+ news_adminmenu(-1);
if(!news_TableExists($xoopsDB->prefix('stories_votedata')) || !news_TableExists($xoopsDB->prefix('stories_files')) ) {
echo "<div align='center'>"._AM_NEWS_PLEASE_UPGRADE.'</div><br/><br />';
}
Modified: XoopsModules/news/trunk/news/archive.php
===================================================================
--- XoopsModules/news/trunk/news/archive.php 2012-07-02 05:38:02 UTC (rev 9765)
+++ XoopsModules/news/trunk/news/archive.php 2012-07-02 05:56:04 UTC (rev 9766)
@@ -100,7 +100,7 @@
$dateformat='m';
}
$myts =& MyTextSanitizer::getInstance();
-$xoopsTpl->assign('xoops_pagetitle', $myts->htmlSpecialChars(_NW_NEWSARCHIVES) . $pgtitle . ' - ' . $myts->htmlSpecialChars($xoopsModule->name()));
+$xoopsTpl->assign('xoops_pagetitle', $myts->htmlSpecialChars(_NW_NEWSARCHIVES) . $pgtitle . ' - ' . $xoopsModule->name('s'));
$useroffset = '';
if(is_object($xoopsUser)) {
Modified: XoopsModules/news/trunk/news/article.php
===================================================================
--- XoopsModules/news/trunk/news/article.php 2012-07-02 05:38:02 UTC (rev 9765)
+++ XoopsModules/news/trunk/news/article.php 2012-07-02 05:56:04 UTC (rev 9766)
@@ -327,7 +327,7 @@
if(news_getmoduleoption('enhanced_pagenav') && (isset($arr_titles) && is_array($arr_titles) && isset($arr_titles,$storypage) && $storypage>0)) {
$complement = ' - '.$arr_titles[$storypage];
}
-$xoopsTpl->assign('xoops_pagetitle', $article->title() . $complement. ' - ' . $article->topic_title() . ' - ' . $myts->htmlSpecialChars($xoopsModule->name()));
+$xoopsTpl->assign('xoops_pagetitle', $article->title() . $complement. ' - ' . $article->topic_title() . ' - ' . $xoopsModule->name('s'));
if(news_getmoduleoption('newsbythisauthor')) {
$xoopsTpl->assign('news_by_the_same_author_link',sprintf("<a href='%s?uid=%d'>%s</a>",XOOPS_URL.'/modules/news/newsbythisauthor.php',$article->uid(),_NW_NEWSSAMEAUTHORLINK));
Modified: XoopsModules/news/trunk/news/backendt.php
===================================================================
--- XoopsModules/news/trunk/news/backendt.php 2012-07-02 05:38:02 UTC (rev 9765)
+++ XoopsModules/news/trunk/news/backendt.php 2012-07-02 05:56:04 UTC (rev 9766)
@@ -42,6 +42,9 @@
include_once XOOPS_ROOT_PATH.'/modules/news/class/class.newstopic.php';
include_once XOOPS_ROOT_PATH.'/modules/news/include/functions.php';
+error_reporting(0);
+$GLOBALS['xoopsLogger']->activated = false;
+
if(!news_getmoduleoption('topicsrss')) {
exit();
}
@@ -77,7 +80,7 @@
$tpl->assign('channel_lastbuild', formatTimestamp(time(), 'rss'));
$tpl->assign('channel_webmaster', checkEmail($xoopsConfig['adminmail'],true)); // Fed up with spam
$tpl->assign('channel_editor', checkEmail($xoopsConfig['adminmail'],true)); // Fed up with spam
- $tpl->assign('channel_category', htmlspecialchars($xt->topic_title(), ENT_QUOTES));
+ $tpl->assign('channel_category', $xt->topic_title());
$tpl->assign('channel_generator', 'XOOPS');
$tpl->assign('channel_language', _LANGCODE);
$tpl->assign('image_url', XOOPS_URL.'/images/logo.gif');
@@ -96,8 +99,9 @@
$tpl->assign('image_height', $height);
$count = $sarray;
foreach ($sarray as $story) {
- $storytitle = htmlspecialchars($story->title(), ENT_QUOTES);
- $description = htmlspecialchars($story->hometext(), ENT_QUOTES);
+ $storytitle = $story->title();
+ //if we are allowing html, we need to use htmlspecialchars or any bug will break the output
+ $description = htmlspecialchars($story->hometext());
$tpl->append('items', array('title' => xoops_utf8_encode($storytitle), 'link' => XOOPS_URL.'/modules/news/article.php?storyid='.$story->storyid(), 'guid' => XOOPS_URL.'/modules/news/article.php?storyid='.$story->storyid(), 'pubdate' => formatTimestamp($story->published(), 'rss'), 'description' => xoops_utf8_encode($description)));
}
}
Modified: XoopsModules/news/trunk/news/changelog.txt
===================================================================
--- XoopsModules/news/trunk/news/changelog.txt 2012-07-02 05:38:02 UTC (rev 9765)
+++ XoopsModules/news/trunk/news/changelog.txt 2012-07-02 05:56:04 UTC (rev 9766)
@@ -1,6 +1,18 @@
Changelog
+*******
+v1.66
+*******
+- Removing double encoding with htmlspecialchars
+- Removing pdf folder (dhsoft)
+Changelog
*******
+v1.65
+*******
+- Adding prefix to adminmenu function for 2.4.2 compatibility
+- Correcting method for loading Editors in xoops_version.php
+
+*******
v1.63
*******
- The Xoops 2.3 editors are fully supported (tested with Xoops 2.3.1 RC)
@@ -590,4 +602,4 @@
> Added upload to topic creation form
> The link "Comments" is not any more visible when comments are disabled
-v1.1 - Baseline
\ No newline at end of file
+v1.1 - Baseline
Modified: XoopsModules/news/trunk/news/fpdf/language/english.php
===================================================================
--- XoopsModules/news/trunk/news/fpdf/language/english.php 2012-07-02 05:38:02 UTC (rev 9765)
+++ XoopsModules/news/trunk/news/fpdf/language/english.php 2012-07-02 05:56:04 UTC (rev 9766)
@@ -148,9 +148,18 @@
}
function _encoding(&$text, $in_charset, $out_charset)
- {
- // some conversion goes here
- // refer to schinese.php for example
- }
+ {
+ $xconv_handler = @xoops_getmodulehandler('xconv', 'xconv', true);
+ if($xconv_handler &&
+ $converted_text = @$xconv_handler->convert_encoding($text, $out_charset, $in_charset)
+ ){
+ $text = $converted_text;
+ return;
+ }
+ if(XOOPS_USE_MULTIBYTES && function_exists('mb_convert_encoding')) $converted_text = @mb_convert_encoding($text, $out_charset, $in_charset);
+ else
+ if(function_exists('iconv')) $converted_text = @iconv($in_charset, $out_charset . "//TRANSLIT", $text);
+ $text = empty($converted_text)?$text:$converted_text;
+ }
}
?>
\ No newline at end of file
Modified: XoopsModules/news/trunk/news/images/news_slogo.png
===================================================================
(Binary files differ)
Modified: XoopsModules/news/trunk/news/include/functions.php
===================================================================
--- XoopsModules/news/trunk/news/include/functions.php 2012-07-02 05:38:02 UTC (rev 9765)
+++ XoopsModules/news/trunk/news/include/functions.php 2012-07-02 05:56:04 UTC (rev 9766)
@@ -698,4 +698,5 @@
}
return true;
}
+
?>
\ No newline at end of file
Modified: XoopsModules/news/trunk/news/index.php
===================================================================
--- XoopsModules/news/trunk/news/index.php 2012-07-02 05:38:02 UTC (rev 9765)
+++ XoopsModules/news/trunk/news/index.php 2012-07-02 05:56:04 UTC (rev 9766)
@@ -202,7 +202,7 @@
$story['topic_title'] = $thisstory->textlink();
$story['topic_color'] = '#'.$myts->displayTarea($thisstory->topic_color);
if($firsttitle=='') {
- $firsttitle=$myts->htmlSpecialChars($thisstory->topic_title()) . ' - ' . $myts->htmlSpecialChars($thisstory->title());
+ $firsttitle=$thisstory->topic_title() . ' - ' . $thisstory->title();
}
$columns[$k][] = $story;
$k++;
@@ -309,12 +309,12 @@
* Assign page's title
*/
if($firsttitle!='') {
- $xoopsTpl->assign('xoops_pagetitle', $myts->htmlSpecialChars($firsttitle) . ' - ' . $myts->htmlSpecialChars($xoopsModule->name()));
+ $xoopsTpl->assign('xoops_pagetitle', $firsttitle . ' - ' . $xoopsModule->name('s'));
} else {
if($topictitle!='') {
- $xoopsTpl->assign('xoops_pagetitle', $myts->htmlSpecialChars($topictitle));
+ $xoopsTpl->assign('xoops_pagetitle', $topictitle);
} else {
- $xoopsTpl->assign('xoops_pagetitle', $myts->htmlSpecialChars($xoopsModule->name()));
+ $xoopsTpl->assign('xoops_pagetitle', $xoopsModule->name('s'));
}
}
@@ -326,4 +326,4 @@
$xoopsTpl->assign('lang_reads', _READS);
$xoopsTpl->assign('lang_morereleases', _NW_MORERELEASES);
include_once XOOPS_ROOT_PATH.'/footer.php';
-?>
+?>
\ No newline at end of file
Added: XoopsModules/news/trunk/news/language/german/admin.php
===================================================================
--- XoopsModules/news/trunk/news/language/german/admin.php (rev 0)
+++ XoopsModules/news/trunk/news/language/german/admin.php 2012-07-02 05:56:04 UTC (rev 9766)
@@ -0,0 +1,210 @@
+<?php
+// $Id: admin.php,v 1.18 2004/07/26 17:51:25 hthouzard Exp $
+//%%%%%% Admin Module Name Articles %%%%%
+define("_AM_DBUPDATED","Datenbank wurde erfolgreich aktualisiert!");
+define("_AM_CONFIG","Artikelkonfiguration");
+define("_AM_AUTOARTICLES","Automatisierte Artikel");
+define("_AM_STORYID","Artikel-ID");
+define("_AM_TITLE","Titel");
+define("_AM_TOPIC","Thema");
+define("_AM_POSTER","Autor");
+define("_AM_PROGRAMMED","Zeitgesteuerte Veröffentlichung");
+define("_AM_ACTION","Aktion");
+define("_AM_EDIT","Bearbeiten");
+define("_AM_DELETE","Löschen");
+define("_AM_LAST10ARTS","Die letzten %d Artikel");
+define("_AM_PUBLISHED","Veröffentlicht am"); // Published Date
+define("_AM_GO","Los!");
+define("_AM_EDITARTICLE","Bearbeite Artikel");
+define("_AM_POSTNEWARTICLE","Neuen Artikel veröffentlichen");
+define("_AM_ARTPUBLISHED","Dein Artikel wurde veröffentlicht!");
+define("_AM_HELLO","Hallo %s,");
+define("_AM_YOURARTPUB","Der von dir verfasste Artikel wurde veröffentlicht.");
+define("_AM_TITLEC","Titel: ");
+define("_AM_URLC","URL: ");
+define("_AM_PUBLISHEDC","Veröffentlicht: ");
+define("_AM_RUSUREDEL","Sind Sie sicher, dass Sie diesen Artikel und alle damit verbundenen Kommentare löschen wollen?");
+
+define("_AM_YES","Ja");
+define("_AM_NO","Nein");
+define("_AM_INTROTEXT","Einführungstext");
+define("_AM_EXTEXT","Erweiterter Text:");
+define("_AM_ALLOWEDHTML","HTML-Tags erlauben:");
+define("_AM_DISAMILEY","Smilies deaktivieren");
+define("_AM_DISHTML","HTML deaktivieren");
+define("_AM_APPROVE","Freigeben");
+define("_AM_MOVETOTOP","Artikel nach oben verschieben");
+define("_AM_CHANGEDATETIME","Datum/Uhrzeit der Veröffentlichung ändern");
+define("_AM_NOWSETTIME","Veröffentlichung ist eingestellt auf: %s"); // %s is datetime of publish
+define("_AM_CURRENTTIME","Aktuelle Uhrzeit: %s"); // %s is the current datetime
+define("_AM_SETDATETIME","<b>Datum/Uhrzeit der Veröffentlichung setzen:</b>");
+define("_AM_MONTHC","Monat:");
+define("_AM_DAYC","Tag:");
+define("_AM_YEARC","Jahr:");
+define("_AM_TIMEC","Uhrzeit:");
+define("_AM_PREVIEW","Vorschau");
+define("_AM_SAVE","Sichern");
+define("_AM_PUBINHOME","Auf der Homepage anzeigen?");
+define("_AM_ADD","Hinzufügen");
+
+//%%%%%% Admin Module Name Topics %%%%%
+
+define("_AM_ADDMTOPIC","Ein Hauptthema hinzufügen");
+define("_AM_TOPICNAME","Thementitel");
+// Warning, changed from 40 to 255 characters.
+define("_AM_MAX40CHAR","(max. 255 Zeichen)");
+define("_AM_TOPICIMG","Themenbild");
+define("_AM_IMGNAEXLOC","Bildname + Dateiendung befinden sich in %s");
+define("_AM_FEXAMPLE","z.B.: games.gif");
+define("_AM_ADDSUBTOPIC","Ein Unterthema hinzufügen");
+define("_AM_IN","in");
+define("_AM_MODIFYTOPIC","Thema ändern");
+define("_AM_MODIFY","Ändern");
+define("_AM_PARENTTOPIC","Übergeordnetes Thema");
+define("_AM_SAVECHANGE","Äderungen sichern");
+define("_AM_DEL","Löschen");
+define("_AM_CANCEL","Abbrechen");
+define("_AM_WAYSYWTDTTAL","WARNUNG: Sind Sie sicher, dass Sie dieses Thema und alle damit verbundenen Artikel und Kommentare löschen wollen?");
+
+
+
+// Added in Beta6
+define("_AM_TOPICSMNGR","Themenmanager - Themenbereiche insgesamt ");
+define("_AM_PEARTICLES","Artikel veröffentlichen / bearbeiten");
+define("_AM_NEWSUB","Neuzugänge");
+define("_AM_POSTED","Veröffentlicht");
+define("_AM_GENERALCONF","Modulkonfiguration");
+
+// Added in RC2
+define("_AM_TOPICDISPLAY","Themenbild anzeigen?");
+define("_AM_TOPICALIGN","Position");
+define("_AM_RIGHT","Rechts");
+define("_AM_LEFT","Links");
+
+define("_AM_EXPARTS","Abgelaufene Artikel");
+define("_AM_EXPIRED","Abgelaufen");
+define("_AM_CHANGEEXPDATETIME","Datum/Uhrzeit des Ablaufs ändern");
+define("_AM_SETEXPDATETIME","Datum/Uhrzeit des Ablaufs setzen: ");
+define("_AM_NOWSETEXPTIME","Aktuell eingestellt auf: %s");
+
+// Added in RC3
+define("_AM_ERRORTOPICNAME","Sie müssen einen Themennamen angeben!");
+define("_AM_EMPTYNODELETE","Nichts zu löschen!");
+
+// Added 240304 (Mithrandir)
+define("_AM_GROUPPERM","Gruppenberechtigungen setzen");
+
+define("_AM_SELFILE","Datei zum upload auswählen");
+
+// Added by Herve
+define("_AM_UPLOAD_DBERROR_SAVE","Fehler beim Anhängen der Datei zum Artikel");
+define("_AM_UPLOAD_ERROR","Fehler beim Hochladen der Datei");
+define("_AM_UPLOAD_ATTACHFILE","Angehängte Datei(en)");
+define("_AM_APPROVEFORM","Genehmigungs - berechtigungen");
+define("_AM_SUBMITFORM","Schreib - berechtigungen");
+define("_AM_VIEWFORM","Lese - berechtigungen");
+define("_AM_APPROVEFORM_DESC","Wählen, wer Artikel genehmigen darf");
+define("_AM_SUBMITFORM_DESC","Wählen, wer Artikel schreiben darf");
+define("_AM_VIEWFORM_DESC","Wählen, wer welche Themen sehen darf");
+define("_AM_DELETE_SELFILES","Lösche ausgewählte Dateien");
+define("_AM_TOPIC_PICTURE","Bild hochladen");
+define("_AM_UPLOAD_WARNING","<B>Achtung, nicht vergessen die Schreibberechtigung für folgende Verzeichnisse einzurichten : %s</B>");
+
+
+define("_AM_NEWS_UPGRADECOMPLETE","Upgrade abgeschlossen");
+define("_AM_NEWS_UPDATEMODULE","Update Modul- templates und blöcke");
+define("_AM_NEWS_UPGRADEFAILED","Upgrade fehlgeschlagen");
+define("_AM_NEWS_UPGRADE","Upgrade");
+define("_AM_ADD_TOPIC","Ein Thema hinzufügen");
+define("_AM_ADD_TOPIC_ERROR","Fehler, dieses Thema existiert schon!");
+define("_AM_ADD_TOPIC_ERROR1","Fehler, dieses Thema kann nicht als Übergeordnetes Thema gewählt werden!");
+define("_AM_SUB_MENU","Dieses Thema als Sub-Menü eintragen");
+
+
+define("_AM_SUB_MENU_YESNO","Sub-Menü?");
+define("_AM_HITS","Aufrufe");
+define("_AM_CREATED","Erstellt");
+
+define("_AM_TOPIC_DESCR","Themen Beschreibung");
+define("_AM_USERS_LIST","Mitgliederliste");
+define("_AM_PUBLISH_FRONTPAGE","Eintrag im Hauptmenü?");
+define("_AM_NEWS_UPGRADEFAILED1","Konnte folgende Tabelle nicht erzeugen: stories_files");
+define("_AM_NEWS_UPGRADEFAILED2","Konnte die Thementitellänge (topic title's length) nicht ändern");
+define("_AM_NEWS_UPGRADEFAILED21","Konnte die neuen Felder in (topics table) nicht zufügen");
+define("_AM_NEWS_UPGRADEFAILED3","Konnte folgende Tabelle nicht erzeugen: stories_votedata");
+define("_AM_NEWS_UPGRADEFAILED4","Konnte die beiden Felder 'rating' and 'votes' in der Tabelle 'story' nicht zufügen");
+define("_AM_NEWS_UPGRADEFAILED0","Bitte beachte die Warnmeldung(en). Versuche die Probleme mittels phpMyadmin und den sql Definitionen, die im 'sql' Ordner des news Moduls zu finden sind, zu beheben.");
+
+define("_AM_NEWS_UPGR_ACCESS_ERROR","Fehler, es muss das upgrade script (mit Adminrechten für das Modul) ausgeführt werden.");
+define("_AM_NEWS_PRUNE_BEFORE","Artikel aufräumen, die veröffentlicht wurden vor:");
+define("_AM_NEWS_PRUNE_EXPIREDONLY","Nur Artikel aufräumen die abgelaufen sind.");
+define("_AM_NEWS_PRUNE_CONFIRM","Warnung, alle Artikel (u. Kommentare zum Artikel) vor %s <br />werden für immer gelöscht. Dies kann nicht rückgängig gemacht werden. <br />Es wurden %s Artikel für den Zeitraum gefunden.<br />Absolut sicher?");
+
+define("_AM_NEWS_PRUNE_TOPICS","Ein oder mehrere Themenbereich(e) auswählen");
+define("_AM_NEWS_PRUNENEWS","Artikel aufräumen");
+define("_AM_NEWS_EXPORT_NEWS","Artikel exportieren");
+define("_AM_NEWS_EXPORT_NOTHING","Es wurde kein Artikel zum exportieren gefunden. Bitte die Auswahl überprüfen.");
+
+define("_AM_NEWS_PRUNE_DELETED","%d Artikel wurde(n) gelöscht");
+define("_AM_NEWS_PERM_WARNING","<h2>Warnung, es gibt 3 Formulare mit jeweils eigenem 'abschicken' Knopf.</h2>");
+
+define("_AM_NEWS_EXPORT_BETWEEN","Artikel exportieren zwischen");
+define("_AM_NEWS_EXPORT_AND"," und ");
+define("_AM_NEWS_EXPORT_PRUNE_DSC","Hier den / die Themenbereiche(e) auswählen, auf die die Aktion angewendet wird.<br/>Wird kein Themengebiet gewählt, sind alle Themenbereiche automatisch gewählt.");
+
+define("_AM_NEWS_EXPORT_INCTOPICS","Inklusive der Themenbeschreibung?");
+define("_AM_NEWS_EXPORT_ERROR","Fehler beim erzeugen der Datei %s. Vorgang gestoppt.");
+
+define("_AM_NEWS_EXPORT_READY","Die xml Exportdatei kann runter geladen werden. <br />Zum Runterladen, <a target='_blank' href='%s'>diesen link klicken</a>.<br />Nach Fertigstellung, nicht vergessen <a href='%s'>mit diesem Link</a> zu löschen.");
+define("_AM_NEWS_RSS_URL","URL des RSS Feed");
+define("_AM_NEWS_NEWSLETTER","Newsletter");
+define("_AM_NEWS_NEWSLETTER_BETWEEN","Artikel auswählen die veröffentlicht wurden zwischen");
+define("_AM_NEWS_NEWSLETTER_READY","Die Newsletterdatei kann runter geladen werden. <br />Zum Runterladen, <a target='_blank' href='%s'>diesen link klicken</a>.<br />Nach Fertigstellung, nicht vergessen <a href='%s'>mit diesem Link</a> zu löschen.");
+define("_AM_NEWS_DELETED_OK","Datei erfolgreich gelöscht");
+define("_AM_NEWS_DELETED_PB","Fehler, die Datei konnte nicht gelöscht werden.");
+
+define("_AM_NEWS_STATS0","Themenstatistik");
+define("_AM_NEWS_STATS","Statistiken");
+define("_AM_NEWS_STATS1","Einzelne Autoren");
+define("_AM_NEWS_STATS2","Gesamt");
+define("_AM_NEWS_STATS3","Artikelstatistik");
+define("_AM_NEWS_STATS4","Am häufigsten gelesene Artikel");
+define("_AM_NEWS_STATS5","Am wenigsten gelesene Artikel");
+define("_AM_NEWS_STATS6","Am besten bewertete Artikel");
+define("_AM_NEWS_STATS7","Am häufigsten gelesene Autoren");
+define("_AM_NEWS_STATS8","Am besten bewertete Autoren");
+define("_AM_NEWS_STATS9","Haben am meisten geschrieben");
+define("_AM_NEWS_STATS10","Autorenstatistik");
+define("_AM_NEWS_STATS11","Anzahl der Artikel");
+define("_AM_NEWS_HELP","Hilfe");
+define("_AM_NEWS_MODULEADMIN","Moduladmin");
+define("_AM_NEWS_GENERALSET","Modulkonfiguration");
+define("_AM_NEWS_GOTOMOD","Zum Modul");
+define("_AM_NEWS_NOTHING","Es wurde keine Datei zum runterladen gefunden. Bitte die Auswahl überprüfen.");
+define("_AM_NEWS_NOTHING_PRUNE","Es wurde kein Artikel zum aufräumen gefunden. Bitte die Auswahl überprüfen.");
+
+
+define("_AM_NEWS_TOPIC_COLOR","Themenfarbe");
+define("_AM_NEWS_COLOR","Farbe");
+define("_AM_NEWS_REMOVE_BR","Den html tag <br> zu einer neuen Zeile konvertieren?");
+// Added in 1.3 RC2
+define("_AM_NEWS_PLEASE_UPGRADE","<a href='upgrade.php'><font color='#FF0000'>Bitte das Modul updaten!</font></a>");
+
+// Added in verisn 1.50
+define('_AM_NEWS_NEWSLETTER_HEADER', "Header");
+define('_AM_NEWS_NEWSLETTER_FOOTER', "Footer");
+define('_AM_NEWS_NEWSLETTER_HTML_TAGS', "Html Tags entfernen?");
+define('_AM_NEWS_VERIFY_TABLES','Tabellen pflegen');
+define('_AM_NEWS_METAGEN',"Metagen");
+define('_AM_NEWS_METAGEN_DESC',"Metagen ist ein System das Sie bei der Indexierung für Suchmaschinen unterstützt. <br />Bitte beachten Sie, wenn Sie selbst Keywords und Meta Daten eingeben, wird das System diese automatisch generieren.");
+
+define('_AM_NEWS_BLACKLIST',"Blacklist");
+define('_AM_NEWS_BLACKLIST_DESC',"Worte und Begriffe in dieser Liste werden nicht in Keywords und Mata Daten übernommen");
+define('_AM_NEWS_BLACKLIST_ADD',"Hinzufügen");
+define('_AM_NEWS_BLACKLIST_ADD_DSC',"Begriff eintragen um zur Liste hinzuzufügen<br />(Jeder begriff in eine neue Zeile)");
+define('_AM_NEWS_META_KEYWORDS_CNT',"Maximale Anzahl der Meta Keywords für das automatische genrieren ist erreicht.");
+define('_AM_NEWS_META_KEYWORDS_ORDER',"Keywords Reihenfolge");
+define('_AM_NEWS_META_KEYWORDS_INTEXT',"In der Reihenfolge erstellen, in der sie gelistet werden sollen.");
+define('_AM_NEWS_META_KEYWORDS_FREQ1',"Reihenfolge der Wiederholung");
+define('_AM_NEWS_META_KEYWORDS_FREQ2',"Zurücksetzen der Reihenfolge");
+?>
\ No newline at end of file
Added: XoopsModules/news/trunk/news/language/german/blocks.php
===================================================================
--- XoopsModules/news/trunk/news/language/german/blocks.php (rev 0)
+++ XoopsModules/news/trunk/news/language/german/blocks.php 2012-07-02 05:56:04 UTC (rev 9766)
@@ -0,0 +1,50 @@
+<?php
+// $Id: blocks.php,v 1.16 2004/09/01 17:48:07 hthouzard Exp $
+define("_MB_NEWS_NOTYET","Es gibt heute noch keinen Leitartikel.");
+define("_MB_NEWS_TMRSI","Der heute meist gelesene Artikel ist:");
+define("_MB_NEWS_ORDER","Sortiert nach");
+define("_MB_NEWS_DATE","Veröffentlichungsdatum");
+define("_MB_NEWS_HITS","Anzahl der Aufrufe");
+define("_MB_NEWS_DISP","Anzeigen");
+define("_MB_NEWS_ARTCLS","Artikel");
+define("_MB_NEWS_CHARS","Löschen des Titels: ");
+define("_MB_NEWS_LENGTH"," Zeichen");
+define("_MB_TITLE", "Titel");
+define("_MB_POSTED", "Geschrieben");
+define("_MB_POSTER", "Autor");
+define("_MB_ACTION", "Aktion");
+define("_MB_TOPIC", "Thema");
+define("_MB_DELETE", "Löschen");
+define("_MB_NEWS_RESTRICTTOPICS", "Eingeschränkte Themen für User sichtbar?");
+define("_MB_NEWS_TEASER", "Länge für Anreißer (0 für keinen)");
+define("_MB_NEWS_SPOTLIGHT", "Aktivieren der Spotlight Eigenschaft");
+define("_MB_NEWS_FIRST", "--Erster Eintrag--");
+define("_MB_NEWS_IMAGE", "Bild für Spotlight");
+define("_MB_SPOTLIGHT_TOPIC", "Themenauswahl die verwendet werden");
+define("_MB_SPOTLIGHT_ALL_TOPICS", "Alle Themen");
+define("_MB_NEWS_SPOTLIGHT_ARTICLE", "Artikel auswählen:");
+define("_MB_READMORE","mehr...");
+define("_MB_NEWS_RATE","Bewertung");
+define("_MB_NEWS_SHOW_NEWS_COUNT","Artikelzähler anzeigen ?");
+define("_MB_NEWS_SPOTLIGHT_TITLE", "Spotlight");
+define("_MB_NEWS_VIEW_TYPE1", "Klassisch");
+define("_MB_NEWS_VIEW_TYPE2", "In Tabs");
+define("_MB_NEWS_TAB_COLOR1", "Farbe der Linie die sich unter den Tabs befindet");
+define("_MB_NEWS_TAB_COLOR2", "Hintergrundfarbe des Tab Inhalts");
+define("_MB_NEWS_TAB_COLOR3", "Aktive Tabfarbe");
+define("_MB_NEWS_TAB_COLOR4", "Farbe der nicht aktiven Tabs");
+define("_MB_NEWS_TAB_COLOR5", "Kopfbereich hover Farbe");
+define("_MB_NEWS_WHAT_PUBLISH", "Was soll im Spotlight <br />angezeigt werde?");
+define("_MB_NEWS_RECENT_NEWS", "Aktuellste Artikel (Liste unten nicht benutzen)");
+define("_MB_NEWS_RECENT_SPECIFIC", "Artikel aus unten aufgeführter Liste");
+define("_MB_NEWS_DEFAULT_COLORS", "Nichts eintragen um die Standardfarben zu nutzen.");
+
+// Added in version 1.50
+define("_MB_NEWS_CAL_YEAR", "Jahr");
+define("_MB_NEWS_CAL_MONTH", "Monat");
+define("_MB_NEWS_STARTING_DATE", "Beginn");
+define("_MB_NEWS_ENDING_DATE", "Ende");
+define("_MB_NEWS_UNTIL_TODAY", "Bis heute");
+define("_MB_NEWS_RECENT_FIRST", "Neueste zuerst");
+define("_MB_NEWS_OLDER_FIRST", "Älteste zuerst");
+?>
\ No newline at end of file
Added: XoopsModules/news/trunk/news/language/german/index.html
===================================================================
--- XoopsModules/news/trunk/news/language/german/index.html (rev 0)
+++ XoopsModules/news/trunk/news/language/german/index.html 2012-07-02 05:56:04 UTC (rev 9766)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/news/trunk/news/language/german/mail_template/category_newstory_notify.tpl
===================================================================
--- XoopsModules/news/trunk/news/language/german/mail_template/category_newstory_notify.tpl (rev 0)
+++ XoopsModules/news/trunk/news/language/german/mail_template/category_newstory_notify.tpl 2012-07-02 05:56:04 UTC (rev 9766)
@@ -0,0 +1,19 @@
+Hallo {X_UNAME},
+
+Ein neuer Artikel "{STORY_NAME}" wurde
+bei {X_SITENAME} hinzugefügt.
+
+Der neue Artikel kann hier gelesen werden:
+{STORY_URL}
+
+-------------------------------------------------
+Diese Email wurde gesendet, weil die Benachrichtigungsmethoe so eingestellt wurde.
+Wenn es sich hierbei um eine Störung handeln sollte, oder in Zukunft keine Benachrichtigungen
+mehr versendet werden sollen, dann kann diese hier in den Benachrichtigungsoptionen eingestellt
+werden:
+{X_UNSUBSCRIBE_URL}
+Bitte nicht auf diese Email antworten.
+-------------------------------------------------
+
+{X_SITENAME} ({X_SITEURL})
+{X_ADMINMAIL}
\ No newline at end of file
Added: XoopsModules/news/trunk/news/language/german/mail_template/global_newcategory_notify.tpl
===================================================================
--- XoopsModules/news/trunk/news/language/german/mail_template/global_newcategory_notify.tpl (rev 0)
+++ XoopsModules/news/trunk/news/language/german/mail_template/global_newcategory_notify.tpl 2012-07-02 05:56:04 UTC (rev 9766)
@@ -0,0 +1,18 @@
+Hallo {X_UNAME},
+
+Das neue Thema "{TOPIC_NAME}" wurde auf
+{X_SITENAME} angelegt.
+
+Sie finden die Artikel-Indexseite unter folgender URL:
+{X_MODULE_URL}
+
+---------------------------------------------------
+Sie erhalten diese E-Mail weil Sie benachrichtigt werden wollten wenn dieser Artikel
+freigegeben wird. Wenn dies ein Fehler ist und Sie keine weiteren Nachrichten dieser Art
+mehr empfangen wollen, folgen Sie diesem Link:
+{X_UNSUBSCRIBE_URL}
+Bitte nicht auf diese E-Mail antworten.
+--------------------------------------------------
+
+{X_SITENAME} ({X_SITEURL})
+{X_ADMINMAIL}
\ No newline at end of file
Added: XoopsModules/news/trunk/news/language/german/mail_template/global_newstory_notify.tpl
===================================================================
--- XoopsModules/news/trunk/news/language/german/mail_template/global_newstory_notify.tpl (rev 0)
+++ XoopsModules/news/trunk/news/language/german/mail_template/global_newstory_notify.tpl 2012-07-02 05:56:04 UTC (rev 9766)
@@ -0,0 +1,18 @@
+Hallo {X_UNAME},
+
+Der neue Artikel "{STORY_NAME}" wurde
+auf {X_SITENAME} hinzugefügt.
+
+Sie finden diesen Artikel unter folgender URL:
+{STORY_URL}
+
+----------------------------------------------
+Sie erhalten diese E-Mail weil Sie benachrichtigt werden wollten wenn dieser Artikel
+freigegeben wird. Wenn dies ein Fehler ist und Sie keine weiteren Nachrichten dieser Art
+mehr empfangen wollen, folgen Sie diesem Link:
+{X_UNSUBSCRIBE_URL}
+Bitte nicht auf diese E-Mail antworten.
+---------------------------------------------
+
+{X_SITENAME} ({X_SITEURL})
+{X_ADMINMAIL}
\ No newline at end of file
Added: XoopsModules/news/trunk/news/language/german/mail_template/global_storysubmit_notify.tpl
===================================================================
--- XoopsModules/news/trunk/news/language/german/mail_template/global_storysubmit_notify.tpl (rev 0)
+++ XoopsModules/news/trunk/news/language/german/mail_template/global_storysubmit_notify.tpl 2012-07-02 05:56:04 UTC (rev 9766)
@@ -0,0 +1,18 @@
+Hallo {X_UNAME},
+
+Der neue Artikel "{STORY_NAME}" wurde auf
+{X_SITENAME} eingeschickt und wartet auf Freigabe.
+
+Sie finden die Einsendung unter folgender URL:
+{WAITINGSTORIES_URL}
+
+-----------------------------------------------
+Sie erhalten diese E-Mail weil Sie benachrichtigt werden wollten wenn dieser Artikel
+freigegeben wird. Wenn dies ein Fehler ist und Sie keine weiteren Nachrichten dieser Art
+mehr empfangen wollen, folgen Sie diesem Link:
+{X_UNSUBSCRIBE_URL}
+Bitte nicht auf diese E-Mail antworten.
+----------------------------------------------
+
+{X_SITENAME} ({X_SITEURL})
+{X_ADMINMAIL}
\ No newline at end of file
Added: XoopsModules/news/trunk/news/language/german/mail_template/index.html
===================================================================
--- XoopsModules/news/trunk/news/language/german/mail_template/index.html (rev 0)
+++ XoopsModules/news/trunk/news/language/german/mail_template/index.html 2012-07-02 05:56:04 UTC (rev 9766)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/news/trunk/news/language/german/mail_template/story_approve_notify.tpl
===================================================================
--- XoopsModules/news/trunk/news/language/german/mail_template/story_approve_notify.tpl (rev 0)
+++ XoopsModules/news/trunk/news/language/german/mail_template/story_approve_notify.tpl 2012-07-02 05:56:04 UTC (rev 9766)
@@ -0,0 +1,18 @@
+Hallo {X_UNAME},
+
+Der von Ihnen eingeschickte Artikel "{STORY_NAME}"
+wurde auf {X_SITENAME} freigegeben.
+
+Sie finden diesen Artikel unter folgender URL:
+{STORY_URL}
+
+---------------------------------------------
+Sie erhalten diese E-Mail weil Sie benachrichtigt werden wollten wenn dieser Artikel
+freigegeben wird. Wenn dies ein Fehler ist und Sie keine weiteren Nachrichten dieser Art
+mehr empfangen wollen, folgen Sie diesem Link:
+{X_UNSUBSCRIBE_URL}
+Bitte nicht auf diese E-Mail antworten.
+--------------------------------------------
+
+{X_SITENAME} ({X_SITEURL})
+{X_ADMINMAIL}
\ No newline at end of file
Added: XoopsModules/news/trunk/news/language/german/mail_template/topic_newstory_notify.tpl
===================================================================
--- XoopsModules/news/trunk/news/language/german/mail_template/topic_newstory_notify.tpl (rev 0)
+++ XoopsModules/news/trunk/news/language/german/mail_template/topic_newstory_notify.tpl 2012-07-02 05:56:04 UTC (rev 9766)
@@ -0,0 +1,18 @@
+Hallo {X_UNAME},
+
+Ein neuer Artikel "{STORY_NAME}" wurde
+auf {X_SITENAME} zu {TOPIC_NAME} hinzugefügt.
+
+Sie finden diesen Artikel unter folgender URL:
+{STORY_URL}
+
+-----------------------------------------------
+Sie erhalten diese E-Mail weil Sie benachrichtigt werden wollten wenn dieser Artikel
+freigegeben wird. Wenn dies ein Fehler ist und Sie keine weiteren Nachrichten dieser Art
+mehr empfangen wollen, folgen Sie diesem Link:
+{X_UNSUBSCRIBE_URL}
+Bitte nicht auf diese E-Mail antworten.
+----------------------------------------------
+
+{X_SITENAME} ({X_SITEURL})
+{X_ADMINMAIL}
\ No newline at end of file
Added: XoopsModules/news/trunk/news/language/german/main.php
===================================================================
--- XoopsModules/news/trunk/news/language/german/main.php (rev 0)
+++ XoopsModules/news/trunk/news/language/german/main.php 2012-07-02 05:56:04 UTC (rev 9766)
@@ -0,0 +1,118 @@
+<?php
+// $Id: main.php,v 1.9 2004/07/26 17:51:25 hthouzard Exp $
+//%%%%%% File Name index.php %%%%%
+define("_NW_PRINTER","Druckoptimierte Version");
+define("_NW_SENDSTORY","Schicke den Artikel an einen Freund");
+define("_NW_READMORE","mehr...");
+define("_NW_COMMENTS","Kommentar?");
+define("_NW_ONECOMMENT","1 Kommentar");
+define("_NW_BYTESMORE","%s Bytes mehr");
+define("_NW_NUMCOMMENTS","%s Kommentare");
+define("_NW_MORERELEASES", "Weitere Artikel in: ");
+
+
+//%%%%%% File Name submit.php %%%%%
+define("_NW_SUBMITNEWS","Artikel schreiben");
+define("_NW_TITLE","Titel");
+define("_NW_TOPIC","Thema");
+define("_NW_THESCOOP","Einleitung");
+define("_NW_NOTIFYPUBLISH","Per E-Mail benachrichtigen, wenn der Artikel veröffentlicht wird");
+define("_NW_POST","Veröffentlichen");
+define("_NW_GO","Los!");
+define("_NW_THANKS","Danke für die Übermittlung."); //submission of news article
+
+define("_NW_NOTIFYSBJCT","Artikel für deine Seite"); // Notification mail subject
+define("_NW_NOTIFYMSG","Hallo! Es gibt neue Artikel für deine Website."); // Notification mail message
+
+//%%%%%% File Name archive.php %%%%%
+define("_NW_NEWSARCHIVES","Archiv");
+define("_NW_ARTICLES","Artikel");
+define("_NW_VIEWS","Gelesen");
+define("_NW_DATE","Datum");
+define("_NW_ACTIONS","Aktionen");
+define("_NW_PRINTERFRIENDLY","Druckoptimierte Version");
+
+define("_NW_THEREAREINTOTAL","Es gibt insgesamt %s Artikel");
+
+// %s is your site name
+define("_NW_INTARTICLE","Interessanter Artikel auf %s");
+define("_NW_INTARTFOUND","Hier ist ein interessanter Artikel den ich auf %s gefunden habe");
+
+define("_NW_TOPICC","Thema:");
+define("_NW_URL","URL:");
+define("_NW_NOSTORY","Der gewählte Artikel existiert nicht mehr.");
+
+//%%%%%% File Name print.php %%%%%
+
+define("_NW_URLFORSTORY","Die URL für diesen Artikel lautet:");
+
+// %s represents your site name
+define("_NW_THISCOMESFROM","Dieser Artikel stammt von %s");
+
+// Added by Herve
+define("_NW_ATTACHEDFILES","Angehängte Dateien:");
+define("_NW_ATTACHEDLIB","Dieser Artikel hat angehängte Dateien");
+define("_NW_NEWSSAMEAUTHORLINK","Artikel vom Autor");
+define("_NW_NEWS_NO_TOPICS","Kein Themenbereich angelegt, bitte einen anlegen bevor Artikel geschrieben werden.");
+define("_NW_PREVIOUS_ARTICLE","Voriger Artikel");
+define("_NW_NEXT_ARTICLE","Nächster Artikel");
+define("_NW_OTHER_ARTICLES","Weitere Artikel");
+
+// Added by Herve in version 1.3 for rating
+define("_NW_RATETHISNEWS","Diesen Artikel bewerten");
+define("_NW_RATEIT","Bewerten");
+define("_NW_TOTALRATE","Gesamtbewertungen");
+define("_NW_RATINGLTOH","Bewertung (niedrigste zu höchster)");
+define("_NW_RATINGHTOL","Bewertung (höchste zu niedrigste)");
+define("_NW_RATINGC","Bewertung: ");
+define("_NW_RATINGSCALE","Die Skala reicht von 1 - 10, wobei 1 die schlechteste und 10 die beste ist.");
+define("_NW_BEOBJECTIVE","Bitte objektiv sein. Wenn alle eine 1 oder 10 erhalten, ist das wenig aussagekräftig.");
+define("_NW_DONOTVOTE","Bitte nicht für eigene Artikel abstimmen.");
+define("_NW_RATING","Bewertung");
+define("_NW_VOTE","Stimme");
+define("_NW_NORATING","Keine Bewertung ausgewählt.");
+define("_NW_USERAVG","Durchschnittliche Bewertung");
+define("_NW_DLRATINGS","Neue Bewertungen (Gesamtstimmen: %s)");
+define("_NW_ONEVOTE","1 Stimme");
+define("_NW_NUMVOTES","%u Stimmen"); // Warning
+define("_NW_CANTVOTEOWN","Es ist nicht mehr möglich hierfür abzustimmen.<br />Alle Stimmen wurden registriert und ausgewertet.");
+define("_NW_VOTEDELETED","Abstimmungsdaten gelöscht.");
+define("_NW_VOTEONCE","Bitte nicht mehrmals für den gleichen Artikel stimmen.");
+define("_NW_VOTEAPPRE","Die Stimme wurde gezählt.");
+define("_NW_THANKYOU","Danke für die Teilnahme an der Abstimmung hier bei %s"); // %s is your site name
+define("_NW_RSSFEED","RSS Feed"); // Warning, this text is included insided an Alt attribut (for a picture), so take care to the quotes
+define("_NW_AUTHOR","Autor");
+define("_NW_META_DESCRIPTION","Meta Beschreibung");
+define("_NW_META_KEYWORDS","Meta Schlüsselworte");
+define("_NW_MAKEPDF","PDF Dokument vom Artikel anfertigen");
+define('_MD_POSTEDON',"Geschrieben am: ");
+define("_NW_AUTHOR_ID","Autor ID");
+define("_NW_POST_SORRY","Entweder sind keine Themen definiert, oder es sind nicht die erforderlichen Rechte zum Schreiben vorhanden.");
+
+// Added in v 1.50
+define("_NW_LINKS","Links");
+define("_NW_PAGE","Seite");
+define("_NW_BOOKMARK_ME","Bookmark Artikel auf eine der nachstehenden Seiten");
+define('_AM_NEWS_TOTAL',"Maximal %u Artikel");
+define('_AM_NEWS_WHOS_WHO',"Who's Who");
+define('_NW_NEWS_LIST_OF_AUTHORS',"Liste der Autoren auf dieser Website");
+define('_AM_NEWS_TOPICS_DIRECTORY',"Themenverzeichnis");
+define("_NW_PAGE_AUTO_SUMMARY","Seite %d : %n");
+
+// Added in version 1.51
+define("_NW_BOOKMARK_TO_BLINKLIST","Bookmark bei Blinklist");
+define("_NW_BOOKMARK_TO_DELICIOUS","Bookmark bei del.icio.us");
+define("_NW_BOOKMARK_TO_DIGG","Bookmark bei Digg");
+define("_NW_BOOKMARK_TO_FARK","Bookmark bei Fark");
+define("_NW_BOOKMARK_TO_FURL","Bookmark bei Furl");
+define("_NW_BOOKMARK_TO_NEWSVINE","Bookmark bei Newsvine");
+define("_NW_BOOKMARK_TO_REDDIT","Bookmark bei Reddit");
+define("_NW_BOOKMARK_TO_SIMPY","Bookmark bei Simpy");
+define("_NW_BOOKMARK_TO_SPURL","Bookmark bei Spurl");
+define("_NW_BOOKMARK_TO_YAHOO","Bookmark bei Yahoo");
+
+// Added in version 1.56
+define('_NW_NOTYETSTORY',"Entschuldigung, der gewählte Artikel wurde noch nicht veröffentlicht. Bitte kommen Sie später wieder und versuche es erneut.");
+define('_NW_SELECT_IMAGE', "Wählen Sie ein Bild aus um dies an die Nachricht anzuhängen");
+define('_NW_CURENT_PICTURE', "Aktuelles Bild");
+?>
\ No newline at end of file
Added: XoopsModules/news/trunk/news/language/german/modinfo.php
===================================================================
--- XoopsModules/news/trunk/news/language/german/modinfo.php (rev 0)
+++ XoopsModules/news/trunk/news/language/german/modinfo.php 2012-07-02 05:56:04 UTC (rev 9766)
@@ -0,0 +1,185 @@
+<?php
+// $Id: modinfo.php,v 1.21 2004/09/01 17:48:07 hthouzard Exp $
+// Module Info
+
+// The name of this module
+define('_MI_NEWS_NAME','Artikel');
+
+// A brief description of this module
+define('_MI_NEWS_DESC','Erzeugt einen Artikelbereich in dem Mitglieder Artikel und Kommentare schreiben können.');
+
+// Names of blocks for this module (Not all module has blocks)
+define('_MI_NEWS_BNAME1','Artikelthemen-Block');
+define('_MI_NEWS_BNAME3','Leitartikel-Block');
+define('_MI_NEWS_BNAME4','Top Artikel-Block');
+define('_MI_NEWS_BNAME5','Aktuellste Artikel');
+define('_MI_NEWS_BNAME6','Artikel moderieren');
+define('_MI_NEWS_BNAME7','In Themenbereichen navigieren');
+define('_MI_NEWS_BNAME9','Schlagzeilen');
+
+// Sub menus in main menu block
+define('_MI_NEWS_SMNAME1','Artikel schreiben');
+define('_MI_NEWS_SMNAME2','Archiv');
+
+// Names of admin menu items
+define('_MI_NEWS_ADMENU1', 'Index');
+define('_MI_NEWS_ADMENU2', 'Themenmanager');
+define('_MI_NEWS_ADMENU3', 'Artikel veröffentlichen / bearbeiten');
+define('_MI_NEWS_GROUPPERMS', 'Berechtigungen');
+// Added by Herve or prune option
+define('_MI_NEWS_PRUNENEWS', 'Artikel aufräumen');
+// Added by Herve
+define('_MI_NEWS_EXPORT', 'Artikel exportieren');
+
+// Title of config items
+define('_MI_STORYHOME', 'Wieviel Artikel auf der Indexseite?');
+define('_MI_NOTIFYSUBMIT', 'Bei Artikeleingang den Webmaster benachrichtigen?');
+define('_MI_DISPLAYNAV', 'Navigations-Box anzeigen?');
+define('_MI_AUTOAPPROVE','Artikel automatisch veröffentlichen?');
+define("_MI_ALLOWEDSUBMITGROUPS", "Gruppen, die Artikel schreiben dürfen");
+define("_MI_ALLOWEDAPPROVEGROUPS", "Gruppen, die Artikel genehmigen dürfen");
+define("_MI_NEWSDISPLAY", "Layout der Artikelansicht");
+define("_MI_NAMEDISPLAY","Name des Autors");
+define("_MI_COLUMNMODE","Spalten");
+define("_MI_STORYCOUNTADMIN","Anzahl der neuen Artikel in der Admin-Ansicht. (Diese Option limitiert die Anzahl der Themen im Adminbereich und der Statistikanzeige): ");
+define('_MI_UPLOADFILESIZE', 'MAX Upload-Dateigröße (KB) 1048576 = 1 MB');
+define("_MI_UPLOADGROUPS","Für Upload berechtigte Gruppen");
+
+
+// Description of each config items
+define('_MI_STORYHOMEDSC', 'Artikelanzahl auf der Startseite');
+define('_MI_NOTIFYSUBMITDSC', 'Bei Artikeleingang eine Nachricht an den Webmaster schicken');
+define('_MI_DISPLAYNAVDSC', 'Wird diese Option gewählt, wird eine Navigations-Box (pull down) angezeigt mit der man durch die Themenbereiche navigieren kann.');
+define('_MI_AUTOAPPROVEDSC', 'Artikel automatisch, ohne Genehmigungsprozedur veröffentlicht');
+define("_MI_ALLOWEDSUBMITGROUPSDESC", "Die selektierten Gruppen sind berechtigt neue Artikel zu schreiben");
+define("_MI_ALLOWEDAPPROVEGROUPSDESC", "Die selektierten Gruppen sind berechtigt neue Artikel zu genehmigen");
+define("_MI_NEWSDISPLAYDESC", "Klassisch, zeigt alle Artikel sortiert nach Datum der Veröffentlichung. Artikel nach Themen, gruppiert die Artikel nach Themen mit dem letzten Artikel im Ganzen und die anderen nur mit der Überschrift");
+define('_MI_ADISPLAYNAMEDSC', 'Wählen Sie, wie der Name des Autors angezeigt wird');
+define("_MI_COLUMNMODE_DESC","Sie können die Anzahl der Spalten für die Artikelliste wählen");
+define("_MI_STORYCOUNTADMIN_DESC","");
+define("_MI_UPLOADFILESIZE_DESC","");
+define("_MI_UPLOADGROUPS_DESC","Wählen Sie die Gruppen die auf den Server hochladen dürfen");
+
+// Name of config item values
+define("_MI_NEWSCLASSIC", "Klassisch");
+define("_MI_NEWSBYTOPIC", "Nach Themen");
+define("_MI_DISPLAYNAME1", "Username");
+define("_MI_DISPLAYNAME2", "Realer Name");
+define("_MI_DISPLAYNAME3", "Autor nicht anzeigen");
+define("_MI_UPLOAD_GROUP1","Absender und Genehmiger");
+define("_MI_UPLOAD_GROUP2","Nur Genehmiger");
+define("_MI_UPLOAD_GROUP3","Upload nicht erlaubt");
+
+// Text for notifications
+
+define('_MI_NEWS_GLOBAL_NOTIFY', 'Allgemein');
+define('_MI_NEWS_GLOBAL_NOTIFYDSC', 'Allgemeine News-Benachrichtigungsoptionen.');
+
+define('_MI_NEWS_STORY_NOTIFY', 'Story');
+define('_MI_NEWS_STORY_NOTIFYDSC', 'Benachrichtigungsoptionen die den aktuellen Artikel betreffen.');
+
+define('_MI_NEWS_GLOBAL_NEWCATEGORY_NOTIFY', 'Neues Thema');
+define('_MI_NEWS_GLOBAL_NEWCATEGORY_NOTIFYCAP', 'Benachrichtigen wenn ein neues Thema angelegt worden ist.');
+define('_MI_NEWS_GLOBAL_NEWCATEGORY_NOTIFYDSC', 'Benachrichtigung wenn ein neues Thema angelegt worden ist.');
+define('_MI_NEWS_GLOBAL_NEWCATEGORY_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} Automatische Benachrichtigung: Neues Thema');
+
+define('_MI_NEWS_GLOBAL_STORYSUBMIT_NOTIFY', 'Neuer Artikel eingeschickt');
+define('_MI_NEWS_GLOBAL_STORYSUBMIT_NOTIFYCAP', 'Benachrichtigen wenn ein neuer Artikel eingeschickt worden ist (noch freizugeben).');
+define('_MI_NEWS_GLOBAL_STORYSUBMIT_NOTIFYDSC', 'Eine Benachrichtigung erhalten wenn ein neuer Artikel eingeschickt worden ist, der noch freizugeben ist.');
+define('_MI_NEWS_GLOBAL_STORYSUBMIT_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} Automatische Benachrichtigung: Neuer Artikel eingeschickt');
+
+define('_MI_NEWS_GLOBAL_NEWSTORY_NOTIFY', 'Neuer Artikel');
+define('_MI_NEWS_GLOBAL_NEWSTORY_NOTIFYCAP', 'Benachrichtigen wenn ein neuer Artikel veröffentlicht worden ist.');
+define('_MI_NEWS_GLOBAL_NEWSTORY_NOTIFYDSC', 'Eine Benachrichtigung erhalten wenn ein neuer Artikel veröffentlicht worden ist.');
+define('_MI_NEWS_GLOBAL_NEWSTORY_NOTIFYSBJ', '[{X...
[truncated message content] |
|
From: <be...@us...> - 2012-07-02 06:03:04
|
Revision: 9767
http://xoops.svn.sourceforge.net/xoops/?rev=9767&view=rev
Author: beckmi
Date: 2012-07-02 06:02:52 +0000 (Mon, 02 Jul 2012)
Log Message:
-----------
Updating Trunk to 1.67
Modified Paths:
--------------
XoopsModules/news/trunk/news/admin/amsimport.php
XoopsModules/news/trunk/news/admin/functions.php
XoopsModules/news/trunk/news/admin/groupperms.php
XoopsModules/news/trunk/news/admin/index.php
XoopsModules/news/trunk/news/admin/menu.php
XoopsModules/news/trunk/news/admin/upgrade.php
XoopsModules/news/trunk/news/article.php
XoopsModules/news/trunk/news/backendt.php
XoopsModules/news/trunk/news/blocks/news_bigstory.php
XoopsModules/news/trunk/news/blocks/news_block_tag.php
XoopsModules/news/trunk/news/blocks/news_moderate.php
XoopsModules/news/trunk/news/blocks/news_randomnews.php
XoopsModules/news/trunk/news/blocks/news_top.php
XoopsModules/news/trunk/news/class/blacklist.php
XoopsModules/news/trunk/news/class/class.newsstory.php
XoopsModules/news/trunk/news/class/class.newstopic.php
XoopsModules/news/trunk/news/class/class.sfiles.php
XoopsModules/news/trunk/news/class/index.html
XoopsModules/news/trunk/news/class/registryfile.php
XoopsModules/news/trunk/news/class/wideimage/Canvas.class.php
XoopsModules/news/trunk/news/class/wideimage/Dimension.class.php
XoopsModules/news/trunk/news/class/wideimage/Exception.class.php
XoopsModules/news/trunk/news/class/wideimage/FileMapperFactory.class.php
XoopsModules/news/trunk/news/class/wideimage/Image.class.php
XoopsModules/news/trunk/news/class/wideimage/OpFactory.class.php
XoopsModules/news/trunk/news/class/wideimage/PaletteImage.class.php
XoopsModules/news/trunk/news/class/wideimage/TrueColorImage.class.php
XoopsModules/news/trunk/news/class/wideimage/WideImage.inc.php
XoopsModules/news/trunk/news/class/wideimage/mappers/ImageFileMapper_GD.class.php
XoopsModules/news/trunk/news/class/wideimage/mappers/ImageFileMapper_GD2.class.php
XoopsModules/news/trunk/news/class/wideimage/mappers/ImageFileMapper_GIF.class.php
XoopsModules/news/trunk/news/class/wideimage/mappers/ImageFileMapper_JPEG.class.php
XoopsModules/news/trunk/news/class/wideimage/mappers/ImageFileMapper_PNG.class.php
XoopsModules/news/trunk/news/class/wideimage/operations/ApplyConvolution.class.php
XoopsModules/news/trunk/news/class/wideimage/operations/ApplyFilter.class.php
XoopsModules/news/trunk/news/class/wideimage/operations/ApplyMask.class.php
XoopsModules/news/trunk/news/class/wideimage/operations/AsGrayscale.class.php
XoopsModules/news/trunk/news/class/wideimage/operations/CopyChannelsPalette.class.php
XoopsModules/news/trunk/news/class/wideimage/operations/CopyChannelsTrueColor.class.php
XoopsModules/news/trunk/news/class/wideimage/operations/CorrectGamma.class.php
XoopsModules/news/trunk/news/class/wideimage/operations/Crop.class.php
XoopsModules/news/trunk/news/class/wideimage/operations/Flip.class.php
XoopsModules/news/trunk/news/class/wideimage/operations/GetMask.class.php
XoopsModules/news/trunk/news/class/wideimage/operations/Merge.class.php
XoopsModules/news/trunk/news/class/wideimage/operations/Mirror.class.php
XoopsModules/news/trunk/news/class/wideimage/operations/Resize.class.php
XoopsModules/news/trunk/news/class/wideimage/operations/Rotate.class.php
XoopsModules/news/trunk/news/class/wideimage/operations/Unsharp.class.php
XoopsModules/news/trunk/news/config.php
XoopsModules/news/trunk/news/extra/modules/tag/plugin/news.php
XoopsModules/news/trunk/news/include/functions.php
XoopsModules/news/trunk/news/include/search.inc.php
XoopsModules/news/trunk/news/include/storyform.inc.php
XoopsModules/news/trunk/news/include/storyform.original.php
XoopsModules/news/trunk/news/index.php
XoopsModules/news/trunk/news/language/english/admin.php
XoopsModules/news/trunk/news/language/english/main.php
XoopsModules/news/trunk/news/language/english/modinfo.php
XoopsModules/news/trunk/news/language/english/newsletter.php
XoopsModules/news/trunk/news/language/englishUTF8/admin.php
XoopsModules/news/trunk/news/language/englishUTF8/modinfo.php
XoopsModules/news/trunk/news/language/french/modinfo.php
XoopsModules/news/trunk/news/language/frenchUTF8/modinfo.php
XoopsModules/news/trunk/news/language/german/admin.php
XoopsModules/news/trunk/news/language/german/blocks.php
XoopsModules/news/trunk/news/language/german/main.php
XoopsModules/news/trunk/news/language/german/modinfo.php
XoopsModules/news/trunk/news/language/german/newsletter.php
XoopsModules/news/trunk/news/list.tag.php
XoopsModules/news/trunk/news/micro_summary.php
XoopsModules/news/trunk/news/newsbythisauthor.php
XoopsModules/news/trunk/news/print.php
XoopsModules/news/trunk/news/sql/mysql.sql
XoopsModules/news/trunk/news/submit.php
XoopsModules/news/trunk/news/templates/blocks/news_block_archives.html
XoopsModules/news/trunk/news/templates/blocks/news_block_bigstory.html
XoopsModules/news/trunk/news/templates/blocks/news_block_randomnews.html
XoopsModules/news/trunk/news/templates/blocks/news_block_top.html
XoopsModules/news/trunk/news/templates/blocks/news_block_topicnav.html
XoopsModules/news/trunk/news/templates/blocks/news_block_topics.html
XoopsModules/news/trunk/news/templates/news_archive.html
XoopsModules/news/trunk/news/templates/news_article.html
XoopsModules/news/trunk/news/templates/news_by_this_author.html
XoopsModules/news/trunk/news/templates/news_by_topic.html
XoopsModules/news/trunk/news/templates/news_index.html
XoopsModules/news/trunk/news/templates/news_item.html
XoopsModules/news/trunk/news/templates/news_ratenews.html
XoopsModules/news/trunk/news/templates/news_topics_directory.html
XoopsModules/news/trunk/news/templates/news_whos_who.html
XoopsModules/news/trunk/news/topics_directory.php
XoopsModules/news/trunk/news/view.tag.php
XoopsModules/news/trunk/news/whoswho.php
XoopsModules/news/trunk/news/xoops_version.php
Added Paths:
-----------
XoopsModules/news/trunk/news/admin/about.php
XoopsModules/news/trunk/news/admin/admin_footer.php
XoopsModules/news/trunk/news/admin/admin_header.php
XoopsModules/news/trunk/news/admin/index.html
XoopsModules/news/trunk/news/class/news_stories.php
XoopsModules/news/trunk/news/class/news_topics.php
XoopsModules/news/trunk/news/css/
XoopsModules/news/trunk/news/css/index.html
XoopsModules/news/trunk/news/css/print.css
XoopsModules/news/trunk/news/css/style.css
XoopsModules/news/trunk/news/docs/
XoopsModules/news/trunk/news/docs/changelog.txt
XoopsModules/news/trunk/news/docs/credits.txt
XoopsModules/news/trunk/news/docs/index.html
XoopsModules/news/trunk/news/docs/install.txt
XoopsModules/news/trunk/news/docs/lang.diff
XoopsModules/news/trunk/news/docs/licence.txt
XoopsModules/news/trunk/news/docs/readme.txt
XoopsModules/news/trunk/news/docs/upgrade.txt
XoopsModules/news/trunk/news/images/dojo/
XoopsModules/news/trunk/news/images/dojo/articles.png
XoopsModules/news/trunk/news/images/dojo/export.png
XoopsModules/news/trunk/news/images/dojo/help.png
XoopsModules/news/trunk/news/images/dojo/home.png
XoopsModules/news/trunk/news/images/dojo/index.html
XoopsModules/news/trunk/news/images/dojo/maintain.png
XoopsModules/news/trunk/news/images/dojo/metagen.png
XoopsModules/news/trunk/news/images/dojo/newsletter.png
XoopsModules/news/trunk/news/images/dojo/options.png
XoopsModules/news/trunk/news/images/dojo/permissions.png
XoopsModules/news/trunk/news/images/dojo/purge.png
XoopsModules/news/trunk/news/images/dojo/statistics.png
XoopsModules/news/trunk/news/images/dojo/topics.png
XoopsModules/news/trunk/news/images/dojo/update.png
XoopsModules/news/trunk/news/images/news.png
XoopsModules/news/trunk/news/include/install_function.php
XoopsModules/news/trunk/news/include/update_function.php
XoopsModules/news/trunk/news/language/english/help/
XoopsModules/news/trunk/news/language/english/help/help.html
XoopsModules/news/trunk/news/language/english/help/index.html
XoopsModules/news/trunk/news/language/englishUTF8/help/
XoopsModules/news/trunk/news/language/englishUTF8/help/help.html
XoopsModules/news/trunk/news/language/englishUTF8/help/index.html
XoopsModules/news/trunk/news/language/french/help/
XoopsModules/news/trunk/news/language/french/help/help.html
XoopsModules/news/trunk/news/language/french/help/index.html
XoopsModules/news/trunk/news/language/frenchUTF8/help/
XoopsModules/news/trunk/news/language/frenchUTF8/help/help.html
XoopsModules/news/trunk/news/language/frenchUTF8/help/index.html
XoopsModules/news/trunk/news/language/german/help/
XoopsModules/news/trunk/news/language/german/help/help.html
XoopsModules/news/trunk/news/language/german/help/index.html
XoopsModules/news/trunk/news/language/italian/
XoopsModules/news/trunk/news/language/italian/admin.php
XoopsModules/news/trunk/news/language/italian/aggiornamento.txt
XoopsModules/news/trunk/news/language/italian/blocks.php
XoopsModules/news/trunk/news/language/italian/help/
XoopsModules/news/trunk/news/language/italian/help/help.html
XoopsModules/news/trunk/news/language/italian/help/index.html
XoopsModules/news/trunk/news/language/italian/index.html
XoopsModules/news/trunk/news/language/italian/mail_template/
XoopsModules/news/trunk/news/language/italian/mail_template/global_newcategory_notify.tpl
XoopsModules/news/trunk/news/language/italian/mail_template/global_newstory_notify.tpl
XoopsModules/news/trunk/news/language/italian/mail_template/global_storysubmit_notify.tpl
XoopsModules/news/trunk/news/language/italian/mail_template/index.html
XoopsModules/news/trunk/news/language/italian/mail_template/story_approve_notify.tpl
XoopsModules/news/trunk/news/language/italian/mail_template/topic_newstory_notify.tpl
XoopsModules/news/trunk/news/language/italian/main.php
XoopsModules/news/trunk/news/language/italian/modinfo.php
XoopsModules/news/trunk/news/language/italian/newsletter.php
Removed Paths:
-------------
XoopsModules/news/trunk/news/changelog.txt
XoopsModules/news/trunk/news/images/acrobat.gif
XoopsModules/news/trunk/news/images/articles.png
XoopsModules/news/trunk/news/images/attach.gif
XoopsModules/news/trunk/news/images/blinklist.gif
XoopsModules/news/trunk/news/images/close12.gif
XoopsModules/news/trunk/news/images/delicious.gif
XoopsModules/news/trunk/news/images/diggman.gif
XoopsModules/news/trunk/news/images/export.png
XoopsModules/news/trunk/news/images/fark.gif
XoopsModules/news/trunk/news/images/forum.gif
XoopsModules/news/trunk/news/images/friend.gif
XoopsModules/news/trunk/news/images/furl.gif
XoopsModules/news/trunk/news/images/help.png
XoopsModules/news/trunk/news/images/home.png
XoopsModules/news/trunk/news/images/maintain.png
XoopsModules/news/trunk/news/images/metagen.png
XoopsModules/news/trunk/news/images/newsletter.png
XoopsModules/news/trunk/news/images/newsvine.gif
XoopsModules/news/trunk/news/images/open12.gif
XoopsModules/news/trunk/news/images/options.png
XoopsModules/news/trunk/news/images/permissions.png
XoopsModules/news/trunk/news/images/pixel.gif
XoopsModules/news/trunk/news/images/print.gif
XoopsModules/news/trunk/news/images/purge.png
XoopsModules/news/trunk/news/images/reddit.gif
XoopsModules/news/trunk/news/images/rss.gif
XoopsModules/news/trunk/news/images/sel.gif
XoopsModules/news/trunk/news/images/simpy.png
XoopsModules/news/trunk/news/images/size.gif
XoopsModules/news/trunk/news/images/spurl.gif
XoopsModules/news/trunk/news/images/statistics.png
XoopsModules/news/trunk/news/images/topics.png
XoopsModules/news/trunk/news/images/update.png
XoopsModules/news/trunk/news/images/yahoomyweb.gif
XoopsModules/news/trunk/news/lang.diff
XoopsModules/news/trunk/news/licence.txt
XoopsModules/news/trunk/news/readme.txt
XoopsModules/news/trunk/news/upgrade.txt
Added: XoopsModules/news/trunk/news/admin/about.php
===================================================================
--- XoopsModules/news/trunk/news/admin/about.php (rev 0)
+++ XoopsModules/news/trunk/news/admin/about.php 2012-07-02 06:02:52 UTC (rev 9767)
@@ -0,0 +1,28 @@
+<?php
+/**
+ * News module
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright The XOOPS Project (http://www.xoops.org)
+ * @license {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License}
+ * @package News
+ * @since 2.5.0
+ * @author XOOPS Development Team
+ * @version $Id $
+ **/
+include_once dirname(__FILE__) . '/admin_header.php';
+
+xoops_cp_header();
+
+$aboutAdmin = new ModuleAdmin();
+
+echo $aboutAdmin->addNavigation('about.php');
+echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false);
+
+include 'admin_footer.php';
\ No newline at end of file
Added: XoopsModules/news/trunk/news/admin/admin_footer.php
===================================================================
--- XoopsModules/news/trunk/news/admin/admin_footer.php (rev 0)
+++ XoopsModules/news/trunk/news/admin/admin_footer.php 2012-07-02 06:02:52 UTC (rev 9767)
@@ -0,0 +1,24 @@
+<?php
+/**
+ * News module
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License
+ * @package News
+ * @since 1.6.7
+ * @author Mamba (www.xoops.org)
+ * @version $Id $
+**/
+
+echo"<div class='adminfooter'>\n" . " <div style='text-align: center;'>\n"
+ . " <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
+ . " </div>\n" . " " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n" . "</div>";
+
+xoops_cp_footer();
\ No newline at end of file
Added: XoopsModules/news/trunk/news/admin/admin_header.php
===================================================================
--- XoopsModules/news/trunk/news/admin/admin_header.php (rev 0)
+++ XoopsModules/news/trunk/news/admin/admin_header.php 2012-07-02 06:02:52 UTC (rev 9767)
@@ -0,0 +1,70 @@
+<?php
+/**
+ * News module
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License
+ * @package news
+ * @since 1.6.7
+ * @author XOOPS Development Team
+ * @version $Id $
+**/
+$path = dirname(dirname(dirname(dirname(__FILE__))));
+include_once $path . '/mainfile.php';
+include_once $path . '/include/cp_functions.php';
+require_once $path . '/include/cp_header.php';
+
+global $xoopsModule;
+
+$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
+$thisModulePath = dirname(dirname(__FILE__));
+
+//if functions.php file exist
+require_once dirname(dirname(__FILE__)) . '/include/functions.php';
+//require_once $thisModulePath . '/include/functions.php';
+
+// Load language files
+xoops_loadLanguage('admin', $thisModuleDir);
+xoops_loadLanguage('modinfo', $thisModuleDir);
+xoops_loadLanguage('main', $thisModuleDir);
+
+$pathIcon16 = '../' . $xoopsModule->getInfo('icons16');
+$pathIcon32 = '../' . $xoopsModule->getInfo('icons32');
+$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
+
+if (file_exists($GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php'))) {
+ include_once $GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php');
+} else {
+ redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, FALSE);
+}
+
+
+$topicsHandler=& xoops_getModuleHandler('news_topics','news');
+$storiesHandler=& xoops_getModuleHandler('news_stories','news');
+
+$myts =& MyTextSanitizer::getInstance();
+
+if ($xoopsUser) {
+ $moduleperm_handler =& xoops_gethandler('groupperm');
+ if (!$moduleperm_handler->checkRight('module_admin', $xoopsModule->getVar( 'mid' ), $xoopsUser->getGroups())) {
+ redirect_header(XOOPS_URL, 1, _NOPERM);
+ exit();
+ }
+} else {
+ redirect_header(XOOPS_URL . "/user.php", 1, _NOPERM);
+ exit();
+}
+
+if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
+ include_once(XOOPS_ROOT_PATH."/class/template.php");
+ $xoopsTpl = new XoopsTpl();
+}
+
+$xoopsTpl->assign('pathIcon16', $pathIcon16);
\ No newline at end of file
Modified: XoopsModules/news/trunk/news/admin/amsimport.php
===================================================================
--- XoopsModules/news/trunk/news/admin/amsimport.php 2012-07-02 05:56:04 UTC (rev 9766)
+++ XoopsModules/news/trunk/news/admin/amsimport.php 2012-07-02 06:02:52 UTC (rev 9767)
@@ -30,8 +30,8 @@
* This script will import topics, articles, files, links, ratings, comments and notifications from AMS 2.41
*
* @package News
- * @author Instant Zero (http://www.instant-zero.com)
- * @copyright 2005, 2006 - Instant Zero
+ * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com)
+ * @copyright 2005, 2006 - Herv\xE9 Thouzard
* @version 1.0
*/
@@ -65,7 +65,7 @@
} else {
include_once XOOPS_ROOT_PATH.'/modules/AMS/language/english/admin.php';
}
- $db =& Database::getInstance();
+ $db =& XoopsDatabaseFactory::getDatabaseConnection();
// User's choices
$use_forum = (isset($_POST['useforum']) && $_POST['useforum']==1) ? 1 : 0;
$use_extlinks = (isset($_POST['useextlinks']) && $_POST['useextlinks']==1) ? 1 : 0;
@@ -161,8 +161,8 @@
$news->setNosmiley($article['nosmiley']);
$news->setHometext($text_lastversion['hometext']);
$news->setBodytext($text_lastversion['bodytext'].$links.$forum);
- $news->Setkeywords('');
- $news->Setdescription('');
+ $news->setKeywords('');
+ $news->setDescription('');
$news->counter=$article['counter'];
$news->setTopicId($news_topicid);
$news->setIhome($article['ihome']);
Modified: XoopsModules/news/trunk/news/admin/functions.php
===================================================================
--- XoopsModules/news/trunk/news/admin/functions.php 2012-07-02 05:56:04 UTC (rev 9766)
+++ XoopsModules/news/trunk/news/admin/functions.php 2012-07-02 06:02:52 UTC (rev 9767)
@@ -33,156 +33,10 @@
* NOTE : Please give credits if you copy this code !
*
* @package News
- * @author Instant Zero (http://www.instant-zero.com) & Dojo Javscript Toolkit
- * @copyright (c) Instant Zero - http://www.instant-zero.com
+ * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com) & Dojo Javscript Toolkit
+ * @copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com)
*/
-function news_adminmenu($currentoption = 0, $breadcrumb = '')
-{
- global $xoopsModule, $xoopsConfig;
-
- include XOOPS_ROOT_PATH . '/modules/news/config.php';
- if (file_exists(XOOPS_ROOT_PATH . '/modules/news/language/' . $xoopsConfig['language'] . '/modinfo.php')) {
- include_once XOOPS_ROOT_PATH . '/modules/news/language/' . $xoopsConfig['language'] . '/modinfo.php';
- } else {
- include_once XOOPS_ROOT_PATH . '/modules/news/language/english/modinfo.php';
- }
-
- if (!$cfg['use_fun_menu']) {
- $tblColors = array('', '', '', '', '', '', '', '', '');
- if ($currentoption >= 0) {
- $tblColors[$currentoption] = 'current';
- }
-
- /* Nice buttons styles */
- echo "
- <style type='text/css'>
- #buttontop { float:left; width:100%; background: #e7e7e7; font-size:93%; line-height:normal; border-top: 1px solid black; border-left: 1px solid black; border-right: 1px solid black; margin: 0; }
- #buttonbar { float:left; width:100%; background: #e7e7e7 url('" . XOOPS_URL . "/modules/news/images/bg.png') repeat-x left bottom; font-size:93%; line-height:normal; border-left: 1px solid black; border-right: 1px solid black; margin-bottom: 12px; }
- #buttonbar ul { margin:0; margin-top: 15px; padding:10px 10px 0; list-style:none; }
- #buttonbar li { display:inline; margin:0; padding:0; }
- #buttonbar a { float:left; background:url('" . XOOPS_URL . "/modules/news/images/left_both.png') no-repeat left top; margin:0; padding:0 0 0 9px; border-bottom:1px solid #000; text-decoration:none; }
- #buttonbar a span { float:left; display:block; background:url('" . XOOPS_URL . "/modules/news/images/right_both.png') no-repeat right top; padding:5px 15px 4px 6px; font-weight:bold; color:#765; }
- /* Commented Backslash Hack hides rule from IE5-Mac \*/
- #buttonbar a span {float:none;}
- /* End IE5-Mac hack */
- #buttonbar a:hover span { color:#333; }
- #buttonbar #current a { background-position:0 -150px; border-width:0; }
- #buttonbar #current a span { background-position:100% -150px; padding-bottom:5px; color:#333; }
- #buttonbar a:hover { background-position:0% -150px; }
- #buttonbar a:hover span { background-position:100% -150px; }
- </style>
- ";
-
- echo "<div id='buttontop'>";
- echo "<table style=\"width: 100%; padding: 0; \" cellspacing=\"0\"><tr>";
- echo "<td style=\"width: 60%; font-size: 10px; text-align: left; color: #2F5376; padding: 0 6px; line-height: 18px;\"><a class=\"nobutton\" href=\"".XOOPS_URL."/modules/system/admin.php?fct=preferences&op=showmod&mod=".$xoopsModule->getVar('mid')."\">" . _AM_NEWS_GENERALSET . "</a> | <a href=\"../index.php\">" . _AM_NEWS_GOTOMOD . "</a> | <a href=\"#\">" . _AM_NEWS_HELP . "</a> | <a href='index.php?op=verifydb'>". _AM_NEWS_VERIFY_TABLES ."</a></td>";
- echo "<td style=\"width: 40%; font-size: 10px; text-align: right; color: #2F5376; padding: 0 6px; line-height: 18px;\"><b>" . $xoopsModule->name() . " " . _AM_NEWS_MODULEADMIN . "</b> " . $breadcrumb . "</td>";
- echo '</tr></table>';
- echo '</div>';
-
- echo "<div id='buttonbar'>";
- echo '<ul>';
- echo "<li id='" . $tblColors[0] . "'><a href=\"index.php?op=topicsmanager\"\"><span>"._MI_NEWS_ADMENU2 ."</span></a></li>\n";
- echo "<li id='" . $tblColors[1] . "'><a href=\"index.php?op=newarticle\"><span>" . _MI_NEWS_ADMENU3 . "</span></a></li>\n";
- echo "<li id='" . $tblColors[2] . "'><a href=\"groupperms.php\"><span>" . _MI_NEWS_GROUPPERMS . "</span></a></li>\n";
- echo "<li id='" . $tblColors[3] . "'><a href=\"index.php?op=prune\"><span>" . _MI_NEWS_PRUNENEWS . "</span></a></li>\n";
- echo "<li id='" . $tblColors[4] . "'><a href=\"index.php?op=export\"><span>" . _MI_NEWS_EXPORT . "</span></a></li>\n";
- echo "<li id='" . $tblColors[5] . "'><a href=\"index.php?op=configurenewsletter\"><span>" . _MI_NEWS_NEWSLETTER . "</span></a></li>\n";
- echo "<li id='" . $tblColors[6] . "'><a href=\"index.php?op=stats\"><span>" . _MI_NEWS_STATS . "</span></a></li>\n";
- if ($xoopsModule->getVar('version') != 166) {
- echo "<li id='" . $tblColors[7] . "'><a href=\"upgrade.php\"><span>" . _AM_NEWS_UPGRADE . "</span></a></li>\n";
- }
- echo "<li id='" . $tblColors[8] . "'><a href=\"index.php?op=metagen\"><span>" . _MI_NEWS_METAGEN . "</span></a></li>\n";
- echo '</ul></div>';
- echo '<br /><br /><pre> </pre><pre> </pre>';
- } else {
- ?>
- <script type="text/javascript" src="../js/dojo.js"></script>
- <script language="JavaScript" type="text/javascript">
- dojo.require("dojo.widget.FisheyeList");
- dojo.hostenv.writeIncludes();
- </script>
- <script>
- function load_app(id){
- urltogo = new Array("../../system/admin.php?fct=preferences&op=showmod&mod=<?php echo $xoopsModule->getVar('mid'); ?>","../index.php","#","index.php?op=verifydb","index.php?op=topicsmanager","index.php?op=newarticle","groupperms.php","index.php?op=prune","index.php?op=export","index.php?op=configurenewsletter","index.php?op=stats","index.php?op=metagen","upgrade.php");
- window.location.href = urltogo[id];
- }
- </script>
-
- <style>
- .dojoHtmlFisheyeListBar {
- margin: 0 auto;
- text-align: center;
- }
-
- .outerbar {
- background-color: #ffffff;
- text-align: center;
- position: relative;
- left: 0px;
- top: 0px;
- width: 100%;
- }
- </style>
-
- <div class="outerbar">
- <div class="dojo-FisheyeList"
- dojo:itemWidth="50" dojo:itemHeight="50"
- dojo:itemMaxWidth="200" dojo:itemMaxHeight="200"
- dojo:orientation="horizontal"
- dojo:effectUnits="2"
- dojo:itemPadding="10"
- dojo:attachEdge="top"
- dojo:labelEdge="bottom"
- dojo:enableCrappySvgSupport="false">
-
- <div class="dojo-FisheyeListItem" onClick="load_app(0)"
- dojo:iconsrc="../images/options.png" caption="<?php echo _AM_NEWS_GENERALSET; ?>">
- </div>
- <div class="dojo-FisheyeListItem" onClick="load_app(1);"
- dojo:iconsrc="../images/home.png" caption="<?php echo _AM_NEWS_GOTOMOD; ?>">
- </div>
- <div class="dojo-FisheyeListItem" onClick="load_app(2);"
- dojo:iconsrc="../images/help.png" caption="<?php echo _AM_NEWS_HELP; ?>">
- </div>
- <div class="dojo-FisheyeListItem" onClick="load_app(3);"
- dojo:iconsrc="../images/maintain.png" caption="<?php echo _AM_NEWS_VERIFY_TABLES; ?>">
- </div>
- <div class="dojo-FisheyeListItem" onClick="load_app(4);"
- dojo:iconsrc="../images/topics.png" caption="<?php echo _MI_NEWS_ADMENU2; ?>">
- </div>
- <div class="dojo-FisheyeListItem" onClick="load_app(5);"
- dojo:iconsrc="../images/articles.png" dojo:caption="<?php echo _MI_NEWS_ADMENU3; ?>" >
- </div>
- <div class="dojo-FisheyeListItem" onClick="load_app(6);"
- dojo:iconsrc="../images/permissions.png" dojo:caption="<?php echo _MI_NEWS_GROUPPERMS; ?>" >
- </div>
- <div class="dojo-FisheyeListItem" onClick="load_app(7);"
- dojo:iconsrc="../images/purge.png" dojo:caption="<?php echo _MI_NEWS_PRUNENEWS; ?>" >
- </div>
- <div class="dojo-FisheyeListItem" onClick="load_app(8);"
- dojo:iconsrc="../images/export.png" dojo:caption="<?php echo _MI_NEWS_EXPORT; ?>" >
- </div>
- <div class="dojo-FisheyeListItem" onClick="load_app(9);"
- dojo:iconsrc="../images/newsletter.png" dojo:caption="<?php echo _MI_NEWS_NEWSLETTER; ?>" >
- </div>
- <div class="dojo-FisheyeListItem" onClick="load_app(10);"
- dojo:iconsrc="../images/statistics.png" dojo:caption="<?php echo _MI_NEWS_STATS; ?>" >
- </div>
- <div class="dojo-FisheyeListItem" onClick="load_app(11);"
- dojo:iconsrc="../images/metagen.png" dojo:caption="<?php echo _MI_NEWS_METAGEN; ?>" >
- </div>
- <?php if ($xoopsModule->getVar('version') != 153) { ?>
- <div class="dojo-FisheyeListItem" onClick="load_app(12);"
- dojo:iconsrc="../images/update.png" dojo:caption="<?php echo _AM_NEWS_UPGRADE; ?>" >
- </div>
- <?php } ?>
- </div>
- </div>
-<?php
- }
-}
-
+
function news_collapsableBar($tablename = '', $iconname = '')
{
@@ -209,9 +63,9 @@
}
var iconClose = new Image();
- iconClose.src = '../images/close12.gif';
+ iconClose.src = '../images/icons/close12.gif';
var iconOpen = new Image();
- iconOpen.src = '../images/open12.gif';
+ iconOpen.src = '../images/icons/open12.gif';
function toggleIcon ( iconName )
{
Modified: XoopsModules/news/trunk/news/admin/groupperms.php
===================================================================
--- XoopsModules/news/trunk/news/admin/groupperms.php 2012-07-02 05:56:04 UTC (rev 9766)
+++ XoopsModules/news/trunk/news/admin/groupperms.php 2012-07-02 06:02:52 UTC (rev 9767)
@@ -29,10 +29,11 @@
include_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
include_once XOOPS_ROOT_PATH . '/modules/news/admin/functions.php';
-
+include_once 'admin_header.php';
xoops_cp_header();
+$permAdmin = new ModuleAdmin();
+echo $permAdmin->addNavigation('groupperms.php');
-news_adminmenu(2);
echo '<br /><br /><br />';
$permtoset = isset($_POST['permtoset']) ? intval($_POST['permtoset']) : 1;
$selected = array('', '', '');
@@ -68,6 +69,4 @@
echo $permform->render();
echo "<br /><br /><br /><br />\n";
unset($permform);
-
-xoops_cp_footer();
-?>
\ No newline at end of file
+include 'admin_footer.php';
\ No newline at end of file
Added: XoopsModules/news/trunk/news/admin/index.html
===================================================================
--- XoopsModules/news/trunk/news/admin/index.html (rev 0)
+++ XoopsModules/news/trunk/news/admin/index.html 2012-07-02 06:02:52 UTC (rev 9767)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Modified: XoopsModules/news/trunk/news/admin/index.php
===================================================================
--- XoopsModules/news/trunk/news/admin/index.php 2012-07-02 05:56:04 UTC (rev 9766)
+++ XoopsModules/news/trunk/news/admin/index.php 2012-07-02 06:02:52 UTC (rev 9767)
@@ -1,1560 +1,1643 @@
-<?php
-// $Id$
-// ------------------------------------------------------------------------ //
-// XOOPS - PHP Content Management System //
-// Copyright (c) 2000 XOOPS.org //
-// <http://www.xoops.org/> //
-// ------------------------------------------------------------------------ //
-// 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. //
-// //
-// You may not change or alter any portion of this comment or credits //
-// of supporting developers from this source code or any supporting //
-// source code which is considered copyrighted (c) material of the //
-// original comment or credit authors. //
-// //
-// This program is distributed in the hope that it will be useful, //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 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 //
-// ------------------------------------------------------------------------ //
-include_once '../../../include/cp_header.php';
-include_once XOOPS_ROOT_PATH.'/class/xoopstopic.php';
-include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
-include_once XOOPS_ROOT_PATH.'/modules/news/config.php';
-include_once XOOPS_ROOT_PATH.'/modules/news/class/class.newsstory.php';
-include_once XOOPS_ROOT_PATH.'/modules/news/class/class.newstopic.php';
-include_once XOOPS_ROOT_PATH.'/modules/news/class/class.sfiles.php';
-include_once XOOPS_ROOT_PATH.'/modules/news/class/blacklist.php';
-include_once XOOPS_ROOT_PATH.'/modules/news/class/registryfile.php';
-include_once XOOPS_ROOT_PATH.'/class/uploader.php';
-include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
-include_once XOOPS_ROOT_PATH.'/modules/news/admin/functions.php';
-include_once XOOPS_ROOT_PATH.'/modules/news/include/functions.php';
-include_once XOOPS_ROOT_PATH.'/class/tree.php';
-$dateformat=news_getmoduleoption('dateformat');
-$myts =& MyTextSanitizer::getInstance();
-$topicscount=0;
-
-$storiesTableName = $xoopsDB->prefix('stories');
-if(!news_FieldExists('picture', $storiesTableName)) {
- news_AddField('`picture` VARCHAR( 50 ) NOT NULL', $storiesTableName);
-}
-
-/**
- * Show new submissions
- *
- * This list can be view in the module's admin when you click on the tab named "Post/Edit News"
- * Submissions are news that was submit by users but who are not approved, so you need to edit
- * them to approve them.
- * Actually you can see the the story's title, the topic, the posted date, the author and a
- * link to delete the story. If you click on the story's title, you will be able to edit the news.
- * The table contains the last x new submissions.
- * The system's block called "Waiting Contents" is listing the number of those news.
- */
-function newSubmissions()
-{
- global $dateformat;
- $start = isset($_GET['startnew']) ? intval($_GET['startnew']) : 0;
- $newsubcount = NewsStory :: getAllStoriesCount(3,false);
- $storyarray = NewsStory :: getAllSubmitted(news_getmoduleoption('storycountadmin'),true,news_getmoduleoption('restrictindex'),$start);
- if ( count($storyarray)> 0) {
- $pagenav = new XoopsPageNav( $newsubcount, news_getmoduleoption('storycountadmin'), $start, 'startnew', 'op=newarticle');
- news_collapsableBar('newsub', 'topnewsubicon');
- echo "<img onclick=\"toggle('toptable'); toggleIcon('toptableicon');\" id='topnewsubicon' name='topnewsubicon' src='" . XOOPS_URL . "/modules/news/images/close12.gif' alt='' /></a> "._AM_NEWSUB."</h4>";
- echo "<div id='newsub'>";
- echo '<br />';
- echo "<div style='text-align: center;'><table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'><tr class='bg3'><td align='center'>" . _AM_TITLE . "</td><td align='center'>" . _AM_TOPIC . "</td><td align='center'>" . _AM_POSTED . "</td><td align='center'>" . _AM_POSTER . "</td><td align='center'>" . _AM_ACTION . "</td></tr>\n";
- $class='';
- foreach( $storyarray as $newstory ) {
- $class = ($class == 'even') ? 'odd' : 'even';
- echo "<tr class='".$class."'><td align='left'>\n";
- $title = $newstory->title();
- if (!isset($title) || ($title == '' )) {
- echo "<a href='".XOOPS_URL."/modules/news/admin/index.php?op=edit&returnside=1&storyid=" . $newstory -> storyid() . "'>" . _AD_NOSUBJECT . "</a>\n";
- } else {
- echo " <a href='".XOOPS_URL."/modules/news/submit.php?returnside=1&op=edit&storyid=" . $newstory -> storyid() . "'>" . $title . "</a>\n";
- }
- echo "</td><td>" . $newstory->topic_title() . "</td><td align='center' class='nw'>" . formatTimestamp($newstory->created(),$dateformat) . "</td><td align='center'><a href='" . XOOPS_URL . "/userinfo.php?uid=" . $newstory->uid() . "'>" . $newstory->uname() . "</a></td><td align='right'><a href='".XOOPS_URL."/modules/news/admin/index.php?op=delete&storyid=" . $newstory->storyid() . "'>" . _AM_DELETE . "</a></td></tr>\n";
- }
- echo '</table></div>';
- echo "<div align='right'>".$pagenav->renderNav().'</div><br />';
- echo '<br /></div><br />';
- }
-}
-
-/**
- * Shows all automated stories
- *
- * Automated stories are stories that have a publication's date greater than "now"
- * This list can be view in the module's admin when you click on the tab named "Post/Edit News"
- * Actually you can see the story's ID, its title, the topic, the author, the
- * programmed date and time, the expiration's date and two links. The first link is
- * used to edit the story while the second is used to remove the story.
- * The list only contains the last (x) automated news
- */
-function autoStories()
-{
- global $dateformat;
- $start = isset($_GET['startauto']) ? intval($_GET['startauto']) : 0;
- $storiescount = NewsStory :: getAllStoriesCount(2,false);
- $storyarray = NewsStory :: getAllAutoStory(news_getmoduleoption('storycountadmin'),true,$start);
- $class='';
- if(count($storyarray) > 0) {
- $pagenav = new XoopsPageNav($storiescount, news_getmoduleoption('storycountadmin'), $start, 'startauto', 'op=newarticle');
- news_collapsableBar('autostories', 'topautostories');
- echo "<img onclick=\"toggle('toptable'); toggleIcon('toptableicon');\" id='topautostories' name='topautostories' src='" . XOOPS_URL . "/modules/news/images/close12.gif' alt='' /></a> "._AM_AUTOARTICLES."</h4>";
- echo "<div id='autostories'>";
- echo '<br />';
- echo "<div style='text-align: center;'>\n";
- echo "<table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'><tr class='bg3'><td align='center'>" . _AM_STORYID . "</td><td align='center'>" . _AM_TITLE . "</td><td align='center'>" . _AM_TOPIC . "</td><td align='center'>" . _AM_POSTER . "</td><td align='center' class='nw'>" . _AM_PROGRAMMED . "</td><td align='center' class='nw'>" . _AM_EXPIRED . "</td><td align='center'>" . _AM_ACTION . "</td></tr>";
- foreach($storyarray as $autostory) {
- $topic = $autostory -> topic();
- $expire = ( $autostory->expired() > 0 ) ? formatTimestamp($autostory->expired(),$dateformat) : '';
- $class = ($class == 'even') ? 'odd' : 'even';
- echo "<tr class='".$class."'>";
- echo "<td align='center'><b>" . $autostory -> storyid() . "</b>
- </td><td align='left'><a href='" . XOOPS_URL . "/modules/news/article.php?storyid=" . $autostory->storyid() . "'>" . $autostory->title() . "</a>
- </td><td align='center'>" . $topic->topic_title() . "
- </td><td align='center'><a href='" . XOOPS_URL . "/userinfo.php?uid=" . $autostory->uid() . "'>" . $autostory->uname() . "</a></td><td align='center' class='nw'>" . formatTimestamp($autostory->published(),$dateformat) . "</td><td align='center'>" . $expire . "</td><td align='center'><a href='".XOOPS_URL."/modules/news/submit.php?returnside=1&op=edit&storyid=" . $autostory->storyid() . "'>" . _AM_EDIT . "</a>-<a href='".XOOPS_URL."/modules/news/admin/index.php?op=delete&storyid=" . $autostory->storyid() . "'>" . _AM_DELETE . "</a>";
- echo "</td></tr>\n";
- }
- echo '</table></div>';
- echo "<div align='right'>".$pagenav->renderNav().'</div><br />';
- echo '</div><br />';
- }
-}
-
-/**
- * Shows last x published stories
- *
- * This list can be view in the module's admin when you click on the tab named "Post/Edit News"
- * Actually you can see the the story's ID, its title, the topic, the author, the number of hits
- * and two links. The first link is used to edit the story while the second is used to remove the story.
- * The table only contains the last X published stories.
- * You can modify the number of visible stories with the module's option named
- * "Number of new articles to display in admin area".
- * As the number of displayed stories is limited, below this list you can find a text box
- * that you can use to enter a story's Id, then with the scrolling list you can select
- * if you want to edit or delete the story.
- */
-function lastStories()
-{
- global $dateformat;
- news_collapsableBar('laststories', 'toplaststories');
- echo "<img onclick=\"toggle('toptable'); toggleIcon('toptableicon');\" id='toplaststories' name='toplaststories' src='" . XOOPS_URL . "/modules/news/images/close12.gif' alt='' /></a> ".sprintf(_AM_LAST10ARTS,news_getmoduleoption('storycountadmin'))."</h4>";
- echo "<div id='laststories'>";
- echo '<br />';
- echo "<div style='text-align: center;'>";
- $start = isset($_GET['start']) ? intval($_GET['start']) : 0;
- $storyarray = NewsStory :: getAllPublished(news_getmoduleoption('storycountadmin'), $start, false, 0, 1 );
- $storiescount = NewsStory :: getAllStoriesCount(4,false);
- $pagenav = new XoopsPageNav( $storiescount, news_getmoduleoption('storycountadmin'), $start, 'start', 'op=newarticle');
- $class='';
- echo "<table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'><tr class='bg3'><td align='center'>" . _AM_STORYID . "</td><td align='center'>" . _AM_TITLE . "</td><td align='center'>" . _AM_TOPIC . "</td><td align='center'>" . _AM_POSTER . "</td><td align='center' class='nw'>" . _AM_PUBLISHED . "</td><td align='center' class='nw'>" . _AM_HITS . "</td><td align='center'>" . _AM_ACTION . "</td></tr>";
- foreach( $storyarray as $eachstory ) {
- $published = formatTimestamp($eachstory->published(),$dateformat );
- // $expired = ( $eachstory -> expired() > 0 ) ? formatTimestamp($eachstory->expired(),$dateformat) : '---';
- $topic = $eachstory -> topic();
- $class = ($class == 'even') ? 'odd' : 'even';
- echo "<tr class='".$class."'>";
- echo "<td align='center'><b>" . $eachstory -> storyid() . "</b>
- </td><td align='left'><a href='" . XOOPS_URL . "/modules/news/article.php?storyid=" . $eachstory -> storyid() . "'>" . $eachstory -> title() . "</a>
- </td><td align='center'>" . $topic -> topic_title() . "
- </td><td align='center'><a href='" . XOOPS_URL . "/userinfo.php?uid=" . $eachstory -> uid() . "'>" . $eachstory -> uname() . "</a></td><td align='center' class='nw'>" . $published . "</td><td align='center'>" . $eachstory -> counter() . "</td><td align='center'><a href='".XOOPS_URL."/modules/news/submit.php?returnside=1&op=edit&storyid=" . $eachstory -> storyid() . "'>" . _AM_EDIT . "</a>-<a href='".XOOPS_URL."/modules/news/admin/index.php?op=delete&storyid=" . $eachstory -> storyid() . "'>" . _AM_DELETE . "</a>";
- echo "</td></tr>\n";
- }
- echo '</table><br />';
- echo "<div align='right'>".$pagenav->renderNav().'</div><br />';
-
- echo "<form action='index.php' method='get'>" . _AM_STORYID . " <input type='text' name='storyid' size='10' />
- <select name='op'>
- <option value='edit' selected='selected'>" . _AM_EDIT . "</option>
- <option value='delete'>" . _AM_DELETE . "</option>
- </select>
- <input type='hidden' name='returnside' value='1'>
- <input type='submit' value='" . _AM_GO . "' />
- </form>
- </div>";
- echo '</div><br />';
-}
-
-
-/**
- * Display a list of the expired stories
- *
- * This list can be view in the module's admin when you click on the tab named "Post/Edit News"
- * Actually you can see the story's ID, the title, the topic, the author,
- * the creation and expiration's date and you have two links, one to delete
- * the story and the other to edit the story.
- * The table only contains the last X expired stories.
- * You can modify the number of visible stories with the module's option named
- * "Number of new articles to display in admin area".
- * As the number of displayed stories is limited, below this list you can find a text box
- * that you can use to enter a story's Id, then with the scrolling list you can select
- * if you want to edit or delete the story.
- */
-function expStories()
-{
- global $dateformat;
- $start = isset($_GET['startexp']) ? intval($_GET['startexp']) : 0;
- $expiredcount = NewsStory :: getAllStoriesCount(1,false);
- $storyarray = NewsStory :: getAllExpired(news_getmoduleoption('storycountadmin'), $start, 0, 1 );
- $pagenav = new XoopsPageNav( $expiredcount, news_getmoduleoption('storycountadmin'), $start, 'startexp', 'op=newarticle');
-
- if(count($storyarray) > 0) {
- $class='';
- news_collapsableBar('expstories', 'topexpstories');
- echo "<img onclick=\"toggle('toptable'); toggleIcon('toptableicon');\" id='topexpstories' name='topexpstories' src='" . XOOPS_URL . "/modules/news/images/close12.gif' alt='' /></a> "._AM_EXPARTS."</h4>";
- echo "<div id='expstories'>";
- echo '<br />';
- echo "<div style='text-align: center;'>";
- echo "<table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'><tr class='bg3'><td align='center'>" . _AM_STORYID . "</td><td align='center'>" . _AM_TITLE . "</td><td align='center'>" . _AM_TOPIC . "</td><td align='center'>" . _AM_POSTER . "</td><td align='center' class='nw'>" . _AM_CREATED . "</td><td align='center' class='nw'>" . _AM_EXPIRED . "</td><td align='center'>" . _AM_ACTION . "</td></tr>";
- foreach( $storyarray as $eachstory ) {
- $created = formatTimestamp($eachstory->created(),$dateformat);
- $expired = formatTimestamp($eachstory->expired(),$dateformat);
- $topic = $eachstory -> topic();
- // added exired value field to table
- $class = ($class == 'even') ? 'odd' : 'even';
- echo "<tr class='".$class."'>";
- echo "<td align='center'><b>" . $eachstory -> storyid() . "</b>
- </td><td align='left'><a href='" . XOOPS_URL . "/modules/news/article.php?returnside=1&storyid=" . $eachstory -> storyid() . "'>" . $eachstory -> title() . "</a>
- </td><td align='center'>" . $topic -> topic_title() . "
- </td><td align='center'><a href='" . XOOPS_URL . "/userinfo.php?uid=" . $eachstory -> uid() . "'>" . $eachstory -> uname() . "</a></td><td align='center' class='nw'>" . $created . "</td><td align='center' class='nw'>" . $expired . "</td><td align='center'><a href='".XOOPS_URL."/modules/news/submit.php?returnside=1&op=edit&storyid=" . $eachstory -> storyid() . "'>" . _AM_EDIT . "</a>-<a href='".XOOPS_URL."/modules/news/admin/index.php?op=delete&storyid=" . $eachstory -> storyid() . "'>" . _AM_DELETE . "</a>";
- echo "</td></tr>\n";
- }
- echo '</table><br />';
- echo "<div align='right'>".$pagenav->renderNav().'</div><br />';
- echo "<form action='index.php' method='get'>
- " . _AM_STORYID . " <input type='text' name='storyid' size='10' />
- <select name='op'>
- <option value='edit' selected='selected'>" . _AM_EDIT . "</option>
- <option value='delete'>" . _AM_DELETE . "</option>
- </select>
- <input type='hidden' name='returnside' value='1'>
- <input type='submit' value='" . _AM_GO . "' />
- </form>
- </div>";
- echo '</div><br />';
- }
-}
-
-/**
- * Delete (purge/prune) old stories
- *
- * You can use this function in the module's admin when you click on the tab named "Prune News"
- * It's useful to remove old stories. It is, of course, recommended
- * to backup (or export) your news before to purge news.
- * You must first specify a date. This date will be used as a reference, everything
- * that was published before this date will be deleted.
- * The option "Only remove stories who have expired" will enable you to only remove
- * expired stories published before the given date.
- * Finally, you can select the topics inside wich you will remove news.
- * Once you have set all the parameters, the script will first show you a confirmation's
- * message with the number of news that will be removed.
- * Note, the topics are not deleted (even if there are no more news inside them).
- */
-function PruneManager()
-{
- include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
- xoops_cp_header();
- news_adminmenu(3);
- echo '<br /><br /><br />';
- $sform = new XoopsThemeForm(_AM_NEWS_PRUNENEWS, 'pruneform', XOOPS_URL.'/modules/news/admin/index.php', 'post');
- $sform->addElement(new XoopsFormTextDateSelect(_AM_NEWS_PRUNE_BEFORE, 'prune_date',15,time()), true);
- $onlyexpired=new xoopsFormCheckBox('', 'onlyexpired');
- $onlyexpired->addOption(1, _AM_NEWS_PRUNE_EXPIREDONLY);
- $sform->addElement($onlyexpired, false);
- $sform->addElement(new XoopsFormHidden('op', 'confirmbeforetoprune'), false);
- $topiclist=new XoopsFormSelect(_AM_NEWS_PRUNE_TOPICS, 'pruned_topics','',5,true);
- $topics_arr=array();
- $xt = new NewsTopic();
- $allTopics = $xt->getAllTopics(false); // The webmaster can see everything
- $topic_tree = new XoopsObjectTree($allTopics, 'topic_id', 'topic_pid');
- $topics_arr = $topic_tree->getAllChild(0);
- if(count($topics_arr)) {
- foreach ($topics_arr as $onetopic) {
- $topiclist->addOption($onetopic->topic_id(),$onetopic->topic_title());
- }
- }
- $topiclist->setDescription(_AM_NEWS_EXPORT_PRUNE_DSC);
- $sform->addElement($topiclist,false);
- $button_tray = new XoopsFormElementTray('' ,'');
- $submit_btn = new XoopsFormButton('', 'post', _SUBMIT, 'submit');
- $button_tray->addElement($submit_btn);
- $sform->addElement($button_tray);
- $sform->display();
-}
-
-// A confirmation is asked before to prune stories
-function ConfirmBeforeToPrune()
-{
- global $dateformat;
- $story = new NewsStory();
- xoops_cp_header();
- $topiclist='';
- if(isset($_POST['pruned_topics'])) {
- $topiclist=implode(',',$_POST['pruned_topics']);
- }
- echo '<h4>' . _AM_NEWS_PRUNENEWS . '</h4>';
- $expired=0;
- if(isset($_POST['onlyexpired'])) {
- $expired = intval($_POST['onlyexpired']);
- }
- $date=$_POST['prune_date'];
- $timestamp=mktime(0,0,0,intval(substr($date,5,2)), intval(substr($date,8,2)), intval(substr($date,0,4)));
- $count=$story->GetCountStoriesPublishedBefore($timestamp, $expired, $topiclist);
- if($count) {
- $displaydate=formatTimestamp($timestamp,$dateformat);
- $msg=sprintf(_AM_NEWS_PRUNE_CONFIRM,$displaydate, $count);
- xoops_confirm(array( 'op' => 'prunenews', 'expired' => $expired, 'pruned_topics' => $topiclist, 'prune_date' => $timestamp, 'ok' => 1), 'index.php', $msg);
- } else {
- printf(_AM_NEWS_NOTHING_PRUNE);
- }
- unset($story);
-}
-
-// Effectively delete stories (published before a date), no more confirmation
-function PruneNews()
-{
- $story = new NewsStory();
- $timestamp=intval($_POST['prune_date']);
- $expired= intval($_POST['expired']);
- $topiclist='';
- if(isset($_POST['pruned_topics'])) {
- $topiclist=$_POST['pruned_topics'];
- }
-
- if(intval($_POST['ok'])==1) {
- $story = new NewsStory();
- xoops_cp_header();
- $count=$story->GetCountStoriesPublishedBefore($timestamp,$expired,$topiclist);
- $msg=sprintf(_AM_NEWS_PRUNE_DELETED,$count);
- $story->DeleteBeforeDate($timestamp,$expired,$topiclist);
- unset($story);
- news_updateCache();
- redirect_header( 'index.php', 3, $msg);
- }
-}
-
-/**
-* Newsletter's configuration
-*
-* You can create a newsletter's content from the admin part of the News module when you click on the tab named "Newsletter"
-* First, let be clear, this module'functionality will not send the newsletter but it will prepare its content for you.
-* To send the newsletter, you can use many specialized modules like evennews.
-* You first select a range of dates and if you want, a selection of topics to use for the search.
-* Once it's done, the script will use the file named /xoops/modules/language/yourlanguage/newsletter.php to create
-* the newsletter's content. When it's finished, the script generates a file in the upload folder.
-*/
-function Newsletter()
-{
- include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
- xoops_cp_header();
- news_adminmenu(5);
- echo '<br /><br /><br />';
- $sform = new XoopsThemeForm(_AM_NEWS_NEWSLETTER, 'newsletterform', XOOPS_URL.'/modules/news/admin/index.php', 'post');
- $dates_tray = new XoopsFormElementTray(_AM_NEWS_NEWSLETTER_BETWEEN);
- $date1 = new XoopsFormTextDateSelect('', 'date1',15,time());
- $date2 = new XoopsFormTextDateSelect(_AM_NEWS_EXPORT_AND, 'date2',15,time());
- $dates_tray->addElement($date1);
- $dates_tray->addElement($date2);
- $sform->addElement($dates_tray);
-
- $topiclist=new XoopsFormSelect(_AM_NEWS_PRUNE_TOPICS, 'export_topics','',5,true);
- $topics_arr=array();
- $xt = new NewsTopic();
- $allTopics = $xt->getAllTopics(false); // The webmaster can see everything
- $topic_tree = new XoopsObjectTree($allTopics, 'topic_id', 'topic_pid');
- $topics_arr = $topic_tree->getAllChild(0);
- if(count($topics_arr)) {
- foreach ($topics_arr as $onetopic) {
- $topiclist->addOption($onetopic->topic_id(),$onetopic->topic_title());
- }
- }
- $topiclist->setDescription(_AM_NEWS_EXPORT_PRUNE_DSC);
- $sform->addElement($topiclist,false);
- $sform->addElement(new XoopsFormHidden('op', 'launchnewsletter'), false);
- $sform->addElement(new XoopsFormRadioYN(_AM_NEWS_REMOVE_BR, 'removebr',1),false);
- $sform->addElement(new XoopsFormRadioYN(_AM_NEWS_NEWSLETTER_HTML_TAGS, 'removehtml',0),false);
- $sform->addElement(new XoopsFormTextArea(_AM_NEWS_NEWSLETTER_HEADER, 'header', '', 4, 70), false);
- $sform->addElement(new XoopsFormTextArea(_AM_NEWS_NEWSLETTER_FOOTER, 'footer', '', 4, 70), false);
- $button_tray = new XoopsFormElementTray('' ,'');
- $submit_btn = new XoopsFormButton('', 'post', _SUBMIT, 'submit');
- $button_tray->addElement($submit_btn);
- $sform->addElement($button_tray);
- $sform->display();
-}
-
-
-/**
- * Launch the creation of the newsletter's content
- */
-function LaunchNewsletter()
-{
- global $xoopsConfig, $dateformat;
- xoops_cp_header();
- news_adminmenu(5);
- $newslettertemplate = '';
- if (file_exists(XOOPS_ROOT_PATH.'/modules/news/language/'.$xoopsConfig['language'].'/newsletter.php')) {
- include_once XOOPS_ROOT_PATH.'/modules/news/language/'.$xoopsConfig['language'].'/newsletter.php';
- } else {
- include_once XOOPS_ROOT_PATH.'/modules/news/language/english/newsletter.php';
- }
- echo '<br />';
- $story = new NewsStory();
- $exportedstories = array();
- $topiclist = '';
- $removebr = $removehtml = false;
- $removebr = isset($_POST['removebr']) ? intval($_POST['removebr']) : 0;
- $removehtml = isset($_POST['removehtml']) ? intval($_POST['removehtml']) : 0;
- $header = isset($_POST['header']) ? $_POST['header'] : '';
- $footer = isset($_POST['footer']) ? $_POST['footer'] : '';
- $date1 = $_POST['date1'];
- $date2 = $_POST['date2'];
- $timestamp1 = mktime(0,0,0,intval(substr($date1,5,2)), intval(substr($date1,8,2)), intval(substr($date1,0,4)));
- $timestamp2 = mktime(23,59,59,intval(substr($date2,5,2)), intval(substr($date2,8,2)), intval(substr($date2,0,4)));
- if(isset($_POST['export_topics'])) {
- $topiclist = implode(',',$_POST['export_topics']);
- }
- $tbltopics = array();
- $exportedstories = $story->NewsExport($timestamp1, $timestamp2, $topiclist, 0, $tbltopics);
- $newsfile = XOOPS_ROOT_PATH.'/uploads/newsletter.txt';
- if(count($exportedstories)) {
- $fp = fopen($newsfile,'w');
- if(!$fp) {
- redirect_header('index.php',4,sprintf(_AM_NEWS_EXPORT_ERROR,$newsfile));
- }
- if(xoops_trim($header) != '') {
- fwrite($fp, $header);
- }
- foreach($exportedstories as $onestory) {
- $content = $newslettertemplate;
- $search_pattern = array('%title%','%uname%','%created%','%published%','%expired%','%hometext%','%bodytext%','%description%','%keywords%','%reads%','%topicid%','%topic_title%','%comments%','%rating%','%votes%','%publisher%','%publisher_id%','%link%');
- $replace_pattern = array($onestory->title(),$onestory->uname(),formatTimestamp($onestory->created(),$dateformat),formatTimestamp($onestory->published(),$dateformat),formatTimestamp($onestory->expired(),$dateformat),$onestory->hometext(),$onestory->bodytext(),$onestory->description(),$onestory->keywords(),$onestory->counter(),$onestory->topicid(),$onestory->topic_title(),$onestory->comments(),$onestory->rating(),$onestory->votes(),$onestory->uname(),$onestory->uid(),XOOPS_URL.'/modules/news/article.php?storyid='.$onestory->storyid());
- $content = str_replace($search_pattern, $replace_pattern, $content);
- if($removebr) {
- $content = str_replace('<br />',"\r\n",$content);
- }
- if($removehtml) {
- $content = strip_tags($content);
- }
- fwrite($fp,$content);
- }
- if(xoops_trim($footer) != '') {
- fwrite($fp, $footer);
- }
- fclose($fp);
- $newsfile=XOOPS_URL.'/uploads/newsletter.txt';
- printf(_AM_NEWS_NEWSLETTER_READY,$newsfile,XOOPS_URL.'/modules/news/admin/index.php?op=deletefile&type=newsletter');
- } else {
- printf(_AM_NEWS_NOTHING);
- }
-}
-
-
-
-/**
-* News export
-*
-* You can use this function in the module's admin when you click on the tab named "News Export"
-* First select a range of date, possibly a range of topics and if you want, check the option "Include Topics Definitions"
-* to also export the topics.
-* News, and topics, will be exported to the XML format.
-*/
-function NewsExport()
-{
- include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
- xoops_cp_header();
- news_adminmenu(4);
- echo '<br /><br /><br />';
- $sform = new XoopsThemeForm(_AM_NEWS_EXPORT_NEWS, 'exportform', XOOPS_URL.'/modules/news/admin/index.php', 'post');
- $dates_tray = new XoopsFormElementTray(_AM_NEWS_EXPORT_BETWEEN);
- $date1 = new XoopsFormTextDateSelect('', 'date1',15,time());
- $date2 = new XoopsFormTextDateSelect(_AM_NEWS_EXPORT_AND, 'date2',15,time());
- $dates_tray->addElement($date1);
- $dates_tray->addElement($date2);
- $sform->addElement($dates_tray);
-
- $topiclist=new XoopsFormSelect(_AM_NEWS_PRUNE_TOPICS, 'export_topics','',5,true);
- $topics_arr=array();
- $xt = new NewsTopic();
- $allTopics = $xt->getAllTopics(false); // The webmaster can see everything
- $topic_tree = new XoopsObjectTree($allTopics, 'topic_id', 'topic_pid');
- $topics_arr = $topic_tree->getAllChild(0);
- if(count($topics_arr)) {
- foreach ($topics_arr as $onetopic) {
- $topiclist->addOption($onetopic->topic_id(),$onetopic->topic_title());
- }
- }
- $topiclist->setDescription(_AM_NEWS_EXPORT_PRUNE_DSC);
- $sform->addElement($topiclist,false);
- $sform->addElement(new XoopsFormRadioYN(_AM_NEWS_EXPORT_INCTOPICS, 'includetopics',0),false);
- $sform->addElement(new XoopsFormHidden('op', 'launchexport'), false);
- $button_tray = new XoopsFormElementTray('' ,'');
- $submit_btn = new XoopsFormButton('', 'post', _SUBMIT, 'submit');
- $button_tray->addElement($submit_btn);
- $sform->addElement($button_tray);
- $sform->display();
-}
-
-
-function news_utf8_encode($text)
-{
- return xoops_utf8_encode($text);
-}
-
-// Launch stories export (to the xml's format)
-function LaunchExport()
-{
- xoops_cp_header();
- news_adminmenu(4);
- echo '<br />';
- $story = new NewsStory();
- $topic= new NewsTopic();
- $exportedstories=array();
- $date1=$_POST['date1'];
- $date2=$_POST['date2'];
- $timestamp1=mktime(0,0,0,intval(substr($date1,5,2)), intval(substr($date1,8,2)), intval(substr($date1,0,4)));
- $timestamp2=mktime(23,59,59,intval(substr($date2,5,2)), intval(substr($date2,8,2)), intval(substr($date2,0,4)));
- $topiclist='';
- if(isset($_POST['export_topics'])) {
- $topiclist=implode(',',$_POST['export_topics']);
- }
- $topicsexport=intval($_POST['includetopics']);
- $tbltopics=array();
- $exportedstories=$story->NewsExport($timestamp1, $timestamp2, $topiclist, $topicsexport, $tbltopics);
- if(count($exportedstories)) {
- $xmlfile=XOOPS_ROOT_PATH.'/uploads/stories.xml';
- $fp=fopen($xmlfile,'w');
- if(!$fp) {
- redirect_header('index.php',4,sprintf(_AM_NEWS_EXPORT_ERROR,$xmlfile));
- }
-
- fwrite($fp,news_utf8_encode("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"));
- fwrite($fp,news_utf8_encode("<news_stories>\n"));
- if($topicsexport) {
- foreach($tbltopics as $onetopic) {
- $topic->NewsTopic($onetopic);
- $content = "<news_topic>\n";
- $content .= sprintf("\t<topic_id>%u</topic_id>\n",$topic->topic_id());
- $content .= sprintf("\t<topic_pid>%u</topic_pid>\n",$topic->topic_pid());
- $content .= sprintf("\t<topic_imgurl>%s</topic_imgurl>\n",$topic->topic_imgurl());
- $content .= sprintf("\t<topic_title>%s</topic_title>\n",$topic->topic_title('F'));
- $content .= sprintf("\t<menu>%d</menu>\n",$topic->menu());
- $content .= sprintf("\t<topic_frontpage>%d</topic_frontpage>\n",$topic->topic_frontpage());
- $content .= sprintf("\t<topic_rssurl>%s</topic_rssurl>\n",$top...
[truncated message content] |
|
From: <be...@us...> - 2012-07-10 07:54:14
|
Revision: 9837
http://xoops.svn.sourceforge.net/xoops/?rev=9837&view=rev
Author: beckmi
Date: 2012-07-10 07:51:44 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
Fixing Permission error notices, if there is no topic (reported by Cesag)
Modified Paths:
--------------
XoopsModules/news/trunk/news/admin/groupperms.php
XoopsModules/news/trunk/news/docs/credits.txt
XoopsModules/news/trunk/news/docs/install.txt
XoopsModules/news/trunk/news/language/english/main.php
XoopsModules/news/trunk/news/language/english/modinfo.php
XoopsModules/news/trunk/news/language/englishUTF8/main.php
XoopsModules/news/trunk/news/language/englishUTF8/modinfo.php
XoopsModules/news/trunk/news/language/italian/modinfo.php
Added Paths:
-----------
XoopsModules/news/trunk/news/docs/lang_diff.txt
Removed Paths:
-------------
XoopsModules/news/trunk/news/docs/lang.diff
Modified: XoopsModules/news/trunk/news/admin/groupperms.php
===================================================================
--- XoopsModules/news/trunk/news/admin/groupperms.php 2012-07-10 07:31:08 UTC (rev 9836)
+++ XoopsModules/news/trunk/news/admin/groupperms.php 2012-07-10 07:51:44 UTC (rev 9837)
@@ -63,10 +63,23 @@
$permform = new XoopsGroupPermForm($title_of_form, $module_id, $perm_name, $perm_desc,'admin/groupperms.php');
$xt = new XoopsTopic($xoopsDB -> prefix('topics'));
$alltopics =& $xt->getTopicsList();
-foreach ($alltopics as $topic_id => $topic) {
- $permform->addItem($topic_id, $topic['title'], $topic['pid']);
+
+
+
+if ($alltopics) {
+ foreach ($alltopics as $topic_id => $topic) {
+ $permform->addItem($topic_id, $topic['title'], $topic['pid']);
+ }
+ echo $permform->render();
+ echo "<br /><br /><br /><br />\n";
+ unset($permform);
+} else {
+
+redirect_header("index.php?op=topicsmanager", 5,_NW_NEWS_NO_TOPICS, false);
}
-echo $permform->render();
-echo "<br /><br /><br /><br />\n";
-unset($permform);
+
+
+
+
+
include 'admin_footer.php';
\ No newline at end of file
Modified: XoopsModules/news/trunk/news/docs/credits.txt
===================================================================
--- XoopsModules/news/trunk/news/docs/credits.txt 2012-07-10 07:31:08 UTC (rev 9836)
+++ XoopsModules/news/trunk/news/docs/credits.txt 2012-07-10 07:51:44 UTC (rev 9837)
@@ -1,8 +1,4 @@
-// ----------------------------------------------------------- //
-// mylinks-w 3.0 //
-// Just enjoy! Internet for everyone!! //
-// wanikoo <http://www.wanisys.net/> //
-// ----------------------------------------------------------- //
-// Original Module: mylinks 1.10 //
-// The XOOPS Project ( http://www.xoops.org/ ) //
-// ----------------------------------------------------------- //
+Credits
+===============
+
+Originally developed by various XOOPS developers, with the latest contributions by Hervet, Trabis, and Mamba.
Modified: XoopsModules/news/trunk/news/docs/install.txt
===================================================================
--- XoopsModules/news/trunk/news/docs/install.txt 2012-07-10 07:31:08 UTC (rev 9836)
+++ XoopsModules/news/trunk/news/docs/install.txt 2012-07-10 07:51:44 UTC (rev 9837)
@@ -1,4 +1,4 @@
INSTALL/UNISTALL
=================
-In order to install the module please do following:
\ No newline at end of file
+Install News just like another module
\ No newline at end of file
Deleted: XoopsModules/news/trunk/news/docs/lang.diff
===================================================================
--- XoopsModules/news/trunk/news/docs/lang.diff 2012-07-10 07:31:08 UTC (rev 9836)
+++ XoopsModules/news/trunk/news/docs/lang.diff 2012-07-10 07:51:44 UTC (rev 9837)
@@ -1,354 +0,0 @@
-Legend :
-+ Added
-- Removed
-* Modified
-
-*******
-v1.67
-*******
-New file :
-help.php
-
-modinfo.php
-+ _MI_NEWS_HELP
-+ _MI_NEWS_ABOUT
-+ _MI_NEWS_HOME
-+ _MI_NEWS_UPGRADE
-+ _MI_NEWS_DESCRIPTION
-+ _MI_NEWS_SHARE_ME
-+ _MI_NEWS_SHARE_ME_DSC
-+ _MI_NEWS_SHOWICONS
-+ _MI_NEWS_SHOWICONS_DSC
-+ _MI_NEWS_FACEBOOKCOMMENTS
-+ _MI_NEWS_FACEBOOKCOMMENTS_DSC
-
-main.php
-+ _NW_BOOKMARK_TO_FACEBOOK
-+ _NW_BOOKMARK_TO_TWITTER
-+ _NW_BOOKMARK_TO_SCRIPSTYLE
-+ _NW_BOOKMARK_TO_STUMBLE
-+ _NW_BOOKMARK_TO_TECHNORATI
-+ _NW_BOOKMARK_TO_MIXX
-+ _NW_BOOKMARK_TO_MYSPACE
-+ _NW_BOOKMARK_TO_DESIGNFLOAT
-+ _NW_BOOKMARK_TO_BALATARIN
-+ _NW_BOOKMARK_TO_GOOGLEPLUS
-+ _NW_BOOKMARK_TO_GOOGLEREADER
-+ _NW_BOOKMARK_TO_GOOGLEBOOKMARKS
-+ _NW_DELETE
-+ _NW_EDIT
-
-admin.php
-+ _AM_NEWS_ABOUT_RELEASEDATE
-+ _AM_NEWS_ABOUT_UPDATEDATE
-+ _AM_NEWS_ABOUT_AUTHOR
-+ _AM_NEWS_ABOUT_CREDITS
-+ _AM_NEWS_ABOUT_LICENSE
-+ _AM_NEWS_ABOUT_MODULE_STATUS
-+ _AM_NEWS_ABOUT_WEBSITE
-+ _AM_NEWS_ABOUT_AUTHOR_NAME
-+ _AM_NEWS_ABOUT_CHANGELOG
-+ _AM_NEWS_ABOUT_MODULE_INFO
-+ _AM_NEWS_ABOUT_AUTHOR_INFO
-+ _AM_NEWS_ABOUT_DESCRIPTION
-+ _AM_NEWS_CONFIG_CHECK
-+ _AM_NEWS_CONFIG_PHP
-+ _AM_NEWS_CONFIG_XOOPS
-
-*******
-v1.63
-*******
-modinfo.php
-+ _MI_NEWS_TAGS
-+ _MI_NEWS_TAGS_DSC
-+ _MI_NEWS_BNAME10
-+ _MI_NEWS_BNAME11
-
-
-*******
-v1.56
-*******
-main.php
-+ _NW_NOTYETSTORY
-
-*******
-v1.54
-*******
-modinfo.php
-+ _MI_NEWS_CATEGORY_NOTIFY
-+ _MI_NEWS_CATEGORY_NOTIFYDSC
-+ _MI_NEWS_CATEGORY_STORYPOSTED_NOTIFY
-+ _MI_NEWS_CATEGORY_STORYPOSTED_NOTIFYCAP
-+ _MI_NEWS_CATEGORY_STORYPOSTED_NOTIFYDSC
-+ _MI_NEWS_CATEGORY_STORYPOSTED_NOTIFYSBJ
-
-
-*******
-v1.51
-*******
-main.php
-
-+ _NW_BOOKMARK_TO_BLINKLIST
-+ _NW_BOOKMARK_TO_DELICIOUS
-+ _NW_BOOKMARK_TO_DIGG
-+ _NW_BOOKMARK_TO_FARK
-+ _NW_BOOKMARK_TO_FURL
-+ _NW_BOOKMARK_TO_NEWSVINE
-+ _NW_BOOKMARK_TO_REDDIT
-+ _NW_BOOKMARK_TO_SIMPY
-+ _NW_BOOKMARK_TO_SPURL
-+ _NW_BOOKMARK_TO_YAHOO
-
-
-*******
-v1.50
-*******
-admin.php
-* _AM_NEWS_EXPORT_NEWS
-+ _AM_NEWS_NEWSLETTER_HEADER
-+ _AM_NEWS_NEWSLETTER_FOOTER
-+ _AM_NEWS_NEWSLETTER_HTML_TAGS
-+ _AM_NEWS_VERIFY_TABLES
-+ _AM_NEWS_METAGEN
-+ _AM_NEWS_METAGEN_DESC
-+ _AM_NEWS_BLACKLIST
-+ _AM_NEWS_BLACKLIST_DESC
-+ _AM_NEWS_BLACKLIST_ADD
-+ _AM_NEWS_BLACKLIST_ADD_DSC
-+ _AM_NEWS_META_KEYWORDS_CNT
-+ _AM_NEWS_META_KEYWORDS_ORDER
-+ _AM_NEWS_META_KEYWORDS_INTEXT
-+ _AM_NEWS_META_KEYWORDS_FREQ1
-+ _AM_NEWS_META_KEYWORDS_FREQ2
-
-blocks.php
-+ _MB_NEWS_CAL_YEAR
-+ _MB_NEWS_CAL_MONTH
-+ _MB_NEWS_STARTING_DATE
-+ _MB_NEWS_ENDING_DATE
-+ _MB_NEWS_UNTIL_TODAY
-+ _MB_NEWS_RECENT_FIRST
-+ _MB_NEWS_OLDER_FIRST
-
-main.php
-+ _NW_LINKS
-+ _NW_PAGE
-+ _NW_BOOKMARK_ME
-+ _AM_NEWS_TOTAL
-+ _AM_NEWS_WHOS_WHO
-+ _NW_NEWS_LIST_OF_AUTHORS
-+ _AM_NEWS_TOPICS_DIRECTORY
-+ _NW_PAGE_AUTO_SUMMARY
-
-modinfo.php
-+ _MI_NEWS_BNAME9
-+ _MI_NEWS_FORM_TINYEDITOR
-+ _MI_NEWS_FOOTNOTES
-+ _MI_NEWS_DUBLINCORE
-+ _MI_NEWS_DUBLINCORE_DSC
-+ _MI_NEWS_BOOKMARK_ME
-+ _MI_NEWS_BOOKMARK_ME_DSC
-+ _MI_NEWS_FF_MICROFORMAT
-+ _MI_NEWS_FF_MICROFORMAT_DSC
-+ _MI_NEWS_WHOS_WHO
-+ _MI_NEWS_METAGEN
-+ _MI_NEWS_TOPICS_DIRECTORY
-+ _MI_NEWS_ADVERTISEMENT
-+ _MI_NEWS_ADV_DESCR
-+ _MI_NEWS_MIME_TYPES
-+ _MI_NEWS_ENHANCED_PAGENAV
-+ _MI_NEWS_ENHANCED_PAGENAV_DSC
-
-
-*******
-v1.44
-*******
-New file :
-newsletter.php
-
-admin.php :
-* _AM_MAX40CHAR
-* _AM_GROUPPERM
-* _AM_SELFILE
-* _AM_UPDATEMODULE (name changed)
-+ _AM_ADD_TOPIC
-+ _AM_ADD_TOPIC_ERROR
-+ _AM_ADD_TOPIC_ERROR1
-+ _AM_SUB_MENU
-+ _AM_SUB_MENU_YESNO
-+ _AM_HITS
-+ _AM_CREATED
-+ _AM_TOPIC_DESCR
-+ _AM_USERS_LIST
-+ _AM_PUBLISH_FRONTPAGE
-+ _AM_NEWS_UPGRADEFAILED1
-+ _AM_NEWS_UPGRADEFAILED2
-+ _AM_NEWS_UPGRADEFAILED2
-+ _AM_NEWS_UPGRADEFAILED3
-+ _AM_NEWS_UPGRADEFAILED4
-+ _AM_NEWS_UPGRADEFAILED0
-+ _AM_NEWS_UPGR_ACCESS_ERROR
-+ _AM_NEWS_PRUNE_BEFORE
-+ _AM_NEWS_PRUNE_EXPIREDONLY
-+ _AM_NEWS_PRUNE_CONFIRM
-+ _AM_NEWS_PRUNE_TOPICS
-+ _AM_NEWS_PRUNENEWS
-+ _AM_NEWS_EXPORT_NEWS
-+ _AM_NEWS_EXPORT_NOTHING
-+ _AM_NEWS_PRUNE_DELETED
-+ _AM_NEWS_PERM_WARNING
-+ _AM_NEWS_EXPORT_BETWEEN
-+ _AM_NEWS_EXPORT_AND
-+ _AM_NEWS_EXPORT_PRUNE_DSC
-+ _AM_NEWS_EXPORT_INCTOPICS
-+ _AM_NEWS_EXPORT_ERROR
-+ _AM_NEWS_EXPORT_READY
-+ _AM_NEWS_RSS_URL
-+ _AM_NEWS_NEWSLETTER
-+ _AM_NEWS_NEWSLETTER_BETWEEN
-+ _AM_NEWS_NEWSLETTER_READY
-+ _AM_NEWS_DELETED_OK
-+ _AM_NEWS_DELETED_PB
-+ _AM_NEWS_STATS0
-+ _AM_NEWS_STATS
-+ _AM_NEWS_STATS1
-+ _AM_NEWS_STATS2
-+ _AM_NEWS_STATS3
-+ _AM_NEWS_STATS4
-+ _AM_NEWS_STATS5
-+ _AM_NEWS_STATS6
-+ _AM_NEWS_STATS7
-+ _AM_NEWS_STATS8
-+ _AM_NEWS_STATS9
-+ _AM_NEWS_STATS10
-+ _AM_NEWS_STATS11
-+ _AM_NEWS_HELP
-+ _AM_NEWS_MODULEADMIN
-+ _AM_NEWS_GENERALSET
-+ _AM_NEWS_GOTOMOD
-+ _AM_NEWS_NOTHING
-+ _AM_NEWS_NOTHING_PRUNE
-+ _AM_NEWS_TOPIC_COLOR
-+ _AM_NEWS_COLOR
-+ _AM_NEWS_REMOVE_BR
-+ _AM_NEWS_PLEASE_UPGRADE
-
-blocks.php :
-* _MB_NEWS_ORDER
-+ _MB_NEWS_TEASER
-+ _MB_NEWS_SPOTLIGHT
-+ _MB_NEWS_FIRST
-+ _MB_NEWS_IMAGE
-+ _MB_SPOTLIGHT_TOPIC
-+ _MB_SPOTLIGHT_ALL_TOPICS
-+ _MB_NEWS_SPOTLIGHT_ARTICLE
-+ _MB_READMORE
-+ _MB_NEWS_RATE
-+ _MB_NEWS_SHOW_NEWS_COUNT
-+ _MB_NEWS_SPOTLIGHT_TITLE
-+ _MB_NEWS_VIEW_TYPE1
-+ _MB_NEWS_VIEW_TYPE2
-+ _MB_NEWS_TAB_COLOR1
-+ _MB_NEWS_TAB_COLOR2
-+ _MB_NEWS_TAB_COLOR3
-+ _MB_NEWS_TAB_COLOR4
-+ _MB_NEWS_TAB_COLOR5
-+ _MB_NEWS_WHAT_PUBLISH
-+ _MB_NEWS_RECENT_NEWS
-+ _MB_NEWS_RECENT_SPECIFIC
-+ _MB_NEWS_DEFAULT_COLORS
-
-main.php :
-- _AM_EXPARTS
-- _AM_EXPIRED
-- _AM_CHANGEEXPDATETIME
-- _AM_SETEXPDATETIME
-- _AM_NOWSETEXPTIME
-+ _NW_ATTACHEDLIB
-+ _NW_NEWSSAMEAUTHORLINK
-+ _NW_NEWS_NO_TOPICS
-+ _NW_PREVIOUS_ARTICLE
-+ _NW_NEXT_ARTICLE
-+ _NW_OTHER_ARTICLES
-+ _NW_RATETHISNEWS
-+ _NW_RATEIT
-+ _NW_TOTALRATE
-+ _NW_RATINGLTOH
-+ _NW_RATINGHTOL
-+ _NW_RATINGC
-+ _NW_RATINGSCALE
-+ _NW_BEOBJECTIVE
-+ _NW_DONOTVOTE
-+ _NW_RATING
-+ _NW_VOTE
-+ _NW_NORATING
-+ _NW_USERAVG
-+ _NW_DLRATINGS
-+ _NW_ONEVOTE
-+ _NW_NUMVOTES
-+ _NW_CANTVOTEOWN
-+ _NW_VOTEDELETED
-+ _NW_VOTEONCE
-+ _NW_VOTEAPPRE
-+ _NW_THANKYOU
-+ _NW_RSSFEED
-+ _NW_AUTHOR
-+ _NW_META_DESCRIPTION
-+ _NW_META_KEYWORDS
-+ _NW_MAKEPDF
-+ _MD_POSTEDON
-+ _NW_AUTHOR_ID
-+ _NW_POST_SORRY
-
-modinfo.php :
-* _MI_NEWS_BNAME8
-* _MI_NEWS_GROUPPERMS
-+ _MI_NEWS_PRUNENEWS
-- _MI_ANONPOST
-+ _MI_NEWS_EXPORT
-- _MI_ANONPOST
-* _MI_STORYCOUNTADMIN
-+ _MI_NEWSBYTHISAUTHOR
-+ _MI_NEWSBYTHISAUTHORDSC
-+ _MI_NEWS_PREVNEX_LINK
-+ _MI_NEWS_PREVNEX_LINK_DESC
-+ _MI_NEWS_SUMMARY_SHOW
-+ _MI_NEWS_SUMMARY_SHOW_DESC
-+ _MI_NEWS_AUTHOR_EDIT
-+ _MI_NEWS_AUTHOR_EDIT_DESC
-+ _MI_NEWS_RATE_NEWS
-+ _MI_NEWS_TOPICS_RSS
-+ _MI_NEWS_TOPICS_RSS_DESC
-+ _MI_NEWS_DATEFORMAT
-+ _MI_NEWS_DATEFORMAT_DESC
-+ _MI_NEWS_META_DATA
-+ _MI_NEWS_META_DATA_DESC
-+ _MI_NEWS_BNAME8
-+ _MI_NEWS_NEWSLETTER
-+ _MI_NEWS_STATS
-+ _MI_NEWS_FORM_OPTIONS
-+ _MI_NEWS_FORM_COMPACT
-+ _MI_NEWS_FORM_DHTML
-+ _MI_NEWS_FORM_SPAW
-+ _MI_NEWS_FORM_HTMLAREA
-+ _MI_NEWS_FORM_FCK
-+ _MI_NEWS_FORM_KOIVI
-+ _MI_NEWS_FORM_OPTIONS_DESC
-+ _MI_NEWS_KEYWORDS_HIGH
-+ _MI_NEWS_KEYWORDS_HIGH_DESC
-+ _MI_NEWS_HIGH_COLOR
-+ _MI_NEWS_HIGH_COLOR_DES
-+ _MI_NEWS_INFOTIPS
-+ _MI_NEWS_INFOTIPS_DES
-+ _MI_NEWS_SITE_NAVBAR
-+ _MI_NEWS_SITE_NAVBAR_DESC
-+ _MI_NEWS_TABS_SKIN
-+ _MI_NEWS_TABS_SKIN_DESC
-+ _MI_NEWS_SKIN_1
-+ _MI_NEWS_SKIN_2
-+ _MI_NEWS_SKIN_3
-+ _MI_NEWS_SKIN_4
-+ _MI_NEWS_SKIN_5
-+ _MI_NEWS_SKIN_6
-+ _MI_NEWS_SKIN_7
-+ _MI_NEWS_SKIN_8
Added: XoopsModules/news/trunk/news/docs/lang_diff.txt
===================================================================
--- XoopsModules/news/trunk/news/docs/lang_diff.txt (rev 0)
+++ XoopsModules/news/trunk/news/docs/lang_diff.txt 2012-07-10 07:51:44 UTC (rev 9837)
@@ -0,0 +1,354 @@
+Legend :
++ Added
+- Removed
+* Modified
+
+*******
+v1.67
+*******
+New file :
+help.php
+
+modinfo.php
++ _MI_NEWS_HELP
++ _MI_NEWS_ABOUT
++ _MI_NEWS_HOME
++ _MI_NEWS_UPGRADE
++ _MI_NEWS_DESCRIPTION
++ _MI_NEWS_SHARE_ME
++ _MI_NEWS_SHARE_ME_DSC
++ _MI_NEWS_SHOWICONS
++ _MI_NEWS_SHOWICONS_DSC
++ _MI_NEWS_FACEBOOKCOMMENTS
++ _MI_NEWS_FACEBOOKCOMMENTS_DSC
+
+main.php
++ _NW_BOOKMARK_TO_FACEBOOK
++ _NW_BOOKMARK_TO_TWITTER
++ _NW_BOOKMARK_TO_SCRIPSTYLE
++ _NW_BOOKMARK_TO_STUMBLE
++ _NW_BOOKMARK_TO_TECHNORATI
++ _NW_BOOKMARK_TO_MIXX
++ _NW_BOOKMARK_TO_MYSPACE
++ _NW_BOOKMARK_TO_DESIGNFLOAT
++ _NW_BOOKMARK_TO_BALATARIN
++ _NW_BOOKMARK_TO_GOOGLEPLUS
++ _NW_BOOKMARK_TO_GOOGLEREADER
++ _NW_BOOKMARK_TO_GOOGLEBOOKMARKS
++ _NW_DELETE
++ _NW_EDIT
+
+admin.php
++ _AM_NEWS_ABOUT_RELEASEDATE
++ _AM_NEWS_ABOUT_UPDATEDATE
++ _AM_NEWS_ABOUT_AUTHOR
++ _AM_NEWS_ABOUT_CREDITS
++ _AM_NEWS_ABOUT_LICENSE
++ _AM_NEWS_ABOUT_MODULE_STATUS
++ _AM_NEWS_ABOUT_WEBSITE
++ _AM_NEWS_ABOUT_AUTHOR_NAME
++ _AM_NEWS_ABOUT_CHANGELOG
++ _AM_NEWS_ABOUT_MODULE_INFO
++ _AM_NEWS_ABOUT_AUTHOR_INFO
++ _AM_NEWS_ABOUT_DESCRIPTION
++ _AM_NEWS_CONFIG_CHECK
++ _AM_NEWS_CONFIG_PHP
++ _AM_NEWS_CONFIG_XOOPS
+
+*******
+v1.63
+*******
+modinfo.php
++ _MI_NEWS_TAGS
++ _MI_NEWS_TAGS_DSC
++ _MI_NEWS_BNAME10
++ _MI_NEWS_BNAME11
+
+
+*******
+v1.56
+*******
+main.php
++ _NW_NOTYETSTORY
+
+*******
+v1.54
+*******
+modinfo.php
++ _MI_NEWS_CATEGORY_NOTIFY
++ _MI_NEWS_CATEGORY_NOTIFYDSC
++ _MI_NEWS_CATEGORY_STORYPOSTED_NOTIFY
++ _MI_NEWS_CATEGORY_STORYPOSTED_NOTIFYCAP
++ _MI_NEWS_CATEGORY_STORYPOSTED_NOTIFYDSC
++ _MI_NEWS_CATEGORY_STORYPOSTED_NOTIFYSBJ
+
+
+*******
+v1.51
+*******
+main.php
+
++ _NW_BOOKMARK_TO_BLINKLIST
++ _NW_BOOKMARK_TO_DELICIOUS
++ _NW_BOOKMARK_TO_DIGG
++ _NW_BOOKMARK_TO_FARK
++ _NW_BOOKMARK_TO_FURL
++ _NW_BOOKMARK_TO_NEWSVINE
++ _NW_BOOKMARK_TO_REDDIT
++ _NW_BOOKMARK_TO_SIMPY
++ _NW_BOOKMARK_TO_SPURL
++ _NW_BOOKMARK_TO_YAHOO
+
+
+*******
+v1.50
+*******
+admin.php
+* _AM_NEWS_EXPORT_NEWS
++ _AM_NEWS_NEWSLETTER_HEADER
++ _AM_NEWS_NEWSLETTER_FOOTER
++ _AM_NEWS_NEWSLETTER_HTML_TAGS
++ _AM_NEWS_VERIFY_TABLES
++ _AM_NEWS_METAGEN
++ _AM_NEWS_METAGEN_DESC
++ _AM_NEWS_BLACKLIST
++ _AM_NEWS_BLACKLIST_DESC
++ _AM_NEWS_BLACKLIST_ADD
++ _AM_NEWS_BLACKLIST_ADD_DSC
++ _AM_NEWS_META_KEYWORDS_CNT
++ _AM_NEWS_META_KEYWORDS_ORDER
++ _AM_NEWS_META_KEYWORDS_INTEXT
++ _AM_NEWS_META_KEYWORDS_FREQ1
++ _AM_NEWS_META_KEYWORDS_FREQ2
+
+blocks.php
++ _MB_NEWS_CAL_YEAR
++ _MB_NEWS_CAL_MONTH
++ _MB_NEWS_STARTING_DATE
++ _MB_NEWS_ENDING_DATE
++ _MB_NEWS_UNTIL_TODAY
++ _MB_NEWS_RECENT_FIRST
++ _MB_NEWS_OLDER_FIRST
+
+main.php
++ _NW_LINKS
++ _NW_PAGE
++ _NW_BOOKMARK_ME
++ _AM_NEWS_TOTAL
++ _AM_NEWS_WHOS_WHO
++ _NW_NEWS_LIST_OF_AUTHORS
++ _AM_NEWS_TOPICS_DIRECTORY
++ _NW_PAGE_AUTO_SUMMARY
+
+modinfo.php
++ _MI_NEWS_BNAME9
++ _MI_NEWS_FORM_TINYEDITOR
++ _MI_NEWS_FOOTNOTES
++ _MI_NEWS_DUBLINCORE
++ _MI_NEWS_DUBLINCORE_DSC
++ _MI_NEWS_BOOKMARK_ME
++ _MI_NEWS_BOOKMARK_ME_DSC
++ _MI_NEWS_FF_MICROFORMAT
++ _MI_NEWS_FF_MICROFORMAT_DSC
++ _MI_NEWS_WHOS_WHO
++ _MI_NEWS_METAGEN
++ _MI_NEWS_TOPICS_DIRECTORY
++ _MI_NEWS_ADVERTISEMENT
++ _MI_NEWS_ADV_DESCR
++ _MI_NEWS_MIME_TYPES
++ _MI_NEWS_ENHANCED_PAGENAV
++ _MI_NEWS_ENHANCED_PAGENAV_DSC
+
+
+*******
+v1.44
+*******
+New file :
+newsletter.php
+
+admin.php :
+* _AM_MAX40CHAR
+* _AM_GROUPPERM
+* _AM_SELFILE
+* _AM_UPDATEMODULE (name changed)
++ _AM_ADD_TOPIC
++ _AM_ADD_TOPIC_ERROR
++ _AM_ADD_TOPIC_ERROR1
++ _AM_SUB_MENU
++ _AM_SUB_MENU_YESNO
++ _AM_HITS
++ _AM_CREATED
++ _AM_TOPIC_DESCR
++ _AM_USERS_LIST
++ _AM_PUBLISH_FRONTPAGE
++ _AM_NEWS_UPGRADEFAILED1
++ _AM_NEWS_UPGRADEFAILED2
++ _AM_NEWS_UPGRADEFAILED2
++ _AM_NEWS_UPGRADEFAILED3
++ _AM_NEWS_UPGRADEFAILED4
++ _AM_NEWS_UPGRADEFAILED0
++ _AM_NEWS_UPGR_ACCESS_ERROR
++ _AM_NEWS_PRUNE_BEFORE
++ _AM_NEWS_PRUNE_EXPIREDONLY
++ _AM_NEWS_PRUNE_CONFIRM
++ _AM_NEWS_PRUNE_TOPICS
++ _AM_NEWS_PRUNENEWS
++ _AM_NEWS_EXPORT_NEWS
++ _AM_NEWS_EXPORT_NOTHING
++ _AM_NEWS_PRUNE_DELETED
++ _AM_NEWS_PERM_WARNING
++ _AM_NEWS_EXPORT_BETWEEN
++ _AM_NEWS_EXPORT_AND
++ _AM_NEWS_EXPORT_PRUNE_DSC
++ _AM_NEWS_EXPORT_INCTOPICS
++ _AM_NEWS_EXPORT_ERROR
++ _AM_NEWS_EXPORT_READY
++ _AM_NEWS_RSS_URL
++ _AM_NEWS_NEWSLETTER
++ _AM_NEWS_NEWSLETTER_BETWEEN
++ _AM_NEWS_NEWSLETTER_READY
++ _AM_NEWS_DELETED_OK
++ _AM_NEWS_DELETED_PB
++ _AM_NEWS_STATS0
++ _AM_NEWS_STATS
++ _AM_NEWS_STATS1
++ _AM_NEWS_STATS2
++ _AM_NEWS_STATS3
++ _AM_NEWS_STATS4
++ _AM_NEWS_STATS5
++ _AM_NEWS_STATS6
++ _AM_NEWS_STATS7
++ _AM_NEWS_STATS8
++ _AM_NEWS_STATS9
++ _AM_NEWS_STATS10
++ _AM_NEWS_STATS11
++ _AM_NEWS_HELP
++ _AM_NEWS_MODULEADMIN
++ _AM_NEWS_GENERALSET
++ _AM_NEWS_GOTOMOD
++ _AM_NEWS_NOTHING
++ _AM_NEWS_NOTHING_PRUNE
++ _AM_NEWS_TOPIC_COLOR
++ _AM_NEWS_COLOR
++ _AM_NEWS_REMOVE_BR
++ _AM_NEWS_PLEASE_UPGRADE
+
+blocks.php :
+* _MB_NEWS_ORDER
++ _MB_NEWS_TEASER
++ _MB_NEWS_SPOTLIGHT
++ _MB_NEWS_FIRST
++ _MB_NEWS_IMAGE
++ _MB_SPOTLIGHT_TOPIC
++ _MB_SPOTLIGHT_ALL_TOPICS
++ _MB_NEWS_SPOTLIGHT_ARTICLE
++ _MB_READMORE
++ _MB_NEWS_RATE
++ _MB_NEWS_SHOW_NEWS_COUNT
++ _MB_NEWS_SPOTLIGHT_TITLE
++ _MB_NEWS_VIEW_TYPE1
++ _MB_NEWS_VIEW_TYPE2
++ _MB_NEWS_TAB_COLOR1
++ _MB_NEWS_TAB_COLOR2
++ _MB_NEWS_TAB_COLOR3
++ _MB_NEWS_TAB_COLOR4
++ _MB_NEWS_TAB_COLOR5
++ _MB_NEWS_WHAT_PUBLISH
++ _MB_NEWS_RECENT_NEWS
++ _MB_NEWS_RECENT_SPECIFIC
++ _MB_NEWS_DEFAULT_COLORS
+
+main.php :
+- _AM_EXPARTS
+- _AM_EXPIRED
+- _AM_CHANGEEXPDATETIME
+- _AM_SETEXPDATETIME
+- _AM_NOWSETEXPTIME
++ _NW_ATTACHEDLIB
++ _NW_NEWSSAMEAUTHORLINK
++ _NW_NEWS_NO_TOPICS
++ _NW_PREVIOUS_ARTICLE
++ _NW_NEXT_ARTICLE
++ _NW_OTHER_ARTICLES
++ _NW_RATETHISNEWS
++ _NW_RATEIT
++ _NW_TOTALRATE
++ _NW_RATINGLTOH
++ _NW_RATINGHTOL
++ _NW_RATINGC
++ _NW_RATINGSCALE
++ _NW_BEOBJECTIVE
++ _NW_DONOTVOTE
++ _NW_RATING
++ _NW_VOTE
++ _NW_NORATING
++ _NW_USERAVG
++ _NW_DLRATINGS
++ _NW_ONEVOTE
++ _NW_NUMVOTES
++ _NW_CANTVOTEOWN
++ _NW_VOTEDELETED
++ _NW_VOTEONCE
++ _NW_VOTEAPPRE
++ _NW_THANKYOU
++ _NW_RSSFEED
++ _NW_AUTHOR
++ _NW_META_DESCRIPTION
++ _NW_META_KEYWORDS
++ _NW_MAKEPDF
++ _MD_POSTEDON
++ _NW_AUTHOR_ID
++ _NW_POST_SORRY
+
+modinfo.php :
+* _MI_NEWS_BNAME8
+* _MI_NEWS_GROUPPERMS
++ _MI_NEWS_PRUNENEWS
+- _MI_ANONPOST
++ _MI_NEWS_EXPORT
+- _MI_ANONPOST
+* _MI_STORYCOUNTADMIN
++ _MI_NEWSBYTHISAUTHOR
++ _MI_NEWSBYTHISAUTHORDSC
++ _MI_NEWS_PREVNEX_LINK
++ _MI_NEWS_PREVNEX_LINK_DESC
++ _MI_NEWS_SUMMARY_SHOW
++ _MI_NEWS_SUMMARY_SHOW_DESC
++ _MI_NEWS_AUTHOR_EDIT
++ _MI_NEWS_AUTHOR_EDIT_DESC
++ _MI_NEWS_RATE_NEWS
++ _MI_NEWS_TOPICS_RSS
++ _MI_NEWS_TOPICS_RSS_DESC
++ _MI_NEWS_DATEFORMAT
++ _MI_NEWS_DATEFORMAT_DESC
++ _MI_NEWS_META_DATA
++ _MI_NEWS_META_DATA_DESC
++ _MI_NEWS_BNAME8
++ _MI_NEWS_NEWSLETTER
++ _MI_NEWS_STATS
++ _MI_NEWS_FORM_OPTIONS
++ _MI_NEWS_FORM_COMPACT
++ _MI_NEWS_FORM_DHTML
++ _MI_NEWS_FORM_SPAW
++ _MI_NEWS_FORM_HTMLAREA
++ _MI_NEWS_FORM_FCK
++ _MI_NEWS_FORM_KOIVI
++ _MI_NEWS_FORM_OPTIONS_DESC
++ _MI_NEWS_KEYWORDS_HIGH
++ _MI_NEWS_KEYWORDS_HIGH_DESC
++ _MI_NEWS_HIGH_COLOR
++ _MI_NEWS_HIGH_COLOR_DES
++ _MI_NEWS_INFOTIPS
++ _MI_NEWS_INFOTIPS_DES
++ _MI_NEWS_SITE_NAVBAR
++ _MI_NEWS_SITE_NAVBAR_DESC
++ _MI_NEWS_TABS_SKIN
++ _MI_NEWS_TABS_SKIN_DESC
++ _MI_NEWS_SKIN_1
++ _MI_NEWS_SKIN_2
++ _MI_NEWS_SKIN_3
++ _MI_NEWS_SKIN_4
++ _MI_NEWS_SKIN_5
++ _MI_NEWS_SKIN_6
++ _MI_NEWS_SKIN_7
++ _MI_NEWS_SKIN_8
Modified: XoopsModules/news/trunk/news/language/english/main.php
===================================================================
--- XoopsModules/news/trunk/news/language/english/main.php 2012-07-10 07:31:08 UTC (rev 9836)
+++ XoopsModules/news/trunk/news/language/english/main.php 2012-07-10 07:51:44 UTC (rev 9837)
@@ -53,7 +53,7 @@
define('_NW_ATTACHEDFILES',"Attached Files:");
define('_NW_ATTACHEDLIB',"This article have some attached files");
define('_NW_NEWSSAMEAUTHORLINK',"News by the same author");
-define('_NW_NEWS_NO_TOPICS',"Sorry but actually there's no topics, please create one before to submit a news");
+define("_NW_NEWS_NO_TOPICS","Sorry but there are no topics yet, please create one first");
define('_NW_PREVIOUS_ARTICLE',"Previous article");
define('_NW_NEXT_ARTICLE',"Next article");
define('_NW_OTHER_ARTICLES',"Other articles");
@@ -133,8 +133,4 @@
define('_NW_DELETE', "Delete");
define('_NW_EDIT', "Edit");
define('_NW_SUBTITLE', "Subtitle: ");
-define('_NW_SELECT_IMAGE_DESC', "Description of selected image: ");
-
-
-
-?>
\ No newline at end of file
+define('_NW_SELECT_IMAGE_DESC', "Description of selected image: ");
\ No newline at end of file
Modified: XoopsModules/news/trunk/news/language/english/modinfo.php
===================================================================
--- XoopsModules/news/trunk/news/language/english/modinfo.php 2012-07-10 07:31:08 UTC (rev 9836)
+++ XoopsModules/news/trunk/news/language/english/modinfo.php 2012-07-10 07:51:44 UTC (rev 9837)
@@ -149,7 +149,7 @@
define('_MI_NEWS_BNAME9','Archives');
define("_MI_NEWS_FORM_TINYEDITOR","TinyEditor");
define("_MI_NEWS_FOOTNOTES","Shows links in printable versions of your articles ?");
-define("_MI_NEWS_DUBLINCORE","Ativate Dublin Core Metadata ?");
+define("_MI_NEWS_DUBLINCORE","Activate Dublin Core Metadata ?");
define("_MI_NEWS_DUBLINCORE_DSC","For more information, <a href='http://dublincore.org/'>visit this link</a>");
define("_MI_NEWS_BOOKMARK_ME","Display a 'Bookmark this article at these sites' block ?");
define("_MI_NEWS_BOOKMARK_ME_DSC","This block will be visible on the article's page");
Modified: XoopsModules/news/trunk/news/language/englishUTF8/main.php
===================================================================
--- XoopsModules/news/trunk/news/language/englishUTF8/main.php 2012-07-10 07:31:08 UTC (rev 9836)
+++ XoopsModules/news/trunk/news/language/englishUTF8/main.php 2012-07-10 07:51:44 UTC (rev 9837)
@@ -53,7 +53,7 @@
define("_NW_ATTACHEDFILES","Attached Files:");
define("_NW_ATTACHEDLIB","This article have some attached files");
define("_NW_NEWSSAMEAUTHORLINK","News by the same author");
-define("_NW_NEWS_NO_TOPICS","Sorry but actually there's no topics, please create one before to submit a news");
+define("_NW_NEWS_NO_TOPICS","Sorry but there are no topics yet, please create one first");
define("_NW_PREVIOUS_ARTICLE","Previous article");
define("_NW_NEXT_ARTICLE","Next article");
define("_NW_OTHER_ARTICLES","Other articles");
Modified: XoopsModules/news/trunk/news/language/englishUTF8/modinfo.php
===================================================================
--- XoopsModules/news/trunk/news/language/englishUTF8/modinfo.php 2012-07-10 07:31:08 UTC (rev 9836)
+++ XoopsModules/news/trunk/news/language/englishUTF8/modinfo.php 2012-07-10 07:51:44 UTC (rev 9837)
@@ -149,7 +149,7 @@
define('_MI_NEWS_BNAME9','Archives');
define("_MI_NEWS_FORM_TINYEDITOR","TinyEditor");
define("_MI_NEWS_FOOTNOTES","Shows links in printable versions of your articles ?");
-define("_MI_NEWS_DUBLINCORE","Ativate Dublin Core Metadata ?");
+define("_MI_NEWS_DUBLINCORE","Activate Dublin Core Metadata ?");
define("_MI_NEWS_DUBLINCORE_DSC","For more information, <a href='http://dublincore.org/'>visit this link</a>");
define("_MI_NEWS_BOOKMARK_ME","Display a 'Bookmark this article at these sites' block ?");
define("_MI_NEWS_BOOKMARK_ME_DSC","This block will be visible on the article's page");
Modified: XoopsModules/news/trunk/news/language/italian/modinfo.php
===================================================================
--- XoopsModules/news/trunk/news/language/italian/modinfo.php 2012-07-10 07:31:08 UTC (rev 9836)
+++ XoopsModules/news/trunk/news/language/italian/modinfo.php 2012-07-10 07:51:44 UTC (rev 9837)
@@ -149,7 +149,7 @@
define("_MI_NEWS_BNAME9", "Archivi");
define("_MI_NEWS_FORM_TINYEDITOR", "TinyEditor");
define("_MI_NEWS_FOOTNOTES", "Mostra i collegamenti nelle versioni stampabili dei tuoi articoli?");
-define("_MI_NEWS_DUBLINCORE", "Ativate Dublin Core Metadata?");
+define("_MI_NEWS_DUBLINCORE", "Activate Dublin Core Metadata?");
define("_MI_NEWS_DUBLINCORE_DSC", "Per ulteriori informazioni, <a href='http://dublincore.org/'>visita questo link</a>");
define("_MI_NEWS_BOOKMARK_ME", "Visualizzare un 'Bookmark questo articolo su questi siti' blocco?");
define("_MI_NEWS_BOOKMARK_ME_DSC", "Questo blocco sarà visibile nella pagina dell'articolo,");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-07-11 19:53:39
|
Revision: 9852
http://xoops.svn.sourceforge.net/xoops/?rev=9852&view=rev
Author: beckmi
Date: 2012-07-11 19:53:33 +0000 (Wed, 11 Jul 2012)
Log Message:
-----------
Removing Dojo related files
Removed Paths:
-------------
XoopsModules/news/trunk/news/images/dojo/
XoopsModules/news/trunk/news/js/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-07-11 19:58:27
|
Revision: 9853
http://xoops.svn.sourceforge.net/xoops/?rev=9853&view=rev
Author: beckmi
Date: 2012-07-11 19:58:21 +0000 (Wed, 11 Jul 2012)
Log Message:
-----------
Updating makepdf.php (Cesag)
Modified Paths:
--------------
XoopsModules/news/trunk/news/docs/changelog.txt
XoopsModules/news/trunk/news/makepdf.php
Modified: XoopsModules/news/trunk/news/docs/changelog.txt
===================================================================
--- XoopsModules/news/trunk/news/docs/changelog.txt 2012-07-11 19:53:33 UTC (rev 9852)
+++ XoopsModules/news/trunk/news/docs/changelog.txt 2012-07-11 19:58:21 UTC (rev 9853)
@@ -4,6 +4,7 @@
======================
- fix of UTF-8 in makePDF (black_beard)
+- remove Dojo related files
======================
v1.67 2012-07-01
Modified: XoopsModules/news/trunk/news/makepdf.php
===================================================================
--- XoopsModules/news/trunk/news/makepdf.php 2012-07-11 19:53:33 UTC (rev 9852)
+++ XoopsModules/news/trunk/news/makepdf.php 2012-07-11 19:58:21 UTC (rev 9853)
@@ -149,7 +149,11 @@
$out.=$pdf_data['author'];
$pdf->WriteHTML($out,$pdf_config['scale']);
$pdf->WriteHTML($puff,$pdf_config['scale']);
-$out=NEWS_PDF_DATE;
+if ( _CHARSET == 'UTF-8') {
+ $out=utf8_decode(NEWS_PDF_DATE).': ';
+} else {
+ $out=NEWS_PDF_AUTHOR.': ';
+}
$out.=$pdf_data['date'];
$pdf->WriteHTML($out,$pdf_config['scale']);
$pdf->WriteHTML($puff,$pdf_config['scale']);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-08-08 22:36:33
|
Revision: 10043
http://xoops.svn.sourceforge.net/xoops/?rev=10043&view=rev
Author: beckmi
Date: 2012-08-08 22:36:24 +0000 (Wed, 08 Aug 2012)
Log Message:
-----------
Update to 1.68 Beta (replace FPDF with TCPDF, rename tables)
Modified Paths:
--------------
XoopsModules/news/trunk/news/admin/amsimport.php
XoopsModules/news/trunk/news/admin/groupperms.php
XoopsModules/news/trunk/news/admin/index.php
XoopsModules/news/trunk/news/admin/upgrade.php
XoopsModules/news/trunk/news/archive.php
XoopsModules/news/trunk/news/article.php
XoopsModules/news/trunk/news/blocks/news_archives.php
XoopsModules/news/trunk/news/blocks/news_randomnews.php
XoopsModules/news/trunk/news/blocks/news_top.php
XoopsModules/news/trunk/news/class/class.newsstory.php
XoopsModules/news/trunk/news/class/class.newstopic.php
XoopsModules/news/trunk/news/class/class.sfiles.php
XoopsModules/news/trunk/news/class/tree.php
XoopsModules/news/trunk/news/docs/changelog.txt
XoopsModules/news/trunk/news/extra/modules/tag/plugin/news.php
XoopsModules/news/trunk/news/include/functions.php
XoopsModules/news/trunk/news/include/notification.inc.php
XoopsModules/news/trunk/news/include/search.inc.php
XoopsModules/news/trunk/news/include/update_function.php
XoopsModules/news/trunk/news/index.php
XoopsModules/news/trunk/news/language/english/modinfo.php
XoopsModules/news/trunk/news/makepdf.php
XoopsModules/news/trunk/news/ratenews.php
XoopsModules/news/trunk/news/sql/mysql.sql
XoopsModules/news/trunk/news/xoops_version.php
Added Paths:
-----------
XoopsModules/news/trunk/news/class/xoopsstory.php
XoopsModules/news/trunk/news/class/xoopstopic.php
XoopsModules/news/trunk/news/class/xoopstree.php
Removed Paths:
-------------
XoopsModules/news/trunk/news/fpdf/
Modified: XoopsModules/news/trunk/news/admin/amsimport.php
===================================================================
--- XoopsModules/news/trunk/news/admin/amsimport.php 2012-08-08 22:34:35 UTC (rev 10042)
+++ XoopsModules/news/trunk/news/admin/amsimport.php 2012-08-08 22:36:24 UTC (rev 10043)
@@ -85,7 +85,7 @@
$ams_links = $xoopsDB->prefix('ams_link');
$ams_rating = $xoopsDB->prefix('ams_rating');
// Retreive News tables names
- $news_stories_votedata = $xoopsDB->prefix('stories_votedata');
+ $news_stories_votedata = $xoopsDB->prefix('mod_news_stories_votedata');
// Misc
$comment_handler =& xoops_gethandler('comment');
$notification_handler =& xoops_gethandler('notification');
Modified: XoopsModules/news/trunk/news/admin/groupperms.php
===================================================================
--- XoopsModules/news/trunk/news/admin/groupperms.php 2012-08-08 22:34:35 UTC (rev 10042)
+++ XoopsModules/news/trunk/news/admin/groupperms.php 2012-08-08 22:36:24 UTC (rev 10043)
@@ -25,7 +25,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
include_once '../../../include/cp_header.php';
-include_once XOOPS_ROOT_PATH . '/class/xoopstopic.php';
+include_once XOOPS_ROOT_PATH.'/modules/news/class/xoopstopic.php';
include_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
include_once XOOPS_ROOT_PATH . '/modules/news/admin/functions.php';
@@ -61,7 +61,7 @@
}
$permform = new XoopsGroupPermForm($title_of_form, $module_id, $perm_name, $perm_desc,'admin/groupperms.php');
-$xt = new XoopsTopic($xoopsDB -> prefix('topics'));
+$xt = new MyXoopsTopic($xoopsDB -> prefix('mod_news_topics'));
$alltopics =& $xt->getTopicsList();
Modified: XoopsModules/news/trunk/news/admin/index.php
===================================================================
--- XoopsModules/news/trunk/news/admin/index.php 2012-08-08 22:34:35 UTC (rev 10042)
+++ XoopsModules/news/trunk/news/admin/index.php 2012-08-08 22:36:24 UTC (rev 10043)
@@ -26,7 +26,7 @@
// ------------------------------------------------------------------------ //
include_once '../../../include/cp_header.php';
include_once 'admin_header.php';
-include_once XOOPS_ROOT_PATH.'/class/xoopstopic.php';
+include_once XOOPS_ROOT_PATH.'/modules/news/class/xoopstopic.php';
include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
include_once XOOPS_ROOT_PATH.'/modules/news/config.php';
include_once XOOPS_ROOT_PATH.'/modules/news/class/class.newsstory.php';
@@ -38,12 +38,12 @@
include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
include_once XOOPS_ROOT_PATH.'/modules/news/admin/functions.php';
include_once XOOPS_ROOT_PATH.'/modules/news/include/functions.php';
-include_once XOOPS_ROOT_PATH.'/class/tree.php';
+include_once XOOPS_ROOT_PATH.'/modules/news/class/tree.php';
$dateformat=news_getmoduleoption('dateformat');
$myts =& MyTextSanitizer::getInstance();
$topicscount=0;
-$storiesTableName = $xoopsDB->prefix('stories');
+$storiesTableName = $xoopsDB->prefix('mod_news_stories');
if(!news_FieldExists('picture', $storiesTableName)) {
news_AddField('`picture` VARCHAR( 50 ) NOT NULL', $storiesTableName);
}
@@ -289,7 +289,7 @@
$topics_arr=array();
$xt = new NewsTopic();
$allTopics = $xt->getAllTopics(false); // The webmaster can see everything
- $topic_tree = new XoopsObjectTree($allTopics, 'topic_id', 'topic_pid');
+ $topic_tree = new MyXoopsObjectTree($allTopics, 'topic_id', 'topic_pid');
$topics_arr = $topic_tree->getAllChild(0);
if(count($topics_arr)) {
foreach ($topics_arr as $onetopic) {
@@ -385,7 +385,7 @@
$topics_arr=array();
$xt = new NewsTopic();
$allTopics = $xt->getAllTopics(false); // The webmaster can see everything
- $topic_tree = new XoopsObjectTree($allTopics, 'topic_id', 'topic_pid');
+ $topic_tree = new MyXoopsObjectTree($allTopics, 'topic_id', 'topic_pid');
$topics_arr = $topic_tree->getAllChild(0);
if(count($topics_arr)) {
foreach ($topics_arr as $onetopic) {
@@ -502,7 +502,7 @@
$topics_arr=array();
$xt = new NewsTopic();
$allTopics = $xt->getAllTopics(false); // The webmaster can see everything
- $topic_tree = new XoopsObjectTree($allTopics, 'topic_id', 'topic_pid');
+ $topic_tree = new MyXoopsObjectTree($allTopics, 'topic_id', 'topic_pid');
$topics_arr = $topic_tree->getAllChild(0);
if(count($topics_arr)) {
foreach ($topics_arr as $onetopic) {
@@ -646,7 +646,7 @@
$uploadirectory='/uploads/news/image';
$start = isset($_GET['start']) ? intval($_GET['start']) : 0;
- $xt = new XoopsTree($xoopsDB->prefix('topics'), 'topic_id', 'topic_pid');
+ $xt = new NewsTopic($xoopsDB->prefix('mod_news_topics'), 'topic_id', 'topic_pid');
$topics_arr = $xt->getChildTreeArray(0,'topic_title');
$totaltopics = count($topics_arr);
$class='';
@@ -674,7 +674,7 @@
$parent=' ';
if($topics_arr[$tmpcpt]['topic_pid']>0) {
- $xttmp = new XoopsTopic($xoopsDB->prefix('topics'),$topics_arr[$tmpcpt]['topic_pid']);
+ $xttmp = new MyXoopsTopic($xoopsDB->prefix('mod_news_topics'),$topics_arr[$tmpcpt]['topic_pid']);
$parent = $xttmp->topic_title();
unset($xttmp);
}
@@ -964,11 +964,11 @@
if (!isset($_POST['ok'])) {
xoops_cp_header();
echo '<h4>' . _AM_CONFIG . '</h4>';
- $xt = new XoopsTopic( $xoopsDB->prefix('topics'), intval($_GET['topic_id']));
+ $xt = new MyXoopsTopic( $xoopsDB->prefix('mod_news_topics'), intval($_GET['topic_id']));
xoops_confirm(array( 'op' => 'delTopic', 'topic_id' => intval($_GET['topic_id']), 'ok' => 1), 'index.php', _AM_WAYSYWTDTTAL . '<br />' . $xt->topic_title('S'));
} else {
xoops_cp_header();
- $xt = new XoopsTopic($xoopsDB->prefix('topics'), intval($_POST['topic_id']));
+ $xt = new MyXoopsTopic($xoopsDB->prefix('mod_news_topics'), intval($_POST['topic_id']));
if(isset($_SESSION['items_count'])) {
$_SESSION['items_count'] = -1;
}
@@ -1555,7 +1555,7 @@
case 'verifydb':
xoops_cp_header();
//news_adminmenu();
- $tbllist = $xoopsDB->prefix('stories').','.$xoopsDB->prefix('topics').','.$xoopsDB->prefix('stories_files').','.$xoopsDB->prefix('stories_votedata');
+ $tbllist = $xoopsDB->prefix('mod_news_stories').','.$xoopsDB->prefix('mod_news_topics').','.$xoopsDB->prefix('mod_news_stories_files').','.$xoopsDB->prefix('mod_news_stories_votedata');
$xoopsDB->queryF("OPTIMIZE TABLE ".$tbllist);
$xoopsDB->queryF("CHECK TABLE ".$tbllist);
$xoopsDB->queryF("ANALYZE TABLE ".$tbllist);
Modified: XoopsModules/news/trunk/news/admin/upgrade.php
===================================================================
--- XoopsModules/news/trunk/news/admin/upgrade.php 2012-08-08 22:34:35 UTC (rev 10042)
+++ XoopsModules/news/trunk/news/admin/upgrade.php 2012-08-08 22:36:24 UTC (rev 10043)
@@ -33,9 +33,9 @@
if (is_object($xoopsUser) && $xoopsUser->isAdmin($xoopsModule->mid())) {
$errors=0;
// 1) Create, if it does not exists, the stories_files table
- if(!news_TableExists($xoopsDB->prefix('stories_files')))
+ if(!news_TableExists($xoopsDB->prefix('mod_news_stories_files')))
{
- $sql = 'CREATE TABLE '.$xoopsDB->prefix('stories_files')." (
+ $sql = 'CREATE TABLE '.$xoopsDB->prefix('mod_news_stories_files')." (
fileid int(8) unsigned NOT NULL auto_increment,
filerealname varchar(255) NOT NULL default '',
storyid int(8) unsigned NOT NULL default '0',
@@ -53,7 +53,7 @@
}
// 2) Change the topic title's length, in the topics table
- $sql=sprintf('ALTER TABLE ' . $xoopsDB->prefix('topics') . ' CHANGE topic_title topic_title VARCHAR( 255 ) NOT NULL;');
+ $sql=sprintf('ALTER TABLE ' . $xoopsDB->prefix('mod_news_topics') . ' CHANGE topic_title topic_title VARCHAR( 255 ) NOT NULL;');
$result=$xoopsDB->queryF($sql);
if (!$result) {
echo '<br />' . _AM_NEWS_UPGRADEFAILED.' '._AM_NEWS_UPGRADEFAILED2;
@@ -61,26 +61,26 @@
}
// 2.1) Add the new fields to the topic table
- if (!news_FieldExists('menu',$xoopsDB->prefix('topics'))) {
- news_AddField("menu TINYINT( 1 ) DEFAULT '0' NOT NULL",$xoopsDB->prefix('topics'));
+ if (!news_FieldExists('menu',$xoopsDB->prefix('mod_news_topics'))) {
+ news_AddField("menu TINYINT( 1 ) DEFAULT '0' NOT NULL",$xoopsDB->prefix('mod_news_topics'));
}
- if (!news_FieldExists('topic_frontpage',$xoopsDB->prefix('topics'))) {
- news_AddField("topic_frontpage TINYINT( 1 ) DEFAULT '1' NOT NULL",$xoopsDB->prefix('topics'));
+ if (!news_FieldExists('topic_frontpage',$xoopsDB->prefix('mod_news_topics'))) {
+ news_AddField("topic_frontpage TINYINT( 1 ) DEFAULT '1' NOT NULL",$xoopsDB->prefix('mod_news_topics'));
}
- if (!news_FieldExists('topic_rssurl',$xoopsDB->prefix('topics'))) {
- news_AddField("topic_rssurl VARCHAR( 255 ) NOT NULL",$xoopsDB->prefix('topics'));
+ if (!news_FieldExists('topic_rssurl',$xoopsDB->prefix('mod_news_topics'))) {
+ news_AddField("topic_rssurl VARCHAR( 255 ) NOT NULL",$xoopsDB->prefix('mod_news_topics'));
}
- if (!news_FieldExists('topic_description',$xoopsDB->prefix('topics'))) {
- news_AddField("topic_description TEXT NOT NULL",$xoopsDB->prefix('topics'));
+ if (!news_FieldExists('topic_description',$xoopsDB->prefix('mod_news_topics'))) {
+ news_AddField("topic_description TEXT NOT NULL",$xoopsDB->prefix('mod_news_topics'));
}
- if (!news_FieldExists('topic_color',$xoopsDB->prefix('topics'))) {
- news_AddField("topic_color varchar(6) NOT NULL default '000000'",$xoopsDB->prefix('topics'));
+ if (!news_FieldExists('topic_color',$xoopsDB->prefix('mod_news_topics'))) {
+ news_AddField("topic_color varchar(6) NOT NULL default '000000'",$xoopsDB->prefix('mod_news_topics'));
}
// 3) If it does not exists, create the table stories_votedata
- if(!news_TableExists($xoopsDB->prefix('stories_votedata')))
+ if(!news_TableExists($xoopsDB->prefix('mod_news_stories_votedata')))
{
- $sql = 'CREATE TABLE '.$xoopsDB->prefix('stories_votedata')." (
+ $sql = 'CREATE TABLE '.$xoopsDB->prefix('mod_news_stories_votedata')." (
ratingid int(11) unsigned NOT NULL auto_increment,
storyid int(8) unsigned NOT NULL default '0',
ratinguser int(11) NOT NULL default '0',
@@ -99,29 +99,29 @@
}
// 4) Create the four new fields for the votes in the story table
- if (!news_FieldExists('rating',$xoopsDB->prefix('stories'))) {
- news_AddField("rating DOUBLE( 6, 4 ) DEFAULT '0.0000' NOT NULL",$xoopsDB->prefix('stories'));
+ if (!news_FieldExists('rating',$xoopsDB->prefix('mod_news_stories'))) {
+ news_AddField("rating DOUBLE( 6, 4 ) DEFAULT '0.0000' NOT NULL",$xoopsDB->prefix('mod_news_stories'));
}
- if (!news_FieldExists('votes',$xoopsDB->prefix('stories'))) {
- news_AddField("votes INT( 11 ) UNSIGNED DEFAULT '0' NOT NULL",$xoopsDB->prefix('stories'));
+ if (!news_FieldExists('votes',$xoopsDB->prefix('mod_news_stories'))) {
+ news_AddField("votes INT( 11 ) UNSIGNED DEFAULT '0' NOT NULL",$xoopsDB->prefix('mod_news_stories'));
}
- if (!news_FieldExists('keywords',$xoopsDB->prefix('stories'))) {
- news_AddField("keywords VARCHAR(255) NOT NULL",$xoopsDB->prefix('stories'));
+ if (!news_FieldExists('keywords',$xoopsDB->prefix('mod_news_stories'))) {
+ news_AddField("keywords VARCHAR(255) NOT NULL",$xoopsDB->prefix('mod_news_stories'));
}
- if (!news_FieldExists('description',$xoopsDB->prefix('stories'))) {
- news_AddField("description VARCHAR(255) NOT NULL",$xoopsDB->prefix('stories'));
+ if (!news_FieldExists('description',$xoopsDB->prefix('mod_news_stories'))) {
+ news_AddField("description VARCHAR(255) NOT NULL",$xoopsDB->prefix('mod_news_stories'));
}
- if (!news_FieldExists('pictureinfo',$xoopsDB->prefix('stories'))) {
- news_AddField("pictureinfo VARCHAR(255) NOT NULL",$xoopsDB->prefix('stories'));
+ if (!news_FieldExists('pictureinfo',$xoopsDB->prefix('mod_news_stories'))) {
+ news_AddField("pictureinfo VARCHAR(255) NOT NULL",$xoopsDB->prefix('mod_news_stories'));
}
- if (!news_FieldExists('subtitle',$xoopsDB->prefix('stories'))) {
- news_AddField("subtitle VARCHAR(255) NOT NULL",$xoopsDB->prefix('stories'));
+ if (!news_FieldExists('subtitle',$xoopsDB->prefix('mod_news_stories'))) {
+ news_AddField("subtitle VARCHAR(255) NOT NULL",$xoopsDB->prefix('mod_news_stories'));
}
// 5) Add some indexes to the topics table
- $sql=sprintf('ALTER TABLE ' . $xoopsDB->prefix('topics') . " ADD INDEX ( `topic_title` );");
+ $sql=sprintf('ALTER TABLE ' . $xoopsDB->prefix('mod_news_topics') . " ADD INDEX ( `topic_title` );");
$result=$xoopsDB->queryF($sql);
- $sql=sprintf('ALTER TABLE ' . $xoopsDB->prefix('topics') . " ADD INDEX ( `menu` );");
+ $sql=sprintf('ALTER TABLE ' . $xoopsDB->prefix('mod_news_topics') . " ADD INDEX ( `menu` );");
$result=$xoopsDB->queryF($sql);
Modified: XoopsModules/news/trunk/news/archive.php
===================================================================
--- XoopsModules/news/trunk/news/archive.php 2012-08-08 22:34:35 UTC (rev 10042)
+++ XoopsModules/news/trunk/news/archive.php 2012-08-08 22:36:24 UTC (rev 10043)
@@ -111,7 +111,7 @@
$useroffset = $xoopsConfig['default_TZ'];
}
}
-$result = $xoopsDB->query('SELECT published FROM '.$xoopsDB->prefix('stories').' WHERE (published>0 AND published<='.time().') AND (expired = 0 OR expired <= '.time().') ORDER BY published DESC');
+$result = $xoopsDB->query('SELECT published FROM '.$xoopsDB->prefix('mod_news_stories').' WHERE (published>0 AND published<='.time().') AND (expired = 0 OR expired <= '.time().') ORDER BY published DESC');
if (!$result) {
echo _ERRORS;
exit();
Modified: XoopsModules/news/trunk/news/article.php
===================================================================
--- XoopsModules/news/trunk/news/article.php 2012-08-08 22:34:35 UTC (rev 10042)
+++ XoopsModules/news/trunk/news/article.php 2012-08-08 22:36:24 UTC (rev 10043)
@@ -120,7 +120,7 @@
include_once '../../mainfile.php';
include_once XOOPS_ROOT_PATH.'/modules/news/class/class.newsstory.php';
include_once XOOPS_ROOT_PATH.'/modules/news/class/class.sfiles.php';
-include_once XOOPS_ROOT_PATH.'/class/xoopstree.php';
+include_once XOOPS_ROOT_PATH.'/modules/news/class/tree.php';
include_once XOOPS_ROOT_PATH.'/modules/news/include/functions.php';
include_once XOOPS_ROOT_PATH.'/modules/news/class/class.newstopic.php';
include_once XOOPS_ROOT_PATH.'/modules/news/class/keyhighlighter.class.php';
@@ -343,7 +343,7 @@
* Uncomment the code to be able to use it
*/
if($cfg['create_clickable_path']) {
- $mytree = new XoopsTree($xoopsDB->prefix('topics'),'topic_id','topic_pid');
+ $mytree = new MyXoopsObjectTree($xoopsDB->prefix('mod_news_topics'),'topic_id','topic_pid');
$topicpath = $mytree->getNicePathFromId($article->topicid(), 'topic_title', 'index.php?op=1');
$xoopsTpl->assign('topic_path', $topicpath);
unset($mytree);
Modified: XoopsModules/news/trunk/news/blocks/news_archives.php
===================================================================
--- XoopsModules/news/trunk/news/blocks/news_archives.php 2012-08-08 22:34:35 UTC (rev 10042)
+++ XoopsModules/news/trunk/news/blocks/news_archives.php 2012-08-08 22:36:24 UTC (rev 10043)
@@ -60,7 +60,7 @@
} else {
$ending_date = time();
}
- $sql = "SELECT distinct(FROM_UNIXTIME(published,'%Y-%m')) as published FROM ".$xoopsDB->prefix('stories').' WHERE published>='.$starting_date .' AND published<='.$ending_date.' ORDER BY published '.$sort_order;
+ $sql = "SELECT distinct(FROM_UNIXTIME(published,'%Y-%m')) as published FROM ".$xoopsDB->prefix('mod_news_stories').' WHERE published>='.$starting_date .' AND published<='.$ending_date.' ORDER BY published '.$sort_order;
$result = $xoopsDB->query($sql);
if (!$result) {
return '';
Modified: XoopsModules/news/trunk/news/blocks/news_randomnews.php
===================================================================
--- XoopsModules/news/trunk/news/blocks/news_randomnews.php 2012-08-08 22:34:35 UTC (rev 10042)
+++ XoopsModules/news/trunk/news/blocks/news_randomnews.php 2012-08-08 22:36:24 UTC (rev 10043)
@@ -118,8 +118,8 @@
$form .= _MB_NEWS_TEASER." <input type='text' name='options[]' value='".$options[3]."' />"._MB_NEWS_LENGTH;
$form .= '<br /><br />'._MB_SPOTLIGHT_TOPIC."<br /><select id='options[4]' name='options[]' multiple='multiple'>";
- include_once XOOPS_ROOT_PATH.'/class/xoopsstory.php';
- $xt = new XoopsTopic($xoopsDB->prefix('topics'));
+ include_once XOOPS_ROOT_PATH.'/modules/news/class/xoopsstory.php';
+ $xt = new MyXoopsTopic($xoopsDB->prefix('mod_news_topics'));
$alltopics = $xt->getTopicsList();
$alltopics[0]['title'] = _MB_SPOTLIGHT_ALL_TOPICS;
ksort($alltopics);
Modified: XoopsModules/news/trunk/news/blocks/news_top.php
===================================================================
--- XoopsModules/news/trunk/news/blocks/news_top.php 2012-08-08 22:34:35 UTC (rev 10042)
+++ XoopsModules/news/trunk/news/blocks/news_top.php 2012-08-08 22:36:24 UTC (rev 10043)
@@ -665,8 +665,8 @@
$form .= '<br /><br />'._MB_SPOTLIGHT_TOPIC."<br /><select name='options[]' multiple='multiple'>";
include_once XOOPS_ROOT_PATH.'/modules/news/class/class.newstopic.php';
$topics_arr=array();
- include_once XOOPS_ROOT_PATH . '/class/xoopstree.php';
- $xt = new XoopsTree($xoopsDB->prefix('topics'), 'topic_id', 'topic_pid');
+ include_once XOOPS_ROOT_PATH . '/modules/news/class/xoopstree.php';
+ $xt = new MyXoopsTree($xoopsDB->prefix('mod_news_topics'), 'topic_id', 'topic_pid');
$topics_arr = $xt->getChildTreeArray(0,'topic_title');
$size = count($options);
foreach ($topics_arr as $onetopic) {
Modified: XoopsModules/news/trunk/news/class/class.newsstory.php
===================================================================
--- XoopsModules/news/trunk/news/class/class.newsstory.php 2012-08-08 22:34:35 UTC (rev 10042)
+++ XoopsModules/news/trunk/news/class/class.newsstory.php 2012-08-08 22:36:24 UTC (rev 10043)
@@ -28,11 +28,11 @@
die('XOOPS root path not defined');
}
-include_once XOOPS_ROOT_PATH.'/class/xoopsstory.php';
+include_once XOOPS_ROOT_PATH.'/modules/news/class/xoopsstory.php';
include_once XOOPS_ROOT_PATH.'/include/comment_constants.php';
include_once XOOPS_ROOT_PATH.'/modules/news/include/functions.php';
-class NewsStory extends XoopsStory
+class NewsStory extends MyXoopsStory
{
public $newstopic; // XoopsTopic object
public $rating; // News rating
@@ -52,8 +52,8 @@
function NewsStory($storyid=-1)
{
$this->db =& XoopsDatabaseFactory::getDatabaseConnection();
- $this->table = $this->db->prefix('stories');
- $this->topicstable = $this->db->prefix('topics');
+ $this->table = $this->db->prefix('mod_news_stories');
+ $this->topicstable = $this->db->prefix('mod_news_topics');
if (is_array($storyid)) {
$this->makeStory($storyid);
} elseif($storyid != -1) {
@@ -67,7 +67,7 @@
function GetCountStoriesPublishedBefore($timestamp, $expired, $topicslist='')
{
$db =& XoopsDatabaseFactory::getDatabaseConnection();
- $sql = 'SELECT count(*) as cpt FROM '.$db->prefix('stories').' WHERE published <=' . $timestamp;
+ $sql = 'SELECT count(*) as cpt FROM '.$db->prefix('mod_news_stories').' WHERE published <=' . $timestamp;
if($expired) {
$sql .=' AND (expired>0 AND expired<='.time().')';
}
@@ -85,7 +85,7 @@
*/
function getStory($storyid)
{
- $sql = 'SELECT s.*, t.* FROM '.$this->table.' s, '.$this->db->prefix('topics').' t WHERE (storyid='.intval($storyid).') AND (s.topicid=t.topic_id)';
+ $sql = 'SELECT s.*, t.* FROM '.$this->table.' s, '.$this->db->prefix('mod_news_topics').' t WHERE (storyid='.intval($storyid).') AND (s.topicid=t.topic_id)';
$array = $this->db->fetchArray($this->db->query($sql));
$this->makeStory($array);
}
@@ -99,9 +99,9 @@
global $xoopsModule;
$mid= $xoopsModule->getVar('mid');
$db =& XoopsDatabaseFactory::getDatabaseConnection();
- $prefix = $db->prefix('stories');
- $vote_prefix = $db->prefix('stories_votedata');
- $files_prefix = $db->prefix('stories_files');
+ $prefix = $db->prefix('mod_news_stories');
+ $vote_prefix = $db->prefix('mod_news_stories_votedata');
+ $files_prefix = $db->prefix('mod_news_stories_files');
$sql = 'SELECT storyid FROM '.$prefix.' WHERE published <=' . $timestamp;
if($expired) {
$sql .=' (AND expired>0 AND expired<='.time().')';
@@ -134,10 +134,10 @@
$ret = array();
$storyid = intval($storyid);
if($next) {
- $sql = 'SELECT storyid, title FROM '.$db->prefix('stories').' WHERE (published > 0 AND published <= '.time().') AND (expired = 0 OR expired > '.time().') AND storyid > '.$storyid;
+ $sql = 'SELECT storyid, title FROM '.$db->prefix('mod_news_stories').' WHERE (published > 0 AND published <= '.time().') AND (expired = 0 OR expired > '.time().') AND storyid > '.$storyid;
$orderBy = ' ORDER BY storyid ASC';
} else {
- $sql = 'SELECT storyid, title FROM '.$db->prefix('stories').' WHERE (published > 0 AND published <= '.time().') AND (expired = 0 OR expired > '.time().') AND storyid < '.$storyid;
+ $sql = 'SELECT storyid, title FROM '.$db->prefix('mod_news_stories').' WHERE (published > 0 AND published <= '.time().') AND (expired = 0 OR expired > '.time().') AND storyid < '.$storyid;
$orderBy = ' ORDER BY storyid DESC';
}
if($checkRight) {
@@ -179,7 +179,7 @@
$db =& XoopsDatabaseFactory::getDatabaseConnection();
$myts =& MyTextSanitizer::getInstance();
$ret = array();
- $sql = 'SELECT s.*, t.* FROM '.$db->prefix('stories').' s, '. $db->prefix('topics').' t WHERE (s.published > 0 AND s.published <= '.time().') AND (s.expired = 0 OR s.expired > '.time().') AND (s.topicid=t.topic_id) ';
+ $sql = 'SELECT s.*, t.* FROM '.$db->prefix('mod_news_stories').' s, '. $db->prefix('mod_news_topics').' t WHERE (s.published > 0 AND s.published <= '.time().') AND (s.expired = 0 OR s.expired > '.time().') AND (s.topicid=t.topic_id) ';
if ($topic != 0) {
if (!is_array($topic)) {
if($checkRight) {
@@ -242,7 +242,7 @@
$db =& XoopsDatabaseFactory::getDatabaseConnection();
$myts =& MyTextSanitizer::getInstance();
$ret = array();
- $sql = 'SELECT s.*, t.* FROM '.$db->prefix('stories').' s, ' .$db->prefix('topics').' t WHERE (s.topicid=t.topic_id) AND (s.published > ' . $publish_start . ' AND s.published <= ' . $publish_end . ') AND (expired = 0 OR expired > '.time().') ';
+ $sql = 'SELECT s.*, t.* FROM '.$db->prefix('mod_news_stories').' s, ' .$db->prefix('mod_news_topics').' t WHERE (s.topicid=t.topic_id) AND (s.published > ' . $publish_start . ' AND s.published <= ' . $publish_end . ') AND (expired = 0 OR expired > '.time().') ';
if($checkRight) {
$topics = news_MygetItemIds('news_view');
@@ -283,7 +283,7 @@
$myts =& MyTextSanitizer::getInstance();
$ret = array();
$tdate = mktime(0,0,0,date('n'),date('j'),date('Y'));
- $sql = 'SELECT s.*, t.* FROM '.$db->prefix('stories').' s, '. $db->prefix('topics').' t WHERE (s.topicid=t.topic_id) AND (published > '.$tdate.' AND published < '.time().') AND (expired > '.time().' OR expired = 0) ';
+ $sql = 'SELECT s.*, t.* FROM '.$db->prefix('mod_news_stories').' s, '. $db->prefix('mod_news_topics').' t WHERE (s.topicid=t.topic_id) AND (published > '.$tdate.' AND published < '.time().') AND (expired > '.time().' OR expired = 0) ';
if ( intval($topic) != 0 ) {
if (!is_array($topic)) {
@@ -334,8 +334,8 @@
$db =& XoopsDatabaseFactory::getDatabaseConnection();
$myts =& MyTextSanitizer::getInstance();
$ret = array();
- $tblstory=$db->prefix('stories');
- $tbltopics=$db->prefix('topics');
+ $tblstory=$db->prefix('mod_news_stories');
+ $tbltopics=$db->prefix('mod_news_topics');
$sql = 'SELECT ' . $tblstory . '.*, '. $tbltopics . '.topic_title, '.$tbltopics.'.topic_color FROM '.$tblstory.','.$tbltopics .' WHERE ('.$tblstory.'.topicid='.$tbltopics.'.topic_id) AND (published > 0 AND published <= '.time().') AND (expired = 0 OR expired > '.time().')';
$sql .= ' AND uid='.intval($uid);
@@ -388,7 +388,7 @@
$db =& XoopsDatabaseFactory::getDatabaseConnection();
$myts =& MyTextSanitizer::getInstance();
$ret = array();
- $sql = 'SELECT * FROM '.$db->prefix('stories').' WHERE expired <= '.time().' AND expired > 0';
+ $sql = 'SELECT * FROM '.$db->prefix('mod_news_stories').' WHERE expired <= '.time().' AND expired > 0';
if ( !empty($topic) ) {
$sql .= ' AND topicid='.intval($topic).' AND (ihome=1 OR ihome=0)';
} else {
@@ -419,7 +419,7 @@
$db =& XoopsDatabaseFactory::getDatabaseConnection();
$myts =& MyTextSanitizer::getInstance();
$ret = array();
- $sql = 'SELECT * FROM '.$db->prefix('stories').' WHERE published > '.time().' ORDER BY published ASC';
+ $sql = 'SELECT * FROM '.$db->prefix('mod_news_stories').' WHERE published > '.time().' ORDER BY published ASC';
$result = $db->query($sql,intval($limit),intval($start));
while ( $myrow = $db->fetchArray($result) ) {
if ( $asobject ) {
@@ -456,7 +456,7 @@
}
$criteria->add($criteria2);
}
- $sql = 'SELECT s.*, t.* FROM '.$db->prefix('stories').' s, '.$db->prefix('topics').' t ';
+ $sql = 'SELECT s.*, t.* FROM '.$db->prefix('mod_news_stories').' s, '.$db->prefix('mod_news_topics').' t ';
$sql .= ' '.$criteria->renderWhere().' AND (s.topicid=t.topic_id) ORDER BY created DESC';
$result = $db->query($sql,intval($limit),intval($start));
while ( $myrow = $db->fetchArray($result) ) {
@@ -479,7 +479,7 @@
function getAllStoriesCount($storytype=1, $checkRight = false)
{
$db =& XoopsDatabaseFactory::getDatabaseConnection();
- $sql = 'SELECT count(*) as cpt FROM '.$db->prefix('stories').' WHERE ';
+ $sql = 'SELECT count(*) as cpt FROM '.$db->prefix('mod_news_stories').' WHERE ';
switch($storytype) {
case 1: // Expired
$sql .='(expired <= '.time().' AND expired >0)';
@@ -516,7 +516,7 @@
{
$ret = array();
$db =& XoopsDatabaseFactory::getDatabaseConnection();
- $sql = 'SELECT * FROM '.$db->prefix('stories').' WHERE topicid='.intval($topicid).' ORDER BY published DESC';
+ $sql = 'SELECT * FROM '.$db->prefix('mod_news_stories').' WHERE topicid='.intval($topicid).' ORDER BY published DESC';
$result = $db->query($sql, intval($limit), 0);
while( $myrow = $db->fetchArray($result) ){
$ret[] = new NewsStory($myrow);
@@ -531,7 +531,7 @@
function countPublishedByTopic($topicid=0, $checkRight = false)
{
$db =& XoopsDatabaseFactory::getDatabaseConnection();
- $sql = 'SELECT COUNT(*) FROM '.$db->prefix('stories').' WHERE published > 0 AND published <= '.time().' AND (expired = 0 OR expired > '.time().')';
+ $sql = 'SELECT COUNT(*) FROM '.$db->prefix('mod_news_stories').' WHERE published > 0 AND published <= '.time().' AND (expired = 0 OR expired > '.time().')';
if ( !empty($topicid) ) {
$sql .= ' AND topicid='.intval($topicid);
} else {
@@ -832,7 +832,7 @@
$myts =& MyTextSanitizer::getInstance();
if($usetopicsdef) { // We firt begin by exporting topics definitions
// Before all we must know wich topics to export
- $sql = 'SELECT distinct topicid FROM '.$this->db->prefix('stories').' WHERE (published >=' . $fromdate . ' AND published <= ' . $todate .')';
+ $sql = 'SELECT distinct topicid FROM '.$this->db->prefix('mod_news_stories').' WHERE (published >=' . $fromdate . ' AND published <= ' . $todate .')';
if(strlen(trim($topicslist))>0) {
$sql .=' AND topicid IN ('.$topicslist.')';
}
@@ -843,7 +843,7 @@
}
// Now we can search for the stories
- $sql = 'SELECT s.*, t.* FROM '.$this->table.' s, '.$this->db->prefix('topics').' t WHERE (s.topicid=t.topic_id) AND (s.published >=' . $fromdate . ' AND s.published <= ' . $todate .')';
+ $sql = 'SELECT s.*, t.* FROM '.$this->table.' s, '.$this->db->prefix('mod_news_topics').' t WHERE (s.topicid=t.topic_id) AND (s.published >=' . $fromdate . ' AND s.published <= ' . $todate .')';
if(strlen(trim($topicslist))>0) {
$sql .=' AND topicid IN ('.$topicslist.')';
}
@@ -1006,7 +1006,7 @@
{
$db =& XoopsDatabaseFactory::getDatabaseConnection();
$ret = $rand_keys = $ret3 = array();
- $sql = 'SELECT storyid FROM '.$db->prefix('stories').' WHERE (published > 0 AND published <= '.time().') AND (expired = 0 OR expired > '.time().')';
+ $sql = 'SELECT storyid FROM '.$db->prefix('mod_news_stories').' WHERE (published > 0 AND published <= '.time().') AND (expired = 0 OR expired > '.time().')';
if ($topic != 0) {
if (!is_array($topic)) {
if($checkRight) {
@@ -1077,9 +1077,9 @@
{
$ret=array();
$db =& XoopsDatabaseFactory::getDatabaseConnection();
- $tbls=$db->prefix('stories');
- $tblt=$db->prefix('topics');
- $tblf=$db->prefix('stories_files');
+ $tbls=$db->prefix('mod_news_stories');
+ $tblt=$db->prefix('mod_news_topics');
+ $tblf=$db->prefix('mod_news_stories_files');
$db =& XoopsDatabaseFactory::getDatabaseConnection();
// Number of stories per topic, including expired and non published stories
@@ -1202,7 +1202,7 @@
function GetOlderRecentNews(&$older, &$recent)
{
$db =& XoopsDatabaseFactory::getDatabaseConnection();
- $sql = 'SELECT min(published) as minpublish, max(published) as maxpublish FROM '.$db->prefix('stories');
+ $sql = 'SELECT min(published) as minpublish, max(published) as maxpublish FROM '.$db->prefix('mod_news_stories');
$result = $db->query($sql);
if(!$result) {
$older = $recent = 0;
@@ -1219,7 +1219,7 @@
{
$db =& XoopsDatabaseFactory::getDatabaseConnection();
$ret = array();
- $sql = 'SELECT distinct(uid) as uid FROM '.$db->prefix('stories').' WHERE (published > 0 AND published <= '.time().') AND (expired = 0 OR expired > '.time().')';
+ $sql = 'SELECT distinct(uid) as uid FROM '.$db->prefix('mod_news_stories').' WHERE (published > 0 AND published <= '.time().') AND (expired = 0 OR expired > '.time().')';
if($checkRight) {
$topics = news_MygetItemIds('news_view');
if(count($topics)>0) {
@@ -1346,7 +1346,7 @@
$db =& XoopsDatabaseFactory::getDatabaseConnection();
$myts =& MyTextSanitizer::getInstance();
$ret = array();
- $sql = 'SELECT s.*, t.* FROM '.$db->prefix('stories').' s, '. $db->prefix('topics').' t WHERE ';
+ $sql = 'SELECT s.*, t.* FROM '.$db->prefix('mod_news_stories').' s, '. $db->prefix('mod_news_topics').' t WHERE ';
if(is_array($ids) && count($ids) > 0) {
array_walk($ids, 'intval');
}
Modified: XoopsModules/news/trunk/news/class/class.newstopic.php
===================================================================
--- XoopsModules/news/trunk/news/class/class.newstopic.php 2012-08-08 22:34:35 UTC (rev 10042)
+++ XoopsModules/news/trunk/news/class/class.newstopic.php 2012-08-08 22:36:24 UTC (rev 10043)
@@ -28,11 +28,12 @@
die("XOOPS root path not defined");
}
-include_once XOOPS_ROOT_PATH."/class/xoopsstory.php";
-include_once XOOPS_ROOT_PATH."/class/xoopstree.php";
+include_once XOOPS_ROOT_PATH."/modules/news/class/xoopsstory.php";
+include_once XOOPS_ROOT_PATH."/modules/news/class/xoopstopic.php";
+include_once XOOPS_ROOT_PATH."/modules/news/class/tree.php";
include_once XOOPS_ROOT_PATH."/modules/news/include/functions.php";
-class NewsTopic extends XoopsTopic
+class NewsTopic extends MyXoopsTopic
{
var $menu;
var $topic_description;
@@ -43,7 +44,7 @@
function NewsTopic($topicid=0)
{
$this->db =& XoopsDatabaseFactory::getDatabaseConnection();
- $this->table = $this->db->prefix("topics");
+ $this->table = $this->db->prefix("mod_news_topics");
if ( is_array($topicid) ) {
$this->makeTopic($topicid);
} elseif ( $topicid != 0 ) {
@@ -184,7 +185,7 @@
{
$topics_arr = array();
$db =& XoopsDatabaseFactory::getDatabaseConnection();
- $table = $db->prefix('topics');
+ $table = $db->prefix('mod_news_topics');
$sql = "SELECT * FROM ".$table;
if ($checkRight) {
$topics = news_MygetItemIds($permission);
@@ -212,7 +213,7 @@
function getNewsCountByTopic()
{
$ret=array();
- $sql="SELECT count(storyid) as cpt, topicid FROM ".$this->db->prefix('stories')." WHERE (published > 0 AND published <= ".time().") AND (expired = 0 OR expired > ".time().") GROUP BY topicid";
+ $sql="SELECT count(storyid) as cpt, topicid FROM ".$this->db->prefix('mod_news_stories')." WHERE (published > 0 AND published <= ".time().") AND (expired = 0 OR expired > ".time().") GROUP BY topicid";
$result = $this->db->query($sql);
while ($row = $this->db->fetchArray($result)) {
$ret[$row["topicid"]]=$row["cpt"];
@@ -226,7 +227,7 @@
function getTopicMiniStats($topicid)
{
$ret=array();
- $sql="SELECT count(storyid) as cpt1, sum(counter) as cpt2 FROM ".$this->db->prefix('stories')." WHERE (topicid=" . $topicid.") AND (published>0 AND published <= ".time().") AND (expired = 0 OR expired > ".time().")";
+ $sql="SELECT count(storyid) as cpt1, sum(counter) as cpt2 FROM ".$this->db->prefix('mod_news_stories')." WHERE (topicid=" . $topicid.") AND (published>0 AND published <= ".time().") AND (expired = 0 OR expired > ".time().")";
$result = $this->db->query($sql);
$row = $this->db->fetchArray($result);
$ret['count']=$row["cpt1"];
@@ -299,7 +300,7 @@
}
if ( $this->use_permission == true ) {
- $xt = new XoopsTree($this->table, "topic_id", "topic_pid");
+ $xt = new MyXoopsTree($this->table, "topic_id", "topic_pid");
$parent_topics = $xt->getAllParentId($this->topic_id);
if ( !empty($this->m_groups) && is_array($this->m_groups) ){
foreach ( $this->m_groups as $m_g ) {
Modified: XoopsModules/news/trunk/news/class/class.sfiles.php
===================================================================
--- XoopsModules/news/trunk/news/class/class.sfiles.php 2012-08-08 22:34:35 UTC (rev 10042)
+++ XoopsModules/news/trunk/news/class/class.sfiles.php 2012-08-08 22:36:24 UTC (rev 10043)
@@ -44,7 +44,7 @@
function sFiles($fileid=-1)
{
$this->db =& XoopsDatabaseFactory::getDatabaseConnection();
- $this->table = $this->db->prefix("stories_files");
+ $this->table = $this->db->prefix("mod_news_stories_files");
$this->storyid = 0;
$this->filerealname = "";
$this->date = 0;
Modified: XoopsModules/news/trunk/news/class/tree.php
===================================================================
--- XoopsModules/news/trunk/news/class/tree.php 2012-08-08 22:34:35 UTC (rev 10042)
+++ XoopsModules/news/trunk/news/class/tree.php 2012-08-08 22:36:24 UTC (rev 10043)
@@ -58,9 +58,10 @@
* @param string $parentId field name of parent object ID
* @param string $rootId field name of root object ID
**/
- function MyXoopsObjectTree(&$objectArr, $myId, $parentId, $rootId = null)
+ function __construct(&$objectArr, $myId, $parentId, $rootId = null)
{
- $this->_objects =& $objectArr;
+ //$this->db = &XoopsDatabaseFactory::getDatabaseConnection();
+ $this->_objects =& $objectArr;
$this->_myId = $myId;
$this->_parentId = $parentId;
if (isset($rootId)) {
@@ -260,5 +261,34 @@
return $ret;
}
+ /**
+ * Enter description here...
+ *
+ * @param unknown_type $sel_id
+ * @param unknown_type $order
+ * @param unknown_type $parray
+ * @param unknown_type $r_prefix
+ * @return unknown
+ */
+// function getChildTreeArray($sel_id = 0, $order = "", $parray = array(), $r_prefix = "")
+// {
+// $sel_id = intval($sel_id);
+// $sql = "SELECT * FROM " . $this->table . " WHERE " . $this->pid . "=" . $sel_id . "";
+// if ($order != "") {
+// $sql .= " ORDER BY $order";
+// }
+// $result = $this->db->query($sql);
+// $count = $this->db->getRowsNum($result);
+// if ($count == 0) {
+// return $parray;
+// }
+// while ($row = $this->db->fetchArray($result)) {
+// $row['prefix'] = $r_prefix . ".";
+// array_push($parray, $row);
+// $parray = $this->getChildTreeArray($row[$this->id], $order, $parray, $row['prefix']);
+// }
+// return $parray;
+// }
+
}
?>
\ No newline at end of file
Added: XoopsModules/news/trunk/news/class/xoopsstory.php
===================================================================
--- XoopsModules/news/trunk/news/class/xoopsstory.php (rev 0)
+++ XoopsModules/news/trunk/news/class/xoopsstory.php 2012-08-08 22:36:24 UTC (rev 10043)
@@ -0,0 +1,422 @@
+<?php
+/**
+ * XOOPS news story
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package kernel
+ * @since 2.0.0
+ * @author Kazumi Ono (AKA onokazu) http://www.myweb.ne.jp/, http://jp.xoops.org/
+ * @version $Id: xoopsstory.php 8066 2011-11-06 05:09:33Z beckmi $
+ * @deprecated
+ */
+
+if (!defined('XOOPS_ROOT_PATH')) {
+ exit();
+}
+//$GLOBALS['xoopsLogger']->addDeprecated("'/class/xoopsstory.php' is deprecated since XOOPS 2.5.4, please create your own class instead.");
+include_once XOOPS_ROOT_PATH."/modules/news/class/xoopstopic.php";
+include_once XOOPS_ROOT_PATH."/kernel/user.php";
+
+class MyXoopsStory
+{
+ var $table;
+ var $storyid;
+ var $topicid;
+ var $uid;
+ var $title;
+ var $hometext;
+ var $bodytext="";
+ var $counter;
+ var $created;
+ var $published;
+ var $expired;
+ var $hostname;
+ var $nohtml=0;
+ var $nosmiley=0;
+ var $ihome=0;
+ var $notifypub=0;
+ var $type;
+ var $approved;
+ var $topicdisplay;
+ var $topicalign;
+ var $db;
+ var $topicstable;
+ var $comments;
+
+ function Story($storyid=-1)
+ {
+ $this->db =& XoopsDatabaseFactory::getDatabaseConnection();
+ $this->table = "";
+ $this->topicstable = "";
+ if ( is_array($storyid) ) {
+ $this->makeStory($storyid);
+ } elseif ( $storyid != -1 ) {
+ $this->getStory(intval($storyid));
+ }
+ }
+
+ function setStoryId($value)
+ {
+ $this->storyid = intval($value);
+ }
+
+ function setTopicId($value)
+ {
+ $this->topicid = intval($value);
+ }
+
+ function setUid($value)
+ {
+ $this->uid = intval($value);
+ }
+
+ function setTitle($value)
+ {
+ $this->title = $value;
+ }
+
+ function setHometext($value)
+ {
+ $this->hometext = $value;
+ }
+
+ function setBodytext($value)
+ {
+ $this->bodytext = $value;
+ }
+
+ function setPublished($value)
+ {
+ $this->published = intval($value);
+ }
+
+ function setExpired($value)
+ {
+ $this->expired = intval($value);
+ }
+
+ function setHostname($value)
+ {
+ $this->hostname = $value;
+ }
+
+ function setNohtml($value=0)
+ {
+ $this->nohtml = $value;
+ }
+
+ function setNosmiley($value=0)
+ {
+ $this->nosmiley = $value;
+ }
+
+ function setIhome($value)
+ {
+ $this->ihome = $value;
+ }
+
+ function setNotifyPub($value)
+ {
+ $this->notifypub = $value;
+ }
+
+ function setType($value)
+ {
+ $this->type = $value;
+ }
+
+ function setApproved($value)
+ {
+ $this->approved = intval($value);
+ }
+
+ function setTopicdisplay($value)
+ {
+ $this->topicdisplay = $value;
+ }
+
+ function setTopicalign($value)
+ {
+ $this->topicalign = $value;
+ }
+
+ function setComments($value)
+ {
+ $this->comments = intval($value);
+ }
+
+ function store($approved=false)
+ {
+ //$newpost = 0;
+ $myts =& MyTextSanitizer::getInstance();
+ $title =$myts->censorString($this->title);
+ $hometext =$myts->censorString($this->hometext);
+ $bodytext =$myts->censorString($this->bodytext);
+ $title = $myts->addSlashes($title);
+ $hometext = $myts->addSlashes($hometext);
+ $bodytext = $myts->addSlashes($bodytext);
+ if (!isset($this->nohtml) || $this->nohtml != 1) {
+ $this->nohtml = 0;
+ }
+ if (!isset($this->nosmiley) || $this->nosmiley != 1) {
+ $this->nosmiley = 0;
+ }
+ if (!isset($this->notifypub) || $this->notifypub != 1) {
+ $this->notifypub = 0;
+ }
+ if (!isset($this->topicdisplay) || $this->topicdisplay != 0) {
+ $this->topicdisplay = 1;
+ }
+ $expired = !empty($this->expired) ? $this->expired : 0;
+ if (!isset($this->storyid)) {
+ //$newpost = 1;
+ $newstoryid = $this->db->genId($this->table."_storyid_seq");
+ $created = time();
+ $published = ($this->approved) ? $this->published : 0;
+
+ $sql = sprintf("INSERT INTO %s (storyid, uid, title, created, published, expired, hostname, nohtml, nosmiley, hometext, bodytext, counter, topicid, ihome, notifypub, story_type, topicdisplay, topicalign, comments) VALUES (%u, %u, '%s', %u, %u, %u, '%s', %u, %u, '%s', '%s', %u, %u, %u, %u, '%s', %u, '%s', %u)", $this->table, $newstoryid, $this->uid, $title, $created, $published, $expired, $this->hostname, $this->nohtml, $this->nosmiley, $hometext, $bodytext, 0, $this->topicid, $this->ihome, $this->notifypub, $this->type, $this->topicdisplay, $this->topicalign, $this->comments);
+ } else {
+ if ($this->approved) {
+ $sql = sprintf("UPDATE %s SET title = '%s', published = %u, expired = %u, nohtml = %u, nosmiley = %u, hometext = '%s', bodytext = '%s', topicid = %u, ihome = %u, topicdisplay = %u, topicalign = '%s', comments = %u WHERE storyid = %u", $this->table, $title, $this->published, $expired, $this->nohtml, $this->nosmiley, $hometext, $bodytext, $this->topicid, $this->ihome, $this->topicdisplay, $this->topicalign, $this->comments, $this->storyid);
+ } else {
+ $sql = sprintf("UPDATE %s SET title = '%s', expired = %u, nohtml = %u, nosmiley = %u, hometext = '%s', bodytext = '%s', topicid = %u, ihome = %u, topicdisplay = %u, topicalign = '%s', comments = %u WHERE storyid = %u", $this->table, $title, $expired, $this->nohtml, $this->nosmiley, $hometext, $bodytext, $this->topicid, $this->ihome, $this->topicdisplay, $this->topicalign, $this->comments, $this->storyid);
+ }
+ $newstoryid = $this->storyid;
+ }
+ if (!$result = $this->db->query($sql)) {
+ return false;
+ }
+ if (empty($newstoryid)) {
+ $newstoryid = $this->db->getInsertId();
+ $this->storyid = $newstoryid;
+ }
+ return $newstoryid;
+ }
+
+ function getStory($storyid)
+ {
+ $storyid = intval($storyid);
+ $sql = "SELECT * FROM ".$this->table." WHERE storyid=" . $storyid . "";
+ $array = $this->db->fetchArray($this->db->query($sql));
+ $this->makeStory($array);
+ }
+
+ function makeStory($array)
+ {
+ foreach ($array as $key => $value){
+ $this->$key = $value;
+ }
+ }
+
+ function delete()
+ {
+ $sql = sprintf("DELETE FROM %s WHERE storyid = %u", $this->table, $this->storyid);
+ if (!$result = $this->db->query($sql)) {
+ return false;
+ }
+ return true;
+ }
+
+ function updateCounter()
+ {
+ $sql = sprintf("UPDATE %s SET counter = counter+1 WHERE storyid = %u", $this->table, $this->storyid);
+ if (!$result = $this->db->queryF($sql)) {
+ return false;
+ }
+ return true;
+ }
+
+ function updateComments($total)
+ {
+ $sql = sprintf("UPDATE %s SET comments = %u WHERE storyid = %u", $this->table, $total, $this->storyid);
+ if (!$result = $this->db->queryF($sql)) {
+ return false;
+ }
+ return true;
+ }
+
+ function topicid()
+ {
+ return $this->topicid;
+ }
+
+ function topic()
+ {
+ return new MyXoopsTopic($this->topicstable, $this->topicid);
+ }
+
+ function uid()
+ {
+ return $this->uid;
+ }
+
+ function uname()
+ {
+ return XoopsUser::getUnameFromId($this->uid);
+ }
+
+ function title($format = "Show")
+ {
+ $myts =& MyTextSanitizer::getInstance();
+ $smiley = 1;
+ if ($this->nosmiley()) {
+ $smiley = 0;
+ }
+ switch ( $format ) {
+ case "Show":
+ case "Edit":
+ $title = $myts->htmlSpecialChars($this->title);
+ break;
+ case "Preview":
+ case "InForm":
+ $title = $myts->htmlSpecialChars($myts->stripSlashesGPC($this->title));
+ break;
+ }
+ return $title;
+ }
+
+ function hometext($format = "Show")
+ {
+ $myts =& MyTextSanitizer::getInstance();
+ $html = 1;
+ $smiley = 1;
+ $xcodes = 1;
+ if ($this->nohtml()) {
+ $html = 0;
+ }
+ if ($this->nosmiley()) {
+ $smiley = 0;
+ }
+ switch ($format) {
+ case "Show":
+ $hometext = $myts->displayTarea($this->hometext, $html, $smiley, $xcodes);
+ break;
+ case "Edit":
+ $hometext = htmlspecialchars($this->hometext, ENT_QUOTES);
+ break;
+ case "Preview":
+ $hometext = $myts->previewTarea($this->hometext, $html, $smiley, $xcodes);
+ break;
+ case "InForm":
+ $hometext = htmlspecialchars($myts->stripSlashesGPC($this->hometext), ENT_QUOTES);
+ break;
+ }
+ return $hometext;
+ }
+
+ function bodytext($format = "Show")
+ {
+ $myts =& MyTextSanitizer::getInstance();
+ $html = 1;
+ $smiley = 1;
+ $xcodes = 1;
+ if ($this->nohtml()) {
+ $html = 0;
+ }
+ if ($this->nosmiley()) {
+ $smiley = 0;
+ }
+ switch ($format) {
+ case "Show":
+ $bodytext = $myts->displayTarea($this->bodytext, $html, $smiley, $xcodes);
+ break;
+ case "Edit":
+ $bodytext = htmlspecialchars($this->bodytext, ENT_QUOTES);
+ break;
+ case "Preview":
+ $bodytext = $myts->previewTarea($this->bodytext, $html, $smiley, $xcodes);
+ break;
+ case "InForm":
+ $bodytext = htmlspecialchars($myts->stripSlashesGPC($this->bodytext), ENT_QUOTES);
+ break;
+ }
+ return $bodytext;
+ }
+
+ function counter()
+ {
+ return $this->counter;
+ }
+
+ function created()
+ {
+ return $this->created;
+ }
+
+ function published()
+ {
+ return $this->published;
+ }
+
+ function expired()
+ {
+ return $this->expired;
+ }
+
+ function hostname()
+ {
+ return $this->hostname;
+ }
+
+ function storyid()
+ {
+ return $this->storyid;
+ }
+
+ function nohtml()
+ {
+ return $this->nohtml;
+ }
+
+ function nosmiley()
+ {
+ return $this->nosmiley;
+ }
+
+ function notifypub()
+ {
+ return $this->notifypub;
+ }
+
+ function type()
+ {
+ return $this->type;
+ }
+
+ function ihome()
+ {
+ return $this->ihome;
+ }
+
+ function topicdisplay()
+ {
+ return $this->topicdisplay;
+ }
+
+ function topicalign($astext = true)
+ {
+ if ($astext) {
+ if ($this->topicalign == "R") {
+ $ret = "right";
+ } else {
+ $ret = "left";
+ }
+ return $ret;
+ }
+ return $this->topicalign;
+ }
+
+ function comments()
+ {
+ return $this->comments;
+ }
+}
+?>
\ No newline at end of file
Added: XoopsModules/news/trunk/news/class/xoopstopic.php
===================================================================
--- XoopsModules/news/trunk/news/class/xoopstopic.php (rev 0)
+++ XoopsModules/news/trunk/news/class/xoopstopic.php 2012-08-08 22:36:24 UTC (rev 10043)
@@ -0,0 +1,324 @@
+<?php
+/**
+ * XOOPS news topic
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package kernel
+ * @since 2.0.0
+ * @author Kazumi Ono (AKA onokazu) http://www.myweb.ne.jp/, http://jp.xoops.org/
+ * @version $Id: xoopstopic.php 8066 2011-11-06 05:09:33Z beckmi $
+ * @deprecated
+ */
+
+if (!defined('XOOPS_ROOT_PATH')) {
+ exit();
+}
+//$GLOBALS['xoopsLogger']->addDeprecated("'/class/xoopstopic.php' is deprecated since XOOPS 2.5.4, please create your own class instead.");
+
+include_once XOOPS_ROOT_PATH.'/modules/news/class/xoopstree.php';
+
+class MyXoopsTopic
+{
+ var $table;
+ var $topic_id;
+ var $topic_pid;
+ var $topic_title;
+ var $topic_imgurl;
+ var $prefix; // only used in topic tree
+ var $use_permission=false;
+ var $mid; // module id used for setting permission
+
+ function __construct($table, $topicid = 0)
+ {
+ $this->db = &XoopsDatabaseFactory::getDatabaseConnection();
+ $this->table = $table;
+ if (is_array($topicid)) {
+ $this->makeTopic($topicid);
+ } else if ($topicid != 0) {
+ $this->getTopic(intval($topicid));
+ } else {
+ $this->topic_id = $topicid;}
+ }
+
+ function setTopicTitle($value)
+ {
+ $this->topic_title = $value;
+ }
+
+ function setTopicImgurl($value)
+ {
+ $this->topic_imgurl = $value;
+ }
+
+ function setTopicPid($value)
+ {
+ $this->topic_pid = $value;
+ }
+
+ function getTopic($topicid)
+ {
+ $topicid = intval($topicid);
+ $sql = "SELECT * FROM ".$this->table." WHERE topic_id=" . $topicid . "";
+ $array = $this->db->fetchArray($this->db->query($sql));
+ $this->makeTopic($array);
+ }
+
+ function makeTopic($array)
+ {
+ foreach($array as $key => $value){
+ $this->$key = $value;
+ }
+ }
+
+ function usePermission($mid)
+ {
+ $this->mid = $mid;
+ $this->use_permission = true;
+ }
+
+ function store()
+ {
+ $myts =& MyTextSanitizer::getInstance();
+ $title = "";
+ $imgurl = "";
+ if (isset($this->topic_title) && $this->topic_title != "") {
+ $title = $myts->addSlashes($this->topic_title);
+ }
+ if (isset($this->topic_imgurl) && $this->topic_imgurl != "") {
+ $imgurl = $myts->addSlashes($this->topic_imgurl);
+ }
+ if (!isset($this->topic_pid) || !is_numeric($this->topic_pid)) {
+ $this->topic_pid = 0;
+ }
+ if (empty($this->topic_id)) {
+ $this->topic_id = $this->db->genId($this->table."_topic_id_seq");
+ $sql = sprintf("INSERT INTO %s (topic_id, topic_pid, topic_imgurl, topic_title) VALUES (%u, %u, '%s', '%s')", $this->table, $this->topic_id, $this->topic_pid, $imgurl, $title);
+ } else {
+ $sql = sprintf("UPDATE %s SET topic_pid = %u, topic_imgurl = '%s', topic_title = '%s' WHERE topic_id = %u", $this->table, $this->topic_pid, $imgurl, $title, $this->topic_id);
+ }
+ if (!$result = $this->db->query($sql)) {
+ ErrorHandler::show('0022');
+ }
+ if ($this->use_permission == true) {
+ if (empty($this->topic_id)) {
+ $this->topic_id = $this->db->getInsertId();
+ }
+ $xt = new MyXoopsTree($this->table, "topic_id", "topic_pid");
+ $parent_topics = $xt->getAllParentId($this->topic_id);
+ if (!empty($this->m_groups) && is_array($this->m_groups)){
+ foreach ($this->m_groups as $m_g) {
+ $moderate_topics = XoopsPerms::getPermitted($this->mid, "ModInTopic", $m_g);
+ $add = true;
+ // only grant this permission when the group has this permission in all parent topics of the created topic
+ foreach ($parent_topics as $p_topic) {
+ if (!in_array($p_topic, $moderate_topics)) {
+ $add = false;
+ continue;
+ }
+ }
+ if ($add == true) {
+ $xp = new XoopsPerms();
+ $xp->setModuleId($this->mid);
+ $xp->setName("ModInTopic");
+ $xp->setItemId($this->topic_id);
+ $xp->store();
+ $xp->addGroup($m_g);
+ }
+ }
+ }
+ if (!empty($this->s_groups) && is_array($this->s_groups)){
+ foreach ($s_groups as $s_g) {
+ $submit_topics = XoopsPerms::getPermitted($this->mid, "SubmitInTopic", $s_g);
+ $add = true;
+ foreach ($parent_topics as $p_topic) {
+ if (!in_array($p_topic, $submit_topics)) {
+ $add = false;
+ continue;
+ }
+ }
+ if ($add == true) {
+ $xp = new XoopsPerms();
+ $xp->setModuleId($this->mid);
+ $xp->setName("SubmitInTopic");
+ $xp->setItemId($this->topic_id);
+ $xp->store();
+ $xp->addGroup($s_g);
+ }
+ }
+ }
+ if (!empty($this->r_groups) && is_array($this->r_groups)){
+ foreach ($r_groups as $r_g) {
+ $read_topics = XoopsPerms::getPermitted($this->mid, "ReadInTopic", $r_g);
+ $add = true;
+ foreach ($parent_topics as $p_topic) {
+ if (!in_array($p_topic, $read_topics)) {
+ $add = false;
+ continue;
+ }
+ }
+ if ($add == true) {
+ $xp = new XoopsPerms();
+ $xp->setModuleId($this->mid);
+ $xp->setName("ReadInTopic");
+ $xp->setItemId($this->topic_id);
+ $xp->store();
+ $xp->addGroup($r_g);
+ }
+ }
+ }
+ }
+ return true;
+ }
+
+ function delete()
+ {
+ $sql = sprintf("DELETE FROM %s WHERE topic_id = %u", $this->table, $this->topic_id);
+ $this->db->query($sql);
+ }
+
+ function topic_id()
+ {
+ return $this->topic_id;
+ }
+
+ function topic_pid()
+ {
+ return $this->topic_pid;
+ }
+
+ function topic_title($format = "S")
+ {
+ $myts =& MyTextSanitizer::getInstance();
+ switch($format){
+ case "S":
+ case "E":
+ $title = $myts->htmlSpecialChars($this->topic_title);
+ break;
+ case "P":
+ case "F":
+ $title = $myts->htmlSpecialChars($myts->stripSlashesGPC($this->topic_title));
+ break;
+ }
+ return $title;
+ }
+
+ function topic_imgurl($format = "S")
+ {
+ $myts =& MyTextSanitizer::getInstance();
+ switch($format){
+ case "S":
+ case "E":
+ $imgurl = $myts->htmlSpecialChars($this->topic_imgurl);
+ break;
+ case "P":
+ case "F":
+ $imgurl = $myts->htmlSpecialChars($myts->stripSlashesGPC($this->topic_imgurl));
+ break;
+ }
+ return $imgurl;
+ }
+
+ function prefix()
+ {
+ if (isset($this->prefix)) {
+ return $this->prefix;
+ }
+ }
+
+ function getFirstChildTopics()
+ {
+ $ret = array();
+ $xt = new MyXoopsTree($this->table, "topic_id", "topic_pid");
+ $topic_arr = $xt->getFirstChild($this->topic_id, "topic_title");
+ if (is_array($topic_arr) && count($topic_arr)) {
+ foreach ($topic_arr as $topic) {
+ $ret[] = new MyXoopsTopic($this->table, $topic);
+ }
+ }
+ return $ret;
+ }
+
+ function getAllChildTopics()
+ {
+ $ret = array();
+ $xt = new MyXoopsTree($this->table, "topic_id", "topic_pid");
+ $topic_arr = $xt->getAllChild($this->topic_id, "topic_title");
+ if (is_array($topic_arr) && count($topic_arr)) {
+ foreach ($topic_arr as $topic) {
+ $ret[] = new MyXoopsTopic($this->table, $topic);
+ }
+ }
+ return $ret;
+ }
+
+ function getChildTopicsTreeArray()
+ {
+ $ret = array();
+ $xt = new MyXoopsTree($this->table, "topic_id", "topic_pid");
+ $topic_arr = $xt->getChildTreeArray($this->topic_id, "topic_title");
+ if (is_array($topic_arr) && count($topic_arr)) {
+ foreach ($topic_arr as $topic) {
+ $ret[] = new MyXoopsTopic($this->table, $topic);
+ }
+ }
+ return $ret;
+ }
+
+ function makeTopicSelBox($none = 0, $seltopic = -1, $selname = "", $onchange = "")
+ {
+ $xt = new MyXoopsObjectTree($this->table, "topic_id", "topic_pid");
+ if ($seltopic != -1) {
+ $xt->makeMySelBox("topic_title", "topic_title", $seltopic, $none, $selname, $onchange);
+ } else if (!empty($this->topic_id)) {
+ $xt->makeMySelBox("topic_title", "topi...
[truncated message content] |
|
From: <be...@us...> - 2012-08-10 19:37:38
|
Revision: 10049
http://xoops.svn.sourceforge.net/xoops/?rev=10049&view=rev
Author: beckmi
Date: 2012-08-10 19:37:32 +0000 (Fri, 10 Aug 2012)
Log Message:
-----------
fixing error with navigation icons (AngeloRocha/mamba)
Modified Paths:
--------------
XoopsModules/news/trunk/news/admin/index.php
XoopsModules/news/trunk/news/docs/changelog.txt
Modified: XoopsModules/news/trunk/news/admin/index.php
===================================================================
--- XoopsModules/news/trunk/news/admin/index.php 2012-08-08 23:06:56 UTC (rev 10048)
+++ XoopsModules/news/trunk/news/admin/index.php 2012-08-10 19:37:32 UTC (rev 10049)
@@ -1503,7 +1503,6 @@
break;
case 'prune':
- echo $indexAdmin->addNavigation('index.php?op=prune');
PruneManager();
break;
@@ -1516,7 +1515,6 @@
break;
case 'export':
- echo $indexAdmin->addNavigation('index.php?op=export');
NewsExport();
break;
@@ -1525,22 +1523,18 @@
break;
case 'configurenewsletter':
- //echo $indexAdmin->addNavigation('index.php?op=configurenewsletter');
Newsletter();
break;
case 'launchnewsletter':
- //echo $indexAdmin->addNavigation('index.php?op=configurenewsletter');
LaunchNewsletter();
break;
case 'stats':
- echo $indexAdmin->addNavigation('index.php?op=stats');
Stats();
break;
case 'metagen':
- echo $indexAdmin->addNavigation('index.php?op=metagen');
Metagen();
break;
Modified: XoopsModules/news/trunk/news/docs/changelog.txt
===================================================================
--- XoopsModules/news/trunk/news/docs/changelog.txt 2012-08-08 23:06:56 UTC (rev 10048)
+++ XoopsModules/news/trunk/news/docs/changelog.txt 2012-08-10 19:37:32 UTC (rev 10049)
@@ -8,6 +8,7 @@
- replacing FPDF with TCPDF (black_beard)
- changing names of tables to use the prefix: "mod_news_" (alain01/mamba)
- moving xoopsstory/xoopstopic/xoopstree to local directory (mamba)
+- fixing error with navigation icons (AngeloRocha/mamba)
======================
v1.67 2012-07-01
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|