[xoops-svn] SF.net SVN: xoops:[9529] XoopsModules/news/branches/mamba/news

[<be...@us...>]

Revision: 9529
          http://xoops.svn.sourceforge.net/xoops/?rev=9529&view=rev
Author:   beckmi
Date:     2012-05-16 19:51:17 +0000 (Wed, 16 May 2012)
Log Message:
-----------
Fixing bugs reported by Cesag

Modified Paths:
--------------
    XoopsModules/news/branches/mamba/news/admin/groupperms.php
    XoopsModules/news/branches/mamba/news/archive.php
    XoopsModules/news/branches/mamba/news/language/english/admin.php

Modified: XoopsModules/news/branches/mamba/news/admin/groupperms.php
===================================================================
--- XoopsModules/news/branches/mamba/news/admin/groupperms.php	2012-05-16 19:02:36 UTC (rev 9528)
+++ XoopsModules/news/branches/mamba/news/admin/groupperms.php	2012-05-16 19:51:17 UTC (rev 9529)
@@ -66,7 +66,18 @@
 foreach ($alltopics as $topic_id => $topic) {
     $permform->addItem($topic_id, $topic['title'], $topic['pid']);
 }
-echo $permform->render();
-echo "<br /><br /><br /><br />\n";
+//echo $permform->render();
+//echo "<br /><br /><br /><br />\n";
+
+//check if topics exist before rendering the form
+$result_view = $xoopsDB->query("SELECT topic_id, topic_title FROM " . $xoopsDB->prefix("topics") . " ");
+if ($xoopsDB->getRowsNum($result_view)) {
+    echo $permform->render();
+} else {
+    //echo _AM_XFAQ_NOPERMSSET;
+redirect_header("index.php?op=topicsmanager", 5, _AM_NEWS_NOPERMSSET, false);
+}
+
+
 unset($permform);
 include 'admin_footer.php';
\ No newline at end of file

Modified: XoopsModules/news/branches/mamba/news/archive.php
===================================================================
--- XoopsModules/news/branches/mamba/news/archive.php	2012-05-16 19:02:36 UTC (rev 9528)
+++ XoopsModules/news/branches/mamba/news/archive.php	2012-05-16 19:51:17 UTC (rev 9529)
@@ -83,6 +83,7 @@
 include_once XOOPS_ROOT_PATH.'/modules/news/include/functions.php';
 $lastyear = 0;
 $lastmonth = 0;
+$this_year = 0;
 
 $months_arr = array(1 => _CAL_JANUARY, 2 => _CAL_FEBRUARY, 3 => _CAL_MARCH, 4 => _CAL_APRIL, 5 => _CAL_MAY, 6 => _CAL_JUNE, 7 => _CAL_JULY, 8 => _CAL_AUGUST, 9 => _CAL_SEPTEMBER, 10 => _CAL_OCTOBER, 11 => _CAL_NOVEMBER, 12 => _CAL_DECEMBER);
 

Modified: XoopsModules/news/branches/mamba/news/language/english/admin.php
===================================================================
--- XoopsModules/news/branches/mamba/news/language/english/admin.php	2012-05-16 19:02:36 UTC (rev 9528)
+++ XoopsModules/news/branches/mamba/news/language/english/admin.php	2012-05-16 19:51:17 UTC (rev 9529)
@@ -175,7 +175,7 @@
 // Added in 1.3 RC2
 define('_AM_NEWS_PLEASE_UPGRADE',"<a href='upgrade.php'><font color='#FF0000'>Please upgrade the module !</font></a>");
 
-// Added in verisn 1.50
+// Added in version 1.50
 define('_AM_NEWS_NEWSLETTER_HEADER', "Header");
 define('_AM_NEWS_NEWSLETTER_FOOTER', "Footer");
 define('_AM_NEWS_NEWSLETTER_HTML_TAGS', "Remove html tags ?");
@@ -192,7 +192,7 @@
 define('_AM_NEWS_META_KEYWORDS_FREQ1',"Words frequency's order");
 define('_AM_NEWS_META_KEYWORDS_FREQ2',"Reverse order of words frequency");
 
-// Added in verisn 1.67
+// Added in version 1.67
 // About.php
 define('_AM_NEWS_ABOUT_RELEASEDATE',        "Released: ");
 define('_AM_NEWS_ABOUT_UPDATEDATE',               "Updated: ");
@@ -215,12 +215,15 @@
 define ("_AM_NEWS_STATISTICS", "Statistics News");
 define ("_AM_NEWS_THEREARE_STORIES", "There are <span class='red bold'>%s</span> News in the database");
 define ("_AM_NEWS_THEREARE_STORIES_ONLINE", "There are <span class='red bold'>%s</span> News Online");
-define ("_AM_NEWS_THEREARE_STORIES_FILES", "There are <span class='red bold'>%s</span> Stories_files in the database");
-define ("_AM_NEWS_THEREARE_STORIES_FILES_ONLINE", "There are <span class='red bold'>%s</span> Stories_files online");
+define ("_AM_NEWS_THEREARE_STORIES_FILES", "There are <span class='red bold'>%s</span> Stories in the database");
+define ("_AM_NEWS_THEREARE_STORIES_FILES_ONLINE", "There are <span class='red bold'>%s</span> Stories online");
 define ("_AM_NEWS_THEREARE_TOPICS", "There are <span class='red bold'>%s</span> Categories in the database");
 define ("_AM_NEWS_THEREARE_TOPICS_ONLINE", "There are <span class='red bold'>%s</span> Categories Online");
 define ("_AM_NEWS_THEREARE_STORIES_VOTEDATA", "There are <span class='red bold'>%s</span> Stories Viewed");
 define ("_AM_NEWS_THEREARE_STORIES_IMPORTED", "There are <span class='red bold'>%s</span> Imported Stories");
 define ("_AM_NEWS_THEREARE_STORIES_EXPORTED", "There are <span class='red bold'>%s</span> Stories exported");
 
+define("_AM_NEWS_NOPERMSSET","Permission cannot be set: There are no Topics created yet! Please create a Topic first.");
+
+
 ?>
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.