Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[8538] XoopsModules/fmcontent/branches/news
|
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] |
