Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[8729] XoopsModules/fmcontent/branches/news
|
From: <vo...@us...> - 2012-01-15 07:08:42
|
Revision: 8729
http://xoops.svn.sourceforge.net/xoops/?rev=8729&view=rev
Author: voltan1
Date: 2012-01-15 07:08:34 +0000 (Sun, 15 Jan 2012)
Log Message:
-----------
Add some updates
Modified Paths:
--------------
XoopsModules/fmcontent/branches/news/admin/permissions.php
XoopsModules/fmcontent/branches/news/admin/tools.php
XoopsModules/fmcontent/branches/news/article.php
XoopsModules/fmcontent/branches/news/include/functions_update.php
XoopsModules/fmcontent/branches/news/language/arabic/modinfo.php
XoopsModules/fmcontent/branches/news/language/english/modinfo.php
XoopsModules/fmcontent/branches/news/language/persian/modinfo.php
XoopsModules/fmcontent/branches/news/rss.php
XoopsModules/fmcontent/branches/news/xoops_version.php
Modified: XoopsModules/fmcontent/branches/news/admin/permissions.php
===================================================================
--- XoopsModules/fmcontent/branches/news/admin/permissions.php 2012-01-14 18:03:21 UTC (rev 8728)
+++ XoopsModules/fmcontent/branches/news/admin/permissions.php 2012-01-15 07:08:34 UTC (rev 8729)
@@ -25,7 +25,15 @@
include_once XOOPS_ROOT_PATH . '/modules/news/class/topic.php';
// Display Admin header
-xoops_cp_header();
+xoops_cp_header();
+
+// Check admin have access to this page
+$group = $xoopsUser->getGroups ();
+$groups = xoops_getModuleOption ( 'admin_groups', $NewsModule->getVar ( 'dirname' ) );
+if (count ( array_intersect ( $group, $groups ) ) <= 0) {
+ redirect_header ( 'index.php', 3, _NOPERM );
+}
+
// Add module stylesheet
$xoTheme->addStylesheet(XOOPS_URL . '/modules/' . $NewsModule->getVar('dirname') . '/css/admin.css');
$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
Modified: XoopsModules/fmcontent/branches/news/admin/tools.php
===================================================================
--- XoopsModules/fmcontent/branches/news/admin/tools.php 2012-01-14 18:03:21 UTC (rev 8728)
+++ XoopsModules/fmcontent/branches/news/admin/tools.php 2012-01-15 07:08:34 UTC (rev 8729)
@@ -23,7 +23,15 @@
if (!isset($NewsModule)) exit('Module not found');
// Display Admin header
-xoops_cp_header();
+xoops_cp_header();
+
+// Check admin have access to this page
+$group = $xoopsUser->getGroups ();
+$groups = xoops_getModuleOption ( 'admin_groups', $NewsModule->getVar ( 'dirname' ) );
+if (count ( array_intersect ( $group, $groups ) ) <= 0) {
+ redirect_header ( 'index.php', 3, _NOPERM );
+}
+
// Define default value
$op = NewsUtils::News_CleanVars($_REQUEST, 'op', 'display', 'string');
// Add module stylesheet
Modified: XoopsModules/fmcontent/branches/news/article.php
===================================================================
--- XoopsModules/fmcontent/branches/news/article.php 2012-01-14 18:03:21 UTC (rev 8728)
+++ XoopsModules/fmcontent/branches/news/article.php 2012-01-15 07:08:34 UTC (rev 8729)
@@ -45,7 +45,7 @@
// Add Stylesheet
$xoTheme->addStylesheet ( XOOPS_URL . '/modules/' . $NewsModule->getVar ( 'dirname' ) . '/css/style.css' );
-if (! $story_id) {
+if (empty($story_id)) {
$criteria = new CriteriaCompo ();
$criteria->add ( new Criteria ( 'story_modid', $NewsModule->getVar ( 'mid' ) ) );
$criteria->add ( new Criteria ( 'story_default', 1 ) );
Modified: XoopsModules/fmcontent/branches/news/include/functions_update.php
===================================================================
--- XoopsModules/fmcontent/branches/news/include/functions_update.php 2012-01-14 18:03:21 UTC (rev 8728)
+++ XoopsModules/fmcontent/branches/news/include/functions_update.php 2012-01-15 07:08:34 UTC (rev 8729)
@@ -24,294 +24,281 @@
*/
function xoops_module_update_news($module, $version) {
- $modsDirname = basename(dirname(dirname(__FILE__)));
- if($modsDirname != 'news') {
- return false;
- }
-
- $indexFile = XOOPS_ROOT_PATH . "/uploads/index.html";
- $blankFile = XOOPS_ROOT_PATH . "/uploads/blank.gif";
-
- //Creation du fichier creator dans uploads
- $module_uploads = XOOPS_ROOT_PATH . "/uploads/news";
- if (!is_dir($module_uploads)) {
- mkdir($module_uploads, 0777);
- chmod($module_uploads, 0777);
- copy($indexFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/index.html");
- }
-
- //Creation du fichier price dans uploads
- $module_uploads = XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/image";
- if (!is_dir($module_uploads)) {
- mkdir($module_uploads, 0777);
- chmod($module_uploads, 0777);
- copy($indexFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/image/index.html");
- copy($blankFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/image/blank.gif");
- }
-
- //Creation du fichier price dans uploads
- $module_uploads = XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/image/original";
- if (!is_dir($module_uploads)) {
- mkdir($module_uploads, 0777);
- chmod($module_uploads, 0777);
- copy($indexFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/image/original/index.html");
- copy($blankFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/image/original/blank.gif");
- }
-
- //Creation du fichier price dans uploads
- $module_uploads = XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/image/medium";
- if (!is_dir($module_uploads)) {
- mkdir($module_uploads, 0777);
- chmod($module_uploads, 0777);
- copy($indexFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/image/medium/index.html");
- copy($blankFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/image/medium/blank.gif");
- }
-
- //Creation du fichier price dans uploads
- $module_uploads = XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/image/thumb";
- if (!is_dir($module_uploads)) {
- mkdir($module_uploads, 0777);
- chmod($module_uploads, 0777);
- copy($indexFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/image/thumb/index.html");
- copy($blankFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/image/thumb/blank.gif");
- }
-
- //Creation du fichier price dans uploads
- $module_uploads = XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/file";
- if (!is_dir($module_uploads)) {
- mkdir($module_uploads, 0777);
- chmod($module_uploads, 0777);
- copy($indexFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/file/index.html");
- copy($blankFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/file/blank.gif");
- }
-
- $db = $GLOBALS["xoopsDB"];
- $error = false;
-
- include_once XOOPS_ROOT_PATH . '/modules/news/include/functions.php';
- include_once XOOPS_ROOT_PATH . '/modules/news/class/perm.php';
- include_once XOOPS_ROOT_PATH . '/modules/news/class/utils.php';
- include_once XOOPS_ROOT_PATH . '/class/template.php';
- include_once XOOPS_ROOT_PATH . '/class/xoopstree.php';
-
-
-
- if(!NewsUtils::News_TableExists($db->prefix('news_story')))
- {
- $sql = "CREATE TABLE " . $db->prefix('news_story') . " (
- `story_id` int(10) NOT NULL auto_increment,
- `story_title` varchar(255) NOT NULL,
- `story_subtitle` varchar(255) NOT NULL,
- `story_titleview` tinyint(1) NOT NULL default '1',
- `story_topic` int(11) NOT NULL,
- `story_type` varchar(25) NOT NULL,
- `story_short` text NOT NULL,
- `story_text` text NOT NULL,
- `story_link` varchar(255) NOT NULL,
- `story_words` varchar(255) NOT NULL,
- `story_desc` varchar(255) NOT NULL,
- `story_alias` varchar(255) NOT NULL,
- `story_important` tinyint(1) NOT NULL,
- `story_default` tinyint(1) NOT NULL,
- `story_status` tinyint(1) NOT NULL,
- `story_create` int (10) NOT NULL default '0',
- `story_update` int (10) NOT NULL default '0',
- `story_publish` int (10) NOT NULL default '0',
- `story_expire` int (10) NOT NULL default '0',
- `story_uid` int(11) NOT NULL,
- `story_author` varchar(255) NOT NULL,
- `story_source` varchar(255) NOT NULL,
- `story_groups` varchar(255) NOT NULL,
- `story_order` int(11) NOT NULL,
- `story_next` int(11) NOT NULL default '0',
- `story_prev` int(11) NOT NULL default '0',
- `story_modid` int(11) NOT NULL,
- `story_hits` int(11) NOT NULL,
- `story_img` varchar(255) NOT NULL,
- `story_comments` int(11) unsigned NOT NULL default '0',
- `story_file` tinyint(3) NOT NULL,
- `dohtml` tinyint(1) NOT NULL,
- `dobr` tinyint(1) NOT NULL,
- `doimage` tinyint(1) NOT NULL,
- `dosmiley` tinyint(1) NOT NULL,
- `doxcode` tinyint(1) NOT NULL,
- PRIMARY KEY (`story_id`),
- KEY `idxstoriestopic` (`story_topic`),
- KEY `story_title` (`story_title`),
- KEY `story_create` (`story_create`),
- FULLTEXT KEY `search` (`story_title`,`story_short`,`story_text`,`story_subtitle`)
- ) ENGINE=MyISAM;";
- if (!$db->queryF($sql)) {
- echo 'd2';
- return false;
- }
- }
+ // start update to version 1.80
+ if($version < 180) {
+
+ $modsDirname = basename(dirname(dirname(__FILE__)));
+ if($modsDirname != 'news') {
+ return false;
+ }
+
+ $indexFile = XOOPS_ROOT_PATH . "/uploads/index.html";
+ $blankFile = XOOPS_ROOT_PATH . "/uploads/blank.gif";
+
+ //Creation du fichier creator dans uploads
+ $module_uploads = XOOPS_ROOT_PATH . "/uploads/news";
+ if (!is_dir($module_uploads)) {
+ mkdir($module_uploads, 0777);
+ chmod($module_uploads, 0777);
+ copy($indexFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/index.html");
+ }
+
+ //Creation du fichier price dans uploads
+ $module_uploads = XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/image";
+ if (!is_dir($module_uploads)) {
+ mkdir($module_uploads, 0777);
+ chmod($module_uploads, 0777);
+ copy($indexFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/image/index.html");
+ copy($blankFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/image/blank.gif");
+ }
+
+ //Creation du fichier price dans uploads
+ $module_uploads = XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/image/original";
+ if (!is_dir($module_uploads)) {
+ mkdir($module_uploads, 0777);
+ chmod($module_uploads, 0777);
+ copy($indexFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/image/original/index.html");
+ copy($blankFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/image/original/blank.gif");
+ }
+
+ //Creation du fichier price dans uploads
+ $module_uploads = XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/image/medium";
+ if (!is_dir($module_uploads)) {
+ mkdir($module_uploads, 0777);
+ chmod($module_uploads, 0777);
+ copy($indexFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/image/medium/index.html");
+ copy($blankFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/image/medium/blank.gif");
+ }
+
+ //Creation du fichier price dans uploads
+ $module_uploads = XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/image/thumb";
+ if (!is_dir($module_uploads)) {
+ mkdir($module_uploads, 0777);
+ chmod($module_uploads, 0777);
+ copy($indexFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/image/thumb/index.html");
+ copy($blankFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/image/thumb/blank.gif");
+ }
+
+ //Creation du fichier price dans uploads
+ $module_uploads = XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/file";
+ if (!is_dir($module_uploads)) {
+ mkdir($module_uploads, 0777);
+ chmod($module_uploads, 0777);
+ copy($indexFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/file/index.html");
+ copy($blankFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/file/blank.gif");
+ }
+
+ $db = $GLOBALS["xoopsDB"];
+ $error = false;
+
+ include_once XOOPS_ROOT_PATH . '/modules/news/include/functions.php';
+ include_once XOOPS_ROOT_PATH . '/modules/news/class/perm.php';
+ include_once XOOPS_ROOT_PATH . '/modules/news/class/utils.php';
+ include_once XOOPS_ROOT_PATH . '/class/template.php';
+ include_once XOOPS_ROOT_PATH . '/class/xoopstree.php';
- if(!NewsUtils::News_TableExists($db->prefix('news_topic')))
- {
- $sql = "CREATE TABLE " . $db->prefix('news_topic') . " (
- `topic_id` int (11) unsigned NOT NULL auto_increment,
- `topic_pid` int (5) unsigned NOT NULL ,
- `topic_title` varchar (255) NOT NULL ,
- `topic_desc` text NOT NULL ,
- `topic_img` varchar (255) NOT NULL ,
- `topic_weight` int (5) NOT NULL ,
- `topic_showtype` tinyint (4) NOT NULL ,
- `topic_perpage` tinyint (4) NOT NULL ,
- `topic_columns` tinyint (4) NOT NULL ,
- `topic_submitter` int (10) NOT NULL default '0',
- `topic_date_created` int (10) NOT NULL default '0',
- `topic_date_update` int (10) NOT NULL default '0',
- `topic_asmenu` tinyint (1) NOT NULL default '1',
- `topic_online` tinyint (1) NOT NULL default '1',
- `topic_modid` int(11) NOT NULL,
- `topic_showtopic` tinyint (1) NOT NULL default '0',
- `topic_showauthor` tinyint (1) NOT NULL default '1',
- `topic_showdate` tinyint (1) NOT NULL default '1',
- `topic_showpdf` tinyint (1) NOT NULL default '1',
- `topic_showprint` tinyint (1) NOT NULL default '1',
- `topic_showmail` tinyint (1) NOT NULL default '1',
- `topic_shownav` tinyint (1) NOT NULL default '1',
- `topic_showhits` tinyint (1) NOT NULL default '1',
- `topic_showcoms` tinyint (1) NOT NULL default '1',
- `topic_alias` varchar(255) NOT NULL,
- `topic_homepage` tinyint (4) NOT NULL ,
- `topic_show` tinyint (1) NOT NULL default '1',
- PRIMARY KEY (`topic_id`,`topic_modid`),
- UNIQUE KEY `file_id` (`topic_id`,`topic_modid`)
- ) ENGINE=MyISAM;";
- if (!$db->queryF($sql)) {
- echo 'd3';
- return false;
- }
- }
+
- if(!NewsUtils::News_TableExists($db->prefix('news_file')))
- {
- $sql = "CREATE TABLE " . $db->prefix('news_file') . " (
- `file_id` int (11) unsigned NOT NULL auto_increment,
- `file_modid` int(11) NOT NULL,
- `file_title` varchar (255) NOT NULL ,
- `file_name` varchar (255) NOT NULL ,
- `file_content` int(11) NOT NULL,
- `file_date` int(10) NOT NULL default '0',
- `file_type` varchar(64) NOT NULL default '',
- `file_status` tinyint(1) NOT NULL,
- `file_hits` int(11) NOT NULL,
- PRIMARY KEY (`file_id`,`file_modid`),
- UNIQUE KEY `file_id` (`file_id`,`file_modid`)
- ) ENGINE=MyISAM;";
- if (!$db->queryF($sql)) {
- echo 'd4';
- return false;
+ if(!NewsUtils::News_TableExists($db->prefix('news_story')))
+ {
+ $sql = "CREATE TABLE " . $db->prefix('news_story') . " (
+ `story_id` int(10) NOT NULL auto_increment,
+ `story_title` varchar(255) NOT NULL,
+ `story_subtitle` varchar(255) NOT NULL,
+ `story_titleview` tinyint(1) NOT NULL default '1',
+ `story_topic` int(11) NOT NULL,
+ `story_type` varchar(25) NOT NULL,
+ `story_short` text NOT NULL,
+ `story_text` text NOT NULL,
+ `story_link` varchar(255) NOT NULL,
+ `story_words` varchar(255) NOT NULL,
+ `story_desc` varchar(255) NOT NULL,
+ `story_alias` varchar(255) NOT NULL,
+ `story_important` tinyint(1) NOT NULL,
+ `story_default` tinyint(1) NOT NULL,
+ `story_status` tinyint(1) NOT NULL,
+ `story_create` int (10) NOT NULL default '0',
+ `story_update` int (10) NOT NULL default '0',
+ `story_publish` int (10) NOT NULL default '0',
+ `story_expire` int (10) NOT NULL default '0',
+ `story_uid` int(11) NOT NULL,
+ `story_author` varchar(255) NOT NULL,
+ `story_source` varchar(255) NOT NULL,
+ `story_groups` varchar(255) NOT NULL,
+ `story_order` int(11) NOT NULL,
+ `story_next` int(11) NOT NULL default '0',
+ `story_prev` int(11) NOT NULL default '0',
+ `story_modid` int(11) NOT NULL,
+ `story_hits` int(11) NOT NULL,
+ `story_img` varchar(255) NOT NULL,
+ `story_comments` int(11) unsigned NOT NULL default '0',
+ `story_file` tinyint(3) NOT NULL,
+ `dohtml` tinyint(1) NOT NULL,
+ `dobr` tinyint(1) NOT NULL,
+ `doimage` tinyint(1) NOT NULL,
+ `dosmiley` tinyint(1) NOT NULL,
+ `doxcode` tinyint(1) NOT NULL,
+ PRIMARY KEY (`story_id`),
+ KEY `idxstoriestopic` (`story_topic`),
+ KEY `story_title` (`story_title`),
+ KEY `story_create` (`story_create`),
+ FULLTEXT KEY `search` (`story_title`,`story_short`,`story_text`,`story_subtitle`)
+ ) ENGINE=MyISAM;";
+ if (!$db->queryF($sql)) {
+ return false;
+ }
}
- }
-
- //load needed handler
- $module_handler = xoops_gethandler('module');
- $comment_handler = xoops_gethandler('comment');
- $notification_handler = xoops_gethandler('notification');
- $topic_handler = xoops_getmodulehandler('topic', 'news');
- $story_handler = xoops_getmodulehandler('story', 'news');
- $file_handler = xoops_getmodulehandler('file', 'news');
- $newsModule = $module_handler->getByDirname('news');
- $news_mid = $newsModule->getVar('mid');
-
- $old_topics = $db->prefix('topics');
- $old_articles = $db->prefix('stories');
- $old_files = $db->prefix('stories_files');
- $old_rating = $db->prefix('stories_votedata');
-
- $new_news_topics = array();
- $mytree = new XoopsTree($old_topics,'topic_id','topic_pid');
- $old_topics = $mytree->getChildTreeArray(0,'topic_id');
-
- // start
- foreach($old_topics as $topic) {
-
- $topicobj = $topic_handler->create ();
- $topicobj->setVar ( 'topic_id', $topic['topic_id'] );
- $topicobj->setVar ( 'topic_pid', $topic['topic_pid'] );
- $topicobj->setVar ( 'topic_title', $topic['topic_title'] );
- $topicobj->setVar ( 'topic_img', $topic['topic_imgurl'] );
- $topicobj->setVar ( 'topic_desc', $topic['topic_description'] );
- $topicobj->setVar ( 'topic_modid', $news_mid);
- $topicobj->setVar ( 'topic_alias', NewsUtils::News_AliasFilter($topic['topic_title']));
- if (! $topic_handler->insert ( $topicobj )) {
- return false;
+ if(!NewsUtils::News_TableExists($db->prefix('news_topic')))
+ {
+ $sql = "CREATE TABLE " . $db->prefix('news_topic') . " (
+ `topic_id` int (11) unsigned NOT NULL auto_increment,
+ `topic_pid` int (5) unsigned NOT NULL ,
+ `topic_title` varchar (255) NOT NULL ,
+ `topic_desc` text NOT NULL ,
+ `topic_img` varchar (255) NOT NULL ,
+ `topic_weight` int (5) NOT NULL ,
+ `topic_showtype` tinyint (4) NOT NULL ,
+ `topic_perpage` tinyint (4) NOT NULL ,
+ `topic_columns` tinyint (4) NOT NULL ,
+ `topic_submitter` int (10) NOT NULL default '0',
+ `topic_date_created` int (10) NOT NULL default '0',
+ `topic_date_update` int (10) NOT NULL default '0',
+ `topic_asmenu` tinyint (1) NOT NULL default '1',
+ `topic_online` tinyint (1) NOT NULL default '1',
+ `topic_modid` int(11) NOT NULL,
+ `topic_showtopic` tinyint (1) NOT NULL default '0',
+ `topic_showauthor` tinyint (1) NOT NULL default '1',
+ `topic_showdate` tinyint (1) NOT NULL default '1',
+ `topic_showpdf` tinyint (1) NOT NULL default '1',
+ `topic_showprint` tinyint (1) NOT NULL default '1',
+ `topic_showmail` tinyint (1) NOT NULL default '1',
+ `topic_shownav` tinyint (1) NOT NULL default '1',
+ `topic_showhits` tinyint (1) NOT NULL default '1',
+ `topic_showcoms` tinyint (1) NOT NULL default '1',
+ `topic_alias` varchar(255) NOT NULL,
+ `topic_homepage` tinyint (4) NOT NULL ,
+ `topic_show` tinyint (1) NOT NULL default '1',
+ PRIMARY KEY (`topic_id`,`topic_modid`),
+ UNIQUE KEY `file_id` (`topic_id`,`topic_modid`)
+ ) ENGINE=MyISAM;";
+ if (!$db->queryF($sql)) {
+ return false;
+ }
}
- $result = $db->query('SELECT * FROM '.$old_articles.' WHERE topicid = '.$topic['topic_id'].' ORDER BY created');
-
- while ( $article = $db->fetchArray($result) ) {
-
- $storyobj = $story_handler->create ();
- $storyobj->setVar ( 'story_id', $article['storyid']);
- $storyobj->setVar ( 'story_title', $article['title']);
- $storyobj->setVar ( 'story_titleview', '1' );
- $storyobj->setVar ( 'story_topic', $article['topicid']);
- $storyobj->setVar ( 'story_type', 'news' );
- $storyobj->setVar ( 'story_short', $article['hometext']);
- $storyobj->setVar ( 'story_text', $article['bodytext']);
- $storyobj->setVar ( 'story_words', $article['keywords']);
- $storyobj->setVar ( 'story_desc', $article['description']);
- $storyobj->setVar ( 'story_alias', NewsUtils::News_AliasFilter($article['title']));
- $storyobj->setVar ( 'story_status', '1');
- $storyobj->setVar ( 'story_create', $article['created']);
- $storyobj->setVar ( 'story_update', $article['created']);
- $storyobj->setVar ( 'story_publish', $article['published']);
- $storyobj->setVar ( 'story_expire', $article['expired']);
- $storyobj->setVar ( 'story_uid', $article['uid']);
- $storyobj->setVar ( 'story_groups', '1 2 3');
- $storyobj->setVar ( 'story_modid', $news_mid );
- $storyobj->setVar ( 'story_hits', $article['counter']);
- $storyobj->setVar ( 'story_img', $article['picture']);
- $storyobj->setVar ( 'story_comments', $article['comments']);
- $storyobj->setVar ( 'dohtml', $article['nohtml']);
- //$storyobj->setVar ( 'dobr', $article['']);
- //$storyobj->setVar ( 'doimage', $article['']);
- $storyobj->setVar ( 'dosmiley', $article['nosmiley']);
- //$storyobj->setVar ( 'doxcode', $article['']);
-
- if (! $story_handler->insert ( $storyobj )) {
- return false;
+ if(!NewsUtils::News_TableExists($db->prefix('news_file')))
+ {
+ $sql = "CREATE TABLE " . $db->prefix('news_file') . " (
+ `file_id` int (11) unsigned NOT NULL auto_increment,
+ `file_modid` int(11) NOT NULL,
+ `file_title` varchar (255) NOT NULL ,
+ `file_name` varchar (255) NOT NULL ,
+ `file_content` int(11) NOT NULL,
+ `file_date` int(10) NOT NULL default '0',
+ `file_type` varchar(64) NOT NULL default '',
+ `file_status` tinyint(1) NOT NULL,
+ `file_hits` int(11) NOT NULL,
+ PRIMARY KEY (`file_id`,`file_modid`),
+ UNIQUE KEY `file_id` (`file_id`,`file_modid`)
+ ) ENGINE=MyISAM;";
+ if (!$db->queryF($sql)) {
+ return false;
}
-
- // The files
- $result4 = $db->query('SELECT * FROM '.$old_files.' WHERE storyid='.$article['storyid']);
- while ( $file = $db->fetchArray($result4) ) {
- $fileobj = $file_handler->create ();
- $fileobj->setVar ( 'file_id', $file['fileid']);
- $fileobj->setVar ( 'file_modid', $news_mid);
- $fileobj->setVar ( 'file_title', $file['filerealname']);
- $fileobj->setVar ( 'file_name', $file['downloadname']);
- $fileobj->setVar ( 'file_content', $file['storyid']);
- $fileobj->setVar ( 'file_date', $file['date']);
- $fileobj->setVar ( 'file_type', $file['mimetype']);
- $fileobj->setVar ( 'file_status', '1');
- $fileobj->setVar ( 'file_hits', $file['counter']);
+ }
+
+ //load needed handler
+ $module_handler = xoops_gethandler('module');
+ $comment_handler = xoops_gethandler('comment');
+ $notification_handler = xoops_gethandler('notification');
+ $topic_handler = xoops_getmodulehandler('topic', 'news');
+ $story_handler = xoops_getmodulehandler('story', 'news');
+ $file_handler = xoops_getmodulehandler('file', 'news');
+ $newsModule = $module_handler->getByDirname('news');
+ $news_mid = $newsModule->getVar('mid');
+
+ $old_topics = $db->prefix('topics');
+ $old_articles = $db->prefix('stories');
+ $old_files = $db->prefix('stories_files');
+ $old_rating = $db->prefix('stories_votedata');
+
+ $new_news_topics = array();
+ $mytree = new XoopsTree($old_topics,'topic_id','topic_pid');
+ $old_topics = $mytree->getChildTreeArray(0,'topic_id');
- if (! $file_handler->insert ( $fileobj )) {
- return false;
- }
+ foreach($old_topics as $topic) {
+
+ $topicobj = $topic_handler->create ();
+ $topicobj->setVar ( 'topic_id', $topic['topic_id'] );
+ $topicobj->setVar ( 'topic_pid', $topic['topic_pid'] );
+ $topicobj->setVar ( 'topic_title', $topic['topic_title'] );
+ $topicobj->setVar ( 'topic_img', $topic['topic_imgurl'] );
+ $topicobj->setVar ( 'topic_desc', $topic['topic_description'] );
+ $topicobj->setVar ( 'topic_modid', $news_mid);
+ $topicobj->setVar ( 'topic_alias', NewsUtils::News_AliasFilter($topic['topic_title']));
+
+ if (! $topic_handler->insert ( $topicobj )) {
+ return false;
}
- // The comments
- $comments = $comment_handler->getByItemId($news_mid, $article['storyid'], 'ASC');
- if(is_array($comments) && count($comments)>0) {
- foreach($comments as $onecomment) {
- $onecomment->setNew();
- $onecomment->setVar('com_modid',$news_mid);
- $onecomment->setVar('com_itemid',$article['storyid']);
- $comment_handler->insert($onecomment);
+ $result = $db->query('SELECT * FROM '.$old_articles.' WHERE topicid = '.$topic['topic_id'].' ORDER BY created');
+
+ while ( $article = $db->fetchArray($result) ) {
+
+ $storyobj = $story_handler->create ();
+ $storyobj->setVar ( 'story_id', $article['storyid']);
+ $storyobj->setVar ( 'story_title', $article['title']);
+ $storyobj->setVar ( 'story_titleview', '1' );
+ $storyobj->setVar ( 'story_topic', $article['topicid']);
+ $storyobj->setVar ( 'story_type', 'news' );
+ $storyobj->setVar ( 'story_short', $article['hometext']);
+ $storyobj->setVar ( 'story_text', $article['bodytext']);
+ $storyobj->setVar ( 'story_words', $article['keywords']);
+ $storyobj->setVar ( 'story_desc', $article['description']);
+ $storyobj->setVar ( 'story_alias', NewsUtils::News_AliasFilter($article['title']));
+ $storyobj->setVar ( 'story_status', '1');
+ $storyobj->setVar ( 'story_create', $article['created']);
+ $storyobj->setVar ( 'story_update', $article['created']);
+ $storyobj->setVar ( 'story_publish', $article['published']);
+ $storyobj->setVar ( 'story_expire', $article['expired']);
+ $storyobj->setVar ( 'story_uid', $article['uid']);
+ $storyobj->setVar ( 'story_groups', '1 2 3');
+ $storyobj->setVar ( 'story_modid', $news_mid );
+ $storyobj->setVar ( 'story_hits', $article['counter']);
+ $storyobj->setVar ( 'story_img', $article['picture']);
+ $storyobj->setVar ( 'story_comments', $article['comments']);
+ $storyobj->setVar ( 'dohtml', !$article['nohtml']);
+ $storyobj->setVar ( 'dobr', 1);
+ $storyobj->setVar ( 'doimage', 1);
+ $storyobj->setVar ( 'dosmiley', !$article['nosmiley']);
+ $storyobj->setVar ( 'doxcode', 1);
+
+ if (! $story_handler->insert ( $storyobj )) {
+ return false;
}
- }
- unset($comments);
- }
-
- }
- // end
+
+ // The files
+ $result4 = $db->query('SELECT * FROM '.$old_files.' WHERE storyid='.$article['storyid']);
+ while ( $file = $db->fetchArray($result4) ) {
+ $fileobj = $file_handler->create ();
+ $fileobj->setVar ( 'file_id', $file['fileid']);
+ $fileobj->setVar ( 'file_modid', $news_mid);
+ $fileobj->setVar ( 'file_title', $file['filerealname']);
+ $fileobj->setVar ( 'file_name', $file['downloadname']);
+ $fileobj->setVar ( 'file_content', $file['storyid']);
+ $fileobj->setVar ( 'file_date', $file['date']);
+ $fileobj->setVar ( 'file_type', $file['mimetype']);
+ $fileobj->setVar ( 'file_status', '1');
+ $fileobj->setVar ( 'file_hits', $file['counter']);
+
+ if (! $file_handler->insert ( $fileobj )) {
+ return false;
+ }
+ }
+ }
+ }
+ }
+ // end update to version 1.80
}
?>
\ No newline at end of file
Modified: XoopsModules/fmcontent/branches/news/language/arabic/modinfo.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/arabic/modinfo.php 2012-01-14 18:03:21 UTC (rev 8728)
+++ XoopsModules/fmcontent/branches/news/language/arabic/modinfo.php 2012-01-15 07:08:34 UTC (rev 8729)
@@ -40,6 +40,9 @@
// Editor
define("_NEWS_MI_FORM_EDITOR", "اختیار شکل");
define("_NEWS_MI_FORM_EDITOR_DESC", "تحدید محرر للاستخدام في صفحة إرسال المواضیع.");
+// Admin groups
+ define("_NEWS_MI_ADMINGROUPS", "Admin Group Permissions");
+ define("_NEWS_MI_ADMINGROUPS_DESC", "Which groups have access to tools and permissions page");
// Urls
define('_NEWS_MI_FRIENDLYURL','تحدید عنوان مفضل للمستخدمین');
define('_NEWS_MI_FRIENDLYURL_DESC', 'Select the URL rewrite mode you want to use.<ul>
@@ -67,9 +70,6 @@
// Lenght Id
define('_NEWS_MI_LENGHTID', 'طول رقم الصفحة');
define('_NEWS_MI_LENGHTID_DESC', 'عدد ارقام المنتجة للصفحة');
-// Group Access
- define('_NEWS_MI_GROUPS','اتاحة المجموعات');
- define('_NEWS_MI_GROUPS_DESC', 'عین الإتاحة الکلیة للمجموعات.');
//Advertisement
define('_NEWS_MI_ADVERTISEMENT', 'الإعلانات');
define('_NEWS_MI_ADVERTISEMENT_DESC', 'اجعل نصا أو کود جاوا للعرض في جمیع الصفحات');
Modified: XoopsModules/fmcontent/branches/news/language/english/modinfo.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/english/modinfo.php 2012-01-14 18:03:21 UTC (rev 8728)
+++ XoopsModules/fmcontent/branches/news/language/english/modinfo.php 2012-01-15 07:08:34 UTC (rev 8729)
@@ -39,7 +39,10 @@
define('_NEWS_MI_BLOCK_TOPIC', 'Topic list');
// Editor
define("_NEWS_MI_FORM_EDITOR", "Form Option");
- define("_NEWS_MI_FORM_EDITOR_DESC", "Select the editor to use for editing your article.");
+ define("_NEWS_MI_FORM_EDITOR_DESC", "Select the editor to use for editing your article.");
+// Admin groups
+ define("_NEWS_MI_ADMINGROUPS", "Admin Group Permissions");
+ define("_NEWS_MI_ADMINGROUPS_DESC", "Which groups have access to tools and permissions page");
// Urls
define('_NEWS_MI_FRIENDLYURL', 'URL rewrite method');
define('_NEWS_MI_FRIENDLYURL_DESC', 'Select the URL rewrite mode you want to use.<ul>
@@ -67,9 +70,6 @@
// Lenght Id
define('_NEWS_MI_LENGHTID', 'Rewrite mode:: length for page ID');
define('_NEWS_MI_LENGHTID_DESC', 'Number of digit used in url for page ID');
-// Group Access
- define('_NEWS_MI_GROUPS', 'Groups access');
- define('_NEWS_MI_GROUPS_DESC', 'Select general access permission for groups.');
//Advertisement
define('_NEWS_MI_ADVERTISEMENT', 'Advertisement');
define('_NEWS_MI_ADVERTISEMENT_DESC', 'Enter text or html/Javascript code for your articles');
Modified: XoopsModules/fmcontent/branches/news/language/persian/modinfo.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/persian/modinfo.php 2012-01-14 18:03:21 UTC (rev 8728)
+++ XoopsModules/fmcontent/branches/news/language/persian/modinfo.php 2012-01-15 07:08:34 UTC (rev 8729)
@@ -40,6 +40,9 @@
// Editor
define("_NEWS_MI_FORM_EDITOR", "انتخاب فرم");
define("_NEWS_MI_FORM_EDITOR_DESC", "انتخاب ویرایشگر برای استفاده در صفحه ارسال مطلب.");
+// Admin groups
+ define("_NEWS_MI_ADMINGROUPS", "Admin Group Permissions");
+ define("_NEWS_MI_ADMINGROUPS_DESC", "Which groups have access to tools and permissions page");
// Urls
define('_NEWS_MI_FRIENDLYURL', 'انتخاب آدرس کاربر پسند');
define('_NEWS_MI_FRIENDLYURL_DESC', 'Select the URL rewrite mode you want to use.<ul>
@@ -67,9 +70,6 @@
// Lenght Id
define('_NEWS_MI_LENGHTID', 'طول شماره صفحه');
define('_NEWS_MI_LENGHTID_DESC', 'تعداد ارقام تولید شماره برای صفحه');
-// Group Access
- define('_NEWS_MI_GROUPS', 'دسترسی گروه ها');
- define('_NEWS_MI_GROUPS_DESC', 'دسترسی سراسری گروه ها را مشخص کنید.');
//Advertisement
define('_NEWS_MI_ADVERTISEMENT', 'تبلیغات');
define('_NEWS_MI_ADVERTISEMENT_DESC', 'یک متن یا کد جاوا در این بخش قرار دهید تا در تمام صفحات شما نمایش داده شود');
Modified: XoopsModules/fmcontent/branches/news/rss.php
===================================================================
--- XoopsModules/fmcontent/branches/news/rss.php 2012-01-14 18:03:21 UTC (rev 8728)
+++ XoopsModules/fmcontent/branches/news/rss.php 2012-01-15 07:08:34 UTC (rev 8729)
@@ -104,7 +104,7 @@
'story_user' => $story_user,
'story_start' => 0,
'story_order' => 'DESC',
- 'story_sort' => 'story_create',
+ 'story_sort' => 'story_publish',
'story_status' => '1',
'story_static' => true,
'admin_side' => false
Modified: XoopsModules/fmcontent/branches/news/xoops_version.php
===================================================================
--- XoopsModules/fmcontent/branches/news/xoops_version.php 2012-01-14 18:03:21 UTC (rev 8728)
+++ XoopsModules/fmcontent/branches/news/xoops_version.php 2012-01-15 07:08:34 UTC (rev 8729)
@@ -150,15 +150,18 @@
'default' => 'dhtmltextarea');
// Get groups
+
+$criteria = new CriteriaCompo ();
+$criteria->add ( new Criteria ( 'group_type', 'Admin' ) );
$member_handler =& xoops_gethandler('member');
-$xoopsgroups = $member_handler->getGroupList();
+$xoopsgroups = $member_handler->getGroupList($criteria);
foreach ($xoopsgroups as $key => $group) {
$groups[$group] = $key;
}
$modversion['config'][] = array(
- 'name' => 'groups',
- 'title' => '_NEWS_MI_GROUPS',
- 'description' => '_NEWS_MI_GROUPS_DESC',
+ 'name' => 'admin_groups',
+ 'title' => '_NEWS_MI_ADMINGROUPS',
+ 'description' => '_NEWS_MI_ADMINGROUPS_DESC',
'formtype' => 'select_multi',
'valuetype' => 'array',
'options' => $groups,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
