|
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 templates to .tpl (mamba)
+
+1.24 (Mamba) - Oct. 31, 2011
--------------------
+- added toggle of Active status by clicking on icon (Mamba)
+- small code adjustments
+
+1.23 (ZySpec) - Oct. 31, 2011
+--------------------
- fixed icon paths (Mamba)
- fixed bugs on category/item delete (Mamba)
- converted Add buttons to XOOPS Module GUI (Mamba)
-- updated standardized XOOPS Module GUI to "latest" version (Mamba)
+- updated standardized XOOPS Module GUI to "latest" (Mamba)
- fixed use of wfp_addslashes in ./class/category.php to use module textsanitizer addSlashes
- updated templates to be more XHTML compliant
- moved module css to language subdirectories so CSS can be modified for RTL/LTR, etc.
@@ -12,13 +22,13 @@
- added display of category for each item in ./admin/main.php for faqs
- added /language/schinese_utf8/modinfo.php
-version 1.22 (Mamba) - Feb. 24, 2011
+1.22 (Mamba) - Feb. 24, 2011
--------------------
- changed to standardized XOOPS Module GUI
- fixed adding comments
- fixed deleting FAQ, when deleting Category
-version 1.21 (Mamba)
+1.21 (Mamba)
--------------------
- changed icons for Edit/Delete
- adjusted editor entries for TinyMCE and CKeditor, and deleted Koivi
@@ -26,6 +36,6 @@
- adjusted language definition names
-version 1.20 (Catzwolf)
+1.20 (Catzwolf)
--------------------
This module has been refactored nearly 99% and I have replaced all old code with new. Only the templates havent changed that much
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/footer.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/footer.php 2014-04-25 12:12:29 UTC (rev 12484)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/footer.php 2014-04-25 12:15:51 UTC (rev 12485)
@@ -28,4 +28,4 @@
$xoops_module_header = '<link rel="stylesheet" type="text/css" href="' . XOOPS_URL . '/modules/' . $GLOBALS['xoopsModule']->getVar('dirname') . '/templates/css/module.css" />';
$xoopsTpl->assign('xoops_module_header', $xoops_module_header);
*/
-include_once XOOPS_ROOT_PATH . '/footer.php';
\ No newline at end of file
+include_once XOOPS_ROOT_PATH . '/footer.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/header.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/header.php 2014-04-25 12:12:29 UTC (rev 12484)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/header.php 2014-04-25 12:15:51 UTC (rev 12485)
@@ -20,4 +20,4 @@
*/
include dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'mainfile.php';
-require_once XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['xoopsModule']->getVar('dirname') . '/include/functions.php';
\ No newline at end of file
+require_once XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['xoopsModule']->getVar('dirname') . '/include/functions.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/include/functions.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/include/functions.php 2014-04-25 12:12:29 UTC (rev 12484)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/include/functions.php 2014-04-25 12:15:51 UTC (rev 12485)
@@ -56,6 +56,7 @@
break;
}
$ret = (false == $ret) ? $default : $ret;
+
return $ret;
}
@@ -92,7 +93,7 @@
global $xoopsModule;
echo "<div style='padding-top: 16px; padding-bottom: 10px; text-align: center;'>\n"
- ." <a href='http://xoops.org' target='_blank'>" . xoopsFaq_showImage('xoopsmicrobutton', '', '', 'gif','modules/' . $GLOBALS['xoopsModule']->getVar('dirname') . '/images/admin') . "</a>\n"
+ ." <a href='http://xoops.org' target='_blank'>" . xoopsFaq_showImage('xoopsmicrobutton', '', '', 'gif','modules/' . $GLOBALS['xoopsModule']->getVar('dirname') . '/assets/images/admin') . "</a>\n"
." " . _AM_XOOPSFAQ_ADMIN_FOOTER . ""
."</div>";
xoops_cp_footer();
@@ -130,6 +131,7 @@
$ret .= ' style="vertical-align: ' . $align . '; border: 0px;"';
}
$ret .= ' />';
+
return $ret;
} else {
return '';
@@ -149,7 +151,7 @@
{
$ret = '';
if ($value) {
- foreach($_icon_array as $_op => $icon) {
+ foreach ($_icon_array as $_op => $icon) {
$url = (!is_numeric($_op)) ? $_op . "?{$key}=" . $value : xoops_getenv('PHP_SELF') . "?op={$icon}&{$key}=" . $value;
if ($extra != null) {
$url .= $extra;
@@ -157,6 +159,7 @@
$ret .= '<a href="' . $url . '">' . xoopsFaq_showImage($icon, xoopsFaq_getConstants('_XO_LA_' . $icon), null, 'png') . '</a>';
}
}
+
return $ret;
}
@@ -172,6 +175,7 @@
{
$prefix = ($prefix != '' || $_title != 'action') ? trim($prefix) : '';
$suffix = trim($suffix);
+
return constant(strtoupper("$prefix$_title$suffix"));
}
@@ -185,5 +189,51 @@
if (isset($GLOBALS['xoopsModuleConfig']['use_wysiwyg']) && in_array($GLOBALS['xoopsModuleConfig']['use_wysiwyg'], array('tinymce', 'ckeditor', 'inbetween', 'spaw'))) {
return true;
}
+
return false;
-}
\ No newline at end of file
+}
+
+/**
+ * Verify that a mysql table exists
+ *
+ * @package News
+ * @author Hervé Thouzard (http://www.herve-thouzard.com)
+ * @copyright (c) Hervé Thouzard
+*/
+function xoopsfaq_TableExists($tablename)
+{
+ global $xoopsDB;
+ $result=$xoopsDB->queryF("SHOW TABLES LIKE '$tablename'");
+
+ return($xoopsDB->getRowsNum($result) > 0);
+}
+
+/**
+ * Verify that a field exists inside a mysql table
+ *
+ * @package News
+ * @author Hervé Thouzard (http://www.herve-thouzard.com)
+ * @copyright (c) Hervé Thouzard
+*/
+function xoopsfaq_FieldExists($fieldname,$table)
+{
+ global $xoopsDB;
+ $result=$xoopsDB->queryF("SHOW COLUMNS FROM $table LIKE '$fieldname'");
+
+ return($xoopsDB->getRowsNum($result) > 0);
+}
+
+/**
+ * Add a field to a mysql table
+ *
+ * @package News
+ * @author Hervé Thouzard (http://www.herve-thouzard.com)
+ * @copyright (c) Hervé Thouzard
+ */
+function xoopsfaq_AddField($field, $table)
+{
+ global $xoopsDB;
+ $result=$xoopsDB->queryF('ALTER TABLE ' . $table . " ADD $field;");
+
+ return $result;
+}
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/include/module.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/include/module.php (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/include/module.php 2014-04-25 12:15:51 UTC (rev 12485)
@@ -0,0 +1,256 @@
+<?php
+
+/**
+ * XoopsFAQ functions
+ *
+ * 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 GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @author XOOPS Development Team
+ * @package xoopsfaq
+ * @version $Id$
+ */
+
+function xoops_module_update_xoopsfaq()
+{
+
+ include_once XOOPS_ROOT_PATH . '/modules/xoopsfaq/include/functions.php';
+ global $xoopsDB;
+
+ //00) Check if the module has been already update do the current version
+
+ if (xoopsfaq_TableExists($xoopsDB->prefix('xoopsfaq_contents'))) {
+ $sql = $ret = array();
+ $i = 0;
+ //0) Rename all tables
+
+ $sql[$i] = sprintf(
+ 'ALTER TABLE ' . $xoopsDB->prefix('xoopsfaq_contents') . ' RENAME ' . $xoopsDB->prefix(
+ 'mod_xoopsfaq_contents'
+ )
+ );
+// $result=$xoopsDB->queryF($sql);
+// if (!$result) {
+// echo '<br />' . _AM_NEWS_UPGRADEFAILED.' '._AM_NEWS_UPGRADEFAILED2;
+// $errors++;
+
+ if (xoopsfaq_TableExists($xoopsDB->prefix('xoopsfaq_categories'))) {
+ ++$i;
+ $sql[$i] = sprintf(
+ 'ALTER TABLE ' . $xoopsDB->prefix('xoopsfaq_categories') . ' RENAME ' . $xoopsDB->prefix(
+ 'mod_xoopsfaq_categories'
+ )
+ );
+// $result=$xoopsDB->queryF($sql);
+// if (!$result) {
+// echo '<br />' . _AM_NEWS_UPGRADEFAILED.' '._AM_NEWS_UPGRADEFAILED2;
+// $errors++;
+// }
+ }
+
+// 2) Change the topic title's length, in the topics table
+
+
+ //--------------- example from xForms --------------------------
+
+
+ ++$i;
+ $sql[$i] = "DROP TABLE `" . $xoopsDB->prefix('xforms_formelements') . "`;";
+ ++$i;
+ $sql[$i] = "CREATE TABLE " . $xoopsDB->prefix('xforms_formelements') . " LIKE " . $xoopsDB->prefix('liaise_formelements') . ";";
+ ++$i;
+ $sql[$i] = "INSERT " . $xoopsDB->prefix('xforms_formelements') . " SELECT * FROM " . $xoopsDB->prefix('liaise_formelements') . ";";
+ ++$i;
+ $sql[$i] = "DROP TABLE `" . $xoopsDB->prefix('xforms_forms') . "`;";
+ ++$i;
+ $sql[$i] = "CREATE TABLE " . $xoopsDB->prefix('xforms_forms') . " LIKE " . $xoopsDB->prefix('liaise_forms') . ";";
+ ++$i;
+ $sql[$i] = "INSERT " . $xoopsDB->prefix('xforms_forms') . " SELECT * FROM " . $xoopsDB->prefix('liaise_forms') . ";";
+
+ //--------------- END example from xForms --------------------------
+
+ ++$i;
+ $sql[$i] = sprintf(
+ 'ALTER TABLE ' . $xoopsDB->prefix('mod_xoopsfaq_contents')
+ . " CHANGE category_id contents_cid tinyint(3) unsigned NOT NULL DEFAULT '0'"
+ );
+ // $result=$xoopsDB->queryF($sql);
+ // if (!$result) {
+ // echo '<br />' . _AM_XOOPSFAQ_UPGRADEFAILED.' '._AM_XOOPSFAQ_UPGRADEFAILED2;
+ // $errors++;
+ // }
+
+
+ /*
+ example from XoopsTube
+
+ ++$i;
+ $ret[$i] = true;
+ $query[$i] = sprintf(
+ "ALTER TABLE " . $xoopsDB->prefix('xoopstube_videos') . " CHANGE forumid vidsource INT(11) NOT NULL default '0'"
+ );
+ $ret[$i] = $ret[$i] && $xoopsDB->query($query[$i]);
+
+
+ */
+
+
+ ++$i;
+ $sql[$i] = sprintf(
+ "ALTER TABLE " . $xoopsDB->prefix('xoopstube_mod') . " CHANGE url vidid TEXT NOT NULL default ''"
+ );
+
+ ++$i;
+ $sql[$i] = sprintf(
+ 'ALTER TABLE ' . $xoopsDB->prefix('mod_xoopsfaq_contents')
+ . " CHANGE contents_time contents_publish int(11) unsigned NOT NULL DEFAULT '0'"
+ );
+ ++$i;
+ $sql[$i] = sprintf(
+ 'ALTER TABLE ' . $xoopsDB->prefix('mod_xoopsfaq_contents')
+ . " CHANGE contents_order contents_weight smallint(5) unsigned NOT NULL DEFAULT '0'"
+ );
+ ++$i;
+ $sql[$i] = sprintf(
+ 'ALTER TABLE ' . $xoopsDB->prefix('mod_xoopsfaq_contents')
+ . " CHANGE contents_visible contents_active tinyint(1) unsigned NOT NULL DEFAULT '1'"
+ );
+ ++$i;
+ $sql[$i] = sprintf(
+ 'ALTER TABLE ' . $xoopsDB->prefix('mod_xoopsfaq_contents')
+ . " CHANGE contents_nohtml dohtml tinyint(1) unsigned NOT NULL DEFAULT '0'"
+ );
+ ++$i;
+ $sql[$i] = sprintf(
+ 'ALTER TABLE ' . $xoopsDB->prefix('mod_xoopsfaq_contents')
+ . " CHANGE contents_nosmiley dosmiley tinyint(1) unsigned NOT NULL DEFAULT '1'"
+ );
+ ++$i;
+ $sql[$i] = sprintf(
+ 'ALTER TABLE ' . $xoopsDB->prefix('mod_xoopsfaq_contents')
+ . " CHANGE contents_noxcode doxcode tinyint(1) unsigned NOT NULL DEFAULT '1'"
+ );
+
+// move column down
+ ++$i;
+ $sql[$i] = sprintf(
+ 'ALTER TABLE ' . $xoopsDB->prefix('mod_xoopsfaq_contents')
+ . " MODIFY COLUMN dosmiley tinyint(1) AFTER doxcode"
+ );
+
+
+// 2.1) Add new fields to the Contents table
+ if (!xoopsfaq_FieldExists('doimage', $xoopsDB->prefix('mod_xoopsfaq_contents'))) {
+
+ ++$i;
+ $sql[$i] = sprintf('ALTER TABLE ' . $xoopsDB->prefix('mod_xoopsfaq_contents') . " ADD doimage tinyint(1) unsigned NOT NULL DEFAULT '1';");
+
+
+// xoopsfaq_AddField(
+// "doimage tinyint(1) unsigned NOT NULL DEFAULT '1'",
+// $xoopsDB->prefix('mod_xoopsfaq_contents')
+// );
+ }
+ if (!xoopsfaq_FieldExists('dobr', $xoopsDB->prefix('mod_xoopsfaq_contents'))) {
+
+ ++$i;
+ $sql[$i] = sprintf('ALTER TABLE ' . $xoopsDB->prefix('mod_xoopsfaq_contents') . " ADD dobr tinyint(1) unsigned NOT NULL DEFAULT '1';");
+
+
+// xoopsfaq_AddField(
+// "dobr tinyint(1) unsigned NOT NULL DEFAULT '1'",
+// $xoopsDB->prefix('mod_xoopsfaq_contents')
+// );
+ }
+
+
+
+
+
+// 2.2 updating index
+
+ ++$i;
+ $sql[$i] = sprintf(
+ 'ALTER TABLE ' . $xoopsDB->prefix('mod_xoopsfaq_contents')
+ . " DROP INDEX ( `contents_visible_category_id` );"
+ );
+// $result=$xoopsDB->queryF($sql);
+
+ ++$i;
+ $sql[$i] = sprintf(
+ 'ALTER TABLE ' . $xoopsDB->prefix('mod_xoopsfaq_contents')
+ . " ADD INDEX ( `contents_visible_category_id` (`contents_active`,`contents_cid`) );"
+ );
+// $result=$xoopsDB->queryF($sql);
+
+
+
+ $number = count($sql);
+ for ($i = 0; $i < count($sql); ++$i) {
+ if (false == $xoopsDB->queryF($sql[$i])) {
+// $ret[$i] = $ret[$i] && $xoopsDB->query($query[$i]);
+ $ret[$i] = 'ERROR: ' . $xoopsDB->error() . ' (' . $xoopsDB->errno() . ')<br />';
+ $number--;
+ } else {
+ $ret[$i] = 'The query "' . $sql[$i] . '" executed successfully...<br />';
+ }
+ echo $ret[$i];
+ }
+
+ If ($number == count($sql)) {
+ echo '<br /><strong>' . _AM_IMPORT_SUCCES . '</strong>';
+ } else {
+ echo '<br /><strong>' . _AM_IMPORT_FAILED . '</strong>';
+ }
+
+ //--------------------------------------------
+
+
+ // 6) Make files and folders
+ //TODO use DirectoryChecker
+
+ $dir = XOOPS_ROOT_PATH . "/uploads/" . $modversion['dirname'];
+ if (!is_dir($dir)) {
+ mkdir($dir);
+ chmod($dir, 0777);
+ } elseif (!is_writeable($dir)) {
+ chmod($dir, 0777);
+ }
+
+ $dir = XOOPS_ROOT_PATH . "/uploads/" . $modversion['dirname'] . "/file";
+ if (!is_dir($dir)) {
+ mkdir($dir);
+ chmod($dir, 0777);
+ } elseif (!is_writeable($dir)) {
+ chmod($dir, 0777);
+ }
+
+ $dir = XOOPS_ROOT_PATH . "/uploads/" . $modversion['dirname'] . "/image";
+ if (!is_dir($dir)) {
+ mkdir($dir);
+ chmod($dir, 0777);
+ } elseif (!is_writeable($dir)) {
+ chmod($dir, 0777);
+ }
+
+ // Copy index.html files on uploads folders
+ $indexFile = XOOPS_ROOT_PATH . "/modules/" . $modversion['dirname'] . "/include/index.html";
+ copy($indexFile, XOOPS_ROOT_PATH . "/uploads/" . $modversion['dirname'] . "/index.html");
+ copy($indexFile, XOOPS_ROOT_PATH . "/uploads/" . $modversion['dirname'] . "/file/index.html");
+ copy($indexFile, XOOPS_ROOT_PATH . "/uploads/" . $modversion['dirname'] . "/image/index.html");
+
+ return true;
+
+ } else {
+
+ // DO NOTHING
+ return null;
+
+ }
+}
Property changes on: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/include/module.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/include/rss.inc.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/include/rss.inc.php 2014-04-25 12:12:29 UTC (rev 12484)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/include/rss.inc.php 2014-04-25 12:15:51 UTC (rev 12485)
@@ -1,5 +1,6 @@
<?php
-function xoopsfaq_rss($max=10){
+function xoopsfaq_rss($max=10)
+{
$categoryid = isset($_GET['categoryid']) ? (int) $_GET['categoryid'] : -1 ;
$cat_handler =& xoops_getmodulehandler('category', 'xoopsfaq');
@@ -19,14 +20,14 @@
$criteria->add(new Criteria('contents_active', 1, '='));
$criteria->add(new Criteria('contents_publish', 0, '>'));
$criteria->add(new Criteria('contents_publish', time(), '<='));
- if($categoryid > -1) {
+ if ($categoryid > -1) {
$criteria->add(new Criteria('contents_cid', $categoryid, '='));
}
$contentObjs = $contents_handler->getAll($criteria);
$retu = array();
- foreach($contentObjs as $contentObj){
+ foreach ($contentObjs as $contentObj) {
$retu[] = array ('image' => '',
'title' => $contentObj->getVar('contents_title'),
'link' => $contentObj->getVar('contents_contents'),
@@ -36,6 +37,6 @@
);
}
unset($contents_handler, $contentObjs);
+
return $retu;
}
-?>
\ No newline at end of file
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/include/search.inc.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/include/search.inc.php 2014-04-25 12:12:29 UTC (rev 12484)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/include/search.inc.php 2014-04-25 12:15:51 UTC (rev 12485)
@@ -31,7 +31,8 @@
* @param mixed $userid
* @return
*/
-function xoopsfaq_search($queryarray, $andor, $limit, $offset, $userid) {
+function xoopsfaq_search($queryarray, $andor, $limit, $offset, $userid)
+{
global $xoopsDB;
$ret = array();
if ($userid != 0) {
@@ -60,12 +61,13 @@
}
$contentArray = $xfContentsHandler->getAll($criteria, $contentFields, false);
foreach ($contentArray as $content) {
- $ret[] = array ('image' => 'images/question2.gif',
+ $ret[] = array ('image' => 'assets/images/question2.gif',
'link' => "index.php?cat_id=" . $content['contents_cid'] . "#" . $content['contents_id'],
'title' => $content['contents_title'],
'time' => $content['contents_publish'],
);
}
unset($contentArray);
+
return $ret;
-}
\ No newline at end of file
+}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/index.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/index.php 2014-04-25 12:12:29 UTC (rev 12484)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/index.php 2014-04-25 12:15:51 UTC (rev 12485)
@@ -25,7 +25,7 @@
$cat_id = xoopsFaq_CleanVars($_GET, 'cat_id', 0, 'int');
if ($cat_id < 1) {
- $xoopsOption['template_main'] = 'xoopsfaq_index.html';
+ $xoopsOption['template_main'] = 'xoopsfaq_index.tpl';
include_once XOOPS_ROOT_PATH . '/header.php';
/**
* Display Categories and a list of Answers Max 10
@@ -47,7 +47,7 @@
}
}
} else {
- $xoopsOption['template_main'] = 'xoopsfaq_category.html';
+ $xoopsOption['template_main'] = 'xoopsfaq_category.tpl';
include_once XOOPS_ROOT_PATH . '/header.php';
/**
* Display answers to a specific category
@@ -67,4 +67,4 @@
include XOOPS_ROOT_PATH . '/include/comment_view.php';
}
-include 'footer.php';
\ No newline at end of file
+include 'footer.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/language/english/admin.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/language/english/admin.php 2014-04-25 12:12:29 UTC (rev 12484)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/language/english/admin.php 2014-04-25 12:15:51 UTC (rev 12485)
@@ -119,7 +119,8 @@
define("_AM_XOOPSFAQ_ADMIN_PREFERENCES","Settings");
define("_AM_XOOPSFAQ_ADMIN_INDEX_TXT1","The XoopsFAQ module is used to create a list of Frequently Asked Questions (FAQs) for your website. It is typically used to create a list of common questions about your website, service or product(s), but you could use it to list questions and answers about anything really. FAQs can be organized into categories.");
-// Text for Admin footer
-define("_AM_XOOPSFAQ_ADMIN_FOOTER","<div class='center smallsmall italic pad5'>XOOPS FAQ is maintained by the <a class='tooltip' rel='external' href='http://xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>");
+//ModuleAdmin
+define('_AM_XOOPSFAQ_MODULEADMIN_MISSING','Error: The ModuleAdmin class is missing. Please install the ModuleAdmin Class into /Frameworks (see /docs/readme.txt)');
-//define('_AM_XOOPSFAQ_ADMIN_'," "); //
\ No newline at end of file
+define('_AM_XOOPSFAQ_ACTIVE_TOGGLE_SUCCESS',"Successfully Changed Active Status");
+define('_AM_XOOPSFAQ_ACTIVE_TOGGLE_FAILED',"Changing Active Status Failed");
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/language/english/blocks.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/language/english/blocks.php 2014-04-25 12:12:29 UTC (rev 12484)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/language/english/blocks.php 2014-04-25 12:15:51 UTC (rev 12485)
@@ -1,11 +1,9 @@
-<?php
-/**
- * Block Language Definitions
- *
- */
-define('_MB_XOOPSFAQ_CHARS','Display');
-define('_MB_XOOPSFAQ_LENGTH','characters of the FAQ');
-define('_MB_XOOPSFAQ_SEEMORE','See more...');
-define('_MB_XOOPSFAQ_RANDOMTITLE','Random FAQ');
-
-?>
\ No newline at end of file
+<?php
+/**
+ * Block Language Definitions
+ *
+ */
+define('_MB_XOOPSFAQ_CHARS','Display');
+define('_MB_XOOPSFAQ_LENGTH','characters of the FAQ');
+define('_MB_XOOPSFAQ_SEEMORE','See more...');
+define('_MB_XOOPSFAQ_RANDOMTITLE','Random FAQ');
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/language/english/main.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/language/english/main.php 2014-04-25 12:12:29 UTC (rev 12484)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/language/english/main.php 2014-04-25 12:15:51 UTC (rev 12485)
@@ -38,4 +38,4 @@
define("_MD_XOOPSFAQ_TOTALPUBLISHED","Total Published FAQs: %s");
define("_MD_XOOPSFAQ_TOTALNONACTIVE","Total Inactive FAQs: %s");
define("_MD_XOOPSFAQ_TOTALFAQS","Total FAQs: %s");
-define("_MD_XOOPSFAQ_TOTALCATEGORIES","Total Categories: %s");
\ No newline at end of file
+define("_MD_XOOPSFAQ_TOTALCATEGORIES","Total Categories: %s");
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/language/english/modinfo.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/language/english/modinfo.php 2014-04-25 12:12:29 UTC (rev 12484)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/language/english/modinfo.php 2014-04-25 12:15:51 UTC (rev 12485)
@@ -71,4 +71,4 @@
* Module Prefs
*/
define("_MI_XOOPSFAQ_EDITORS","Select Editor:");
-define("_MI_XOOPSFAQ_EDITORS_DSC","Please select the editor you would like to use? <br />You may be required to install an editor before you can use it.");
\ No newline at end of file
+define("_MI_XOOPSFAQ_EDITORS_DSC","Please select the editor you would like to use? <br />You may be required to install an editor before you can use it.");
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/sql/mysql.sql
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/sql/mysql.sql 2014-04-25 12:12:29 UTC (rev 12484)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/sql/mysql.sql 2014-04-25 12:15:51 UTC (rev 12485)
@@ -1,8 +1,8 @@
#
-# Table structure for table `faq_categories`
+# Table structure for table `mod_faq_categories`
#
-CREATE TABLE `xoopsfaq_categories` (
+CREATE TABLE `mod_xoopsfaq_categories` (
`category_id` tinyint(3) unsigned NOT NULL AUTO_INCREMENT,
`category_title` varchar(255) NOT NULL DEFAULT '',
`category_order` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -11,10 +11,10 @@
#
-# Table structure for table `faq_contents`
+# Table structure for table `mod_faq_contents`
#
-CREATE TABLE `xoopsfaq_contents` (
+CREATE TABLE `mod_xoopsfaq_contents` (
`contents_id` smallint(5) unsigned NOT NULL AUTO_INCREMENT,
`contents_cid` tinyint(3) unsigned NOT NULL DEFAULT '0',
`contents_title` varchar(255) NOT NULL DEFAULT '',
Deleted: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/templates/blocks/xoopsfaq_block_rand.html
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/templates/blocks/xoopsfaq_block_rand.html 2014-04-25 12:12:29 UTC (rev 12484)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/templates/blocks/xoopsfaq_block_rand.html 2014-04-25 12:15:51 UTC (rev 12485)
@@ -1,8 +0,0 @@
-<div style='font-size: 12px; font-weight: bold; background-color: #ccc; padding: 4px; margin: 0;'>
- <a href='<{$block.catlink}>'><{$block.cattxt}></a>
-</div>
-<div style='padding: 4px 0 0 0; color: #456;'>
- <h5 style='margin: 0;'><{$block.faq}></h5>
- <div><{$block.faqans}></div>
- <div style='text-align: right; font-size: x-small;'><a href='<{$block.morelink}>'><{$block.linktxt}></a></div>
-</div>
\ No newline at end of file
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/templates/blocks/xoopsfaq_block_rand.tpl
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/templates/blocks/xoopsfaq_block_rand.tpl (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/templates/blocks/xoopsfaq_block_rand.tpl 2014-04-25 12:15:51 UTC (rev 12485)
@@ -0,0 +1,8 @@
+<div style='font-size: 12px; font-weight: bold; background-color: #ccc; padding: 4px; margin: 0;'>
+ <a href='<{$block.catlink}>'><{$block.cattxt}></a>
+</div>
+<div style='padding: 4px 0 0 0; color: #456;'>
+ <h5 style='margin: 0;'><{$block.faq}></h5>
+ <div><{$block.faqans}></div>
+ <div style='text-align: right; font-size: x-small;'><a href='<{$block.morelink}>'><{$block.linktxt}></a></div>
+</div>
\ No newline at end of file
Deleted: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/templates/xoopsfaq_category.html
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/templates/xoopsfaq_category.html 2014-04-25 12:12:29 UTC (rev 12484)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsfaq/templates/xoopsfaq_category.html 2014-04-25 12:15:51 UTC (rev 12485)
@@ -1,52 +0,0 @@
-<div class="page_headline"><span class="itemTitle"><{$smarty.const._MD_XOOPSFAQ_FAQ}></span></div>
-<br />
-<a id="top" name="top"><a href="index.php"><{$smarty.const._MD_XOOPSFAQ_MAIN}></a> <span style="font-weight:bold;">»»</span> <strong><{$category_name}></strong><br /><br />
-<table style='width: 100%; margin: 1px;' class='outer'>
- <tr>
- <th colspan="2" style="text-align: left;"><{$smarty.const._MD_XOOPSFAQ_TOC}></th>
- </tr>
- <tr>
- <td colspan="2" class="even">
- <ul style="list-style-image:url(images/faq.png);">
- <!-- start question loop -->
- <{foreach item=question from=$questions}>
- <li style="line-height: 1.75em;"> <a href="#q<{$question.id}>"><{$question.title}></a></li>
- <{/foreach}>
- <!-- end question loop -->
- </ul>
- </td>
- </tr>
-</table>
-<br /><br />
-
-<table style="width: 100%; margin: 1px;" class="outer">
-<!-- start question and answer loop -->
-<{foreach item=question from=$questions}>
- <tr>
- <th style="text-align: left;"><a id="q<{$question.id}>" name="q<{$question.id}>"></a><{$question.title}></th>
- </tr>
- <tr>
- <td class="even"><{$question.answer}><div style="text-align: right"><a href="#top" title ="<{$smarty.const._MD_XOOPSFAQ_BACKTOTOP}>"><img src="<{xoModuleIcons16 up.png}>"> </a></div></td>
- </tr>
-<{/foreach}>
-<!-- end question and answer loop -->
-</table>
-<br /><br />
-<div style="text-align:center; font-weight: bold;">[ <a href="index.php"><{$smarty.const._MD_XOOPSFAQ_BACKTOINDEX}></a> ]</div>
-
-<div style="text-align:center; padding: 3px; margin: 3px;">
- <{$commentsnav}>
- <{$lang_notice}><{$smarty.const._MD_XOOPSFAQ_BACKTOINDEX}>
-</div>
-
-<div style="margin: 3px; padding: 3px;">
-<!-- start comments loop -->
-<{if $comment_mode == "flat"}>
- <{include file="db:system_comments_flat.html"}>
-<{elseif $comment_mode == "thread"}>
- <{include file="db:system_comments_thread.html"}>
-<{elseif $comment_mode == "nest"}>
- <{include file="db:system_comments_nest.html"}>
-<{/if}>
-<!-- end comments loop -->
-</div>
\ No newline at end of file
Added: Xoop...
[truncated message content] |