Menu
▾
▴
[Xoops-svn] SF.net SVN: xoops-svn:[12993] XoopsModules/modulepacks/x257basicmodulepack/ trunk/modules/tag
|
From: <be...@us...> - 2015-02-18 16:22:29
|
Revision: 12993
http://sourceforge.net/p/xoops/svn/12993
Author: beckmi
Date: 2015-02-18 16:22:25 +0000 (Wed, 18 Feb 2015)
Log Message:
-----------
2.33 RC 1
Modified Paths:
--------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/admin/about.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/admin/admin.tag.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/admin/admin_footer.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/admin/admin_header.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/admin/index.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/admin/menu.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/admin/syn.tag.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/assets/css/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/assets/images/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/assets/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/assets/js/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/blocks/block.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/blocks/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/class/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/class/link.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/class/tag.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/docs/changelog.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/docs/credits.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/docs/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/docs/install.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/docs/readme.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/footer.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/header.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/include/action.module.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/include/formtag.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/include/functions.ini.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/include/functions.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/include/functions.recon.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/include/plugin.dist.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/include/plugin.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/include/search.inc.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/include/tagbar.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/include/vars.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/index.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/language/english/admin.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/language/english/blocks.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/language/english/config.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/language/english/help/help.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/language/english/help/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/language/english/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/language/english/main.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/language/english/modinfo.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/language/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/list.tag.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/plugin/TDMDownloads.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/plugin/article.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/plugin/extgallery.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/plugin/myalbum.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/plugin/myalbum0.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/plugin/myalbum1.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/plugin/myalbum2.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/plugin/newbb.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/plugin/publisher.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/plugin/smartfaq.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/plugin/xfaq.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/plugin/xforum.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/sample.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/sql/mysql.150.sql
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/sql/mysql.sql
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/templates/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/templates/tag_view.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/view.tag.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/xoops_version.php
Added Paths:
-----------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/assets/cumulus.swf
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/assets/js/swfobject.js
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/class/blockform.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/class/constants.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/class/formtag.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/class/formvalidatedinput.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/plugin/randomquote.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/templates/blocks/tag_block_cumulus.tpl
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/admin/about.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/admin/about.php 2015-02-18 15:50:59 UTC (rev 12992)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/admin/about.php 2015-02-18 16:22:25 UTC (rev 12993)
@@ -1,28 +1,33 @@
-<?php
-/**
- * Tag module
- *
- * 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://www.xoops.org)
- * @license GNU GPL (http://www.gnu.org/licenses/gpl-2.0.html)
- * @package Tag
- * @since 2.5.0
- * @author Mage, Mamba
- * @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';
+<?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.
+*/
+
+/**
+ * XOOPS tag management module
+ *
+ * @package tag
+ * @copyright {@link http://sourceforge.net/projects/xoops/ The XOOPS Project}
+ * @license {@link http://www.fsf.org/copyleft/gpl.html GNU public license}
+ * @author Mage
+ * @author Mamba
+ * @since 2.31
+ * @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 __DIR__ . '/admin_footer.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/admin/admin.tag.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/admin/admin.tag.php 2015-02-18 15:50:59 UTC (rev 12992)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/admin/admin.tag.php 2015-02-18 16:22:25 UTC (rev 12993)
@@ -12,41 +12,40 @@
/**
* XOOPS tag management module
*
- * @copyright The XOOPS project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @since 1.0.0
+ * @package tag
+ * @copyright {@link http://sourceforge.net/projects/xoops/ The XOOPS Project}
+ * @license {@link http://www.fsf.org/copyleft/gpl.html GNU public license}
* @author Taiwen Jiang <ph...@us...>
+ * @since 1.00
* @version $Id$
- * @package tag
*/
-include_once 'admin_header.php';
-require_once XOOPS_ROOT_PATH . "/class/xoopsformloader.php";
+require_once __DIR__ . '/admin_header.php';
+require_once $GLOBALS['xoops']->path("/class/xoopsformloader.php");
+xoops_load('xoopsrequest');
+
$indexAdmin = new ModuleAdmin();
xoops_cp_header();
-include XOOPS_ROOT_PATH . "/modules/tag/include/vars.php";
-//echo function_exists("loadModuleAdminMenu") ? loadModuleAdminMenu(1) : "";
- echo $indexAdmin->addNavigation('admin.tag.php');
+include $GLOBALS['xoops']->path("/modules/tag/include/vars.php");
+echo $indexAdmin->addNavigation('admin.tag.php');
-global $xoopsModuleConfig;
+$limit = $GLOBALS['xoopsModuleConfig']['items_perpage'];
+$modid = XoopsRequest::getInt('modid', TagConstants::DEFAULT_ID);
+$start = XoopsRequest::getInt('start', TagConstants::BEGINNING);
+$status = XoopsRequest::getInt('status', TagConstants::STATUS_ALL, 'GET');
-$limit = $xoopsModuleConfig['items_perpage'];
-$modid = intval( empty($_GET['modid']) ? @$_POST['modid'] : $_GET['modid'] );
-$start = intval( empty($_GET['start']) ? @$_POST['start'] : $_GET['start'] );
-//$status = intval( empty($_GET['status']) ? @$_POST['status'] : $_GET['status']);
+$tag_handler =& xoops_getmodulehandler('tag', $thisModuleDir);
+$link_handler =& xoops_getmodulehandler('link', $thisModuleDir);
-$status = intval( (isset($_GET['status']) && $_GET['status'] >-1) ? $_GET['status'] : -1);
-
-$tag_handler =& xoops_getmodulehandler("tag", $xoopsModule->getVar("dirname"));
-
-if (!empty($_POST['tags'])) {
+$postTags = XoopsRequest::getArray('tags', array(), 'POST');
+if (!empty($postTags)) {
$msgDBUpdated='';
- foreach ($_POST['tags'] as $tag => $tag_status) {
+ foreach ($postTags as $tag => $tag_status) {
$tag_obj =& $tag_handler->get($tag);
- if (!is_object($tag_obj) || !$tag_obj->getVar("tag_id")) continue;
- if ($tag_status < 0) {
+ if (!($tag_obj instanceof TagTag) || !$tag_obj->getVar("tag_id")) continue;
+ if ($tag_status < TagConstants::STATUS_ACTIVE) {
$tag_handler->delete($tag_obj);
} elseif ($tag_status != $tag_obj->getVar("tag_status")) {
$tag_obj->setVar("tag_status", $tag_status);
@@ -54,19 +53,19 @@
$msgDBUpdated = _AM_TAG_DB_UPDATED;
}
}
- redirect_header("admin.tag.php?modid={$modid}&start={$start}&status={$status}", 2, $msgDBUpdated);
- exit();
+ redirect_header("admin.tag.php?modid={$modid}&start={$start}&status={$status}", TagConstants::REDIRECT_DELAY_MEDIUM, $msgDBUpdated);
}
-$sql = " SELECT tag_modid, COUNT(DISTINCT tag_id) AS count_tag";
-$sql .= " FROM " . $xoopsDB->prefix("tag_link");
-$sql .= " GROUP BY tag_modid";
+$sql = "SELECT tag_modid, COUNT(DISTINCT tag_id) AS count_tag";
+$sql .= " FROM " . $GLOBALS['xoopsDB']->prefix("tag_link");
+$sql .= " GROUP BY tag_modid";
$counts_module = array();
$module_list = array();
-if ( ($result = $xoopsDB->query($sql)) == false) {
- xoops_error($xoopsDB->error());
+$result = $GLOBALS['xoopsDB']->query($sql);
+if (false === $result) {
+ xoops_error($GLOBALS['xoopsDB']->error());
} else {
- while ($myrow = $xoopsDB->fetchArray($result)) {
+ while ($myrow = $GLOBALS['xoopsDB']->fetchArray($result)) {
$counts_module[$myrow["tag_modid"]] = $myrow["count_tag"];
}
if (!empty($counts_module)) {
@@ -84,9 +83,9 @@
}
$tray->addElement($mod_select);
$status_select = new XoopsFormRadio("", 'status', $status);
-$status_select->addOption(-1, _ALL);
-$status_select->addOption(1, TAG_AM_ACTIVE);
-$status_select->addOption(0, TAG_AM_INACTIVE);
+$status_select->addOption(TagConstants::STATUS_ALL, _ALL);
+$status_select->addOption(TagConstants::STATUS_ACTIVE, _AM_TAG_ACTIVE);
+$status_select->addOption(TagConstants::STATUS_INACTIVE, _AM_TAG_INACTIVE);
$tray->addElement($status_select);
$tray->addElement(new XoopsFormButton("", "submit", _SUBMIT, "submit"));
$opform->addElement($tray);
@@ -97,52 +96,62 @@
$criteria->setOrder("ASC");
$criteria->setStart($start);
$criteria->setLimit($limit);
-if ($status >= 0) {
- $criteria->add( new Criteria("o.tag_status", $status) );
+if ($status >= TagConstants::STATUS_ACTIVE) {
+ $criteria->add(new Criteria("o.tag_status", $status));
}
if (!empty($modid)) {
- $criteria->add( new Criteria("l.tag_modid", $modid) );
+ $criteria->add(new Criteria("l.tag_modid", $modid));
}
$tags = $tag_handler->getByLimit($criteria, false);
-$form_tags = "<form name='tags' method='post' action='" . xoops_getenv("PHP_SELF") . "'>";
-$form_tags .= "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
-$form_tags .= "<tr align='center'>";
-$form_tags .= "<th class='bg3'>" . TAG_AM_TERM . "</td>";
-$form_tags .= "<th class='bg3' width='10%'>" . TAG_AM_ACTIVE . "</td>";
-$form_tags .= "<th class='bg3' width='10%'>" . TAG_AM_INACTIVE . "</td>";
-$form_tags .= "<th class='bg3' width='10%'>" . _DELETE . "</td>";
-$form_tags .= "</tr>";
+$form_tags = "<form name='tags' method='post' action='" . xoops_getenv("PHP_SELF") . "'>\n"
+ . "<table style='border-width: 0px; margin: 1px; padding: 4px;' cellspacing='1' class='outer width100'>\n"
+ . " <thead>\n"
+ . " <tr class='txtcenter'>\n"
+ . " <th class='bg3'>" . _AM_TAG_TERM . "</th>\n"
+ . " <th class='bg3 width10'>" . _AM_TAG_INACTIVE . "</th>\n"
+ . " <th class='bg3 width10'>" . _AM_TAG_ACTIVE . "</th>\n"
+ . " <th class='bg3 width10'>" . _DELETE . "</th>\n"
+ . " </tr>\n"
+ . " </thead>\n"
+ . " <tbody>\n";
if (empty($tags)) {
- $form_tags .= "<tr><td colspan='4'>" . _NONE . "</td></tr>";
+ $form_tags .= " <tr><td colspan='4'>" . _NONE . "</td></tr>\n";
} else {
- $class_tr = array("odd", "even");
+ $class_tr = 'odd';
$i = 0;
foreach (array_keys($tags) as $key) {
- $form_tags .= "<tr class='" . $class_tr[(++$i) % 2] . "'>";
- $form_tags .= "<td>" . $tags[$key]["term"] . "</td>";
- $form_tags .= "<td align='center'><input type='radio' name='tags[{$key}]' value='1' " . ( $tags[$key]["status"] ? "checked" : " '' ") . "></td>";
- $form_tags .= "<td align='center'><input type='radio' name='tags[{$key}]' value='0' " . ( $tags[$key]["status"] ? " '' " : "checked") . "></td>";
- $form_tags .= "<td align='center'><input type='radio' name='tags[{$key}]' value='-1'></td>";
- $form_tags .= "</tr>";
+ $form_tags .= " <tr class='{$class_tr}'>\n"
+ . " <td>" . $tags[$key]["term"] . "</td>\n"
+ . " <td class='txtcenter'><input type='radio' name='tags[{$key}]' value='" . TagConstants::STATUS_INACTIVE . "'" . ( $tags[$key]["status"] ? " checked" : " '' ") . "></td>\n"
+ . " <td class='txtcenter'><input type='radio' name='tags[{$key}]' value='" . TagConstants::STATUS_ACTIVE . "'" . ( $tags[$key]["status"] ? " '' " : " checked") . "></td>\n"
+ . " <td class='txtcenter'><input type='radio' name='tags[{$key}]' value='" . TagConstants::STATUS_DELETE . "'></td>\n"
+ . " </tr>\n";
+ $class_tr = ('even' == $class_tr) ? 'odd' : 'even';
}
- if ( !empty($start) || count($tags) >= $limit ) {
+ if (!empty($start) || (count($tags) >= $limit)) {
$count_tag = $tag_handler->getCount($criteria);
- include XOOPS_ROOT_PATH . "/class/pagenav.php";
+ include $GLOBALS['xoops']->path("/class/pagenav.php");
$nav = new XoopsPageNav($count_tag, $limit, $start, "start", "modid={$modid}&status={$status}");
- $form_tags .= "<tr><td colspan='4' align='right'>" . $nav->renderNav(4) . "</td></tr>";
+ $form_tags .= " <tr><td colspan='4' class='txtright'>" . $nav->renderNav(4) . "</td></tr>\n";
}
- $form_tags .= "<tr><td colspan='4' align='center'>";
- $form_tags .= "<input type='hidden' name='status' value='{$status}'> ";
- $form_tags .= "<input type='hidden' name='start' value='{$start}'> ";
- $form_tags .= "<input type='hidden' name='modid' value='{$modid}'> ";
- $form_tags .= "<input type='submit' name='submit' value='" . _SUBMIT . "'> ";
- $form_tags .= "<input type='reset' name='submit' value='" . _CANCEL . "'>";
- $form_tags .= "</td></tr>";
+ $form_tags .= " </tbody>\n"
+ . " <tfoot>\n"
+ . " <tr>\n"
+ . " <td class='txtcenter' colspan='4'>\n"
+ . " <input type='hidden' name='status' value='{$status}' /> \n"
+ . " <input type='hidden' name='start' value='{$start}' /> \n"
+ . " <input type='hidden' name='modid' value='{$modid}' /> \n"
+ . " <input type='submit' name='submit' value='" . _SUBMIT . "' /> \n"
+ . " <input type='reset' name='submit' value='" . _CANCEL . "' />\n"
+ . " </td>\n"
+ . " </tr>\n"
+ . " </tfoot>\n";
}
-$form_tags .= "</table>";
-$form_tags .= "</form>";
+$form_tags .= " </tbody>\n"
+ . "</table>\n"
+ . "</form>\n";
echo $form_tags;
-include 'admin_footer.php';
+include __DIR__ . '/admin_footer.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/admin/admin_footer.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/admin/admin_footer.php 2015-02-18 15:50:59 UTC (rev 12992)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/admin/admin_footer.php 2015-02-18 16:22:25 UTC (rev 12993)
@@ -1,27 +1,41 @@
-<?php
-/**
- * Tag module
- *
- * 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 http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package XOOPS Tag
- * @since 2.5.0
- * @author Mamba (www.xoops.org)
- * @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_TAG_FOOTER . "\n"
- ."</div>";
-
-xoops_cp_footer();
+<?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.
+*/
+
+/**
+ * XOOPS tag management module
+ *
+ * @package tag
+ * @copyright {@link http://sourceforge.net/projects/xoops/ The XOOPS Project}
+ * @license {@link http://www.fsf.org/copyleft/gpl.html GNU public license}
+ * @author Mamba {@link http://www.xoops.org}
+ * @since 2.31
+ * @version $Id$
+ */
+/*
+echo "<div class='adminfooter'>\n"
+ ." <div class='txtcenter'>\n"
+ ." <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
+ ." </div>\n"
+ ." " . _AM_TAG_FOOTER . "\n"
+ ."</div>";
+ */
+echo "<div class='adminfooter'>\n"
+ . " <div class='center'>\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"
+ . " " . _AM_TAG_MAINTAINED_BY
+ . " <a class='tooltip' rel='external' href='http://" . $GLOBALS['xoopsModule']->getInfo('module_website_url') . "' "
+ . "title='" . _AM_TAG_MAINTAINED_TITLE . "'>" . _AM_TAG_MAINTAINED_TEXT . "</a>\n"
+ . " </div>\n"
+ . "</div>";
+
+xoops_cp_footer();
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/admin/admin_header.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/admin/admin_header.php 2015-02-18 15:50:59 UTC (rev 12992)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/admin/admin_header.php 2015-02-18 16:22:25 UTC (rev 12993)
@@ -1,104 +1,45 @@
-<?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.
-*/
-
-/**
- * XOOPS tag management module
- *
- * @copyright The XOOPS project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @since 1.0.0
- * @author Taiwen Jiang <ph...@us...>
- * @version $Id$
- * @package tag
- */
-
-$path = dirname(dirname(dirname(dirname(__FILE__))));
-require_once $path . '/include/cp_header.php';
-
-require_once dirname(dirname(__FILE__)) . '/include/vars.php';
-require_once dirname(dirname(__FILE__)) . '/include/functions.php';
-
-$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
-
-// 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_MODULEADMIN_MISSING, false);
- }
-
-IF (!@ include_once XOOPS_ROOT_PATH . "/Frameworks/art/functions.admin.php"):
-
-function loadModuleAdminMenu($currentoption, $breadcrumb = "")
-{
- if (!$adminmenu = $GLOBALS["xoopsModule"]->getAdminMenu()) {
- return false;
- }
-
- $breadcrumb = empty($breadcrumb) ? $adminmenu[$currentoption]["title"] : $breadcrumb;
- $module_link = XOOPS_URL . "/modules/" . $GLOBALS["xoopsModule"]->getVar("dirname") . "/";
- $image_link = XOOPS_URL . "/modules/" . $GLOBALS["xoopsModule"]->getVar("dirname") . "/images";
-
- $adminmenu_text ='
- <style type="text/css">
- <!--
- #buttontop { float:left; width:100%; background: #e7e7e7; font-size:93%; line-height:normal; border-top: 1px solid black; border-left: 1px solid black; border-right: 1px solid black; margin: 0;}
- #buttonbar { float:left; width:100%; background: #e7e7e7 url("'.$image_link.'/modadminbg.gif") repeat-x left bottom; font-size:93%; line-height:normal; border-left: 1px solid black; border-right: 1px solid black; margin-bottom: 12px;}
- #buttonbar ul { margin:0; margin-top: 15px; padding:10px 10px 0; list-style:none; }
- #buttonbar li { display:inline; margin:0; padding:0; }
- #buttonbar a { float:left; background:url("'.$image_link.'/left_both.gif") no-repeat left top; margin:0; padding:0 0 0 9px; border-bottom:1px solid #000; text-decoration:none; }
- #buttonbar a span { float:left; display:block; background:url("'.$image_link.'/right_both.gif") no-repeat right top; padding:5px 15px 4px 6px; font-weight:bold; color:#765; }
- /* Commented Backslash Hack hides rule from IE5-Mac \*/
- #buttonbar a span {float:none;}
- /* End IE5-Mac hack */
- #buttonbar a:hover span { color:#333; }
- #buttonbar .current a { background-position:0 -150px; border-width:0; }
- #buttonbar .current a span { background-position:100% -150px; padding-bottom:5px; color:#333; }
- #buttonbar a:hover { background-position:0% -150px; }
- #buttonbar a:hover span { background-position:100% -150px; }
- //-->
- </style>
- <div id="buttontop">
- <table style="width: 100%; padding: 0; " cellspacing="0">
- <tr>
- <td style="width: 70%; font-size: 10px; text-align: left; color: #2F5376; padding: 0 6px; line-height: 18px;">
- <a href="../index.php">' . $GLOBALS["xoopsModule"]->getVar("name") . '</a>
- </td>
- <td style="width: 30%; font-size: 10px; text-align: right; color: #2F5376; padding: 0 6px; line-height: 18px;">
- <strong>' . $GLOBALS["xoopsModule"]->getVar("name") . '</strong> ' . $breadcrumb . '
- </td>
- </tr>
- </table>
- </div>
- <div id="buttonbar">
- <ul>
- ';
- foreach (array_keys($adminmenu) as $key) {
- $adminmenu_text .= (($currentoption == $key) ? '<li class="current">' : '<li>') . '<a href="' . $module_link . $adminmenu[$key]["link"] . '"><span>' . $adminmenu[$key]["title"] . '</span></a></li>';
- }
- $adminmenu_text .= '<li><a href="' . XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $GLOBALS["xoopsModule"]->getVar("mid") . '"><span>' . _PREFERENCES . '</span></a></li>';
- $adminmenu_text .= '
- </ul>
- </div>
- <br style="clear:both;" />';
-
- echo $adminmenu_text;
-}
-
-ENDIF;
+<?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.
+*/
+
+/**
+ * XOOPS tag management module
+ *
+ * @copyright The XOOPS project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @since 1.00
+ * @author Taiwen Jiang <ph...@us...>
+ * @version $Id$
+ * */
+
+$path = dirname(dirname(dirname(__DIR__)));
+require_once $path . '/include/cp_header.php';
+
+require_once dirname(__DIR__) . '/include/vars.php';
+require_once dirname(__DIR__) . '/include/functions.php';
+xoops_load('constants', 'tag');
+
+$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
+// Load language files
+xoops_loadLanguage('admin', $thisModuleDir);
+xoops_loadLanguage('modinfo', $thisModuleDir);
+xoops_loadLanguage('main', $thisModuleDir);
+
+$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'));
+
+if ( file_exists("{$pathModuleAdmin}/moduleadmin/moduleadmin.php")) {
+ include_once "{$pathModuleAdmin}/moduleadmin/moduleadmin.php";
+} else {
+ redirect_header("{$path}/admin.php", TagConstants::REDIRECT_DELAY_LONG, _AM_MODULEADMIN_MISSING, false);
+}
+
+include_once $GLOBALS['xoops']->path("/Frameworks/art/functions.admin.php");
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/admin/index.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/admin/index.php 2015-02-18 15:50:59 UTC (rev 12992)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/admin/index.php 2015-02-18 16:22:25 UTC (rev 12993)
@@ -1,70 +1,82 @@
-<?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.
-*/
-
-/**
- * XOOPS tag management module
- *
- * @copyright The XOOPS project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @since 1.0.0
- * @author Taiwen Jiang <ph...@us...>
- * @version $Id$
- * @package tag
- */
-include_once 'admin_header.php';
-xoops_cp_header();
-
-include XOOPS_ROOT_PATH . "/modules/tag/include/vars.php";
-//echo function_exists("loadModuleAdminMenu") ? loadModuleAdminMenu(0) : "";
-
-$indexAdmin = new ModuleAdmin();
-
-$tag_handler =& xoops_getmodulehandler("tag", $xoopsModule->getVar("dirname"));
-$count_tag = $tag_handler->getCount();
-
-$count_item = 0;
-$sql = " SELECT COUNT(DISTINCT tl_id) FROM " . $xoopsDB->prefix("tag_link");
-if ( ($result = $xoopsDB->query($sql)) == false) {
- xoops_error($xoopsDB->error());
-} else {
- list($count_item) = $xoopsDB->fetchRow($result);
-}
-
-$sql = " SELECT tag_modid, SUM(tag_count) AS count_item, COUNT(DISTINCT tag_id) AS count_tag";
-$sql .= " FROM " . $xoopsDB->prefix("tag_stats");
-$sql .= " GROUP BY tag_modid";
-$counts_module = array();
-if ( ($result = $xoopsDB->query($sql)) == false) {
- xoops_error($xoopsDB->error());
-} else {
- while ($myrow = $xoopsDB->fetchArray($result)) {
- $counts_module[$myrow["tag_modid"]] = array("count_item" => $myrow["count_item"], "count_tag" => $myrow["count_tag"]);
- }
- if (!empty($counts_module)) {
- $module_handler =& xoops_gethandler("module");
- $module_list = $module_handler->getList(new Criteria("mid", "(" . implode(", ", array_keys($counts_module)) . ")", "IN"));
- }
-}
-
-$indexAdmin->addInfoBox(TAG_AM_STATS) ;
-$indexAdmin->addInfoBoxLine(TAG_AM_STATS, "<infolabel>" .TAG_AM_COUNT_TAG. "</infolabel>" , $count_tag) ;
-$indexAdmin->addInfoBoxLine(TAG_AM_STATS, "<infolabel>" .TAG_AM_COUNT_ITEM. "</infolabel>" , $count_item ."<br /><br />") ;
-$indexAdmin->addInfoBoxLine(TAG_AM_STATS, "<infolabel>" . TAG_AM_COUNT_MODULE. "</infolabel><infotext>" .TAG_AM_COUNT_MODULE_TITLE."</infotext>") ;
-
-foreach ($counts_module as $module => $count) {
- $indexAdmin->addInfoBoxLine( TAG_AM_STATS,("<infolabel>" . $module_list[$module] . ":</infolabel><infotext>" . $count["count_tag"] . " / " . $count["count_item"] . " [<a href=\"" . XOOPS_URL . "/modules/tag/admin/admin.tag.php?modid={$module}\">" . TAG_AM_EDIT . "</a>] [<a href=\"" . XOOPS_URL . "/modules/tag/admin/syn.tag.php?modid={$module}\">" . TAG_AM_SYNCHRONIZATION . "</a>]</infotext> "));
-}
-
-echo $indexAdmin->addNavigation('index.php');
-echo $indexAdmin->renderIndex();
-
-include 'admin_footer.php';
-//xoops_cp_footer();
+<?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.
+*/
+
+/**
+ * XOOPS tag management module
+ *
+ * @package tag
+ * @subpackage admin
+ * @copyright {@link http://sourceforge.net/projects/xoops/ The XOOPS Project}
+ * @license {@link http://www.fsf.org/copyleft/gpl.html GNU public license}
+ * @author Taiwen Jiang <ph...@us...>
+ * @since 1.00
+ * @version $Id$
+ */
+
+require_once __DIR__ . '/admin_header.php';
+xoops_cp_header();
+include $GLOBALS['xoops']->path("/modules/tag/include/vars.php");
+
+$indexAdmin = new ModuleAdmin();
+
+$tag_handler =& xoops_getmodulehandler("tag", $thisModuleDir);
+$count_tag = $tag_handler->getCount();
+
+$count_item = 0;
+$sql = "SELECT COUNT(DISTINCT tl_id) FROM " . $GLOBALS['xoopsDB']->prefix("tag_link");
+if (false === ($result = $GLOBALS['xoopsDB']->query($sql))) {
+ xoops_error($GLOBALS['xoopsDB']->error());
+} else {
+ list($count_item) = $GLOBALS['xoopsDB']->fetchRow($result);
+}
+
+$sql = "SELECT tag_modid, SUM(tag_count) AS count_item, COUNT(DISTINCT tag_id) AS count_tag";
+$sql .= " FROM " . $GLOBALS['xoopsDB']->prefix("tag_stats");
+$sql .= " GROUP BY tag_modid";
+$counts_module = array();
+if (false === ($result = $GLOBALS['xoopsDB']->query($sql))) {
+ xoops_error($GLOBALS['xoopsDB']->error());
+} else {
+ while ($myrow = $GLOBALS['xoopsDB']->fetchArray($result)) {
+ $counts_module[$myrow["tag_modid"]] = array("count_item" => $myrow["count_item"], "count_tag" => $myrow["count_tag"]);
+ }
+ if (!empty($counts_module)) {
+ $module_handler =& xoops_gethandler("module");
+ $module_list = $module_handler->getList(new Criteria("mid", "(" . implode(", ", array_keys($counts_module)) . ")", "IN"));
+ } else {
+
+ }
+}
+
+$indexAdmin->addInfoBox(_AM_TAG_STATS) ;
+$indexAdmin->addInfoBoxLine(_AM_TAG_STATS, "<infolabel>" . _AM_TAG_COUNT_TAG . "</infolabel>" , $count_tag) ;
+$indexAdmin->addInfoBoxLine(_AM_TAG_STATS, "<infolabel>" . _AM_TAG_COUNT_ITEM . "</infolabel>" , $count_item ."<br /><br />") ;
+$indexAdmin->addInfoBoxLine(_AM_TAG_STATS, "<infolabel>" . _AM_TAG_COUNT_MODULE . "</infolabel>" . "<infotext>" . _AM_TAG_COUNT_MODULE_TITLE . "</infotext>") ;
+
+foreach ($counts_module as $module => $count) {
+ $moduleStat = "<infolabel>" . $module_list[$module] . ":</infolabel>\n"
+ . "<infotext>" . $count["count_tag"] . " / " . $count["count_item"] . "\n"
+ . " [<a href='" . $GLOBALS['xoops']->url("www/modules/tag/admin/admin.tag.php?modid={$module}") . "'>" . _AM_TAG_EDIT . "</a>]\n"
+ . " [<a href='" . $GLOBALS['xoops']->url("www/modules/tag/admin/syn.tag.php?modid={$module}") . "'>" . _AM_TAG_SYNCHRONIZATION . "</a>]\n"
+ . "</infotext> \n";
+ $indexAdmin->addInfoBoxLine( _AM_TAG_STATS, $moduleStat);
+}
+
+if (empty($counts_module)) { // there aren't any so just display "none"
+ $moduleStat = "<infolabel>%s</infolabel><infotext>0 / 0</infotext> \n";
+ $indexAdmin->addInfoBoxLine( _AM_TAG_STATS, $moduleStat, _NONE);
+}
+
+echo $indexAdmin->addNavigation('index.php');
+echo $indexAdmin->renderIndex();
+
+include __DIR__ . '/admin_footer.php';
+//xoops_cp_footer();
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/admin/menu.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/admin/menu.php 2015-02-18 15:50:59 UTC (rev 12992)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/admin/menu.php 2015-02-18 16:22:25 UTC (rev 12993)
@@ -1,51 +1,49 @@
-<?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.
-*/
-
-/**
- * XOOPS tag management module
- *
- * @copyright The XOOPS project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @since 1.0.0
- * @author Taiwen Jiang <ph...@us...>
- * @version $Id$
- * @package tag
- */
-
-defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
-
-$module_handler =& xoops_gethandler('module');
-$xoopsModule =& XoopsModule::getByDirname('tag');
-$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
-$pathIcon32 = $moduleInfo->getInfo('icons32');
-
-$adminmenu = array();
-
-$i = 1;
-$adminmenu[$i]["title"] = TAG_MI_ADMENU_INDEX;
-$adminmenu[$i]["link"] = "admin/index.php";
-$adminmenu[$i]["desc"] = _TAG_ADMIN_HOME_DESC;
-$adminmenu[$i]["icon"] = $pathIcon32.'/home.png';
-++$i;
-$adminmenu[$i]["title"] = TAG_MI_ADMENU_EDIT;
-$adminmenu[$i]["link"] = "admin/admin.tag.php";
-$adminmenu[$i]["desc"] = _TAG_ADMIN_ABOUT_DESC;
-$adminmenu[$i]["icon"] = $pathIcon32.'/administration.png';
-++$i;
-$adminmenu[$i]["title"] = TAG_MI_ADMENU_SYNCHRONIZATION;
-$adminmenu[$i]["link"] = "admin/syn.tag.php";
-$adminmenu[$i]["desc"] = _TAG_ADMIN_HELP_DESC;
-$adminmenu[$i]["icon"] = $pathIcon32.'/synchronized.png';
-++$i;
-$adminmenu[$i]["title"] = _TAG_ADMIN_ABOUT;
-$adminmenu[$i]["link"] = "admin/about.php";
-$adminmenu[$i]["desc"] = _TAG_ADMIN_ABOUT_DESC;
-$adminmenu[$i]["icon"] = $pathIcon32.'/about.png';
+<?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.
+*/
+
+/**
+ * XOOPS tag management module
+ *
+ * @package tag
+ * @copyright {@link http://sourceforge.net/projects/xoops/ The XOOPS Project}
+ * @license {@link http://www.fsf.org/copyleft/gpl.html GNU public license}
+ * @author Taiwen Jiang <ph...@us...>
+ * @since 1.00
+ * @version $Id$
+ */
+
+defined('XOOPS_ROOT_PATH') || exit('Restricted access');
+
+$module_handler =& xoops_gethandler('module');
+$module =& XoopsModule::getByDirname('tag');
+$moduleInfo =& $module_handler->get($module->getVar('mid'));
+$pathIcon32 = '../../' . $module->getInfo('icons32');
+
+$adminmenu = array(array("title" => _MI_TAG_ADMENU_INDEX,
+ "link" => "admin/index.php",
+ "desc" => _MI_TAG_ADMIN_HOME_DESC,
+ "icon" => "{$pathIcon32}/home.png"),
+
+ array("title" => _MI_TAG_ADMENU_EDIT,
+ "link" => "admin/admin.tag.php",
+ "desc" => _MI_TAG_ADMENU_EDIT_DESC,
+ "icon" => "{$pathIcon32}/administration.png"),
+
+ array("title" => _MI_TAG_ADMENU_SYNCHRONIZATION,
+ "link" => "admin/syn.tag.php",
+ "desc" => _MI_TAG_HELP_DESC,
+ "icon" => "{$pathIcon32}/synchronized.png"),
+
+ array("title" => _MI_TAG_ADMIN_ABOUT,
+ "link" => "admin/about.php",
+ "desc" => _MI_TAG_ADMIN_HELP_DESC,
+ "icon" => "{$pathIcon32}/about.png")
+);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/admin/syn.tag.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/admin/syn.tag.php 2015-02-18 15:50:59 UTC (rev 12992)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/admin/syn.tag.php 2015-02-18 16:22:25 UTC (rev 12993)
@@ -1,95 +1,90 @@
-<?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.
-*/
-
-/**
- * XOOPS tag management module
- *
- * @copyright The XOOPS project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @since 1.0.0
- * @author Taiwen Jiang <ph...@us...>
- * @version $Id$
- * @package tag
- */
-include_once 'admin_header.php';
-require_once XOOPS_ROOT_PATH . "/class/xoopsformloader.php";
-//include_once XOOPS_ROOT_PATH."/modules/" . $xoopsModule->getVar("dirname") . "/class/admin.php";
-$index_admin = new ModuleAdmin();
-
-xoops_cp_header();
-
-include XOOPS_ROOT_PATH . "/modules/tag/include/vars.php";
-//echo function_exists("loadModuleAdminMenu") ? loadModuleAdminMenu(2) : "";
- echo $index_admin->addNavigation('syn.tag.php');
-
-$limit = 10;
-$modid = intval( @$_GET['modid'] );
-$start = intval( @$_GET['start'] );
-$limit = isset($_GET['limit']) ? intval( $_GET['limit'] ) : 100;
-
-$sql = " SELECT tag_modid, COUNT(DISTINCT tag_id) AS count_tag";
-$sql .= " FROM " . $xoopsDB->prefix("tag_link");
-$sql .= " GROUP BY tag_modid";
-$counts_module = array();
-$module_list = array();
-if ( $result = $xoopsDB->query($sql)) {
- while ($myrow = $xoopsDB->fetchArray($result)) {
- $counts_module[$myrow["tag_modid"]] = $myrow["count_tag"];
- }
- if (!empty($counts_module)) {
- $module_handler =& xoops_gethandler("module");
- $module_list = $module_handler->getList(new Criteria("mid", "(" . implode(", ", array_keys($counts_module)) . ")", "IN"));
- }
-}
-
-$opform = new XoopsSimpleForm('', 'moduleform', xoops_getenv("PHP_SELF"), "get");
-$tray = new XoopsFormElementTray('');
-$mod_select = new XoopsFormSelect(_SELECT, 'modid', $modid);
-$mod_select->addOption(-1, TAG_AM_GLOBAL);
-$mod_select->addOption(0, TAG_AM_ALL);
-foreach ($module_list as $module => $module_name) {
- $mod_select->addOption($module, $module_name . " (" . $counts_module[$module] . ")");
-}
-$tray->addElement($mod_select);
-$num_select = new XoopsFormSelect(TAG_AM_NUM, 'limit', $limit);
-foreach (array(10, 50, 100, 500) as $_num) {
- $num_select->addOption($_num);
-}
-$num_select->addOption(0, _ALL);
-$tray->addElement($num_select);
-$tray->addElement(new XoopsFormButton("", "submit", _SUBMIT, "submit"));
-$tray->addElement(new XoopsFormHidden("start", $start));
-$opform->addElement($tray);
-$opform->display();
-
-if ( isset($_GET['start']) ) {
-
- $tag_handler =& xoops_getmodulehandler("tag", $xoopsModule->getVar("dirname"));
-
- $criteria = new CriteriaCompo();
- $criteria->setStart($start);
- $criteria->setLimit($limit);
- if ($modid > 0) {
- $criteria->add( new Criteria("l.tag_modid", $modid) );
- }
- $tags = $tag_handler->getByLimit($criteria, false);
- if (empty($tags)) {
- echo "<h2>" . TAG_AM_FINISHED . "</h2>";
- } else {
-
- foreach (array_keys($tags) as $tag_id) {
- $tag_handler->update_stats($tag_id, ( $modid == -1 ) ? 0 : $tags[$tag_id]["modid"]);
- }
- redirect_header("syn.tag.php?modid={$modid}&start=" . ($start + $limit) . "&limit={$limit}", 2, TAG_AM_IN_PROCESS);
- }
-}
-include 'admin_footer.php';
-//xoops_cp_footer();
+<?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.
+*/
+
+/**
+ * XOOPS tag management module
+ *
+ * @package tag
+ * @copyright {@link http://sourceforge.net/projects/xoops/ The XOOPS Project}
+ * @license {@link http://www.fsf.org/copyleft/gpl.html GNU public license}
+ * @author Taiwen Jiang <ph...@us...>
+ * @since 1.00
+ * @version $Id$
+ */
+
+require_once __DIR__ . '/admin_header.php';
+require_once $GLOBALS['xoops']->path("/class/xoopsformloader.php");
+xoops_load('xoopsrequest');
+//include_once $GLOBALS['xoops']->path("/modules/" . $GLOBALS['xoopsModule']->getVar("dirname") . "/class/admin.php");
+
+include $GLOBALS['xoops']->path("/modules/tag/include/vars.php");
+
+xoops_cp_header();
+
+$index_admin = new ModuleAdmin();
+echo $index_admin->addNavigation('syn.tag.php');
+
+$modid = XoopsRequest::getInt('modid', TagConstants::DEFAULT_ID);
+$start = XoopsRequest::getInt('start', TagConstants::BEGINNING);
+$limit = XoopsRequest::getInt('limit', TagConstants::DEFAULT_LIMIT);
+
+$sql = "SELECT tag_modid, COUNT(DISTINCT tag_id) AS count_tag";
+$sql .= " FROM " . $GLOBALS['xoopsDB']->prefix("tag_link");
+$sql .= " GROUP BY tag_modid";
+$counts_module = array();
+$module_list = array();
+if ( $result = $GLOBALS['xoopsDB']->query($sql)) {
+ while ($myrow = $GLOBALS['xoopsDB']->fetchArray($result)) {
+ $counts_module[$myrow["tag_modid"]] = $myrow["count_tag"];
+ }
+ if (!empty($counts_module)) {
+ $module_handler =& xoops_gethandler("module");
+ $module_list = $module_handler->getList(new Criteria("mid", "(" . implode(", ", array_keys($counts_module)) . ")", "IN"));
+ }
+}
+
+$opform = new XoopsSimpleForm('', 'moduleform', xoops_getenv("PHP_SELF"), "get");
+$tray = new XoopsFormElementTray('');
+$mod_select = new XoopsFormSelect(_SELECT, 'modid', $modid);
+$mod_select->addOption(-1, _AM_TAG_GLOBAL);
+$mod_select->addOption(0, _AM_TAG_ALL);
+foreach ($module_list as $module => $module_name) {
+ $mod_select->addOption($module, $module_name . " (" . $counts_module[$module] . ")");
+}
+$tray->addElement($mod_select);
+$num_select = new XoopsFormSelect(_AM_TAG_NUM, 'limit', $limit);
+$num_select->addOptionArray(array(0 => _ALL, 10 => 10, 50 => 50, 100 => 100, 500 => 500));
+$tray->addElement($num_select);
+$tray->addElement(new XoopsFormButton("", "submit", _SUBMIT, "submit"));
+$tray->addElement(new XoopsFormHidden("start", $start));
+$opform->addElement($tray);
+$opform->display();
+
+if (isset($_GET['start'])) {
+ $tag_handler =& xoops_getmodulehandler("tag", $thisModuleDir);
+
+ $criteria = new CriteriaCompo();
+ $criteria->setStart($start);
+ $criteria->setLimit($limit);
+ if ($modid > TagConstants::DEFAULT_ID) {
+ $criteria->add(new Criteria("l.tag_modid", $modid));
+ }
+ $tags = $tag_handler->getByLimit($criteria, false);
+ if (empty($tags)) {
+ echo "<h2>" . _AM_TAG_FINISHED . "</h2>\n";
+ } else {
+ foreach (array_keys($tags) as $tag_id) {
+ $tag_handler->update_stats($tag_id, (-1 == $modid) ? TagConstants::DEFAULT_ID : $tags[$tag_id]["modid"]);
+ }
+ redirect_header("syn.tag.php?modid={$modid}&start=" . ($start + $limit) . "&limit={$limit}", TagConstants::REDIRECT_DELAY_SHORT, _AM_TAG_IN_PROCESS);
+ }
+}
+include __DIR__ . '/admin_footer.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/assets/css/index.html
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/assets/css/index.html 2015-02-18 15:50:59 UTC (rev 12992)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/assets/css/index.html 2015-02-18 16:22:25 UTC (rev 12993)
@@ -1 +1 @@
- <script>history.go(-1);</script>
\ No newline at end of file
+<script>history.go(-1);</script>
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/assets/cumulus.swf
===================================================================
(Binary files differ)
Index: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/assets/cumulus.swf
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/assets/cumulus.swf 2015-02-18 15:50:59 UTC (rev 12992)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/assets/cumulus.swf 2015-02-18 16:22:25 UTC (rev 12993)
Property changes on: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/assets/cumulus.swf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/assets/images/index.html
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/assets/images/index.html 2015-02-18 15:50:59 UTC (rev 12992)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/assets/images/index.html 2015-02-18 16:22:25 UTC (rev 12993)
@@ -1 +1 @@
- <script>history.go(-1);</script>
\ No newline at end of file
+<script>history.go(-1);</script>
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/assets/index.html
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/assets/index.html 2015-02-18 15:50:59 UTC (rev 12992)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/assets/index.html 2015-02-18 16:22:25 UTC (rev 12993)
@@ -1 +1 @@
- <script>history.go(-1);</script>
\ No newline at end of file
+<script>history.go(-1);</script>
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/assets/js/index.html
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/assets/js/index.html 2015-02-18 15:50:59 UTC (rev 12992)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/assets/js/index.html 2015-02-18 16:22:25 UTC (rev 12993)
@@ -1 +1 @@
- <script>history.go(-1);</script>
\ No newline at end of file
+<script>history.go(-1);</script>
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/assets/js/swfobject.js
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/assets/js/swfobject.js (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/assets/js/swfobject.js 2015-02-18 16:22:25 UTC (rev 12993)
@@ -0,0 +1,133 @@
+/**
+ * SWFObject v1.4: Flash Player detection and embed - http://blog.deconcept.com/swfobject/
+ *
+ * SWFObject is (c) 2006 Geoff Stearns and is released under the MIT License:
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * **SWFObject is the SWF embed script formarly known as FlashObject. The name was changed for
+ * legal reasons.
+ */
+if(typeof deconcept=="undefined"){var deconcept=new Object();}
+if(typeof deconcept.util=="undefined"){deconcept.util=new Object();}
+if(typeof deconcept.SWFObjectUtil=="undefined"){deconcept.SWFObjectUtil=new Object();}
+deconcept.SWFObject=function(_1,id,w,h,_5,c,_7,_8,_9,_a,_b){
+if(!document.createElement||!document.getElementById){return;}
+this.DETECT_KEY=_b?_b:"detectflash";
+this.skipDetect=deconcept.util.getRequestParameter(this.DETECT_KEY);
+this.params=new Object();
+this.variables=new Object();
+this.attributes=new Array();
+if(_1){this.setAttribute("swf",_1);}
+if(id){this.setAttribute("id",id);}
+if(w){this.setAttribute("width",w);}
+if(h){this.setAttribute("height",h);}
+if(_5){this.setAttribute("version",new deconcept.PlayerVersion(_5.toString().split(".")));}
+this.installedVer=deconcept.SWFObjectUtil.getPlayerVersion(this.getAttribute("version"),_7);
+if(c){this.addParam("bgcolor",c);}
+var q=_8?_8:"high";
+this.addParam("quality",q);
+this.setAttribute("useExpressInstall",_7);
+this.setAttribute("doExpressInstall",false);
+var _d=(_9)?_9:window.location;
+this.setAttribute("xiRedirectUrl",_d);
+this.setAttribute("redirectUrl","");
+if(_a){this.setAttribute("redirectUrl",_a);}};
+deconcept.SWFObject.prototype={setAttribute:function(_e,_f){
+this.attributes[_e]=_f;
+},getAttribute:function(_10){
+return this.attributes[_10];
+},addParam:function(_11,_12){
+this.params[_11]=_12;
+},getParams:function(){
+return this.params;
+},addVariable:function(_13,_14){
+this.variables[_13]=_14;
+},getVariable:function(_15){
+return this.variables[_15];
+},getVariables:function(){
+return this.variables;
+},getVariablePairs:function(){
+var _16=new Array();
+var key;
+var _18=this.getVariables();
+for(key in _18){
+_16.push(key+"="+_18[key]);}
+return _16;
+},getSWFHTML:function(){
+var _19="";
+if(navigator.plugins&&navigator.mimeTypes&&navigator.mimeTypes.length){
+if(this.getAttribute("doExpressInstall")){this.addVariable("MMplayerType","PlugIn");}
+_19="<embed type=\"application/x-shockwave-flash\" src=\""+this.getAttribute("swf")+"\" width=\""+this.getAttribute("width")+"\" height=\""+this.getAttribute("height")+"\"";
+_19+=" id=\""+this.getAttribute("id")+"\" name=\""+this.getAttribute("id")+"\" ";
+var _1a=this.getParams();
+for(var key in _1a){_19+=[key]+"=\""+_1a[key]+"\" ";}
+var _1c=this.getVariablePairs().join("&");
+if(_1c.length>0){_19+="flashvars=\""+_1c+"\"";}
+_19+="/>";
+}else{
+if(this.getAttribute("doExpressInstall")){this.addVariable("MMplayerType","ActiveX");}
+_19="<object id=\""+this.getAttribute("id")+"\" classid=\"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\" width=\""+this.getAttribute("width")+"\" height=\""+this.getAttribute("height")+"\">";
+_19+="<param name=\"movie\" value=\""+this.getAttribute("swf")+"\" />";
+var _1d=this.getParams();
+for(var key in _1d){_19+="<param name=\""+key+"\" value=\""+_1d[key]+"\" />";}
+var _1f=this.getVariablePairs().join("&");
+if(_1f.length>0){_19+="<param name=\"flashvars\" value=\""+_1f+"\" />";}
+_19+="</object>";}
+return _19;
+},write:function(_20){
+if(this.getAttribute("useExpressInstall")){
+var _21=new deconcept.PlayerVersion([6,0,65]);
+if(this.installedVer.versionIsValid(_21)&&!this.installedVer.versionIsValid(this.getAttribute("version"))){
+this.setAttribute("doExpressInstall",true);
+this.addVariable("MMredirectURL",escape(this.getAttribute("xiRedirectUrl")));
+document.title=document.title.slice(0,47)+" - Flash Player Installation";
+this.addVariable("MMdoctitle",document.title);}}
+if(this.skipDetect||this.getAttribute("doExpressInstall")||this.installedVer.versionIsValid(this.getAttribute("version"))){
+var n=(typeof _20=="string")?document.getElementById(_20):_20;
+n.innerHTML=this.getSWFHTML();
+return true;
+}else{
+if(this.getAttribute("redirectUrl")!=""){document.location.replace(this.getAttribute("redirectUrl"));}}
+return false;}};
+deconcept.SWFObjectUtil.getPlayerVersion=function(_23,_24){
+var _25=new deconcept.PlayerVersion([0,0,0]);
+if(navigator.plugins&&navigator.mimeTypes.length){
+var x=navigator.plugins["Shockwave Flash"];
+if(x&&x.description){_25=new deconcept.PlayerVersion(x.description.replace(/([a-z]|[A-Z]|\s)+/,"").replace(/(\s+r|\s+b[0-9]+)/,".").split("."));}
+}else{try{
+var axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash");
+for(var i=3;axo!=null;i++){
+axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash."+i);
+_25=new deconcept.PlayerVersion([i,0,0]);}}
+catch(e){}
+if(_23&&_25.major>_23.major){return _25;}
+if(!_23||((_23.minor!=0||_23.rev!=0)&&_25.major==_23.major)||_25.major!=6||_24){
+try{_25=new deconcept.PlayerVersion(axo.GetVariable("$version").split(" ")[1].split(","));}
+catch(e){}}}
+return _25;};
+deconcept.PlayerVersion=function(_29){
+this.major=parseInt(_29[0])!=null?parseInt(_29[0]):0;
+this.minor=parseInt(_29[1])||0;
+this.rev=parseInt(_29[2])||0;};
+deconcept.PlayerVersion.prototype.versionIsValid=function(fv){
+if(this.major<fv.major){return false;}
+if(this.major>fv.major){return true;}
+if(this.minor<fv.minor){return false;}
+if(this.minor>fv.minor){return true;}
+if(this.rev<fv.rev){return false;}return true;};
+deconcept.util={getRequestParameter:function(_2b){
+var q=document.location.search||document.location.hash;
+if(q){
+var _2d=q.indexOf(_2b+"=");
+var _2e=(q.indexOf("&",_2d)>-1)?q.indexOf("&",_2d):q.length;
+if(q.length>1&&_2d>-1){
+return q.substring(q.indexOf("=",_2d)+1,_2e);
+}}return "";}};
+if(Array.prototype.push==null){
+Array.prototype.push=function(_2f){
+this[this.length]=_2f;
+return this.length;};}
+var getQueryParamValue=deconcept.util.getRequestParameter;
+var FlashObject=deconcept.SWFObject; // for backwards compatibility
+var SWFObject=deconcept.SWFObject;
+
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/blocks/block.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/blocks/block.php 2015-02-18 15:50:59 UTC (rev 12992)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tag/blocks/block.php 2015-02-18 16:22:25 UTC (rev 12993)
@@ -1,305 +1,490 @@
-<?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.
-*/
-
-/**
- * XOOPS tag management module
- *
- * @copyright The XOOPS project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @since 1.0.0
- * @author Taiwen Jiang <ph...@us...>
- * @version $Id$
- * @package tag
- */
-
-defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
-include XOOPS_ROOT_PATH . "/modules/tag/include/vars.php";
-include_once XOOPS_ROOT_PATH . "/modules/tag/include/functions.php";
-
-xoops_loadLanguage("blocks", "tag");
-
-/**#@+
- * Function to display tag cloud
- *
- * Developer guide:
- * <ul>
- * <li>Build your tag_block_cloud_show function, for example newbb_block_tag_cloud_show;</li>
- * <li>Call the tag_block_cloud_show in your defined block function:<br />
- * <code>
- * function newbb_block_tag_cloud_show($options) {
- * $catid = $options[4]; // Not used by newbb, Only for demonstration
- * if (!@include_once XOOPS_ROOT_PATH."/modules/tag/blocks/block.php") {
- * ...
[truncated message content] |
