|
From: <be...@us...> - 2014-04-25 12:16:08
|
Revision: 12485
http://sourceforge.net/p/xoops/svn/12485
Author: beckmi
Date: 2014-04-25 12:15:51 +0000 (Fri, 25 Apr 2014)
Log Message:
-----------
XOOPS 2.5.7 Module Pack update (work in progress): XoopsFAQ
Modified Paths:
--------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/admin/about.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/admin/admin_footer.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/admin/admin_header.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/admin/category.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/admin/contentsform.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/admin/index.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/admin/main.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/admin/menu.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/blocks/xoopsfaq_rand.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/class/category.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/class/contents.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/comment_delete.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/comment_edit.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/comment_new.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/comment_post.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/comment_reply.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/docs/changelog.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/footer.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/header.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/include/functions.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/include/rss.inc.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/include/search.inc.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/index.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/language/english/admin.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/language/english/blocks.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/language/english/main.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/language/english/modinfo.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/sql/mysql.sql
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/xoops_version.php
Added Paths:
-----------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/css/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/css/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/images/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/images/faq.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/images/folder.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/images/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/images/question.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/images/question2.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/images/slogo.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/js/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/js/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/include/module.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/templates/blocks/xoopsfaq_block_rand.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/templates/xoopsfaq_category.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/templates/xoopsfaq_index.tpl
Removed Paths:
-------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/css/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/images/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/language/schinese_utf8/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/templates/blocks/xoopsfaq_block_rand.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/templates/xoopsfaq_category.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/templates/xoopsfaq_index.html
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/admin/about.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/admin/about.php 2014-04-25 12:12:29 UTC (rev 12484)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/admin/about.php 2014-04-25 12:15:51 UTC (rev 12485)
@@ -28,4 +28,4 @@
echo $aboutAdmin->addNavigation('about.php');
echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false);
-include 'admin_footer.php';
\ No newline at end of file
+include 'admin_footer.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/admin/admin_footer.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/admin/admin_footer.php 2014-04-25 12:12:29 UTC (rev 12484)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/admin/admin_footer.php 2014-04-25 12:15:51 UTC (rev 12485)
@@ -21,7 +21,7 @@
." <div style='text-align: center;'>\n"
." <a href='http://www.xoops.org' target='_blank'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
." </div>\n"
- ." " . _AM_XOOPSFAQ_ADMIN_FOOTER . "\n"
+ ." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
."</div>";
-xoops_cp_footer();
\ No newline at end of file
+xoops_cp_footer();
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/admin/admin_header.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/admin/admin_header.php 2014-04-25 12:12:29 UTC (rev 12484)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/admin/admin_header.php 2014-04-25 12:15:51 UTC (rev 12485)
@@ -31,7 +31,6 @@
//if functions.php file exist
require_once dirname(dirname(__FILE__)) . '/include/functions.php';
-
// Load language files
xoops_loadLanguage('admin', $thisModuleDir);
xoops_loadLanguage('modinfo', $thisModuleDir);
@@ -41,8 +40,8 @@
$pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
-if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))){
+if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))) {
include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
- }else{
- redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false);
- }
\ No newline at end of file
+ } else {
+ redirect_header("../../../admin.php", 5, _AM_XOOPSFAQ_MODULEADMIN_MISSING, false);
+ }
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/admin/category.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/admin/category.php 2014-04-25 12:12:29 UTC (rev 12484)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/admin/category.php 2014-04-25 12:15:51 UTC (rev 12485)
@@ -93,4 +93,4 @@
$category_handler->displayAdminListing();
break;
}
-include_once 'admin_footer.php';
\ No newline at end of file
+include_once 'admin_footer.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/admin/contentsform.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/admin/contentsform.php 2014-04-25 12:12:29 UTC (rev 12484)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/admin/contentsform.php 2014-04-25 12:15:51 UTC (rev 12485)
@@ -34,9 +34,7 @@
* @version: $Id$
**/
-if (!defined('XOOPS_ROOT_PATH')) {
- die("Direct Access Denied");
-}
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
$checked = (1 == $contents_visible) ? " checked='checked'" : '';
@@ -89,4 +87,4 @@
." </td>\n"
." </tr>\n"
." </table>\n"
- ."</form>\n";
\ No newline at end of file
+ ."</form>\n";
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/admin/index.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/admin/index.php 2014-04-25 12:12:29 UTC (rev 12484)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/admin/index.php 2014-04-25 12:15:51 UTC (rev 12485)
@@ -71,4 +71,4 @@
echo $index_admin->renderIndex();
include 'admin_footer.php';
-xoops_cp_footer();
\ No newline at end of file
+xoops_cp_footer();
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/admin/main.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/admin/main.php 2014-04-25 12:12:29 UTC (rev 12484)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/admin/main.php 2014-04-25 12:15:51 UTC (rev 12485)
@@ -87,6 +87,16 @@
$contents_handler->displayError($ret);
break;
+ case 'toggle':
+ if (isset($_REQUEST['content_id'])) {
+ $id = intval($_REQUEST['content_id']);
+ if (isset($_REQUEST['active'])) {
+ $active = intval($_REQUEST['active']);
+ faq_active_toggle($id, $active);
+ }
+ }
+ break;
+
case 'default':
default:
$indexAdmin = new ModuleAdmin();
@@ -100,4 +110,19 @@
$contents_handler->displayAdminListing();
break;
}
-include_once 'admin_footer.php';
\ No newline at end of file
+
+function faq_active_toggle($id, $active)
+{
+ $active = ($active == 1) ? 0 : 1;
+ $this_handler =& xoops_getModuleHandler('contents', 'xoopsfaq');
+ $obj = $this_handler->get($id);
+ $obj->setVar('contents_active', $active);
+ if ($this_handler->insert($obj, true)) {
+ redirect_header('main.php', 1, _AM_XOOPSFAQ_ACTIVE_TOGGLE_SUCCESS);
+ } else {
+ redirect_header('main.php', 1, _AM_XOOPSFAQ_ACTIVE_TOGGLE_FAILED);
+ }
+
+}
+
+include_once 'admin_footer.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/admin/menu.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/admin/menu.php 2014-04-25 12:12:29 UTC (rev 12484)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/admin/menu.php 2014-04-25 12:15:51 UTC (rev 12485)
@@ -26,7 +26,7 @@
$pathIcon32 = $module->getInfo('icons32');
xoops_loadLanguage('admin', $dirname);
-
+
$adminmenu = array();
$i = 1;
@@ -34,17 +34,17 @@
$adminmenu[$i]["link"] = "admin/index.php";
$adminmenu[$i]["desc"] = _MI_XOOPSFAQ_ADMIN_INDEX_DESC;
$adminmenu[$i]["icon"] = $pathIcon32.'/home.png';
-$i++;
+++$i;
$adminmenu[$i]["title"] = _MI_XOOPSFAQ_MENU_ADMINCATEGORY;
$adminmenu[$i]["link"] = "admin/category.php";
$adminmenu[$i]["desc"] = _MI_XOOPSFAQ_ADMIN_CATEGORY_DESC;
$adminmenu[$i]["icon"] = $pathIcon32.'/category.png';
-$i++;
+++$i;
$adminmenu[$i]["title"] = _MI_XOOPSFAQ_MENU_ADMINFAQ;
$adminmenu[$i]["link"] = "admin/main.php";
$adminmenu[$i]["desc"] = _MI_XOOPSFAQ_ADMIN_FAQ_DESC;
$adminmenu[$i]["icon"] = $pathIcon32.'/faq.png';
-$i++;
+++$i;
$adminmenu[$i]["title"] = _MI_XOOPSFAQ_MENU_ADMINABOUT;
$adminmenu[$i]["link"] = "admin/about.php";
$adminmenu[$i]["desc"] = _MI_XOOPSFAQ_ADMIN_ABOUT_DESC;
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/css/index.html
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/css/index.html (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/css/index.html 2014-04-25 12:15:51 UTC (rev 12485)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/images/faq.png
===================================================================
(Binary files differ)
Index: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/images/faq.png
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/images/faq.png 2014-04-25 12:12:29 UTC (rev 12484)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/images/faq.png 2014-04-25 12:15:51 UTC (rev 12485)
Property changes on: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/images/faq.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/images/folder.png
===================================================================
(Binary files differ)
Index: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/images/folder.png
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/images/folder.png 2014-04-25 12:12:29 UTC (rev 12484)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/images/folder.png 2014-04-25 12:15:51 UTC (rev 12485)
Property changes on: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/images/folder.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/images/index.html
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/images/index.html (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/images/index.html 2014-04-25 12:15:51 UTC (rev 12485)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/images/question.gif
===================================================================
(Binary files differ)
Index: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/images/question.gif
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/images/question.gif 2014-04-25 12:12:29 UTC (rev 12484)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/images/question.gif 2014-04-25 12:15:51 UTC (rev 12485)
Property changes on: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/images/question.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/images/question2.gif
===================================================================
(Binary files differ)
Index: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/images/question2.gif
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/images/question2.gif 2014-04-25 12:12:29 UTC (rev 12484)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/images/question2.gif 2014-04-25 12:15:51 UTC (rev 12485)
Property changes on: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/images/question2.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/images/slogo.png
===================================================================
(Binary files differ)
Index: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/images/slogo.png
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/images/slogo.png 2014-04-25 12:12:29 UTC (rev 12484)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/images/slogo.png 2014-04-25 12:15:51 UTC (rev 12485)
Property changes on: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/images/slogo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/index.html
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/index.html (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/index.html 2014-04-25 12:15:51 UTC (rev 12485)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/js/index.html
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/js/index.html (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/assets/js/index.html 2014-04-25 12:15:51 UTC (rev 12485)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/blocks/xoopsfaq_rand.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/blocks/xoopsfaq_rand.php 2014-04-25 12:12:29 UTC (rev 12484)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/blocks/xoopsfaq_rand.php 2014-04-25 12:15:51 UTC (rev 12485)
@@ -20,7 +20,6 @@
* @version:: $Id $
*/
-
function b_xoopsfaq_random_show($options)
{
global $xoopsDB, $xoopsConfig, $xoopsModule, $xoopsModuleConfig, $xoopsUser;
@@ -65,10 +64,12 @@
unset($xpFaqObj, $catObj);
}
}
+
return $block;
}
function b_xoopsfaq_rand_edit($options)
{
$form .= _MB_XOOPSFAQ_CHARS . " <input type='text' name='options[]' value='" . $options[0] . "' /> " . _MB_XOOPSFAQ_LENGTH . "";
+
return $form;
-}
\ No newline at end of file
+}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/class/category.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/class/category.php 2014-04-25 12:12:29 UTC (rev 12484)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/class/category.php 2014-04-25 12:15:51 UTC (rev 12485)
@@ -29,11 +29,13 @@
* @version:: $Id$
* @access:: public
*/
-class XoopsfaqCategory extends XoopsObject {
+class XoopsfaqCategory extends XoopsObject
+{
/**
* XoopsfaqCategory::__construct()
*/
- function __construct() {
+ function __construct()
+ {
$this->XoopsObject();
$this->initVar('category_id', XOBJ_DTYPE_INT, null, false);
$this->initVar('category_title', XOBJ_DTYPE_TXTBOX, null, true, 255);
@@ -43,7 +45,8 @@
/**
* XoopsfaqCategory::XoopsfaqCategory()
*/
- function XoopsfaqCategory() {
+ function XoopsfaqCategory()
+ {
$this->__construct();
}
@@ -52,7 +55,8 @@
*
* @return
*/
- function displayForm() {
+ function displayForm()
+ {
include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
$caption = ($this->isNew()) ? _AM_XOOPSFAQ_CREATENEW : sprintf(_AM_XOOPSFAQ_MODIFYITEM, $this->getVar('category_title'));
@@ -91,13 +95,15 @@
* @version:: $Id$
* @access:: public
*/
-class XoopsfaqCategoryHandler extends XoopsPersistableObjectHandler {
+class XoopsfaqCategoryHandler extends XoopsPersistableObjectHandler
+{
/**
* XoopsfaqCategoryHandler::__construct()
*
* @param mixed $db
*/
- function __construct(&$db) {
+ function __construct(&$db)
+ {
parent::__construct($db, 'xoopsfaq_categories', 'XoopsfaqCategory', 'category_id', 'category_title');
}
@@ -106,7 +112,8 @@
*
* @param mixed $db
*/
- function XoopsfaqCategoryHandler(&$db) {
+ function XoopsfaqCategoryHandler(&$db)
+ {
$this->__construct($db);
}
@@ -127,6 +134,7 @@
$criteria->setLimit(0);
}
$obj['list'] = &$this->getObjects($criteria, false);
+
return $obj;
}
@@ -135,7 +143,8 @@
*
* @return
*/
- function displayAdminListing() {
+ function displayAdminListing()
+ {
$objects = $this->getObj();
$buttons = array('edit', 'delete');
@@ -171,7 +180,8 @@
*
* @return
*/
- function displayError($errorString = '') {
+ function displayError($errorString = '')
+ {
xoops_cp_header();
xoopsFaq_AdminMenu(1);
xoopsFaq_DisplayHeading(_AM_XOOPSFAQ_CATEGORY_HEADER, _AM_XOOPSFAQ_SUBERROR);
@@ -183,4 +193,4 @@
xoops_cp_footer();
exit();
}
-}
\ No newline at end of file
+}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/class/contents.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/class/contents.php 2014-04-25 12:12:29 UTC (rev 12484)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/class/contents.php 2014-04-25 12:15:51 UTC (rev 12485)
@@ -29,7 +29,8 @@
* @version:: $Id$
* @access:: public
*/
-class XoopsfaqContents extends XoopsObject {
+class XoopsfaqContents extends XoopsObject
+{
/**
* XoopsfaqContents::__construct()
*/
@@ -169,7 +170,8 @@
*/
function getActive()
{
- return $this->getVar('contents_active') ? _YES : _NO;
+ //return $this->getVar('contents_active') ? _YES : _NO; //mb
+ return $this->getVar('contents_active') ? 1 : 0;
}
function getPublished($timestamp = '')
@@ -177,6 +179,7 @@
if (!$this->getVar('contents_publish')) {
return '';
}
+
return formatTimestamp($this->getVar('contents_publish'), $timestamp);
}
}
@@ -190,7 +193,8 @@
* @version:: $Id$
* @access:: public
*/
-class XoopsfaqContentsHandler extends XoopsPersistableObjectHandler {
+class XoopsfaqContentsHandler extends XoopsPersistableObjectHandler
+{
/**
* XoopsfaqContentsHandler::__construct()
*
@@ -228,6 +232,7 @@
$criteria->setLimit(0);
}
$obj['list'] = &$this->getObjects($criteria, false);
+
return $obj;
}
@@ -257,6 +262,7 @@
$criteria->setLimit(0);
}
$obj['list'] = &$this->getObjects($criteria, false);
+
return $obj;
}
@@ -267,6 +273,7 @@
*/
function displayAdminListing()
{
+ global $pathIcon16;
$objects = $this->getObj();
$xfCatHandler =& xoops_getmodulehandler('category', $GLOBALS['xoopsModule']->getVar('dirname'));
$catFields = array('category_id', 'category_title');
@@ -292,7 +299,13 @@
. " <td style='text-align: center;' class='even'>" . $object->getVar('contents_id') . "</td>\n"
. " <td style='text-align: left;' class='even'>" . $thisCatTitle . "</td>\n"
. " <td style='text-align: left;' class='even'>" . $object->getVar('contents_title') . "</td>\n"
- . " <td style='text-align: center;' class='even'>" . $object->getActive() . "</td>\n"
+ // . " <td style='text-align: center;' class='even'>" . $object->getActive() . "</td>\n"
+ . " <td style='text-align: center;' class='even'>"
+
+ .'<a href="main.php?op=toggle&active='.$object->getActive().'&content_id='.$object->getVar('contents_id')
+ .'"><img src="'.$pathIcon16.'/'.$object->getActive().'.png" title = "'._AM_MYMENUS_ACTION_TOGGLE
+ . '"></td>'
+
. " <td style='text-align: center;' class='even'>" . $object->getPublished() . "</td>\n"
. " <td style='text-align: center;' class='even'>" . $object->getVar('contents_weight') . "</td>\n"
. " <td style='text-align: center;' class='even'>\n";
@@ -323,4 +336,4 @@
xoops_cp_footer();
exit();
}
-}
\ No newline at end of file
+}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/comment_delete.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/comment_delete.php 2014-04-25 12:12:29 UTC (rev 12484)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/comment_delete.php 2014-04-25 12:15:51 UTC (rev 12485)
@@ -21,4 +21,4 @@
*/
include dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'mainfile.php';
-include XOOPS_ROOT_PATH . '/include/comment_delete.php';
\ No newline at end of file
+include XOOPS_ROOT_PATH . '/include/comment_delete.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/comment_edit.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/comment_edit.php 2014-04-25 12:12:29 UTC (rev 12484)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/comment_edit.php 2014-04-25 12:15:51 UTC (rev 12485)
@@ -20,4 +20,4 @@
* @version $Id$
*/
include dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'mainfile.php';
-include XOOPS_ROOT_PATH . '/include/comment_edit.php';
\ No newline at end of file
+include XOOPS_ROOT_PATH . '/include/comment_edit.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/comment_new.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/comment_new.php 2014-04-25 12:12:29 UTC (rev 12484)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/comment_new.php 2014-04-25 12:15:51 UTC (rev 12485)
@@ -21,4 +21,4 @@
*/
include dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'mainfile.php';
-include XOOPS_ROOT_PATH . '/include/comment_new.php';
\ No newline at end of file
+include XOOPS_ROOT_PATH . '/include/comment_new.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/comment_post.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/comment_post.php 2014-04-25 12:12:29 UTC (rev 12484)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/comment_post.php 2014-04-25 12:15:51 UTC (rev 12485)
@@ -21,4 +21,4 @@
*/
include dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'mainfile.php';
-include XOOPS_ROOT_PATH . '/include/comment_post.php';
\ No newline at end of file
+include XOOPS_ROOT_PATH . '/include/comment_post.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/comment_reply.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/comment_reply.php 2014-04-25 12:12:29 UTC (rev 12484)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/comment_reply.php 2014-04-25 12:15:51 UTC (rev 12485)
@@ -20,4 +20,4 @@
* @version $Id$
*/
include dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'mainfile.php';
-include XOOPS_ROOT_PATH . '/include/comment_reply.php';
\ No newline at end of file
+include XOOPS_ROOT_PATH . '/include/comment_reply.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/docs/changelog.txt
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/docs/changelog.txt 2014-04-25 12:12:29 UTC (rev 12484)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/docs/changelog.txt 2014-04-25 12:15:51 UTC (rev 12485)
@@ -1,9 +1,19 @@
-version 1.23 (ZySpec) - Oct. 31, 2011
+1.25 Beta 1 2014-04-23
+=================================
+- moved all images, CSS, and JS files to /assets (mamba)
+- renamed .html Smarty te...
[truncated message content] |