Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[11910] XoopsModules/planet/trunk/planet
|
From: <be...@us...> - 2013-08-14 06:37:18
|
Revision: 11910
http://sourceforge.net/p/xoops/svn/11910
Author: beckmi
Date: 2013-08-14 06:37:13 +0000 (Wed, 14 Aug 2013)
Log Message:
-----------
Converted to XOOPS 2.5.6 Admin GUI
Modified Paths:
--------------
XoopsModules/planet/trunk/planet/action.article.php
XoopsModules/planet/trunk/planet/action.blog.php
XoopsModules/planet/trunk/planet/action.bookmark.php
XoopsModules/planet/trunk/planet/action.rate.php
XoopsModules/planet/trunk/planet/admin/about.php
XoopsModules/planet/trunk/planet/admin/admin.article.php
XoopsModules/planet/trunk/planet/admin/admin.blog.php
XoopsModules/planet/trunk/planet/admin/admin.category.php
XoopsModules/planet/trunk/planet/admin/header.php
XoopsModules/planet/trunk/planet/admin/index.php
XoopsModules/planet/trunk/planet/admin/menu.php
XoopsModules/planet/trunk/planet/blocks/block.php
XoopsModules/planet/trunk/planet/class/article.php
XoopsModules/planet/trunk/planet/class/blog.php
XoopsModules/planet/trunk/planet/class/bookmark.php
XoopsModules/planet/trunk/planet/class/category.php
XoopsModules/planet/trunk/planet/class/feedcreator.class.php
XoopsModules/planet/trunk/planet/class/rate.php
XoopsModules/planet/trunk/planet/class/xml.php
XoopsModules/planet/trunk/planet/class/xmlparser.php
XoopsModules/planet/trunk/planet/class/xmlpc.php
XoopsModules/planet/trunk/planet/comment_delete.php
XoopsModules/planet/trunk/planet/comment_edit.php
XoopsModules/planet/trunk/planet/comment_new.php
XoopsModules/planet/trunk/planet/comment_post.php
XoopsModules/planet/trunk/planet/comment_reply.php
XoopsModules/planet/trunk/planet/counter.php
XoopsModules/planet/trunk/planet/footer.php
XoopsModules/planet/trunk/planet/header.php
XoopsModules/planet/trunk/planet/images/logo.png
XoopsModules/planet/trunk/planet/include/action.module.php
XoopsModules/planet/trunk/planet/include/comment.inc.php
XoopsModules/planet/trunk/planet/include/form.blog.php
XoopsModules/planet/trunk/planet/include/functions.ini.php
XoopsModules/planet/trunk/planet/include/functions.php
XoopsModules/planet/trunk/planet/include/search.inc.php
XoopsModules/planet/trunk/planet/include/vars.php
XoopsModules/planet/trunk/planet/index.php
XoopsModules/planet/trunk/planet/language/english/admin.php
XoopsModules/planet/trunk/planet/pdf.php
XoopsModules/planet/trunk/planet/print.php
XoopsModules/planet/trunk/planet/search.php
XoopsModules/planet/trunk/planet/templates/planet_index.html
XoopsModules/planet/trunk/planet/trackback.php
XoopsModules/planet/trunk/planet/update.php
XoopsModules/planet/trunk/planet/view.archive.php
XoopsModules/planet/trunk/planet/view.article.php
XoopsModules/planet/trunk/planet/view.blogs.php
XoopsModules/planet/trunk/planet/xml.php
XoopsModules/planet/trunk/planet/xoops_version.php
Added Paths:
-----------
XoopsModules/planet/trunk/planet/admin/admin_footer.php
XoopsModules/planet/trunk/planet/admin/admin_header.php
XoopsModules/planet/trunk/planet/admin/main.php
XoopsModules/planet/trunk/planet/docs/
XoopsModules/planet/trunk/planet/docs/changelog.txt
XoopsModules/planet/trunk/planet/docs/credits.txt
XoopsModules/planet/trunk/planet/docs/index.html
XoopsModules/planet/trunk/planet/docs/install.txt
XoopsModules/planet/trunk/planet/docs/lang_diff.txt
XoopsModules/planet/trunk/planet/docs/license.txt
XoopsModules/planet/trunk/planet/docs/readme.clone.txt
XoopsModules/planet/trunk/planet/docs/readme.txt
XoopsModules/planet/trunk/planet/images/index.html
XoopsModules/planet/trunk/planet/include/index.html
XoopsModules/planet/trunk/planet/language/english/help/
XoopsModules/planet/trunk/planet/language/english/help/help.html
XoopsModules/planet/trunk/planet/language/english/help/index.html
XoopsModules/planet/trunk/planet/language/english/mail_template/index.html
XoopsModules/planet/trunk/planet/templates/blocks/index.html
Removed Paths:
-------------
XoopsModules/planet/trunk/planet/admin/admin.block.php
XoopsModules/planet/trunk/planet/changelog.txt
XoopsModules/planet/trunk/planet/gpl.txt
XoopsModules/planet/trunk/planet/readme.clone.txt
XoopsModules/planet/trunk/planet/readme.html
Modified: XoopsModules/planet/trunk/planet/action.article.php
===================================================================
--- XoopsModules/planet/trunk/planet/action.article.php 2013-08-14 06:26:06 UTC (rev 11909)
+++ XoopsModules/planet/trunk/planet/action.article.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -21,7 +21,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
// Author: phppp (D.J., in...@gm...) //
-// URL: http://xoopsforge.com, http://xoops.org.cn //
+// URL: http://xoops.org //
// Project: Article Project //
// ------------------------------------------------------------------------ //
Modified: XoopsModules/planet/trunk/planet/action.blog.php
===================================================================
--- XoopsModules/planet/trunk/planet/action.blog.php 2013-08-14 06:26:06 UTC (rev 11909)
+++ XoopsModules/planet/trunk/planet/action.blog.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -21,7 +21,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
// Author: phppp (D.J., in...@gm...) //
-// URL: http://xoopsforge.com, http://xoops.org.cn //
+// URL: http://xoops.org //
// Project: Article Project //
// ------------------------------------------------------------------------ //
Modified: XoopsModules/planet/trunk/planet/action.bookmark.php
===================================================================
--- XoopsModules/planet/trunk/planet/action.bookmark.php 2013-08-14 06:26:06 UTC (rev 11909)
+++ XoopsModules/planet/trunk/planet/action.bookmark.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -21,7 +21,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
// Author: phppp (D.J., in...@gm...) //
-// URL: http://xoopsforge.com, http://xoops.org.cn //
+// URL: http://xoops.org //
// Project: Article Project //
// ------------------------------------------------------------------------ //
Modified: XoopsModules/planet/trunk/planet/action.rate.php
===================================================================
--- XoopsModules/planet/trunk/planet/action.rate.php 2013-08-14 06:26:06 UTC (rev 11909)
+++ XoopsModules/planet/trunk/planet/action.rate.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -21,7 +21,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
// Author: phppp (D.J., in...@gm...) //
-// URL: http://xoopsforge.com, http://xoops.org.cn //
+// URL: http://xoops.org //
// Project: Article Project //
// ------------------------------------------------------------------------ //
Modified: XoopsModules/planet/trunk/planet/admin/about.php
===================================================================
--- XoopsModules/planet/trunk/planet/admin/about.php 2013-08-14 06:26:06 UTC (rev 11909)
+++ XoopsModules/planet/trunk/planet/admin/about.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -1,99 +1,30 @@
-<?php
-// $Id$
-// ------------------------------------------------------------------------ //
-// This program is free software; you can redistribute it and/or modify //
-// it under the terms of the GNU General Public License as published by //
-// the Free Software Foundation; either version 2 of the License, or //
-// (at your option) any later version. //
-// //
-// 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. See the //
-// GNU General Public License for more details. //
-// //
-// You should have received a copy of the GNU General Public License //
-// along with this program; if not, write to the Free Software //
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
-// ------------------------------------------------------------------------ //
-// Author: phppp (D.J., in...@gm...) //
-// URL: http://xoopsforge.com, http://xoops.org.cn //
-// Project: Article Project //
-// ------------------------------------------------------------------------ //
-include( "header.php" );
-
-xoops_cp_header();
-planet_adminmenu(5);
-
-$versioninfo =& $module_handler->get( $xoopsModule->getVar( 'mid' ) );
-echo "
- <style type=\"text/css\">
- label,text {
- display: block;
- float: left;
- margin-bottom: 2px;
- }
- label {
- text-align: right;
- width: 150px;
- padding-right: 20px;
- }
- br {
- clear: left;
- }
- </style>
-";
-
-echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . $xoopsModule->getVar("name"). "</legend>";
-echo "<div style='padding: 8px;'>";
-echo "<img src='" . XOOPS_URL . "/modules/" . $xoopsModule->getVar("dirname") . "/" . $versioninfo->getInfo( 'image' ) . "' alt='' hspace='10' vspace='0' /></a>\n";
-echo "<div style='padding: 5px;'><strong>" . $versioninfo->getInfo( 'name' ) . " version " . $versioninfo->getInfo( 'version' ) . "</strong></div>\n";
-echo "<label>" . planet_constant("AM_ABOUT_RELEASEDATE") . ":</label><text>" . $versioninfo->getInfo( 'release' ) . "</text><br />";
-echo "<label>" . planet_constant("AM_ABOUT_AUTHOR") . ":</label><text>" . $versioninfo->getInfo( 'author' ) . "</text><br />";
-echo "<label>" . planet_constant("AM_ABOUT_CREDITS") . ":</label><text>" . $versioninfo->getInfo( 'credits' ) . "</text><br />";
-echo "<label>" . planet_constant("AM_ABOUT_LICENSE") . ":</label><text><a href=\"".$versioninfo->getInfo( 'license_file' )."\" target=\"_blank\" >" . $versioninfo->getInfo( 'license' ) . "</a></text>\n";
-echo "</div>";
-echo "</fieldset>";
-echo "<br clear=\"all\" />";
-
-echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . planet_constant("AM_ABOUT_MODULE_INFO") . "</legend>";
-echo "<div style='padding: 8px;'>";
-echo "<label>" . planet_constant("AM_ABOUT_MODULE_STATUS") . ":</label><text>" . $versioninfo->getInfo( 'module_status' ) . "</text><br />";
-echo "<label>" . planet_constant("AM_ABOUT_WEBSITE") . ":</label><text>" . "<a href='" . $versioninfo->getInfo( 'module_website_url' ) . "' target='_blank'>" . $versioninfo->getInfo( 'module_website_name' ) . "</a>" . "</text><br />";
-echo "<label>" . planet_constant("AM_ABOUT_MODULE_TEAM") . ":</label><text>" . $versioninfo->getInfo( 'module_team' ) . "</text><br />";
-echo "</div>";
-echo "</fieldset>";
-echo "<br clear=\"all\" />";
-
-echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . planet_constant("AM_ABOUT_AUTHOR_INFO") . "</legend>";
-echo "<div style='padding: 8px;'>";
-echo "<label>" . planet_constant("AM_ABOUT_AUTHOR_NAME") . ":</label><text>" . $versioninfo->getInfo( 'author' ) . "</text><br />";
-echo "<label>" . planet_constant("AM_ABOUT_WEBSITE") . ":</label><text>" . "<a href='" . $versioninfo->getInfo( 'author_website_url' ) . "' target='_blank'>" . $versioninfo->getInfo( 'author_website_name' ) . "</a>" . "</text><br />";
-echo "<label>" . planet_constant("AM_ABOUT_AUTHOR_WORD") . ":</label><text>" . $versioninfo->getInfo( 'author_word' ) . "</text><br />";
-echo "</div>";
-echo "</fieldset>";
-echo "<br clear=\"all\" />";
-
-echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . planet_constant("AM_ABOUT_DISCLAIMER") . "</legend>";
-echo "<div style='padding: 8px;'>";
-echo "<div>". planet_constant("AM_ABOUT_DISCLAIMER_TEXT") . "</div>";
-echo "</div>";
-echo "</fieldset>";
-echo "<br clear=\"all\" />";
-
-$file = XOOPS_ROOT_PATH. "/modules/" . $GLOBALS["moddirname"] . "/changelog.txt";
-if ( is_readable( $file ) ){
- echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . planet_constant("AM_ABOUT_CHANGELOG") . "</legend>";
- echo "<div style='padding: 8px;'>";
- echo "<div>". implode("<br />", file( $file )) . "</div>";
- echo "</div>";
- echo "</fieldset>";
- echo "<br clear=\"all\" />";
-}
-
-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 $
+ */
+
+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
Modified: XoopsModules/planet/trunk/planet/admin/admin.article.php
===================================================================
--- XoopsModules/planet/trunk/planet/admin/admin.article.php 2013-08-14 06:26:06 UTC (rev 11909)
+++ XoopsModules/planet/trunk/planet/admin/admin.article.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -21,12 +21,14 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
// Author: phppp (D.J., in...@gm...) //
-// URL: http://xoopsforge.com, http://xoops.org.cn //
+// URL: http://xoops.org //
// Project: Article Project //
// ------------------------------------------------------------------------ //
-include("header.php");
+include( "admin_header.php" );
xoops_cp_header();
+$indexAdmin = new ModuleAdmin();
+echo $indexAdmin->addNavigation('admin.article.php');
/*
* To restore basic parameters in case cloned modules are installed
* reported by programfan
@@ -35,7 +37,7 @@
* it is expected to have a better solution in article 1.0
*/
require XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname")."/include/vars.php";
-planet_adminmenu(3);
+//planet_adminmenu(3);
$article_handler =& xoops_getmodulehandler("article", $GLOBALS["moddirname"]);
if(!empty($xoopsModuleConfig["article_expire"])){
Deleted: XoopsModules/planet/trunk/planet/admin/admin.block.php
===================================================================
--- XoopsModules/planet/trunk/planet/admin/admin.block.php 2013-08-14 06:26:06 UTC (rev 11909)
+++ XoopsModules/planet/trunk/planet/admin/admin.block.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -1,29 +0,0 @@
-<?php
-// $Id$
-// ------------------------------------------------------------------------ //
-// This program is free software; you can redistribute it and/or modify //
-// it under the terms of the GNU General Public License as published by //
-// the Free Software Foundation; either version 2 of the License, or //
-// (at your option) any later version. //
-// //
-// 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. See the //
-// GNU General Public License for more details. //
-// //
-// You should have received a copy of the GNU General Public License //
-// along with this program; if not, write to the Free Software //
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
-// ------------------------------------------------------------------------ //
-// Author: phppp (D.J., in...@gm...) //
-// URL: http://xoopsforge.com, http://xoops.org.cn //
-// Project: Article Project //
-// ------------------------------------------------------------------------ //
-include('header.php');
-header("Location: ".XOOPS_URL."/modules/system/admin.php?fct=blocksadmin&selmod=".$xoopsModule->getVar("mid"));
-?>
\ No newline at end of file
Modified: XoopsModules/planet/trunk/planet/admin/admin.blog.php
===================================================================
--- XoopsModules/planet/trunk/planet/admin/admin.blog.php 2013-08-14 06:26:06 UTC (rev 11909)
+++ XoopsModules/planet/trunk/planet/admin/admin.blog.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -21,13 +21,15 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
// Author: phppp (D.J., in...@gm...) //
-// URL: http://xoopsforge.com, http://xoops.org.cn //
+// URL: http://xoops.org //
// Project: Article Project //
// ------------------------------------------------------------------------ //
-include("header.php");
+include( "admin_header.php" );
require_once(XOOPS_ROOT_PATH . "/class/xoopsformloader.php");
xoops_cp_header();
+$indexAdmin = new ModuleAdmin();
+echo $indexAdmin->addNavigation('admin.blog.php');
/*
* To restore basic parameters in case cloned modules are installed
* reported by programfan
@@ -36,7 +38,7 @@
* it is expected to have a better solution in article 1.0
*/
require XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname")."/include/vars.php";
-planet_adminmenu(2);
+//planet_adminmenu(2);
$op = !empty($_POST["op"])?$_POST["op"]:(!empty($_GET["op"])?$_GET["op"]:"");
$blog_id = !empty($_POST["blog"])?$_POST["blog"]:(!empty($_GET["blog"])?$_GET["blog"]:0);
@@ -276,25 +278,26 @@
echo "<form name='list' id='list' method='post' action='".xoops_getenv("PHP_SELF")."'>";
echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
echo "<tr align='center'>";
- echo "<td class='bg3' width='5%'><input name='blog_check' id='blog_check' value='1' type='checkbox' onclick=\"xoopsCheckAll('list', 'blog_check');\" /></td>";
- echo "<td class='bg3' width='5%'>" . _EDIT . "</td>";
- echo "<td class='bg3' width='5%'>" . _DELETE . "</td>";
- echo "<td class='bg3' width='5%'>" . planet_constant("MD_EMPTY_BLOG") . "</td>";
- echo "<td class='bg3'>" . planet_constant("AM_TITLE") . "</td>";
- echo "<td class='bg3' width='5%'>" . planet_constant("AM_STATUS") . "</td>";
- echo "<td class='bg3' width='40%'>" . planet_constant("AM_FEED") . "</td>";
+ echo "<th class='bg3' width='5%'><input name='blog_check' id='blog_check' value='1' type='checkbox' onclick=\"xoopsCheckAll('list', 'blog_check');\" /></td>";
+ echo "<th class='bg3'>" . planet_constant("AM_TITLE") . "</td>";
+ echo "<th class='bg3' width='5%'>" . planet_constant("AM_STATUS") . "</td>";
+ echo "<th class='bg3' width='40%'>" . planet_constant("AM_FEED") . "</td>";
+// echo "<th class='bg3' width='5%'>" . _EDIT . "</td>";
+// echo "<th class='bg3' width='5%'>" . _DELETE . "</td>";
+ echo "<th class='bg3' width='10%'>" . planet_constant("AM_ACTIONS") . "</td>";
echo "</tr>";
$status = array("0"=>planet_constant("MD_PENDING"), "1"=>planet_constant("MD_ACTIVE"), "2"=>planet_constant("MD_FEATURED"));
foreach(array_keys($blog_objs) as $bid){
echo "<tr class='odd' align='left'>";
- echo "<td><input name='blog[]' value='".$bid."' type='checkbox' /></td>";
- echo "<td><a href='admin.blog.php?op=edit&blog=".$bid."' title='"._EDIT."' />"._EDIT."</a></td>";
- echo "<td><a href='admin.blog.php?op=del&blog=".$bid."' title='"._DELETE."' />"._DELETE."</a></td>";
- echo "<td><a href='admin.blog.php?op=empty&blog=".$bid."' title='".planet_constant("MD_EMPTY_BLOG")."' />".planet_constant("MD_EMPTY_BLOG")."</a></td>";
+ echo "<td align='center'><input name='blog[]' value='".$bid."' type='checkbox' /></td>";
echo "<td><a href='".XOOPS_URL."/modules/".$GLOBALS["moddirname"]."/index.php".URL_DELIMITER."b".$bid."'>".$blog_objs[$bid]->getVar("blog_title")."</a></td>";
- echo "<td>".$status[$blog_objs[$bid]->getVar("blog_status")]."</td>";
+ echo "<td align='center'>".$status[$blog_objs[$bid]->getVar("blog_status")]."</td>";
echo "<td>".$blog_objs[$bid]->getVar("blog_feed")."</td>";
+ echo "<td align='center'><a href='admin.blog.php?op=edit&blog=".$bid. "' title='"._EDIT."'><img src='". $pathIcon16 ."/edit.png '". "alt='" . _EDIT . " title='" ._EDIT." </a>
+ <a href='admin.blog.php?op=del&blog=".$bid. "' title='"._DELETE."'><img src='". $pathIcon16 ."/delete.png '"." alt='" . _EDIT . " title='"._DELETE." </a>
+ <a href='admin.blog.php?op=empty&blog=".$bid."' title='".planet_constant("MD_EMPTY_BLOG")."'><img src='". $pathIcon16 ."/empty.png '"." alt='" . _EDIT . " title='".planet_constant("MD_EMPTY_BLOG")."</a></td>";
+
echo "</tr>";
}
echo "<tr class='even' align='center'>";
Modified: XoopsModules/planet/trunk/planet/admin/admin.category.php
===================================================================
--- XoopsModules/planet/trunk/planet/admin/admin.category.php 2013-08-14 06:26:06 UTC (rev 11909)
+++ XoopsModules/planet/trunk/planet/admin/admin.category.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -21,15 +21,17 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
// Author: phppp (D.J., in...@gm...) //
-// URL: http://xoopsforge.com, http://xoops.org.cn //
+// URL: http://xoops.org //
// Project: Article Project //
// ------------------------------------------------------------------------ //
-include("header.php");
+include( "admin_header.php" );
require_once(XOOPS_ROOT_PATH . "/class/xoopsformloader.php");
xoops_cp_header();
+$indexAdmin = new ModuleAdmin();
+echo $indexAdmin->addNavigation('admin.category.php');
require XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname")."/include/vars.php";
-planet_adminmenu(1);
+//planet_adminmenu(1);
$op = !empty($_POST["op"])?$_POST["op"]:(!empty($_GET["op"])?$_GET["op"]:"");
$cat_id = !empty($_POST["category"])?$_POST["category"]:(!empty($_GET["category"])?$_GET["category"]:0);
@@ -119,11 +121,12 @@
echo "<form name='list' method='post'>";
echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
echo "<tr align='center'>";
- echo "<td class='bg3' width='5%'>" . planet_constant("AM_ORDER") . "</td>";
- echo "<td class='bg3' width='5%'>" . _EDIT . "</td>";
- echo "<td class='bg3' width='5%'>" . _DELETE . "</td>";
- echo "<td class='bg3' width='80%'>" . planet_constant("AM_TITLE") . "</td>";
- echo "<td class='bg3' width='5%'>" . planet_constant("AM_BLOGCOUNT") . "</td>";
+ echo "<th class='bg3' width='5%'>" . planet_constant("AM_ORDER") . "</td>";
+ echo "<th align='left' class='bg3' width='80%'>" . planet_constant("AM_TITLE") . "</td>";
+ echo "<th class='bg3' width='5%'>" . planet_constant("AM_BLOGCOUNT") . "</td>";
+ echo "<th class='bg3' width='5%'>" . planet_constant("AM_ACTIONS") . "</td>";
+// echo "<td class='bg3' width='5%'>" . _DELETE . "</td>";
+
echo "</tr>";
$ii = 0;
@@ -131,10 +134,11 @@
echo "<tr class='odd' align='left'>";
echo "<td><input type='hidden' name='cat[]' value='".$cid."' />";
echo "<input type='text' name='cat_order[]' value='".($ii*10)."' /></td>";
- echo "<td><a href='admin.category.php?op=edit&category=".$cid."' title='"._EDIT."' />"._EDIT."</a></td>";
- echo "<td><a href='admin.category.php?op=del&category=".$cid."' title='"._DELETE."' />"._DELETE."</a></td>";
echo "<td>".$categories[$cid]."</td>";
- echo "<td>".@$blog_counts[$cid]."</td>";
+ echo "<td align='center'>".@$blog_counts[$cid]."</td>";
+
+ echo "<td align='center'><a href='admin.category.php?op=edit &category='".$cid."' title='"._EDIT."'><img src='". $pathIcon16 ."/edit.png '". "alt='" . _EDIT . "' title='" ._EDIT."' </a>
+ <a href='admin.category.php?op=del &category='".$cid."' title='"._DELETE."'><img src='". $pathIcon16 ."/delete.png '"." alt='" . _EDIT . "' title='"._DELETE."' </a></td>";
echo "</tr>";
$ii++;
}
Added: XoopsModules/planet/trunk/planet/admin/admin_footer.php
===================================================================
--- XoopsModules/planet/trunk/planet/admin/admin_footer.php (rev 0)
+++ XoopsModules/planet/trunk/planet/admin/admin_footer.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -0,0 +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
Property changes on: XoopsModules/planet/trunk/planet/admin/admin_footer.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: XoopsModules/planet/trunk/planet/admin/admin_header.php
===================================================================
--- XoopsModules/planet/trunk/planet/admin/admin_header.php (rev 0)
+++ XoopsModules/planet/trunk/planet/admin/admin_header.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -0,0 +1,55 @@
+<?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';
+
+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');
+
+include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
+
+
+require XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname")."/include/vars.php";
+require_once(XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname")."/include/functions.php");
+include_once(XOOPS_ROOT_PATH."/Frameworks/art/functions.admin.php");
+
+// include the default language file for the admin interface
+if(!@include_once(XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname")."/language/" . $xoopsConfig['language'] . "/main.php")){
+ include_once(XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname")."/language/english/main.php");
+}
+
+planet_define_url_delimiter();
+$myts =& MyTextSanitizer::getInstance();
Property changes on: XoopsModules/planet/trunk/planet/admin/admin_header.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: XoopsModules/planet/trunk/planet/admin/header.php
===================================================================
--- XoopsModules/planet/trunk/planet/admin/header.php 2013-08-14 06:26:06 UTC (rev 11909)
+++ XoopsModules/planet/trunk/planet/admin/header.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -21,7 +21,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
// Author: phppp (D.J., in...@gm...) //
-// URL: http://xoopsforge.com, http://xoops.org.cn //
+// URL: http://xoops.org //
// Project: Article Project //
// ------------------------------------------------------------------------ //
Modified: XoopsModules/planet/trunk/planet/admin/index.php
===================================================================
--- XoopsModules/planet/trunk/planet/admin/index.php 2013-08-14 06:26:06 UTC (rev 11909)
+++ XoopsModules/planet/trunk/planet/admin/index.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -1,113 +1,32 @@
-<?php
-// $Id$
-// ------------------------------------------------------------------------ //
-// This program is free software; you can redistribute it and/or modify //
-// it under the terms of the GNU General Public License as published by //
-// the Free Software Foundation; either version 2 of the License, or //
-// (at your option) any later version. //
-// //
-// 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. See the //
-// GNU General Public License for more details. //
-// //
-// You should have received a copy of the GNU General Public License //
-// along with this program; if not, write to the Free Software //
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
-// ------------------------------------------------------------------------ //
-// Author: phppp (D.J., in...@gm...) //
-// URL: http://xoopsforge.com, http://xoops.org.cn //
-// Project: Article Project //
-// ------------------------------------------------------------------------ //
-include('header.php');
-
-xoops_cp_header();
-
-planet_adminmenu(0);
-
-echo "
- <style type=\"text/css\">
- label,text {
- display: block;
- float: left;
- margin-bottom: 2px;
- }
- label {
- text-align: right;
- width: 150px;
- padding-right: 20px;
- }
- br {
- clear: left;
- }
- </style>
-";
-
-echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . planet_constant("AM_PREFERENCES") . "</legend>";
-echo "<div style='padding: 8px;'>";
-echo "<label>" . "<strong>PHP Version:</strong>" . ":</label><text>" . phpversion() . "</text><br />";
-echo "<label>" . "<strong>MySQL Version:</strong>" . ":</label><text>" . mysql_get_server_info() . "</text><br />";
-echo "<label>" . "<strong>XOOPS Version:</strong>" . ":</label><text>" . XOOPS_VERSION . "</text><br />";
-echo "<label>" . "<strong>Module Version:</strong>" . ":</label><text>" . $xoopsModule->getInfo('version') . "</text><br />";
-echo "</div>";
-echo "<div style='padding: 8px;'>";
-echo "<label>" . planet_constant("AM_SAFEMODE") . ":</label><text>";
-echo ( ini_get( 'safe_mode' ) ) ? planet_constant("AM_ON") : planet_constant("AM_OFF");
-echo "</text><br />";
-echo "<label>" . planet_constant("AM_REGISTERGLOBALS") . ":</label><text>";
-echo ( ini_get( 'register_globals' )) ? planet_constant("AM_ON") : planet_constant("AM_OFF");
-echo "</text><br />";
-echo "<label>" . planet_constant("AM_MAGICQUOTESGPC") . ":</label><text>";
-echo ( ini_get( 'magic_quotes_gpc' )) ? planet_constant("AM_ON") : planet_constant("AM_OFF");
-echo "</text><br />";
-echo "<label>" . planet_constant("AM_MAXPOSTSIZE") .":</label><text>". ini_get( 'post_max_size' );
-echo "</text><br />";
-echo "<label>" . planet_constant("AM_MAXINPUTTIME") .":</label><text>". ini_get( 'max_input_time' );
-echo "</text><br />";
-echo "<label>" . planet_constant("AM_OUTPUTBUFFERING") .":</label><text>". ini_get( 'output_buffering' );
-echo "</text><br />";
-echo "<label>" . planet_constant("AM_XML_EXTENSION") .":</label><text>";
-echo ( extension_loaded( 'xml' )) ? planet_constant("AM_ON") : planet_constant("AM_OFF");
-echo "</text><br />";
-echo "<label>" . planet_constant("AM_MB_EXTENSION") .":</label><text>";
-echo ( extension_loaded( 'mbstring' )) ? planet_constant("AM_ON") : planet_constant("AM_OFF");
-echo "</text><br />";
-echo "<label>" . planet_constant("AM_CURL") .":</label><text>";
-echo ( function_exists('curl_init')) ? planet_constant("AM_ON") : planet_constant("AM_OFF");
-echo "</text><br />";
-echo "<label>" . planet_constant("AM_FSOCKOPEN") .":</label><text>";
-echo ( function_exists('fsockopen')) ? planet_constant("AM_ON") : planet_constant("AM_OFF");
-echo "</text><br />";
-echo "<label>" . planet_constant("AM_URLFOPEN") .":</label><text>";
-echo ( ini_get('allow_url_fopen')) ? planet_constant("AM_ON") : planet_constant("AM_OFF");
-echo "</text><br />";
-echo "</div>";
-echo "</fieldset>";
-
-echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . planet_constant("AM_STATS") . "</legend>";
-echo "<div style='padding: 8px;'>";
-$category_handler =& xoops_getmodulehandler('category', $GLOBALS["moddirname"]);
-$category_count = $category_handler->getCount();
-$blog_handler =& xoops_getmodulehandler("blog", $GLOBALS["moddirname"]);
-$blog_count = $blog_handler->getCount();
-$article_handler =& xoops_getmodulehandler('article', $GLOBALS["moddirname"]);
-$article_count = $article_handler->getCount();
-$criteria = new Criteria("blog_status", 0);
-$blog_count_pending = $blog_handler->getCount($criteria);
-echo "<label>" . planet_constant("AM_TOTAL_CATEGORIES") .":</label><text>". $category_count;
-echo "</text><br />";
-echo "<label>" . planet_constant("AM_TOTAL_BLOGS") .":</label><text>". $blog_count;
-if($blog_count_pending>0) echo " (<font color=\"red\">". $blog_count_pending."</font>)";
-echo "</text><br />";
-echo "<label>" . planet_constant("AM_TOTAL_ARTICLES") .":</label><text>".$article_count;
-echo "</text><br />";
-echo "</div>";
-echo "</fieldset>";
-
-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 $
+ */
+
+
+require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
+include_once dirname(__FILE__) . '/admin_header.php';
+
+xoops_cp_header();
+
+ $indexAdmin = new ModuleAdmin();
+
+ echo $indexAdmin->addNavigation('index.php');
+ echo $indexAdmin->renderIndex();
+
+include "admin_footer.php";
\ No newline at end of file
Added: XoopsModules/planet/trunk/planet/admin/main.php
===================================================================
--- XoopsModules/planet/trunk/planet/admin/main.php (rev 0)
+++ XoopsModules/planet/trunk/planet/admin/main.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -0,0 +1,115 @@
+<?php
+// $Id$
+// ------------------------------------------------------------------------ //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation; either version 2 of the License, or //
+// (at your option) any later version. //
+// //
+// 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. See the //
+// GNU General Public License for more details. //
+// //
+// You should have received a copy of the GNU General Public License //
+// along with this program; if not, write to the Free Software //
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
+// ------------------------------------------------------------------------ //
+// Author: phppp (D.J., in...@gm...) //
+// URL: http://xoops.org //
+// Project: Article Project //
+// ------------------------------------------------------------------------ //
+include( "admin_header.php" );
+
+xoops_cp_header();
+$indexAdmin = new ModuleAdmin();
+echo $indexAdmin->addNavigation('main.php');
+
+//planet_adminmenu(0);
+
+echo "
+ <style type=\"text/css\">
+ label,text {
+ display: block;
+ float: left;
+ margin-bottom: 2px;
+ }
+ label {
+ text-align: right;
+ width: 150px;
+ padding-right: 20px;
+ }
+ br {
+ clear: left;
+ }
+ </style>
+";
+
+echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . planet_constant("AM_PREFERENCES") . "</legend>";
+echo "<div style='padding: 8px;'>";
+echo "<label>" . "<strong>PHP Version:</strong>" . ":</label><text>" . phpversion() . "</text><br />";
+echo "<label>" . "<strong>MySQL Version:</strong>" . ":</label><text>" . mysql_get_server_info() . "</text><br />";
+echo "<label>" . "<strong>XOOPS Version:</strong>" . ":</label><text>" . XOOPS_VERSION . "</text><br />";
+echo "<label>" . "<strong>Module Version:</strong>" . ":</label><text>" . $xoopsModule->getInfo('version') . "</text><br />";
+echo "</div>";
+echo "<div style='padding: 8px;'>";
+echo "<label>" . planet_constant("AM_SAFEMODE") . ":</label><text>";
+echo ( ini_get( 'safe_mode' ) ) ? planet_constant("AM_ON") : planet_constant("AM_OFF");
+echo "</text><br />";
+echo "<label>" . planet_constant("AM_REGISTERGLOBALS") . ":</label><text>";
+echo ( ini_get( 'register_globals' )) ? planet_constant("AM_ON") : planet_constant("AM_OFF");
+echo "</text><br />";
+echo "<label>" . planet_constant("AM_MAGICQUOTESGPC") . ":</label><text>";
+echo ( ini_get( 'magic_quotes_gpc' )) ? planet_constant("AM_ON") : planet_constant("AM_OFF");
+echo "</text><br />";
+echo "<label>" . planet_constant("AM_MAXPOSTSIZE") .":</label><text>". ini_get( 'post_max_size' );
+echo "</text><br />";
+echo "<label>" . planet_constant("AM_MAXINPUTTIME") .":</label><text>". ini_get( 'max_input_time' );
+echo "</text><br />";
+echo "<label>" . planet_constant("AM_OUTPUTBUFFERING") .":</label><text>". ini_get( 'output_buffering' );
+echo "</text><br />";
+echo "<label>" . planet_constant("AM_XML_EXTENSION") .":</label><text>";
+echo ( extension_loaded( 'xml' )) ? planet_constant("AM_ON") : planet_constant("AM_OFF");
+echo "</text><br />";
+echo "<label>" . planet_constant("AM_MB_EXTENSION") .":</label><text>";
+echo ( extension_loaded( 'mbstring' )) ? planet_constant("AM_ON") : planet_constant("AM_OFF");
+echo "</text><br />";
+echo "<label>" . planet_constant("AM_CURL") .":</label><text>";
+echo ( function_exists('curl_init')) ? planet_constant("AM_ON") : planet_constant("AM_OFF");
+echo "</text><br />";
+echo "<label>" . planet_constant("AM_FSOCKOPEN") .":</label><text>";
+echo ( function_exists('fsockopen')) ? planet_constant("AM_ON") : planet_constant("AM_OFF");
+echo "</text><br />";
+echo "<label>" . planet_constant("AM_URLFOPEN") .":</label><text>";
+echo ( ini_get('allow_url_fopen')) ? planet_constant("AM_ON") : planet_constant("AM_OFF");
+echo "</text><br />";
+echo "</div>";
+echo "</fieldset>";
+
+echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . planet_constant("AM_STATS") . "</legend>";
+echo "<div style='padding: 8px;'>";
+$category_handler =& xoops_getmodulehandler('category', $GLOBALS["moddirname"]);
+$category_count = $category_handler->getCount();
+$blog_handler =& xoops_getmodulehandler("blog", $GLOBALS["moddirname"]);
+$blog_count = $blog_handler->getCount();
+$article_handler =& xoops_getmodulehandler('article', $GLOBALS["moddirname"]);
+$article_count = $article_handler->getCount();
+$criteria = new Criteria("blog_status", 0);
+$blog_count_pending = $blog_handler->getCount($criteria);
+echo "<label>" . planet_constant("AM_TOTAL_CATEGORIES") .":</label><text>". $category_count;
+echo "</text><br />";
+echo "<label>" . planet_constant("AM_TOTAL_BLOGS") .":</label><text>". $blog_count;
+if($blog_count_pending>0) echo " (<font color=\"red\">". $blog_count_pending."</font>)";
+echo "</text><br />";
+echo "<label>" . planet_constant("AM_TOTAL_ARTICLES") .":</label><text>".$article_count;
+echo "</text><br />";
+echo "</div>";
+echo "</fieldset>";
+
+xoops_cp_footer();
+?>
\ No newline at end of file
Property changes on: XoopsModules/planet/trunk/planet/admin/main.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: XoopsModules/planet/trunk/planet/admin/menu.php
===================================================================
--- XoopsModules/planet/trunk/planet/admin/menu.php 2013-08-14 06:26:06 UTC (rev 11909)
+++ XoopsModules/planet/trunk/planet/admin/menu.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -21,25 +21,59 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
// Author: phppp (D.J., in...@gm...) //
-// URL: http://xoopsforge.com, http://xoops.org.cn //
+// URL: http://xoops.org //
// Project: Article Project //
// ------------------------------------------------------------------------ //
if (!defined('XOOPS_ROOT_PATH')){ exit(); }
-global $adminmenu;
+
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+
+$path = dirname(dirname(dirname(dirname(__FILE__))));
+include_once $path . '/mainfile.php';
+
+$dirname = basename(dirname(dirname(__FILE__)));
+$module_handler = xoops_gethandler('module');
+$module = $module_handler->getByDirname($dirname);
+$pathIcon32 = $module->getInfo('icons32');
+$pathModuleAdmin = $module->getInfo('dirmoduleadmin');
+$pathLanguage = $path . $pathModuleAdmin;
+
+
+if (!file_exists($fileinc = $pathLanguage . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/' . 'main.php')) {
+ $fileinc = $pathLanguage . '/language/english/main.php';
+}
+
+include_once $fileinc;
+
$adminmenu = array();
+$i=0;
+$adminmenu[$i]["title"] = _AM_MODULEADMIN_HOME;
+$adminmenu[$i]['link'] = "admin/index.php";
+$adminmenu[$i]["icon"] = $pathIcon32 . '/home.png';
+$i++;
+$adminmenu[$i]['title'] = planet_constant("MI_ADMENU_INDEX");
+$adminmenu[$i]['link'] = "admin/main.php";
+$adminmenu[$i]["icon"] = $pathIcon32 . '/manage.png';
-$adminmenu[]= array("link"=>"admin/index.php",
- "title"=>planet_constant("MI_ADMENU_INDEX"));
-$adminmenu[]= array("link"=>"admin/admin.category.php",
- "title"=>planet_constant("MI_ADMENU_CATEGORY"));
-$adminmenu[]= array("link"=>"admin/admin.blog.php",
- "title"=>planet_constant("MI_ADMENU_BLOG"));
-$adminmenu[]= array("link"=>"admin/admin.article.php",
- "title"=>planet_constant("MI_ADMENU_ARTICLE"));
-$adminmenu[]= array("link"=>"admin/admin.block.php",
- "title"=>planet_constant("MI_ADMENU_BLOCK"));
-$adminmenu[]= array("link"=>"admin/about.php",
- "title"=>planet_constant("MI_ADMENU_ABOUT"));
-?>
\ No newline at end of file
+$i++;
+$adminmenu[$i]['title'] = planet_constant("MI_ADMENU_CATEGORY");
+$adminmenu[$i]['link'] = "admin/admin.category.php";
+$adminmenu[$i]["icon"] = $pathIcon32 . '/category.png';
+$i++;
+$adminmenu[$i]['title'] = planet_constant("MI_ADMENU_BLOG");
+$adminmenu[$i]['link'] = "admin/admin.blog.php";
+$adminmenu[$i]["icon"] = $pathIcon32 . '/translations.png';
+$i++;
+$adminmenu[$i]['title'] = planet_constant("MI_ADMENU_ARTICLE");
+$adminmenu[$i]['link'] = "admin/admin.article.php";
+$adminmenu[$i]["icon"] = $pathIcon32 . '/content.png';
+//$i++;
+//$adminmenu[$i]['title'] = planet_constant("MI_ADMENU_BLOCK");
+//$adminmenu[$i]['link'] = "admin/admin.block.php";
+//$adminmenu[$i]["icon"] = $pathIcon32 . '/manage.png';
+$i++;
+$adminmenu[$i]['title'] = _AM_MODULEADMIN_ABOUT;
+$adminmenu[$i]["link"] = "admin/about.php";
+$adminmenu[$i]["icon"] = $pathIcon32 . '/about.png';
Modified: XoopsModules/planet/trunk/planet/blocks/block.php
===================================================================
--- XoopsModules/planet/trunk/planet/blocks/block.php 2013-08-14 06:26:06 UTC (rev 11909)
+++ XoopsModules/planet/trunk/planet/blocks/block.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -21,7 +21,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
// Author: phppp (D.J., in...@gm...) //
-// URL: http://xoopsforge.com, http://xoops.org.cn //
+// URL: http://xoops.org //
// Project: Article Project //
// ------------------------------------------------------------------------ //
@@ -60,6 +60,7 @@
global $xoopsDB;
planet_define_url_delimiter();
+ $blogs = array();
$block = array();
$select = "art_id";
$disp_tag = "";
@@ -264,8 +265,9 @@
$blogs[] = $_art;
unset($blog, $_art);
}
+if (isset($block["blogs"])) {
$block["blogs"] = $blogs;
-
+ }
$block["dirname"] = $GLOBALS["moddirname"];
return $block;
}
Deleted: XoopsModules/planet/trunk/planet/changelog.txt
===================================================================
--- XoopsModules/planet/trunk/planet/changelog.txt 2013-08-14 06:26:06 UTC (rev 11909)
+++ XoopsModules/planet/trunk/planet/changelog.txt 2013-08-14 06:37:13 UTC (rev 11910)
@@ -1,24 +0,0 @@
-Changelog 2.02
-Oct 29th, 2006
-==============
-Bugfix for URLs in template
-Made clonable
-
-
-Changelog 2.0
-July 9th, 2006
-=============
-Validated with XOOPS 2.0.14
-
-Jan 29th, 2006
-=============
-Compatible with XOOPS 2.0, 2.2, 2.3
-
-2005-11-18
-Planet 1.01 release
-1. bugfixes
-2. "empty blog" for admin
-3. known issue: archive view having problem with missing language definition and disabled
-
-2005-11-15
-Planet 1.00 release
\ No newline at end of file
Modified: XoopsModules/planet/trunk/planet/class/article.php
===================================================================
--- XoopsModules/planet/trunk/planet/class/article.php 2013-08-14 06:26:06 UTC (rev 11909)
+++ XoopsModules/planet/trunk/planet/class/article.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -21,7 +21,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
// Author: phppp (D.J., in...@gm...) //
-// URL: http://xoopsforge.com, http://xoops.org.cn //
+// URL: http://xoops.org //
// Project: Article Project //
// ------------------------------------------------------------------------ //
/**
@@ -75,7 +75,7 @@
$this->initVar("dosmiley", XOBJ_DTYPE_INT, 1);
$this->initVar("doxcode", XOBJ_DTYPE_INT, 1);
$this->initVar("doimage", XOBJ_DTYPE_INT, 1);
- $this->initVar("dobr", XOBJ_DTYPE_INT, 0);
+ $this->initVar("dobr", XOBJ_DTYPE_INT, 1);
}
/**
@@ -338,7 +338,7 @@
$ret[$myrow[$this->keyName]] = $object;
}else{
foreach($myrow as $key=>$val){
- $ret[$myrow[$this->keyName]][$key] = $val;
+ $ret[$myrow[$this->keyName]][$key] = ($object->vars[$key]["changed"])?$object->getVar($key):$val;
}
}
unset($object);
Modified: XoopsModules/planet/trunk/planet/class/blog.php
===================================================================
--- XoopsModules/planet/trunk/planet/class/blog.php 2013-08-14 06:26:06 UTC (rev 11909)
+++ XoopsModules/planet/trunk/planet/class/blog.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -21,7 +21,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
// Author: phppp (D.J., in...@gm...) //
-// URL: http://xoopsforge.com, http://xoops.org.cn //
+// URL: http://xoops.org //
// Project: Article Project //
// ------------------------------------------------------------------------ //
/**
@@ -247,7 +247,9 @@
/* parse items */
$res = $this->parse($content, $blog->getVar("blog_charset"), array("items"));
+ //xoops_message($res);
$items = $res["items"];
+ //xoops_message($items);
$blog_time = 0;
$crit = $blog->getVar("blog_time");
$articles = array();
@@ -318,10 +320,11 @@
}
require_once XOOPS_ROOT_PATH."/modules/".$GLOBALS["moddirname"]."/class/xmlparser.php";
- $parser = new XmlParser( $content, $charset, empty($xlanguage["charset_base"]) ? _CHARSET : $xlanguage["charset_base"], $tags );
+ $parser = new XmlParser( $content, $charset, _CHARSET, $tags );
if (!$parser) {
return $res;
}
+ //xoops_message($parser);
foreach($tags as $tag){
$res[$tag] = $parser->{$tag};
}
Modified: XoopsModules/planet/trunk/planet/class/bookmark.php
===================================================================
--- XoopsModules/planet/trunk/planet/class/bookmark.php 2013-08-14 06:26:06 UTC (rev 11909)
+++ XoopsModules/planet/trunk/planet/class/bookmark.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -21,7 +21,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
// Author: phppp (D.J., in...@gm...) //
-// URL: http://xoopsforge.com, http://xoops.org.cn //
+// URL: http://xoops.org //
// Project: Article Project //
// ------------------------------------------------------------------------ //
/**
Modified: XoopsModules/planet/trunk/planet/class/category.php
===================================================================
--- XoopsModules/planet/trunk/planet/class/category.php 2013-08-14 06:26:06 UTC (rev 11909)
+++ XoopsModules/planet/trunk/planet/class/category.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -21,7 +21,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
// Author: phppp (D.J., in...@gm...) //
-// URL: http://xoopsforge.com, http://xoops.org.cn //
+// URL: http://xoops.org //
// Project: Article Project //
// ------------------------------------------------------------------------ //
/**
Modified: XoopsModules/planet/trunk/planet/class/feedcreator.class.php
===================================================================
--- XoopsModules/planet/trunk/planet/class/feedcreator.class.php 2013-08-14 06:26:06 UTC (rev 11909)
+++ XoopsModules/planet/trunk/planet/class/feedcreator.class.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -21,7 +21,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
// Author: phppp (D.J., in...@gm...) //
-// URL: http://xoopsforge.com, http://xoops.org.cn //
+// URL: http://xoops.org //
// Project: Article Project //
// ------------------------------------------------------------------------ //
@@ -66,11 +66,11 @@
added a switch to select an external stylesheet (thanks to Pascal Van Hecke)
changed default content-type to application/xml
added character encoding setting
- fixed numerous smaller bugs (thanks to S\xF6ren Fuhrmann of golem.de)
+ fixed numerous smaller bugs (thanks to S�ren Fuhrmann of golem.de)
improved changing ATOM versions handling (thanks to August Trometer)
- improved the UniversalFeedCreator's useCached method (thanks to S\xF6ren Fuhrmann of golem.de)
- added charset output in HTTP headers (thanks to S\xF6ren Fuhrmann of golem.de)
- added Slashdot namespace to RSS 1.0 (thanks to S\xF6ren Fuhrmann of golem.de)
+ improved the UniversalFeedCreator's useCached method (thanks to S�ren Fuhrmann of golem.de)
+ added charset output in HTTP headers (thanks to S�ren Fuhrmann of golem.de)
+ added Slashdot namespace to RSS 1.0 (thanks to S�ren Fuhrmann of golem.de)
v1.6 05-10-04
added stylesheet to RSS 1.0 feeds
@@ -88,7 +88,7 @@
considered beta due to some internal changes
v1.5.1 01-27-04
- fixed some RSS 1.0 glitches (thanks to St\xE9phane Vanpoperynghe)
+ fixed some RSS 1.0 glitches (thanks to St�phane Vanpoperynghe)
fixed some inconsistencies between documentation and code (thanks to Timothy Martin)
v1.5 01-06-04
Modified: XoopsModules/planet/trunk/planet/class/rate.php
===================================================================
--- XoopsModules/planet/trunk/planet/class/rate.php 2013-08-14 06:26:06 UTC (rev 11909)
+++ XoopsModules/planet/trunk/planet/class/rate.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -21,7 +21,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
// Author: phppp (D.J., in...@gm...) //
-// URL: http://xoopsforge.com, http://xoops.org.cn //
+// URL: http://xoops.org //
// Project: Article Project //
// ------------------------------------------------------------------------ //
Modified: XoopsModules/planet/trunk/planet/class/xml.php
===================================================================
--- XoopsModules/planet/trunk/planet/class/xml.php 2013-08-14 06:26:06 UTC (rev 11909)
+++ XoopsModules/planet/trunk/planet/class/xml.php 2013-08-14 06:37:13 UTC (rev 11910)
...
[truncated message content] |
