Menu
▾
▴
xoops-cvs2
|
From: <vo...@us...> - 2011-12-19 11:47:44
|
Revision: 8526
http://xoops.svn.sourceforge.net/xoops/?rev=8526&view=rev
Author: voltan1
Date: 2011-12-19 11:47:33 +0000 (Mon, 19 Dec 2011)
Log Message:
-----------
Fix some bugs
Modified Paths:
--------------
XoopsModules/fmcontent/branches/news/blocks/list.php
XoopsModules/fmcontent/branches/news/class/story.php
XoopsModules/fmcontent/branches/news/sql/mysql.sql
Modified: XoopsModules/fmcontent/branches/news/blocks/list.php
===================================================================
--- XoopsModules/fmcontent/branches/news/blocks/list.php 2011-12-19 09:13:05 UTC (rev 8525)
+++ XoopsModules/fmcontent/branches/news/blocks/list.php 2011-12-19 11:47:33 UTC (rev 8526)
@@ -19,14 +19,16 @@
* @author Hossein Azizabadi (Aka Voltan)
* @version $Id$
*/
-
-require dirname(__FILE__) . '/header.php';
-if (!isset($forMods)) exit('Module not found');
function news_list_show($options) {
$story_handler = xoops_getmodulehandler ( 'story', 'news' );
$topic_handler = xoops_getmodulehandler ( 'topic', 'news' );
+ $module_handler = xoops_gethandler('module');
+
+ require_once XOOPS_ROOT_PATH . '/modules/news/include/functions.php';
+ require_once XOOPS_ROOT_PATH . '/modules/news/class/perm.php';
+ require_once XOOPS_ROOT_PATH . '/modules/news/class/utils.php';
global $xoTheme;
@@ -42,7 +44,11 @@
$width = $options[8];
$float = $options[9];
$story_infos['story_order'] = $options[10];
-
+ $block['showmore'] = $options[11];
+ $block['morelink'] = $options[12];
+
+ array_shift($options);
+ array_shift($options);
array_shift($options);
array_shift($options);
array_shift($options);
@@ -51,12 +57,12 @@
array_shift($options);
array_shift($options);
array_shift($options);
- array_shift($options);
array_shift($options);
array_shift($options);
+ array_shift($options);
- $module_handler = xoops_gethandler('module');
$forMods = $module_handler->getByDirname($forMods);
+
$options0 = $options[0];
$story_infos ['topics'] = $topic_handler->getall ();
Modified: XoopsModules/fmcontent/branches/news/class/story.php
===================================================================
--- XoopsModules/fmcontent/branches/news/class/story.php 2011-12-19 09:13:05 UTC (rev 8525)
+++ XoopsModules/fmcontent/branches/news/class/story.php 2011-12-19 11:47:33 UTC (rev 8526)
@@ -563,18 +563,17 @@
function getContentBlockList($forMods, $story_infos ,$options) {
$ret = array ();
$criteria = new CriteriaCompo ();
- $criteria->add ( new Criteria ( 'story_type', 'news' ) );
$criteria->add ( new Criteria ( 'story_status', '1' ) );
- $access_topic = NewsPermission::getItemIds ( 'news_access', $forMods);
- $criteria->add ( new Criteria ( 'story_topic', '(' . implode ( ',', $access_topic ) . ')', 'IN' ) );
- if (! (count ( $options ) == 1 && $options [0] == 0)) {
- $criteria->add ( new Criteria ( 'story_topic', '(' . implode ( ',', $options ) . ')', 'IN' ) );
- }
$criteria->add ( new Criteria ( 'story_publish', time() , '<=' ));
$criteria->add ( new Criteria ( 'story_publish', 0 , '>' ));
$criteria->add ( new Criteria ( 'story_expire', time() , '>=' ));
$criteria->add ( new Criteria ( 'story_expire', 0 ) ,'OR');
$criteria->add ( new Criteria ( 'story_modid', $forMods->getVar ( 'mid' ) ) );
+ $access_topic = NewsPermission::getItemIds ( 'news_access', $forMods);
+ $criteria->add ( new Criteria ( 'story_topic', '(' . implode ( ',', $access_topic ) . ')', 'IN' ) );
+ if (! (count ( $options ) == 1 && $options [0] == 0)) {
+ $criteria->add ( new Criteria ( 'story_topic', '(' . implode ( ',', $options ) . ')', 'IN' ) );
+ }
$criteria->setSort ( $story_infos ['story_sort'] );
$criteria->setOrder ( $story_infos ['story_order'] );
$criteria->setLimit ( $story_infos ['story_limit'] );
Modified: XoopsModules/fmcontent/branches/news/sql/mysql.sql
===================================================================
--- XoopsModules/fmcontent/branches/news/sql/mysql.sql 2011-12-19 09:13:05 UTC (rev 8525)
+++ XoopsModules/fmcontent/branches/news/sql/mysql.sql 2011-12-19 11:47:33 UTC (rev 8526)
@@ -35,9 +35,12 @@
`doimage` tinyint(1) NOT NULL,
`dosmiley` tinyint(1) NOT NULL,
`doxcode` tinyint(1) NOT NULL,
-PRIMARY KEY (`story_id`,`story_modid`),
-UNIQUE KEY `story_id` (`story_id`,`story_modid`)
-) ENGINE=MyISAM ;
+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;
CREATE TABLE `news_topic` (
@@ -68,8 +71,11 @@
`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 `topic_id` (`topic_id`,`topic_modid`)
+ 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;
CREATE TABLE `news_file` (
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2011-12-22 12:06:14
|
Revision: 8535
http://xoops.svn.sourceforge.net/xoops/?rev=8535&view=rev
Author: voltan1
Date: 2011-12-22 12:06:03 +0000 (Thu, 22 Dec 2011)
Log Message:
-----------
Add rebuild function
Modified Paths:
--------------
XoopsModules/fmcontent/branches/news/admin/tools.php
XoopsModules/fmcontent/branches/news/class/utils.php
XoopsModules/fmcontent/branches/news/language/arabic/admin.php
XoopsModules/fmcontent/branches/news/language/english/admin.php
XoopsModules/fmcontent/branches/news/language/persian/admin.php
XoopsModules/fmcontent/branches/news/templates/admin/news_tools.html
Modified: XoopsModules/fmcontent/branches/news/admin/tools.php
===================================================================
--- XoopsModules/fmcontent/branches/news/admin/tools.php 2011-12-21 14:07:58 UTC (rev 8534)
+++ XoopsModules/fmcontent/branches/news/admin/tools.php 2011-12-22 12:06:03 UTC (rev 8535)
@@ -38,22 +38,6 @@
case 'display':
default:
- // rebuild alias
- $form = new XoopsThemeForm(_NEWS_AM_TOOLS_ALIAS_TITLE, 'tools', 'tools.php', 'post');
- $form->addElement(new XoopsFormRadioYN ( _NEWS_AM_TOOLS_ALIAS_CONTENT, 'topic', "1" ));
- $form->addElement(new XoopsFormRadioYN ( _NEWS_AM_TOOLS_ALIAS_TOPIC, 'content', "1" ));
- $form->addElement(new XoopsFormHidden('op', 'alias'));
- $form->addElement(new XoopsFormButton('', 'post', _SUBMIT, 'submit'));
- $xoopsTpl->assign('alias', $form->render());
-
- // meta alias
- $form = new XoopsThemeForm(_NEWS_AM_TOOLS_META_TITLE, 'tools', 'tools.php', 'post');
- $form->addElement(new XoopsFormRadioYN ( _NEWS_AM_TOOLS_META_KEYWORD, 'keyword', "1" ));
- $form->addElement(new XoopsFormRadioYN ( _NEWS_AM_TOOLS_META_DESCRIPTION, 'description', "1" ));
- $form->addElement(new XoopsFormHidden('op', 'meta'));
- $form->addElement(new XoopsFormButton('', 'post', _SUBMIT, 'submit'));
- $xoopsTpl->assign('meta', $form->render());
-
// Add clone
$form = new XoopsThemeForm(_NEWS_AM_TOOLS_FORMFOLDER_TITLE, 'tools', 'tools.php', 'post');
$form->addElement(new XoopsFormText(_NEWS_AM_TOOLS_FORMFOLDER_NAME, 'folder_name', 50, 255, ''), true);
@@ -86,6 +70,34 @@
$xoopsTpl->assign('purge', $form->render());
}
+ // rebuild alias
+ $form = new XoopsThemeForm(_NEWS_AM_TOOLS_ALIAS_CONTENT, 'tools', 'tools.php', 'post');
+ $form->addElement(new XoopsFormRadioYN ( _NEWS_AM_TOOLS_ALIAS_CONTENT, 'content', "1" ));
+ $form->addElement(new XoopsFormHidden('op', 'alias'));
+ $form->addElement(new XoopsFormButton('', 'post', _SUBMIT, 'submit'));
+ $xoopsTpl->assign('alias', $form->render());
+
+ // rebuild topic alias
+ $form = new XoopsThemeForm(_NEWS_AM_TOOLS_ALIAS_TOPIC, 'tools', 'tools.php', 'post');
+ $form->addElement(new XoopsFormRadioYN ( _NEWS_AM_TOOLS_ALIAS_TOPIC, 'topic', "1" ));
+ $form->addElement(new XoopsFormHidden('op', 'topicalias'));
+ $form->addElement(new XoopsFormButton('', 'post', _SUBMIT, 'submit'));
+ $xoopsTpl->assign('topicalias', $form->render());
+
+ // rebuild description
+ $form = new XoopsThemeForm(_NEWS_AM_TOOLS_META_DESCRIPTION, 'tools', 'tools.php', 'post');
+ $form->addElement(new XoopsFormRadioYN ( _NEWS_AM_TOOLS_META_DESCRIPTION, 'description', "1" ));
+ $form->addElement(new XoopsFormHidden('op', 'description'));
+ $form->addElement(new XoopsFormButton('', 'post', _SUBMIT, 'submit'));
+ $xoopsTpl->assign('description', $form->render());
+
+ // rebuild keyword
+ $form = new XoopsThemeForm(_NEWS_AM_TOOLS_META_KEYWORD, 'tools', 'tools.php', 'post');
+ $form->addElement(new XoopsFormRadioYN ( _NEWS_AM_TOOLS_META_KEYWORD, 'keyword', "1" ));
+ $form->addElement(new XoopsFormHidden('op', 'keyword'));
+ $form->addElement(new XoopsFormButton('', 'post', _SUBMIT, 'submit'));
+ $xoopsTpl->assign('keyword', $form->render());
+
// other options
$xoopsTpl->assign('header', true );
break;
@@ -112,88 +124,36 @@
$story_handler->deleteAll(new Criteria('story_modid', $id));
$topic_handler->deleteAll(new Criteria('topic_modid', $id));
}
- News_Redirect('tools.php', 1, _NEWS_AM_MSG_WAIT);
+ News_Redirect('tools.php', 20, _NEWS_AM_MSG_WAIT);
break;
-
- case 'alias':
-
-
- if($_POST['topic']) {
- $criteria = new CriteriaCompo ();
- $criteria->setSort ( 'topic_id' );
- $criteria->setOrder ( 'DESC' );
- $criteria->setLimit ( 1 );
- $last = $topic_handler->getObjects ( $criteria );
- foreach ( $last as $item ) {
- $last_id = $item->getVar ( 'topic_id' );
- }
- $topic_id = '1';
- while ($topic_id <= $last_id) {
- $obj = $topic_handler->get ( $topic_id );
- if($obj) {
- $obj->setVar ( 'topic_alias', News_Filter($obj->getVar ( 'topic_title', 'e' )));
- $topic_handler->insert ( $obj );
- }
- $topic_id = $topic_id + 1;
- }
- }
-
- if($_POST['content']) {
- $criteria = new CriteriaCompo ();
- $criteria->setSort ( 'story_id' );
- $criteria->setOrder ( 'DESC' );
- $criteria->setLimit ( 1 );
- $last = $story_handler->getObjects ( $criteria );
- foreach ( $last as $item ) {
- $last_id = $item->getVar ( 'story_id' );
- }
- $story_id = '1';
- while ($story_id <= $last_id) {
- $obj = $story_handler->get ( $story_id );
- if($obj) {
- $obj->setVar ( 'story_alias', News_Filter($obj->getVar ( 'story_title', 'e' )));
- $story_handler->insert ( $obj );
- }
- $story_id = $story_id + 1;
- }
- }
- News_Redirect('tools.php', 1, _NEWS_AM_MSG_WAIT);
- break;
+
+ case 'alias':
+ $start_id = news_CleanVars($_REQUEST, 'start_id', '1', 'int');
+ $end_id = news_CleanVars($_REQUEST, 'end_id', '1', 'int');
+ NewsUtils::news_rebuild ($story_handler , 'story_id' , 'alias' , 'story_alias' , 'story_title' , $start_id , $end_id);
+ News_Redirect('tools.php', 20, _NEWS_AM_MSG_WAIT);
+ break;
+
+ case 'topicalias':
+ $start_id = news_CleanVars($_REQUEST, 'start_id', '1', 'int');
+ $end_id = news_CleanVars($_REQUEST, 'end_id', '1', 'int');
+ NewsUtils::news_rebuild ($topic_handler , 'topic_id' , 'topicalias' , 'topic_alias' , 'topic_title' , $start_id , $end_id);
+ News_Redirect('tools.php', 20, _NEWS_AM_MSG_WAIT);
+ break;
- case 'meta':
- $criteria = new CriteriaCompo ();
- $criteria->setSort ( 'story_id' );
- $criteria->setOrder ( 'DESC' );
- $criteria->setLimit ( 1 );
- $last = $story_handler->getObjects ( $criteria );
- foreach ( $last as $item ) {
- $last_id = $item->getVar ( 'story_id' );
- }
- $story_id = '1';
-
- if($_POST['keyword']) {
- while ($story_id <= $last_id) {
- $obj = $story_handler->get ( $story_id );
- if($obj) {
- $obj->setVar ( 'story_words', News_MetaFilter($obj->getVar ( 'story_title', 'e' )));
- $story_handler->insert ( $obj );
- }
- $story_id = $story_id + 1;
- }
- }
-
- if($_POST['description']) {
- while ($story_id <= $last_id) {
- $obj = $story_handler->get ( $story_id );
- if($obj) {
- $obj->setVar ( 'story_desc', News_AjaxFilter($obj->getVar ( 'story_title', 'e' )));
- $story_handler->insert ( $obj );
- }
- $story_id = $story_id + 1;
- }
- }
- News_Redirect('tools.php', 1, _NEWS_AM_MSG_WAIT);
- break;
+ case 'keyword':
+ $start_id = news_CleanVars($_REQUEST, 'start_id', '1', 'int');
+ $end_id = news_CleanVars($_REQUEST, 'end_id', '1', 'int');
+ NewsUtils::news_rebuild ($story_handler , 'story_id' , 'keyword' , 'story_words' , 'story_title' , $start_id , $end_id);
+ News_Redirect('tools.php', 20, _NEWS_AM_MSG_WAIT);
+ break;
+
+ case 'description':
+ $start_id = news_CleanVars($_REQUEST, 'start_id', '1', 'int');
+ $end_id = news_CleanVars($_REQUEST, 'end_id', '1', 'int');
+ NewsUtils::news_rebuild ($story_handler , 'story_id' , 'description' , 'story_desc' , 'story_title' , $start_id , $end_id);
+ News_Redirect('tools.php', 20, _NEWS_AM_MSG_WAIT);
+ break;
}
$xoopsTpl->assign('navigation', 'tools');
Modified: XoopsModules/fmcontent/branches/news/class/utils.php
===================================================================
--- XoopsModules/fmcontent/branches/news/class/utils.php 2011-12-21 14:07:58 UTC (rev 8534)
+++ XoopsModules/fmcontent/branches/news/class/utils.php 2011-12-22 12:06:03 UTC (rev 8535)
@@ -379,6 +379,67 @@
}
return true;
}
+
+ /**
+ * Rebuild
+ */
+ function news_rebuild ($handler , $item_id , $op , $set , $get , $start_id, $end_id) {
+ // check last_id
+ $criteria = new CriteriaCompo ();
+ $criteria->setSort ( $item_id );
+ $criteria->setOrder ( 'DESC' );
+ $criteria->setLimit ( 1 );
+ $last = $handler->getObjects ( $criteria );
+ foreach ( $last as $item ) {
+ $last_id = $item->getVar ( $item_id );
+ }
+ // set end_id
+ $end_id = $end_id + 100;
+
+ // do rebuild
+ while ($start_id <= $end_id) {
+ $obj = $handler->get ( $start_id );
+ if($obj) {
+ $new = self::news_dorebuild ($op , $obj->getVar ( $get, 'e' ));
+ $obj->setVar ( $set , $new);
+ $handler->insert ( $obj );
+ }
+ $start_id = $start_id + 1;
+ }
+
+
+ // Redirect
+ if($start_id <= $last_id) {
+ News_Redirect('tools.php?op='.$op.'&start_id='.$start_id.'&end_id='.$end_id, 20, _NEWS_AM_MSG_INPROC);
+ xoops_cp_footer ();
+ exit ();
+ }
+
+ }
+
+ /**
+ * Make text for Rebuild
+ */
+ function news_dorebuild ($op , $get) {
+ switch($op) {
+ case 'alias':
+ $item = News_Filter($get);
+ break;
+
+ case 'topicalias':
+ $item = News_Filter($get);
+ break;
+
+ case 'keyword':
+ $item = News_MetaFilter($get);
+ break;
+
+ case 'description':
+ $item = News_AjaxFilter($get);
+ break;
+ }
+ return $item;
+ }
}
?>
\ No newline at end of file
Modified: XoopsModules/fmcontent/branches/news/language/arabic/admin.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/arabic/admin.php 2011-12-21 14:07:58 UTC (rev 8534)
+++ XoopsModules/fmcontent/branches/news/language/arabic/admin.php 2011-12-22 12:06:03 UTC (rev 8535)
@@ -138,6 +138,7 @@
define('_NEWS_AM_TOOLS_META_TITLE', 'Rebuild Metas');
define('_NEWS_AM_TOOLS_META_KEYWORD', 'Rebuild Meta keywords');
define('_NEWS_AM_TOOLS_META_DESCRIPTION', 'Rebuild Meta Description');
+ define('_NEWS_AM_MSG_INPROC', 'Rebuilding ... ');
// Permissions
define('_NEWS_AM_PERMISSIONS_ACCESS', 'إتاحة العرض');
define('_NEWS_AM_PERMISSIONS_SUBMIT', 'إتاحة الإرسال');
Modified: XoopsModules/fmcontent/branches/news/language/english/admin.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/english/admin.php 2011-12-21 14:07:58 UTC (rev 8534)
+++ XoopsModules/fmcontent/branches/news/language/english/admin.php 2011-12-22 12:06:03 UTC (rev 8535)
@@ -166,7 +166,8 @@
define('_NEWS_AM_MSG_INSERT_ERROR', 'Could not update database! Insert content error ');
define('_NEWS_AM_MSG_CLONE_ERROR', 'This folder already exists !');
define('_NEWS_AM_MSG_NOPERMSSET', 'Permission cannot be set: No Topics created yet! Please create a Topic first.');
- define('_NEWS_AM_MSG_ALIASERROR', 'Your selected Alias is already taken. Please change it and try again');
+ define('_NEWS_AM_MSG_ALIASERROR', 'Your selected Alias is already taken. Please change it and try again');
+ define('_NEWS_AM_MSG_INPROC', 'Rebuilding ... ');
// about
define('_NEWS_AM_ABOUT_ADMIN', 'About');
define('_NEWS_AM_ABOUT_DESCRIPTION', 'Description:');
Modified: XoopsModules/fmcontent/branches/news/language/persian/admin.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/persian/admin.php 2011-12-21 14:07:58 UTC (rev 8534)
+++ XoopsModules/fmcontent/branches/news/language/persian/admin.php 2011-12-22 12:06:03 UTC (rev 8535)
@@ -137,7 +137,8 @@
define('_NEWS_AM_TOOLS_ALIAS_TOPIC', 'دوباره سازی نام مستعار شاخه');
define('_NEWS_AM_TOOLS_META_TITLE', 'Rebuild Metas');
define('_NEWS_AM_TOOLS_META_KEYWORD', 'Rebuild Meta keywords');
- define('_NEWS_AM_TOOLS_META_DESCRIPTION', 'Rebuild Meta Description');
+ define('_NEWS_AM_TOOLS_META_DESCRIPTION', 'Rebuild Meta Description');
+ define('_NEWS_AM_MSG_INPROC', 'Rebuilding ... ');
// Permissions
define('_NEWS_AM_PERMISSIONS_ACCESS', 'دسترسی نمایش');
define('_NEWS_AM_PERMISSIONS_SUBMIT', 'دسترسی ارسال');
Modified: XoopsModules/fmcontent/branches/news/templates/admin/news_tools.html
===================================================================
--- XoopsModules/fmcontent/branches/news/templates/admin/news_tools.html 2011-12-21 14:07:58 UTC (rev 8534)
+++ XoopsModules/fmcontent/branches/news/templates/admin/news_tools.html 2011-12-22 12:06:03 UTC (rev 8535)
@@ -5,7 +5,9 @@
<{if $folder}><{$folder}><{/if}>
<{if $purge}><{$purge}><{/if}>
<{if $alias}><{$alias}><{/if}>
- <{if $meta}><{$meta}><{/if}>
+ <{if $topicalias}><{$topicalias}><{/if}>
+ <{if $description}><{$description}><{/if}>
+ <{if $keyword}><{$keyword}><{/if}>
<{if $messages}>
<div id="xo-module-log">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2011-12-23 15:30:37
|
Revision: 8538
http://xoops.svn.sourceforge.net/xoops/?rev=8538&view=rev
Author: voltan1
Date: 2011-12-23 15:30:28 +0000 (Fri, 23 Dec 2011)
Log Message:
-----------
Rename class and function name
Modified Paths:
--------------
XoopsModules/fmcontent/branches/news/admin/about.php
XoopsModules/fmcontent/branches/news/admin/ajax.php
XoopsModules/fmcontent/branches/news/admin/article.php
XoopsModules/fmcontent/branches/news/admin/backend.php
XoopsModules/fmcontent/branches/news/admin/file.php
XoopsModules/fmcontent/branches/news/admin/header.php
XoopsModules/fmcontent/branches/news/admin/index.php
XoopsModules/fmcontent/branches/news/admin/permissions.php
XoopsModules/fmcontent/branches/news/admin/tools.php
XoopsModules/fmcontent/branches/news/admin/topic.php
XoopsModules/fmcontent/branches/news/ajax.php
XoopsModules/fmcontent/branches/news/article.php
XoopsModules/fmcontent/branches/news/blocks/list.php
XoopsModules/fmcontent/branches/news/blocks/page.php
XoopsModules/fmcontent/branches/news/class/file.php
XoopsModules/fmcontent/branches/news/class/perm.php
XoopsModules/fmcontent/branches/news/class/story.php
XoopsModules/fmcontent/branches/news/class/topic.php
XoopsModules/fmcontent/branches/news/class/utils.php
XoopsModules/fmcontent/branches/news/header.php
XoopsModules/fmcontent/branches/news/include/functions.php
XoopsModules/fmcontent/branches/news/include/search.inc.php
XoopsModules/fmcontent/branches/news/index.php
XoopsModules/fmcontent/branches/news/pdf.php
XoopsModules/fmcontent/branches/news/print.php
XoopsModules/fmcontent/branches/news/rss.php
XoopsModules/fmcontent/branches/news/submit.php
XoopsModules/fmcontent/branches/news/topic.php
XoopsModules/fmcontent/branches/news/xoops_version.php
Modified: XoopsModules/fmcontent/branches/news/admin/about.php
===================================================================
--- XoopsModules/fmcontent/branches/news/admin/about.php 2011-12-22 19:31:36 UTC (rev 8537)
+++ XoopsModules/fmcontent/branches/news/admin/about.php 2011-12-23 15:30:28 UTC (rev 8538)
@@ -21,16 +21,16 @@
*/
require dirname(__FILE__) . '/header.php';
-if (!isset($forMods)) exit('Module not found');
+if (!isset($NewsModule)) exit('Module not found');
// Display Admin header
xoops_cp_header();
// Add module stylesheet
-$xoTheme->addStylesheet(XOOPS_URL . '/modules/' . $forMods->getVar('dirname') . '/css/admin.css');
+$xoTheme->addStylesheet(XOOPS_URL . '/modules/' . $NewsModule->getVar('dirname') . '/css/admin.css');
$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
// Add Changelog
-$file = XOOPS_ROOT_PATH . "/modules/" . $forMods->getVar("dirname") . "/docs/changelog.txt";
+$file = XOOPS_ROOT_PATH . "/modules/" . $NewsModule->getVar("dirname") . "/docs/changelog.txt";
if (is_readable($file)) {
$xoopsTpl->assign('module_changelog', utf8_encode(implode("<br />", file($file))));
} else {
@@ -39,22 +39,22 @@
$xoopsTpl->assign('navigation', 'about');
$xoopsTpl->assign('navtitle', _NEWS_MI_ABOUT);
-$xoopsTpl->assign('module_name', $forMods->getInfo("name"));
-$xoopsTpl->assign('module_description', $forMods->getInfo("description"));
-$xoopsTpl->assign('module_icon', $forMods->getInfo("image"));
-$xoopsTpl->assign('module_version', $forMods->getInfo("version"));
-$xoopsTpl->assign('module_author', $forMods->getInfo("author"));
-$xoopsTpl->assign('module_credits', $forMods->getInfo("credits"));
-$xoopsTpl->assign('module_license', $forMods->getInfo("license"));
-$xoopsTpl->assign('module_license_url', $forMods->getInfo("license_url"));
-$xoopsTpl->assign('module_release_date', $forMods->getInfo("release_date"));
+$xoopsTpl->assign('module_name', $NewsModule->getInfo("name"));
+$xoopsTpl->assign('module_description', $NewsModule->getInfo("description"));
+$xoopsTpl->assign('module_icon', $NewsModule->getInfo("image"));
+$xoopsTpl->assign('module_version', $NewsModule->getInfo("version"));
+$xoopsTpl->assign('module_author', $NewsModule->getInfo("author"));
+$xoopsTpl->assign('module_credits', $NewsModule->getInfo("credits"));
+$xoopsTpl->assign('module_license', $NewsModule->getInfo("license"));
+$xoopsTpl->assign('module_license_url', $NewsModule->getInfo("license_url"));
+$xoopsTpl->assign('module_release_date', $NewsModule->getInfo("release_date"));
$xoopsTpl->assign('module_last_update', formatTimestamp($xoopsModule->getVar("last_update"), "m"));
-$xoopsTpl->assign('module_status', $forMods->getInfo("module_status"));
-$xoopsTpl->assign('module_website_url', $forMods->getInfo("module_website_url"));
-$xoopsTpl->assign('module_website_name', $forMods->getInfo("module_website_name"));
+$xoopsTpl->assign('module_status', $NewsModule->getInfo("module_status"));
+$xoopsTpl->assign('module_website_url', $NewsModule->getInfo("module_website_url"));
+$xoopsTpl->assign('module_website_name', $NewsModule->getInfo("module_website_name"));
// Call template file
-$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/' . $forMods->getVar('dirname') . '/templates/admin/news_about.html');
+$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/' . $NewsModule->getVar('dirname') . '/templates/admin/news_about.html');
include "footer.php";
xoops_cp_footer();
Modified: XoopsModules/fmcontent/branches/news/admin/ajax.php
===================================================================
--- XoopsModules/fmcontent/branches/news/admin/ajax.php 2011-12-22 19:31:36 UTC (rev 8537)
+++ XoopsModules/fmcontent/branches/news/admin/ajax.php 2011-12-23 15:30:28 UTC (rev 8538)
@@ -20,27 +20,27 @@
*/
require dirname(__FILE__) . '/header.php';
-if (!isset($forMods)) exit('Module not found');
+if (!isset($NewsModule)) exit('Module not found');
error_reporting(0);
$GLOBALS['xoopsLogger']->activated = false;
-$ajax_type = news_CleanVars($_REQUEST, 'type', '', 'string');
+$ajax_type = NewsUtils::News_CleanVars($_REQUEST, 'type', '', 'string');
switch ($ajax_type) {
case 'filter':
- $value = $func = news_CleanVars($_REQUEST, 'value', '', 'string');
- echo News_Filter($value);
+ $value = $func = NewsUtils::News_CleanVars($_REQUEST, 'value', '', 'string');
+ echo NewsUtils::News_AliasFilter($value);
break;
case 'words':
- $value = $func = news_CleanVars($_REQUEST, 'value', '', 'string');
- echo News_MetaFilter($value);
+ $value = $func = NewsUtils::News_CleanVars($_REQUEST, 'value', '', 'string');
+ echo NewsUtils::News_MetaFilter($value);
break;
case 'desc':
- $value = $func = news_CleanVars($_REQUEST, 'value', '', 'string');
- echo News_AjaxFilter($value);
+ $value = $func = NewsUtils::News_CleanVars($_REQUEST, 'value', '', 'string');
+ echo NewsUtils::News_AjaxFilter($value);
break;
}
Modified: XoopsModules/fmcontent/branches/news/admin/article.php
===================================================================
--- XoopsModules/fmcontent/branches/news/admin/article.php 2011-12-22 19:31:36 UTC (rev 8537)
+++ XoopsModules/fmcontent/branches/news/admin/article.php 2011-12-23 15:30:28 UTC (rev 8538)
@@ -20,13 +20,13 @@
*/
require dirname(__FILE__) . '/header.php';
-if (!isset($forMods)) exit('Module not found');
+if (!isset($NewsModule)) exit('Module not found');
include_once XOOPS_ROOT_PATH . "/class/pagenav.php";
// Display Admin header
xoops_cp_header();
// Define default value
-$op = news_CleanVars($_REQUEST, 'op', '', 'string');
+$op = NewsUtils::News_CleanVars($_REQUEST, 'op', '', 'string');
// Initialize content handler
$topic_handler = xoops_getmodulehandler('topic', 'news');
$story_handler = xoops_getmodulehandler('story', 'news');
@@ -34,46 +34,46 @@
// Define scripts
$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
$xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
-$xoTheme->addScript('browse.php?modules/' . $forMods->getVar('dirname') . '/js/order.js');
-$xoTheme->addScript('browse.php?modules/' . $forMods->getVar('dirname') . '/js/admin.js');
+$xoTheme->addScript('browse.php?modules/' . $NewsModule->getVar('dirname') . '/js/order.js');
+$xoTheme->addScript('browse.php?modules/' . $NewsModule->getVar('dirname') . '/js/admin.js');
// Add module stylesheet
-$xoTheme->addStylesheet(XOOPS_URL . '/modules/' . $forMods->getVar('dirname') . '/css/admin.css');
+$xoTheme->addStylesheet(XOOPS_URL . '/modules/' . $NewsModule->getVar('dirname') . '/css/admin.css');
$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
// get module configs
-$story_perpage = xoops_getModuleOption('admin_perpage', $forMods->getVar('dirname'));
-$story_order = xoops_getModuleOption('admin_showorder', $forMods->getVar('dirname'));
-$story_sort = xoops_getModuleOption('admin_showsort', $forMods->getVar('dirname'));
+$story_perpage = xoops_getModuleOption('admin_perpage', $NewsModule->getVar('dirname'));
+$story_order = xoops_getModuleOption('admin_showorder', $NewsModule->getVar('dirname'));
+$story_sort = xoops_getModuleOption('admin_showsort', $NewsModule->getVar('dirname'));
// get user id content
if (isset($_REQUEST["user"])) {
- $story_user = news_CleanVars($_REQUEST, 'user', 0, 'int');
+ $story_user = NewsUtils::News_CleanVars($_REQUEST, 'user', 0, 'int');
} else {
$story_user = null;
}
// get limited information
if (isset($_REQUEST['limit'])) {
- $story_limit = news_CleanVars($_REQUEST, 'limit', 0, 'int');
+ $story_limit = NewsUtils::News_CleanVars($_REQUEST, 'limit', 0, 'int');
} else {
$story_limit = $story_perpage;
}
// get start information
if (isset($_REQUEST['start'])) {
- $story_start = news_CleanVars($_REQUEST, 'start', 0, 'int');
+ $story_start = NewsUtils::News_CleanVars($_REQUEST, 'start', 0, 'int');
} else {
$story_start = 0;
}
// get topic information
if (isset($_REQUEST['topic'])) {
- $story_topic = news_CleanVars($_REQUEST, 'topic', 0, 'int');
+ $story_topic = NewsUtils::News_CleanVars($_REQUEST, 'topic', 0, 'int');
if ($story_topic) {
$topics = $topic_handler->getall($story_topic);
- $topic_title = NewsTopicHandler::getTopicFromId ( $story_topic );
+ $topic_title = NewsTopicHandler::News_GetTopicFromId ( $story_topic );
} else {
$topics = $topic_title = _NEWS_AM_CONTENT_STATICS;
}
@@ -86,27 +86,27 @@
switch ($op)
{
case 'new_content':
- $story_type = news_CleanVars($_REQUEST, 'story_type', 'news', 'string');
+ $story_type = NewsUtils::News_CleanVars($_REQUEST, 'story_type', 'news', 'string');
$obj = $story_handler->create();
- $obj->getContentForm($forMods, $story_type);
+ $obj->News_GetContentForm($NewsModule, $story_type);
break;
case 'edit_content':
- $story_id = news_CleanVars($_REQUEST, 'story_id', 0, 'int');
+ $story_id = NewsUtils::News_CleanVars($_REQUEST, 'story_id', 0, 'int');
if ($story_id > 0) {
$obj = $story_handler->get($story_id);
- $obj->getContentForm($forMods);
+ $obj->News_GetContentForm($NewsModule);
} else {
- News_Redirect('article.php', 1, _NEWS_AM_MSG_EDIT_ERROR);
+ NewsUtils::News_Redirect('article.php', 1, _NEWS_AM_MSG_EDIT_ERROR);
}
break;
case 'delete':
- $story_id = news_CleanVars($_REQUEST, 'story_id', '0', 'int');
+ $story_id = NewsUtils::News_CleanVars($_REQUEST, 'story_id', '0', 'int');
if ($story_id > 0) {
$content = $story_handler->get($story_id);
// Prompt message
- News_Message('backend.php', sprintf(_NEWS_AM_MSG_DELETE, $content->getVar('story_type') . ': "' . $content->getVar('story_title') . '"'), $story_id, 'content');
+ NewsUtils::News_Message('backend.php', sprintf(_NEWS_AM_MSG_DELETE, $content->getVar('story_type') . ': "' . $content->getVar('story_title') . '"'), $story_id, 'content');
// Display Admin footer
xoops_cp_footer();
}
@@ -143,8 +143,8 @@
'story_static' => false,
);
- $contents = $story_handler->getExpireContentList($forMods, $story_infos);
- $story_numrows = $story_handler->getExpireContentCount($forMods, $story_infos);
+ $contents = $story_handler->News_GetExpireContentList($NewsModule, $story_infos);
+ $story_numrows = $story_handler->News_GetExpireContentCount($NewsModule, $story_infos);
if ($story_numrows > $story_limit) {
$story_pagenav = new XoopsPageNav($story_numrows, $story_limit, $story_start, 'start', 'limit=' . $story_limit . '&op=offline');
@@ -158,11 +158,11 @@
$xoopsTpl->assign('topic_title', $topic_title);
$xoopsTpl->assign('contents', $contents);
$xoopsTpl->assign('story_pagenav', $story_pagenav);
- $xoopsTpl->assign('xoops_dirname', $forMods->getVar('dirname'));
+ $xoopsTpl->assign('xoops_dirname', $NewsModule->getVar('dirname'));
$xoopsTpl->assign('news_tips', _NEWS_AM_CONTENT_TIPS);
// Call template file
- $xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/' . $forMods->getVar('dirname') . '/templates/admin/news_article.html');
+ $xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/' . $NewsModule->getVar('dirname') . '/templates/admin/news_article.html');
break;
@@ -180,8 +180,8 @@
'story_static' => false,
);
- $contents = $story_handler->getAdminContentList($forMods, $story_infos);
- $story_numrows = $story_handler->getOfflineContentCount($forMods, $story_infos);
+ $contents = $story_handler->News_GetAdminContentList($NewsModule, $story_infos);
+ $story_numrows = $story_handler->News_GetOfflineContentCount($NewsModule, $story_infos);
if ($story_numrows > $story_limit) {
$story_pagenav = new XoopsPageNav($story_numrows, $story_limit, $story_start, 'start', 'limit=' . $story_limit . '&op=offline');
@@ -195,11 +195,11 @@
$xoopsTpl->assign('topic_title', $topic_title);
$xoopsTpl->assign('contents', $contents);
$xoopsTpl->assign('story_pagenav', $story_pagenav);
- $xoopsTpl->assign('xoops_dirname', $forMods->getVar('dirname'));
+ $xoopsTpl->assign('xoops_dirname', $NewsModule->getVar('dirname'));
$xoopsTpl->assign('news_tips', _NEWS_AM_CONTENT_TIPS);
// Call template file
- $xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/' . $forMods->getVar('dirname') . '/templates/admin/news_article.html');
+ $xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/' . $NewsModule->getVar('dirname') . '/templates/admin/news_article.html');
break;
@@ -217,8 +217,8 @@
'story_static' => false,
);
- $contents = $story_handler->getAdminContentList($forMods, $story_infos);
- $story_numrows = $story_handler->getAdminContentCount($forMods, $story_infos);
+ $contents = $story_handler->News_GetAdminContentList($NewsModule, $story_infos);
+ $story_numrows = $story_handler->News_GetAdminContentCount($NewsModule, $story_infos);
if ($story_numrows > $story_limit) {
if ($story_topic) {
@@ -236,11 +236,11 @@
$xoopsTpl->assign('topic_title', $topic_title);
$xoopsTpl->assign('contents', $contents);
$xoopsTpl->assign('story_pagenav', $story_pagenav);
- $xoopsTpl->assign('xoops_dirname', $forMods->getVar('dirname'));
+ $xoopsTpl->assign('xoops_dirname', $NewsModule->getVar('dirname'));
$xoopsTpl->assign('news_tips', _NEWS_AM_CONTENT_TIPS);
// Call template file
- $xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/' . $forMods->getVar('dirname') . '/templates/admin/news_article.html');
+ $xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/' . $NewsModule->getVar('dirname') . '/templates/admin/news_article.html');
break;
Modified: XoopsModules/fmcontent/branches/news/admin/backend.php
===================================================================
--- XoopsModules/fmcontent/branches/news/admin/backend.php 2011-12-22 19:31:36 UTC (rev 8537)
+++ XoopsModules/fmcontent/branches/news/admin/backend.php 2011-12-23 15:30:28 UTC (rev 8538)
@@ -20,15 +20,15 @@
*/
require dirname(__FILE__) . '/header.php';
-if (! isset ( $forMods )) exit ( 'Module not found' );
+if (! isset ( $NewsModule )) exit ( 'Module not found' );
// Define default value
-$op = news_CleanVars ( $_REQUEST, 'op', 'new', 'string' );
+$op = NewsUtils::News_CleanVars ( $_REQUEST, 'op', 'new', 'string' );
// Admin header
xoops_cp_header ();
// Redirect to content page
if (! isset ( $op )) {
- News_Redirect ( 'index.php', 0, _NEWS_AM_MSG_WAIT );
+ NewsUtils::News_Redirect ( 'index.php', 0, _NEWS_AM_MSG_WAIT );
// Include footer
xoops_cp_footer ();
exit ();
@@ -45,21 +45,21 @@
$obj = $topic_handler->create ();
$obj->setVars ( $_REQUEST );
- if($topic_handler->existAlias($forMods,$_REQUEST)) {
- News_Redirect ( "javascript:history.go(-1)", 3, _NEWS_AM_MSG_ALIASERROR );
+ if($topic_handler->News_ExistTopicAlias($NewsModule,$_REQUEST)) {
+ NewsUtils::News_Redirect ( "javascript:history.go(-1)", 3, _NEWS_AM_MSG_ALIASERROR );
xoops_cp_footer ();
exit ();
}
$obj->setVar ( 'topic_date_created', time () );
$obj->setVar ( 'topic_date_update', time () );
- $obj->setVar ( 'topic_weight', $topic_handler->setorder($forMods) );
+ $obj->setVar ( 'topic_weight', $topic_handler->setorder($NewsModule) );
//image
- NewsUtils::uploadimg ( $forMods, 'topic_img', $obj, $_REQUEST ['topic_img'] );
+ NewsUtils::News_UploadImg ( $NewsModule, 'topic_img', $obj, $_REQUEST ['topic_img'] );
if (! $topic_handler->insert ( $obj )) {
- News_Redirect ( 'onclick="javascript:history.go(-1);"', 1, _NEWS_AM_MSG_ERROR );
+ NewsUtils::News_Redirect ( 'onclick="javascript:history.go(-1);"', 1, _NEWS_AM_MSG_ERROR );
xoops_cp_footer ();
exit ();
}
@@ -67,47 +67,47 @@
$topic_id = $obj->db->getInsertId ();
//permission
- NewsPermission::setpermission ( $forMods, 'news_access', $_POST ['groups_view'], $topic_id, true );
- NewsPermission::setpermission ( $forMods, 'news_submit', $_POST ['groups_submit'], $topic_id, true );
+ NewsPermission::News_SetPermission ( $NewsModule, 'news_access', $_POST ['groups_view'], $topic_id, true );
+ NewsPermission::News_SetPermission ( $NewsModule, 'news_submit', $_POST ['groups_submit'], $topic_id, true );
// Redirect page
- News_Redirect ( 'topic.php', 1, _NEWS_AM_MSG_WAIT );
+ NewsUtils::News_Redirect ( 'topic.php', 1, _NEWS_AM_MSG_WAIT );
xoops_cp_footer ();
exit ();
break;
case 'edit_topic' :
- $topic_id = news_CleanVars ( $_REQUEST, 'topic_id', 0, 'int' );
+ $topic_id = NewsUtils::News_CleanVars ( $_REQUEST, 'topic_id', 0, 'int' );
if ($topic_id > 0) {
$obj = $topic_handler->get ( $topic_id );
$obj->setVars ( $_POST );
$obj->setVar ( 'topic_date_update', time () );
- if($topic_handler->existAlias($forMods,$_REQUEST)) {
- News_Redirect ( "javascript:history.go(-1)", 3, _NEWS_AM_MSG_ALIASERROR );
+ if($topic_handler->News_ExistTopicAlias($NewsModule,$_REQUEST)) {
+ NewsUtils::News_Redirect ( "javascript:history.go(-1)", 3, _NEWS_AM_MSG_ALIASERROR );
xoops_cp_footer ();
exit ();
}
//image
- NewsUtils::uploadimg ( $forMods, 'topic_img', $obj, $_REQUEST ['topic_img'] );
+ NewsUtils::News_UploadImg ( $NewsModule, 'topic_img', $obj, $_REQUEST ['topic_img'] );
if (isset ( $_POST ['deleteimage'] ) && intval ( $_POST ['deleteimage'] ) == 1) {
- NewsUtils::deleteimg ( $forMods, 'topic_img', $obj );
+ NewsUtils::News_DeleteImg ( $NewsModule, 'topic_img', $obj );
}
//permission
- NewsPermission::setpermission ( $forMods, 'news_access', $_POST ['groups_view'], $topic_id, false );
- NewsPermission::setpermission ( $forMods, 'news_submit', $_POST ['groups_submit'], $topic_id, false );
+ NewsPermission::News_SetPermission ( $NewsModule, 'news_access', $_POST ['groups_view'], $topic_id, false );
+ NewsPermission::News_SetPermission ( $NewsModule, 'news_submit', $_POST ['groups_submit'], $topic_id, false );
if (! $topic_handler->insert ( $obj )) {
- News_Redirect ( 'onclick="javascript:history.go(-1);"', 1, _NEWS_AM_MSG_ERROR );
+ NewsUtils::News_Redirect ( 'onclick="javascript:history.go(-1);"', 1, _NEWS_AM_MSG_ERROR );
xoops_cp_footer ();
exit ();
}
}
// Redirect page
- News_Redirect ( 'topic.php', 1, _NEWS_AM_MSG_WAIT );
+ NewsUtils::News_Redirect ( 'topic.php', 1, _NEWS_AM_MSG_WAIT );
xoops_cp_footer ();
exit ();
break;
@@ -119,15 +119,15 @@
$obj = $story_handler->create ();
$obj->setVars ( $_REQUEST );
- if($story_handler->existAlias($forMods,$_REQUEST)) {
- News_Redirect ( "javascript:history.go(-1)", 3, _NEWS_AM_MSG_ALIASERROR );
+ if($story_handler->News_ExistAlias($NewsModule,$_REQUEST)) {
+ NewsUtils::News_Redirect ( "javascript:history.go(-1)", 3, _NEWS_AM_MSG_ALIASERROR );
xoops_cp_footer ();
exit ();
}
if(!$_REQUEST ['story_default'] && $_REQUEST ['story_topic'] == 0) {
$criteria = new CriteriaCompo ();
- $criteria->add ( new Criteria ( 'story_modid', $forMods->getVar ( 'mid' ) ) );
+ $criteria->add ( new Criteria ( 'story_modid', $NewsModule->getVar ( 'mid' ) ) );
$criteria->add ( new Criteria ( 'story_topic', 0) );
$criteria->add ( new Criteria ( 'story_default', 1 ) );
if(!$story_handler->getCount ( $criteria )) {
@@ -135,9 +135,9 @@
}
}
- $obj->setVar ( 'story_order', $story_handler->setorder($forMods) );
- $obj->setVar ( 'story_next', $story_handler->setNext($forMods, $_REQUEST ['story_topic']) );
- $obj->setVar ( 'story_prev', $story_handler->setPrevious($forMods, $_REQUEST ['story_topic']) );
+ $obj->setVar ( 'story_order', $story_handler->News_SetContentOrder($NewsModule) );
+ $obj->setVar ( 'story_next', $story_handler->News_SetNext($NewsModule, $_REQUEST ['story_topic']) );
+ $obj->setVar ( 'story_prev', $story_handler->News_SetPrevious($NewsModule, $_REQUEST ['story_topic']) );
$obj->setVar ( 'story_groups', $groups );
$obj->setVar ( 'story_create', time () );
$obj->setVar ( 'story_update', time () );
@@ -156,53 +156,53 @@
}
//image
- NewsUtils::uploadimg ( $forMods, 'story_img', $obj, $_REQUEST ['story_img'] );
+ NewsUtils::News_UploadImg ( $NewsModule, 'story_img', $obj, $_REQUEST ['story_img'] );
- $story_handler->updateposts ( $_REQUEST ['story_uid'], $_REQUEST ['story_status'], $story_action = 'add' );
+ $story_handler->News_Updateposts ( $_REQUEST ['story_uid'], $_REQUEST ['story_status'], $story_action = 'add' );
if (! $story_handler->insert ( $obj )) {
- News_Redirect ( 'onclick="javascript:history.go(-1);"', 1, _NEWS_AM_MSG_ERROR );
+ NewsUtils::News_Redirect ( 'onclick="javascript:history.go(-1);"', 1, _NEWS_AM_MSG_ERROR );
xoops_cp_footer ();
exit ();
}
// Reset next and previous content
- $story_handler->resetNext($forMods, $_REQUEST ['story_topic'] , $obj->getVar ( 'story_id' ));
- $story_handler->resetPrevious($forMods, $_REQUEST ['story_topic'] , $obj->getVar ( 'story_id' ));
+ $story_handler->News_ResetNext($NewsModule, $_REQUEST ['story_topic'] , $obj->getVar ( 'story_id' ));
+ $story_handler->News_ResetPrevious($NewsModule, $_REQUEST ['story_topic'] , $obj->getVar ( 'story_id' ));
// tag
- if ((xoops_getModuleOption ( 'usetag', $forMods->getVar ( 'dirname' ) )) and (is_dir ( XOOPS_ROOT_PATH . '/modules/tag' ))) {
+ if ((xoops_getModuleOption ( 'usetag', $NewsModule->getVar ( 'dirname' ) )) and (is_dir ( XOOPS_ROOT_PATH . '/modules/tag' ))) {
$tag_handler = xoops_getmodulehandler ( 'tag', 'tag' );
- $tag_handler->updateByItem ( $_POST ["item_tag"], $obj->getVar ( 'story_id' ), $forMods->getVar ( "dirname" ), 0 );
+ $tag_handler->updateByItem ( $_POST ["item_tag"], $obj->getVar ( 'story_id' ), $NewsModule->getVar ( "dirname" ), 0 );
}
// file
if($_REQUEST ['file_name']) {
$fileobj = $file_handler->create ();
$fileobj->setVar ( 'file_date', time () );
- $fileobj->setVar ( 'file_modid', $forMods->getVar ( 'mid' ) );
+ $fileobj->setVar ( 'file_modid', $NewsModule->getVar ( 'mid' ) );
$fileobj->setVar ( 'file_title', $_REQUEST ['story_title'] );
$fileobj->setVar ( 'file_content', $obj->getVar ( 'story_id' ) );
$fileobj->setVar ( 'file_status', 1 );
- NewsUtils::uploadfile ( $forMods, 'file_name', $fileobj, $_REQUEST ['file_name'] );
- $story_handler->contentfile('add',$obj->getVar ( 'story_id' ));
+ NewsUtils::News_UploadFile ( $NewsModule, 'file_name', $fileobj, $_REQUEST ['file_name'] );
+ $story_handler->News_Contentfile('add',$obj->getVar ( 'story_id' ));
if (! $file_handler->insert ( $fileobj )) {
- News_Redirect ( 'onclick="javascript:history.go(-1);"', 1, _NEWS_AM_MSG_ERROR );
+ NewsUtils::News_Redirect ( 'onclick="javascript:history.go(-1);"', 1, _NEWS_AM_MSG_ERROR );
xoops_cp_footer ();
exit ();
}
}
// Redirect page
- News_Redirect ( 'article.php', 1, _NEWS_AM_MSG_WAIT );
+ NewsUtils::News_Redirect ( 'article.php', 1, _NEWS_AM_MSG_WAIT );
xoops_cp_footer ();
exit ();
break;
case 'edit' :
- $story_id = news_CleanVars ( $_REQUEST, 'story_id', 0, 'int' );
+ $story_id = NewsUtils::News_CleanVars ( $_REQUEST, 'story_id', 0, 'int' );
if ($story_id > 0) {
$groups = (isset ( $_POST ['story_groups'] )) ? $_POST ['story_groups'] : '';
$groups = (is_array ( $groups )) ? implode ( " ", $groups ) : '';
@@ -225,8 +225,8 @@
$obj->setVar ( 'story_expire', 0 );
}
- if($story_handler->existAlias($forMods,$_REQUEST)) {
- News_Redirect ( "javascript:history.go(-1)", 3, _NEWS_AM_MSG_ALIASERROR );
+ if($story_handler->News_ExistAlias($NewsModule,$_REQUEST)) {
+ NewsUtils::News_Redirect ( "javascript:history.go(-1)", 3, _NEWS_AM_MSG_ALIASERROR );
xoops_cp_footer ();
exit ();
}
@@ -256,36 +256,36 @@
}
//image
- NewsUtils::uploadimg ( $forMods, 'story_img', $obj, $_REQUEST ['story_img'] );
+ NewsUtils::News_UploadImg ( $NewsModule, 'story_img', $obj, $_REQUEST ['story_img'] );
if (isset ( $_POST ['deleteimage'] ) && intval ( $_POST ['deleteimage'] ) == 1) {
- NewsUtils::deleteimg ( $forMods, 'story_img', $obj );
+ NewsUtils::News_DeleteImg ( $NewsModule, 'story_img', $obj );
}
if (! $story_handler->insert ( $obj )) {
- News_Redirect ( 'onclick="javascript:history.go(-1);"', 1, _NEWS_AM_MSG_ERROR );
+ NewsUtils::News_Redirect ( 'onclick="javascript:history.go(-1);"', 1, _NEWS_AM_MSG_ERROR );
xoops_cp_footer ();
exit ();
}
//tag
- if ((xoops_getModuleOption ( 'usetag', $forMods->getVar ( 'dirname' ) )) and (is_dir ( XOOPS_ROOT_PATH . '/modules/tag' ))) {
+ if ((xoops_getModuleOption ( 'usetag', $NewsModule->getVar ( 'dirname' ) )) and (is_dir ( XOOPS_ROOT_PATH . '/modules/tag' ))) {
$tag_handler = xoops_getmodulehandler ( 'tag', 'tag' );
- $tag_handler->updateByItem ( $_POST ["item_tag"], $story_id, $forMods->getVar ( "dirname" ), $catid = 0 );
+ $tag_handler->updateByItem ( $_POST ["item_tag"], $story_id, $NewsModule->getVar ( "dirname" ), $catid = 0 );
}
// file
if($_REQUEST ['file_name']) {
$fileobj = $file_handler->create ();
$fileobj->setVar ( 'file_date', time () );
- $fileobj->setVar ( 'file_modid', $forMods->getVar ( 'mid' ) );
+ $fileobj->setVar ( 'file_modid', $NewsModule->getVar ( 'mid' ) );
$fileobj->setVar ( 'file_title', $_REQUEST ['story_title'] );
$fileobj->setVar ( 'file_content', $obj->getVar ( 'story_id' ) );
$fileobj->setVar ( 'file_status', 1 );
- NewsUtils::uploadfile ( $forMods, 'file_name', $fileobj, $_REQUEST ['file_name'] );
- $story_handler->contentfile('add',$obj->getVar ( 'story_id' ));
+ NewsUtils::News_UploadFile ( $NewsModule, 'file_name', $fileobj, $_REQUEST ['file_name'] );
+ $story_handler->News_Contentfile('add',$obj->getVar ( 'story_id' ));
if (! $file_handler->insert ( $fileobj )) {
- News_Redirect ( 'onclick="javascript:history.go(-1);"', 1, _NEWS_AM_MSG_ERROR );
+ NewsUtils::News_Redirect ( 'onclick="javascript:history.go(-1);"', 1, _NEWS_AM_MSG_ERROR );
xoops_cp_footer ();
exit ();
}
@@ -294,7 +294,7 @@
}
// Redirect page
- News_Redirect ( 'article.php', 1, _NEWS_AM_MSG_WAIT );
+ NewsUtils::News_Redirect ( 'article.php', 1, _NEWS_AM_MSG_WAIT );
xoops_cp_footer ();
exit ();
break;
@@ -305,50 +305,50 @@
$obj->setVars ( $_REQUEST );
$obj->setVar ( 'file_date', time () );
- NewsUtils::uploadfile ( $forMods, 'file_name', $obj, $_REQUEST ['file_name'] );
- $story_handler->contentfile('add',$_REQUEST['file_content']);
+ NewsUtils::News_UploadFile ( $NewsModule, 'file_name', $obj, $_REQUEST ['file_name'] );
+ $story_handler->News_Contentfile('add',$_REQUEST['file_content']);
if (! $file_handler->insert ( $obj )) {
- News_Redirect ( 'onclick="javascript:history.go(-1);"', 1, _NEWS_AM_MSG_ERROR );
+ NewsUtils::News_Redirect ( 'onclick="javascript:history.go(-1);"', 1, _NEWS_AM_MSG_ERROR );
xoops_cp_footer ();
exit ();
}
// Redirect page
- News_Redirect ( 'file.php', 1, _NEWS_AM_MSG_WAIT );
+ NewsUtils::News_Redirect ( 'file.php', 1, _NEWS_AM_MSG_WAIT );
xoops_cp_footer ();
exit ();
break;
case 'edit_file' :
- $file_id = news_CleanVars ( $_REQUEST, 'file_id', 0, 'int' );
+ $file_id = NewsUtils::News_CleanVars ( $_REQUEST, 'file_id', 0, 'int' );
if ($file_id > 0) {
$obj = $file_handler->get ( $file_id );
$obj->setVars ( $_REQUEST );
if($_REQUEST['file_content'] != $_REQUEST['file_previous']) {
- $story_handler->contentfile('add', $_REQUEST['file_content']);
- $story_handler->contentfile('delete',$_REQUEST['file_previous']);
+ $story_handler->News_Contentfile('add', $_REQUEST['file_content']);
+ $story_handler->News_Contentfile('delete',$_REQUEST['file_previous']);
}
if (! $file_handler->insert ( $obj )) {
- News_Redirect ( 'onclick="javascript:history.go(-1);"', 1, _NEWS_AM_MSG_ERROR );
+ NewsUtils::News_Redirect ( 'onclick="javascript:history.go(-1);"', 1, _NEWS_AM_MSG_ERROR );
xoops_cp_footer ();
exit ();
}
}
// Redirect page
- News_Redirect ( 'file.php', 1, _NEWS_AM_MSG_WAIT );
+ NewsUtils::News_Redirect ( 'file.php', 1, _NEWS_AM_MSG_WAIT );
xoops_cp_footer ();
exit ();
break;
case 'status' :
- $story_id = news_CleanVars ( $_REQUEST, 'story_id', 0, 'int' );
+ $story_id = NewsUtils::News_CleanVars ( $_REQUEST, 'story_id', 0, 'int' );
if ($story_id > 0) {
$obj = & $story_handler->get ( $story_id );
$old = $obj->getVar ( 'story_status' );
- $story_handler->updateposts ( $obj->getVar ( 'story_uid' ), $obj->getVar ( 'story_status' ), $story_action = 'status' );
+ $story_handler->News_Updateposts ( $obj->getVar ( 'story_uid' ), $obj->getVar ( 'story_status' ), $story_action = 'status' );
$obj->setVar ( 'story_status', ! $old );
if ($story_handler->insert ( $obj )) {
exit ();
@@ -358,8 +358,8 @@
break;
case 'default' :
- $story_id = news_CleanVars ( $_REQUEST, 'story_id', 0, 'int' );
- $topic_id = news_CleanVars ( $_REQUEST, 'topic_id', 0, 'int' );
+ $story_id = NewsUtils::News_CleanVars ( $_REQUEST, 'story_id', 0, 'int' );
+ $topic_id = NewsUtils::News_CleanVars ( $_REQUEST, 'topic_id', 0, 'int' );
if ($story_id > 0) {
$criteria = new CriteriaCompo ();
$criteria->add ( new Criteria ( 'story_topic', $topic_id ) );
@@ -374,7 +374,7 @@
break;
case 'important' :
- $story_id = news_CleanVars ( $_REQUEST, 'story_id', 0, 'int' );
+ $story_id = NewsUtils::News_CleanVars ( $_REQUEST, 'story_id', 0, 'int' );
if ($story_id > 0) {
$obj = & $story_handler->get ( $story_id );
$old = $obj->getVar ( 'story_important' );
@@ -387,7 +387,7 @@
break;
case 'topic_asmenu' :
- $topic_id = news_CleanVars ( $_REQUEST, 'topic_id', 0, 'int' );
+ $topic_id = NewsUtils::News_CleanVars ( $_REQUEST, 'topic_id', 0, 'int' );
if ($topic_id > 0) {
$obj = & $topic_handler->get ( $topic_id );
$old = $obj->getVar ( 'topic_asmenu' );
@@ -400,7 +400,7 @@
break;
case 'topic_online' :
- $topic_id = news_CleanVars ( $_REQUEST, 'topic_id', 0, 'int' );
+ $topic_id = NewsUtils::News_CleanVars ( $_REQUEST, 'topic_id', 0, 'int' );
if ($topic_id > 0) {
$obj = & $topic_handler->get ( $topic_id );
$old = $obj->getVar ( 'topic_online' );
@@ -413,7 +413,7 @@
break;
case 'topic_show' :
- $topic_id = news_CleanVars ( $_REQUEST, 'topic_id', 0, 'int' );
+ $topic_id = NewsUtils::News_CleanVars ( $_REQUEST, 'topic_id', 0, 'int' );
if ($topic_id > 0) {
$obj = & $topic_handler->get ( $topic_id );
$old = $obj->getVar ( 'topic_show' );
@@ -426,7 +426,7 @@
break;
case 'file_status' :
- $file_id = news_CleanVars ( $_REQUEST, 'file_id', 0, 'int' );
+ $file_id = NewsUtils::News_CleanVars ( $_REQUEST, 'file_id', 0, 'int' );
if ($file_id > 0) {
$obj = & $file_handler->get ( $file_id );
$old = $obj->getVar ( 'file_status' );
@@ -440,14 +440,14 @@
case 'delete' :
//print_r($_POST);
- $id = news_CleanVars ( $_REQUEST, 'id', 0, 'int' );
- $handler = news_CleanVars ( $_REQUEST, 'handler', 0, 'string' );
+ $id = NewsUtils::News_CleanVars ( $_REQUEST, 'id', 0, 'int' );
+ $handler = NewsUtils::News_CleanVars ( $_REQUEST, 'handler', 0, 'string' );
if ($id > 0 && $handler) {
switch($handler) {
case 'content':
$obj = $story_handler->get ( $id );
$url = 'article.php';
- $story_handler->updateposts ( $obj->getVar ( 'story_uid' ), $obj->getVar ( 'story_status' ), $story_action = 'delete' );
+ $story_handler->News_Updateposts ( $obj->getVar ( 'story_uid' ), $obj->getVar ( 'story_status' ), $story_action = 'delete' );
if (! $story_handler->delete ( $obj )) {
echo $obj->getHtmlErrors ();
}
@@ -462,7 +462,7 @@
case 'file':
$obj = $file_handler->get ( $id );
$url = 'file.php';
- $story_handler->contentfile('delete',$obj->getVar ( 'file_content' ));
+ $story_handler->News_Contentfile('delete',$obj->getVar ( 'file_content' ));
if (! $file_handler->delete ( $obj )) {
echo $obj->getHtmlErrors ();
}
@@ -471,14 +471,14 @@
}
// Redirect page
- News_Redirect ( $url , 1, _NEWS_AM_MSG_WAIT );
+ NewsUtils::News_Redirect ( $url , 1, _NEWS_AM_MSG_WAIT );
xoops_cp_footer ();
exit ();
break;
}
// Redirect page
-News_Redirect ( 'index.php', 1, _NEWS_AM_MSG_WAIT );
+NewsUtils::News_Redirect ( 'index.php', 1, _NEWS_AM_MSG_WAIT );
// Include footer
xoops_cp_footer ();
Modified: XoopsModules/fmcontent/branches/news/admin/file.php
===================================================================
--- XoopsModules/fmcontent/branches/news/admin/file.php 2011-12-22 19:31:36 UTC (rev 8537)
+++ XoopsModules/fmcontent/branches/news/admin/file.php 2011-12-23 15:30:28 UTC (rev 8538)
@@ -19,23 +19,23 @@
*/
require dirname(__FILE__) . '/header.php';
-if (!isset($forMods)) exit('Module not found');
+if (!isset($NewsModule)) exit('Module not found');
include_once XOOPS_ROOT_PATH . "/class/pagenav.php";
// Display Admin header
xoops_cp_header();
// Define default value
-$op = news_CleanVars($_REQUEST, 'op', '', 'string');
+$op = NewsUtils::News_CleanVars($_REQUEST, 'op', '', 'string');
// Initialize content handler
$file_handler = xoops_getmodulehandler('file', 'news');
$story_handler = xoops_getmodulehandler('story', 'news');
// Define scripts
$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
$xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
-$xoTheme->addScript('browse.php?modules/' . $forMods->getVar('dirname') . '/js/order.js');
-$xoTheme->addScript('browse.php?modules/' . $forMods->getVar('dirname') . '/js/admin.js');
+$xoTheme->addScript('browse.php?modules/' . $NewsModule->getVar('dirname') . '/js/order.js');
+$xoTheme->addScript('browse.php?modules/' . $NewsModule->getVar('dirname') . '/js/admin.js');
// Add module stylesheet
-$xoTheme->addStylesheet(XOOPS_URL . '/modules/' . $forMods->getVar('dirname') . '/css/admin.css');
+$xoTheme->addStylesheet(XOOPS_URL . '/modules/' . $NewsModule->getVar('dirname') . '/css/admin.css');
$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
@@ -43,25 +43,25 @@
{
case 'new_file':
$obj = $file_handler->create();
- $obj->getForm($forMods);
+ $obj->getForm($NewsModule);
break;
case 'edit_file':
- $file_id = news_CleanVars($_REQUEST, 'file_id', 0, 'int');
+ $file_id = NewsUtils::News_CleanVars($_REQUEST, 'file_id', 0, 'int');
if ($file_id > 0) {
$obj = $file_handler->get($file_id);
- $obj->getForm($forMods);
+ $obj->getForm($NewsModule);
} else {
- News_Redirect('file.php', 1, _NEWS_AM_MSG_EDIT_ERROR);
+ NewsUtils::News_Redirect('file.php', 1, _NEWS_AM_MSG_EDIT_ERROR);
}
break;
case 'delete_file':
- $file_id = news_CleanVars($_REQUEST, 'file_id', 0, 'int');
+ $file_id = NewsUtils::News_CleanVars($_REQUEST, 'file_id', 0, 'int');
if ($file_id > 0) {
$file = $file_handler->get($file_id);
// Prompt message
- News_Message('backend.php', sprintf(_NEWS_AM_MSG_DELETE, '"' . $file->getVar('file_title') . '"'), $file_id, 'file');
+ NewsUtils::News_Message('backend.php', sprintf(_NEWS_AM_MSG_DELETE, '"' . $file->getVar('file_title') . '"'), $file_id, 'file');
// Display Admin footer
xoops_cp_footer();
}
@@ -71,9 +71,9 @@
// get module configs
/*
- $file['perpage'] = xoops_getModuleOption('admin_perpage_file', $forMods->getVar('dirname'));
- $file['order'] = xoops_getModuleOption('admin_showorder_file', $forMods->getVar('dirname'));
- $file['sort'] = xoops_getModuleOption('admin_showsort_file', $forMods->getVar('dirname'));
+ $file['perpage'] = xoops_getModuleOption('admin_perpage_file', $NewsModule->getVar('dirname'));
+ $file['order'] = xoops_getModuleOption('admin_showorder_file', $NewsModule->getVar('dirname'));
+ $file['sort'] = xoops_getModuleOption('admin_showsort_file', $NewsModule->getVar('dirname'));
*/
$file['perpage'] = '10';
@@ -82,30 +82,30 @@
// get limited information
if (isset($_REQUEST['limit'])) {
- $file['limit'] = news_CleanVars($_REQUEST, 'limit', 0, 'int');
+ $file['limit'] = NewsUtils::News_CleanVars($_REQUEST, 'limit', 0, 'int');
} else {
$file['limit'] = $file['perpage'];
}
// get start information
if (isset($_REQUEST['start'])) {
- $file['start'] = news_CleanVars($_REQUEST, 'start', 0, 'int');
+ $file['start'] = NewsUtils::News_CleanVars($_REQUEST, 'start', 0, 'int');
} else {
$file['start'] = 0;
}
// get content
if (isset($_REQUEST['content'])) {
- $file['content'] = news_CleanVars($_REQUEST, 'content', 0, 'int');
+ $file['content'] = NewsUtils::News_CleanVars($_REQUEST, 'content', 0, 'int');
$content = $story_handler->get($file['content']);
} else {
$content = $story_handler->getall();
}
- $files = $file_handler->getAdminFiles($forMods, $file , $content);
+ $files = $file_handler->News_GetAdminFiles($NewsModule, $file , $content);
- $file_numrows = $file_handler->getFileCount($forMods);
+ $file_numrows = $file_handler->News_GetFileCount($NewsModule);
if ($file_numrows > $file['limit']) {
$file_pagenav = new XoopsPageNav($file_numrows, $file['limit'], $file['start'], 'start', 'limit=' . $file['limit']);
@@ -118,11 +118,11 @@
$xoopsTpl->assign('navtitle', _NEWS_MI_FILE);
$xoopsTpl->assign('files', $files);
$xoopsTpl->assign('file_pagenav', $file_pagenav);
- $xoopsTpl->assign('xoops_dirname', $forMods->getVar('dirname'));
+ $xoopsTpl->assign('xoops_dirname', $NewsModule->getVar('dirname'));
$xoopsTpl->assign('news_tips', _NEWS_AM_FILE_TIPS);
// Call template file
- $xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/' . $forMods->getVar('dirname') . '/templates/admin/news_file.html');
+ $xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/' . $NewsModule->getVar('dirname') . '/templates/admin/news_file.html');
break;
}
Modified: XoopsModules/fmcontent/branches/news/admin/header.php
===================================================================
--- XoopsModules/fmcontent/branches/news/admin/header.php 2011-12-22 19:31:36 UTC (rev 8537)
+++ XoopsModules/fmcontent/branches/news/admin/header.php 2011-12-23 15:30:28 UTC (rev 8538)
@@ -39,6 +39,6 @@
xoops_load('xoopsformloader');
$module_handler = xoops_gethandler('module');
-$forMods = $module_handler->getByDirname(basename(dirname(dirname(__FILE__))));
+$NewsModule = $module_handler->getByDirname(basename(dirname(dirname(__FILE__))));
?>
\ No newline at end of file
Modified: XoopsModules/fmcontent/branches/news/admin/index.php
===================================================================
--- XoopsModules/fmcontent/branches/news/admin/index.php 2011-12-22 19:31:36 UTC (rev 8537)
+++ XoopsModules/fmcontent/branches/news/admin/index.php 2011-12-23 15:30:28 UTC (rev 8538)
@@ -21,12 +21,12 @@
require dirname(__FILE__) . '/header.php';
-if (!isset($forMods)) exit('Module not found');
+if (!isset($NewsModule)) exit('Module not found');
$index_admin = new ModuleAdmin();
// Display Admin header
xoops_cp_header();
// Add module stylesheet
-$xoTheme->addStylesheet(XOOPS_URL . '/modules/' . $forMods->getVar('dirname') . '/css/admin.css');
+$xoTheme->addStylesheet(XOOPS_URL . '/modules/' . $NewsModule->getVar('dirname') . '/css/admin.css');
$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
$topic_handler = xoops_getmodulehandler('topic', 'news');
@@ -45,10 +45,10 @@
$index_admin = new ModuleAdmin();
$index_admin->addInfoBox(_NEWS_AM_INDEX_ADMENU1);
$index_admin->addInfoBox(_NEWS_AM_INDEX_ADMENU2);
-$index_admin->addInfoBoxLine(_NEWS_AM_INDEX_ADMENU1, _NEWS_AM_INDEX_TOPICS, $topic_handler->getTopicCount($forMods));
-$index_admin->addInfoBoxLine(_NEWS_AM_INDEX_ADMENU2, _NEWS_AM_INDEX_CONTENTS, $story_handler->getAllContentCount($forMods));
-$index_admin->addInfoBoxLine(_NEWS_AM_INDEX_ADMENU2, _NEWS_AM_INDEX_CONTENTS_OFFLINE, $story_handler->getOfflineContentCount($forMods , $story_infos));
-$index_admin->addInfoBoxLine(_NEWS_AM_INDEX_ADMENU2, _NEWS_AM_INDEX_CONTENTS_EXPIRE, $story_handler->getExpireContentCount($forMods , $story_infos));
+$index_admin->addInfoBoxLine(_NEWS_AM_INDEX_ADMENU1, _NEWS_AM_INDEX_TOPICS, $topic_handler->News_GetTopicCount($NewsModule));
+$index_admin->addInfoBoxLine(_NEWS_AM_INDEX_ADMENU2, _NEWS_AM_INDEX_CONTENTS, $story_handler->News_GetAllContentCount($NewsModule));
+$index_admin->addInfoBoxLine(_NEWS_AM_INDEX_ADMENU2, _NEWS_AM_INDEX_CONTENTS_OFFLINE, $story_handler->News_GetOfflineContentCount($NewsModule , $story_infos));
+$index_admin->addInfoBoxLine(_NEWS_AM_INDEX_ADMENU2, _NEWS_AM_INDEX_CONTENTS_EXPIRE, $story_handler->News_GetExpireContentCount($NewsModule , $story_infos));
foreach (array_keys( $folder) as $i) {
$index_admin->addConfigBoxLine($folder[$i], 'folder');
@@ -60,7 +60,7 @@
$xoopsTpl->assign('renderindex', $index_admin->renderIndex());
// Call template file
-$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/' . $forMods->getVar('dirname') . '/templates/admin/news_index.html');
+$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/' . $NewsModule->getVar('dirname') . '/templates/admin/news_index.html');
// Display Xoops footer
include "footer.php";
Modified: XoopsModules/fmcontent/branches/news/admin/permissions.php
===================================================================
--- XoopsModules/fmcontent/branches/news/admin/permissions.php 2011-12-22 19:31:36 UTC (rev 8537)
+++ XoopsModules/fmcontent/branches/news/admin/permissions.php 2011-12-23 15:30:28 UTC (rev 8538)
@@ -27,7 +27,7 @@
// Display Admin header
xoops_cp_header();
// Add module stylesheet
-$xoTheme->addStylesheet(XOOPS_URL . '/modules/' . $forMods->getVar('dirname') . '/css/admin.css');
+$xoTheme->addStylesheet(XOOPS_URL . '/modules/' . $NewsModule->getVar('dirname') . '/css/admin.css');
$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
$topic_handler = xoops_getmodulehandler('topic', 'news'); //mb
@@ -40,7 +40,7 @@
$xoopsTpl->assign('selected1', $selected[1]);
$xoopsTpl->assign('selected2', $selected[2]);
-$module_id = $forMods->getVar("mid");
+$module_id = $NewsModule->getVar("mid");
switch ($permtoset)
{
@@ -76,17 +76,17 @@
$xoopsTpl->assign('permform', $permform->render());
} else {
$xt = new XoopsTopic($xoopsDB -> prefix("news_topic"));
- $alltopics =& $xt->getTopicsList();
+ $alltopics =& $xt->News_GetTopicsList();
foreach ($alltopics as $topic_id => $topic) {
$permform->addItem($topic_id, $topic["title"], $topic["pid"]);
}
//check if topics exist before rendering the form and redirect, if there are no topics
- if ($topic_handler->getTopicCount($forMods)) {
+ if ($topic_handler->News_GetTopicCount($NewsModule)) {
$xoopsTpl->assign('permform', $permform->render());
} else {
- News_Redirect ( 'topic.php?op=new_topic', 02, _NEWS_AM_MSG_NOPERMSSET );
+ NewsUtils::News_Redirect ( 'topic.php?op=new_topic', 02, _NEWS_AM_MSG_NOPERMSSET );
// Include footer
xoops_cp_footer ();
exit ();
@@ -98,7 +98,7 @@
$xoopsTpl->assign('news_tips', _NEWS_AM_PERMISSIONS_TIPS);
// Call template file
-$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/' . $forMods->getVar('dirname') . '/templates/admin/news_permissions.html');
+$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/' . $NewsModule->getVar('dirname') . '/templates/admin/news_permissions.html');
unset ($permform);
include "footer.php";
Modified: XoopsModules/fmcontent/branches/news/admin/tools.php
===================================================================
--- XoopsModules/fmcontent/branches/news/admin/tools.php 2011-12-22 19:31:36 UTC (rev 8537)
+++ XoopsModules/fmcontent/branches/news/admin/tools.php 2011-12-23 15:30:28 UTC (rev 8538)
@@ -20,14 +20,14 @@
*/
require dirname(__FILE__) . '/header.php';
-if (!isset($forMods)) exit('Module not found');
+if (!isset($NewsModule)) exit('Module not found');
// Display Admin header
xoops_cp_header();
// Define default value
-$op = news_CleanVars($_REQUEST, 'op', 'display', 'string');
+$op = NewsUtils::News_CleanVars($_REQUEST, 'op', 'display', 'string');
// Add module stylesheet
-$xoTheme->addStylesheet(XOOPS_URL . '/modules/' . $forMods->getVar('dirname') . '/css/admin.css');
+$xoTheme->addStylesheet(XOOPS_URL . '/modules/' . $NewsModule->getVar('dirname') . '/css/admin.css');
$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
// Initialize content handler
$topic_handler = xoops_getmodulehandler('topic', 'news');
@@ -55,7 +55,7 @@
$form->addElement(new XoopsFormHidden('op', 'purge'));
$clone = array();
while ($myrow = $GLOBALS["xoopsDB"]->fetchArray($result)) {
- if ($myrow['story_modid'] != $forMods->getVar('mid')) {
+ if ($myrow['story_modid'] != $NewsModule->getVar('mid')) {
if (!$module_handler->get($myrow['story_modid'])) {
$clone[] = $myrow['story_modid'];
$form->addElement(new XoopsFormHidden('modid[]', $myrow['story_modid']));
@@ -103,7 +103,7 @@
break;
case 'clone':
- $folder = news_CleanVars($_REQUEST, 'folder_name', '', 'string');
+ $folder = NewsUtils::News_CleanVars($_REQUEST, 'folder_name', '', 'string');
if (!is_dir(XOOPS_ROOT_PATH . '/modules/' . $folder)) {
$folder_handler = new FolderHandler(XOOPS_ROOT_PATH . '/modules/' . $folder);
$optn = array('to' => XOOPS_ROOT_PATH . '/modules/' . $folder, 'from' => XOOPS_ROOT_PATH . '/modules/news');
@@ -114,7 +114,7 @@
$xoopsTpl->assign('messages', $folder_handler->erros);
}
} else {
- News_Redirect('tools.php', 1, _NEWS_AM_MSG_CLONE_ERROR);
+ NewsUtils::News_Redirect('tools.php', 1, _NEWS_AM_MSG_CLONE_ERROR);
}
break;
@@ -124,35 +124,35 @@
$story_handler->deleteAll(new Criteria('story_modid', $id));
$topic_handler->deleteAll(new Criteria('topic_modid', $id));
}
- News_Redirect('tools.php', 20, _NEWS_AM_MSG_WAIT);
+ NewsUtils::News_Redirect('tools.php', 20, _NEWS_AM_MSG_WAIT);
break;
case 'alias':
- $start_id = news_CleanVars($_REQUEST, 'start_id', '1', 'int');
- $end_id = news_CleanVars($_REQUEST, 'end_id', '1', 'int');
- NewsUtils::news_rebuild ($story_handler , 'story_id' , 'alias' , 'story_alias' , 'story_title' , $start_id , $end_id);
- News_Redirect('tools.php', 20, _NEWS_AM_MSG_WAIT);
+ $start_id = NewsUtils::News_CleanVars($_REQUEST, 'start_id', '1', 'int');
+ $end_id = NewsUtils::News_CleanVars($_REQUEST, 'end_id', '1', 'int');
+ NewsUtils::News_Rebuild ($story_handler , 'story_id' , 'alias' , 'story_alias' , 'story_title' , $start_id , $end_id);
+ NewsUtils::News_Redirect('tools.php', 20, _NEWS_AM_MSG_WAIT);
break;
case 'topicalias':
- $start_id = news_CleanVars($_REQUEST, 'start_id', '1', 'int');
- $end_id = news_CleanVars($_REQUEST, 'end_id', '1', 'int');
- NewsUtils::news_rebuild ($topic_handler , 'topic_id' , 'topicalias' , 'topic_alias' , 'topic_title' , $start_id , $end_id);
- News_Redirect('tools.php', 20, _NEWS_AM_MSG_WAIT);
+ $start_id = NewsUtils::News_CleanVars($_REQUEST, 'start_id', '1', 'int');
+ $end_id = NewsUtils::News_CleanVars($_REQUEST, 'end_id', '1', 'int');
+ NewsUtils::News_Rebuild ($topic_handler , 'topic_id' , 'topicalias' , 'topic_alias' , 'topic_title' , $start_id , $end_id);
+ NewsUtils::News_Redirect('tools.php', 20, _NEWS_AM_MSG_WAIT);
break;
case 'keyword':
- $start_id = news_CleanVars($_REQUEST, 'start_id', '1', 'int');
- $end_id = news_CleanVars($_REQUEST, 'end_id', '1', 'int');
- NewsUtils::news_rebuild ($story_handler , 'story_id' , 'keyword' , 'story_words' , 'story_title' , $start_id , $end_id);
- News_Redirect('tools.php', 20, _NEWS_AM_MSG_WAIT);
+ $start_id = NewsUtils::News_CleanVars($_REQUEST, 'start_id', '1', 'int');
+ $end_id = NewsUtils::News_CleanVars($_REQUEST, 'end_id', '1', 'int');
+ NewsUtils::News_Rebuild ($story_handler , 'story_id' , 'keyword' , 'story_words' , 'story_title' , $start_id , $end_id);
+ NewsUtils::News_Redirect('tools.php', 20, _NEWS_AM_MSG_WAIT);
break;
case 'description':
- $start_id = news_CleanVars($_REQUEST, 'start_id', '1', 'int');
- $end_id = news_CleanVars($_REQUEST, 'end_id', '1', 'int');
- NewsUtils::news_rebuild ($story_handler , 'story_id' , 'description' , 'story_desc' , 'story_title' , $start_id , $end_id);
- News_Redirect('tools.php', 20, _NEWS_AM_MSG_WAIT);
+ $start_id = NewsUtils::News_CleanVars($_REQUEST, 'start_id', '1', 'int');
+ $end_id = NewsUtils::News_CleanVars($_REQUEST, 'end_id', '1', 'int');
+ NewsUtils::News_Rebuild ($story_handler , 'story_id' , 'description' , 'story_desc' , 'story_title' , $start_id , $end_id);
+ NewsUtils::News_Redirect('tools.php', 20, _NEWS_AM_MSG_WAIT);
break;
}
@@ -160,7 +160,7 @@
$xoopsTpl->assign('navtitle', _NEWS_MI_TOOLS);
// Call template file
-$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/' . $forMods->getVar('dirname') . '/templates/admin/news_tools.html');
+$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/' . $NewsModule->getVar('dirname') . '/templates/admin/news_tools.html');
// Display Xoops footer
include "footer.php";
Modified: XoopsModules/fmcontent/branches/news/admin/topic.php
===================================================================
--- XoopsModules/fmcontent/branches/news/admin/topic.php 2011-12-22 19:31:36 UTC (rev 8537)
+++ XoopsModules/fmcontent/branches/news/admin/topic.php 2011-12-23 15:30:28 UTC (rev 8538)
@@ -20,23 +20,23 @@
*/
require dirname(__FILE__) . '/header.php';
-if (!isset($forMods)) exit('Module not found');
+if (!isset($NewsModule)) exit('Module not found');
include_once XOOPS_ROOT_PATH . "/class/pagenav.php";
// Display Admin header
xoops_cp_header();
// Define default value
-$op = news_CleanVars($_REQUEST, 'op', '', 'string');
+$op = NewsUtils::News_CleanVars($_REQUEST, 'op', '', 'string');
// Initialize content handler
$topic_handler = xoops_getmodulehandler('topic', 'news');
$story_handler = xoops_getmodulehandler('story', 'news');
// Define scripts
$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
$xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
-$xoTheme->addScript('browse.php?modules/' . $forMods->getVar('dirname') . '/js/order.js');
-$xoTheme->addScript('browse.php?modules/' . $forMods->getVar('dirname') . '/js/admin.js');
+$xoTheme->addScript('browse.php?modules/' . $NewsModule->getVar('dirname') . '/js/order.js');
+$xoTheme->addScript('browse.php?modules/' . $NewsModule->getVar('dirname') . '/js/admin.js');
// Add module stylesheet
-$xoTheme->addStylesheet(XOOPS_URL . '/modules/' . $forMods->getVar('dirname') . '/css/admin.css');
+$xoTheme->addStylesheet(XOOPS_URL . '/modules/' . $NewsModule->getVar('dirname') . '/css/admin.css');
$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
@@ -44,25 +44,25 @@
{
case 'new_topic':
$obj = $topic_handler->create();
- $obj->getForm($forMods);
+ $obj->getForm($NewsModule);
break;
case 'edit_topic':
- $topic_id = news_CleanVars($_REQUEST, 'topic_id', 0, 'int');
+ $topic_id = NewsUtils::News_CleanVars($_REQUEST, 'topic_id', 0, 'int');
if ($topic_id > 0) {
$obj = $topic_handler->get($topic_id);
- $obj->getForm($forMods);
+ $obj->getForm($NewsModule);
} else {
- News_Redirect('topic.php', 1, _NEWS_AM_MSG_EDIT_ERROR);
+ NewsUtils::News_Redirect('topic.php', 1, _NEWS_AM_MSG_EDIT_ERROR);
}
break;
case 'delete_topic':
- $topic_id = news_CleanVars($_REQUEST, 'topic_id', 0, 'int');
+ $topic_id = NewsUtils::News_CleanVars($_REQUEST, 'topic_id', 0, 'int');
if ($topic_id > 0) {
$topic = $topic_handler->get($topic_id);
// Prompt message
- News_Message('backend.php', sprintf(_NEWS_AM_MSG_DELETE, '"' . $topic->getVar('topic_title') . '"'), $topic_id, 'topic');
+ NewsUtils::News_Message('backend.php', sprintf(_NEWS_AM_MSG_DELETE, '"' . $topic->getVar('topic_title') . '"'), $topic_id, 'topic');
// Display Admin footer
xoops_cp_footer();
}
@@ -88,26 +88,26 @@
default:
// get module configs
- $topic_perpage = xoops_getModuleOption('admin_perpage_topic', $forMods->getVar('dirname'));
- $topic_order = xoops_getModuleOption('admin_showorder_topic', $forMods->getVar('dirname'));
- $topic_sort = xoops_getModuleOption('admin_showsort_topic', $forMods->getVar('dirname'));
+ $topic_perpage = xoops_getModuleOption('admin_perpage_topic', $NewsModule->getVar('dirname'));
+ $topic_order = xoops_getModuleOption('admin_showorder_topic', $NewsModule->getVar('dirname'));
+ $topic_sort = xoops_getModuleOption('admin_showsort_topic', $NewsModule->getVar('dirname'));
// get limited information
if (isset($_REQUEST['limit'])) {
- $topic_limit = news_CleanVars($_REQUEST, 'limit', 0, 'int');
+ $topic_limit = NewsUtils::News_CleanVars($_REQUEST, 'limit', 0, 'int');
} else {
$topic_limit = $topic_perpage;
}
// get start information
if (isset($_REQUEST['start'])) {
- $topic_start = news_CleanVars($_REQUEST, 'start', 0, 'int');
+ $topic_start = NewsUtils::News_CleanVars($_REQUEST, 'start', 0, 'int');
} else {
$topic_start = 0;
}
- $topics = $topic_handler->getTopics($forMods, $topic_limit, $topic_start, $topic_order, $topic_sort, $topic_menu = null, $topic_online = null , $topic_parent = null);
- $topic_numrows = $topic_handler->getTopicCount($forMods);
+ $topics = $topic_handler->News_GetTopics($NewsModule, $topic_limit, $topic_start, $topic_order, $topic_sort, $topic_menu = null, $topic_online = null , $topic_parent = null);
+ $topic_numrows = $topic_handler->News_GetTopicCount($NewsModule);
if ($topic_numrows > $topic_limit) {
$topic_pagenav = new XoopsPageNav($topic_numrows, $topic_limit, $topic_start, 'start', 'limit=' . $topic_limit);
@@ -120,11 +120,11 @@
$xoopsTpl->assign('navtitle', _NEWS_MI_TOPIC);
$xoopsTpl->assign('topics', $topics);
$xoopsTpl->assign('topic_pagenav', $topic_pagenav);
- $xoopsTpl->assign('xoops_dirname', $forMods->getVar('dirname'));
+ $xoopsTpl->assign('xoops_dirname', $NewsModule->getVar('dirname'));
$xoopsTpl->assign('news_tips', _NEWS_AM_TOPIC_TIPS);
// Call template file
- $xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/' . $forMods->getVar('dirname') . '/templates/admin/news_topic.html');
+ $xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/' . $NewsModule->getVar('dirname') . '/templates/admin/news_topic.html');
break;
}
Modified: XoopsModules/fmcontent/branches/news/ajax.php
===================================================================
--- XoopsModules/fmcontent/branches/news/ajax.php 2011-12-22 19:31:36 UTC (rev 8537)
+++ XoopsModules/fmcontent/branches/news/ajax.php 2011-12-23 15:30:28 UTC (rev 8538)
@@ -19,19 +19,19 @@
*/
require dirname(__FILE__) . '/header.php';
-if (!isset($forMods)) exit('Module not found');
+if (!isset($NewsModule)) exit('Module not found');
error_reporting(0);
$GLOBALS['xoopsLogger']->activated = false;
-$story_id = news_CleanVars($_REQUEST, 'id', '', 'string');
-$story_text = news_CleanVars($_REQUEST, 'value', '', 'string');
+$story_id = NewsUtils::News_CleanVars($_REQUEST, 'id', '', 'string');
+$story_text = NewsUtils::News_CleanVars($_REQUEST, 'value', '', 'string');
list($root, $id) = explode('_', $story_id);
if (intval($id) > 0) {
// Initialize content handler
- $story_handler = xoops_getmodulehandler('story', $forMods->getVar('dirname'));
+ $story_handler = xoops_getmodulehandler('story', $NewsModule->getVar('dirname'));
$content = $story_handler->get($id);
$content->setVar('story_text', $story_text);
if (!$story_handler->insert($content)) {
Modified: XoopsModules/fmcontent/branches/news/article.php
===================================================================
--- XoopsModules/fmcontent/branches/news/article.php 2011-12-22 19:31:36 UTC (rev 8537)
+++ XoopsModules/fmcontent/branche...
[truncated message content] |
|
From: <vo...@us...> - 2011-12-25 16:28:15
|
Revision: 8542
http://xoops.svn.sourceforge.net/xoops/?rev=8542&view=rev
Author: voltan1
Date: 2011-12-25 16:28:08 +0000 (Sun, 25 Dec 2011)
Log Message:
-----------
Fix error in SQL file
Modified Paths:
--------------
XoopsModules/fmcontent/branches/news/sql/mysql.sql
XoopsModules/fmcontent/branches/news/xoops_version.php
Modified: XoopsModules/fmcontent/branches/news/sql/mysql.sql
===================================================================
--- XoopsModules/fmcontent/branches/news/sql/mysql.sql 2011-12-25 16:18:41 UTC (rev 8541)
+++ XoopsModules/fmcontent/branches/news/sql/mysql.sql 2011-12-25 16:28:08 UTC (rev 8542)
@@ -71,11 +71,8 @@
`topic_alias` varchar(255) NOT NULL,
`topic_homepage` tinyint (4) NOT NULL ,
`topic_show` tinyint (1) NOT NULL default '1',
- 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`)
+PRIMARY KEY (`topic_id`,`topic_modid`),
+UNIQUE KEY `file_id` (`topic_id`,`topic_modid`)
) ENGINE=MyISAM;
CREATE TABLE `news_file` (
Modified: XoopsModules/fmcontent/branches/news/xoops_version.php
===================================================================
--- XoopsModules/fmcontent/branches/news/xoops_version.php 2011-12-25 16:18:41 UTC (rev 8541)
+++ XoopsModules/fmcontent/branches/news/xoops_version.php 2011-12-25 16:28:08 UTC (rev 8542)
@@ -63,6 +63,13 @@
'min_admin' => '1.1'
);
+//Sql file
+$modversion["sqlfile"]["mysql"] = "sql/mysql.sql";
+$modversion["tables"] = array(
+ "news_story",
+ "news_topic",
+ "news_file",
+);
//Recherche
$modversion["search"]["file"] = "include/search.inc.php";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2011-12-26 07:16:57
|
Revision: 8559
http://xoops.svn.sourceforge.net/xoops/?rev=8559&view=rev
Author: voltan1
Date: 2011-12-26 07:16:50 +0000 (Mon, 26 Dec 2011)
Log Message:
-----------
improve language
Modified Paths:
--------------
XoopsModules/fmcontent/branches/news/admin/article.php
XoopsModules/fmcontent/branches/news/admin/menu.php
XoopsModules/fmcontent/branches/news/language/english/admin.php
XoopsModules/fmcontent/branches/news/language/english/blocks.php
XoopsModules/fmcontent/branches/news/language/english/main.php
XoopsModules/fmcontent/branches/news/language/english/modinfo.php
XoopsModules/fmcontent/branches/news/language/persian/admin.php
XoopsModules/fmcontent/branches/news/language/persian/modinfo.php
Modified: XoopsModules/fmcontent/branches/news/admin/article.php
===================================================================
--- XoopsModules/fmcontent/branches/news/admin/article.php 2011-12-26 06:41:56 UTC (rev 8558)
+++ XoopsModules/fmcontent/branches/news/admin/article.php 2011-12-26 07:16:50 UTC (rev 8559)
@@ -232,7 +232,7 @@
}
$xoopsTpl->assign('navigation', 'content');
- $xoopsTpl->assign('navtitle', _NEWS_MI_CONTENT);
+ $xoopsTpl->assign('navtitle', _NEWS_MI_ARTICLE);
$xoopsTpl->assign('topic_title', $topic_title);
$xoopsTpl->assign('contents', $contents);
$xoopsTpl->assign('story_pagenav', $story_pagenav);
Modified: XoopsModules/fmcontent/branches/news/admin/menu.php
===================================================================
--- XoopsModules/fmcontent/branches/news/admin/menu.php 2011-12-26 06:41:56 UTC (rev 8558)
+++ XoopsModules/fmcontent/branches/news/admin/menu.php 2011-12-26 07:16:50 UTC (rev 8559)
@@ -27,7 +27,7 @@
'icon' => 'images/admin/category.png');
$i++;
$adminmenu[$i] = array(
- 'title' => _NEWS_MI_CONTENT,
+ 'title' => _NEWS_MI_ARTICLE,
'link' => 'admin/article.php',
'icon' => 'images/admin/content.png');
$i++;
Modified: XoopsModules/fmcontent/branches/news/language/english/admin.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/english/admin.php 2011-12-26 06:41:56 UTC (rev 8558)
+++ XoopsModules/fmcontent/branches/news/language/english/admin.php 2011-12-26 07:16:50 UTC (rev 8559)
@@ -20,16 +20,16 @@
if (!defined('_NEWS_AM_PREFERENCES')) {
// Global page
- define('_NEWS_AM_GLOBAL_ADD_CONTENT', 'Add Content');
+ define('_NEWS_AM_GLOBAL_ADD_CONTENT', 'Add Article');
define('_NEWS_AM_GLOBAL_ADD_TOPIC', 'Add Topic');
define('_NEWS_AM_GLOBAL_ADD_FILE', 'Add File');
define('_NEWS_AM_GLOBAL_IMG', 'Image');
define('_NEWS_AM_GLOBAL_FORMUPLOAD', 'Select Image');
// Index page
define("_NEWS_AM_INDEX_ADMENU1", "Topics");
- define("_NEWS_AM_INDEX_ADMENU2", "Contents");
+ define("_NEWS_AM_INDEX_ADMENU2", "Articles");
define("_NEWS_AM_INDEX_TOPICS", "There are <span class='green'>%s</span> Topics in our database");
- define("_NEWS_AM_INDEX_CONTENTS", "There are <span class='green'>%s</span> Contents in our database");
+ define("_NEWS_AM_INDEX_CONTENTS", "There are <span class='green'>%s</span> Articles in our database");
define("_NEWS_AM_INDEX_CONTENTS_OFFLINE", "There are <span class='red'>%s</span> Offline news in our database");
define("_NEWS_AM_INDEX_CONTENTS_EXPIRE", "There are <span class='red'>%s</span> Expire news in our database");
// Topic page
@@ -42,7 +42,7 @@
define('_NEWS_AM_TOPIC_IMG', 'Image');
define('_NEWS_AM_TOPIC_WEIGHT', 'Weight');
define('_NEWS_AM_TOPIC_SHOWTYPE', 'Display mode');
- define('_NEWS_AM_TOPIC_SHOWTYPE_DESC', 'Contents display template for this topic<br />"Module based" will use display options defined in module preferences.');
+ define('_NEWS_AM_TOPIC_SHOWTYPE_DESC', 'Articles display template for this topic<br />"Module based" will use display options defined in module preferences.');
define('_NEWS_AM_TOPIC_PERPAGE', 'Per page');
define('_NEWS_AM_TOPIC_COLUMNS', 'Columns');
define('_NEWS_AM_TOPIC_ONLINE', 'Active');
@@ -62,11 +62,11 @@
define('_NEWS_AM_TOPIC_SHOWHITS', 'Display Hits');
define('_NEWS_AM_TOPIC_SHOWCOMS', 'Display Comments count');
define('_NEWS_AM_TOPIC_HOMEPAGE', 'Topic homepage seting');
- define('_NEWS_AM_TOPIC_HOMEPAGE_DESC', 'Seting content show type in topic pages');
- define('_NEWS_AM_TOPIC_HOMEPAGE_1', 'List all contents from this topic and subtopics');
+ define('_NEWS_AM_TOPIC_HOMEPAGE_DESC', 'Seting article show type in topic pages');
+ define('_NEWS_AM_TOPIC_HOMEPAGE_1', 'List all articles from this topic and subtopics');
define('_NEWS_AM_TOPIC_HOMEPAGE_2', 'List all subtopics');
- define('_NEWS_AM_TOPIC_HOMEPAGE_3', 'List all contents from just this topic');
- define('_NEWS_AM_TOPIC_HOMEPAGE_4', 'Show selected content from this topic');
+ define('_NEWS_AM_TOPIC_HOMEPAGE_3', 'List all articles from just this topic');
+ define('_NEWS_AM_TOPIC_HOMEPAGE_4', 'Show selected article from this topic');
define('_NEWS_AM_TOPIC_OPTIONS', 'Sellect topic show options');
define('_NEWS_AM_TOPIC_OPTIONS_DESC', 'Sellect topic show options');
define('_NEWS_AM_TOPIC_ALIAS', 'Alias (for url)');
@@ -77,7 +77,7 @@
define('_NEWS_AM_TOPIC_SHOWTYPE_4', 'List type');
define('_NEWS_AM_TOPIC_SHOWTYPE_5', 'Spotlight');
// Content page
- define('_NEWS_AM_CONTENT_FORM', 'Manage Content');
+ define('_NEWS_AM_CONTENT_FORM', 'Manage Article');
define('_NEWS_AM_CONTENT_FORMTITLE', 'Title');
define('_NEWS_AM_CONTENT_FORMTITLE_DISP', 'Display page title?');
define('_NEWS_AM_CONTENT_FORMAUTHOR', 'Source (Name)');
@@ -93,12 +93,12 @@
define('_NEWS_AM_CONTENT_FORMNEXT', 'Next link');
define('_NEWS_AM_CONTENT_DOHTML', 'Allow HTML code');
define('_NEWS_AM_CONTENT_BREAKS', 'Convert line breaks');
- define('_NEWS_AM_CONTENT_DOIMAGE', 'Allow XOOPS Images');
- define('_NEWS_AM_CONTENT_DOXCODE', 'Allow XOOPS BBcode');
- define('_NEWS_AM_CONTENT_DOSMILEY', 'Allow XOOPS Smilies');
+ define('_NEWS_AM_CONTENT_DOIMAGE', 'Allow Images');
+ define('_NEWS_AM_CONTENT_DOXCODE', 'Allow BBcode');
+ define('_NEWS_AM_CONTENT_DOSMILEY', 'Allow Smilies');
define('_NEWS_AM_CONTENT_SHORT', 'Short text');
define('_NEWS_AM_CONTENT_TITLE', 'Title');
- define('_NEWS_AM_CONTENT_MANAGER', 'Content manager');
+ define('_NEWS_AM_CONTENT_MANAGER', 'Article manager');
define('_NEWS_AM_CONTENT_FILE', 'File');
define('_NEWS_AM_CONTENT_ID', 'ID');
define('_NEWS_AM_CONTENT_NUM', 'Weight');
@@ -114,10 +114,10 @@
define('_NEWS_AM_CONTENT_DELETE', 'Delete');
define('_NEWS_AM_CONTENT_SHORTDESC', 'Short Desc');
define('_NEWS_AM_CONTENT_TOPIC', 'Topic');
- define('_NEWS_AM_CONTENT_TOPIC_DESC', 'Empty selection will set the content as a Static Page');
+ define('_NEWS_AM_CONTENT_TOPIC_DESC', 'Empty selection will set the article as a Static Page');
define('_NEWS_AM_CONTENT_STATIC', 'Static page');
define('_NEWS_AM_CONTENT_STATICS', 'Static pages');
- define('_NEWS_AM_CONTENT_ALL_ITEMS', 'All content/item list');
+ define('_NEWS_AM_CONTENT_ALL_ITEMS', 'All article/item list');
define('_NEWS_AM_CONTENT_ALL_ITEMS_FROM', 'Item list filtered by: ');
define('_NEWS_AM_CONTENT_FILE_DESC', 'For add more files you must use admin file system in admin side');
define('_NEWS_AM_CONTENT_SUBTITLE', 'Subtitle');
@@ -133,7 +133,7 @@
define('_NEWS_AM_TOOLS_LOG_TITLE', 'Clone module log');
define('_NEWS_AM_TOOLS_FORMPURGE_TITLE', 'Purge page of deleted clone');
define('_NEWS_AM_TOOLS_ALIAS_TITLE', 'Rebuild Alias');
- define('_NEWS_AM_TOOLS_ALIAS_CONTENT', 'Rebuild content alias');
+ define('_NEWS_AM_TOOLS_ALIAS_CONTENT', 'Rebuild article alias');
define('_NEWS_AM_TOOLS_ALIAS_TOPIC', 'Rebuild topic alias');
define('_NEWS_AM_TOOLS_META_TITLE', 'Rebuild Metas');
define('_NEWS_AM_TOOLS_META_KEYWORD', 'Rebuild Meta keywords');
@@ -152,18 +152,18 @@
define('_NEWS_AM_FILE_ACTION', 'Action');
define('_NEWS_AM_FILE_FORM', 'Attach file');
define('_NEWS_AM_FILE_TITLE', 'Title');
- define('_NEWS_AM_FILE_CONTENT', 'File Content');
+ define('_NEWS_AM_FILE_CONTENT', 'File Article');
define('_NEWS_AM_FILE_STATUS', 'Active');
define('_NEWS_AM_FILE_SELECT', 'Select your file');
define('_NEWS_AM_FILE_TYPE', 'Type');
// Admin message
define('_NEWS_AM_MSG_DBUPDATE', 'Database updated successfully!');
- define('_NEWS_AM_MSG_ERRORDELETE', 'You cannot delete this content! <br />Please move or delete all child of this content');
+ define('_NEWS_AM_MSG_ERRORDELETE', 'You cannot delete this article! <br />Please move or delete all child of this article');
define('_NEWS_AM_MSG_WAIT', 'Please wait...');
define('_NEWS_AM_MSG_DELETE', 'Are you sure you would like to delete: %s ?');
define('_NEWS_AM_MSG_EDIT_ERROR', 'Could not find page or invalid page id!');
- define('_NEWS_AM_MSG_UPDATE_ERROR', 'Could not update database! Update content error');
- define('_NEWS_AM_MSG_INSERT_ERROR', 'Could not update database! Insert content error ');
+ define('_NEWS_AM_MSG_UPDATE_ERROR', 'Could not update database! Update article error');
+ define('_NEWS_AM_MSG_INSERT_ERROR', 'Could not update database! Insert article error ');
define('_NEWS_AM_MSG_CLONE_ERROR', 'This folder already exists !');
define('_NEWS_AM_MSG_NOPERMSSET', 'Permission cannot be set: No Topics created yet! Please create a Topic first.');
define('_NEWS_AM_MSG_ALIASERROR', 'Your selected Alias is already taken. Please change it and try again');
@@ -190,15 +190,15 @@
define('_NEWS_AM_TOPIC_TIPS',
'<ul>
<li>Reorder, view, edit or delete any topic</li>
- <li>Display topic contents as a menu in block</li>
+ <li>Display topic articles as a menu in block</li>
<li>Show/hide topics in index and parent pages</li>
- <li>Click on a topic title to see all contents for that topic</li>
+ <li>Click on a topic title to see all articles for that topic</li>
</ul>');
define('_NEWS_AM_CONTENT_TIPS',
'<ul>
- <li>Reorder, view, edit or delete any content page</li>
- <li>Create content, link, section header or separator</li>
- <li>To change order of contents (which will be reflected in the Menu), simply drag and drop the contents into the desired position.</li>
+ <li>Reorder, view, edit or delete any article page</li>
+ <li>Create article, link, section header or separator</li>
+ <li>To change order of articles (which will be reflected in the Menu), simply drag and drop the articles into the desired position.</li>
</ul>');
define('_NEWS_AM_TOOLS_TIPS',
'<ul>
Modified: XoopsModules/fmcontent/branches/news/language/english/blocks.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/english/blocks.php 2011-12-26 06:41:56 UTC (rev 8558)
+++ XoopsModules/fmcontent/branches/news/language/english/blocks.php 2011-12-26 07:16:50 UTC (rev 8559)
@@ -19,11 +19,11 @@
define('_NEWS_MB_SELECTPAGE', 'Select the page to display: ');
define('_NEWS_MB_ALLMENUS', 'All Topics');
define('_NEWS_MB_TOPICDISPLAY', 'Select Topics to display');
- define('_NEWS_MB_NUMBER', 'Number of listed contents');
+ define('_NEWS_MB_NUMBER', 'Number of listed articles');
define('_NEWS_MB_CHARS', 'Title lenght (characters)');
define('_NEWS_MB_IMG', 'Display image');
define('_NEWS_MB_WIDTH', 'Max image width (pixel)');
- define('_NEWS_MB_DESCRIPTION', 'Display content text');
+ define('_NEWS_MB_DESCRIPTION', 'Display article text');
define('_NEWS_MB_DATE', 'Display publish date');
define('_NEWS_MB_MORE', 'Read more');
define('_NEWS_MB_SHOE_MORELINK', 'Show more link');
Modified: XoopsModules/fmcontent/branches/news/language/english/main.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/english/main.php 2011-12-26 06:41:56 UTC (rev 8558)
+++ XoopsModules/fmcontent/branches/news/language/english/main.php 2011-12-26 07:16:50 UTC (rev 8559)
@@ -30,7 +30,7 @@
define("_NEWS_MD_AUTHOR_ALL", "Read all");
define("_NEWS_MD_AUTHOR_ALL_DESC", "View all contributions by ");
define('_NEWS_MD_COM', 'Comment');
- define('_NEWS_MD_RELATED', 'Related contents');
+ define('_NEWS_MD_RELATED', 'Related articles');
define("_NEWS_MD_HOME", "Home");
// Link
define('_NEWS_MD_NEXT', 'Next page');
@@ -51,7 +51,7 @@
define('_NEWS_MD_ERROR_NOPAGE', 'You have not created any page yet');
define('_NEWS_MD_ERROR_STATUS', 'This page is diactive');
define('_NEWS_MD_ERROR_TOPIC', 'Selected topic does not exist');
- define('_NEWS_MD_ERROR_EXIST', 'Selected content does not exist');
+ define('_NEWS_MD_ERROR_EXIST', 'Selected article does not exist');
// Light box
define('_NEWS_MD_LIGHTBOX_IMAGE', 'Image');
define('_NEWS_MD_LIGHTBOX_OF', 'of');
Modified: XoopsModules/fmcontent/branches/news/language/english/modinfo.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/english/modinfo.php 2011-12-26 06:41:56 UTC (rev 8558)
+++ XoopsModules/fmcontent/branches/news/language/english/modinfo.php 2011-12-26 07:16:50 UTC (rev 8559)
@@ -21,11 +21,11 @@
if (!defined('_MI_NEWS_NAME')) {
// Module info
define('_MI_NEWS_NAME', 'News');
- define('_MI_NEWS_DESC', 'Manage page content');
+ define('_MI_NEWS_DESC', 'Manage articles');
// Menu
define('_NEWS_MI_HOME', 'Home');
- define('_NEWS_MI_TOPIC', 'Topic');
- define('_NEWS_MI_CONTENT', 'Content');
+ define('_NEWS_MI_TOPIC', 'Topics');
+ define('_NEWS_MI_ARTICLE', 'Articles');
define('_NEWS_MI_PERM', 'Permissions');
define('_NEWS_MI_TOOLS', 'Tools');
define('_NEWS_MI_ABOUT', 'About');
@@ -33,11 +33,11 @@
define('_NEWS_MI_SUBMIT', 'Submit');
define('_NEWS_MI_FILE', 'File');
// Block
- define('_NEWS_MI_BLOCK_PAGE', 'Content page');
- define('_NEWS_MI_BLOCK_LIST', 'Content list');
+ define('_NEWS_MI_BLOCK_PAGE', 'Article page');
+ define('_NEWS_MI_BLOCK_LIST', 'Article list');
// Editor
define("_NEWS_MI_FORM_EDITOR", "Form Option");
- define("_NEWS_MI_FORM_EDITOR_DESC", "Select the editor to use for editing your content.");
+ define("_NEWS_MI_FORM_EDITOR_DESC", "Select the editor to use for editing your article.");
// Urls
define('_NEWS_MI_FRIENDLYURL', 'URL rewrite method');
define('_NEWS_MI_FRIENDLYURL_DESC', 'Select the URL rewrite mode you want to use.<ul>
@@ -50,7 +50,7 @@
define('_NEWS_MI_URL_ID', 'ID Mode');
// Rewrite Mode
define('_NEWS_MI_REWRITEBASE', 'Rewrite Mode: .htaccess file position');
- define('_NEWS_MI_REWRITEBASE_DESC', '"Module": .htaccess file must be in the module directory.<br />"Root": .htaccess file must be in your XOOPS root directory.');
+ define('_NEWS_MI_REWRITEBASE_DESC', '"Module": .htaccess file must be in the module directory.<br />"Root": .htaccess file must be in your ROOT directory.');
define('_NEWS_MI_REWRITEBASE_MODS', 'Module');
define('_NEWS_MI_REWRITEBASE_ROOT', 'Root');
// Rewrite Name
@@ -70,10 +70,10 @@
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 contents');
+ define('_NEWS_MI_ADVERTISEMENT_DESC', 'Enter text or html/Javascript code for your articles');
// Edit in place
define('_NEWS_MI_EDITINPLACE', 'Use edit in place?');
- define('_NEWS_MI_EDITINPLACE_DESC', 'Allow inline edits of your contents');
+ define('_NEWS_MI_EDITINPLACE_DESC', 'Allow inline edits of your articles');
// Tell a friend
define('_NEWS_MI_TELLAFRIEND', 'Use module Tell a friend?');
define('_NEWS_MI_TELLAFRIEND_DESC', '');
@@ -88,7 +88,7 @@
define('_NEWS_MI_MINWORDOCCUR_DESC', 'Choose the minimum occurrence of single words');
// Show options
define('_NEWS_MI_DISP_OPTION', 'General display method');
- define('_NEWS_MI_DISP_OPTION_DESC', 'Select which display options will be used in contents<br />"Topic based" will use display options defined in topic preferences');
+ define('_NEWS_MI_DISP_OPTION_DESC', 'Select which display options will be used in articles<br />"Topic based" will use display options defined in topic preferences');
define('_NEWS_MI_DISP_OPTION_MODULE', 'Module based');
define('_NEWS_MI_DISP_OPTION_TOPIC', 'Topic based');
// Title
@@ -122,14 +122,14 @@
define('_NEWS_MI_DISPCOMS', 'Display Comments count');
define('_NEWS_MI_DISPCOMS_DESC', '');
// Per page
- define('_NEWS_MI_PERPAGE', 'Per page contents');
- define('_NEWS_MI_PERPAGE_DESC', 'Number of contents listed in topic/index page');
+ define('_NEWS_MI_PERPAGE', 'Per page articles');
+ define('_NEWS_MI_PERPAGE_DESC', 'Number of articles listed in topic/index page');
// Columns
define('_NEWS_MI_COLUMNS', 'Columns');
define('_NEWS_MI_COLUMNS_DESC', 'Number of Columns in each page');
// Show type
define('_NEWS_MI_SHOWTYPE', 'Display mode');
- define('_NEWS_MI_SHOWTYPE_DESC', 'Display template for contents listed in topic/index page');
+ define('_NEWS_MI_SHOWTYPE_DESC', 'Display template for articles listed in topic/index page');
define('_NEWS_MI_SHOWTYPE_0', 'Module based');
define('_NEWS_MI_SHOWTYPE_1', 'News type');
define('_NEWS_MI_SHOWTYPE_2', 'Table type');
@@ -149,23 +149,23 @@
define('_NEWS_MI_ASC', 'ASC');
// Show sort
define('_NEWS_MI_SHOWSORT', 'Sort by');
- define('_NEWS_MI_SHOWSORT_DESC', 'Ordering method for contents displayed in the module');
- define('_NEWS_MI_SHOWSORT_1', 'Content id');
- define('_NEWS_MI_SHOWSORT_2', 'Content create');
- define('_NEWS_MI_SHOWSORT_3', 'Content update');
- define('_NEWS_MI_SHOWSORT_4', 'Content title');
- define('_NEWS_MI_SHOWSORT_5', 'Admin Content page order');
+ define('_NEWS_MI_SHOWSORT_DESC', 'Ordering method for articles displayed in the module');
+ define('_NEWS_MI_SHOWSORT_1', 'article id');
+ define('_NEWS_MI_SHOWSORT_2', 'article create');
+ define('_NEWS_MI_SHOWSORT_3', 'article update');
+ define('_NEWS_MI_SHOWSORT_4', 'article title');
+ define('_NEWS_MI_SHOWSORT_5', 'Admin article page order');
define('_NEWS_MI_SHOWSORT_6', 'Random order');
- define('_NEWS_MI_SHOWSORT_7', 'content Hits');
+ define('_NEWS_MI_SHOWSORT_7', 'article Hits');
// Admin page
- define('_NEWS_MI_ADMIN_PERPAGE', 'Admin Content page items number');
- define('_NEWS_MI_ADMIN_PERPAGE_DESC', 'Number of items listed in admin Content page');
+ define('_NEWS_MI_ADMIN_PERPAGE', 'Admin article page items number');
+ define('_NEWS_MI_ADMIN_PERPAGE_DESC', 'Number of items listed in admin article page');
// Admin Show order
- define('_NEWS_MI_ADMIN_SHOWORDER', 'Admin Content page display order');
- define('_NEWS_MI_ADMIN_SHOWORDER_DESC', 'Select Descendant/Ascendant order for admin Content page');
+ define('_NEWS_MI_ADMIN_SHOWORDER', 'Admin article page display order');
+ define('_NEWS_MI_ADMIN_SHOWORDER_DESC', 'Select Descendant/Ascendant order for admin article page');
// Admin sort
- define('_NEWS_MI_ADMIN_SHOWSORT', 'Admin Content page sort');
- define('_NEWS_MI_ADMIN_SHOWSORT_DESC', 'Ordering method for items listed in admin Content page<br />Any option except "Admin content order" will modify all manual sort of content page at each reload.');
+ define('_NEWS_MI_ADMIN_SHOWSORT', 'Admin article page sort');
+ define('_NEWS_MI_ADMIN_SHOWSORT_DESC', 'Ordering method for items listed in admin article page<br />Any option except "Admin article order" will modify all manual sort of article page at each reload.');
// Admin topic page
define('_NEWS_MI_ADMIN_PERPAGE_TOPIC', 'Admin Topic page items number');
define('_NEWS_MI_ADMIN_PERPAGE_TOPIC_DESC', 'Number of items listed in admin Topic page');
@@ -189,7 +189,7 @@
define('_NEWS_MI_RSS_PERPAGE', 'RSS number');
define('_NEWS_MI_RSS_PERPAGE_DESC', 'Select number of items in RSS page');
define('_NEWS_MI_RSS_LOGO', 'RSS logo URL');
- define('_NEWS_MI_RSS_LOGO_DESC', 'Path for site logo displayed in RSS pages (relative to Xoops root directory)');
+ define('_NEWS_MI_RSS_LOGO_DESC', 'Path for site logo displayed in RSS pages (relative to ROOT directory)');
// Print
define('_NEWS_MI_PRINT_LOGO', 'Display site title');
define('_NEWS_MI_PRINT_LOGO_DESC', 'Show/hide site title in print page');
@@ -199,7 +199,7 @@
define('_NEWS_MI_PRINT_RIGHT', 'Right');
define('_NEWS_MI_PRINT_CENTER', 'Center');
define('_NEWS_MI_PRINT_LOGOURL', 'Print logo URL');
- define('_NEWS_MI_PRINT_LOGOURL_DESC', 'Path for site logo displayed in print page (relative to Xoops root directory)');
+ define('_NEWS_MI_PRINT_LOGOURL_DESC', 'Path for site logo displayed in print page (relative to ROOT directory)');
define('_NEWS_MI_PRINT_TITLE', 'Display Title');
define('_NEWS_MI_PRINT_TITLE_DESC', '');
define('_NEWS_MI_PRINT_IMG', 'Display Image');
@@ -216,7 +216,7 @@
define('_NEWS_MI_PRINT_LINK_DESC', '');
//img
define('_NEWS_MI_IMAGE_DIR', 'Image upload path');
- define('_NEWS_MI_IMAGE_DIR_DESC', 'Upload path for images attached to content');
+ define('_NEWS_MI_IMAGE_DIR_DESC', 'Upload path for images attached to article');
define('_NEWS_MI_IMAGE_SIZE', 'Image file size (in bytes)');
define('_NEWS_MI_IMAGE_SIZE_DESC', 'Max allowed size for image file (1048576 bytes = 1 MegaByte)');
define('_NEWS_MI_IMAGE_MAXWIDTH', 'Image max width (pixel)');
@@ -233,31 +233,31 @@
define('_NEWS_MI_IMAGE_THUMBHEIGHT_DESC', 'Thumb allowed height for image resize');
define('_NEWS_MI_IMAGE_MIME', 'Image mime types');
define('_NEWS_MI_IMAGE_MIME_DESC', 'Allowed myme-types for image upload');
- define('_NEWS_MI_IMAGE_WIDTH', 'Content list max image width (pixel)');
- define('_NEWS_MI_IMAGE_WIDTH_DESC', 'Max allowed width for images in content listed in index/topic pages<br /> A max width/height for images in content pages is set in /css/style.css');
+ define('_NEWS_MI_IMAGE_WIDTH', 'article list max image width (pixel)');
+ define('_NEWS_MI_IMAGE_WIDTH_DESC', 'Max allowed width for images in article listed in index/topic pages<br /> A max width/height for images in article pages is set in /css/style.css');
define('_NEWS_MI_IMAGE_FLOAT', 'Image align');
- define('_NEWS_MI_IMAGE_FLOAT_DESC', 'Select left or right position for images attached to content');
+ define('_NEWS_MI_IMAGE_FLOAT_DESC', 'Select left or right position for images attached to article');
define('_NEWS_MI_IMAGE_LEFT', 'Left');
define('_NEWS_MI_IMAGE_RIGHT', 'Right');
define('_NEWS_MI_IMAGE_LIGHTBOX', 'Use lightbox');
define('_NEWS_MI_IMAGE_LIGHTBOX_DESC', 'Use lightbox effect to display images at original size');
//social
define('_NEWS_MI_SOCIAL', 'Display Bookmark/Social links');
- define('_NEWS_MI_SOCIAL_DESC', 'You can display Social network and bookmark icons in each content');
+ define('_NEWS_MI_SOCIAL_DESC', 'You can display Social network and bookmark icons in each article');
define('_NEWS_MI_BOOKMARK', 'Bookmark');
define('_NEWS_MI_SOCIALNETWORM', 'Social Networks');
define('_NEWS_MI_NONE', 'None');
define('_NEWS_MI_BOTH', 'Both');
//Multiple Columns
define('_NEWS_MI_MULTIPLE_COLUMNS', 'Multiple Columns');
- define('_NEWS_MI_MULTIPLE_COLUMNS_DESC', 'Select number of columns used for displaying contents<br />This option works only in content page and for content in <b>Text</b> field');
+ define('_NEWS_MI_MULTIPLE_COLUMNS_DESC', 'Select number of columns used for displaying articles<br />This option works only in article page and for article in <b>Text</b> field');
define('_NEWS_MI_MULTIPLE_COLUMNS_1', 'One Column');
define('_NEWS_MI_MULTIPLE_COLUMNS_2', 'Two Columns');
define('_NEWS_MI_MULTIPLE_COLUMNS_3', 'Three Columns');
define('_NEWS_MI_MULTIPLE_COLUMNS_4', 'Four Columns');
// All user posts
define('_NEWS_MI_ALLUSERPOST', 'Display "All user posts" link');
- define('_NEWS_MI_ALLUSERPOST_DESC', 'Show/Hide all user posts link in each content');
+ define('_NEWS_MI_ALLUSERPOST_DESC', 'Show/Hide all user posts link in each article');
// regular expression
define('_NEWS_MI_REGULAR_EXPRESSION', 'Auto Alias URL pattern');
define('_NEWS_MI_REGULAR_EXPRESSION_DESC', 'Regular Expression for generating auto Alias URL pattern. <br />If you your language is not supported in Alias URL you can add appopriate regular expression here. Default setting is : <b>`[^a-z0-9]`i</b>');
@@ -268,7 +268,7 @@
define('_NEWS_MI_BREADCRUMB_TOHOME', 'Display Homepage link');
// Files
define('_NEWS_MI_FILE_DIR', 'File upload path');
- define('_NEWS_MI_FILE_DIR_DESC', 'Upload path for files attached to content');
+ define('_NEWS_MI_FILE_DIR_DESC', 'Upload path for files attached to article');
define('_NEWS_MI_FILE_SIZE', 'file size (in bytes)');
define('_NEWS_MI_FILE_SIZE_DESC', 'Max allowed size for file (1048576 bytes = 1 MegaByte)');
define('_NEWS_MI_FILE_MIME', 'File mime types');
@@ -294,11 +294,11 @@
define('_NEWS_MI_INSERT_DATA', 'Inserting data');
// homepage
define('_NEWS_MI_HOMEPAGE', 'Homepage seting');
- define('_NEWS_MI_HOMEPAGE_DESC', 'Seting content show type in module index page');
- define('_NEWS_MI_HOMEPAGE_1', 'List all contents from all topics');
+ define('_NEWS_MI_HOMEPAGE_DESC', 'Seting article show type in module index page');
+ define('_NEWS_MI_HOMEPAGE_1', 'List all articles from all topics');
define('_NEWS_MI_HOMEPAGE_2', 'List all topics');
define('_NEWS_MI_HOMEPAGE_3', 'List all static pages');
- define('_NEWS_MI_HOMEPAGE_4', 'Show selected static content');
+ define('_NEWS_MI_HOMEPAGE_4', 'Show selected static article');
// topic name
define('_NEWS_MI_TOPICNAME', 'Topic name');
define('_NEWS_MI_TOPICNAME_DESC', 'Set topic name for URL');
@@ -306,6 +306,6 @@
define('_NEWS_MI_RELATED', 'Related table');
define('_NEWS_MI_RELATED_DESC', 'When you use this option, a summary containing links to all the recent published articles is visible at the bottom of each article');
define('_NEWS_MI_RELATED_LIMIT', 'Related limit');
- define('_NEWS_MI_RELATED_LIMIT_DESC', 'Number of contents for show in Related table');
+ define('_NEWS_MI_RELATED_LIMIT_DESC', 'Number of articles for show in Related table');
}
?>
\ No newline at end of file
Modified: XoopsModules/fmcontent/branches/news/language/persian/admin.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/persian/admin.php 2011-12-26 06:41:56 UTC (rev 8558)
+++ XoopsModules/fmcontent/branches/news/language/persian/admin.php 2011-12-26 07:16:50 UTC (rev 8559)
@@ -77,7 +77,7 @@
define('_NEWS_AM_TOPIC_SHOWTYPE_4', 'List type');
define('_NEWS_AM_TOPIC_SHOWTYPE_5', 'Spotlight');
// Content page
- define('_NEWS_AM_CONTENT_FORM', 'مدیریت محتوا');
+ define('_NEWS_AM_CONTENT_FORM', 'مدیریت اخبار');
define('_NEWS_AM_CONTENT_FORMTITLE', 'عنوان');
define('_NEWS_AM_CONTENT_FORMTITLE_DISP', 'نمایش عنوان صفحه؟');
define('_NEWS_AM_CONTENT_FORMAUTHOR', 'سازنده ( نام)');
@@ -93,12 +93,12 @@
define('_NEWS_AM_CONTENT_FORMNEXT', 'صقحه بعدی');
define('_NEWS_AM_CONTENT_DOHTML', 'نمایش به صورت Html');
define('_NEWS_AM_CONTENT_BREAKS', 'تبدیل خط شکسته فعال');
- define('_NEWS_AM_CONTENT_DOIMAGE', 'نمایش تصاویر محتوا');
- define('_NEWS_AM_CONTENT_DOXCODE', 'نمایش کدهای محتوا');
- define('_NEWS_AM_CONTENT_DOSMILEY', 'نمایش لبخند های محتوا');
+ define('_NEWS_AM_CONTENT_DOIMAGE', 'نمایش تصاویر');
+ define('_NEWS_AM_CONTENT_DOXCODE', 'نمایش کدها');
+ define('_NEWS_AM_CONTENT_DOSMILEY', 'نمایش لبخند ها');
define('_NEWS_AM_CONTENT_SHORT', 'متن خلاصه');
define('_NEWS_AM_CONTENT_TITLE', 'عنوان');
- define('_NEWS_AM_CONTENT_MANAGER', 'مدیریت محتوا');
+ define('_NEWS_AM_CONTENT_MANAGER', 'مدیریت اخبار');
define('_NEWS_AM_CONTENT_FILE', 'File');
define('_NEWS_AM_CONTENT_ID', 'ID');
define('_NEWS_AM_CONTENT_NUM', 'وزن');
@@ -164,7 +164,7 @@
define('_NEWS_AM_MSG_DELETE', 'آیا اطمینان دارید که میخواهید %s را حذف کنید؟');
define('_NEWS_AM_MSG_EDIT_ERROR', 'این صفحه پیدا نشد یا آی دی صفحه اشتباه است!');
define('_NEWS_AM_MSG_UPDATE_ERROR', 'ناتوان در به روز رسانی پایگاه داده ها! خطا در به روز رسانی صفحه');
- define('_NEWS_AM_MSG_INSERT_ERROR', 'ناتوان در به روز رسانی پایگاه داده ها! خطا در مورد محتوا');
+ define('_NEWS_AM_MSG_INSERT_ERROR', 'ناتوان در به روز رسانی پایگاه داده ها! خطا در مورد اخبار');
define('_NEWS_AM_MSG_CLONE_ERROR', 'این شاخه هماکنون موجود است!');
define("_NEWS_AM_MSG_NOPERMSSET", "هیچ دسترسی قابل تنظیم نیست : هنوز هیچ شاخه ای ساخته نشده است! لطفا ابتدا یک شاخه بسازید.");
define('_NEWS_AM_MSG_ALIASERROR', 'نام مستعار مورد انتخاب شما گرفته شده است. لطفا یک نام دیگر انتخاب کنید.');
Modified: XoopsModules/fmcontent/branches/news/language/persian/modinfo.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/persian/modinfo.php 2011-12-26 06:41:56 UTC (rev 8558)
+++ XoopsModules/fmcontent/branches/news/language/persian/modinfo.php 2011-12-26 07:16:50 UTC (rev 8559)
@@ -20,12 +20,12 @@
if (!defined('_MI_NEWS_NAME')) {
// Module info
- define('_MI_NEWS_NAME', 'محتوا');
+ define('_MI_NEWS_NAME', 'اخبار');
define('_MI_NEWS_DESC', 'برای مدییت صفحات ایستا و پویا');
// Menu
define("_NEWS_MI_HOME", "صفحه اصلی");
define("_NEWS_MI_TOPIC", "شاخه");
- define("_NEWS_MI_CONTENT", "محتوا");
+ define("_NEWS_MI_CONTENT", "اخبار");
define("_NEWS_MI_PERM", "دسترسی ها");
define("_NEWS_MI_TOOLS", "ابزار");
define("_NEWS_MI_ABOUT", "درباره");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2011-12-26 09:17:14
|
Revision: 8561
http://xoops.svn.sourceforge.net/xoops/?rev=8561&view=rev
Author: voltan1
Date: 2011-12-26 09:17:08 +0000 (Mon, 26 Dec 2011)
Log Message:
-----------
Fix Queries
Modified Paths:
--------------
XoopsModules/fmcontent/branches/news/class/story.php
XoopsModules/fmcontent/branches/news/class/topic.php
XoopsModules/fmcontent/branches/news/index.php
Modified: XoopsModules/fmcontent/branches/news/class/story.php
===================================================================
--- XoopsModules/fmcontent/branches/news/class/story.php 2011-12-26 07:19:19 UTC (rev 8560)
+++ XoopsModules/fmcontent/branches/news/class/story.php 2011-12-26 09:17:08 UTC (rev 8561)
@@ -502,26 +502,27 @@
*/
function News_GetContentList($NewsModule, $story_infos) {
$ret = array ();
- $criteria = new CriteriaCompo ();
- $criteria->add ( new Criteria ( 'story_status', $story_infos ['story_status'] ) );
+
$access_topic = NewsPermission::News_GetItemIds ( 'news_access', $NewsModule);
$topic_handler = xoops_getmodulehandler ( 'topic', 'news' );
$topic_show = $topic_handler->allVisible($NewsModule,$story_infos ['topics'],$story_infos ['story_topic']);
- $topiclist = array_intersect($access_topic , $topic_show);
- $criteria->add ( new Criteria ( 'story_topic', '(' . implode ( ',', $topiclist ) . ')', 'IN' ) );
+ if(isset($story_infos ['story_subtopic'])) {
+ $topiclist = array_intersect($access_topic , $topic_show , $story_infos ['story_subtopic']);
+ } else {
+ $topiclist = array_intersect($access_topic , $topic_show);
+ }
+
+
+ $criteria = new CriteriaCompo ();
+ $criteria->add ( new Criteria ( 'story_topic', '(' . implode ( ',', $topiclist ) . ')', 'IN' ) );
$criteria->add ( new Criteria ( 'story_modid', $NewsModule->getVar ( 'mid' ) ) );
+ $criteria->add ( new Criteria ( 'story_status', $story_infos ['story_status'] ) );
+ $criteria->add ( new Criteria ( 'story_uid', $story_infos ['story_user'] ) );
+ $criteria->add ( new Criteria ( 'story_publish', 0 , '>' ));
$criteria->add ( new Criteria ( 'story_publish', time() , '<=' ));
- $criteria->add ( new Criteria ( 'story_publish', 0 , '>' ));
- $criteria->add ( new Criteria ( 'story_expire', time() , '>=' ));
- $criteria->add ( new Criteria ( 'story_expire', 0 ) ,'OR');
- $criteria->add ( new Criteria ( 'story_uid', $story_infos ['story_user'] ) );
- $criteria->add ( new Criteria ( 'story_topic', $story_infos ['story_topic'] ) );
- if(isset($story_infos ['story_subtopic'])) {
- foreach ($story_infos ['story_subtopic'] as $subtopic){
- $criteria->add ( new Criteria ( 'story_topic', $subtopic ) ,'OR');
- }
- }
- $criteria->setSort ( $story_infos ['story_sort'] );
+ $criteria->add ( new Criteria ( 'story_expire', 0 ));
+ $criteria->add ( new Criteria ( 'story_expire', time() , '>' ) ,'OR');
+ $criteria->setSort ( $story_infos ['story_sort'] );
$criteria->setOrder ( $story_infos ['story_order'] );
$criteria->setLimit ( $story_infos ['story_limit'] );
$criteria->setStart ( $story_infos ['story_start'] );
@@ -654,22 +655,28 @@
* use in homepage function in NewsUtils class
*/
function News_GetContentCount($NewsModule, $story_infos) {
- $criteria = new CriteriaCompo ();
- $criteria->add ( new Criteria ( 'story_modid', $NewsModule->getVar ( 'mid' ) ) );
- $criteria->add ( new Criteria ( 'story_topic', $story_infos ['story_topic'] ) );
$access_topic = NewsPermission::News_GetItemIds ( 'news_access', $NewsModule);
$topic_handler = xoops_getmodulehandler ( 'topic', 'news' );
$topic_show = $topic_handler->allVisible($NewsModule,$story_infos ['topics'],$story_infos ['story_topic']);
- $topiclist = array_intersect($access_topic , $topic_show);
- $criteria->add ( new Criteria ( 'story_topic', '(' . implode ( ',', $topiclist ) . ')', 'IN' ) );
if(isset($story_infos ['story_subtopic'])) {
- foreach ($story_infos ['story_subtopic'] as $subtopic){
- $criteria->add ( new Criteria ( 'story_topic', $subtopic ) ,'OR');
- }
- }
- if ($story_infos ['story_static']) {
- $criteria->add ( new Criteria ( 'story_topic', '0', '>' ) );
- }
+ $topiclist = array_intersect($access_topic , $topic_show , $story_infos ['story_subtopic']);
+ } else {
+ $topiclist = array_intersect($access_topic , $topic_show);
+ }
+
+ $criteria = new CriteriaCompo ();
+ $criteria->add ( new Criteria ( 'story_topic', '(' . implode ( ',', $topiclist ) . ')', 'IN' ) );
+ $criteria->add ( new Criteria ( 'story_modid', $NewsModule->getVar ( 'mid' ) ) );
+ $criteria->add ( new Criteria ( 'story_status', $story_infos ['story_status'] ) );
+ $criteria->add ( new Criteria ( 'story_uid', $story_infos ['story_user'] ) );
+ $criteria->add ( new Criteria ( 'story_publish', 0 , '>' ));
+ $criteria->add ( new Criteria ( 'story_publish', time() , '<=' ));
+ $criteria->add ( new Criteria ( 'story_expire', 0 ));
+ $criteria->add ( new Criteria ( 'story_expire', time() , '>' ) ,'OR');
+ $criteria->setSort ( $story_infos ['story_sort'] );
+ $criteria->setOrder ( $story_infos ['story_order'] );
+ $criteria->setLimit ( $story_infos ['story_limit'] );
+ $criteria->setStart ( $story_infos ['story_start'] );
return $this->getCount ( $criteria );
}
Modified: XoopsModules/fmcontent/branches/news/class/topic.php
===================================================================
--- XoopsModules/fmcontent/branches/news/class/topic.php 2011-12-26 07:19:19 UTC (rev 8560)
+++ XoopsModules/fmcontent/branches/news/class/topic.php 2011-12-26 09:17:08 UTC (rev 8561)
@@ -309,6 +309,7 @@
*/
function News_GetSubTopics($NewsModule , $id ,$topics) {
$ret = array();
+ $ret [] = $id;
foreach ( $topics as $root ) {
if($root->getVar ( 'topic_pid' ) == $id) {
$ret [] = $root->getVar ( 'topic_id' );
Modified: XoopsModules/fmcontent/branches/news/index.php
===================================================================
--- XoopsModules/fmcontent/branches/news/index.php 2011-12-26 07:19:19 UTC (rev 8560)
+++ XoopsModules/fmcontent/branches/news/index.php 2011-12-26 09:17:08 UTC (rev 8561)
@@ -148,7 +148,7 @@
$story_start = 0;
}
-$story_infos = array ('topics' => $topics, 'story_limit' => $story_limit, 'story_topic' => $story_topic, 'story_user' => $story_user, 'story_start' => $story_start, 'story_order' => $story_order, 'story_sort' => $story_sort, 'story_status' => '1', 'story_static' => true, 'admin_side' => false , 'story_subtopic' => $story_subtopic , 'id' => $default_id, 'title' => $default_title , 'alias' => $default_alias);
+$story_infos = array ('topics' => $topics, 'story_limit' => $story_limit, 'story_topic' => $story_topic, 'story_user' => $story_user, 'story_start' => $story_start, 'story_order' => $story_order, 'story_sort' => $story_sort, 'story_status' => '1', 'story_subtopic' => $story_subtopic , 'id' => $default_id, 'title' => $default_title , 'alias' => $default_alias);
// Get Information for Show in indexpage or topic pages
$contents = NewsUtils::News_Homepage ( $NewsModule, $story_infos, $type );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2011-12-31 13:02:34
|
Revision: 8624
http://xoops.svn.sourceforge.net/xoops/?rev=8624&view=rev
Author: voltan1
Date: 2011-12-31 13:02:26 +0000 (Sat, 31 Dec 2011)
Log Message:
-----------
Change time
Modified Paths:
--------------
XoopsModules/fmcontent/branches/news/admin/file.php
XoopsModules/fmcontent/branches/news/admin/topic.php
XoopsModules/fmcontent/branches/news/article.php
XoopsModules/fmcontent/branches/news/blocks/list.php
XoopsModules/fmcontent/branches/news/class/story.php
XoopsModules/fmcontent/branches/news/index.php
XoopsModules/fmcontent/branches/news/language/arabic/blocks.php
XoopsModules/fmcontent/branches/news/language/arabic/main.php
XoopsModules/fmcontent/branches/news/language/arabic/modinfo.php
XoopsModules/fmcontent/branches/news/language/english/blocks.php
XoopsModules/fmcontent/branches/news/language/english/main.php
XoopsModules/fmcontent/branches/news/language/english/modinfo.php
XoopsModules/fmcontent/branches/news/language/persian/blocks.php
XoopsModules/fmcontent/branches/news/language/persian/main.php
XoopsModules/fmcontent/branches/news/language/persian/modinfo.php
XoopsModules/fmcontent/branches/news/templates/blocks/news_list.html
XoopsModules/fmcontent/branches/news/templates/news_article.html
XoopsModules/fmcontent/branches/news/templates/news_index_default.html
XoopsModules/fmcontent/branches/news/templates/news_index_list.html
XoopsModules/fmcontent/branches/news/templates/news_index_news.html
XoopsModules/fmcontent/branches/news/templates/news_index_photo.html
XoopsModules/fmcontent/branches/news/templates/news_index_table.html
XoopsModules/fmcontent/branches/news/templates/news_rss.html
XoopsModules/fmcontent/branches/news/topic.php
XoopsModules/fmcontent/branches/news/xoops_version.php
Modified: XoopsModules/fmcontent/branches/news/admin/file.php
===================================================================
--- XoopsModules/fmcontent/branches/news/admin/file.php 2011-12-29 17:56:36 UTC (rev 8623)
+++ XoopsModules/fmcontent/branches/news/admin/file.php 2011-12-31 13:02:26 UTC (rev 8624)
@@ -32,8 +32,8 @@
// Define scripts
$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
$xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
-$xoTheme->addScript('browse.php?modules/' . $NewsModule->getVar('dirname') . '/js/order.js');
-$xoTheme->addScript('browse.php?modules/' . $NewsModule->getVar('dirname') . '/js/admin.js');
+$xoTheme->addScript(XOOPS_URL . '/modules/' . $NewsModule->getVar('dirname') . '/js/order.js');
+$xoTheme->addScript(XOOPS_URL . '/modules/' . $NewsModule->getVar('dirname') . '/js/admin.js');
// Add module stylesheet
$xoTheme->addStylesheet(XOOPS_URL . '/modules/' . $NewsModule->getVar('dirname') . '/css/admin.css');
$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
Modified: XoopsModules/fmcontent/branches/news/admin/topic.php
===================================================================
--- XoopsModules/fmcontent/branches/news/admin/topic.php 2011-12-29 17:56:36 UTC (rev 8623)
+++ XoopsModules/fmcontent/branches/news/admin/topic.php 2011-12-31 13:02:26 UTC (rev 8624)
@@ -33,8 +33,8 @@
// Define scripts
$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
$xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
-$xoTheme->addScript('browse.php?modules/' . $NewsModule->getVar('dirname') . '/js/order.js');
-$xoTheme->addScript('browse.php?modules/' . $NewsModule->getVar('dirname') . '/js/admin.js');
+$xoTheme->addScript(XOOPS_URL . '/modules/' . $NewsModule->getVar('dirname') . '/js/order.js');
+$xoTheme->addScript(XOOPS_URL . '/modules/' . $NewsModule->getVar('dirname') . '/js/admin.js');
// Add module stylesheet
$xoTheme->addStylesheet(XOOPS_URL . '/modules/' . $NewsModule->getVar('dirname') . '/css/admin.css');
$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
Modified: XoopsModules/fmcontent/branches/news/article.php
===================================================================
--- XoopsModules/fmcontent/branches/news/article.php 2011-12-29 17:56:36 UTC (rev 8623)
+++ XoopsModules/fmcontent/branches/news/article.php 2011-12-31 13:02:26 UTC (rev 8624)
@@ -89,7 +89,7 @@
$content ['topic'] = $view_topic->getVar ( 'topic_title' );
$content ['topic_alias'] = $view_topic->getVar ( 'topic_alias' );
$content ['topic_id'] = $view_topic->getVar ( 'topic_id' );
-$content ['story_create'] = formatTimestamp ( $content ['story_create'], _MEDIUMDATESTRING );
+$content ['story_publish'] = formatTimestamp ( $content ['story_publish'], _MEDIUMDATESTRING );
$content ['story_update'] = formatTimestamp ( $content ['story_update'], _MEDIUMDATESTRING );
$content ['imageurl'] = XOOPS_URL . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/medium/' . $content ['story_img'];
$content ['thumburl'] = XOOPS_URL . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/thumb/' . $content ['story_img'];
@@ -188,7 +188,7 @@
}
}
if (xoops_getModuleOption ( 'disp_date', $NewsModule->getVar ( 'dirname' ) )) {
- $link ['date'] = XoopsUser::getUnameFromId ( $obj->getVar ( 'story_create' ) );
+ $link ['date'] = XoopsUser::getUnameFromId ( $obj->getVar ( 'story_publish' ) );
}
if (xoops_getModuleOption ( 'disp_author', $NewsModule->getVar ( 'dirname' ) )) {
$content ['author'] = XoopsUser::getUnameFromId ( $obj->getVar ( 'story_uid' ) );
@@ -236,9 +236,9 @@
if (xoops_getModuleOption ( 'editinplace', $NewsModule->getVar ( 'dirname' ) ) && is_object ( $xoopsUser ) && ($xoopsUser->id () == $obj->getVar ( 'story_uid' ) || $xoopsUser->isAdmin ()) && $content ['dohtml']) {
// Add scripts
$xoTheme->addScript ( 'browse.php?Frameworks/jquery/jquery.js' );
- $xoTheme->addScript ( 'browse.php?modules/' . $NewsModule->getVar ( 'dirname' ) . '/js/jeditable/jquery.wysiwyg.js' );
- $xoTheme->addScript ( 'browse.php?modules/' . $NewsModule->getVar ( 'dirname' ) . '/js/jeditable/jquery.jeditable.mini.js' );
- $xoTheme->addScript ( 'browse.php?modules/' . $NewsModule->getVar ( 'dirname' ) . '/js/jeditable/jquery.jeditable.wysiwyg.js' );
+ $xoTheme->addScript ( XOOPS_URL . '/modules/' . $NewsModule->getVar ( 'dirname' ) . '/js/jeditable/jquery.wysiwyg.js' );
+ $xoTheme->addScript ( XOOPS_URL . '/modules/' . $NewsModule->getVar ( 'dirname' ) . '/js/jeditable/jquery.jeditable.mini.js' );
+ $xoTheme->addScript ( XOOPS_URL . '/modules/' . $NewsModule->getVar ( 'dirname' ) . '/js/jeditable/jquery.jeditable.wysiwyg.js' );
// Add Stylesheet
$xoTheme->addStylesheet ( XOOPS_URL . '/modules/' . $NewsModule->getVar ( 'dirname' ) . '/css/jquery.wysiwyg.css' );
$xoopsTpl->assign ( 'editinplace', true );
@@ -249,7 +249,7 @@
$xoTheme->addScript ( 'browse.php?Frameworks/jquery/jquery.js' );
$xoTheme->addScript ( 'browse.php?Frameworks/jquery/plugins/jquery.lightbox.js' );
// Add Stylesheet
- $xoTheme->addStylesheet ( 'browse.php?modules/system/css/lightbox.css' );
+ $xoTheme->addStylesheet ( XOOPS_URL . '/modules/system/css/lightbox.css' );
$xoopsTpl->assign ( 'img_lightbox', true );
}
Modified: XoopsModules/fmcontent/branches/news/blocks/list.php
===================================================================
--- XoopsModules/fmcontent/branches/news/blocks/list.php 2011-12-29 17:56:36 UTC (rev 8623)
+++ XoopsModules/fmcontent/branches/news/blocks/list.php 2011-12-31 13:02:26 UTC (rev 8624)
@@ -145,7 +145,7 @@
$story_sort = new XoopsFormSelect(_NEWS_MI_SHOWSORT, 'options[]', $options[7]);
$story_sort->addOption("story_id", _NEWS_MI_SHOWSORT_1);
- $story_sort->addOption("story_create", _NEWS_MI_SHOWSORT_2);
+ $story_sort->addOption("story_publish", _NEWS_MI_SHOWSORT_2);
$story_sort->addOption("story_update", _NEWS_MI_SHOWSORT_3);
$story_sort->addOption("story_title", _NEWS_MI_SHOWSORT_4);
$story_sort->addOption("story_order", _NEWS_MI_SHOWSORT_5);
Modified: XoopsModules/fmcontent/branches/news/class/story.php
===================================================================
--- XoopsModules/fmcontent/branches/news/class/story.php 2011-12-29 17:56:36 UTC (rev 8623)
+++ XoopsModules/fmcontent/branches/news/class/story.php 2011-12-31 13:02:26 UTC (rev 8624)
@@ -437,7 +437,7 @@
$default = self::News_GetDefault ( $criteria );
$obj = self::get ( $default );
$contentDefault = $obj->toArray ();
- $contentDefault ['story_create'] = formatTimestamp ( $contentDefault ['story_create'], _MEDIUMDATESTRING );
+ $contentDefault ['story_publish'] = formatTimestamp ( $contentDefault ['story_publish'], _MEDIUMDATESTRING );
$contentDefault ['imageurl'] = XOOPS_URL . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/medium/' . $contentDefault ['story_img'];
$contentDefault ['thumburl'] = XOOPS_URL . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/thumb/' . $contentDefault ['story_img'];
$contentDefault ['topic'] = $default_info ['title'];
@@ -487,7 +487,7 @@
}
$tab ['url'] = NewsUtils::News_Url ( $NewsModule->getVar ( 'dirname' ), $tab );
- $tab ['story_create'] = formatTimestamp ( $root->getVar ( 'story_create' ), _MEDIUMDATESTRING );
+ $tab ['story_publish'] = formatTimestamp ( $root->getVar ( 'story_publish' ), _MEDIUMDATESTRING );
$tab ['story_update'] = formatTimestamp ( $root->getVar ( 'story_update' ), _MEDIUMDATESTRING );
$tab ['imageurl'] = XOOPS_URL . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/medium/' . $root->getVar ( 'story_img' );
$tab ['thumburl'] = XOOPS_URL . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/thumb/' . $root->getVar ( 'story_img' );
@@ -547,7 +547,7 @@
}
$tab ['url'] = NewsUtils::News_Url ( $NewsModule->getVar ( 'dirname' ), $tab );
- $tab ['story_create'] = formatTimestamp ( $root->getVar ( 'story_create' ), _MEDIUMDATESTRING );
+ $tab ['story_publish'] = formatTimestamp ( $root->getVar ( 'story_publish' ), _MEDIUMDATESTRING );
$tab ['story_update'] = formatTimestamp ( $root->getVar ( 'story_update' ), _MEDIUMDATESTRING );
$tab ['imageurl'] = XOOPS_URL . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/medium/' . $root->getVar ( 'story_img' );
$tab ['thumburl'] = XOOPS_URL . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/thumb/' . $root->getVar ( 'story_img' );
@@ -604,7 +604,7 @@
$tab ['url'] = NewsUtils::News_Url ( $NewsModule->getVar ( 'dirname' ), $tab );
$tab ['title'] = mb_strlen ( $root->getVar ( 'story_title' ), 'utf-8' ) > $story_infos ['lenght_title'] ? mb_substr ( $root->getVar ( 'story_title' ), 0, ($story_infos ['lenght_title']), 'utf-8' ) . "..." : $root->getVar ( 'story_title' );
- $tab ['date'] = formatTimestamp ( $root->getVar ( 'story_create' ), _MEDIUMDATESTRING );
+ $tab ['date'] = formatTimestamp ( $root->getVar ( 'story_publish' ), _MEDIUMDATESTRING );
$ret [] = $tab;
}
}
@@ -646,7 +646,7 @@
}
$tab ['url'] = NewsUtils::News_Url ( $NewsModule->getVar ( 'dirname' ), $tab );
- $tab ['story_create'] = formatTimestamp ( $root->getVar ( 'story_create' ), _MEDIUMDATESTRING );
+ $tab ['story_publish'] = formatTimestamp ( $root->getVar ( 'story_publish' ), _MEDIUMDATESTRING );
$tab ['story_update'] = formatTimestamp ( $root->getVar ( 'story_update' ), _MEDIUMDATESTRING );
$tab ['imageurl'] = XOOPS_URL . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/medium/' . $root->getVar ( 'story_img' );
$tab ['thumburl'] = XOOPS_URL . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/thumb/' . $root->getVar ( 'story_img' );
@@ -873,7 +873,7 @@
}
$criteria->setStart ( $start );
$criteria->setLimit ( $limit );
- $criteria->setSort ( 'story_create' );
+ $criteria->setSort ( 'story_publish' );
$contents = $this->getObjects ( $criteria );
@@ -886,7 +886,7 @@
$data ['topic_alias'] = $data ['topic'];
$data ['link'] = NewsUtils::News_Url ( 'news', $data );
$data ['title'] = $content->getVar ( 'story_title' );
- $data ['time'] = $content->getVar ( 'story_create' );
+ $data ['time'] = $content->getVar ( 'story_publish' );
$data ['uid'] = $content->getVar ( 'story_uid' );
$ret [] = $data;
}
Modified: XoopsModules/fmcontent/branches/news/index.php
===================================================================
--- XoopsModules/fmcontent/branches/news/index.php 2011-12-29 17:56:36 UTC (rev 8623)
+++ XoopsModules/fmcontent/branches/news/index.php 2011-12-31 13:02:26 UTC (rev 8624)
@@ -59,17 +59,17 @@
$topics = $topic_handler->getall ( $story_topic );
$view_topic = $topics[$story_topic];
if (! isset ( $view_topic )) {
- redirect_header ( 'index.php', 3, _NEWS_MD_TOPIC_ERROR );
+ redirect_header ( 'index.php', 3, _NEWS_MD_ERROR_TOPIC );
exit ();
}
if ($view_topic->getVar ( 'topic_modid' ) != $NewsModule->getVar ( 'mid' )) {
- redirect_header ( 'index.php', 3, _NEWS_MD_TOPIC_ERROR );
+ redirect_header ( 'index.php', 3, _NEWS_MD_ERROR_TOPIC );
exit ();
}
if ($view_topic->getVar ( 'topic_online' ) == '0') {
- redirect_header ( 'index.php', 3, _NEWS_MD_TOPIC_ERROR );
+ redirect_header ( 'index.php', 3, _NEWS_MD_ERROR_TOPIC );
exit ();
}
@@ -199,7 +199,7 @@
$xoTheme->addScript ( 'browse.php?Frameworks/jquery/jquery.js' );
$xoTheme->addScript ( 'browse.php?Frameworks/jquery/plugins/jquery.lightbox.js' );
// Add Stylesheet
- $xoTheme->addStylesheet ( 'browse.php?modules/system/css/lightbox.css' );
+ $xoTheme->addStylesheet ( XOOPS_URL . '/modules/system/css/lightbox.css' );
$xoopsTpl->assign ( 'img_lightbox', true );
}
Modified: XoopsModules/fmcontent/branches/news/language/arabic/blocks.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/arabic/blocks.php 2011-12-29 17:56:36 UTC (rev 8623)
+++ XoopsModules/fmcontent/branches/news/language/arabic/blocks.php 2011-12-31 13:02:26 UTC (rev 8624)
@@ -28,5 +28,6 @@
define('_NEWS_MB_MORE', ' اقرأ المزيد ');
define('_NEWS_MB_SHOE_MORELINK', 'Show more link');
define('_NEWS_MB_MORELINK', 'More link');
+ define("_NEWS_MB_IMPORTANT", "Immediate ");
}
?>
\ No newline at end of file
Modified: XoopsModules/fmcontent/branches/news/language/arabic/main.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/arabic/main.php 2011-12-29 17:56:36 UTC (rev 8623)
+++ XoopsModules/fmcontent/branches/news/language/arabic/main.php 2011-12-31 13:02:26 UTC (rev 8624)
@@ -32,6 +32,7 @@
define('_NEWS_MD_COM', 'الرأي');
define('_NEWS_MD_RELATED', 'مواضیع ذات صلة');
define("_NEWS_MD_HOME", "Home");
+ define("_NEWS_MD_IMPORTANT", "Immediate ");
// Link
define('_NEWS_MD_NEXT', 'التالیة');
define('_NEWS_MD_PREV', 'السابقة');
Modified: XoopsModules/fmcontent/branches/news/language/arabic/modinfo.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/arabic/modinfo.php 2011-12-29 17:56:36 UTC (rev 8623)
+++ XoopsModules/fmcontent/branches/news/language/arabic/modinfo.php 2011-12-31 13:02:26 UTC (rev 8624)
@@ -155,7 +155,7 @@
define('_NEWS_MI_SHOWSORT_3', 'content update');
define('_NEWS_MI_SHOWSORT_4', 'content title');
define('_NEWS_MI_SHOWSORT_5', 'content order');
- define('_NEWS_MI_SHOWSORT_6', 'Random content');
+ define('_NEWS_MI_SHOWSORT_6', 'Random');
define('_NEWS_MI_SHOWSORT_7', 'content Hits');
// Admin page
define('_NEWS_MI_ADMIN_PERPAGE', 'الوثیقة في کل صفحة');
Modified: XoopsModules/fmcontent/branches/news/language/english/blocks.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/english/blocks.php 2011-12-29 17:56:36 UTC (rev 8623)
+++ XoopsModules/fmcontent/branches/news/language/english/blocks.php 2011-12-31 13:02:26 UTC (rev 8624)
@@ -28,5 +28,6 @@
define('_NEWS_MB_MORE', 'Read more');
define('_NEWS_MB_SHOE_MORELINK', 'Show more link');
define('_NEWS_MB_MORELINK', 'More link');
+ define("_NEWS_MB_IMPORTANT", "Immediate ");
}
?>
\ No newline at end of file
Modified: XoopsModules/fmcontent/branches/news/language/english/main.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/english/main.php 2011-12-29 17:56:36 UTC (rev 8623)
+++ XoopsModules/fmcontent/branches/news/language/english/main.php 2011-12-31 13:02:26 UTC (rev 8624)
@@ -31,7 +31,8 @@
define("_NEWS_MD_AUTHOR_ALL_DESC", "View all contributions by ");
define('_NEWS_MD_COM', 'Comment');
define('_NEWS_MD_RELATED', 'Related articles');
- define("_NEWS_MD_HOME", "Home");
+ define("_NEWS_MD_HOME", "Home");
+ define("_NEWS_MD_IMPORTANT", "Immediate ");
// Link
define('_NEWS_MD_NEXT', 'Next page');
define('_NEWS_MD_PREV', 'Previous page');
Modified: XoopsModules/fmcontent/branches/news/language/english/modinfo.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/english/modinfo.php 2011-12-29 17:56:36 UTC (rev 8623)
+++ XoopsModules/fmcontent/branches/news/language/english/modinfo.php 2011-12-31 13:02:26 UTC (rev 8624)
@@ -154,8 +154,8 @@
define('_NEWS_MI_SHOWSORT_2', 'article create');
define('_NEWS_MI_SHOWSORT_3', 'article update');
define('_NEWS_MI_SHOWSORT_4', 'article title');
- define('_NEWS_MI_SHOWSORT_5', 'Admin article page order');
- define('_NEWS_MI_SHOWSORT_6', 'Random order');
+ define('_NEWS_MI_SHOWSORT_5', 'article order');
+ define('_NEWS_MI_SHOWSORT_6', 'Random');
define('_NEWS_MI_SHOWSORT_7', 'article Hits');
// Admin page
define('_NEWS_MI_ADMIN_PERPAGE', 'Admin article page items number');
Modified: XoopsModules/fmcontent/branches/news/language/persian/blocks.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/persian/blocks.php 2011-12-29 17:56:36 UTC (rev 8623)
+++ XoopsModules/fmcontent/branches/news/language/persian/blocks.php 2011-12-31 13:02:26 UTC (rev 8624)
@@ -28,5 +28,6 @@
define('_NEWS_MB_MORE', 'ادامه مطلب');
define('_NEWS_MB_SHOE_MORELINK', 'Show more link');
define('_NEWS_MB_MORELINK', 'More link');
+ define("_NEWS_MB_IMPORTANT", "Immediate ");
}
?>
\ No newline at end of file
Modified: XoopsModules/fmcontent/branches/news/language/persian/main.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/persian/main.php 2011-12-29 17:56:36 UTC (rev 8623)
+++ XoopsModules/fmcontent/branches/news/language/persian/main.php 2011-12-31 13:02:26 UTC (rev 8624)
@@ -31,7 +31,8 @@
define("_NEWS_MD_AUTHOR_ALL_DESC", "مشاهده تمام مطالب ارسال شده توسط ");
define('_NEWS_MD_COM', 'نظر');
define('_NEWS_MD_RELATED', 'مطالب مرتبط');
- define("_NEWS_MD_HOME", "Home");
+ define("_NEWS_MD_HOME", "Home");
+ define("_NEWS_MD_IMPORTANT", "Immediate ");
// Link
define('_NEWS_MD_NEXT', 'صفحه بعدی');
define('_NEWS_MD_PREV', 'صفحه قبلی');
Modified: XoopsModules/fmcontent/branches/news/language/persian/modinfo.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/persian/modinfo.php 2011-12-29 17:56:36 UTC (rev 8623)
+++ XoopsModules/fmcontent/branches/news/language/persian/modinfo.php 2011-12-31 13:02:26 UTC (rev 8624)
@@ -155,7 +155,7 @@
define('_NEWS_MI_SHOWSORT_3', 'content update');
define('_NEWS_MI_SHOWSORT_4', 'content title');
define('_NEWS_MI_SHOWSORT_5', 'content order');
- define('_NEWS_MI_SHOWSORT_6', 'Random content');
+ define('_NEWS_MI_SHOWSORT_6', 'Random');
define('_NEWS_MI_SHOWSORT_7', 'content Hits');
// Admin page
define('_NEWS_MI_ADMIN_PERPAGE', 'سند در هر صفحه');
Modified: XoopsModules/fmcontent/branches/news/templates/blocks/news_list.html
===================================================================
--- XoopsModules/fmcontent/branches/news/templates/blocks/news_list.html 2011-12-29 17:56:36 UTC (rev 8623)
+++ XoopsModules/fmcontent/branches/news/templates/blocks/news_list.html 2011-12-31 13:02:26 UTC (rev 8624)
@@ -3,7 +3,7 @@
<{foreach item=content from=$block.contents}>
<div class="item">
<div class="itemHead">
- <div class="itemTitle"><h3><a title="<{$content.title}>" href="<{$content.url}>"><{$content.title}></a></h3></div>
+ <div class="itemTitle"><h3><{if $content.story_important}><span class="red bold"><{$smarty.const._NEWS_MB_IMPORTANT}></span><{/if}><a title="<{$content.title}>" href="<{$content.url}>"><{$content.title}></a></h3></div>
</div>
<{if $block.date}>
<div class="itemInfo"><{$smarty.const._NEWS_MB_DATE}> :<{$content.date}></div>
@@ -39,7 +39,7 @@
</div>
<{/if}>
<li>
- <h3><a href="<{$content.url}>" title="<{$content.story_title}>"><{$content.story_title}></a></h3>
+ <h3><{if $content.story_important}><span class="red bold"><{$smarty.const._NEWS_MB_IMPORTANT}></span><{/if}><a href="<{$content.url}>" title="<{$content.story_title}>"><{$content.story_title}></a></h3>
<{if $block.date}>
<div class="itemPostDate"><{$content.date}></div>
<{/if}>
@@ -47,7 +47,7 @@
<{if $content.story_short}>
<div class="itemText"><{$content.story_short}></div>
<{else}>
- <div class="itemText"><{$content.story_text|truncate:130:""}></div>
+ <div class="itemText"><{$content.story_text|truncate:130}></div>
<{/if}>
<{/if}>
<div class="clear"></div>
@@ -58,7 +58,7 @@
<ul>
<{foreach item=content from=$block.contents}>
<li>
- <h3><a href="<{$content.url}>" title="<{$content.story_title}>"><{$content.story_title}></a></h3>
+ <h3><{if $content.story_important}><span class="red bold"><{$smarty.const._NEWS_MB_IMPORTANT}></span><{/if}><a href="<{$content.url}>" title="<{$content.story_title}>"><{$content.story_title}></a></h3>
<{if $block.date}>
<div class="itemPostDate"><{$content.date}></div>
<{/if}>
@@ -74,7 +74,7 @@
<div class="itemBlockLeft">
<div class="item">
<div class="itemHead">
- <div class="itemTitle"><h2><a title="<{$content.title}>" href="<{$content.url}>"><{$content.title}></a></h2></div>
+ <div class="itemTitle"><h2><{if $content.story_important}><span class="red bold"><{$smarty.const._NEWS_MB_IMPORTANT}></span><{/if}><a title="<{$content.title}>" href="<{$content.url}>"><{$content.title}></a></h2></div>
</div>
<{if $block.date}>
<div class="itemInfo"><{$smarty.const._NEWS_MB_DATE}> :<{$content.date}></div>
@@ -104,7 +104,7 @@
<{foreach item=content from=$block.contents}>
<{if $content.story_default == 0}>
<div class="itemBlockRight">
- <h3><a href="<{$content.url}>" title="<{$content.story_title}>"><{$content.story_title|truncate:80}></a></h3>
+ <h3><{if $content.story_important}><span class="red bold"><{$smarty.const._NEWS_MB_IMPORTANT}></span><{/if}><a href="<{$content.url}>" title="<{$content.story_title}>"><{$content.story_title|truncate:80}></a></h3>
</div>
<{/if}>
<{/foreach}>
Modified: XoopsModules/fmcontent/branches/news/templates/news_article.html
===================================================================
--- XoopsModules/fmcontent/branches/news/templates/news_article.html 2011-12-29 17:56:36 UTC (rev 8623)
+++ XoopsModules/fmcontent/branches/news/templates/news_article.html 2011-12-31 13:02:26 UTC (rev 8624)
@@ -11,7 +11,7 @@
<!-- Display content header -->
<div class="itemHead">
<div class="itemTitle">
- <h2><{$content.story_title}></h2>
+ <h2><{if $content.story_important}><span class="red bold"><{$smarty.const._NEWS_MD_IMPORTANT}></span><{/if}><{$content.story_title}></h2>
</div>
</div>
<{/if}>
@@ -21,7 +21,7 @@
<{if $link.date || $link.hits || $content.story_comments || $link.topicshow}> •<{/if}>
<{/if}>
<{if $link.date}>
- <span class="itemPostDate"><{$smarty.const._NEWS_MD_DATE}>: <{$content.story_create}></span>
+ <span class="itemPostDate"><{$smarty.const._NEWS_MD_DATE}>: <{$content.story_publish}></span>
<{if $link.hits || $content.story_comments || $link.topicshow}> •<{/if}>
<{/if}>
<{if $link.hits}>
@@ -64,7 +64,7 @@
</div>
<{/if}>
<{if $link.date}>
- <{if $content.story_update != $content.story_create}>
+ <{if $content.story_update != $content.story_publish}>
<div class="itemPostDate"><{$smarty.const._NEWS_MD_UPDATE}>: <{$content.story_update}></div>
<{/if}>
<{/if}>
Modified: XoopsModules/fmcontent/branches/news/templates/news_index_default.html
===================================================================
--- XoopsModules/fmcontent/branches/news/templates/news_index_default.html 2011-12-29 17:56:36 UTC (rev 8623)
+++ XoopsModules/fmcontent/branches/news/templates/news_index_default.html 2011-12-31 13:02:26 UTC (rev 8624)
@@ -1,5 +1,5 @@
<div id="default" class="item">
- <div class="itemTitle "><h2><{$default.story_title}></h2></div>
+ <div class="itemTitle "><h2><{if $content.story_important}><span class="red bold"><{$smarty.const._NEWS_MD_IMPORTANT}></span><{/if}><{$default.story_title}></h2></div>
<{if $default.story_short}>
<div class="itemShort">
<{if $default.story_img}>
@@ -34,7 +34,7 @@
<div class="clear"></div>
</div>
<{/if}>
- <div class="itemPostDate"><{$smarty.const._NEWS_MD_DATE}>: <{$default.story_create}>
+ <div class="itemPostDate"><{$smarty.const._NEWS_MD_DATE}>: <{$default.story_publish}>
<{if $xoops_isadmin}>
<span class="itemAdminLink">
<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/article.php?op=edit_content&story_id=<{$default.story_id}>" title="<{$smarty.const._NEWS_MD_EDIT}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/edit.png" alt="<{$smarty.const._story_EDIT}>"/></a>
Modified: XoopsModules/fmcontent/branches/news/templates/news_index_list.html
===================================================================
--- XoopsModules/fmcontent/branches/news/templates/news_index_list.html 2011-12-29 17:56:36 UTC (rev 8623)
+++ XoopsModules/fmcontent/branches/news/templates/news_index_list.html 2011-12-31 13:02:26 UTC (rev 8624)
@@ -2,7 +2,7 @@
<ul>
<{foreach item=content from=$contents}>
<li>
- <h3><a href="<{$content.url}>" title="<{$content.story_title}>"><{$content.story_title}></a></h3>
+ <h3><{if $content.story_important}><span class="red bold"><{$smarty.const._NEWS_MD_IMPORTANT}></span><{/if}><a href="<{$content.url}>" title="<{$content.story_title}>"><{$content.story_title}></a></h3>
<{if $info.author || $info.date || $info.hits}>
<div class="pad2">
<{if $info.author}>
@@ -12,7 +12,7 @@
<{if $info.date || $info.hits}> •<{/if}>
<{/if}>
<{if $info.date}>
- <span class="itemPostDate"><{$content.story_create}></span>
+ <span class="itemPostDate"><{$content.story_publish}></span>
<{if $info.hits}> •<{/if}>
<{/if}>
<{if $info.hits}>
Modified: XoopsModules/fmcontent/branches/news/templates/news_index_news.html
===================================================================
--- XoopsModules/fmcontent/branches/news/templates/news_index_news.html 2011-12-29 17:56:36 UTC (rev 8623)
+++ XoopsModules/fmcontent/branches/news/templates/news_index_news.html 2011-12-31 13:02:26 UTC (rev 8624)
@@ -3,6 +3,7 @@
<div class="itemHead">
<div class="itemTitle">
<h2>
+ <{if $content.story_important}><span class="red bold"><{$smarty.const._NEWS_MD_IMPORTANT}></span><{/if}>
<a href="<{$content.url}>" title="<{$content.story_title}>"><{$content.story_title}></a>
</h2>
</div>
@@ -16,7 +17,7 @@
<{/if}>
<{if $info.date}>
<span class="itemPostDate">
- <{$smarty.const._NEWS_MD_DATE}>: <{$content.story_create}><{if $content.story_update != $content.story_create}> • <{$smarty.const._NEWS_MD_UPDATE}>: <{$content.story_update}><{/if}>
+ <{$smarty.const._NEWS_MD_DATE}>: <{$content.story_publish}><{if $content.story_update != $content.story_publish}> • <{$smarty.const._NEWS_MD_UPDATE}>: <{$content.story_update}><{/if}>
</span>
<{if $info.hits}> •<{/if}>
<{/if}>
Modified: XoopsModules/fmcontent/branches/news/templates/news_index_photo.html
===================================================================
--- XoopsModules/fmcontent/branches/news/templates/news_index_photo.html 2011-12-29 17:56:36 UTC (rev 8623)
+++ XoopsModules/fmcontent/branches/news/templates/news_index_photo.html 2011-12-31 13:02:26 UTC (rev 8624)
@@ -19,6 +19,7 @@
<div class="itemHead">
<div class="itemTitle">
<h2>
+ <{if $content.story_important}><span class="red bold"><{$smarty.const._NEWS_MD_IMPORTANT}></span><{/if}>
<a href="<{$content.url}>" title="<{$content.story_title}>"><{$content.story_title}></a>
</h2>
</div>
@@ -32,7 +33,7 @@
<{/if}>
<{if $info.date}>
<span class="itemPostDate">
- <{$smarty.const._NEWS_MD_DATE}>: <{$content.story_create}><{if $content.story_update != $content.story_create}> • <{$smarty.const._NEWS_MD_UPDATE}>: <{$content.story_update}><{/if}>
+ <{$smarty.const._NEWS_MD_DATE}>: <{$content.story_publish}><{if $content.story_update != $content.story_publish}> • <{$smarty.const._NEWS_MD_UPDATE}>: <{$content.story_update}><{/if}>
</span>
<{if $info.hits}> •<{/if}>
<{/if}>
Modified: XoopsModules/fmcontent/branches/news/templates/news_index_table.html
===================================================================
--- XoopsModules/fmcontent/branches/news/templates/news_index_table.html 2011-12-29 17:56:36 UTC (rev 8623)
+++ XoopsModules/fmcontent/branches/news/templates/news_index_table.html 2011-12-31 13:02:26 UTC (rev 8624)
@@ -12,10 +12,10 @@
<tbody>
<{foreach item=content from=$contents}>
<tr class="<{cycle values="even,odd"}>">
- <td><a href="<{$content.url}>" title="<{$content.story_title}>"><{$content.story_title}></a></td>
+ <td><{if $content.story_important}><span class="red bold"><{$smarty.const._NEWS_MD_IMPORTANT}></span><{/if}><a href="<{$content.url}>" title="<{$content.story_title}>"><{$content.story_title}></a></td>
<{if !$story_topic}><td><a href="<{$content.topicurl}>" title="<{$content.topic}>"><{$content.topic}></a></td><{/if}>
<{if $info.author}><td><a title="<{$content.owner}>" href="<{$xoops_url}>/user.php?id=<{$content.story_uid}>"><{$content.owner}></a></td><{/if}>
- <{if $info.date}><td><{$content.story_create}></td><{/if}>
+ <{if $info.date}><td><{$content.story_publish}></td><{/if}>
<{if $info.hits}><td><{$content.story_hits}></td><{/if}>
<{if $info.coms}><td><{$content.story_comments}></td><{/if}>
</tr>
Modified: XoopsModules/fmcontent/branches/news/templates/news_rss.html
===================================================================
--- XoopsModules/fmcontent/branches/news/templates/news_rss.html 2011-12-29 17:56:36 UTC (rev 8623)
+++ XoopsModules/fmcontent/branches/news/templates/news_rss.html 2011-12-31 13:02:26 UTC (rev 8624)
@@ -25,7 +25,7 @@
<title><{$content.story_title}></title>
<link><{$content.url}></link>
<description><{if $content.story_short}><{$content.story_short}><{else}><{$content.story_text|strip_tags|truncate:300}><{/if}></description>
- <pubDate><{$content.story_create}></pubDate>
+ <pubDate><{$content.story_publish}></pubDate>
<guid><{$content.url}></guid>
</item>
<{/foreach}>
Modified: XoopsModules/fmcontent/branches/news/topic.php
===================================================================
--- XoopsModules/fmcontent/branches/news/topic.php 2011-12-29 17:56:36 UTC (rev 8623)
+++ XoopsModules/fmcontent/branches/news/topic.php 2011-12-31 13:02:26 UTC (rev 8624)
@@ -69,7 +69,7 @@
$xoTheme->addScript ( 'browse.php?Frameworks/jquery/jquery.js' );
$xoTheme->addScript ( 'browse.php?Frameworks/jquery/plugins/jquery.lightbox.js' );
// Add Stylesheet
- $xoTheme->addStylesheet ( 'browse.php?modules/system/css/lightbox.css' );
+ $xoTheme->addStylesheet ( XOOPS_URL . '/modules/system/css/lightbox.css' );
$xoopsTpl->assign ( 'img_lightbox', true );
}
Modified: XoopsModules/fmcontent/branches/news/xoops_version.php
===================================================================
--- XoopsModules/fmcontent/branches/news/xoops_version.php 2011-12-29 17:56:36 UTC (rev 8623)
+++ XoopsModules/fmcontent/branches/news/xoops_version.php 2011-12-31 13:02:26 UTC (rev 8624)
@@ -119,7 +119,7 @@
'description' => '',
'show_func' => 'news_list_show',
'edit_func' => 'news_list_edit',
- 'options' => $modversion['dirname'] . '|news|10|100|1|1|1|story_create|180|left|DESC|0|'. XOOPS_URL.'|0',
+ 'options' => $modversion['dirname'] . '|news|10|100|1|1|1|story_publish|180|left|DESC|0|'. XOOPS_URL.'|0',
'template' => 'news_list.html');
// Settings
@@ -394,7 +394,7 @@
'description' => '_NEWS_MI_SHOWSORT_DESC',
'formtype' => 'select',
'valuetype' => 'text',
- 'options' => array(_NEWS_MI_SHOWSORT_1 => 'story_id', _NEWS_MI_SHOWSORT_2 => 'story_create', _NEWS_MI_SHOWSORT_3 => 'story_update', _NEWS_MI_SHOWSORT_4 => 'story_title', _NEWS_MI_SHOWSORT_5 => 'story_order', _NEWS_MI_SHOWSORT_6 => 'RAND()' , _NEWS_MI_SHOWSORT_7 => 'story_hits'),
+ 'options' => array(_NEWS_MI_SHOWSORT_1 => 'story_id', _NEWS_MI_SHOWSORT_2 => 'story_publish', _NEWS_MI_SHOWSORT_3 => 'story_update', _NEWS_MI_SHOWSORT_4 => 'story_title', _NEWS_MI_SHOWSORT_5 => 'story_order', _NEWS_MI_SHOWSORT_6 => 'RAND()' , _NEWS_MI_SHOWSORT_7 => 'story_hits'),
'default' => 'story_id');
$modversion['config'][] = array(
@@ -792,7 +792,7 @@
'description' => '_NEWS_MI_ADMIN_SHOWSORT_DESC',
'formtype' => 'select',
'valuetype' => 'text',
- 'options' => array(_NEWS_MI_SHOWSORT_1 => 'story_id', _NEWS_MI_SHOWSORT_2 => 'story_create', _NEWS_MI_SHOWSORT_3 => 'story_update', _NEWS_MI_SHOWSORT_4 => 'story_title', _NEWS_MI_SHOWSORT_5 => 'story_order', _NEWS_MI_SHOWSORT_6 => 'RAND()'),
+ 'options' => array(_NEWS_MI_SHOWSORT_1 => 'story_id', _NEWS_MI_SHOWSORT_2 => 'story_publish', _NEWS_MI_SHOWSORT_3 => 'story_update', _NEWS_MI_SHOWSORT_4 => 'story_title', _NEWS_MI_SHOWSORT_5 => 'story_order', _NEWS_MI_SHOWSORT_6 => 'RAND()'),
'default' => 1);
$modversion['config'][] = array(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2012-01-05 10:40:09
|
Revision: 8641
http://xoops.svn.sourceforge.net/xoops/?rev=8641&view=rev
Author: voltan1
Date: 2012-01-05 09:06:31 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
Add News_SpotlightId function for get spotlight id
Modified Paths:
--------------
XoopsModules/fmcontent/branches/news/blocks/list.php
XoopsModules/fmcontent/branches/news/class/story.php
XoopsModules/fmcontent/branches/news/templates/blocks/news_list.html
Modified: XoopsModules/fmcontent/branches/news/blocks/list.php
===================================================================
--- XoopsModules/fmcontent/branches/news/blocks/list.php 2012-01-05 07:58:55 UTC (rev 8640)
+++ XoopsModules/fmcontent/branches/news/blocks/list.php 2012-01-05 09:06:31 UTC (rev 8641)
@@ -66,8 +66,13 @@
$options0 = $options[0];
$story_infos ['topics'] = $topic_handler->getall ();
- $contents = $story_handler->News_GetContentBlockList($NewsModule, $story_infos ,$options);
-
+ $contents = $story_handler->News_GetContentBlockList($NewsModule, $story_infos ,$options);
+
+ if($show == 'spotlight') {
+ $spotlightid = $story_handler->News_SpotlightId($contents);
+ $block['spotlightid'] = $spotlightid;
+ }
+
// Add block data
$block['show'] = $show;
$block['img'] = $showimg;
Modified: XoopsModules/fmcontent/branches/news/class/story.php
===================================================================
--- XoopsModules/fmcontent/branches/news/class/story.php 2012-01-05 07:58:55 UTC (rev 8640)
+++ XoopsModules/fmcontent/branches/news/class/story.php 2012-01-05 09:06:31 UTC (rev 8641)
@@ -988,6 +988,29 @@
}
return $ret;
}
+
+ /**
+ * Get Spotlight Id
+ */
+ function News_SpotlightId($list) {
+ $defaultid = array();
+ $storyid = array();
+
+ foreach ( $list as $item ) {
+ $storyid [] = $item['story_id'];
+ if($item['story_default'] === '1') {
+ $defaultid [] = $item['story_id'];
+ }
+ }
+
+ if($defaultid) {
+ $spotlightid = max($defaultid);
+ } else {
+ $spotlightid = max($storyid);
+ }
+
+ return $spotlightid;
+ }
}
?>
\ No newline at end of file
Modified: XoopsModules/fmcontent/branches/news/templates/blocks/news_list.html
===================================================================
--- XoopsModules/fmcontent/branches/news/templates/blocks/news_list.html 2012-01-05 07:58:55 UTC (rev 8640)
+++ XoopsModules/fmcontent/branches/news/templates/blocks/news_list.html 2012-01-05 09:06:31 UTC (rev 8641)
@@ -70,7 +70,7 @@
<{elseif $block.show == 'spotlight'}>
<div class="itemBlock">
<{foreach item=content from=$block.contents}>
- <{if $content.story_default == 1}>
+ <{if $content.story_id == $block.spotlightid}>
<div class="itemBlockLeft">
<div class="item">
<div class="itemHead">
@@ -102,7 +102,7 @@
<{/if}>
<{/foreach}>
<{foreach item=content from=$block.contents}>
- <{if $content.story_default == 0}>
+ <{if $content.story_id != $block.spotlightid}>
<div class="itemBlockRight">
<h3><{if $content.story_important}><span class="red bold"><{$smarty.const._NEWS_MB_IMPORTANT}></span><{/if}><a href="<{$content.url}>" title="<{$content.story_title}>"><{$content.story_title|truncate:80}></a></h3>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2012-01-08 07:19:23
|
Revision: 8666
http://xoops.svn.sourceforge.net/xoops/?rev=8666&view=rev
Author: voltan1
Date: 2012-01-08 07:19:16 +0000 (Sun, 08 Jan 2012)
Log Message:
-----------
Add topic list block
Modified Paths:
--------------
XoopsModules/fmcontent/branches/news/class/story.php
XoopsModules/fmcontent/branches/news/class/topic.php
XoopsModules/fmcontent/branches/news/language/arabic/blocks.php
XoopsModules/fmcontent/branches/news/language/arabic/modinfo.php
XoopsModules/fmcontent/branches/news/language/english/blocks.php
XoopsModules/fmcontent/branches/news/language/english/modinfo.php
XoopsModules/fmcontent/branches/news/language/persian/blocks.php
XoopsModules/fmcontent/branches/news/language/persian/modinfo.php
XoopsModules/fmcontent/branches/news/xoops_version.php
Added Paths:
-----------
XoopsModules/fmcontent/branches/news/blocks/topic.php
XoopsModules/fmcontent/branches/news/templates/blocks/news_block_list.html
XoopsModules/fmcontent/branches/news/templates/blocks/news_block_page.html
XoopsModules/fmcontent/branches/news/templates/blocks/news_block_topic.html
Removed Paths:
-------------
XoopsModules/fmcontent/branches/news/blocks/header.php
XoopsModules/fmcontent/branches/news/templates/blocks/news_list.html
XoopsModules/fmcontent/branches/news/templates/blocks/news_page.html
Deleted: XoopsModules/fmcontent/branches/news/blocks/header.php
===================================================================
--- XoopsModules/fmcontent/branches/news/blocks/header.php 2012-01-07 17:05:42 UTC (rev 8665)
+++ XoopsModules/fmcontent/branches/news/blocks/header.php 2012-01-08 07:19:16 UTC (rev 8666)
@@ -1,28 +0,0 @@
-<?php
-/*
- 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.
-*/
-
-/**
- * News header file
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author Andricq Nicolas (AKA MusS)
- * @package forcontent
- * @version $Id$
- */
-
-require_once XOOPS_ROOT_PATH . '/class/tree.php';
-require_once XOOPS_ROOT_PATH . '/modules/news/include/functions.php';
-
-$module_handler =& xoops_gethandler('module');
-$forMods =& $module_handler->getByDirname(basename(dirname(dirname(__FILE__))));
-
-?>
\ No newline at end of file
Added: XoopsModules/fmcontent/branches/news/blocks/topic.php
===================================================================
--- XoopsModules/fmcontent/branches/news/blocks/topic.php (rev 0)
+++ XoopsModules/fmcontent/branches/news/blocks/topic.php 2012-01-08 07:19:16 UTC (rev 8666)
@@ -0,0 +1,132 @@
+<?php
+/*
+ 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.
+*/
+
+/**
+ * Module block page file
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Hossein Azizabadi (Aka Voltan)
+ * @version $Id$
+ */
+
+function news_topic_show($options) {
+
+
+ $story_handler = xoops_getmodulehandler ( 'story', 'news' );
+ $topic_handler = xoops_getmodulehandler ( 'topic', 'news' );
+ $module_handler = xoops_gethandler('module');
+
+ $block = array();
+ $NewsModule = $options[0];
+ $block['showtype'] = $options[1];
+ $block['img'] = $options[2];
+ $block['description'] = $options[3];
+ $count = $options[4];
+ $float = $options[5];
+ $info['topic_order'] = $options[6];
+ $info['topic_sort'] = $options[7];
+
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+
+ $NewsModule = $module_handler->getByDirname($NewsModule);
+
+ if($count) {
+ $info['newscountbytopic'] = $story_handler->News_GetNewsCountByTopic();
+ }
+ $topics = $topic_handler->News_GetBlockTopics($NewsModule, $info);
+ $block['topics'] = $topics;
+ $block['float'] = $float;
+ $block['count'] = $count;
+ return $block;
+}
+
+function news_topic_edit($options) {
+
+ $module_handler = xoops_gethandler('module');
+ $NewsModule = $module_handler->getByDirname($options[0]);
+
+ $form = "<input type=\"hidden\" name=\"options[]\" value=\"" . $options[0] . "\" />";
+
+ $show_select = new XoopsFormSelect(_NEWS_MI_SHOWTYPE, 'options[]', $options[1]);
+ $show_select->addOption("list", _NEWS_MI_SHOWTYPE_4);
+ $show_select->addOption("table", _NEWS_MI_SHOWTYPE_2);
+ $form .= _NEWS_MI_SHOWTYPE . " : " . $show_select->render() . '<br />';
+
+ if ($options[2] == false) {
+ $checked_yes = '';
+ $checked_no = 'checked="checked"';
+ } else {
+ $checked_yes = 'checked="checked"';
+ $checked_no = '';
+ }
+ $form .= _NEWS_MB_IMG . " : <input name=\"options[2]\" value=\"1\" type=\"radio\" " . $checked_yes . "/>" . _YES . " \n";
+ $form .= "<input name=\"options[2]\" value=\"0\" type=\"radio\" " . $checked_no . "/>" . _NO . "<br />\n";
+
+ if ($options[3] == false) {
+ $checked_yes = '';
+ $checked_no = 'checked="checked"';
+ } else {
+ $checked_yes = 'checked="checked"';
+ $checked_no = '';
+ }
+ $form .= _NEWS_MB_DESCRIPTION . " : <input name=\"options[3]\" value=\"1\" type=\"radio\" " . $checked_yes . "/>" . _YES . " \n";
+ $form .= "<input name=\"options[3]\" value=\"0\" type=\"radio\" " . $checked_no . "/>" . _NO . "<br />\n";
+
+ if ($options[4] == false) {
+ $checked_yes = '';
+ $checked_no = 'checked="checked"';
+ } else {
+ $checked_yes = 'checked="checked"';
+ $checked_no = '';
+ }
+ $form .= _NEWS_MB_COUNT . " : <input name=\"options[4]\" value=\"1\" type=\"radio\" " . $checked_yes . "/>" . _YES . " \n";
+ $form .= "<input name=\"options[4]\" value=\"0\" type=\"radio\" " . $checked_no . "/>" . _NO . "<br />\n";
+
+ $float_select = new XoopsFormSelect(_NEWS_MI_IMAGE_FLOAT, 'options[]', $options[5]);
+ $float_select->addOption("left", _NEWS_MI_IMAGE_LEFT);
+ $float_select->addOption("right", _NEWS_MI_IMAGE_RIGHT);
+ $form .= _NEWS_MI_IMAGE_FLOAT . " : " . $float_select->render() . '<br />';
+
+ $order_select = new XoopsFormSelect(_NEWS_MI_SHOWORDER, 'options[]', $options[6]);
+ $order_select->addOption("DESC", _NEWS_MI_DESC);
+ $order_select->addOption("ASC", _NEWS_MI_ASC);
+ $form .= _NEWS_MI_SHOWORDER . " : " . $order_select->render() . '<br />';
+
+ $sort_select = new XoopsFormSelect(_NEWS_MI_SHOWSORT, 'options[]', $options[7]);
+ $sort_select->addOption("topic_id", _NEWS_MI_SHOWSORT_1);
+ $sort_select->addOption("topic_publish", _NEWS_MI_SHOWSORT_2);
+ $sort_select->addOption("topic_update", _NEWS_MI_SHOWSORT_3);
+ $sort_select->addOption("topic_title", _NEWS_MI_SHOWSORT_4);
+ $sort_select->addOption("topic_order", _NEWS_MI_SHOWSORT_5);
+ $sort_select->addOption("RAND()", _NEWS_MI_SHOWSORT_6);
+ $form .= _NEWS_MI_SHOWSORT . " : " . $sort_select->render() . '<br />';
+
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+
+ return $form;
+}
+
+?>
\ No newline at end of file
Modified: XoopsModules/fmcontent/branches/news/class/story.php
===================================================================
--- XoopsModules/fmcontent/branches/news/class/story.php 2012-01-07 17:05:42 UTC (rev 8665)
+++ XoopsModules/fmcontent/branches/news/class/story.php 2012-01-08 07:19:16 UTC (rev 8666)
@@ -1011,6 +1011,23 @@
return $spotlightid;
}
+
+ /**
+ * Returns the number of published news per topic
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @author Hervé Thouzard (ttp://www.instant-zero.com)
+ */
+ function News_GetNewsCountByTopic()
+ {
+ $ret = array();
+ $sql = "SELECT count( story_id ) AS cpt, story_topic FROM ".$this->db->prefix('news_story')." WHERE ( story_publish > 0 AND story_publish <= " . time() . " ) AND ( story_expire = 0 OR story_expire > " . time() . " ) GROUP BY story_topic";
+ $result = $this->db->query($sql);
+ while ($row = $this->db->fetchArray($result)) {
+ $ret [ $row["story_topic"] ] = $row["cpt"];
+ }
+ return $ret;
+ }
}
?>
\ No newline at end of file
Modified: XoopsModules/fmcontent/branches/news/class/topic.php
===================================================================
--- XoopsModules/fmcontent/branches/news/class/topic.php 2012-01-07 17:05:42 UTC (rev 8665)
+++ XoopsModules/fmcontent/branches/news/class/topic.php 2012-01-08 07:19:16 UTC (rev 8666)
@@ -350,6 +350,35 @@
}
return $topic_show;
}
+
+ /**
+ *
+ */
+ function News_GetBlockTopics($NewsModule , $info) {
+ $ret = array ();
+ $criteria = new CriteriaCompo ();
+ $criteria->add ( new Criteria ( 'topic_modid', $NewsModule->getVar ( 'mid' ) ) );
+ $criteria->add ( new Criteria ( 'topic_asmenu', 1 ) );
+ $criteria->add ( new Criteria ( 'topic_online', 1 ) );
+ $criteria->setSort ( $info['topic_sort'] );
+ $criteria->setOrder ( $info['topic_order'] );
+ $topics = $this->getObjects ( $criteria, false );
+ if ($topics) {
+ foreach ( $topics as $root ) {
+ $tab = array ();
+ $tab = $root->toArray ();
+ $tab ['topicurl'] = NewsUtils::News_TopicUrl ( $NewsModule->getVar ( 'dirname' ), $tab );
+ $tab ['thumburl'] = XOOPS_URL . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/thumb/' .$root->getVar ( 'topic_img' );
+ $tab ['imageurl'] = XOOPS_URL . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/medium/' .$root->getVar ( 'topic_img' );
+ if(isset($info['newscountbytopic'])) {
+ $tab ['count'] = $info['newscountbytopic'][$root->getVar ( 'topic_id' )];
+ }
+ $ret [] = $tab;
+ }
+ }
+ return $ret;
+ }
+
}
?>
\ No newline at end of file
Modified: XoopsModules/fmcontent/branches/news/language/arabic/blocks.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/arabic/blocks.php 2012-01-07 17:05:42 UTC (rev 8665)
+++ XoopsModules/fmcontent/branches/news/language/arabic/blocks.php 2012-01-08 07:19:16 UTC (rev 8666)
@@ -29,5 +29,8 @@
define('_NEWS_MB_SHOE_MORELINK', 'Show more link');
define('_NEWS_MB_MORELINK', 'More link');
define("_NEWS_MB_IMPORTANT", "Immediate ");
+ define("_NEWS_MB_COUNT", "Show news count");
+ define("_NEWS_MB_TOPIC_NAME", "Title");
+ define("_NEWS_MB_TOPIC_IMG", "image");
}
?>
\ 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-07 17:05:42 UTC (rev 8665)
+++ XoopsModules/fmcontent/branches/news/language/arabic/modinfo.php 2012-01-08 07:19:16 UTC (rev 8666)
@@ -35,6 +35,7 @@
// Block
define("_NEWS_MI_BLOCK_PAGE", "الصفحة");
define("_NEWS_MI_BLOCK_LIST", "الفهرسة");
+ define('_NEWS_MI_BLOCK_TOPIC', 'Topic list');
// Editor
define("_NEWS_MI_FORM_EDITOR", "اختیار شکل");
define("_NEWS_MI_FORM_EDITOR_DESC", "تحدید محرر للاستخدام في صفحة إرسال المواضیع.");
Modified: XoopsModules/fmcontent/branches/news/language/english/blocks.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/english/blocks.php 2012-01-07 17:05:42 UTC (rev 8665)
+++ XoopsModules/fmcontent/branches/news/language/english/blocks.php 2012-01-08 07:19:16 UTC (rev 8666)
@@ -29,5 +29,8 @@
define('_NEWS_MB_SHOE_MORELINK', 'Show more link');
define('_NEWS_MB_MORELINK', 'More link');
define("_NEWS_MB_IMPORTANT", "Immediate ");
+ define("_NEWS_MB_COUNT", "Show news count");
+ define("_NEWS_MB_TOPIC_NAME", "Title");
+ define("_NEWS_MB_TOPIC_IMG", "image");
}
?>
\ No newline at end of file
Modified: XoopsModules/fmcontent/branches/news/language/english/modinfo.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/english/modinfo.php 2012-01-07 17:05:42 UTC (rev 8665)
+++ XoopsModules/fmcontent/branches/news/language/english/modinfo.php 2012-01-08 07:19:16 UTC (rev 8666)
@@ -34,7 +34,8 @@
define('_NEWS_MI_FILE', 'File');
// Block
define('_NEWS_MI_BLOCK_PAGE', 'Article page');
- define('_NEWS_MI_BLOCK_LIST', 'Article list');
+ define('_NEWS_MI_BLOCK_LIST', 'Article list');
+ 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.");
Modified: XoopsModules/fmcontent/branches/news/language/persian/blocks.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/persian/blocks.php 2012-01-07 17:05:42 UTC (rev 8665)
+++ XoopsModules/fmcontent/branches/news/language/persian/blocks.php 2012-01-08 07:19:16 UTC (rev 8666)
@@ -29,5 +29,8 @@
define('_NEWS_MB_SHOE_MORELINK', 'Show more link');
define('_NEWS_MB_MORELINK', 'More link');
define("_NEWS_MB_IMPORTANT", "Immediate ");
+ define("_NEWS_MB_COUNT", "Show news count");
+ define("_NEWS_MB_TOPIC_NAME", "Title");
+ define("_NEWS_MB_TOPIC_IMG", "image");
}
?>
\ No newline at end of file
Modified: XoopsModules/fmcontent/branches/news/language/persian/modinfo.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/persian/modinfo.php 2012-01-07 17:05:42 UTC (rev 8665)
+++ XoopsModules/fmcontent/branches/news/language/persian/modinfo.php 2012-01-08 07:19:16 UTC (rev 8666)
@@ -34,7 +34,8 @@
define('_NEWS_MI_FILE', 'فایل');
// Block
define("_NEWS_MI_BLOCK_PAGE", "صفحه");
- define("_NEWS_MI_BLOCK_LIST", "فهرست");
+ define("_NEWS_MI_BLOCK_LIST", "فهرست");
+ define('_NEWS_MI_BLOCK_TOPIC', 'Topic list');
// Editor
define("_NEWS_MI_FORM_EDITOR", "انتخاب فرم");
define("_NEWS_MI_FORM_EDITOR_DESC", "انتخاب ویرایشگر برای استفاده در صفحه ارسال مطلب.");
Added: XoopsModules/fmcontent/branches/news/templates/blocks/news_block_list.html
===================================================================
--- XoopsModules/fmcontent/branches/news/templates/blocks/news_block_list.html (rev 0)
+++ XoopsModules/fmcontent/branches/news/templates/blocks/news_block_list.html 2012-01-08 07:19:16 UTC (rev 8666)
@@ -0,0 +1,113 @@
+<{if $block.show == 'news'}>
+ <div class="itemBlock">
+ <{foreach item=content from=$block.contents}>
+ <div class="item">
+ <div class="itemHead">
+ <div class="itemTitle"><h3><{if $content.story_important}><span class="red bold"><{$smarty.const._NEWS_MB_IMPORTANT}></span><{/if}><a title="<{$content.title}>" href="<{$content.url}>"><{$content.title}></a></h3></div>
+ </div>
+ <{if $block.date}>
+ <div class="itemInfo"><{$smarty.const._NEWS_MB_DATE}> :<{$content.date}></div>
+ <{/if}>
+ <{if $block.img || $block.description}>
+ <div class="itemBody" id="story_<{$content.story_id}>">
+ <{if $block.img && $content.story_img}>
+ <div class="itemImg">
+ <img width="<{$block.width}>" class="<{$block.float}>" src="<{$block.thumburl}><{$content.story_img}>" alt="<{$content.title}>" />
+ </div>
+ <{/if}>
+ <{if $block.description}>
+ <{if $content.story_short}>
+ <div class="itemText"><{$content.story_short}></div>
+ <{else}>
+ <div class="itemText"><{$content.story_text|truncate:300}></div>
+ <{/if}>
+ <{/if}>
+ <div class="clear"></div>
+ </div>
+ <{/if}>
+ </div>
+ <{/foreach}>
+ </div>
+<{elseif $block.show == 'list'}>
+ <div class="itemBlock">
+ <{if $block.img || $block.description}>
+ <ul class="itemList">
+ <{foreach item=content from=$block.contents}>
+ <{if $block.img && $content.story_img}>
+ <div class="itemImg">
+ <img width="<{$block.width}>" class="<{$block.float}>" src="<{$block.thumburl}><{$content.story_img}>" alt="<{$content.title}>" />
+ </div>
+ <{/if}>
+ <li>
+ <h3><{if $content.story_important}><span class="red bold"><{$smarty.const._NEWS_MB_IMPORTANT}></span><{/if}><a href="<{$content.url}>" title="<{$content.story_title}>"><{$content.story_title}></a></h3>
+ <{if $block.date}>
+ <div class="itemPostDate"><{$content.date}></div>
+ <{/if}>
+ <{if $block.description}>
+ <{if $content.story_short}>
+ <div class="itemText"><{$content.story_short}></div>
+ <{else}>
+ <div class="itemText"><{$content.story_text|truncate:130}></div>
+ <{/if}>
+ <{/if}>
+ <div class="clear"></div>
+ </li>
+ <{/foreach}>
+ </ul>
+ <{else}>
+ <ul>
+ <{foreach item=content from=$block.contents}>
+ <li>
+ <h3><{if $content.story_important}><span class="red bold"><{$smarty.const._NEWS_MB_IMPORTANT}></span><{/if}><a href="<{$content.url}>" title="<{$content.story_title}>"><{$content.story_title}></a></h3>
+ <{if $block.date}>
+ <div class="itemPostDate"><{$content.date}></div>
+ <{/if}>
+ </li>
+ <{/foreach}>
+ </ul>
+ <{/if}>
+ </div>
+<{elseif $block.show == 'spotlight'}>
+ <div class="itemBlock">
+ <{foreach item=content from=$block.contents}>
+ <{if $content.story_id == $block.spotlightid}>
+ <div class="itemBlockLeft">
+ <div class="item">
+ <div class="itemHead">
+ <div class="itemTitle"><h2><{if $content.story_important}><span class="red bold"><{$smarty.const._NEWS_MB_IMPORTANT}></span><{/if}><a title="<{$content.title}>" href="<{$content.url}>"><{$content.title}></a></h2></div>
+ </div>
+ <{if $block.date}>
+ <div class="itemInfo"><{$smarty.const._NEWS_MB_DATE}> :<{$content.date}></div>
+ <{/if}>
+ <{if $block.img || $block.description}>
+ <div class="itemBody" id="story_<{$content.story_id}>">
+ <{if $block.img && $content.story_img}>
+ <div class="itemImg">
+ <img width="<{$block.width}>" class="<{$block.float}>" src="<{$block.thumburl}><{$content.story_img}>" alt="<{$content.title}>" />
+ </div>
+ <{/if}>
+ <{if $block.description}>
+ <{if $content.story_short}>
+ <div class="itemText"><{$content.story_short|truncate:200}></div>
+ <{else}>
+ <div class="itemText"><{$content.story_text|truncate:200}></div>
+ <{/if}>
+ <div class="itemMore"><a title="<{$content.title}>" href="<{$content.url}>" ><{$smarty.const._NEWS_MB_MORE}></a></div>
+ <{/if}>
+ <div class="clear"></div>
+ </div>
+ <{/if}>
+ </div>
+ </div>
+ <{/if}>
+ <{/foreach}>
+ <{foreach item=content from=$block.contents}>
+ <{if $content.story_id != $block.spotlightid}>
+ <div class="itemBlockRight">
+ <h3><{if $content.story_important}><span class="red bold"><{$smarty.const._NEWS_MB_IMPORTANT}></span><{/if}><a href="<{$content.url}>" title="<{$content.story_title}>"><{$content.story_title|truncate:80}></a></h3>
+ </div>
+ <{/if}>
+ <{/foreach}>
+ <div class="clear"></div>
+ </div>
+<{/if}>
\ No newline at end of file
Added: XoopsModules/fmcontent/branches/news/templates/blocks/news_block_page.html
===================================================================
--- XoopsModules/fmcontent/branches/news/templates/blocks/news_block_page.html (rev 0)
+++ XoopsModules/fmcontent/branches/news/templates/blocks/news_block_page.html 2012-01-08 07:19:16 UTC (rev 8666)
@@ -0,0 +1,31 @@
+<div class="itemBlock">
+ <div class="itemHead">
+ <div class="itemTitle">
+ <h2><{$block.story_title}></h2>
+ </div>
+ </div>
+ <{if $block.story_short}>
+ <div class="itemBody">
+ <{if $block.story_img}>
+ <div class="itemImg">
+ <img width="<{$block.width}>" class="<{$block.float}> story_img" src="<{$block.thumburl}><{$block.story_img}>" alt="<{$block.story_title}>" />
+ </div>
+ <{/if}>
+ <div class="itemText"><{$block.story_short}></div>
+ <div class="itemMore">
+ <a href="<{$block.link}>" title="<{$block.story_title}>"><{$smarty.const._NEWS_MB_MORE}></a>
+ </div>
+ <div class="clear"></div>
+ </div>
+ <{else}>
+ <div class="itemBody">
+ <{if $block.story_img}>
+ <div class="itemImg">
+ <img width="<{$block.width}>" class="<{$block.float}> story_img" src="<{$block.thumburl}><{$block.story_img}>" alt="<{$block.story_title}>" />
+ </div>
+ <{/if}>
+ <div class="itemText"><{$block.story_text}></div>
+ <div class="clear"></div>
+ </div>
+ <{/if}>
+</div>
\ No newline at end of file
Added: XoopsModules/fmcontent/branches/news/templates/blocks/news_block_topic.html
===================================================================
--- XoopsModules/fmcontent/branches/news/templates/blocks/news_block_topic.html (rev 0)
+++ XoopsModules/fmcontent/branches/news/templates/blocks/news_block_topic.html 2012-01-08 07:19:16 UTC (rev 8666)
@@ -0,0 +1,50 @@
+<{if $block.showtype == 'list'}>
+ <div class="itemBlock">
+ <ul>
+ <{foreach item=topic from=$block.topics}>
+ <li>
+ <{if $block.img || $block.description}>
+ <h3><a title="<{$topic.topic_title}>" href="<{$topics.topicurl}>"><{$topic.topic_title}></a><{if $block.count}> ( <{$topic.count}> ) <{/if}></h3>
+ <div class="itemBody" id="topic_<{$topic.story_id}>">
+ <{if $block.img && $topic.topic_img}>
+ <div class="itemImg">
+ <img class="<{$block.float}>" src="<{$topic.thumburl}>" alt="<{$topic.topic_title}>" />
+ </div>
+ <{/if}>
+ <{if $block.description && $topic.topic_desc}>
+ <div class="itemText"><{$topic.topic_desc}></div>
+ <{/if}>
+ <div class="clear"></div>
+ </div>
+ <{else}>
+ <a title="<{$topic.topic_title}>" href="<{$topic.topicurl}>"><{$topic.topic_title}></a><{if $block.count}> ( <{$topic.count}> ) <{/if}>
+ <{/if}>
+ </li>
+ <{/foreach}>
+ </ul>
+ </div>
+<{elseif $block.showtype == 'table'}>
+ <table>
+ <thead>
+ <th class="txtcenter"><{$smarty.const._NEWS_MB_TOPIC_NAME}></th>
+ <th class="txtcenter"><{$smarty.const._NEWS_MB_TOPIC_IMG}></th>
+ </thead>
+ <tbody>
+ <{foreach item=topic from=$block.topics}>
+ <tr class="odd">
+ <td<{if !$topic.topic_img}> colspan="2"<{/if}> class="top">
+ <div class="topicTitle"><a title="<{$topic.topic_title}>" href="<{$topic.topicurl}>"><{$topic.topic_title}></a><{if $block.count}> ( <{$topic.count}> ) <{/if}></div>
+ <div class="topicDesc"><{$topic.topic_desc}></div>
+ </td>
+ <{if $topic.topic_img}>
+ <td class="top txtcenter">
+ <div class="topicImg">
+ <img class="<{$imgfloat}> story_img" src="<{$topic.thumburl}>" alt="<{$topic.topic_title}>" />
+ </div>
+ </td>
+ <{/if}>
+ </tr>
+ <{/foreach}>
+ </tbody>
+ </table>
+<{/if}>
\ No newline at end of file
Deleted: XoopsModules/fmcontent/branches/news/templates/blocks/news_list.html
===================================================================
--- XoopsModules/fmcontent/branches/news/templates/blocks/news_list.html 2012-01-07 17:05:42 UTC (rev 8665)
+++ XoopsModules/fmcontent/branches/news/templates/blocks/news_list.html 2012-01-08 07:19:16 UTC (rev 8666)
@@ -1,113 +0,0 @@
-<{if $block.show == 'news'}>
- <div class="itemBlock">
- <{foreach item=content from=$block.contents}>
- <div class="item">
- <div class="itemHead">
- <div class="itemTitle"><h3><{if $content.story_important}><span class="red bold"><{$smarty.const._NEWS_MB_IMPORTANT}></span><{/if}><a title="<{$content.title}>" href="<{$content.url}>"><{$content.title}></a></h3></div>
- </div>
- <{if $block.date}>
- <div class="itemInfo"><{$smarty.const._NEWS_MB_DATE}> :<{$content.date}></div>
- <{/if}>
- <{if $block.img || $block.description}>
- <div class="itemBody" id="story_<{$content.story_id}>">
- <{if $block.img && $content.story_img}>
- <div class="itemImg">
- <img width="<{$block.width}>" class="<{$block.float}>" src="<{$block.thumburl}><{$content.story_img}>" alt="<{$content.title}>" />
- </div>
- <{/if}>
- <{if $block.description}>
- <{if $content.story_short}>
- <div class="itemText"><{$content.story_short}></div>
- <{else}>
- <div class="itemText"><{$content.story_text|truncate:300}></div>
- <{/if}>
- <{/if}>
- <div class="clear"></div>
- </div>
- <{/if}>
- </div>
- <{/foreach}>
- </div>
-<{elseif $block.show == 'list'}>
- <div class="itemBlock">
- <{if $block.img || $block.description}>
- <ul class="itemList">
- <{foreach item=content from=$block.contents}>
- <{if $block.img && $content.story_img}>
- <div class="itemImg">
- <img width="<{$block.width}>" class="<{$block.float}>" src="<{$block.thumburl}><{$content.story_img}>" alt="<{$content.title}>" />
- </div>
- <{/if}>
- <li>
- <h3><{if $content.story_important}><span class="red bold"><{$smarty.const._NEWS_MB_IMPORTANT}></span><{/if}><a href="<{$content.url}>" title="<{$content.story_title}>"><{$content.story_title}></a></h3>
- <{if $block.date}>
- <div class="itemPostDate"><{$content.date}></div>
- <{/if}>
- <{if $block.description}>
- <{if $content.story_short}>
- <div class="itemText"><{$content.story_short}></div>
- <{else}>
- <div class="itemText"><{$content.story_text|truncate:130}></div>
- <{/if}>
- <{/if}>
- <div class="clear"></div>
- </li>
- <{/foreach}>
- </ul>
- <{else}>
- <ul>
- <{foreach item=content from=$block.contents}>
- <li>
- <h3><{if $content.story_important}><span class="red bold"><{$smarty.const._NEWS_MB_IMPORTANT}></span><{/if}><a href="<{$content.url}>" title="<{$content.story_title}>"><{$content.story_title}></a></h3>
- <{if $block.date}>
- <div class="itemPostDate"><{$content.date}></div>
- <{/if}>
- </li>
- <{/foreach}>
- </ul>
- <{/if}>
- </div>
-<{elseif $block.show == 'spotlight'}>
- <div class="itemBlock">
- <{foreach item=content from=$block.contents}>
- <{if $content.story_id == $block.spotlightid}>
- <div class="itemBlockLeft">
- <div class="item">
- <div class="itemHead">
- <div class="itemTitle"><h2><{if $content.story_important}><span class="red bold"><{$smarty.const._NEWS_MB_IMPORTANT}></span><{/if}><a title="<{$content.title}>" href="<{$content.url}>"><{$content.title}></a></h2></div>
- </div>
- <{if $block.date}>
- <div class="itemInfo"><{$smarty.const._NEWS_MB_DATE}> :<{$content.date}></div>
- <{/if}>
- <{if $block.img || $block.description}>
- <div class="itemBody" id="story_<{$content.story_id}>">
- <{if $block.img && $content.story_img}>
- <div class="itemImg">
- <img width="<{$block.width}>" class="<{$block.float}>" src="<{$block.thumburl}><{$content.story_img}>" alt="<{$content.title}>" />
- </div>
- <{/if}>
- <{if $block.description}>
- <{if $content.story_short}>
- <div class="itemText"><{$content.story_short|truncate:200}></div>
- <{else}>
- <div class="itemText"><{$content.story_text|truncate:200}></div>
- <{/if}>
- <div class="itemMore"><a title="<{$content.title}>" href="<{$content.url}>" ><{$smarty.const._NEWS_MB_MORE}></a></div>
- <{/if}>
- <div class="clear"></div>
- </div>
- <{/if}>
- </div>
- </div>
- <{/if}>
- <{/foreach}>
- <{foreach item=content from=$block.contents}>
- <{if $content.story_id != $block.spotlightid}>
- <div class="itemBlockRight">
- <h3><{if $content.story_important}><span class="red bold"><{$smarty.const._NEWS_MB_IMPORTANT}></span><{/if}><a href="<{$content.url}>" title="<{$content.story_title}>"><{$content.story_title|truncate:80}></a></h3>
- </div>
- <{/if}>
- <{/foreach}>
- <div class="clear"></div>
- </div>
-<{/if}>
\ No newline at end of file
Deleted: XoopsModules/fmcontent/branches/news/templates/blocks/news_page.html
===================================================================
--- XoopsModules/fmcontent/branches/news/templates/blocks/news_page.html 2012-01-07 17:05:42 UTC (rev 8665)
+++ XoopsModules/fmcontent/branches/news/templates/blocks/news_page.html 2012-01-08 07:19:16 UTC (rev 8666)
@@ -1,31 +0,0 @@
-<div class="itemBlock">
- <div class="itemHead">
- <div class="itemTitle">
- <h2><{$block.story_title}></h2>
- </div>
- </div>
- <{if $block.story_short}>
- <div class="itemBody">
- <{if $block.story_img}>
- <div class="itemImg">
- <img width="<{$block.width}>" class="<{$block.float}> story_img" src="<{$block.thumburl}><{$block.story_img}>" alt="<{$block.story_title}>" />
- </div>
- <{/if}>
- <div class="itemText"><{$block.story_short}></div>
- <div class="itemMore">
- <a href="<{$block.link}>" title="<{$block.story_title}>"><{$smarty.const._NEWS_MB_MORE}></a>
- </div>
- <div class="clear"></div>
- </div>
- <{else}>
- <div class="itemBody">
- <{if $block.story_img}>
- <div class="itemImg">
- <img width="<{$block.width}>" class="<{$block.float}> story_img" src="<{$block.thumburl}><{$block.story_img}>" alt="<{$block.story_title}>" />
- </div>
- <{/if}>
- <div class="itemText"><{$block.story_text}></div>
- <div class="clear"></div>
- </div>
- <{/if}>
-</div>
\ No newline at end of file
Modified: XoopsModules/fmcontent/branches/news/xoops_version.php
===================================================================
--- XoopsModules/fmcontent/branches/news/xoops_version.php 2012-01-07 17:05:42 UTC (rev 8665)
+++ XoopsModules/fmcontent/branches/news/xoops_version.php 2012-01-08 07:19:16 UTC (rev 8666)
@@ -111,7 +111,7 @@
'show_func' => 'news_page_show',
'edit_func' => 'news_page_edit',
'options' => '0|' . $modversion['dirname'],
- 'template' => 'news_page.html');
+ 'template' => 'news_block_page.html');
$modversion['blocks'][] = array(
'file' => 'list.php',
@@ -120,8 +120,17 @@
'show_func' => 'news_list_show',
'edit_func' => 'news_list_edit',
'options' => $modversion['dirname'] . '|news|10|100|1|1|1|story_publish|180|left|DESC|0|'. XOOPS_URL.'|0',
- 'template' => 'news_list.html');
+ 'template' => 'news_block_list.html');
+$modversion['blocks'][] = array(
+ 'file' => 'topic.php',
+ 'name' => _NEWS_MI_BLOCK_TOPIC,
+ 'description' => '',
+ 'show_func' => 'news_topic_show',
+ 'edit_func' => 'news_topic_edit',
+ 'options' => $modversion['dirname'] . '|list|0|0|0|left|DESC|topic_id',
+ 'template' => 'news_block_topic.html');
+
// Settings
// Load class
xoops_load('xoopslists');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2012-01-08 13:22:37
|
Revision: 8673
http://xoops.svn.sourceforge.net/xoops/?rev=8673&view=rev
Author: voltan1
Date: 2012-01-08 13:22:31 +0000 (Sun, 08 Jan 2012)
Log Message:
-----------
Set days for content hits
Modified Paths:
--------------
XoopsModules/fmcontent/branches/news/blocks/list.php
XoopsModules/fmcontent/branches/news/class/story.php
XoopsModules/fmcontent/branches/news/language/arabic/blocks.php
XoopsModules/fmcontent/branches/news/language/english/blocks.php
XoopsModules/fmcontent/branches/news/language/persian/blocks.php
XoopsModules/fmcontent/branches/news/xoops_version.php
Modified: XoopsModules/fmcontent/branches/news/blocks/list.php
===================================================================
--- XoopsModules/fmcontent/branches/news/blocks/list.php 2012-01-08 12:55:37 UTC (rev 8672)
+++ XoopsModules/fmcontent/branches/news/blocks/list.php 2012-01-08 13:22:31 UTC (rev 8673)
@@ -46,6 +46,7 @@
$story_infos['story_order'] = $options[10];
$block['showmore'] = $options[11];
$block['morelink'] = $options[12];
+ $day = $options[13];
array_shift($options);
array_shift($options);
@@ -59,11 +60,24 @@
array_shift($options);
array_shift($options);
array_shift($options);
+ array_shift($options);
array_shift($options);
$NewsModule = $module_handler->getByDirname($NewsModule);
+
+ if($story_infos['story_sort'] == 'story_hits') {
+ if($day) {
+ $day = 86400 * $day;
+ $publish = time() - $day;
+ } else {
+ $publish = 0;
+ }
+ } else {
+ $publish = 0;
+ }
-
+ $story_infos['story_publish'] = $publish;
+
$options0 = $options[0];
$story_infos ['topics'] = $topic_handler->getall ();
$contents = $story_handler->News_GetContentBlockList($NewsModule, $story_infos ,$options);
@@ -154,8 +168,8 @@
$story_sort->addOption("story_update", _NEWS_MI_SHOWSORT_3);
$story_sort->addOption("story_title", _NEWS_MI_SHOWSORT_4);
$story_sort->addOption("story_order", _NEWS_MI_SHOWSORT_5);
- $story_sort->addOption("RAND()", _NEWS_MI_SHOWSORT_6);
- $story_sort->addOption("story_hits", _NEWS_MI_SHOWSORT_7);
+ $story_sort->addOption("story_hits", _NEWS_MI_SHOWSORT_7);
+ $story_sort->addOption("RAND()", _NEWS_MI_SHOWSORT_6);
$form .= _NEWS_MI_SHOWSORT . " : " . $story_sort->render() . '<br />';
$form .= _NEWS_MB_WIDTH . " : <input name=\"options[8]\" size=\"5\" maxlength=\"255\" value=\"" . $options[8] . "\" type=\"text\" /><br />\n";
@@ -181,6 +195,7 @@
$form .= "<input name=\"options[11]\" value=\"0\" type=\"radio\" " . $checked_no . "/>" . _NO . "<br />\n";
$form .= _NEWS_MB_MORELINK . " : <input name=\"options[12]\" size=\"50\" maxlength=\"255\" value=\"" . $options[12] . "\" type=\"text\" /><br />\n";
+ $form .= _NEWS_MB_HITINDAY1 . " <input name=\"options[13]\" size=\"5\" maxlength=\"255\" value=\"" . $options[13] . "\" type=\"text\" />" . _NEWS_MB_HITINDAY2 . "<br />\n";
array_shift($options);
array_shift($options);
@@ -194,6 +209,7 @@
array_shift($options);
array_shift($options);
array_shift($options);
+ array_shift($options);
array_shift($options);
$form .= "<br />" . _NEWS_MB_TOPICDISPLAY . "<br /><select name=\"options[]\" multiple=\"multiple\" size=\"5\">\n";
Modified: XoopsModules/fmcontent/branches/news/class/story.php
===================================================================
--- XoopsModules/fmcontent/branches/news/class/story.php 2012-01-08 12:55:37 UTC (rev 8672)
+++ XoopsModules/fmcontent/branches/news/class/story.php 2012-01-08 13:22:31 UTC (rev 8673)
@@ -580,7 +580,7 @@
$criteria->add ( new Criteria ( 'story_topic', '(' . implode ( ',', $topiclist ) . ')', 'IN' ) );
$criteria->add ( new Criteria ( 'story_modid', $NewsModule->getVar ( 'mid' ) ) );
$criteria->add ( new Criteria ( 'story_status', '1' ) );
- $criteria->add ( new Criteria ( 'story_publish', 0 , '>' ));
+ $criteria->add ( new Criteria ( 'story_publish', $story_infos['story_publish'] , '>' ));
$criteria->add ( new Criteria ( 'story_publish', time() , '<=' ));
$criteria->add ( new Criteria ( 'story_expire', 0 ));
$criteria->add ( new Criteria ( 'story_expire', time() , '>' ) ,'OR');
Modified: XoopsModules/fmcontent/branches/news/language/arabic/blocks.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/arabic/blocks.php 2012-01-08 12:55:37 UTC (rev 8672)
+++ XoopsModules/fmcontent/branches/news/language/arabic/blocks.php 2012-01-08 13:22:31 UTC (rev 8673)
@@ -32,5 +32,7 @@
define("_NEWS_MB_COUNT", "Show news count");
define("_NEWS_MB_TOPIC_NAME", "Title");
define("_NEWS_MB_TOPIC_IMG", "image");
+ define("_NEWS_MB_HITINDAY1", "Show news since");
+ define("_NEWS_MB_HITINDAY2", "Day's ago. This option work when you sort news by hit");
}
?>
\ No newline at end of file
Modified: XoopsModules/fmcontent/branches/news/language/english/blocks.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/english/blocks.php 2012-01-08 12:55:37 UTC (rev 8672)
+++ XoopsModules/fmcontent/branches/news/language/english/blocks.php 2012-01-08 13:22:31 UTC (rev 8673)
@@ -32,5 +32,7 @@
define("_NEWS_MB_COUNT", "Show news count");
define("_NEWS_MB_TOPIC_NAME", "Title");
define("_NEWS_MB_TOPIC_IMG", "image");
+ define("_NEWS_MB_HITINDAY1", "Show news since");
+ define("_NEWS_MB_HITINDAY2", "Day's ago. This option work when you sort news by hit");
}
?>
\ No newline at end of file
Modified: XoopsModules/fmcontent/branches/news/language/persian/blocks.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/persian/blocks.php 2012-01-08 12:55:37 UTC (rev 8672)
+++ XoopsModules/fmcontent/branches/news/language/persian/blocks.php 2012-01-08 13:22:31 UTC (rev 8673)
@@ -32,5 +32,7 @@
define("_NEWS_MB_COUNT", "Show news count");
define("_NEWS_MB_TOPIC_NAME", "Title");
define("_NEWS_MB_TOPIC_IMG", "image");
+ define("_NEWS_MB_HITINDAY1", "Show news since");
+ define("_NEWS_MB_HITINDAY2", "Day's ago. This option work when you sort news by hit");
}
?>
\ No newline at end of file
Modified: XoopsModules/fmcontent/branches/news/xoops_version.php
===================================================================
--- XoopsModules/fmcontent/branches/news/xoops_version.php 2012-01-08 12:55:37 UTC (rev 8672)
+++ XoopsModules/fmcontent/branches/news/xoops_version.php 2012-01-08 13:22:31 UTC (rev 8673)
@@ -75,11 +75,12 @@
$modversion["search"]["file"] = "include/search.inc.php";
$modversion["search"]["func"] = "news_search";
-// Commentaires
-$modversion['comments']['itemName'] = 'storyid';
-$modversion['comments']['pageName'] = 'article.php';
-$modversion['comments']['callbackFile'] = 'include/comment_functions.php';
-$modversion['comments']['callback']['approve'] = 'news_com_approve';
+// Comments
+$modversion['comments']['pageName'] = 'article.php';
+$modversion['comments']['itemName'] = 'storyid';
+// Comment callback functions
+$modversion['comments']['callbackFile'] = 'include/comment_functions.php';
+$modversion['comments']['callback']['approve'] = 'news_com_approve';
$modversion['comments']['callback']['update'] = 'news_com_update';
// Templates
@@ -119,7 +120,7 @@
'description' => '',
'show_func' => 'news_list_show',
'edit_func' => 'news_list_edit',
- 'options' => $modversion['dirname'] . '|news|10|100|1|1|1|story_publish|180|left|DESC|0|'. XOOPS_URL.'|0',
+ 'options' => $modversion['dirname'] . '|news|10|100|1|1|1|story_publish|180|left|DESC|0|'. XOOPS_URL.'|0|0',
'template' => 'news_block_list.html');
$modversion['blocks'][] = array(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2012-01-09 06:03:31
|
Revision: 8685
http://xoops.svn.sourceforge.net/xoops/?rev=8685&view=rev
Author: voltan1
Date: 2012-01-09 06:03:25 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
Add subtitle to template
Modified Paths:
--------------
XoopsModules/fmcontent/branches/news/css/legacy.css
XoopsModules/fmcontent/branches/news/css/style.css
XoopsModules/fmcontent/branches/news/templates/news_article.html
Modified: XoopsModules/fmcontent/branches/news/css/legacy.css
===================================================================
--- XoopsModules/fmcontent/branches/news/css/legacy.css 2012-01-09 03:14:03 UTC (rev 8684)
+++ XoopsModules/fmcontent/branches/news/css/legacy.css 2012-01-09 06:03:25 UTC (rev 8685)
@@ -15,88 +15,4 @@
* @author voltan
* @version $Id $
**/
-.item {
- margin-bottom: 12px;
-}
-
-#default.item {
- border-width: 0;
-}
-
-#default .itemTitle {
- padding-bottom: 2px;
-}
-
-#default .itemShort,#default .itemText {
- text-align: justify;
-}
-
-.itemHead {
- padding: 5px 3px 6px 7px;
-}
-
-.itemInfo {
- padding: 4px 5px;
-}
-
-.itemBody {
- padding: 3px 4px;
-}
-
-.itemFoot {
- padding: 4px 5px;
-}
-
-.itemFoot img {
- vertical-align: -3px;
-}
-
-.itemTitle h1 {
- padding: 0;
- margin: 0;
-}
-
-.itemTitle h2 {
- padding: 0;
- margin: 0;
-}
-
-.itemTitle a {
- font-size: inherit;
-}
-
-.itemShort {
- line-height: 1.5em;
- margin: 0 2px;
- padding: 0 2px;
-}
-
-.itemSource {
- font-style: italic;
- font-size: 0.9em;;
- margin-bottom: 2px;
-}
-
-.itemAdminLink img {
- vertical-align: bottom;
-}
-
-.itemAde {
- text-align: center;
- margin: 4px 0 1px 0;
- auto;
-}
-
-.itemMore {
- margin-top: 4px;
-}
-
-.related h2 {
- padding: 7px 0 6px 0;
- margin: 0;
-}
-
-#xo-canvas-content ul li,.news ul li {
- list-style-position: outside;
- margin: 0 0 5px 15px;
-}
\ No newline at end of file
+
Modified: XoopsModules/fmcontent/branches/news/css/style.css
===================================================================
--- XoopsModules/fmcontent/branches/news/css/style.css 2012-01-09 03:14:03 UTC (rev 8684)
+++ XoopsModules/fmcontent/branches/news/css/style.css 2012-01-09 06:03:25 UTC (rev 8685)
@@ -16,6 +16,92 @@
* @version $Id $
**/
+.item {
+ margin-bottom: 12px;
+}
+
+#default.item {
+ border-width: 0;
+}
+
+#default .itemTitle {
+ padding-bottom: 2px;
+}
+
+#default .itemShort,#default .itemText {
+ text-align: justify;
+}
+
+.itemHead {
+ padding: 5px 3px 6px 7px;
+}
+
+.itemInfo {
+ padding: 4px 5px;
+}
+
+.itemBody {
+ padding: 3px 4px;
+}
+
+.itemFoot {
+ padding: 4px 5px;
+}
+
+.itemFoot img {
+ vertical-align: -3px;
+}
+
+.itemTitle h1 {
+ padding: 0;
+ margin: 0;
+}
+
+.itemTitle h2 {
+ padding: 0;
+ margin: 0;
+}
+
+.itemTitle a {
+ font-size: inherit;
+}
+
+.itemShort {
+ line-height: 1.5em;
+ margin: 0 2px;
+ padding: 0 2px;
+}
+
+.itemSource {
+ font-style: italic;
+ font-size: 0.9em;;
+ margin-bottom: 2px;
+}
+
+.itemAdminLink img {
+ vertical-align: bottom;
+}
+
+.itemAde {
+ text-align: center;
+ margin: 4px 0 1px 0;
+ auto;
+}
+
+.itemMore {
+ margin-top: 4px;
+}
+
+.related h2 {
+ padding: 7px 0 6px 0;
+ margin: 0;
+}
+
+#xo-canvas-content ul li,.news ul li {
+ list-style-position: outside;
+ margin: 0 0 5px 15px;
+}
+
.itemImg img {
max-width: 200px;
max-height: 200px;
@@ -32,6 +118,11 @@
margin: 5px;
}
+.itemSubTitle {
+ padding: 0px;
+ margin: 0px;
+}
+
.content_img {
max-width: 300px;
max-height: 300px;
Modified: XoopsModules/fmcontent/branches/news/templates/news_article.html
===================================================================
--- XoopsModules/fmcontent/branches/news/templates/news_article.html 2012-01-09 03:14:03 UTC (rev 8684)
+++ XoopsModules/fmcontent/branches/news/templates/news_article.html 2012-01-09 06:03:25 UTC (rev 8685)
@@ -38,6 +38,9 @@
</div>
<div class="itemBody">
<!-- Display content body -->
+ <{if $content.story_subtitle}>
+ <div class="itemSubTitle"><h3><{$content.story_subtitle}></h3></div>
+ <{/if}>
<{if $content.story_short}>
<div class="itemShort"><{$content.story_short}></div>
<{/if}>
@@ -55,7 +58,7 @@
<img class="<{$imgfloat}> story_img" src="<{$content.thumburl}>" alt="<{$content.story_title}>"/>
<{/if}>
</div>
- <{/if}>
+ <{/if}>
<{$content.story_text}>
<div class="clear spacer"></div>
<{if $content.story_author}>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2012-01-09 07:53:13
|
Revision: 8686
http://xoops.svn.sourceforge.net/xoops/?rev=8686&view=rev
Author: voltan1
Date: 2012-01-09 07:53:07 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
Add story cont for each topic in topic list page
Modified Paths:
--------------
XoopsModules/fmcontent/branches/news/class/topic.php
XoopsModules/fmcontent/branches/news/templates/news_topic.html
XoopsModules/fmcontent/branches/news/topic.php
Modified: XoopsModules/fmcontent/branches/news/class/topic.php
===================================================================
--- XoopsModules/fmcontent/branches/news/class/topic.php 2012-01-09 06:03:25 UTC (rev 8685)
+++ XoopsModules/fmcontent/branches/news/class/topic.php 2012-01-09 07:53:07 UTC (rev 8686)
@@ -243,7 +243,7 @@
/**
* Get topic information
*/
- function News_GetTopics($NewsModule, $topic_limit, $topic_start, $topic_order, $topic_sort, $topic_menu, $topic_online , $topic_parent) {
+ function News_GetTopics($NewsModule, $topic_limit, $topic_start, $topic_order, $topic_sort, $topic_menu, $topic_online , $topic_parent , $newscountbytopic) {
$ret = array ();
$criteria = new CriteriaCompo ();
$criteria->add ( new Criteria ( 'topic_modid', $NewsModule->getVar ( 'mid' ) ) );
@@ -265,6 +265,7 @@
$tab ['topicurl'] = NewsUtils::News_TopicUrl ( $NewsModule->getVar ( 'dirname' ), $tab );
$tab ['thumburl'] = XOOPS_URL . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/thumb/' .$root->getVar ( 'topic_img' );
$tab ['imageurl'] = XOOPS_URL . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/medium/' .$root->getVar ( 'topic_img' );
+ $tab ['count'] = $newscountbytopic[$root->getVar ( 'topic_id' )];
$ret [] = $tab;
}
}
Modified: XoopsModules/fmcontent/branches/news/templates/news_topic.html
===================================================================
--- XoopsModules/fmcontent/branches/news/templates/news_topic.html 2012-01-09 06:03:25 UTC (rev 8685)
+++ XoopsModules/fmcontent/branches/news/templates/news_topic.html 2012-01-09 07:53:07 UTC (rev 8686)
@@ -11,7 +11,7 @@
<{foreach item=topic from=$topics}>
<tr class="odd">
<td<{if !$topic.topic_img}> colspan="2"<{/if}> class="top">
- <div class=""><a title="<{$topic.topic_title}>" href="<{$topic.topicurl}>"><{$topic.topic_title}></a></div>
+ <div class=""><a title="<{$topic.topic_title}>" href="<{$topic.topicurl}>"><{$topic.topic_title}></a> ( <{$topic.count}> ) </div>
<div class=""><{$topic.topic_desc}></div>
</td>
<{if $topic.topic_img}>
Modified: XoopsModules/fmcontent/branches/news/topic.php
===================================================================
--- XoopsModules/fmcontent/branches/news/topic.php 2012-01-09 06:03:25 UTC (rev 8685)
+++ XoopsModules/fmcontent/branches/news/topic.php 2012-01-09 07:53:07 UTC (rev 8686)
@@ -52,9 +52,10 @@
$topic_start = NewsUtils::News_CleanVars($_REQUEST, 'start', 0, 'int');
} else {
$topic_start = 0;
-}
+}
-$topics = $topic_handler->News_GetTopics($NewsModule, $topic_limit, $topic_start, $topic_order, $topic_sort, $topic_menu = null, $topic_online = null , $topic_parent = null);
+$newscountbytopic = $story_handler->News_GetNewsCountByTopic();
+$topics = $topic_handler->News_GetTopics($NewsModule, $topic_limit, $topic_start, $topic_order, $topic_sort, $topic_menu = null, $topic_online = null , $topic_parent = null , $newscountbytopic);
$topic_numrows = $topic_handler->News_GetTopicCount($NewsModule);
if ($topic_numrows > $topic_limit) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2012-01-09 08:00:57
|
Revision: 8687
http://xoops.svn.sourceforge.net/xoops/?rev=8687&view=rev
Author: voltan1
Date: 2012-01-09 08:00:51 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
REmove leagacy css file
Modified Paths:
--------------
XoopsModules/fmcontent/branches/news/article.php
XoopsModules/fmcontent/branches/news/index.php
Removed Paths:
-------------
XoopsModules/fmcontent/branches/news/css/legacy.css
Modified: XoopsModules/fmcontent/branches/news/article.php
===================================================================
--- XoopsModules/fmcontent/branches/news/article.php 2012-01-09 07:53:07 UTC (rev 8686)
+++ XoopsModules/fmcontent/branches/news/article.php 2012-01-09 08:00:51 UTC (rev 8687)
@@ -44,7 +44,6 @@
// Add Stylesheet
$xoTheme->addStylesheet ( XOOPS_URL . '/modules/' . $NewsModule->getVar ( 'dirname' ) . '/css/style.css' );
-$xoTheme->addStylesheet ( XOOPS_URL . '/modules/' . $NewsModule->getVar ( 'dirname' ) . '/css/legacy.css' );
if (! $story_id) {
$criteria = new CriteriaCompo ();
Deleted: XoopsModules/fmcontent/branches/news/css/legacy.css
===================================================================
--- XoopsModules/fmcontent/branches/news/css/legacy.css 2012-01-09 07:53:07 UTC (rev 8686)
+++ XoopsModules/fmcontent/branches/news/css/legacy.css 2012-01-09 08:00:51 UTC (rev 8687)
@@ -1,18 +0,0 @@
-/**
- * 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.fsf.org/copyleft/gpl.html GNU public license
- * @package News
- * @since 2.5.0
- * @author voltan
- * @version $Id $
- **/
-
Modified: XoopsModules/fmcontent/branches/news/index.php
===================================================================
--- XoopsModules/fmcontent/branches/news/index.php 2012-01-09 07:53:07 UTC (rev 8686)
+++ XoopsModules/fmcontent/branches/news/index.php 2012-01-09 08:00:51 UTC (rev 8687)
@@ -53,7 +53,6 @@
// Add Stylesheet
$xoTheme->addStylesheet ( XOOPS_URL . '/modules/' . $NewsModule->getVar ( 'dirname' ) . '/css/style.css' );
-$xoTheme->addStylesheet ( XOOPS_URL . '/modules/' . $NewsModule->getVar ( 'dirname' ) . '/css/legacy.css' );
if (isset ( $story_topic )) {
$topics = $topic_handler->getall ( $story_topic );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2012-01-09 10:53:51
|
Revision: 8688
http://xoops.svn.sourceforge.net/xoops/?rev=8688&view=rev
Author: voltan1
Date: 2012-01-09 10:53:40 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
Add archive page
Modified Paths:
--------------
XoopsModules/fmcontent/branches/news/class/story.php
XoopsModules/fmcontent/branches/news/language/arabic/main.php
XoopsModules/fmcontent/branches/news/language/arabic/modinfo.php
XoopsModules/fmcontent/branches/news/language/english/main.php
XoopsModules/fmcontent/branches/news/language/english/modinfo.php
XoopsModules/fmcontent/branches/news/language/persian/main.php
XoopsModules/fmcontent/branches/news/language/persian/modinfo.php
XoopsModules/fmcontent/branches/news/xoops_version.php
Added Paths:
-----------
XoopsModules/fmcontent/branches/news/archive.php
XoopsModules/fmcontent/branches/news/templates/news_archive.html
Added: XoopsModules/fmcontent/branches/news/archive.php
===================================================================
--- XoopsModules/fmcontent/branches/news/archive.php (rev 0)
+++ XoopsModules/fmcontent/branches/news/archive.php 2012-01-09 10:53:40 UTC (rev 8688)
@@ -0,0 +1,125 @@
+<?php
+/*
+ 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.
+*/
+
+/**
+ * News index file
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Andricq Nicolas (AKA MusS)
+ * @version $Id$
+ */
+
+require dirname(__FILE__) . '/header.php';
+if (!isset($NewsModule)) exit('Module not found');
+
+include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/calendar.php';
+
+// Initialize content handler
+$story_handler = xoops_getmodulehandler ( 'story', 'news' );
+$topic_handler = xoops_getmodulehandler ( 'topic', 'news' );
+$file_handler = xoops_getmodulehandler('file', 'news');
+
+// Include content template
+$xoopsOption ['template_main'] = 'news_archive.html';
+
+// include Xoops header
+include XOOPS_ROOT_PATH . '/header.php';
+
+// Add Stylesheet
+$xoTheme->addStylesheet ( XOOPS_URL . '/modules/' . $NewsModule->getVar ( 'dirname' ) . '/css/style.css' );
+
+$lastyear = 0;
+$lastmonth = 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);
+
+$fromyear = NewsUtils::News_CleanVars ( $_REQUEST, 'year', 0, 'int' );
+$frommonth = NewsUtils::News_CleanVars ( $_REQUEST, 'month', 0, 'int' );
+
+$pgtitle = '';
+if($fromyear && $frommonth) {
+ $pgtitle = sprintf(" - %d - %d", $fromyear, $frommonth);
+}
+
+$dateformat='m';
+
+$xoopsTpl->assign('xoops_pagetitle', _NEWS_MD_ARCHIVE . $pgtitle . ' - ' . $xoopsModule->name('s'));
+
+$useroffset = '';
+if(is_object($xoopsUser)) {
+ $timezone = $xoopsUser->timezone();
+ if(isset($timezone)){
+ $useroffset = $xoopsUser->timezone();
+ } else {
+ $useroffset = $xoopsConfig['default_TZ'];
+ }
+}
+
+$result = $story_handler->News_GetArchiveMonth($NewsModule);
+$years = array();
+$months = array();
+$i = 0;
+
+while (list($time) = $xoopsDB->fetchRow($result)) {
+ $time = formatTimestamp($time, 'mysql', $useroffset);
+ if (preg_match("/([0-9]{4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})/", $time, $datetime)) {
+ $this_year = intval($datetime[1]);
+ $this_month = intval($datetime[2]);
+ if (empty($lastyear)) {
+ $lastyear = $this_year;
+ }
+ if ($lastmonth == 0) {
+ $lastmonth = $this_month;
+ $months[$lastmonth]['string'] = $months_arr[$lastmonth];
+ $months[$lastmonth]['number'] = $lastmonth;
+ }
+ if ($lastyear != $this_year) {
+ $years[$i]['number'] = $lastyear;
+ $years[$i]['months'] = $months;
+ $months = array();
+ $lastmonth = 0;
+ $lastyear = $this_year;
+ $i++;
+ }
+ if ($lastmonth != $this_month) {
+ $lastmonth = $this_month;
+ $months[$lastmonth]['string'] = $months_arr[$lastmonth];
+ $months[$lastmonth]['number'] = $lastmonth;
+ }
+ }
+}
+
+ $years[$i]['number'] = $this_year;
+ $years[$i]['months'] = $months;
+ $xoopsTpl->assign('years', $years);
+ $xoopsTpl->assign('module', $NewsModule->getVar ( 'dirname' ));
+
+
+if ($fromyear != 0 && $frommonth != 0) {
+ // must adjust the selected time to server timestamp
+ $timeoffset = $useroffset - $xoopsConfig['server_TZ'];
+ $monthstart = mktime(0 - $timeoffset, 0, 0, $frommonth, 1, $fromyear);
+ $monthend = mktime(23 - $timeoffset, 59, 59, $frommonth + 1, 0, $fromyear);
+ $monthend = ($monthend > time()) ? time() : $monthend;
+
+ $topics = $topic_handler->getall ();
+ $archive = $story_handler->News_GetArchive($NewsModule , $monthstart, $monthend , $topics);
+ $xoopsTpl->assign('archive', $archive);
+ $xoopsTpl->assign('show_articles', true);
+} else {
+ $xoopsTpl->assign('show_articles', false);
+}
+
+
+// include Xoops footer
+include XOOPS_ROOT_PATH . '/footer.php';
+?>
\ No newline at end of file
Modified: XoopsModules/fmcontent/branches/news/class/story.php
===================================================================
--- XoopsModules/fmcontent/branches/news/class/story.php 2012-01-09 08:00:51 UTC (rev 8687)
+++ XoopsModules/fmcontent/branches/news/class/story.php 2012-01-09 10:53:40 UTC (rev 8688)
@@ -846,7 +846,7 @@
*
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
- * @author Hervé Thouzard (ttp://www.instant-zero.com)
+ * @author Hervé Thouzard (http://www.instant-zero.com)
*/
function News_UpdateHits($story_id) {
@@ -1027,7 +1027,7 @@
* Returns the number of published news per topic
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
- * @author Hervé Thouzard (ttp://www.instant-zero.com)
+ * @author Hervé Thouzard (http://www.instant-zero.com)
*/
function News_GetNewsCountByTopic()
{
@@ -1039,6 +1039,55 @@
}
return $ret;
}
+
+ /**
+ * Get archive month
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @author Hervé Thouzard (http://www.instant-zero.com)
+ */
+ function News_GetArchiveMonth($NewsModule) {
+ $sql = "SELECT `story_publish` FROM ".$this->db->prefix('news_story')." WHERE ( story_status = 1 ) AND ( story_topic != 0 ) AND ( story_modid = " . $NewsModule->getVar ( 'mid' ) . " ) AND ( story_publish > 0 AND story_publish <= " . time() . " ) AND ( story_expire = 0 OR story_expire <= " . time() . " ) ORDER BY story_publish DESC";
+ $result = $this->db->query($sql);
+ return $result;
+ }
+
+ /**
+ * Get archive
+ */
+ function News_GetArchive($NewsModule, $publish_start, $publish_end ,$topics) {
+ $ret = array();
+ $criteria = new CriteriaCompo ();
+ $criteria->add ( new Criteria ( 'story_modid', $NewsModule->getVar ( 'mid' ) ) );
+ $criteria->add ( new Criteria ( 'story_status', '1' ) );
+ $criteria->add ( new Criteria ( 'story_publish', $publish_start , '>' ));
+ $criteria->add ( new Criteria ( 'story_publish', $publish_end , '<=' ));
+ $criteria->add ( new Criteria ( 'story_expire', 0 ));
+ $criteria->add ( new Criteria ( 'story_expire', time() , '>' ) ,'OR');
+ $criteria->setSort ( 'story_publish' );
+ $criteria->setOrder ( 'DESC' );
+ $obj = $this->getObjects ( $criteria, false );
+ if ($obj) {
+ foreach ( $obj as $root ) {
+ $tab = array ();
+ $tab = $root->toArray ();
+ foreach ( array_keys ( $topics ) as $i ) {
+ $list [$i] ['topic_title'] = $topics [$i]->getVar ( "topic_title" );
+ $list [$i] ['topic_id'] = $topics [$i]->getVar ( "topic_id" );
+ $list [$i] ['topic_alias'] =$topics [$i]->getVar ( "topic_alias" );
+ }
+ $tab ['topic'] = $list [$root->getVar ( 'story_topic' )] ['topic_title'];
+ $tab ['topic_alias'] = $list [$root->getVar ( 'story_topic' )] ['topic_alias'];
+ $tab ['topicurl'] = NewsUtils::News_TopicUrl ( $NewsModule->getVar ( 'dirname' ), array('topic_id'=>$list [$root->getVar ( 'story_topic' )] ['topic_id'], 'topic_alias'=>$list [$root->getVar ( 'story_topic' )] ['topic_alias'] ));
+ $tab ['url'] = NewsUtils::News_Url ( $NewsModule->getVar ( 'dirname' ), $tab );
+ $tab ['story_publish'] = formatTimestamp ( $root->getVar ( 'story_publish' ), _MEDIUMDATESTRING );
+ $tab ['imageurl'] = XOOPS_URL . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/medium/' . $root->getVar ( 'story_img' );
+ $tab ['thumburl'] = XOOPS_URL . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/thumb/' . $root->getVar ( 'story_img' );
+ $ret [] = $tab;
+ }
+ }
+ return $ret;
+ }
}
?>
\ No newline at end of file
Modified: XoopsModules/fmcontent/branches/news/language/arabic/main.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/arabic/main.php 2012-01-09 08:00:51 UTC (rev 8687)
+++ XoopsModules/fmcontent/branches/news/language/arabic/main.php 2012-01-09 10:53:40 UTC (rev 8688)
@@ -85,5 +85,12 @@
define("_NEWS_MD_TOPIC_NAME", "العنوان");
define("_NEWS_MD_TOPIC_DESC", "شرح");
define("_NEWS_MD_TOPIC_IMG", "صورة");
+// Archive
+ define("_NEWS_MD_ARCHIVE", "News Archive");
+ define("_NEWS_MD_ARCHIVE_ARTICLES", "Articles");
+ define("_NEWS_MD_ARCHIVE_VIEW", "Hits");
+ define("_NEWS_MD_ARCHIVE_DATE", "Date");
+ define("_NEWS_MD_ARCHIVE_TOPIC", "Topic");
+ define("_NEWS_MD_ARCHIVE_TOTAL", "Total Stores");
}
?>
\ 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-09 08:00:51 UTC (rev 8687)
+++ XoopsModules/fmcontent/branches/news/language/arabic/modinfo.php 2012-01-09 10:53:40 UTC (rev 8688)
@@ -32,6 +32,7 @@
define("_NEWS_MI_HELP", "دلیل");
define("_NEWS_MI_SUBMIT", "ارسال");
define('_NEWS_MI_FILE', 'ملف');
+ define('_NEWS_MI_ARCHIVE', 'Archive');
// Block
define("_NEWS_MI_BLOCK_PAGE", "الصفحة");
define("_NEWS_MI_BLOCK_LIST", "الفهرسة");
Modified: XoopsModules/fmcontent/branches/news/language/english/main.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/english/main.php 2012-01-09 08:00:51 UTC (rev 8687)
+++ XoopsModules/fmcontent/branches/news/language/english/main.php 2012-01-09 10:53:40 UTC (rev 8688)
@@ -80,10 +80,17 @@
define("_NEWS_MD_BOOKMARK_TO_GOOLGEBUZZ", "Bookmark to Google Buzz");
define("_NEWS_MD_BOOKMARK_TO_GOOLGEREADER", "Bookmark to Google Reader");
define("_NEWS_MD_BOOKMARK_TO_GOOLGEBOOKMARKS", "Bookmark to Google Bookmarks");
-// topic
+// Topic
define("_NEWS_MD_TOPIC_ID", "ID");
define("_NEWS_MD_TOPIC_NAME", "Title");
define("_NEWS_MD_TOPIC_DESC", "Description");
- define("_NEWS_MD_TOPIC_IMG", "image");
+ define("_NEWS_MD_TOPIC_IMG", "image");
+// Archive
+ define("_NEWS_MD_ARCHIVE", "News Archive");
+ define("_NEWS_MD_ARCHIVE_ARTICLES", "Articles");
+ define("_NEWS_MD_ARCHIVE_VIEW", "Hits");
+ define("_NEWS_MD_ARCHIVE_DATE", "Date");
+ define("_NEWS_MD_ARCHIVE_TOPIC", "Topic");
+ define("_NEWS_MD_ARCHIVE_TOTAL", "Total Stores");
}
?>
\ No newline at end of file
Modified: XoopsModules/fmcontent/branches/news/language/english/modinfo.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/english/modinfo.php 2012-01-09 08:00:51 UTC (rev 8687)
+++ XoopsModules/fmcontent/branches/news/language/english/modinfo.php 2012-01-09 10:53:40 UTC (rev 8688)
@@ -31,7 +31,8 @@
define('_NEWS_MI_ABOUT', 'About');
define('_NEWS_MI_HELP', 'Help');
define('_NEWS_MI_SUBMIT', 'Submit');
- define('_NEWS_MI_FILE', 'File');
+ define('_NEWS_MI_FILE', 'File');
+ define('_NEWS_MI_ARCHIVE', 'Archive');
// Block
define('_NEWS_MI_BLOCK_PAGE', 'Article page');
define('_NEWS_MI_BLOCK_LIST', 'Article list');
Modified: XoopsModules/fmcontent/branches/news/language/persian/main.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/persian/main.php 2012-01-09 08:00:51 UTC (rev 8687)
+++ XoopsModules/fmcontent/branches/news/language/persian/main.php 2012-01-09 10:53:40 UTC (rev 8688)
@@ -85,5 +85,12 @@
define("_NEWS_MD_TOPIC_NAME", "عنوان");
define("_NEWS_MD_TOPIC_DESC", "توضیحات");
define("_NEWS_MD_TOPIC_IMG", "تصویر");
+// Archive
+ define("_NEWS_MD_ARCHIVE", "News Archive");
+ define("_NEWS_MD_ARCHIVE_ARTICLES", "Articles");
+ define("_NEWS_MD_ARCHIVE_VIEW", "Hits");
+ define("_NEWS_MD_ARCHIVE_DATE", "Date");
+ define("_NEWS_MD_ARCHIVE_TOPIC", "Topic");
+ define("_NEWS_MD_ARCHIVE_TOTAL", "Total Stores");
}
?>
\ No newline at end of file
Modified: XoopsModules/fmcontent/branches/news/language/persian/modinfo.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/persian/modinfo.php 2012-01-09 08:00:51 UTC (rev 8687)
+++ XoopsModules/fmcontent/branches/news/language/persian/modinfo.php 2012-01-09 10:53:40 UTC (rev 8688)
@@ -31,7 +31,8 @@
define("_NEWS_MI_ABOUT", "درباره");
define("_NEWS_MI_HELP", "راهنما");
define("_NEWS_MI_SUBMIT", "ارسال");
- define('_NEWS_MI_FILE', 'فایل');
+ define('_NEWS_MI_FILE', 'فایل');
+ define('_NEWS_MI_ARCHIVE', 'Archive');
// Block
define("_NEWS_MI_BLOCK_PAGE", "صفحه");
define("_NEWS_MI_BLOCK_LIST", "فهرست");
Added: XoopsModules/fmcontent/branches/news/templates/news_archive.html
===================================================================
--- XoopsModules/fmcontent/branches/news/templates/news_archive.html (rev 0)
+++ XoopsModules/fmcontent/branches/news/templates/news_archive.html 2012-01-09 10:53:40 UTC (rev 8688)
@@ -0,0 +1,39 @@
+<div class="news-archive">
+ <div class="pad2 marg2">
+ <table>
+ <tr>
+ <th><{$smarty.const._NEWS_MD_ARCHIVE}></th>
+ </tr>
+ <{foreach item=year from=$years}>
+ <{foreach item=month from=$year.months}>
+ <tr class="even">
+ <td><a title="<{$month.string}> <{$year.number}>" href="<{$xoops_url}>/modules/<{$module}>/archive.php?year=<{$year.number}>&month=<{$month.number}>"><{$month.string}> <{$year.number}></a></td>
+ </tr>
+ <{/foreach}>
+ <{/foreach}>
+ </table>
+ </div>
+
+ <{if $show_articles == true}>
+ <div class="pad2 marg2">
+ <table>
+ <tr>
+ <th><{$smarty.const._NEWS_MD_ARCHIVE_ARTICLES}></th>
+ <th class="center"><{$smarty.const._NEWS_MD_ARCHIVE_VIEW}></th>
+ <th class="center"><{$smarty.const._NEWS_MD_ARCHIVE_DATE}></th>
+ <th class="center"><{$smarty.const._NEWS_MD_ARCHIVE_TOPIC}></th>
+ </tr>
+ <{foreach item=archive from=$archive}>
+ <tr class="<{cycle values="even,odd"}>">
+ <td><a title="<{$archive.story_title}>" href="<{$archive.url}>"><{$archive.story_title}></a></td>
+ <td class="center"><{$archive.story_hits}></td>
+ <td class="center"><{$archive.story_publish}></td>
+ <td class="center"><a title="<{$archive.topic}>" href="<{$archive.topicurl}>" ><{$archive.topic}></a></td>
+ </tr>
+ <{/foreach}>
+ </table>
+ </div>
+ <div class="marg2 pad2 center"><a title="<{$smarty.const._NEWS_MD_ARCHIVE_TOTAL}>" href="<{$xoops_url}>/modules/<{$module}>/archive.php"><{$smarty.const._NEWS_MD_ARCHIVE_TOTAL}></a></div>
+ <{/if}>
+
+</div>
\ No newline at end of file
Modified: XoopsModules/fmcontent/branches/news/xoops_version.php
===================================================================
--- XoopsModules/fmcontent/branches/news/xoops_version.php 2012-01-09 08:00:51 UTC (rev 8687)
+++ XoopsModules/fmcontent/branches/news/xoops_version.php 2012-01-09 10:53:40 UTC (rev 8688)
@@ -95,6 +95,7 @@
$modversion['templates'][] = array('file' => 'news_bookmarkme.html', 'description' => '');
$modversion['templates'][] = array('file' => 'news_header.html', 'description' => '');
$modversion['templates'][] = array('file' => 'news_topic.html', 'description' => '');
+$modversion['templates'][] = array('file' => 'news_archive.html', 'description' => '');
// Menu
$modversion['sub'][] = array(
@@ -103,6 +104,9 @@
$modversion['sub'][] = array(
'name' => _NEWS_MI_TOPIC,
'url' => 'topic.php');
+$modversion['sub'][] = array(
+ 'name' => _NEWS_MI_ARCHIVE,
+ 'url' => 'archive.php');
// Blocks
$modversion['blocks'][] = array(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2012-01-09 13:31:30
|
Revision: 8689
http://xoops.svn.sourceforge.net/xoops/?rev=8689&view=rev
Author: voltan1
Date: 2012-01-09 13:31:19 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
Add news pream in tools
Modified Paths:
--------------
XoopsModules/fmcontent/branches/news/admin/tools.php
XoopsModules/fmcontent/branches/news/class/story.php
XoopsModules/fmcontent/branches/news/language/arabic/admin.php
XoopsModules/fmcontent/branches/news/language/english/admin.php
XoopsModules/fmcontent/branches/news/language/persian/admin.php
XoopsModules/fmcontent/branches/news/templates/admin/news_tools.html
Modified: XoopsModules/fmcontent/branches/news/admin/tools.php
===================================================================
--- XoopsModules/fmcontent/branches/news/admin/tools.php 2012-01-09 10:53:40 UTC (rev 8688)
+++ XoopsModules/fmcontent/branches/news/admin/tools.php 2012-01-09 13:31:19 UTC (rev 8689)
@@ -97,7 +97,32 @@
$form->addElement(new XoopsFormHidden('op', 'keyword'));
$form->addElement(new XoopsFormButton('', 'post', _SUBMIT, 'submit'));
$xoopsTpl->assign('keyword', $form->render());
-
+
+ // prune manager
+ $form = new XoopsThemeForm(_NEWS_AM_TOOLS_PRUNE, 'tools', 'tools.php', 'post');
+ $form->addElement(new XoopsFormTextDateSelect(_NEWS_AM_TOOLS_PRUNE_BEFORE, 'prune_date', 15, time()));
+ $onlyexpired=new xoopsFormCheckBox('', 'onlyexpired');
+ $onlyexpired->addOption(1, _NEWS_AM_TOOLS_PRUNE_EXPIREDONLY);
+ $form->addElement($onlyexpired, false);
+ $form->addElement(new XoopsFormHidden('op', 'confirmbeforetoprune'), false);
+ $form->addElement(new XoopsFormHidden('op', 'confirmbeforetoprune'), false);
+ $topiclist = new XoopsFormSelect(_NEWS_AM_TOOLS_PRUNE_TOPICS, 'pruned_topics','',5,true);
+ $criteria = new CriteriaCompo ();
+ $criteria->add ( new Criteria ( 'topic_modid', $NewsModule->getVar ( 'mid' ) ) );
+ $criteria->setSort ( 'topic_id' );
+ $criteria->setOrder ( 'DESC' );
+ $allTopics = $topic_handler->getObjects ( $criteria );
+ $topic_tree = new XoopsObjectTree($allTopics, 'topic_id', 'topic_pid');
+ $topics_arr = $topic_tree->getAllChild(0);
+ foreach ($topics_arr as $onetopic) {
+ $topiclist->addOption($onetopic->getVar ( 'topic_id' ),$onetopic->getVar ( 'topic_title', 'e' ));
+ }
+ $topiclist->setDescription(_NEWS_AM_TOOLS_EXPORT_PRUNE_DSC);
+ $form->addElement($topiclist,false);
+ $form->addElement(new XoopsFormHidden('op', 'prune'));
+ $form->addElement(new XoopsFormButton('', 'post', _SUBMIT, 'submit'));
+ $xoopsTpl->assign('prune', $form->render());
+
// other options
$xoopsTpl->assign('header', true );
break;
@@ -154,6 +179,19 @@
NewsUtils::News_Rebuild ($story_handler , 'story_id' , 'description' , 'story_desc' , 'story_title' , $start_id , $end_id);
NewsUtils::News_Redirect('tools.php', 1, _NEWS_AM_MSG_WAIT);
break;
+
+ case 'prune':
+ $timestamp = NewsUtils::News_CleanVars ( $_REQUEST, 'prune_date', '', 'int' );
+ $expired = NewsUtils::News_CleanVars ( $_REQUEST, 'onlyexpired', 0, 'int' );
+ $timestamp = strtotime($_REQUEST ['prune_date']);
+ $topiclist = '';
+ if(isset($_REQUEST['pruned_topics'])) {
+ $topiclist = implode ( ',', $_REQUEST['pruned_topics'] );
+ }
+ $count = $story_handler->News_PruneCount($NewsModule,$timestamp,$expired,$topiclist);
+ $story_handler->News_DeleteBeforeDate($NewsModule,$timestamp,$expired,$topiclist);
+ NewsUtils::News_Redirect('tools.php', 100, sprintf(_NEWS_AM_MSG_PRUNE_DELETED,$count));
+ break;
}
$xoopsTpl->assign('navigation', 'tools');
Modified: XoopsModules/fmcontent/branches/news/class/story.php
===================================================================
--- XoopsModules/fmcontent/branches/news/class/story.php 2012-01-09 10:53:40 UTC (rev 8688)
+++ XoopsModules/fmcontent/branches/news/class/story.php 2012-01-09 13:31:19 UTC (rev 8689)
@@ -1052,7 +1052,7 @@
return $result;
}
- /**
+ /**
* Get archive
*/
function News_GetArchive($NewsModule, $publish_start, $publish_end ,$topics) {
@@ -1088,6 +1088,50 @@
}
return $ret;
}
+
+ /**
+ * News Prune Count
+ */
+ function News_PruneCount($NewsModule,$timestamp,$expired,$topiclist) {
+ $criteria = new CriteriaCompo ();
+ $criteria->add ( new Criteria ( 'story_modid', $NewsModule->getVar ( 'mid' ) ) );
+ $criteria->add ( new Criteria ( 'story_publish', $timestamp , '<=' ));
+ if($expired) {
+ $criteria->add ( new Criteria ( 'story_expire', 0 ));
+ $criteria->add ( new Criteria ( 'story_expire', time() , '>' ) ,'OR');
+ }
+ if($topiclist) {
+ $criteria->add ( new Criteria ( 'story_topic', '(' . $topiclist . ')', 'IN' ) );
+ }
+ return $this->getCount ( $criteria );
+ }
+
+ /**
+ * News Delete Before Date
+ */
+ function News_DeleteBeforeDate($NewsModule,$timestamp,$expired,$topiclist) {
+ $criteria = new CriteriaCompo ();
+ $criteria->add ( new Criteria ( 'story_modid', $NewsModule->getVar ( 'mid' ) ) );
+ $criteria->add ( new Criteria ( 'story_publish', $timestamp , '<=' ));
+ if($expired) {
+ $criteria->add ( new Criteria ( 'story_expire', 0 ));
+ $criteria->add ( new Criteria ( 'story_expire', time() , '>' ) ,'OR');
+ }
+ if($topiclist) {
+ $criteria->add ( new Criteria ( 'story_topic', '(' . $topiclist . ')', 'IN' ) );
+ }
+ /*
+ $obj = $this->getObjects ( $criteria, false );
+ if ($obj) {
+ foreach ( $obj as $root ) {
+ xoops_comment_delete( $NewsModule->getVar ( 'mid' ) , $root->getVar ( 'story_id' ));
+ //xoops_notification_deletebyitem( $NewsModule->getVar ( 'mid' ) , 'story', $root->getVar ( 'story_id' ));
+ }
+ }
+ */
+ $this->deleteAll($criteria);
+ return true;
+ }
}
?>
\ No newline at end of file
Modified: XoopsModules/fmcontent/branches/news/language/arabic/admin.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/arabic/admin.php 2012-01-09 10:53:40 UTC (rev 8688)
+++ XoopsModules/fmcontent/branches/news/language/arabic/admin.php 2012-01-09 13:31:19 UTC (rev 8689)
@@ -168,6 +168,7 @@
define('_NEWS_AM_MSG_CLONE_ERROR', 'هذا الدليل هو متاح الآن !');
define("_NEWS_AM_MSG_NOPERMSSET", "لایمکن تعدیل الإتاحات: لم یتم تحدیث أي فئة ! الرجاء تحدیث فئة أولا.");
define('_NEWS_AM_MSG_ALIASERROR', 'لقد تم اختیار هذا الإسم. الرجاء اختیار اسم آخر.');
+ define('_NEWS_AM_MSG_PRUNE_DELETED', '%s Articles deleted');
// about
define('_NEWS_AM_ABOUT_ADMIN', 'درباره');
define('_NEWS_AM_ABOUT_DESCRIPTION', 'وصف:');
Modified: XoopsModules/fmcontent/branches/news/language/english/admin.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/english/admin.php 2012-01-09 10:53:40 UTC (rev 8688)
+++ XoopsModules/fmcontent/branches/news/language/english/admin.php 2012-01-09 13:31:19 UTC (rev 8689)
@@ -167,7 +167,8 @@
define('_NEWS_AM_MSG_CLONE_ERROR', 'This folder already exists !');
define('_NEWS_AM_MSG_NOPERMSSET', 'Permission cannot be set: No Topics created yet! Please create a Topic first.');
define('_NEWS_AM_MSG_ALIASERROR', 'Your selected Alias is already taken. Please change it and try again');
- define('_NEWS_AM_MSG_INPROC', 'Rebuilding ... ');
+ define('_NEWS_AM_MSG_INPROC', 'Rebuilding ... ');
+ define('_NEWS_AM_MSG_PRUNE_DELETED', '%s Articles deleted');
// about
define('_NEWS_AM_ABOUT_ADMIN', 'About');
define('_NEWS_AM_ABOUT_DESCRIPTION', 'Description:');
Modified: XoopsModules/fmcontent/branches/news/language/persian/admin.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/persian/admin.php 2012-01-09 10:53:40 UTC (rev 8688)
+++ XoopsModules/fmcontent/branches/news/language/persian/admin.php 2012-01-09 13:31:19 UTC (rev 8689)
@@ -167,7 +167,8 @@
define('_NEWS_AM_MSG_INSERT_ERROR', 'ناتوان در به روز رسانی پایگاه داده ها! خطا در مورد اخبار');
define('_NEWS_AM_MSG_CLONE_ERROR', 'این شاخه هماکنون موجود است!');
define("_NEWS_AM_MSG_NOPERMSSET", "هیچ دسترسی قابل تنظیم نیست : هنوز هیچ شاخه ای ساخته نشده است! لطفا ابتدا یک شاخه بسازید.");
- define('_NEWS_AM_MSG_ALIASERROR', 'نام مستعار مورد انتخاب شما گرفته شده است. لطفا یک نام دیگر انتخاب کنید.');
+ define('_NEWS_AM_MSG_ALIASERROR', 'نام مستعار مورد انتخاب شما گرفته شده است. لطفا یک نام دیگر انتخاب کنید.');
+ define('_NEWS_AM_MSG_PRUNE_DELETED', '%s Articles deleted');
// about
define('_NEWS_AM_ABOUT_ADMIN', 'درباره');
define('_NEWS_AM_ABOUT_DESCRIPTION', 'توضیحات:');
Modified: XoopsModules/fmcontent/branches/news/templates/admin/news_tools.html
===================================================================
--- XoopsModules/fmcontent/branches/news/templates/admin/news_tools.html 2012-01-09 10:53:40 UTC (rev 8688)
+++ XoopsModules/fmcontent/branches/news/templates/admin/news_tools.html 2012-01-09 13:31:19 UTC (rev 8689)
@@ -8,7 +8,7 @@
<{if $topicalias}><{$topicalias}><{/if}>
<{if $description}><{$description}><{/if}>
<{if $keyword}><{$keyword}><{/if}>
-
+ <{if $prune}><{$prune}><{/if}>
<{if $messages}>
<div id="xo-module-log">
<h4><{$smarty.const._NEWS_AM_TOOLS_LOG_TITLE}></h4>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2012-01-10 05:29:31
|
Revision: 8691
http://xoops.svn.sourceforge.net/xoops/?rev=8691&view=rev
Author: voltan1
Date: 2012-01-10 05:29:25 +0000 (Tue, 10 Jan 2012)
Log Message:
-----------
Fix some problems
Modified Paths:
--------------
XoopsModules/fmcontent/branches/news/admin/action.module.php
XoopsModules/fmcontent/branches/news/admin/index.php
XoopsModules/fmcontent/branches/news/index.php
XoopsModules/fmcontent/branches/news/templates/news_index.html
XoopsModules/fmcontent/branches/news/xoops_version.php
Modified: XoopsModules/fmcontent/branches/news/admin/action.module.php
===================================================================
--- XoopsModules/fmcontent/branches/news/admin/action.module.php 2012-01-09 20:02:45 UTC (rev 8690)
+++ XoopsModules/fmcontent/branches/news/admin/action.module.php 2012-01-10 05:29:25 UTC (rev 8691)
@@ -21,16 +21,18 @@
function xoops_module_pre_install_news($module) {
- /*
- $db =& $GLOBALS["xoopsDB"];
- $error = false;
+
+ $db = $GLOBALS["xoopsDB"];
+ $error = false;
+
+ /*
if (substr(XOOPS_VERSION, 0, 9) < "XOOPS 2.5") {
$module->setErrors("The module only works for XOOPS 2.5+");
return false;
}
-
+ */
$sqlfile = array('mysql' => 'sql/mysql.sql');
- */
+
$modsDirname = 'news';
$indexFile = XOOPS_ROOT_PATH . "/uploads/index.html";
$blankFile = XOOPS_ROOT_PATH . "/uploads/blank.gif";
@@ -44,39 +46,39 @@
}
//Creation du fichier price dans uploads
- $module_uploads = XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/img";
+ $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 . "/img/index.html");
- copy($blankFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/img/blank.gif");
+ 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 . "/img/original";
+ $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 . "/img/original/index.html");
- copy($blankFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/img/original/blank.gif");
+ 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 . "/img/medium";
+ $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 . "/img/medium/index.html");
- copy($blankFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/img/medium/blank.gif");
+ 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 . "/img/thumb";
+ $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 . "/img/thumb/index.html");
- copy($blankFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/img/thumb/blank.gif");
+ 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
@@ -88,13 +90,13 @@
copy($blankFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/file/blank.gif");
}
- /*
- if (is_array($sqlfile) && !empty($sqlfile[XOOPS_DB_TYPE])) {
- $sql_file_path = XOOPS_ROOT_PATH . "/modules/" . $modsDirname . "/" . $sqlfile[XOOPS_DB_TYPE];
+ if (is_array($sqlfile) && !empty($sqlfile[XOOPS_DB_TYPE])) {
+ $sql_file_path = XOOPS_ROOT_PATH . "/modules/" . $modsDirname . "/" . $sqlfile[XOOPS_DB_TYPE];
+
if (!file_exists($sql_file_path)) {
$module->setErrors("<p>" . sprintf(_NEWS_MI_SQL_NOT_FOUND, "<strong>{$sql_file_path}</strong>"));
$error = true;
- } else {
+ } else {
$msgs[] = "<p>" . sprintf(_NEWS_MI_SQL_FOUND, "<strong>{$sql_file_path}</strong>") . "<br />" . _NEWS_MI_CREATE_TABLES;
require_once $GLOBALS['xoops']->path('/class/database/sqlutility.php');
@@ -145,11 +147,9 @@
return false;
}
}
- return true;
+ return true;
}
return false;
- */
- return true;
}
function xoops_module_update_news($module, $version) {
@@ -159,7 +159,6 @@
function xoops_module_uninstall_news($module) {
$db =& $GLOBALS["xoopsDB"];
- //$created_tables = array(0 => 'news');
$created_tables = array(0 => 'news_story', 1 => 'news_topic' , 2 => 'news_file');
foreach ($created_tables as $ct) {
Modified: XoopsModules/fmcontent/branches/news/admin/index.php
===================================================================
--- XoopsModules/fmcontent/branches/news/admin/index.php 2012-01-09 20:02:45 UTC (rev 8690)
+++ XoopsModules/fmcontent/branches/news/admin/index.php 2012-01-10 05:29:25 UTC (rev 8691)
@@ -34,8 +34,11 @@
$folder = array(
XOOPS_ROOT_PATH . '/uploads/news/',
- XOOPS_ROOT_PATH . '/uploads/news/img',
- XOOPS_ROOT_PATH . '/uploads/news/file'
+ XOOPS_ROOT_PATH . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ),
+ XOOPS_ROOT_PATH . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/thumb/',
+ XOOPS_ROOT_PATH . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/medium/',
+ XOOPS_ROOT_PATH . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/original/',
+ XOOPS_ROOT_PATH . xoops_getModuleOption ( 'file_dir', $NewsModule->getVar ( 'dirname' ) )
);
$story_infos = array(
Modified: XoopsModules/fmcontent/branches/news/index.php
===================================================================
--- XoopsModules/fmcontent/branches/news/index.php 2012-01-09 20:02:45 UTC (rev 8690)
+++ XoopsModules/fmcontent/branches/news/index.php 2012-01-10 05:29:25 UTC (rev 8691)
@@ -84,12 +84,14 @@
$topic_alias = $default_alias = $view_topic->getVar ( 'topic_alias' );
$topic_id = $default_id = $view_topic->getVar ( 'topic_id' );
$topic_img = $view_topic->getVar ( 'topic_img' );
- $topic_imgurl = XOOPS_URL . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . $view_topic->getVar ( 'topic_img' );
+ $topic_thumb = XOOPS_URL . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/thumb/'. $view_topic->getVar ( 'topic_img' );
+ $topic_medium = XOOPS_URL . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/medium/'. $view_topic->getVar ( 'topic_img' );
$topic_desc = $view_topic->getVar ( 'topic_desc' );
$xoopsTpl->assign ( 'topic_desc', $topic_desc );
$xoopsTpl->assign ( 'topic_img', $topic_img );
- $xoopsTpl->assign ( 'topic_imgurl', $topic_imgurl );
+ $xoopsTpl->assign ( 'topic_thumb', $topic_thumb );
+ $xoopsTpl->assign ( 'topic_medium', $topic_medium );
$xoopsTpl->assign ( 'topic_title', $topic_title );
$xoopsTpl->assign ( 'xoops_pagetitle', $topic_title );
Modified: XoopsModules/fmcontent/branches/news/templates/news_index.html
===================================================================
--- XoopsModules/fmcontent/branches/news/templates/news_index.html 2012-01-09 20:02:45 UTC (rev 8690)
+++ XoopsModules/fmcontent/branches/news/templates/news_index.html 2012-01-10 05:29:25 UTC (rev 8691)
@@ -20,15 +20,16 @@
<{if $topic_img}>
<div class="itemImg gallery">
<{if $img_lightbox}>
- <a href="<{$topic_imgurl}>" title="<{$topic_title}>" >
- <img width="<{$imgwidth}>" class="<{$imgfloat}> story_img" src="<{$topic_imgurl}>" alt="<{$topic_title}>"/>
+ <a href="<{$topic_medium}>" title="<{$topic_title}>" >
+ <img width="<{$imgwidth}>" class="<{$imgfloat}> story_img" src="<{$topic_thumb}>" alt="<{$topic_title}>"/>
</a>
<{else}>
- <img width="<{$imgwidth}>" class="<{$imgfloat}> story_img" src="<{$topic_imgurl}>" alt="<{$topic_title}>"/>
+ <img width="<{$imgwidth}>" class="<{$imgfloat}> story_img" src="<{$topic_thumb}>" alt="<{$topic_title}>"/>
<{/if}>
</div>
<{/if}>
<{$topic_desc}>
+ <div class="clear"></div>
</div>
<{/if}>
<{/if}>
Modified: XoopsModules/fmcontent/branches/news/xoops_version.php
===================================================================
--- XoopsModules/fmcontent/branches/news/xoops_version.php 2012-01-09 20:02:45 UTC (rev 8690)
+++ XoopsModules/fmcontent/branches/news/xoops_version.php 2012-01-10 05:29:25 UTC (rev 8691)
@@ -63,14 +63,6 @@
'min_admin' => '1.1'
);
-//Sql file
-$modversion["sqlfile"]["mysql"] = "sql/mysql.sql";
-$modversion["tables"] = array(
- "news_story",
- "news_topic",
- "news_file",
-);
-
//Recherche
$modversion["search"]["file"] = "include/search.inc.php";
$modversion["search"]["func"] = "news_search";
@@ -516,7 +508,7 @@
'description' => '_NEWS_MI_FILE_DIR_DESC',
'formtype' => 'textbox',
'valuetype' => 'text',
- 'default' => "/uploads/news/file/");
+ 'default' => "/uploads/news/file");
$modversion['config'][] = array(
'name' => 'file_size',
@@ -548,7 +540,7 @@
'description' => '_NEWS_MI_IMAGE_DIR_DESC',
'formtype' => 'textbox',
'valuetype' => 'text',
- 'default' => "/uploads/news/img/");
+ 'default' => "/uploads/news/image");
$modversion['config'][] = array(
'name' => 'img_size',
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2012-01-10 05:41:42
|
Revision: 8692
http://xoops.svn.sourceforge.net/xoops/?rev=8692&view=rev
Author: voltan1
Date: 2012-01-10 05:41:35 +0000 (Tue, 10 Jan 2012)
Log Message:
-----------
Add language
Modified Paths:
--------------
XoopsModules/fmcontent/branches/news/admin/tools.php
XoopsModules/fmcontent/branches/news/language/arabic/admin.php
XoopsModules/fmcontent/branches/news/language/english/admin.php
XoopsModules/fmcontent/branches/news/language/persian/admin.php
Modified: XoopsModules/fmcontent/branches/news/admin/tools.php
===================================================================
--- XoopsModules/fmcontent/branches/news/admin/tools.php 2012-01-10 05:29:25 UTC (rev 8691)
+++ XoopsModules/fmcontent/branches/news/admin/tools.php 2012-01-10 05:41:35 UTC (rev 8692)
@@ -117,7 +117,7 @@
foreach ($topics_arr as $onetopic) {
$topiclist->addOption($onetopic->getVar ( 'topic_id' ),$onetopic->getVar ( 'topic_title', 'e' ));
}
- $topiclist->setDescription(_NEWS_AM_TOOLS_EXPORT_PRUNE_DSC);
+ $topiclist->setDescription(_NEWS_AM_TOOLS_PRUNE_EXPORT_DSC);
$form->addElement($topiclist,false);
$form->addElement(new XoopsFormHidden('op', 'prune'));
$form->addElement(new XoopsFormButton('', 'post', _SUBMIT, 'submit'));
Modified: XoopsModules/fmcontent/branches/news/language/arabic/admin.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/arabic/admin.php 2012-01-10 05:29:25 UTC (rev 8691)
+++ XoopsModules/fmcontent/branches/news/language/arabic/admin.php 2012-01-10 05:41:35 UTC (rev 8692)
@@ -138,7 +138,11 @@
define('_NEWS_AM_TOOLS_META_TITLE', 'Rebuild Metas');
define('_NEWS_AM_TOOLS_META_KEYWORD', 'Rebuild Meta keywords');
define('_NEWS_AM_TOOLS_META_DESCRIPTION', 'Rebuild Meta Description');
- define('_NEWS_AM_MSG_INPROC', 'Rebuilding ... ');
+ define('_NEWS_AM_TOOLS_PRUNE', 'Prune news');
+ define('_NEWS_AM_TOOLS_PRUNE_BEFORE', 'Prune stories that were published before');
+ define('_NEWS_AM_TOOLS_PRUNE_EXPIREDONLY', 'Only remove stories who have expired');
+ define('_NEWS_AM_TOOLS_PRUNE_TOPICS', 'Limit to the following topics');
+ define('_NEWS_AM_TOOLS_PRUNE_EXPORT_DSC', 'If you dont check anything then all the topics will be used else only the selected topics will be used');
// Permissions
define('_NEWS_AM_PERMISSIONS_ACCESS', 'إتاحة العرض');
define('_NEWS_AM_PERMISSIONS_SUBMIT', 'إتاحة الإرسال');
@@ -168,6 +172,7 @@
define('_NEWS_AM_MSG_CLONE_ERROR', 'هذا الدليل هو متاح الآن !');
define("_NEWS_AM_MSG_NOPERMSSET", "لایمکن تعدیل الإتاحات: لم یتم تحدیث أي فئة ! الرجاء تحدیث فئة أولا.");
define('_NEWS_AM_MSG_ALIASERROR', 'لقد تم اختیار هذا الإسم. الرجاء اختیار اسم آخر.');
+ define('_NEWS_AM_MSG_INPROC', 'Rebuilding ... ');
define('_NEWS_AM_MSG_PRUNE_DELETED', '%s Articles deleted');
// about
define('_NEWS_AM_ABOUT_ADMIN', 'درباره');
Modified: XoopsModules/fmcontent/branches/news/language/english/admin.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/english/admin.php 2012-01-10 05:29:25 UTC (rev 8691)
+++ XoopsModules/fmcontent/branches/news/language/english/admin.php 2012-01-10 05:41:35 UTC (rev 8692)
@@ -137,7 +137,12 @@
define('_NEWS_AM_TOOLS_ALIAS_TOPIC', 'Rebuild topic alias');
define('_NEWS_AM_TOOLS_META_TITLE', 'Rebuild Metas');
define('_NEWS_AM_TOOLS_META_KEYWORD', 'Rebuild Meta keywords');
- define('_NEWS_AM_TOOLS_META_DESCRIPTION', 'Rebuild Meta Description');
+ define('_NEWS_AM_TOOLS_META_DESCRIPTION', 'Rebuild Meta Description');
+ define('_NEWS_AM_TOOLS_PRUNE', 'Prune news');
+ define('_NEWS_AM_TOOLS_PRUNE_BEFORE', 'Prune stories that were published before');
+ define('_NEWS_AM_TOOLS_PRUNE_EXPIREDONLY', 'Only remove stories who have expired');
+ define('_NEWS_AM_TOOLS_PRUNE_TOPICS', 'Limit to the following topics');
+ define('_NEWS_AM_TOOLS_PRUNE_EXPORT_DSC', 'If you dont check anything then all the topics will be used else only the selected topics will be used');
// Permissions
define('_NEWS_AM_PERMISSIONS_ACCESS', 'Access permissions');
define('_NEWS_AM_PERMISSIONS_SUBMIT', 'Submit permissions');
Modified: XoopsModules/fmcontent/branches/news/language/persian/admin.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/persian/admin.php 2012-01-10 05:29:25 UTC (rev 8691)
+++ XoopsModules/fmcontent/branches/news/language/persian/admin.php 2012-01-10 05:41:35 UTC (rev 8692)
@@ -138,7 +138,11 @@
define('_NEWS_AM_TOOLS_META_TITLE', 'Rebuild Metas');
define('_NEWS_AM_TOOLS_META_KEYWORD', 'Rebuild Meta keywords');
define('_NEWS_AM_TOOLS_META_DESCRIPTION', 'Rebuild Meta Description');
- define('_NEWS_AM_MSG_INPROC', 'Rebuilding ... ');
+ define('_NEWS_AM_TOOLS_PRUNE', 'Prune news');
+ define('_NEWS_AM_TOOLS_PRUNE_BEFORE', 'Prune stories that were published before');
+ define('_NEWS_AM_TOOLS_PRUNE_EXPIREDONLY', 'Only remove stories who have expired');
+ define('_NEWS_AM_TOOLS_PRUNE_TOPICS', 'Limit to the following topics');
+ define('_NEWS_AM_TOOLS_PRUNE_EXPORT_DSC', 'If you dont check anything then all the topics will be used else only the selected topics will be used');
// Permissions
define('_NEWS_AM_PERMISSIONS_ACCESS', 'دسترسی نمایش');
define('_NEWS_AM_PERMISSIONS_SUBMIT', 'دسترسی ارسال');
@@ -168,6 +172,7 @@
define('_NEWS_AM_MSG_CLONE_ERROR', 'این شاخه هماکنون موجود است!');
define("_NEWS_AM_MSG_NOPERMSSET", "هیچ دسترسی قابل تنظیم نیست : هنوز هیچ شاخه ای ساخته نشده است! لطفا ابتدا یک شاخه بسازید.");
define('_NEWS_AM_MSG_ALIASERROR', 'نام مستعار مورد انتخاب شما گرفته شده است. لطفا یک نام دیگر انتخاب کنید.');
+ define('_NEWS_AM_MSG_INPROC', 'Rebuilding ... ');
define('_NEWS_AM_MSG_PRUNE_DELETED', '%s Articles deleted');
// about
define('_NEWS_AM_ABOUT_ADMIN', 'درباره');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2012-01-10 08:37:31
|
Revision: 8693
http://xoops.svn.sourceforge.net/xoops/?rev=8693&view=rev
Author: voltan1
Date: 2012-01-10 08:37:21 +0000 (Tue, 10 Jan 2012)
Log Message:
-----------
Add update script from old news module. it not complated
Modified Paths:
--------------
XoopsModules/fmcontent/branches/news/admin/action.module.php
XoopsModules/fmcontent/branches/news/xoops_version.php
Added Paths:
-----------
XoopsModules/fmcontent/branches/news/include/functions_install.php
XoopsModules/fmcontent/branches/news/include/functions_uninstall.php
XoopsModules/fmcontent/branches/news/include/functions_update.php
Modified: XoopsModules/fmcontent/branches/news/admin/action.module.php
===================================================================
--- XoopsModules/fmcontent/branches/news/admin/action.module.php 2012-01-10 05:41:35 UTC (rev 8692)
+++ XoopsModules/fmcontent/branches/news/admin/action.module.php 2012-01-10 08:37:21 UTC (rev 8693)
@@ -19,153 +19,10 @@
* @version $Id$
*/
-function xoops_module_pre_install_news($module) {
-
- $db = $GLOBALS["xoopsDB"];
- $error = false;
-
- /*
- if (substr(XOOPS_VERSION, 0, 9) < "XOOPS 2.5") {
- $module->setErrors("The module only works for XOOPS 2.5+");
- return false;
- }
- */
- $sqlfile = array('mysql' => 'sql/mysql.sql');
-
- $modsDirname = 'news';
- $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");
- }
-
- if (is_array($sqlfile) && !empty($sqlfile[XOOPS_DB_TYPE])) {
- $sql_file_path = XOOPS_ROOT_PATH . "/modules/" . $modsDirname . "/" . $sqlfile[XOOPS_DB_TYPE];
-
- if (!file_exists($sql_file_path)) {
- $module->setErrors("<p>" . sprintf(_NEWS_MI_SQL_NOT_FOUND, "<strong>{$sql_file_path}</strong>"));
- $error = true;
- } else {
- $msgs[] = "<p>" . sprintf(_NEWS_MI_SQL_FOUND, "<strong>{$sql_file_path}</strong>") . "<br />" . _NEWS_MI_CREATE_TABLES;
- require_once $GLOBALS['xoops']->path('/class/database/sqlutility.php');
- $sql_query = fread(fopen($sql_file_path, 'r'), filesize($sql_file_path));
- $sql_query = trim($sql_query);
- SqlUtility::splitMySqlFile($pieces, $sql_query);
- $created_tables = array();
- foreach ($pieces as $piece) {
- // [0] contains the prefixed query
- // [4] contains unprefixed table name
- $prefixed_query = SqlUtility::prefixQuery($piece, $db->prefix());
- if (!$prefixed_query) {
- $module->setErrors("<p>" . sprintf(_NEWS_MI_SQL_NOT_VALID, "<strong>" . $piece . "</strong>"));
- $error = true;
- break;
- }
-
- if (!isset($reservedTables)) {
- $reservedTables = array();
- }
- // check if the table name is reserved
- if (!in_array($prefixed_query[4], $reservedTables)) {
- // not reserved, so try to create one
- if (!$db->query($prefixed_query[0])) {
- $errs[] = $db->error();
- $error = true;
- break;
- } else {
- if (!in_array($prefixed_query[4], $created_tables)) {
- $msgs[] = " " . sprintf(_NEWS_MI_TABLE_CREATED, "<strong>" . $db->prefix($prefixed_query[4]) . "</strong>");
- $created_tables[] = $prefixed_query[4];
- } else {
- $msgs[] = " " . sprintf(_NEWS_MI_INSERT_DATA, "<strong>" . $db->prefix($prefixed_query[4]) . "</strong>");
- }
- }
- } else {
- // the table name is reserved, so halt the installation
- $module->setErrors(" " . sprintf(_NEWS_MI_TABLE_RESERVED, "<strong>" . $prefixed_query[4] . "</strong>"));
- $error = true;
- break;
- }
- }
- // if there was an error, delete the tables created so far, so the next installation will not fail
- if ($error == true) {
- foreach ($created_tables as $ct) {
- $db->query("DROP TABLE " . $db->prefix($ct));
- }
- return false;
- }
- }
- return true;
- }
- return false;
-}
-function xoops_module_update_news($module, $version) {
-}
-function xoops_module_uninstall_news($module) {
- $db =& $GLOBALS["xoopsDB"];
-
- $created_tables = array(0 => 'news_story', 1 => 'news_topic' , 2 => 'news_file');
-
- foreach ($created_tables as $ct) {
- $db->query("DROP TABLE " . $db->prefix($ct));
- }
- return true;
-
-}
-
?>
\ No newline at end of file
Added: XoopsModules/fmcontent/branches/news/include/functions_install.php
===================================================================
--- XoopsModules/fmcontent/branches/news/include/functions_install.php (rev 0)
+++ XoopsModules/fmcontent/branches/news/include/functions_install.php 2012-01-10 08:37:21 UTC (rev 8693)
@@ -0,0 +1,155 @@
+<?php
+/*
+ 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.
+*/
+
+/**
+ * News action script file
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Andricq Nicolas (AKA MusS)
+ * @author Hossein Azizabadi (AKA Voltan)
+ * @version $Id$
+ */
+
+function xoops_module_pre_install_news($module) {
+
+
+ $db = $GLOBALS["xoopsDB"];
+ $error = false;
+
+ /*
+ if (substr(XOOPS_VERSION, 0, 9) < "XOOPS 2.5") {
+ $module->setErrors("The module only works for XOOPS 2.5+");
+ return false;
+ }
+ */
+ $sqlfile = array('mysql' => 'sql/mysql.sql');
+
+ $modsDirname = basename(dirname(dirname(__FILE__)));
+ $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");
+ }
+
+ if (is_array($sqlfile) && !empty($sqlfile[XOOPS_DB_TYPE])) {
+ $sql_file_path = XOOPS_ROOT_PATH . "/modules/" . $modsDirname . "/" . $sqlfile[XOOPS_DB_TYPE];
+
+ if (!file_exists($sql_file_path)) {
+ $module->setErrors("<p>" . sprintf(_NEWS_MI_SQL_NOT_FOUND, "<strong>{$sql_file_path}</strong>"));
+ $error = true;
+ } else {
+ $msgs[] = "<p>" . sprintf(_NEWS_MI_SQL_FOUND, "<strong>{$sql_file_path}</strong>") . "<br />" . _NEWS_MI_CREATE_TABLES;
+
+ require_once $GLOBALS['xoops']->path('/class/database/sqlutility.php');
+ $sql_query = fread(fopen($sql_file_path, 'r'), filesize($sql_file_path));
+ $sql_query = trim($sql_query);
+ SqlUtility::splitMySqlFile($pieces, $sql_query);
+ $created_tables = array();
+ foreach ($pieces as $piece) {
+ // [0] contains the prefixed query
+ // [4] contains unprefixed table name
+ $prefixed_query = SqlUtility::prefixQuery($piece, $db->prefix());
+ if (!$prefixed_query) {
+ $module->setErrors("<p>" . sprintf(_NEWS_MI_SQL_NOT_VALID, "<strong>" . $piece . "</strong>"));
+ $error = true;
+ break;
+ }
+
+ if (!isset($reservedTables)) {
+ $reservedTables = array();
+ }
+ // check if the table name is reserved
+ if (!in_array($prefixed_query[4], $reservedTables)) {
+ // not reserved, so try to create one
+ if (!$db->query($prefixed_query[0])) {
+ $errs[] = $db->error();
+ $error = true;
+ break;
+ } else {
+ if (!in_array($prefixed_query[4], $created_tables)) {
+ $msgs[] = " " . sprintf(_NEWS_MI_TABLE_CREATED, "<strong>" . $db->prefix($prefixed_query[4]) . "</strong>");
+ $created_tables[] = $prefixed_query[4];
+ } else {
+ $msgs[] = " " . sprintf(_NEWS_MI_INSERT_DATA, "<strong>" . $db->prefix($prefixed_query[4]) . "</strong>");
+ }
+ }
+ } else {
+ // the table name is reserved, so halt the installation
+ $module->setErrors(" " . sprintf(_NEWS_MI_TABLE_RESERVED, "<strong>" . $prefixed_query[4] . "</strong>"));
+ $error = true;
+ break;
+ }
+ }
+ // if there was an error, delete the tables created so far, so the next installation will not fail
+ if ($error == true) {
+ foreach ($created_tables as $ct) {
+ $db->query("DROP TABLE " . $db->prefix($ct));
+ }
+ return false;
+ }
+ }
+ return true;
+ }
+ return false;
+}
+
+?>
\ No newline at end of file
Added: XoopsModules/fmcontent/branches/news/include/functions_uninstall.php
===================================================================
--- XoopsModules/fmcontent/branches/news/include/functions_uninstall.php (rev 0)
+++ XoopsModules/fmcontent/branches/news/include/functions_uninstall.php 2012-01-10 08:37:21 UTC (rev 8693)
@@ -0,0 +1,34 @@
+<?php
+/*
+ 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.
+*/
+
+/**
+ * News action script file
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Andricq Nicolas (AKA MusS)
+ * @author Hossein Azizabadi (AKA Voltan)
+ * @version $Id$
+ */
+
+function xoops_module_uninstall_news($module) {
+ $db =& $GLOBALS["xoopsDB"];
+
+ $created_tables = array(0 => 'news_story', 1 => 'news_topic' , 2 => 'news_file');
+
+ foreach ($created_tables as $ct) {
+ $db->query("DROP TABLE " . $db->prefix($ct));
+ }
+ return true;
+
+}
+
+?>
\ No newline at end of file
Added: XoopsModules/fmcontent/branches/news/include/functions_update.php
===================================================================
--- XoopsModules/fmcontent/branches/news/include/functions_update.php (rev 0)
+++ XoopsModules/fmcontent/branches/news/include/functions_update.php 2012-01-10 08:37:21 UTC (rev 8693)
@@ -0,0 +1,317 @@
+<?php
+/*
+ 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.
+*/
+
+/**
+ * News action script file
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Hossein Azizabadi (AKA Voltan)
+ * @version $Id$
+ */
+
+/**
+ * This function work just for update version 1.68 ( or 1.66 ) to version 1.8 and upper.
+ * If your version is under 1.68 ( or 1.66 ) please frist update your old version to 1.68.
+ */
+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;
+ }
+ }
+
+ 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;
+ }
+ }
+
+ //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;
+ }
+
+ $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;
+ }
+
+ // 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;
+ }
+ }
+
+ // 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);
+ }
+ }
+ unset($comments);
+ }
+
+ }
+ // end
+}
+
+?>
\ No newline at end of file
Modified: XoopsModules/fmcontent/branches/news/xoops_version.php
===================================================================
--- XoopsModules/fmcontent/branches/news/xoops_version.php 2012-01-10 05:41:35 UTC (rev 8692)
+++ XoopsModules/fmcontent/branches/news/xoops_version.php 2012-01-10 08:37:21 UTC (rev 8693)
@@ -44,9 +44,9 @@
'adminindex' => 'admin/index.php',
'adminmenu' => 'admin/menu.php',
// Modules scripts
- 'onInstall' => 'admin/action.module.php',
- 'onUpdate' => 'admin/action.module.php',
- 'onUninstall' => 'admin/action.module.php',
+ 'onInstall' => 'include/functions_install.php',
+ 'onUpdate' => 'include/functions_update.php',
+ 'onUninstall' => 'include/functions_uninstall.php',
// Main menu
'hasMain' => 1,
// Recherche
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
|
From: <vo...@us...> - 2012-01-15 07:41:17
|
Revision: 8730
http://xoops.svn.sourceforge.net/xoops/?rev=8730&view=rev
Author: voltan1
Date: 2012-01-15 07:41:11 +0000 (Sun, 15 Jan 2012)
Log Message:
-----------
Fix index
Modified Paths:
--------------
XoopsModules/fmcontent/branches/news/index.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/xoops_version.php
Modified: XoopsModules/fmcontent/branches/news/index.php
===================================================================
--- XoopsModules/fmcontent/branches/news/index.php 2012-01-15 07:08:34 UTC (rev 8729)
+++ XoopsModules/fmcontent/branches/news/index.php 2012-01-15 07:41:11 UTC (rev 8730)
@@ -119,7 +119,7 @@
} else {
// get all topic informations
- $topics = $topic_handler->getall ( $story_topic );
+ $topics = $topic_handler->getall ();
$default_title = xoops_getModuleOption ( 'static_name', $NewsModule->getVar ( 'dirname' ) );
$default_alias = NewsUtils::News_AliasFilter($default_title);
$topic_id = $default_id = '0';
Modified: XoopsModules/fmcontent/branches/news/language/arabic/modinfo.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/arabic/modinfo.php 2012-01-15 07:08:34 UTC (rev 8729)
+++ XoopsModules/fmcontent/branches/news/language/arabic/modinfo.php 2012-01-15 07:41:11 UTC (rev 8730)
@@ -42,7 +42,10 @@
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");
+ define("_NEWS_MI_ADMINGROUPS_DESC", "Which groups have access to tools and permissions page");
+// Group Access
+ define('_NEWS_MI_GROUPS','اتاحة المجموعات');
+ define('_NEWS_MI_GROUPS_DESC', 'عین الإتاحة الکلیة للمجموعات.');
// Urls
define('_NEWS_MI_FRIENDLYURL','تحدید عنوان مفضل للمستخدمین');
define('_NEWS_MI_FRIENDLYURL_DESC', 'Select the URL rewrite mode you want to use.<ul>
Modified: XoopsModules/fmcontent/branches/news/language/english/modinfo.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/english/modinfo.php 2012-01-15 07:08:34 UTC (rev 8729)
+++ XoopsModules/fmcontent/branches/news/language/english/modinfo.php 2012-01-15 07:41:11 UTC (rev 8730)
@@ -42,7 +42,10 @@
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");
+ define("_NEWS_MI_ADMINGROUPS_DESC", "Which groups have access to tools and permissions page");
+// Group Access
+ define('_NEWS_MI_GROUPS', 'Groups access');
+ define('_NEWS_MI_GROUPS_DESC', 'Select general access permission for groups.');
// Urls
define('_NEWS_MI_FRIENDLYURL', 'URL rewrite method');
define('_NEWS_MI_FRIENDLYURL_DESC', 'Select the URL rewrite mode you want to use.<ul>
Modified: XoopsModules/fmcontent/branches/news/language/persian/modinfo.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/persian/modinfo.php 2012-01-15 07:08:34 UTC (rev 8729)
+++ XoopsModules/fmcontent/branches/news/language/persian/modinfo.php 2012-01-15 07:41:11 UTC (rev 8730)
@@ -42,7 +42,10 @@
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");
+ define("_NEWS_MI_ADMINGROUPS_DESC", "Which groups have access to tools and permissions page");
+// Group Access
+ define('_NEWS_MI_GROUPS', 'دسترسی گروه ها');
+ define('_NEWS_MI_GROUPS_DESC', 'دسترسی سراسری گروه ها را مشخص کنید.');
// Urls
define('_NEWS_MI_FRIENDLYURL', 'انتخاب آدرس کاربر پسند');
define('_NEWS_MI_FRIENDLYURL_DESC', 'Select the URL rewrite mode you want to use.<ul>
Modified: XoopsModules/fmcontent/branches/news/xoops_version.php
===================================================================
--- XoopsModules/fmcontent/branches/news/xoops_version.php 2012-01-15 07:08:34 UTC (rev 8729)
+++ XoopsModules/fmcontent/branches/news/xoops_version.php 2012-01-15 07:41:11 UTC (rev 8730)
@@ -150,22 +150,36 @@
'default' => 'dhtmltextarea');
// Get groups
-
-$criteria = new CriteriaCompo ();
-$criteria->add ( new Criteria ( 'group_type', 'Admin' ) );
$member_handler =& xoops_gethandler('member');
-$xoopsgroups = $member_handler->getGroupList($criteria);
+$xoopsgroups = $member_handler->getGroupList();
foreach ($xoopsgroups as $key => $group) {
$groups[$group] = $key;
}
$modversion['config'][] = array(
+ 'name' => 'groups',
+ 'title' => '_NEWS_MI_GROUPS',
+ 'description' => '_NEWS_MI_GROUPS_DESC',
+ 'formtype' => 'select_multi',
+ 'valuetype' => 'array',
+ 'options' => $groups,
+ 'default' => $groups);
+
+// Get Admin groups
+$criteria = new CriteriaCompo ();
+$criteria->add ( new Criteria ( 'group_type', 'Admin' ) );
+$member_handler =& xoops_gethandler('member');
+$admin_xoopsgroups = $member_handler->getGroupList($criteria);
+foreach ($admin_xoopsgroups as $key => $admin_group) {
+ $admin_groups[$admin_group] = $key;
+}
+$modversion['config'][] = array(
'name' => 'admin_groups',
'title' => '_NEWS_MI_ADMINGROUPS',
'description' => '_NEWS_MI_ADMINGROUPS_DESC',
'formtype' => 'select_multi',
'valuetype' => 'array',
- 'options' => $groups,
- 'default' => $groups);
+ 'options' => $admin_groups,
+ 'default' => $admin_groups);
$modversion['config'][] = array(
'name' => 'editinplace',
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2012-01-18 11:25:38
|
Revision: 8751
http://xoops.svn.sourceforge.net/xoops/?rev=8751&view=rev
Author: voltan1
Date: 2012-01-18 11:25:27 +0000 (Wed, 18 Jan 2012)
Log Message:
-----------
Fix some problems
Modified Paths:
--------------
XoopsModules/fmcontent/branches/news/admin/backend.php
XoopsModules/fmcontent/branches/news/class/file.php
XoopsModules/fmcontent/branches/news/submit.php
XoopsModules/fmcontent/branches/news/templates/news_archive.html
XoopsModules/fmcontent/branches/news/templates/news_topic.html
Modified: XoopsModules/fmcontent/branches/news/admin/backend.php
===================================================================
--- XoopsModules/fmcontent/branches/news/admin/backend.php 2012-01-18 05:24:13 UTC (rev 8750)
+++ XoopsModules/fmcontent/branches/news/admin/backend.php 2012-01-18 11:25:27 UTC (rev 8751)
@@ -178,7 +178,7 @@
}
// file
- if($_REQUEST ['file_name']) {
+ if(isset($_REQUEST['xoops_upload_file'])) {
$fileobj = $file_handler->create ();
$fileobj->setVar ( 'file_date', time () );
$fileobj->setVar ( 'file_modid', $NewsModule->getVar ( 'mid' ) );
@@ -274,7 +274,7 @@
}
// file
- if($_REQUEST ['file_name']) {
+ if(isset($_REQUEST['xoops_upload_file'])) {
$fileobj = $file_handler->create ();
$fileobj->setVar ( 'file_date', time () );
$fileobj->setVar ( 'file_modid', $NewsModule->getVar ( 'mid' ) );
Modified: XoopsModules/fmcontent/branches/news/class/file.php
===================================================================
--- XoopsModules/fmcontent/branches/news/class/file.php 2012-01-18 05:24:13 UTC (rev 8750)
+++ XoopsModules/fmcontent/branches/news/class/file.php 2012-01-18 11:25:27 UTC (rev 8751)
@@ -169,7 +169,7 @@
foreach ( $files as $root ) {
$tab = array ();
$tab = $root->toArray ();
- $tab ['fileurl'] = XOOPS_URL . xoops_getModuleOption ( 'file_dir', $NewsModule->getVar ( 'dirname' ) ) . $root->getVar ( 'file_name' );
+ $tab ['fileurl'] = XOOPS_URL . xoops_getModuleOption ( 'file_dir', $NewsModule->getVar ( 'dirname' ) ) . '/' . $root->getVar ( 'file_name' );
$ret [] = $tab;
}
}
Modified: XoopsModules/fmcontent/branches/news/submit.php
===================================================================
--- XoopsModules/fmcontent/branches/news/submit.php 2012-01-18 05:24:13 UTC (rev 8750)
+++ XoopsModules/fmcontent/branches/news/submit.php 2012-01-18 11:25:27 UTC (rev 8751)
@@ -73,6 +73,7 @@
$obj->setVar ( 'story_desc', NewsUtils::News_AjaxFilter ( $_REQUEST ['story_title'] ) );
$obj->setVar ( 'story_create', time () );
$obj->setVar ( 'story_update', time () );
+ $obj->setVar ( 'story_publish', time () );
$obj->setVar ( 'story_groups', $groups );
//Form topic_img
@@ -99,7 +100,7 @@
}
// file
- if($_REQUEST ['file_name']) {
+ if(isset($_REQUEST['xoops_upload_file'])) {
$fileobj = $file_handler->create ();
$fileobj->setVar ( 'file_date', time () );
$fileobj->setVar ( 'file_modid', $NewsModule->getVar ( 'mid' ) );
Modified: XoopsModules/fmcontent/branches/news/templates/news_archive.html
===================================================================
--- XoopsModules/fmcontent/branches/news/templates/news_archive.html 2012-01-18 05:24:13 UTC (rev 8750)
+++ XoopsModules/fmcontent/branches/news/templates/news_archive.html 2012-01-18 11:25:27 UTC (rev 8751)
@@ -1,6 +1,6 @@
<div class="news-archive">
<div class="pad2 marg2">
- <table>
+ <table class="outer">
<tr>
<th><{$smarty.const._NEWS_MD_ARCHIVE}></th>
</tr>
Modified: XoopsModules/fmcontent/branches/news/templates/news_topic.html
===================================================================
--- XoopsModules/fmcontent/branches/news/templates/news_topic.html 2012-01-18 05:24:13 UTC (rev 8750)
+++ XoopsModules/fmcontent/branches/news/templates/news_topic.html 2012-01-18 11:25:27 UTC (rev 8751)
@@ -2,7 +2,7 @@
<{if $advertisement}>
<div class="itemAde"><{$advertisement}></div>
<{/if}>
- <table id="xo-content-data" class="outer" cellspacing="1" width="100%">
+ <table class="outer">
<thead>
<th class="txtcenter"><{$smarty.const._NEWS_MD_TOPIC_NAME}></th>
<th class="txtcenter"><{$smarty.const._NEWS_MD_TOPIC_IMG}></th>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2012-01-19 07:35:47
|
Revision: 8756
http://xoops.svn.sourceforge.net/xoops/?rev=8756&view=rev
Author: voltan1
Date: 2012-01-19 07:35:40 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
Fix error in files
Modified Paths:
--------------
XoopsModules/fmcontent/branches/news/admin/backend.php
XoopsModules/fmcontent/branches/news/submit.php
Modified: XoopsModules/fmcontent/branches/news/admin/backend.php
===================================================================
--- XoopsModules/fmcontent/branches/news/admin/backend.php 2012-01-18 18:55:31 UTC (rev 8755)
+++ XoopsModules/fmcontent/branches/news/admin/backend.php 2012-01-19 07:35:40 UTC (rev 8756)
@@ -178,7 +178,7 @@
}
// file
- if(isset($_REQUEST['xoops_upload_file'])) {
+ if(isset($_REQUEST['file_name'])) {
$fileobj = $file_handler->create ();
$fileobj->setVar ( 'file_date', time () );
$fileobj->setVar ( 'file_modid', $NewsModule->getVar ( 'mid' ) );
Modified: XoopsModules/fmcontent/branches/news/submit.php
===================================================================
--- XoopsModules/fmcontent/branches/news/submit.php 2012-01-18 18:55:31 UTC (rev 8755)
+++ XoopsModules/fmcontent/branches/news/submit.php 2012-01-19 07:35:40 UTC (rev 8756)
@@ -100,7 +100,7 @@
}
// file
- if(isset($_REQUEST['xoops_upload_file'])) {
+ if(isset($_REQUEST['file_name'])) {
$fileobj = $file_handler->create ();
$fileobj->setVar ( 'file_date', time () );
$fileobj->setVar ( 'file_modid', $NewsModule->getVar ( 'mid' ) );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2012-01-19 08:09:36
|
Revision: 8757
http://xoops.svn.sourceforge.net/xoops/?rev=8757&view=rev
Author: voltan1
Date: 2012-01-19 08:09:27 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
Fix forms
Modified Paths:
--------------
XoopsModules/fmcontent/branches/news/admin/backend.php
XoopsModules/fmcontent/branches/news/class/story.php
XoopsModules/fmcontent/branches/news/class/topic.php
XoopsModules/fmcontent/branches/news/submit.php
Modified: XoopsModules/fmcontent/branches/news/admin/backend.php
===================================================================
--- XoopsModules/fmcontent/branches/news/admin/backend.php 2012-01-19 07:35:40 UTC (rev 8756)
+++ XoopsModules/fmcontent/branches/news/admin/backend.php 2012-01-19 08:09:27 UTC (rev 8757)
@@ -178,7 +178,7 @@
}
// file
- if(isset($_REQUEST['file_name'])) {
+ if(isset($_FILES['file_name']['name']) && !empty($_FILES['file_name']['name'])) {
$fileobj = $file_handler->create ();
$fileobj->setVar ( 'file_date', time () );
$fileobj->setVar ( 'file_modid', $NewsModule->getVar ( 'mid' ) );
@@ -274,7 +274,7 @@
}
// file
- if(isset($_REQUEST['xoops_upload_file'])) {
+ if(isset($_FILES['file_name']['name']) && !empty($_FILES['file_name']['name'])) {
$fileobj = $file_handler->create ();
$fileobj->setVar ( 'file_date', time () );
$fileobj->setVar ( 'file_modid', $NewsModule->getVar ( 'mid' ) );
Modified: XoopsModules/fmcontent/branches/news/class/story.php
===================================================================
--- XoopsModules/fmcontent/branches/news/class/story.php 2012-01-19 07:35:40 UTC (rev 8756)
+++ XoopsModules/fmcontent/branches/news/class/story.php 2012-01-19 08:09:27 UTC (rev 8757)
@@ -120,7 +120,7 @@
$form->addElement ( new XoopsFormHidden ( 'story_topic', 0 ) );
}
// Short
- $form->addElement ( new XoopsFormTextArea ( _NEWS_AM_CONTENT_SHORT, 'story_short', $this->getVar ( 'story_short', 'e' ), 5, 90 ) );
+ $form->addElement ( new XoopsFormTextArea ( _NEWS_AM_CONTENT_SHORT, 'story_short', $this->getVar ( 'story_short', 'e' ), 10, 90 ) );
// Editor
$editor_tray = new XoopsFormElementTray ( _NEWS_AM_CONTENT_FORMTEXT, '<br />' );
if (class_exists ( 'XoopsFormEditor' )) {
@@ -188,8 +188,8 @@
$file->setDescription ( _NEWS_AM_CONTENT_FILE_DESC );
$form->addElement ($file);
// Metas
- $form->addElement ( new XoopsFormTextArea ( 'Metas Keyword', 'story_words', $this->getVar ( 'story_words', 'e' ), 5, 90 ) );
- $form->addElement ( new XoopsFormTextArea ( 'Metas Description', 'story_desc', $this->getVar ( 'story_desc', 'e' ), 5, 90 ) );
+ $form->addElement ( new XoopsFormTextArea ( 'Metas Keyword', 'story_words', $this->getVar ( 'story_words', 'e' ), 3, 50 ) );
+ $form->addElement ( new XoopsFormTextArea ( 'Metas Description', 'story_desc', $this->getVar ( 'story_desc', 'e' ), 3, 50 ) );
// Content author
$form->addElement ( new XoopsFormText ( _NEWS_AM_CONTENT_FORMAUTHOR, 'story_author', 50, 255, $this->getVar ( 'story_author', 'e' ) ), false );
// Content Source
@@ -299,7 +299,7 @@
$form->addElement ( new XoopsFormHidden ( 'story_topic', 0 ) );
}
// Short
- $form->addElement ( new XoopsFormTextArea ( _NEWS_AM_CONTENT_SHORT, 'story_short', $this->getVar ( 'story_short', 'e' ), 5, 80 ) );
+ $form->addElement ( new XoopsFormTextArea ( _NEWS_AM_CONTENT_SHORT, 'story_short', $this->getVar ( 'story_short', 'e' ), 10, 80 ) );
// Editor
$editor_tray = new XoopsFormElementTray ( _NEWS_AM_CONTENT_FORMTEXT, '<br />' );
if (class_exists ( 'XoopsFormEditor' )) {
Modified: XoopsModules/fmcontent/branches/news/class/topic.php
===================================================================
--- XoopsModules/fmcontent/branches/news/class/topic.php 2012-01-19 07:35:40 UTC (rev 8756)
+++ XoopsModules/fmcontent/branches/news/class/topic.php 2012-01-19 08:09:27 UTC (rev 8757)
@@ -89,15 +89,14 @@
$criteria = new CriteriaCompo ();
$criteria->add ( new Criteria ( 'topic_modid', $NewsModule->getVar ( 'mid' ) ) );
$topic = $topic_Handler->getObjects ( $criteria );
- $tree = new XoopsObjectTree ( $topic, 'topic_id', 'topic_pid' );
- ob_start ();
- echo $tree->makeSelBox ( 'topic_pid', 'topic_title', '--', $this->getVar ( 'topic_pid', 'e' ), true );
- $form->addElement ( new XoopsFormLabel ( _NEWS_AM_TOPIC_PARENT, ob_get_contents () ) );
- ob_end_clean ();
-
- $form->addElement ( new XoopsFormTextArea ( _NEWS_AM_TOPIC_DESC, "topic_desc", $this->getVar ( "topic_desc" ), 5, 47 ), false );
- //$form->addElement ( new XoopsFormText ( _NEWS_AM_TOPIC_WEIGHT, "topic_weight", 5, 11, $this->getVar ( "topic_weight" ) ), false );
-
+ if($topic) {
+ $tree = new XoopsObjectTree ( $topic, 'topic_id', 'topic_pid' );
+ ob_start ();
+ echo $tree->makeSelBox ( 'topic_pid', 'topic_title', '--', $this->getVar ( 'topic_pid', 'e' ), true );
+ $form->addElement ( new XoopsFormLabel ( _NEWS_AM_TOPIC_PARENT, ob_get_contents () ) );
+ ob_end_clean ();
+ }
+ $form->addElement ( new XoopsFormTextArea ( _NEWS_AM_TOPIC_DESC, "topic_desc", $this->getVar ( "topic_desc" ), 8, 47 ), false );
// Image
$topic_img = $this->getVar ( 'topic_img' ) ? $this->getVar ( 'topic_img' ) : 'blank.gif';
$uploadirectory_topic_img = xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) );
Modified: XoopsModules/fmcontent/branches/news/submit.php
===================================================================
--- XoopsModules/fmcontent/branches/news/submit.php 2012-01-19 07:35:40 UTC (rev 8756)
+++ XoopsModules/fmcontent/branches/news/submit.php 2012-01-19 08:09:27 UTC (rev 8757)
@@ -100,7 +100,7 @@
}
// file
- if(isset($_REQUEST['file_name'])) {
+ if(isset($_FILES['file_name']['name']) && !empty($_FILES['file_name']['name'])) {
$fileobj = $file_handler->create ();
$fileobj->setVar ( 'file_date', time () );
$fileobj->setVar ( 'file_modid', $NewsModule->getVar ( 'mid' ) );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X