From: <zy...@us...> - 2015-02-20 05:05:20
|
Revision: 13004 http://sourceforge.net/p/xoops/svn/13004 Author: zyspec Date: 2015-02-20 05:05:11 +0000 (Fri, 20 Feb 2015) Log Message: ----------- * minor PSRx naming convention updates * minor XOOPS variable name updates for consistency * minor template CSS changes Modified Paths: -------------- XoopsModules/randomquote/branches/zyspec/randomquote/admin/admin_footer.php XoopsModules/randomquote/branches/zyspec/randomquote/admin/admin_header.php XoopsModules/randomquote/branches/zyspec/randomquote/admin/main.php XoopsModules/randomquote/branches/zyspec/randomquote/admin/menu.php XoopsModules/randomquote/branches/zyspec/randomquote/class/quotes.php XoopsModules/randomquote/branches/zyspec/randomquote/docs/changelog.txt XoopsModules/randomquote/branches/zyspec/randomquote/header.php XoopsModules/randomquote/branches/zyspec/randomquote/include/action.module.php XoopsModules/randomquote/branches/zyspec/randomquote/include/functions.php XoopsModules/randomquote/branches/zyspec/randomquote/include/plugin.tag.php XoopsModules/randomquote/branches/zyspec/randomquote/include/search.inc.php XoopsModules/randomquote/branches/zyspec/randomquote/index.php XoopsModules/randomquote/branches/zyspec/randomquote/xoops_version.php Modified: XoopsModules/randomquote/branches/zyspec/randomquote/admin/admin_footer.php =================================================================== --- XoopsModules/randomquote/branches/zyspec/randomquote/admin/admin_footer.php 2015-02-20 04:45:42 UTC (rev 13003) +++ XoopsModules/randomquote/branches/zyspec/randomquote/admin/admin_footer.php 2015-02-20 05:05:11 UTC (rev 13004) @@ -24,10 +24,10 @@ */ echo "<div class='adminfooter'>\n" - . " <div class='center'>\n" + . " <div class='txtcenter'>\n" . " <a href='" . $GLOBALS['xoopsModule']->getInfo('author_website_url') . "' target='_blank'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='" . $GLOBALS['xoopsModule']->getInfo('author_website_name') . "' title='" . $GLOBALS['xoopsModule']->getInfo('author_website_name') . "' /></a>\n" . " </div>\n" - . " <div class='center smallsmall italic pad5'>\n" + . " <div class='txtcenter smallsmall italic pad5'>\n" . " " . _AM_RANDOMQUOTE_MAINTAINED_BY . " <a class='tooltip' rel='external' href='http://" . $GLOBALS['xoopsModule']->getInfo('module_website_url') . "' " . "title='" . _AM_RANDOMQUOTE_MAINTAINED_TITLE . "'>" . _AM_RANDOMQUOTE_MAINTAINED_TEXT . "</a>\n" Modified: XoopsModules/randomquote/branches/zyspec/randomquote/admin/admin_header.php =================================================================== --- XoopsModules/randomquote/branches/zyspec/randomquote/admin/admin_header.php 2015-02-20 04:45:42 UTC (rev 13003) +++ XoopsModules/randomquote/branches/zyspec/randomquote/admin/admin_header.php 2015-02-20 05:05:11 UTC (rev 13004) @@ -23,21 +23,21 @@ * @since 2.0.0 */ -$thisDirname = basename(dirname(__DIR__)); +$moduleDirname = basename(dirname(__DIR__)); include_once dirname(dirname(dirname(__DIR__))) . '/mainfile.php'; include_once $GLOBALS['xoops']->path('/include/cp_header.php'); -//include_once $GLOBALS['xoops']->path("modules/{$thisDirname}/include/config.php"); -include_once $GLOBALS['xoops']->path("modules/{$thisDirname}/include/functions.php"); +//include_once $GLOBALS['xoops']->path("modules/{$moduleDirname}/include/config.php"); +include_once $GLOBALS['xoops']->path("modules/{$moduleDirname}/include/functions.php"); -XoopsLoad::load('xoopsrequest'); -XoopsLoad::load('quotes', $thisDirname); -XoopsLoad::load('constants', $thisDirname); +XoopsLoad::load('XoopsRequest'); +XoopsLoad::load('quotes', $moduleDirname); +XoopsLoad::load('constants', $moduleDirname); $pathIcon16 = $GLOBALS['xoops']->url('www/' . $GLOBALS['xoopsModule']->getInfo('icons16')); $pathIcon32 = $GLOBALS['xoops']->url('www/' . $GLOBALS['xoopsModule']->getInfo('icons32')); $pathModuleAdmin = $GLOBALS['xoops']->path('www/' . $GLOBALS['xoopsModule']->getInfo('dirmoduleadmin')); -$quotesHandler =& xoops_getModuleHandler('quotes', $thisDirname); +$quotesHandler =& xoops_getModuleHandler('quotes', $moduleDirname); $myts =& MyTextSanitizer::getInstance(); if (!isset($GLOBALS['xoopsTpl']) || !($GLOBALS['xoopsTpl'] instanceof XoopsTpl)) { @@ -48,9 +48,9 @@ $GLOBALS['xoopsTpl']->assign('pathIcon16', $pathIcon16); $GLOBALS['xoopsTpl']->assign('pathIcon32', $pathIcon32); //Load languages -xoops_loadLanguage('admin', $thisDirname); -xoops_loadLanguage('modinfo', $thisDirname); -xoops_loadLanguage('main', $thisDirname); +xoops_loadLanguage('admin', $moduleDirname); +xoops_loadLanguage('modinfo', $moduleDirname); +xoops_loadLanguage('main', $moduleDirname); require_once "{$pathModuleAdmin}/moduleadmin/moduleadmin.php"; xoops_cp_header(); Modified: XoopsModules/randomquote/branches/zyspec/randomquote/admin/main.php =================================================================== --- XoopsModules/randomquote/branches/zyspec/randomquote/admin/main.php 2015-02-20 04:45:42 UTC (rev 13003) +++ XoopsModules/randomquote/branches/zyspec/randomquote/admin/main.php 2015-02-20 05:05:11 UTC (rev 13004) @@ -25,10 +25,8 @@ include_once __DIR__ . '/admin_header.php'; -//xoops_load('xoopsrequest'); +$op = XoopsRequest::getCmd('op', ''); -$op = XoopsRequest::getCmd('op', ''); -//$op = cleanVarsRandomquote($_REQUEST, 'op', '', 'string'); switch ($op) { case "list": default: @@ -45,20 +43,20 @@ $criteria->setOrder('ASC'); $quotesObjArray = $quotesHandler->getAll($criteria); $quoteCount = (!empty($quotesObjArray) ? count($quotesObjArray) : 0); -// $quoteCount = $quotesHandler->getCount(); //Table view if ($quoteCount) { - echo "<table class='width100 outer' cellspacing='1'>\n" - . " <thead>\n" + echo "\n" + . "<table class='outer width100 bspacing1'>\n" + . "<thead>\n" . " <tr>\n" . " <th class='txtcenter'>" . _AM_RANDOMQUOTE_QUOTES_QUOTE . "</th>\n" . " <th class='txtcenter'>" . _AM_RANDOMQUOTE_QUOTES_AUTHOR . "</th>\n" . " <th class='txtcenter'>" . _AM_RANDOMQUOTE_QUOTES_STATUS . "</th>\n" . " <th class='txtcenter width10'>" . _AM_RANDOMQUOTE_FORMACTION . "</th>\n" . " </tr>\n" - . " </thead>\n" - . " <tbody>\n"; + . "</thead>\n" + . "<tbody>\n"; $class = 'even'; @@ -83,7 +81,7 @@ . " </td>\n" . " </tr>\n"; } - echo " </tbody>\n" + echo "</tbody>\n" . "</table><br /><br />\n"; } @@ -135,11 +133,11 @@ ); if ($objId = $quotesHandler->insert($obj)) { -// $module_handler =& xoops_gethandler('module'); +// $moduleHandler =& xoops_gethandler('module'); $tagModule =& XoopsModule::getByDirname('tag'); if (($tagModule instanceof XoopsModule) && ($tagModule->isactive())) { - $tag_handler =& xoops_getmodulehandler('tag', 'tag'); - $tag_handler->updateByItem($input->item_tag, $objId, $thisDirname, 0); + $tagHandler =& xoops_getmodulehandler('tag', 'tag'); + $tagHandler->updateByItem($input->item_tag, $objId, $thisDirname, 0); } redirect_header("main.php?op=list", RandomquoteConstants::REDIRECT_DELAY_MEDIUM, $add_msg); } @@ -185,11 +183,11 @@ $item_id = $obj->getVar('id'); if ($quotesHandler->delete($obj)) { // now clear out items in tag module for this item - $module_handler =& xoops_gethandler('module'); + $moduleHandler =& xoops_gethandler('module'); $tagModule =& XoopsModule::getByDirname('tag'); if (($tagModule instanceof XoopsModule) && ($tagModule->isactive())) { - $tag_handler =& xoops_getmodulehandler('tag', 'tag'); - $tag_handler->updateByItem(array(), $item_id, $thisDirname); //clear all tags for this item + $tagHandler =& xoops_getmodulehandler('tag', 'tag'); + $tagHandler->updateByItem(array(), $item_id, $thisDirname); //clear all tags for this item } redirect_header($_SERVER['PHP_SELF'], RandomquoteConstants::REDIRECT_DELAY_MEDIUM, _AM_RANDOMQUOTE_FORMDELOK); } else { Modified: XoopsModules/randomquote/branches/zyspec/randomquote/admin/menu.php =================================================================== --- XoopsModules/randomquote/branches/zyspec/randomquote/admin/menu.php 2015-02-20 04:45:42 UTC (rev 13003) +++ XoopsModules/randomquote/branches/zyspec/randomquote/admin/menu.php 2015-02-20 05:05:11 UTC (rev 13004) @@ -23,21 +23,21 @@ * @since 2.0.0 */ -$dirname = basename(dirname(__DIR__)); -$module_handler =& xoops_gethandler("module"); -$xoopsModule =& XoopsModule::getByDirname($dirname); -$moduleInfo =& $module_handler->get($xoopsModule->getVar("mid")); -$pathIcon32 = '../../' . $moduleInfo->getInfo('icons32'); +$moduleDirname = basename(dirname(__DIR__)); +$moduleHandler =& xoops_gethandler("module"); +$xoopsModule =& XoopsModule::getByDirname($moduleDirname); +$moduleInfo =& $moduleHandler->get($xoopsModule->getVar("mid")); +$pathIcon32 = '../../' . $moduleInfo->getInfo('icons32'); -$adminmenu = array(array("title" => _MI_RANDOMQUOTE_ADMENU1, - "link" => 'admin/index.php', - "icon" => "{$pathIcon32}/home.png"), +$adminmenu = array(array('title' => _MI_RANDOMQUOTE_ADMENU1, + 'link' => 'admin/index.php', + 'icon' => "{$pathIcon32}/home.png"), - array("title" => _MI_RANDOMQUOTE_ADMENU2, - "link" => 'admin/main.php', - "icon" => "{$pathIcon32}/content.png"), + array('title' => _MI_RANDOMQUOTE_ADMENU2, + 'link' => 'admin/main.php', + 'icon' => "{$pathIcon32}/content.png"), - array("title" => _MI_RANDOMQUOTE_ADMENU3, - "link" => 'admin/about.php', - "icon" => "{$pathIcon32}/about.png") + array('title' => _MI_RANDOMQUOTE_ADMENU3, + 'link' => 'admin/about.php', + 'icon' => "{$pathIcon32}/about.png") ); Modified: XoopsModules/randomquote/branches/zyspec/randomquote/class/quotes.php =================================================================== --- XoopsModules/randomquote/branches/zyspec/randomquote/class/quotes.php 2015-02-20 04:45:42 UTC (rev 13003) +++ XoopsModules/randomquote/branches/zyspec/randomquote/class/quotes.php 2015-02-20 05:05:11 UTC (rev 13004) @@ -99,17 +99,17 @@ * load the formtag class * display the tag form element to collect the tag item */ - $module_handler =& xoops_gethandler('module'); - $tagModule =& XoopsModule::getByDirname('tag'); + $moduleHandler =& xoops_gethandler('module'); + $tagModule =& XoopsModule::getByDirname('tag'); if (($tagModule instanceof XoopsModule) && ($tagModule->isactive())) { $tagClassExists = XoopsLoad::load('formtag', 'tag'); // get the TagFormTag class if ($tagClassExists) { if ($this->isNew()) { $tag_items = array(); } else { - $moduleMid = $GLOBALS['xoopsModule']->mid(); - $tag_handler =& xoops_getmodulehandler('tag', 'tag'); - $tag_items = $tag_handler->getByItem($id, $moduleMid, 0); + $moduleMid = $GLOBALS['xoopsModule']->mid(); + $tagHandler =& xoops_getmodulehandler('tag', 'tag'); + $tag_items = $tagHandler->getByItem($id, $moduleMid, 0); } $tag_string = implode('|', $tag_items); $form->addElement(new TagFormTag('item_tag', 60, 255, $tag_string, 0)); Modified: XoopsModules/randomquote/branches/zyspec/randomquote/docs/changelog.txt =================================================================== --- XoopsModules/randomquote/branches/zyspec/randomquote/docs/changelog.txt 2015-02-20 04:45:42 UTC (rev 13003) +++ XoopsModules/randomquote/branches/zyspec/randomquote/docs/changelog.txt 2015-02-20 05:05:11 UTC (rev 13004) @@ -1,4 +1,4 @@ -<u>Version 2.1 Beta 2 from 2015-1-28</u> +<u>Version 2.1 Beta 2 from 2015-2-10</u> - added breadcrumb display to top of index page - improved index.tpl rendering - changed to allow HTML in quote entry (XoopsRequest::getText) in admin @@ -7,6 +7,8 @@ - fixed bug where 'item_tag' wasn't correctly assigned to template in /class/quotes.php - fixed bug in install script PHP version checking - fixed bug where language file wasn't being loaded in install script +- improved PSRx naming nomenclature +- removed cleanVarsRandomquote function since it was deprecated in Beta 1 <u>Version 2.1 Beta 1 from 2014-12-08</u> - require PHP 5.3 Modified: XoopsModules/randomquote/branches/zyspec/randomquote/header.php =================================================================== --- XoopsModules/randomquote/branches/zyspec/randomquote/header.php 2015-02-20 04:45:42 UTC (rev 13003) +++ XoopsModules/randomquote/branches/zyspec/randomquote/header.php 2015-02-20 05:05:11 UTC (rev 13004) @@ -20,14 +20,14 @@ */ include dirname(dirname(__DIR__)) . '/mainfile.php'; -$dirname = $GLOBALS['xoopsModule']->getVar('dirname'); -//include $GLOBALS['xoops']->path("/modules/{$dirname}/include/config.php"); -include $GLOBALS['xoops']->path("/modules/{$dirname}/include/functions.php"); +$moduleDirname = $GLOBALS['xoopsModule']->getVar('dirname'); +//include $GLOBALS['xoops']->path("/modules/{$moduleDirname}/include/config.php"); +include $GLOBALS['xoops']->path("/modules/{$moduleDirname}/include/functions.php"); //$myts =& MyTextSanitizer::getInstance(); -$style = "modules/{$dirname}/include/style.css"; +$style = "modules/{$moduleDirname}/include/style.css"; if (file_exists($GLOBALS['xoops']->path($style))) { $GLOBALS['xoTheme']->addStylesheet($GLOBALS['xoops']->url("www/{$stylesheet}")); } -$quotesHandler =& xoops_getModuleHandler('quotes', $dirname); -xoops_loadLanguage('modinfo', $dirname); -xoops_loadLanguage('main', $dirname); +$quotesHandler =& xoops_getModuleHandler('quotes', $moduleDirname); +xoops_loadLanguage('modinfo', $moduleDirname); +xoops_loadLanguage('main', $moduleDirname); Modified: XoopsModules/randomquote/branches/zyspec/randomquote/include/action.module.php =================================================================== --- XoopsModules/randomquote/branches/zyspec/randomquote/include/action.module.php 2015-02-20 04:45:42 UTC (rev 13003) +++ XoopsModules/randomquote/branches/zyspec/randomquote/include/action.module.php 2015-02-20 05:05:11 UTC (rev 13004) @@ -29,7 +29,7 @@ if ((!defined('XOOPS_ROOT_PATH')) || !($GLOBALS['xoopsUser'] instanceof XoopsUser) - || !($GLOBALS['xoopsUser']->IsAdmin())) + || !($GLOBALS['xoopsUser']->isAdmin())) { exit("Restricted access" . PHP_EOL); } @@ -163,7 +163,7 @@ { /* Do some synchronization with tags to remove tags associated with this module * - * @todo: write this code... + * @TODO: write this code... * * pseudo code * if (tag module installed) { @@ -177,8 +177,8 @@ $tagModule =& XoopsModule::getByDirname('tag'); if (($tagModule instanceof XoopsModule) && ($tagModule->isactive())) { // first delete all quotes - $quotes_handler =& xoops_getmodulehandler('quotes', 'randomquote'); - $quoteObjs = $quotes_handler->deleteAll(); + $quotesHandler =& xoops_getmodulehandler('quotes', 'randomquote'); + $quoteObjs = $quotesHandler->deleteAll(); //now 'unlink' the quote tags from Tag modules include_once $GLOBALS['xoops']->path("/modules/tag/include/functions.recon.php"); $success = tag_synchronization(); Modified: XoopsModules/randomquote/branches/zyspec/randomquote/include/functions.php =================================================================== --- XoopsModules/randomquote/branches/zyspec/randomquote/include/functions.php 2015-02-20 04:45:42 UTC (rev 13003) +++ XoopsModules/randomquote/branches/zyspec/randomquote/include/functions.php 2015-02-20 05:05:11 UTC (rev 13004) @@ -44,36 +44,6 @@ /** * - * Enter description here ... - * - * @deprecated Replaced by XoopsRequest - * @param string $global ($_POST, $_GET, $_REQUEST, etc) - * @param string $key input var - * @param unknown_type $default set $key to this if invalid input - * @param string $type types are 'int' or 'string' - * - * @return unknown_type cleaned input value contained in $global[$key] - */ -function cleanVarsRandomquote(&$global, $key, $default = '', $type = 'int') -{ - switch ($type) { - case 'string': - $ret = (isset($global[$key])) ? filter_var($global[$key], FILTER_SANITIZE_MAGIC_QUOTES) : $default; - break; - case 'int': - default: - $ret = (isset($global[$key])) ? filter_var($global[$key], FILTER_SANITIZE_NUMBER_INT) : $default; - break; - } - if ($ret === false) { - return $default; - } - - return $ret; -} - -/** - * * Assign the xoops_meta_keywords in the template * * @param string $content a string of keywords for HTML meta tag Modified: XoopsModules/randomquote/branches/zyspec/randomquote/include/plugin.tag.php =================================================================== --- XoopsModules/randomquote/branches/zyspec/randomquote/include/plugin.tag.php 2015-02-20 04:45:42 UTC (rev 13003) +++ XoopsModules/randomquote/branches/zyspec/randomquote/include/plugin.tag.php 2015-02-20 05:05:11 UTC (rev 13004) @@ -52,8 +52,8 @@ $criteria->add(new Criteria("id", "(" . implode(",", $items_id) . ")", "IN")); $criteria->add(new Criteria('quote_status', RandomquoteConstants::STATUS_ONLINE)); - $quote_handler =& xoops_getmodulehandler('quotes', 'randomquote'); - $quoteObjs = $quote_handler->getObjects($criteria, true); + $quoteHandler =& xoops_getmodulehandler('quotes', 'randomquote'); + $quoteObjs = $quoteHandler->getObjects($criteria, true); foreach ($cats_id as $cat_id) { foreach ($items_id as $item_id) { @@ -80,29 +80,29 @@ function mymodule_tag_synchronization($mid) { xoops_load('constants', 'randomquote'); - $item_handler =& xoops_getmodulehandler('quotes', 'randomquote'); - $link_handler =& xoops_getmodulehandler('link', 'tag'); + $itemHandler =& xoops_getmodulehandler('quotes', 'randomquote'); + $linkHandler =& xoops_getmodulehandler('link', 'tag'); - if (!$item_handler || !$link_handler) { + if (!$itemHandler || !$linkHandler) { $result = false; } else { $mid = XoopsFilterInput::clean($mid, 'INT'); - $module_handler =& xoops_gethandler('module'); - $rqModule =& XoopsModule::getByDirname('randomquote'); + $moduleHandler =& xoops_gethandler('module'); + $rqModule =& XoopsModule::getByDirname('randomquote'); // check to make sure module is active and trying to sync randomquote if (($rqModule instanceof XoopsModule) && ($rqModule->isactive()) && ($rqModule->mid() == $mid)) { // clear tag-item links - $sql = "DELETE FROM {$link_handler->table}" + $sql = "DELETE FROM {$linkHandler->table}" . " WHERE tag_modid = {$mid}" . " AND " . " (tag_itemid NOT IN " - . " (SELECT DISTINCT {$item_handler->keyName} " - . " FROM {$item_handler->table} " - . " WHERE {$item_handler->table}.quote_status = " . RandomquoteConstants::STATUS_ONLINE + . " (SELECT DISTINCT {$itemHandler->keyName} " + . " FROM {$itemHandler->table} " + . " WHERE {$itemHandler->table}.quote_status = " . RandomquoteConstants::STATUS_ONLINE . " )" . " )"; - $result = $link_handler->db->queryF($sql); + $result = $linkHandler->db->queryF($sql); } else { $result = false; } Modified: XoopsModules/randomquote/branches/zyspec/randomquote/include/search.inc.php =================================================================== --- XoopsModules/randomquote/branches/zyspec/randomquote/include/search.inc.php 2015-02-20 04:45:42 UTC (rev 13003) +++ XoopsModules/randomquote/branches/zyspec/randomquote/include/search.inc.php 2015-02-20 05:05:11 UTC (rev 13004) @@ -30,7 +30,7 @@ if (0 != (int) $userid) { return $ret; } - $quote_handler =& xoops_getmodulehandler('quotes', 'randomquote'); + $quoteHandler =& xoops_getmodulehandler('quotes', 'randomquote'); $entryFields = array('id', 'quote', 'author', 'create_date'); $criteria = new CriteriaCompo(); $criteria->add(new Criteria('quote_status', RandomquoteConstants::STATUS_ONLINE)); @@ -49,7 +49,7 @@ $criteria->add(new Criteria('author', "%{$query}%", 'LIKE'), 'OR'); } } - $quoteObjs = $quote_handler->getAll($criteria, $entryFields); + $quoteObjs = $quoteHandler->getAll($criteria, $entryFields); foreach ($quoteObjs as $thisQuote) { $ret[] = array ( 'image' => 'assets/images/icons/quote.png', Modified: XoopsModules/randomquote/branches/zyspec/randomquote/index.php =================================================================== --- XoopsModules/randomquote/branches/zyspec/randomquote/index.php 2015-02-20 04:45:42 UTC (rev 13003) +++ XoopsModules/randomquote/branches/zyspec/randomquote/index.php 2015-02-20 05:05:11 UTC (rev 13004) @@ -59,7 +59,7 @@ //$numrows = $quotesHandler->getCount(); //Table view if ($numrows) { - $bodyTxt = "<table class='width100 outer' cellspacing='1'>\n" + $bodyTxt = "<table class='outer width100 outer bspacing1'>\n" . " <thead>\n" . " <tr>\n" . " <th class='txtcenter'>" . _MA_RANDOMQUOTE_QUOTES_QUOTE . "</th>\n" Modified: XoopsModules/randomquote/branches/zyspec/randomquote/xoops_version.php =================================================================== --- XoopsModules/randomquote/branches/zyspec/randomquote/xoops_version.php 2015-02-20 04:45:42 UTC (rev 13003) +++ XoopsModules/randomquote/branches/zyspec/randomquote/xoops_version.php 2015-02-20 05:05:11 UTC (rev 13004) @@ -6,8 +6,6 @@ * 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. * - * PHP version 5 - * * @category Module * @package randomquote * @author XOOPS Development Team @@ -21,11 +19,11 @@ // defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined'); -$dirname = basename(__DIR__); +$moduleDirname = basename(__DIR__); xoops_load('XoopsLists'); xoops_load('xoopseditorhandler'); -$editor_handler = XoopsEditorHandler::getInstance(); +$editorHandler = XoopsEditorHandler::getInstance(); $modversion = array('name' => _MI_RANDOMQUOTE_ADMIN_NAME, 'description' => _MI_RANDOMQUOTE_ADMIN_DESC, @@ -47,13 +45,13 @@ 'link' => 'page=module_index')), 'manual' => "Install.txt", - 'manual_file' => XOOPS_URL . "/modules/{$dirname}/docs/link to manual file", + 'manual_file' => XOOPS_URL . "/modules/{$moduleDirname}/docs/link to manual file", 'min_php' => "5.3.7", 'min_xoops' => "2.5.7", 'min_admin' => "1.2", 'min_db' => array('mysql' => '5.0.7', 'mysqli' => '5.0.7'), 'image' => "assets/images/randomquote_logo.png", - 'dirname' => "{$dirname}", + 'dirname' => "{$moduleDirname}", 'dirmoduleadmin' => 'Frameworks/moduleclasses', 'icons16' => 'Frameworks/moduleclasses/icons/16', @@ -61,7 +59,7 @@ //About 'release_info' => "module_release_info", - 'release_file' => XOOPS_URL . "/modules/{$dirname}/docs/module_release_info file", + 'release_file' => XOOPS_URL . "/modules/{$moduleDirname}/docs/module_release_info file", 'demo_site_url' => "http://xoops.org", 'demo_site_name' => "XOOPS Demo Site", 'forum_site_url' => "http://xoops.org", @@ -138,7 +136,7 @@ 'formtype' => "select", 'valuetype' => "text", 'default' => "dhtml", - 'options' => array_flip($editor_handler->getList())), + 'options' => array_flip($editorHandler->getList())), array('name' => "keywords", 'title' => "_MI_RANDOMQUOTE_KEYWORDS", |