From: <be...@us...> - 2015-02-18 18:28:54
|
Revision: 12997 http://sourceforge.net/p/xoops/svn/12997 Author: beckmi Date: 2015-02-18 18:28:39 +0000 (Wed, 18 Feb 2015) Log Message: ----------- 1.11 RC3 Modified Paths: -------------- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/admin/about.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/admin/about2.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/admin/admin.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/admin/admin_footer.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/admin/admin_header.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/admin/admin_header2.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/admin/answer.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/admin/category.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/admin/docbook_export.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/admin/faq.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/admin/import.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/admin/index.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/admin/main.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/admin/menu.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/admin/myblocksadmin.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/admin/mygroupperm.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/admin/mygrouppermform.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/admin/permissions.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/admin/question.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/admin/wffaq.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/admin/xoopsfaq.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/answer.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/blocks/faqs_context.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/blocks/faqs_most_viewed.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/blocks/faqs_new.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/blocks/faqs_random_diduno.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/blocks/faqs_random_faq.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/blocks/faqs_random_how.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/blocks/faqs_recent.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/blocks/faqs_recent_questions.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/category.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/class/answer.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/class/category.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/class/faq.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/class/permission.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/class/smartdbupdater.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/comment_delete.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/comment_edit.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/comment_new.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/comment_post.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/comment_reply.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/docs/changelog.txt XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/docs/credits.txt XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/docs/readme.txt XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/faq.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/footer.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/header.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/include/answer.inc.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/include/blocksadmin.inc.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/include/comment_functions.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/include/displayfaqs.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/include/functions.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/include/notification.inc.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/include/onupdate.inc.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/include/request.inc.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/include/search.inc.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/include/searchform.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/include/submit.inc.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/index.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/language/english/admin.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/language/english/blocks.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/language/english/main.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/language/english/modinfo.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/language/english/smartdbupdater.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/notification_update.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/open_category.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/open_index.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/print.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/request.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/sql/mysql.sql XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/submit.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/xoops_version.php Added Paths: ----------- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/css/ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/css/index.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/images/ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/images/bg.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/images/blank.png XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/images/icon/ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/images/icon/approve.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/images/icon/cat.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/images/icon/close12.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/images/icon/delete.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/images/icon/edit.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/images/icon/friend.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/images/icon/index.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/images/icon/merge.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/images/icon/newanswer.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/images/icon/open12.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/images/icon/print.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/images/icon/subcat.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/images/index.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/images/left_both.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/images/links/ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/images/links/delete.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/images/links/delete.png XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/images/links/edit.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/images/links/friend.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/images/links/index.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/images/links/newanswer.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/images/links/print.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/images/right_both.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/images/sfcssbutton.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/images/smartfaq.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/images/smartfaq_logo.png XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/index.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/js/ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/js/index.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/js/overlib/ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/js/overlib/index.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/js/overlib/mini/ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/js/overlib/mini/index.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/js/overlib/mini/overlib_anchor_mini.js XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/js/overlib/mini/overlib_crossframe_mini.js XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/js/overlib/mini/overlib_cssstyle_mini.js XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/js/overlib/mini/overlib_exclusive_mini.js XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/js/overlib/mini/overlib_followscroll_mini.js XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/js/overlib/mini/overlib_hideform_mini.js XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/js/overlib/mini/overlib_mini.js XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/js/overlib/mini/overlib_shadow_mini.js XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/js/overlib/overlib.js XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/js/overlib/overlib_anchor.js XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/js/overlib/overlib_crossframe.js XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/js/overlib/overlib_cssstyle.js XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/js/overlib/overlib_exclusive.js XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/js/overlib/overlib_followscroll.js XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/js/overlib/overlib_hideform.js XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/assets/js/overlib/overlib_shadow.js XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/class/uploader.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/include/functions.image.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/include/functions.render.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/templates/blocks/faqs_context.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/templates/blocks/faqs_most_viewed.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/templates/blocks/faqs_new.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/templates/blocks/faqs_random_diduno.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/templates/blocks/faqs_random_faq.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/templates/blocks/faqs_random_how.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/templates/blocks/faqs_recent.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/templates/blocks/faqs_recent_questions.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/templates/smartfaq_category.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/templates/smartfaq_faq.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/templates/smartfaq_index.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/templates/smartfaq_lastfaqs.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/templates/smartfaq_singlefaq.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/templates/smartfaq_submit.tpl Removed Paths: ------------- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/images/ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/include/overlib/ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/templates/blocks/faqs_context.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/templates/blocks/faqs_most_viewed.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/templates/blocks/faqs_new.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/templates/blocks/faqs_random_diduno.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/templates/blocks/faqs_random_faq.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/templates/blocks/faqs_random_how.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/templates/blocks/faqs_recent.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/templates/blocks/faqs_recent_questions.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/templates/smartfaq_category.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/templates/smartfaq_faq.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/templates/smartfaq_index.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/templates/smartfaq_lastfaqs.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/templates/smartfaq_singlefaq.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/templates/smartfaq_submit.html Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/admin/about.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/admin/about.php 2015-02-18 18:20:22 UTC (rev 12996) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/admin/about.php 2015-02-18 18:28:39 UTC (rev 12997) @@ -1,30 +1,30 @@ -<?php -/* - * You may not change or alter any portion of this comment or credits - * of supporting developers from this source code or any supporting source code - * which is considered copyrighted (c) material of the original comment or credit authors. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ - -/** - * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ - * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html) - * @package - * @since - * @author XOOPS Development Team - * @version $Id $ - */ - -include_once dirname(__FILE__) . '/admin_header.php'; - -xoops_cp_header(); - -$aboutAdmin = new ModuleAdmin(); - -echo $aboutAdmin->addNavigation('about.php'); -echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false); - -include 'admin_footer.php'; \ No newline at end of file +<?php +/* + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + */ + +/** + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html) + * @package + * @since + * @author XOOPS Development Team + * @version $Id $ + */ + +include_once __DIR__ . '/admin_header.php'; + +xoops_cp_header(); + +$aboutAdmin = new ModuleAdmin(); + +echo $aboutAdmin->addNavigation('about.php'); +echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false); + +include_once __DIR__ . '/admin_footer.php'; Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/admin/about2.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/admin/about2.php 2015-02-18 18:20:22 UTC (rev 12996) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/admin/about2.php 2015-02-18 18:28:39 UTC (rev 12997) @@ -7,7 +7,7 @@ * Licence: GNU */ -include_once("admin_header.php"); +include_once __DIR__ . '/admin_header.php'; $myts = &MyTextSanitizer::getInstance(); Global $xoopsModule; @@ -26,11 +26,9 @@ echo "<td align = 'center'>"; echo "<img src='".XOOPS_URL."/modules/smartfaq/".$versioninfo->getInfo('image')."' alt='' align='center'/></a>"; echo "<div style='margin-top: 10px; color: #33538e; margin-bottom: 4px; font-size: 18px; line-height: 18px; font-weight: bold; display: block;'>" . $versioninfo->getInfo('name') . " version " . $versioninfo->getInfo('version') . "</div>"; -if ( $versioninfo->getInfo('author_realname') != '') -{ +if ( $versioninfo->getInfo('author_realname') != '') { $author_name = $versioninfo->getInfo('author') . " (" . $versioninfo->getInfo('author_realname') . ")"; -} else -{ +} else { $author_name = $versioninfo->getInfo('author'); } @@ -49,7 +47,7 @@ $author_name = $versioninfo->getInfo('author') . " (" . $versioninfo->getInfo('author_realname') . ")"; } else { $author_name = $versioninfo->getInfo('author'); -} +} echo "<div style = 'line-height: 16px; font-weight: bold; display: block;'>" . _AM_SF_BY . " " . $author_name; echo "</div>"; @@ -66,27 +64,26 @@ echo "<td class='head' width = '150px' align='left'>" . _MI_SF_DEVELOPER_LEAD . "</td>"; echo "<td class='even' align='left'>" . $versioninfo->getInfo('developer_lead') . "</td>"; echo "</tr>"; -} +} if ($versioninfo->getInfo('developer_contributor') != '') { echo "<tr>"; echo "<td class='head' width = '150px' align='left'>" . _MI_SF_DEVELOPER_CONTRIBUTOR . "</td>"; echo "<td class='even' align='left'>" . $versioninfo->getInfo('developer_contributor') . "</td>"; echo "</tr>"; -} +} if ($versioninfo->getInfo('developer_website_url') != '') { echo "<tr>"; echo "<td class='head' width = '150px' align='left'>" . _MI_SF_DEVELOPER_WEBSITE . "</td>"; echo "<td class='even' align='left'><a href='" . $versioninfo->getInfo('developer_website_url') . "' target='blank'>" . $versioninfo->getInfo('developer_website_name') . "</a></td>"; echo "</tr>"; -} +} if ($versioninfo->getInfo('developer_email') != '') { echo "<tr>"; echo "<td class='head' width = '150px' align='left'>" . _MI_SF_DEVELOPER_EMAIL . "</td>"; echo "<td class='even' align='left'><a href='mailto:" . $versioninfo->getInfo('developer_email') . "'>" . $versioninfo->getInfo('developer_email') . "</a></td>"; echo "</tr>"; -} +} - echo "</table>"; echo "<br />\n"; // Module Developpment information @@ -100,41 +97,41 @@ echo "<td class='head' width = '200' align='left'>" . _MI_SF_MODULE_RELEASE_DATE . "</td>"; echo "<td class='even' align='left'>" . $versioninfo->getInfo('date') . "</td>"; echo "</tr>"; -} +} if ($versioninfo->getInfo('status') != '') { echo "<tr>"; echo "<td class='head' width = '200' align='left'>" . _MI_SF_MODULE_STATUS . "</td>"; echo "<td class='even' align='left'>" . $versioninfo->getInfo('status') . "</td>"; echo "</tr>"; -} +} if ($versioninfo->getInfo('demo_site_url') != '') { echo "<tr>"; echo "<td class='head' align='left'>" . _MI_SF_MODULE_DEMO . "</td>"; echo "<td class='even' align='left'><a href='" . $versioninfo->getInfo('demo_site_url') . "' target='blank'>" . $versioninfo->getInfo('demo_site_name') . "</a></td>"; echo "</tr>"; -} +} if ($versioninfo->getInfo('support_site_url') != '') { echo "<tr>"; echo "<td class='head' align='left'>" . _MI_SF_MODULE_SUPPORT . "</td>"; echo "<td class='even' align='left'><a href='" . $versioninfo->getInfo('support_site_url') . "' target='blank'>" . $versioninfo->getInfo('support_site_name') . "</a></td>"; echo "</tr>"; -} +} if ($versioninfo->getInfo('submit_bug') != '') { echo "<tr>"; echo "<td class='head' align='left'>" . _MI_SF_MODULE_BUG . "</td>"; echo "<td class='even' align='left'><a href='" . $versioninfo->getInfo('submit_bug') . "' target='blank'>" . "Submit a Bug in SmartFAQ Bug Tracker" . "</a></td>"; echo "</tr>"; -} +} if ($versioninfo->getInfo('submit_feature') != '') { echo "<tr>"; echo "<td class='head' align='left'>" . _MI_SF_MODULE_FEATURE . "</td>"; echo "<td class='even' align='left'><a href='" . $versioninfo->getInfo('submit_feature') . "' target='blank'>" . "Request a feature in the SmartFAQ Feature Tracker" . "</a></td>"; echo "</tr>"; -} +} echo "</table>"; // Warning @@ -150,7 +147,7 @@ echo "</tr>"; echo "</table>"; -} +} // Author's note if ($versioninfo->getInfo('author_word') != '') { echo "<br />\n"; @@ -164,7 +161,7 @@ echo "</tr>"; echo "</table>"; -} +} // Version History if ($versioninfo->getInfo('version_history') != '') { @@ -179,10 +176,10 @@ echo "</tr>"; echo "</table>"; -} +} echo "<br />"; //$modfooter = sf_modFooter(); //echo "<div align='center'>" . $modfooter . "</div>"; //xoops_cp_footer(); -include "admin_footer.php"; \ No newline at end of file +include_once __DIR__ . '/admin_footer.php'; Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/admin/admin.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/admin/admin.php 2015-02-18 18:20:22 UTC (rev 12996) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/admin/admin.php 2015-02-18 18:28:39 UTC (rev 12997) @@ -28,18 +28,16 @@ // URL: http://www.myweb.ne.jp/, http://www.xoops.org/, http://jp.xoops.org/ // // Project: The XOOPS Project // // ------------------------------------------------------------------------- // -if (!defined("XOOPS_ROOT_PATH")) { - die("XOOPS root path not defined"); -} +// defined("XOOPS_ROOT_PATH") || exit("XOOPS root path not defined"); if (isset($HTTP_POST_VARS['fct'])) { - $fct = trim($HTTP_POST_VARS['fct']); + $fct = trim($HTTP_POST_VARS['fct']); } if (isset($HTTP_GET_VARS['fct'])) { - $fct = trim($HTTP_GET_VARS['fct']); + $fct = trim($HTTP_GET_VARS['fct']); } if (empty($fct)) $fct = 'preferences' ; -include "../../../mainfile.php"; +include dirname(dirname(dirname(__DIR__))) . '/mainfile.php'; include XOOPS_ROOT_PATH."/include/cp_functions.php"; include_once XOOPS_ROOT_PATH."/kernel/module.php"; @@ -47,108 +45,106 @@ $admintest = 0; if (is_object($xoopsUser)) { - $xoopsModule =& XoopsModule::getByDirname("system"); - if ( !$xoopsUser->isAdmin($xoopsModule->mid()) ) { - redirect_header(XOOPS_URL.'/user.php',3,_NOPERM); - exit(); - } - $admintest=1; + $xoopsModule =& XoopsModule::getByDirname("system"); + if ( !$xoopsUser->isAdmin($xoopsModule->mid()) ) { + redirect_header(XOOPS_URL.'/user.php',3,_NOPERM); + exit(); + } + $admintest=1; } else { - redirect_header(XOOPS_URL.'/user.php',3,_NOPERM); - exit(); + redirect_header(XOOPS_URL.'/user.php',3,_NOPERM); + exit(); } // include system category definitions include_once XOOPS_ROOT_PATH."/modules/system/constants.php"; $error = false; if ($admintest != 0) { - if (isset($fct) && $fct != '') { - if (file_exists(XOOPS_ROOT_PATH."/modules/system/admin/".$fct."/xoops_version.php")) { - - include_once( XOOPS_ROOT_PATH."/modules/system/language/" . $xoopsConfig['language'] . "/admin.php" ) ; - - if (file_exists(XOOPS_ROOT_PATH."/modules/system/language/".$xoopsConfig['language']."/admin/".$fct.".php")) { - include XOOPS_ROOT_PATH."/modules/system/language/".$xoopsConfig['language']."/admin/".$fct.".php"; - } elseif (file_exists(XOOPS_ROOT_PATH."/modules/system/language/english/admin/".$fct.".php")) { - include XOOPS_ROOT_PATH."/modules/system/language/english/admin/".$fct.".php"; - } - include XOOPS_ROOT_PATH."/modules/system/admin/".$fct."/xoops_version.php"; - $sysperm_handler =& xoops_gethandler('groupperm'); - $category = !empty($modversion['category'])? intval($modversion['category']) : 0; - unset($modversion); - if ($category > 0) { - $groups =& $xoopsUser->getGroups(); - if (in_array(XOOPS_GROUP_ADMIN, $groups) || false != $sysperm_handler->checkRight('system_admin', $category, $groups, $xoopsModule->getVar('mid'))){ - if (file_exists("../include/{$fct}.inc.php")) { - include_once "../include/{$fct}.inc.php" ; - } else { - $error = true; - } - } else { - $error = true; - } - } elseif ($fct == 'version') { - if (file_exists(XOOPS_ROOT_PATH."/modules/system/admin/version/main.php")) { - include_once XOOPS_ROOT_PATH."/modules/system/admin/version/main.php"; - } else { - $error = true; - } - } else { - $error = true; - } - } else { - $error = true; - } - } else { - $error = true; - } + if (isset($fct) && $fct != '') { + if (file_exists(XOOPS_ROOT_PATH."/modules/system/admin/".$fct."/xoops_version.php")) { + + include_once( XOOPS_ROOT_PATH."/modules/system/language/" . $xoopsConfig['language'] . "/admin.php" ) ; + + if (file_exists(XOOPS_ROOT_PATH."/modules/system/language/".$xoopsConfig['language']."/admin/".$fct.".php")) { + include XOOPS_ROOT_PATH."/modules/system/language/".$xoopsConfig['language']."/admin/".$fct.".php"; + } elseif (file_exists(XOOPS_ROOT_PATH."/modules/system/language/english/admin/".$fct.".php")) { + include XOOPS_ROOT_PATH."/modules/system/language/english/admin/".$fct.".php"; + } + include XOOPS_ROOT_PATH."/modules/system/admin/".$fct."/xoops_version.php"; + $sysperm_handler =& xoops_gethandler('groupperm'); + $category = !empty($modversion['category'])? intval($modversion['category']) : 0; + unset($modversion); + if ($category > 0) { + $groups =& $xoopsUser->getGroups(); + if (in_array(XOOPS_GROUP_ADMIN, $groups) || false != $sysperm_handler->checkRight('system_admin', $category, $groups, $xoopsModule->getVar('mid'))) { + if (file_exists("../include/{$fct}.inc.php")) { + include_once "../include/{$fct}.inc.php" ; + } else { + $error = true; + } + } else { + $error = true; + } + } elseif ($fct == 'version') { + if (file_exists(XOOPS_ROOT_PATH."/modules/system/admin/version/main.php")) { + include_once XOOPS_ROOT_PATH."/modules/system/admin/version/main.php"; + } else { + $error = true; + } + } else { + $error = true; + } + } else { + $error = true; + } + } else { + $error = true; + } } if (false != $error) { - xoops_cp_header(); - echo "<h4>System Configuration</h4>"; - echo '<table class="outer" cellpadding="4" cellspacing="1">'; - echo '<tr>'; - $groups = $xoopsUser->getGroups(); - $all_ok = false; - if (!in_array(XOOPS_GROUP_ADMIN, $groups)) { - $sysperm_handler =& xoops_gethandler('groupperm'); - $ok_syscats =& $sysperm_handler->getItemIds('system_admin', $groups); - } else { - $all_ok = true; - } - $admin_dir = XOOPS_ROOT_PATH."/modules/system/admin"; - $handle = opendir($admin_dir); - $counter = 0; - $class = 'even'; - while ($file = readdir($handle)) { - if (strtolower($file) != 'cvs' && !preg_match("/[.]/", $file) && is_dir($admin_dir.'/'.$file)) { - include $admin_dir.'/'.$file.'/xoops_version.php'; - if ($modversion['hasAdmin']) { - $category = isset($modversion['category'])? intval($modversion['category']) : 0; - if (false != $all_ok || in_array($modversion['category'], $ok_syscats)) { - echo "<td class='$class' align='center' valign='bottom' width='19%'>"; - echo "<a href='".XOOPS_URL."/modules/system/admin.php?fct=".$file."'><b>" .trim($modversion['name'])."</b></a>\n"; - echo "</td>"; - $counter++; - $class = ($class == 'even')? 'odd' : 'even'; - } - if ( $counter > 4 ) { - $counter = 0; - echo "</tr>"; - echo "<tr>"; - } - } - unset($modversion); - } - } - while ($counter < 5) { - echo '<td class="'.$class.'"> </td>'; - $class = ($class == 'even')? 'odd' : 'even'; - $counter++; - } - echo '</tr></table>'; + xoops_cp_header(); + echo "<h4>System Configuration</h4>"; + echo '<table class="outer" cellpadding="4" cellspacing="1">'; + echo '<tr>'; + $groups = $xoopsUser->getGroups(); + $all_ok = false; + if (!in_array(XOOPS_GROUP_ADMIN, $groups)) { + $sysperm_handler =& xoops_gethandler('groupperm'); + $ok_syscats =& $sysperm_handler->getItemIds('system_admin', $groups); + } else { + $all_ok = true; + } + $admin_dir = XOOPS_ROOT_PATH."/modules/system/admin"; + $handle = opendir($admin_dir); + $counter = 0; + $class = 'even'; + while ($file = readdir($handle)) { + if (strtolower($file) != 'cvs' && !preg_match("/[.]/", $file) && is_dir($admin_dir.'/'.$file)) { + include $admin_dir.'/'.$file.'/xoops_version.php'; + if ($modversion['hasAdmin']) { + $category = isset($modversion['category'])? intval($modversion['category']) : 0; + if (false != $all_ok || in_array($modversion['category'], $ok_syscats)) { + echo "<td class='$class' align='center' valign='bottom' width='19%'>"; + echo "<a href='".XOOPS_URL."/modules/system/admin.php?fct=".$file."'><b>" .trim($modversion['name'])."</b></a>\n"; + echo "</td>"; + ++$counter; + $class = ($class == 'even')? 'odd' : 'even'; + } + if ($counter > 4) { + $counter = 0; + echo "</tr>"; + echo "<tr>"; + } + } + unset($modversion); + } + } + while ($counter < 5) { + echo '<td class="'.$class.'"> </td>'; + $class = ($class == 'even')? 'odd' : 'even'; + ++$counter; + } + echo '</tr></table>'; xoops_cp_footer(); } - -?> \ No newline at end of file Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/admin/admin_footer.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/admin/admin_footer.php 2015-02-18 18:20:22 UTC (rev 12996) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/admin/admin_footer.php 2015-02-18 18:28:39 UTC (rev 12997) @@ -1,28 +1,28 @@ -<?php -/* - * You may not change or alter any portion of this comment or credits - * of supporting developers from this source code or any supporting source code - * which is considered copyrighted (c) material of the original comment or credit authors. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ - -/** - * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ - * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html) - * @package - * @since - * @author XOOPS Development Team - * @version $Id $ - */ - -echo "<div class='adminfooter'>\n" - ." <div style='text-align: center;'>\n" - ." <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n" - ." </div>\n" - ." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n" - ."</div>"; - -xoops_cp_footer(); \ No newline at end of file +<?php +/* + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + */ + +/** + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html) + * @package + * @since + * @author XOOPS Development Team + * @version $Id $ + */ + +echo "<div class='adminfooter'>\n" + ." <div style='text-align: center;'>\n" + ." <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n" + ." </div>\n" + ." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n" + ."</div>"; + +xoops_cp_footer(); Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/admin/admin_header.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/admin/admin_header.php 2015-02-18 18:20:22 UTC (rev 12996) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/admin/admin_header.php 2015-02-18 18:28:39 UTC (rev 12997) @@ -1,63 +1,59 @@ -<?php -/* - * You may not change or alter any portion of this comment or credits - * of supporting developers from this source code or any supporting source code - * which is considered copyrighted (c) material of the original comment or credit authors. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ - -/** - * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ - * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html) - * @package - * @since - * @author XOOPS Development Team - * @version $Id $ - */ - -$path = dirname(dirname(dirname(dirname(__FILE__)))); -include_once $path . '/mainfile.php'; -include_once $path . '/include/cp_functions.php'; -require_once $path . '/include/cp_header.php'; - - - -include_once $path . "/kernel/module.php"; -include_once $path . "/class/xoopstree.php"; -include_once $path . "/class/xoopslists.php"; -include_once $path . '/class/pagenav.php'; -include_once $path . "/class/xoopsformloader.php"; - -include_once $path .'/modules/smartfaq/include/functions.php'; -include_once $path .'/modules/smartfaq/class/category.php'; -include_once $path .'/modules/smartfaq/class/faq.php'; -include_once $path .'/modules/smartfaq/class/answer.php'; - -$myts = &MyTextSanitizer::getInstance(); - - - -global $xoopsModule; - -$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname'); - -//if functions.php file exist -//require_once dirname(dirname(__FILE__)) . '/include/functions.php'; - -// Load language files -xoops_loadLanguage('admin', $thisModuleDir); -xoops_loadLanguage('modinfo', $thisModuleDir); -xoops_loadLanguage('main', $thisModuleDir); - -$pathIcon16 = '../'.$xoopsModule->getInfo('icons16'); -$pathIcon32 = '../'.$xoopsModule->getInfo('icons32'); -$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin'); - -if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))){ - include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'); - }else{ - redirect_header("../../../admin.php", 5, _AM_BIRTHDAY_MODULEADMIN_MISSING, false); - } \ No newline at end of file +<?php +/* + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + */ + +/** + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html) + * @package + * @since + * @author XOOPS Development Team + * @version $Id $ + */ + +$path = dirname(dirname(dirname(__DIR__))); +include_once $path . '/mainfile.php'; +include_once $path . '/include/cp_functions.php'; +require_once $path . '/include/cp_header.php'; + +include_once $path . "/kernel/module.php"; +include_once $path . "/class/xoopstree.php"; +include_once $path . "/class/xoopslists.php"; +include_once $path . '/class/pagenav.php'; +include_once $path . "/class/xoopsformloader.php"; + +include_once $path .'/modules/smartfaq/include/functions.php'; +include_once $path .'/modules/smartfaq/class/category.php'; +include_once $path .'/modules/smartfaq/class/faq.php'; +include_once $path .'/modules/smartfaq/class/answer.php'; + +$myts = &MyTextSanitizer::getInstance(); + +global $xoopsModule; + +$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname'); + +//if functions.php file exist +//require_once dirname(__DIR__) . '/include/functions.php'; + +// Load language files +xoops_loadLanguage('admin', $thisModuleDir); +xoops_loadLanguage('modinfo', $thisModuleDir); +xoops_loadLanguage('main', $thisModuleDir); + +$pathIcon16 = '../'.$xoopsModule->getInfo('icons16'); +$pathIcon32 = '../'.$xoopsModule->getInfo('icons32'); +$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin'); + +if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))) { + include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'); + } else { + redirect_header("../../../admin.php", 5, _AM_BIRTHDAY_MODULEADMIN_MISSING, false); + } Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/admin/admin_header2.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/admin/admin_header2.php 2015-02-18 18:20:22 UTC (rev 12996) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/admin/admin_header2.php 2015-02-18 18:28:39 UTC (rev 12997) @@ -7,8 +7,8 @@ * Licence: GNU */ -include_once "../../../mainfile.php"; -include_once '../../../include/cp_header.php'; +include_once dirname(dirname(dirname(__DIR__))) . '/mainfile.php'; +include_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php'; include_once XOOPS_ROOT_PATH . "/kernel/module.php"; include_once XOOPS_ROOT_PATH . "/class/xoopstree.php"; include_once XOOPS_ROOT_PATH . "/class/xoopslists.php"; @@ -21,5 +21,3 @@ include_once XOOPS_ROOT_PATH.'/modules/smartfaq/class/answer.php'; $myts = &MyTextSanitizer::getInstance(); - -?> \ No newline at end of file Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/admin/answer.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/admin/answer.php 2015-02-18 18:20:22 UTC (rev 12996) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/smartfaq/admin/answer.php 2015-02-18 18:28:39 UTC (rev 12997) @@ -7,7 +7,7 @@ * Licence: GNU */ -include_once("admin_header.php"); +include_once __DIR__ . '/admin_header.php'; $op = ''; @@ -21,262 +21,260 @@ function editfaq($faqid = '') { - global $answer_handler, $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $modify, $xoopsModuleConfig, $xoopsModule, $XOOPS_URL, $myts, $pathIcon16, $smartModuleConfig; + global $answer_handler, $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $modify, $xoopsModuleConfig, $xoopsModule, $XOOPS_URL, $myts, $pathIcon16, $smartModuleConfig; - include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php'; + include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php'; - // Creating the FAQ object - $faqObj = new sfFaq($faqid); + // Creating the FAQ object + $faqObj = new sfFaq($faqid); - // Creating the category object - $categoryObj =& $faqObj->category(); + // Creating the category object + $categoryObj =& $faqObj->category(); - if ($faqObj->notLoaded()) { - redirect_header("index.php", 1, _AM_SF_NOFAQSELECTED); - exit(); - } + if ($faqObj->notLoaded()) { + redirect_header("index.php", 1, _AM_SF_NOFAQSELECTED); + exit(); + } - switch ($faqObj->status()) { + switch ($faqObj->status()) { - case _SF_STATUS_ANSWERED : - $breadcrumb_action1 = _AM_SF_SUBMITTED; - $breadcrumb_action2 = _AM_SF_APPROVING; - $collapsableBar_title = _AM_SF_SUBMITTED_TITLE; - $collapsableBar_info = _AM_SF_SUBMITTED_INFO; - $button_caption = _AM_SF_APPROVE; - $an_status = _SF_AN_STATUS_PROPOSED; - break; + case _SF_STATUS_ANSWERED : + $breadcrumb_action1 = _AM_SF_SUBMITTED; + $breadcrumb_action2 = _AM_SF_APPROVING; + $collapsableBar_title = _AM_SF_SUBMITTED_TITLE; + $collapsableBar_info = _AM_SF_SUBMITTED_INFO; + $button_caption = _AM_SF_APPROVE; + $an_status = _SF_AN_STATUS_PROPOSED; + break; - } + } - $module_id = $xoopsModule->getVar('mid'); - $gperm_handler = &xoops_gethandler('groupperm'); - $groups = ($xoopsUser)? ($xoopsUser->getGroups()) : XOOPS_GROUP_ANONYMOUS; + $module_id = $xoopsModule->getVar('mid'); + $gperm_handler = &xoops_gethandler('groupperm'); + $groups = ($xoopsUser)? ($xoopsUser->getGroups()) : XOOPS_GROUP_ANONYMOUS; - if (!sf_userIsAdmin() && (!($gperm_handler->checkRight('category_admin', $faqObj->categoryid(), $groups, $module_id)))) { - redirect_header("javascript:history.go(-1)", 1, _NOPERM); - exit; - } - // Retreiving the official answer - $official_answer = $faqObj->answer(); + if (!sf_userIsAdmin() && (!($gperm_handler->checkRight('category_admin', $faqObj->categoryid(), $groups, $module_id)))) { + redirect_header("javascript:history.go(-1)", 1, _NOPERM); + exit; + } + // Retreiving the official answer + $official_answer = $faqObj->answer(); - //sf_adminMenu(-1, _AM_SF_SMARTFAQ . " > " . _AM_SF_ANSWER); + //sf_adminMenu(-1, _AM_SF_SMARTFAQ . " > " . _AM_SF_ANSWER); - sf_collapsableBar('bottomtable', 'bottomtableicon'); - echo "<img id='bottomtableicon' src=" . XOOPS_URL . "/modules/" . $xoopsModule->dirname() . "/images/icon/close12.gif alt='' /></a> " . _AM_SF_SUBMITTED_ANSWER . "</h3>"; - echo "<div id='bottomtable'>"; - echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_SF_SUBMITTED_ANSWER_INFO . "</span>"; + sf_collapsableBar('bottomtable', 'bottomtableicon'); + echo "<img id='bottomtableicon' src=" . XOOPS_URL . "/modules/" . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt='' /></a> " . _AM_SF_SUBMITTED_ANSWER . "</h3>"; + echo "<div id='bottomtable'>"; + echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_SF_SUBMITTED_ANSWER_INFO . "</span>"; - $proposed_answers = $answer_handler->getAllAnswers($faqid, _SF_AN_STATUS_PROPOSED); + $proposed_answers = $answer_handler->getAllAnswers($faqid, _SF_AN_STATUS_PROPOSED); - if (count($proposed_answers) == 0) { - redirect_header("index.php", 1, _AM_SF_NOANSWERS); - exit(); - } + if (count($proposed_answers) == 0) { + redirect_header("index.php", 1, _AM_SF_NOANSWERS); + exit(); + } - echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer> - <tr> - <td class='head' width='100px'>" . _AM_SF_CATEGORY . "</td> - <td class='even'>" . $categoryObj->name() . "</td> - </tr> - <tr> - <td class='head' width='100px'>" . _AM_SF_QUESTION . "</td> - <td class='even'>" . $faqObj->question() . "</td> - </tr>"; - if ($official_answer) { - echo " - <tr> - <td class='head' width='100px'>" . _AM_SF_ANSWER_OFFICIAL . "</td> - <td class='even'>" . $official_answer->answer() . "</td> - </tr>"; - } - echo "</table><br />\n"; + echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer> + <tr> + <td class='head' width='100px'>" . _AM_SF_CATEGORY . "</td> + <td class='even'>" . $categoryObj->name() . "</td> + </tr> + <tr> + <td class='head' width='100px'>" . _AM_SF_QUESTION . "</td> + <td class='even'>" . $faqObj->question() . "</td> + </tr>"; + if ($official_answer) { + echo " + <tr> + <td class='head' width='100px'>" . _AM_SF_ANSWER_OFFICIAL . "</td> + <td class='even'>" . $official_answer->answer() . "</td> + </tr>"; + } + echo "</table><br />\n"; - echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>"; - echo "<tr>"; - echo "<th width='40' class='bg3' align='center'><b>" . _AM_SF_ARTID . "</b></td>"; - echo "<th class='bg3' class='bg3' align='center'><b>" . _AM_SF_ANSWER . "</b></td>"; + echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>"; + echo "<tr>"; + echo "<th width='40' class='bg3' align='center'><b>" . _AM_SF_ARTID . "</b></td>"; + echo "<th class='bg3' class='bg3' align='center'><b>" . _AM_SF_ANSWER . "</b></td>"; echo "<th width='90' class='bg3' align='center'><b>" . _AM_SF_ANSWERED . "</b></td>"; - echo "<th width='180' class='bg3' align='center'><b>" . _AM_SF_CREATED . "</b></td>"; - echo "<th width='120' class='bg3' align='center'><b>" . _AM_SF_ACTION . "</b></td>"; - echo "</tr>"; + echo "<th width='180' class='bg3' align='center'><b>" . _AM_SF_CREATED . "</b></td>"; + echo "<th width='120' class='bg3' align='center'><b>" . _AM_SF_ACTION . "</b></td>"; + echo "</tr>"; - $merge = ''; - $modify = ''; - $approve = ''; - foreach ($proposed_answers as $proposed_answer) { - if ($faqObj->status() == _SF_STATUS_NEW_ANSWER) { - $merge = "<a href='faq.php?op=merge&faqid=" . $faqObj->faqid() . "&answerid=" . $proposed_answer->answerid() . "'><img src='" . XOOPS_URL . "/modules/" . $xoopsModule->dirname() . "/images/icon/merge.gif' title='" . _AM_SF_FAQ_MERGE . "' alt='" . _AM_SF_FAQ_MERGE . "' /></a> "; - $approve = "<a href='answer.php?op=selectanswer&faqid=" . $faqid . "&answerid=" . $proposed_answer->answerid() . "'><img src='". $pathIcon16 .'/on.png'."' title='" . _AM_SF_FAQ_APPROVE_NEW_ANSWER . "' alt='" . _AM_SF_APPROVESUB . "' /></a>"; - } - $modify = "<a href='faq.php?op=mod&faqid=" . $faqObj->faqid() . "&answerid=" . $proposed_answer->answerid() . "'><img src='". $pathIcon16 .'/edit.png'."' title='" . _AM_SF_FAQ_REVIEW . "' alt='" . _AM_SF_FAQ_REVIEW . "' /></a> "; - $delete = "<a href='answer.php?op=del&faqid=" . $faqObj->faqid() . "&answerid=" . $proposed_answer->answerid() . "'><img src='". $pathIcon16 .'/delete.png'."' title='" . _AM_SF_DELETESUBM . "' alt='" . _AM_SF_DELETESUBM . "' /></a>"; - echo "<tr>"; - echo "<td class='head' align='center'>" . $proposed_answer->answerid(). "</td>"; - echo "<td class='even' align='left'>" . $proposed_answer->answer() . "</td>"; + $merge = ''; + $modify = ''; + $approve = ''; + foreach ($proposed_answers as $proposed_answer) { + if ($faqObj->status() == _SF_STATUS_NEW_ANSWER) { + $merge = "<a href='faq.php?op=merge&faqid=" . $faqObj->faqid() . "&answerid=" . $proposed_answer->answerid() . "'><img src='" . XOOPS_URL . "/modules/" . $xoopsModule->dirname() . "/assets/images/icon/merge.gif' title='" . _AM_SF_FAQ_MERGE . "' alt='" . _AM_SF_FAQ_MERGE . "' /></a> "; + $approve = "<a href='answer.php?op=selectanswer&faqid=" . $faqid . "&answerid=" . $proposed_answer->answerid() . "'><img src='". $pathIcon16 .'/on.png'."' title='" . _AM_SF_FAQ_APPROVE_NEW_ANSWER . "' alt='" . _AM_SF_APPROVESUB . "' /></a>"; + } + $modify = "<a href='faq.php?op=mod&faqid=" . $faqObj->faqid() . "&answerid=" . $proposed_answer->answerid() . "'><img src='". $pathIcon16 .'/edit.png'."' title='" . _AM_SF_FAQ_REVIEW . "' alt='" . _AM_SF_FAQ_REVIEW . "' /></a> "; + $delete = "<a href='answer.php?op=del&faqid=" . $faqObj->faqid() . "&answerid=" . $proposed_answer->answerid() . "'><img src='". $pathIcon16 .'/delete.png'."' title='" . _AM_SF_DELETESUBM . "' alt='" . _AM_SF_DELETESUBM . "' /></a>"; + echo "<tr>"; + echo "<td class='head' align='center'>" . $proposed_answer->answerid(). "</td>"; + echo "<td class='even' align='left'>" . $proposed_answer->answer() . "</td>"; //show name of the answer submitter $submitter= sf_getLinkedUnameFromId($proposed_answer->uid(), $smartModuleConfig['userealname']); echo "<td class='even' align='center'>" . $submitter . "</td>"; - echo "<td class='even' align='center'>" . $proposed_answer->datesub() . "</td>"; - echo "<td class='even' align='center'> $merge $modify $approve $delete </td>"; - echo "</tr>"; - } + echo "<td class='even' align='center'>" . $proposed_answer->datesub() . "</td>"; + echo "<td class='even' align='center'> $merge $modify $approve $delete </td>"; + echo "</tr>"; + } - echo "</table>\n<br />"; + echo "</table>\n<br />"; } /* -- Available operations -- */ switch ($op) { - case "mod": - xoops_cp_header(); - include_once XOOPS_ROOT_PATH . "/class/xoopsformloader.php"; - Global $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule, $modify, $myts; - $faqid = isset($_GET['faqid'])? intval($_GET['faqid']) : 0; - editfaq($faqid); - break; + case "mod": + xoops_cp_header(); + include_once XOOPS_ROOT_PATH . "/class/xoopsformloader.php"; + Global $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule, $modify, $myts; + $faqid = isset($_GET['faqid'])? intval($_GET['faqid']) : 0; + editfaq($faqid); + break; - case "selectanswer": - global $xoopsUser, $_GET, $xoopsModuleConfig; + case "selectanswer": + global $xoopsUser, $_GET, $xoopsModuleConfig; - $faqid = isset($_GET['faqid'])? intval($_GET['faqid']) : 0; - $answerid = isset($_GET['answerid'])? intval($_GET['answerid']) : 0; + $faqid = isset($_GET['faqid'])? intval($_GET['faqid']) : 0; + $answerid = isset($_GET['answerid'])? intval($_GET['answerid']) : 0; - // Creating the FAQ object - $faqObj = new sfFaq($faqid); + // Creating the FAQ object + $faqObj = new sfFaq($faqid); - if ($faqObj->notLoaded()) { - redirect_header("index.php", 1, _AM_SF_NOFAQSELECTED); - exit(); - } + if ($faqObj->notLoaded()) { + redirect_header("index.php", 1, _AM_SF_NOFAQSELECTED); + exit(); + } - // Creating the answer object - $answerObj = new sfAnswer($answerid); + // Creating the answer object + $answerObj = new sfAnswer($answerid); - if ($answerObj->notLoaded()) { - redirect_header("index.php", 1, _AM_SF_NOFAQSELECTED); - exit(); - } + if ($answerObj->notLoaded()) { + redirect_header("index.php", 1, _AM_SF_NOFAQSELECTED); + exit(); + } - $answerObj->setVar('status', _SF_AN_STATUS_APPROVED); + $answerObj->setVar('status', _SF_AN_STATUS_APPROVED); - $notifToDo_answer = null; - $notifToDo_faq = null; + $notifToDo_answer = null; + $notifToDo_faq = null; - switch ($faqObj->status()) - { - // This was an Open Question that became a Submitted FAQ - case _SF_STATUS_ANSWERED : - if ( $xoopsModuleConfig['autoapprove_submitted_faq'] == 1) { - // We automatically approve Submitted Q&A - $redirect_msg = _AM_SF_ANSWER_APPROVED_PUBLISHED; - $faqObj->setVar('status', _SF_STATUS_PUBLISHED); - $answerObj->setVar('status', _SF_AN_STATUS_APPROVED); - $notifToDo_faq = array(_SF_NOT_FAQ_PUBLISHED); - } else { - // Submitted Q&A need approbation - $redirect_msg = _AM_SF_ANSWER_APPROVED_NEED_APPROVED; - $faqObj->setVar('status', _SF_STATUS_SUBMITTED); - $answerObj->setVar('status', _SF_AN_STATUS_APPROVED); - $notifToDo_faq = array(_SF_NOT_FAQ_SUBMITTED); - } - break; + switch ($faqObj->status()) { + // This was an Open Question that became a Submitted FAQ + case _SF_STATUS_ANSWERED : + if ($xoopsModuleConfig['autoapprove_submitted_faq'] == 1) { + // We automatically approve Submitted Q&A + $redirect_msg = _AM_SF_ANSWER_APPROVED_PUBLISHED; + $faqObj->setVar('status', _SF_STATUS_PUBLISHED); + $answerObj->setVar('status', _SF_AN_STATUS_APPROVED); + $notifToDo_faq = array(_SF_NOT_FAQ_PUBLISHED); + } else { + // Submitted Q&A need approbation + $redirect_msg = _AM_SF_ANSWER_APPROVED_NEED_APPROVED; + $faqObj->setVar('status', _SF_STATUS_SUBMITTED); + $answerObj->setVar('status', _SF_AN_STATUS_APPROVED); + $notifToDo_faq = array(_SF_NOT_FAQ_SUBMITTED); + } + break; - // This is a published FAQ for which a user submitted a new answer and we just accepeted one - case _SF_STATUS_NEW_ANSWER : - $redirect_msg = _AM_SF_FAQ_NEW_ANSWER_PUBLISHED; - $faqObj->setVar('status', _SF_STATUS_PUBLISHED); - $answerObj->setVar('status', _SF_AN_STATUS_APPROVED); - $notifToDo_answer = array(_SF_NOT_ANSWER_APPROVED); - break; - } + // This is a published FAQ for which a user submitted a new answer and we just accepeted one + case _SF_STATUS_NEW_ANSWER : + $redirect_msg = _AM_SF_FAQ_NEW_ANSWER_PUBLISHED; + $faqObj->setVar('status', _SF_STATUS_PUBLISHED); + $answerObj->setVar('status', _SF_AN_STATUS_APPROVED); + $notifToDo_answer = array(_SF_NOT_ANSWER_APPROVED); + break; + } - // Storing the FAQ object in the database - if ( !$faqObj->store() ) { - redirect_header("javascript:history.go(-1)", 2, _AM_SF_ERROR_FAQ_NOT_SAVED); - exit(); - } + // Storing the FAQ object in the database + if ( !$faqObj->store() ) { + redirect_header("javascript:history.go(-1)", 2, _AM_SF_ERROR_FAQ_NOT_SAVED); + exit(); + } - // Storing the answer object in the database - if ( !$answerObj->store() ) { - redirect_header("javascript:history.go(-1)", 2, _AM_SF_ERROR_ANSWER_NOT_SAVED); - exit(); - } + // Storing the answer object in the database + if ( !$answerObj->store() ) { + redirect_header("javascript:history.go(-1)", 2, _AM_SF_ERROR_ANSWER_NOT_SAVED); + exit(); + } - // Send FAQ notifications - if (!empty($notifToDo_faq)) { - $faqObj->sendNotifications($notifToDo_faq); - } + // Send FAQ notifications + if (!empty($notifToDo_faq)) { + $faqObj->sendNotifications($notifToDo_faq); + } - // Send answer notifications - if (!empty($notifToDo_answer)) { - $answerObj->sendNotifications($notifToDo_answer); - } + // Send answer notifications + if (!empty($notifToDo_answer)) { + $answerObj->sendNotifications($notifToDo_answer); + } + redirect_header("index.php", 2, $redirect_msg); + exit(); + break; - redirect_header("index.php", 2, $redirect_msg); - exit(); - break; + case "del": + Global $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB; - case "del": - Global $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB; + $faqid = isset($_POST['faqid'])? intval($_POST['faqid']) : 0; + $faqid = isset($_GET['faqid'])? intval($_GET['faqid']) : $faqid; + $answerid = isset($_POST['answerid'])? intval($_POST['answerid']) : 0; + $answerid = isset($_GET['answerid'])? intval($_GET['answerid']) : $answerid; + $confirm = isset($_POST['confirm'])? intval($_POST['confirm']) : 0; + $faqObj = new sfFaq($faqid); + $answerObj = new sfAnswer($answerid); + if ($confirm) { + $answerObj->setVar('status', _SF_AN_STATUS_REJECTED); + $answerObj->store(); - $faqid = isset($_POST['faqid'])? intval($_POST['faqid']) : 0; - $faqid = isset($_GET['faqid'])? intval($_GET['faqid']) : $faqid; - $answerid = isset($_POST['answerid'])? intval($_POST['answerid']) : 0; - $answerid = isset($_GET['answerid'])? intval($_GET['answerid']) : $answerid; - $confirm = isset($_POST['confirm'])? intval($_POST['confirm']) : 0; - $faqObj = new sfFaq($faqid); - $answerObj = new sfAnswer($answerid); - if ($confirm) { - $answerObj->setVar('status', _SF_AN_STATUS_REJECTED); - $answerObj->store(); + switch ($faqObj->status()) { + // Open Question for which we are rejecting an answer + case _SF_STATUS_ANSWERED : + $redirect_page = "index.php"; + $redirect_msg = _AM_SF_ANSWER_REJECTED_OPEN_QUESTION; + $faqObj->setVar('status', _SF_STATUS_OPENED); + break; - switch ($faqObj->status()) { - // Open Question for which we are rejecting an answer - case _SF_STATUS_ANSWERED : - $redirect_page = "index.php"; - $redirect_msg = _AM_SF_ANSWER_REJECTED_OPEN_QUESTION; - $faqObj->setVar('status', _SF_STATUS_OPENED); - break; + case _SF_STATUS_NEW_ANSWER : + $proposed_answers = $answer_handler->getAllAnswers($faqid, _SF_AN_STATUS_PROPOSED); + if (count($proposed_answers) > 0) { + // This question has other proposed answer + $redirect_page = "answer.php?op=mod&faqid=" . $faqid; + $redirect_msg = _AM_SF_ANSWER_REJECTED; + } else { + // The question has no other proposed answer + $redirect_page = "index.php"; + $redirect_msg = _AM_SF_ANSWER_REJECTED; + $faqObj->setVar('status', _SF_STATUS_PUBLISHED); + } + break; + } + $faqObj->store(); + redirect_header($redirect_page, 3, $redirect_msg); + ... [truncated message content] |