Thread: [xoops-svn] SF.net SVN: xoops-svn:[11891] XoopsModules/myalbum/trunk/htdocs/modules/ myalbum

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 11891
          http://sourceforge.net/p/xoops/svn/11891
Author:   beckmi
Date:     2013-08-08 22:07:07 +0000 (Thu, 08 Aug 2013)
Log Message:
-----------
Updating to 3.07 RC3 (see changelog)

Modified Paths:
--------------
    XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/about.php
    XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/admin_header.php
    XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/admission.php
    XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/batch.php
    XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/export.php
    XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/groupperm_global.php
    XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/import.php
    XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/index.php
    XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/menu.php
    XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/photomanager.php
    XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/redothumbs.php
    XoopsModules/myalbum/trunk/htdocs/modules/myalbum/blocks/myalbum_tophits.php
    XoopsModules/myalbum/trunk/htdocs/modules/myalbum/class/comments.php
    XoopsModules/myalbum/trunk/htdocs/modules/myalbum/docs/changelog.txt
    XoopsModules/myalbum/trunk/htdocs/modules/myalbum/docs/install.txt
    XoopsModules/myalbum/trunk/htdocs/modules/myalbum/include/blocksadmin.inc.php
    XoopsModules/myalbum/trunk/htdocs/modules/myalbum/include/functions.php
    XoopsModules/myalbum/trunk/htdocs/modules/myalbum/include/onupdate.inc.php
    XoopsModules/myalbum/trunk/htdocs/modules/myalbum/include/sitemap.plugin.php
    XoopsModules/myalbum/trunk/htdocs/modules/myalbum/include/waiting.plugin.php
    XoopsModules/myalbum/trunk/htdocs/modules/myalbum/photo.php
    XoopsModules/myalbum/trunk/htdocs/modules/myalbum/xoops_version.php

Added Paths:
-----------
    XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/admin_footer.php
    XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/main.php
    XoopsModules/myalbum/trunk/htdocs/modules/myalbum/language/english/help/
    XoopsModules/myalbum/trunk/htdocs/modules/myalbum/language/english/help/help.html
    XoopsModules/myalbum/trunk/htdocs/modules/myalbum/language/english/help/index.html

Removed Paths:
-------------
    XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/dashboard.php

Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/about.php
===================================================================

--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/about.php	2013-08-08 06:30:41 UTC (rev 11890)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/about.php	2013-08-08 22:07:07 UTC (rev 11891)
@@ -1,75 +1,30 @@
 <?php
-// $Id: about.php 5204 2010-09-06 20:10:52Z mageg $
-//  ------------------------------------------------------------------------ //
-//                XOOPS - PHP Content Management System                      //
-//                    Copyright (c) 2000 XOOPS.org                           //
-//                       <http://www.xoops.org/>                             //
-//  ------------------------------------------------------------------------ //
-//  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: XOOPS Foundation                                                  //
-// URL: http://www.xoops.org/                                                //
-// Project: The XOOPS Project                                                //
-// ------------------------------------------------------------------------- //
+/*
+ * 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.
+ */
 
-	include ('admin_header.php');
-		
-	xoops_cp_header();		
-	myalbum_adminMenu(basename(__FILE__), 9);
-	$paypalitemno='MYALBUMP301';
-	$aboutAdmin = new ModuleAdmin();
-	$about = $aboutAdmin->renderabout($paypalitemno, false);
-	
-	$donationform = array(	0 => '<form name="donation" id="donation" action="http://www.chronolabs.coop/modules/xpayment/" method="post" onsubmit="return xoopsFormValidate_donation();">',
-								1 => '<table class="outer" cellspacing="1" width="100%"><tbody><tr><th colspan="2">'._AM_ABOUT_MAKEDONATE.'</th></tr><tr align="left" valign="top"><td class="head"><div class="xoops-form-element-caption-required"><span class="caption-text">Donation Amount</span><span class="caption-marker">*</span></div></td><td class="even"><select size="1" name="item[A][amount]" id="item[A][amount]" title="Donation Amount"><option value="5">5.00 AUD</option><option value="10">10.00 AUD</option><option value="20">20.00 AUD</option><option value="40">40.00 AUD</option><option value="60">60.00 AUD</option><option value="80">80.00 AUD</option><option value="90">90.00 AUD</option><option value="100">100.00 AUD</option><option value="200">200.00 AUD</option></select></td></tr><tr align="left" valign="top"><td class="head"></td><td class="even"><input class="formButton" name="submit" id="submit" value="'._SUBMIT.'" title="'._SUBMIT.'" type="submit"></td></tr></tbody></table>',
-								2 => '<input name="op" id="op" value="createinvoice" type="hidden"><input name="plugin" id="plugin" value="donations" type="hidden"><input name="donation" id="donation" value="1" type="hidden"><input name="drawfor" id="drawfor" value="Chronolabs Co-Operative" type="hidden"><input name="drawto" id="drawto" value="%s" type="hidden"><input name="drawto_email" id="drawto_email" value="%s" type="hidden"><input name="key" id="key" value="%s" type="hidden"><input name="currency" id="currency" value="AUD" type="hidden"><input name="weight_unit" id="weight_unit" value="kgs" type="hidden"><input name="item[A][cat]" id="item[A][cat]" value="XDN%s" type="hidden"><input name="item[A][name]" id="item[A][name]" value="Donation for %s" type="hidden"><input name="item[A][quantity]" id="item[A][quantity]" value="1" type="hidden"><input name="item[A][shipping]" id="item[A][shipping]" value="0" type="hidden"><input name="item[A][handling]" id="item[A][handling]" value="0" type="hidden"><input name="item[A][weight]" id="item[A][weight]" value="0" type="hidden"><input name="item[A][tax]" id="item[A][tax]" value="0" type="hidden"><input name="return" id="return" value="http://www.chronolabs.coop/modules/donations/success.php" type="hidden"><input name="cancel" id="cancel" value="http://www.chronolabs.coop/modules/donations/success.php" type="hidden"></form>',																'D'=>'',
-								3 => '',
-								4 => '<!-- Start Form Validation JavaScript //-->
-<script type="text/javascript">
-<!--//
-function xoopsFormValidate_donation() { var myform = window.document.donation; 
-var hasSelected = false; var selectBox = myform.item[A][amount];for (i = 0; i < selectBox.options.length; i++ ) { if (selectBox.options[i].selected == true && selectBox.options[i].value != \'\') { hasSelected = true; break; } }if (!hasSelected) { window.alert("Please enter Donation Amount"); selectBox.focus(); return false; }return true;
-}
-//--></script>
-<!-- End Form Validation JavaScript //-->');
-	$paypalform = array(	0 => '<form action="https://www.paypal.com/cgi-bin/webscr" method="post">',
-							1 => '<input name="cmd" value="_s-xclick" type="hidden">',
-							2 => '<input name="hosted_button_id" value="%s" type="hidden">',
-							3 => '<img alt="" src="https://www.paypal.com/fr_FR/i/scr/pixel.gif" height="1" border="0" width="1">',
-							4 => '<input src="https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif" name="submit" alt="PayPal - The safer, easier way to pay online!" border="0" type="image">',
-							5 => '</form>');
-	
-	for($key=0;$key<=4;$key++) {
-		switch ($key) {
-			case 2:
-				$donationform[$key] =  sprintf($donationform[$key], $GLOBALS['xoopsConfig']['sitename'] . ' - ' . (strlen($GLOBALS['xoopsUser']->getVar('name'))>0?$GLOBALS['xoopsUser']->getVar('name'). ' ['.$GLOBALS['xoopsUser']->getVar('uname').']':$GLOBALS['xoopsUser']->getVar('uname')), $GLOBALS['xoopsUser']->getVar('email'), XOOPS_LICENSE_KEY, strtoupper($GLOBALS['myalbumModule']->getVar('dirname')),  strtoupper($GLOBALS['myalbumModule']->getVar('dirname')). ' '.$GLOBALS['myalbumModule']->getVar('name'));
-				break;
-		}
-	}
-		
-	$istart = strpos($about, ($paypalform[0]), 1);
-	$iend = strpos($about, ($paypalform[5]), $istart+1)+strlen($paypalform[5])-1;
-	echo (substr($about, 0, $istart-1));
-	echo implode("\n", $donationform);
-	echo (substr($about, $iend+1, strlen($about)-$iend-1));
-	myalbum_footer_adminMenu();
-	xoops_cp_footer();	
+/**
+ * @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 $
+ */
 
-?>
\ No newline at end of file
+include_once dirname(__FILE__) . '/admin_header.php';
+
+xoops_cp_header();
+
+$aboutAdmin = new ModuleAdmin();
+
+echo $aboutAdmin->addNavigation('about.php');
+echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false);
+
+include_once 'admin_footer.php';
\ No newline at end of file

Added: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/admin_footer.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/admin_footer.php	                        (rev 0)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/admin_footer.php	2013-08-08 22:07:07 UTC (rev 11891)
@@ -0,0 +1,30 @@
+<?php
+/*
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * @copyright    The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license      GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package
+ * @since
+ * @author     XOOPS Development Team
+ * @version    $Id $
+ */
+
+global $pathIcon32;
+
+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/myalbum/trunk/htdocs/modules/myalbum/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
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/admin_header.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/admin_header.php	2013-08-08 06:30:41 UTC (rev 11890)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/admin_header.php	2013-08-08 22:07:07 UTC (rev 11891)
@@ -1,5 +1,6 @@
 <?php
-	require_once (dirname(dirname(dirname(dirname(__FILE__)))).'/include/cp_header.php');
+require_once (dirname(dirname(dirname(dirname(__FILE__)))).'/mainfile.php');
+require_once (dirname(dirname(dirname(dirname(__FILE__)))).'/include/cp_header.php');
 	require_once (dirname(dirname(__FILE__))).'/include/functions.php';
 	require_once (dirname(dirname(__FILE__))).'/include/read_configs.php';
 	
@@ -55,6 +56,10 @@
 	xoops_loadLanguage('user');
 	xoops_loadLanguage('admin', $mydirname);
 	xoops_loadLanguage('main', $mydirname);
+
+$pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
+$pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
+$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
 	
 	if (!isset($GLOBALS['xoopsTpl']) || !is_object($GLOBALS['xoopsTpl'])) {
 		include_once(XOOPS_ROOT_PATH."/class/template.php");

Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/admission.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/admission.php	2013-08-08 06:30:41 UTC (rev 11890)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/admission.php	2013-08-08 22:07:07 UTC (rev 11891)
@@ -44,7 +44,9 @@
 	}
 }
 xoops_cp_header();
-myalbum_adminMenu(basename(__FILE__), 3);
+$indexAdmin = new ModuleAdmin();
+echo $indexAdmin->addNavigation('admission.php');
+//myalbum_adminMenu(basename(__FILE__), 3);
 $GLOBALS['xoopsTpl']->assign('admin_title', sprintf(_AM_H3_FMT_ADMISSION,$xoopsModule->name()));
 $GLOBALS['xoopsTpl']->assign('mydirname', $GLOBALS['mydirname']);
 $GLOBALS['xoopsTpl']->assign('photos_url', $GLOBALS['photos_url']);
@@ -65,6 +67,5 @@
 $GLOBALS['xoopsTpl']->display('db:'.$GLOBALS['mydirname'].'_cpanel_admission.html');
 
 // check $xoopsModule
-myalbum_footer_adminMenu();
-xoops_cp_footer();
-?>
+//	myalbum_footer_adminMenu();
+include_once 'admin_footer.php';

Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/batch.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/batch.php	2013-08-08 06:30:41 UTC (rev 11890)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/batch.php	2013-08-08 22:07:07 UTC (rev 11891)
@@ -121,7 +121,9 @@
 }
 
 xoops_cp_header();
-myalbum_adminMenu(basename(__FILE__), 4);
+$indexAdmin = new ModuleAdmin();
+echo $indexAdmin->addNavigation('batch.php');
+//myalbum_adminMenu(basename(__FILE__), 4);
 $GLOBALS['xoopsTpl']->assign('admin_title', sprintf(_AM_H3_FMT_BATCHREGISTER,$GLOBALS['myalbumModule']->name()));
 $GLOBALS['xoopsTpl']->assign('mydirname', $GLOBALS['mydirname']);
 $GLOBALS['xoopsTpl']->assign('photos_url', $GLOBALS['photos_url']);
@@ -133,7 +135,5 @@
 $GLOBALS['xoopsTpl']->display('db:'.$GLOBALS['mydirname'].'_cpanel_batch.html');
 
 // check $GLOBALS['myalbumModule']
-myalbum_footer_adminMenu();
-xoops_cp_footer();
-
-?>
\ No newline at end of file
+//	myalbum_footer_adminMenu();
+include_once 'admin_footer.php';

Deleted: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/dashboard.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/dashboard.php	2013-08-08 06:30:41 UTC (rev 11890)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/dashboard.php	2013-08-08 22:07:07 UTC (rev 11891)
@@ -1,169 +0,0 @@
-<?php
-	include ('admin_header.php');
-	xoops_loadLanguage('admin');
-	
-	xoops_cp_header();		
-	
-	myalbum_adminMenu(basename(__FILE__), 0);
-	$indexAdmin = new ModuleAdmin();
-	
-	$cat_handler = xoops_getmodulehandler('cat');
-    $comments_handler = xoops_getmodulehandler('comments');
-    $photos_handler = xoops_getmodulehandler('photos');
-    $text_handler = xoops_getmodulehandler('text');
-    $votedata_handler = xoops_getmodulehandler('votedata');
-    $group_handler = xoops_gethandler('group');
-
-    $netpbm_pipes = array( "jpegtopnm" , "giftopnm" , "pngtopnm" , 
-	 "pnmtojpeg" , "pnmtopng" , "ppmquant" , "ppmtogif" ,
-	 "pnmscale" , "pnmflip" ) ;
-
-	// PATH_SEPARATOR
-	if( ! defined( 'PATH_SEPARATOR' ) ) {
-		if( DIRECTORY_SEPARATOR == '/' ) define( 'PATH_SEPARATOR' , ':' ) ;
-		else define( 'PATH_SEPARATOR' , ';' ) ;
-	}
-	
-	// Check the path to binaries of imaging packages
-	if( trim( $myalbum_imagickpath ) != '' && substr( $myalbum_imagickpath , -1 ) != DIRECTORY_SEPARATOR ) {
-		$myalbum_imagickpath .= DIRECTORY_SEPARATOR ;
-	}
-	if( trim( $myalbum_netpbmpath ) != '' && substr( $myalbum_netpbmpath , -1 ) != DIRECTORY_SEPARATOR ) {
-		$myalbum_netpbmpath .= DIRECTORY_SEPARATOR ;
-	}
-	    
-	// Environmental
- 	$indexAdmin = new ModuleAdmin();
- 	$title = _AM_MB_PHPDIRECTIVE.'&nbsp;:&nbsp;'._AM_H4_ENVIRONMENT;	
-    $indexAdmin->addInfoBox($title);
-    // Safe Mode
-    $safe_mode_flag = ini_get( "safe_mode" ) ;
-    $indexAdmin->addInfoBoxLine($title, "<label>'safe_mode' ("._AM_MB_BOTHOK."): %s</label>", (!$safe_mode_flag?_AM_LABEL_OFF:_AM_LABEL_ON), (!$safe_mode_flag?'Red':'Green'));
-    // File Uploads
-    $rs = ini_get( "file_uploads" );
-    $indexAdmin->addInfoBoxLine($title, "<label>'file_uploads' ("._AM_MB_NEEDON."): %s</label>", (!$rs?_AM_LABEL_OFF:_AM_LABEL_ON), (!$rs?'Red':'Green'));
-    // Register Globals
-    $rs = ini_get( "register_globals" );
-    $indexAdmin->addInfoBoxLine($title, "<label>'register_globals' ("._AM_MB_BOTHOK."): %s</label>", (!$rs?_AM_LABEL_OFF:_AM_LABEL_ON), (!$rs?'Red':'Green'));
-    // File Uploads
-    $rs = ini_get( "upload_max_filesize" );
-    $indexAdmin->addInfoBoxLine($title, "<label>'upload_max_filesize': %s bytes</label>", $rs, (!$rs?'Red':'Green'));
-        // File Uploads
-    $rs = ini_get( "post_max_size" );
-    $indexAdmin->addInfoBoxLine($title, "<label>'post_max_size': %s bytes</label>", $rs, (!$rs?'Red':'Green'));
-        // File Uploads
-    $rs = ini_get( "open_basedir" );
-    $indexAdmin->addInfoBoxLine($title, "<label>'open_basedir': %s</label>", (!$rs?_AM_LABEL_NOTHING:$rs), (!$rs?'Red':'Green'));
-        // File Uploads
-    $rs = ini_get( "file_uploads" );
-    $tmp_dirs = explode( PATH_SEPARATOR , ini_get( "upload_tmp_dir" ) ) ;
-	$error_upload_tmp_dir = false;
-    foreach( $tmp_dirs as $dir ) {
-		if( $dir != "" && ( ! is_writable( $dir ) || ! is_readable( $dir ) ) && $error_upload_tmp_dir == false) {
-			$indexAdmin->addInfoBoxLine($title, "<label>'upload_tmp_dir': %s</label>", "Error: upload_tmp_dir ($dir) is not writable nor readable", 'Red');
-			$error_upload_tmp_dir = true ;
-		}
-	}
-	if( $error_upload_tmp_dir == false ) {
-		$indexAdmin->addInfoBoxLine($title, "<label>'upload_tmp_dir': %s</label>", "ok - ".ini_get("upload_tmp_dir"), 'Green'); 
-	}
-	
-	// Tables
-	$title = _AM_H4_TABLE;
-    $indexAdmin->addInfoBox($title);
-    $indexAdmin->addInfoBoxLine($title, "<label>"._AM_MB_PHOTOSTABLE.": ".$GLOBALS['table_photos']. ": %s photos</label>", $photos_handler->getCount(new Criteria('`status`', '0', '>')), 'Purple');
-    $indexAdmin->addInfoBoxLine($title, "<label>"._AM_MB_PHOTOSTABLE.": ".$GLOBALS['table_photos']. ": %s dead photos</label>", $photos_handler->getCountDeadPhotos(), 'Red');
-    $indexAdmin->addInfoBoxLine($title, "<label>"._AM_MB_PHOTOSTABLE.": ".$GLOBALS['table_photos']. ": %s dead thumbs</label>", $photos_handler->getCountDeadThumbs(), 'Red');
-    $indexAdmin->addInfoBoxLine($title, "<label>"._AM_MB_DESCRIPTIONTABLE.": ".$GLOBALS['table_text']. ": %s descriptions</label>", $text_handler->getCount(), 'Purple');
-    $indexAdmin->addInfoBoxLine($title, "<label>"._AM_MB_DESCRIPTIONTABLE.": ".$GLOBALS['table_text']. ": %s bytes</label>", $text_handler->getBytes(), 'Orange');
-    $indexAdmin->addInfoBoxLine($title, "<label>"._AM_MB_CATEGORIESTABLE.": ".$GLOBALS['table_cat']. ": %s categories</label>", $cat_handler->getCount(), 'Purple');
-    $indexAdmin->addInfoBoxLine($title, "<label>"._AM_MB_VOTEDATATABLE.": ".$GLOBALS['table_votedata']. ": %s votes</label>", $votedata_handler->getCount(), 'Purple');
-    $indexAdmin->addInfoBoxLine($title, "<label>"._AM_MB_COMMENTSTABLE.": ".$GLOBALS['table_comments']. ": %s comments</label>", $comments_handler->getCount(new Criteria('`com_modid`', $GLOBALS['myalbumModule']->getVar('mid'), '=')), 'Purple');
-    
-    // Config
-	$title = _AM_H4_CONFIG;
-    $indexAdmin->addInfoBox($title);
-    if( $myalbum_imagingpipe == PIPEID_IMAGICK ) {
-		$indexAdmin->addInfoBoxLine($title, "<label>"._AM_MB_PIPEFORIMAGES.": ImageMagick : %s</label>", "Path: $myalbum_imagickpath", 'Brown');
-		exec( "{$myalbum_imagickpath}convert --help" , $ret_array ) ;
-		if( count( $ret_array ) < 1 )
-			$indexAdmin->addInfoBoxLine($title, "<label>"._AM_MB_PIPEFORIMAGES.": ImageMagick : %s</label>", "Error: {$myalbum_imagickpath}convert can't be executed", 'Red'); 
-		else
-			$indexAdmin->addInfoBoxLine($title, "<label>"._AM_MB_PIPEFORIMAGES.": ImageMagick : %s</label>", "{$ret_array[0]} &nbsp; Ok", 'Green'); 
-	} else if( $myalbum_imagingpipe == PIPEID_NETPBM ) {
-		$indexAdmin->addInfoBoxLine($title, "<label>"._AM_MB_PIPEFORIMAGES.": NetPBM : %s</label>", "Path: $myalbum_netpbmpath", 'Brown');
-		foreach( $netpbm_pipes as $pipe ) {
-			$ret_array = array() ;
-			exec( "{$myalbum_netpbmpath}$pipe --version 2>&1" , $ret_array ) ;
-			if( count( $ret_array ) < 1 ) 
-				$indexAdmin->addInfoBoxLine($title, "<label>"._AM_MB_PIPEFORIMAGES.": NetPBM : %s</label>", "Error: {$myalbum_netpbmpath}{$pipe} can't be executed", 'Red');
-			else 
-				$indexAdmin->addInfoBoxLine($title, "<label>"._AM_MB_PIPEFORIMAGES.": NetPBM : %s</label>", "{$pipe} : {$ret_array[0]} &nbsp; Ok", 'Green');
-		}
-	} else {
-		if( function_exists( 'gd_info' ) ) {
-			$gd_info = gd_info() ;
-			$indexAdmin->addInfoBoxLine($title, "<label>"._AM_MB_PIPEFORIMAGES.": GD : %s</label>", "GD Version: {$gd_info['GD Version']}", 'Brown');
-		} 
-		if( function_exists( 'imagecreatetruecolor' ) ) {
-			if( imagecreatetruecolor(200,200) ) {
-				$indexAdmin->addInfoBoxLine($title, "<label>"._AM_MB_PIPEFORIMAGES.": GD2 : %s</label>", _AM_MB_GD2SUCCESS, 'Green');
-			} else {
-				$indexAdmin->addInfoBoxLine($title, "<label>"._AM_MB_PIPEFORIMAGES.": GD2 : %s</label>", 'Failed', 'Red');
-			}
-		} else {
-			$indexAdmin->addInfoBoxLine($title, "<label>"._AM_MB_PIPEFORIMAGES.": GD2 : %s</label>", 'Failed', 'Red');
-		}
-	}
-	
-	$title = _AM_H4_DIRECTORIES;
-    $indexAdmin->addInfoBox($title);
-
-	if( substr( $myalbum_photospath , -1 ) == '/' ) {
-		$indexAdmin->addInfoBoxLine($title, "<label>"._AM_MB_DIRECTORYFORPHOTOS.": ".XOOPS_ROOT_PATH."$myalbum_photospath %s</label>", _AM_ERR_LASTCHAR, 'Red');
-	} else if( ord( $myalbum_photospath ) != 0x2f ) {
-		$indexAdmin->addInfoBoxLine($title, "<label>"._AM_MB_DIRECTORYFORPHOTOS.": ".XOOPS_ROOT_PATH."$myalbum_photospath %s</label>", _AM_ERR_FIRSTCHAR, 'Red');
-	} else if( ! is_dir( $GLOBALS['photos_dir'] ) ) {
-		if( $safe_mode_flag ) {
-			$indexAdmin->addInfoBoxLine($title, "<label>"._AM_MB_DIRECTORYFORPHOTOS.": ".XOOPS_ROOT_PATH."$myalbum_photospath %s</label>", _AM_ERR_PERMISSION, 'Red');
-		} else {
-			$rs = mkdir( $GLOBALS['photos_dir'] , 0777 ) ;
-			if( ! $rs ) 
-				$indexAdmin->addInfoBoxLine($title, "<label>"._AM_MB_DIRECTORYFORPHOTOS.": ".XOOPS_ROOT_PATH."$myalbum_photospath %s</label>", _AM_ERR_NOTDIRECTORY, 'Red');
-			else 
-				$indexAdmin->addInfoBoxLine($title, "<label>"._AM_MB_DIRECTORYFORPHOTOS.": ".XOOPS_ROOT_PATH."$myalbum_photospath %s</label>", 'Ok', 'Green');
-		}
-	} else if( ! is_writable( $GLOBALS['photos_dir'] ) || ! is_readable( $GLOBALS['photos_dir'] ) ) {
-		$indexAdmin->addInfoBoxLine($title, "<label>"._AM_MB_DIRECTORYFORPHOTOS.": ".XOOPS_ROOT_PATH."$myalbum_photospath %s</label>", _AM_ERR_READORWRITE, 'Red');
-	} else {
-		$indexAdmin->addInfoBoxLine($title, "<label>"._AM_MB_DIRECTORYFORPHOTOS.": ".XOOPS_ROOT_PATH."$myalbum_photospath %s</label>", 'Ok', 'Green');
-	}
-
-	// thumbs
-	if( $myalbum_makethumb ) {
-		if( substr( $myalbum_thumbspath , -1 ) == '/' ) {
-			$indexAdmin->addInfoBoxLine($title, "<label>"._AM_MB_DIRECTORYFORPHOTOS.": ".XOOPS_ROOT_PATH."$myalbum_thumbspath %s</label>", _AM_ERR_LASTCHAR, 'Red');
-		} else if( ord( $myalbum_thumbspath ) != 0x2f ) {
-			$indexAdmin->addInfoBoxLine($title, "<label>"._AM_MB_DIRECTORYFORPHOTOS.": ".XOOPS_ROOT_PATH."$myalbum_thumbspath %s</label>", _AM_ERR_FIRSTCHAR, 'Red');
-		} else if( ! is_dir( $GLOBALS['thumbs_dir'] ) ) {
-			if( $safe_mode_flag ) {
-				$indexAdmin->addInfoBoxLine($title, "<label>"._AM_MB_DIRECTORYFORPHOTOS.": ".XOOPS_ROOT_PATH."$myalbum_thumbspath %s</label>", _AM_ERR_PERMISSION, 'Red');
-			} else {
-				$rs = mkdir( $GLOBALS['thumbs_dir'] , 0777 ) ;
-				if( ! $rs ) 
-					$indexAdmin->addInfoBoxLine($title, "<label>"._AM_MB_DIRECTORYFORPHOTOS.": ".XOOPS_ROOT_PATH."$myalbum_thumbspath %s</label>", _AM_ERR_NOTDIRECTORY, 'Red');
-				else 
-					$indexAdmin->addInfoBoxLine($title, "<label>"._AM_MB_DIRECTORYFORPHOTOS.": ".XOOPS_ROOT_PATH."$myalbum_thumbspath %s</label>", 'Ok', 'Green');
-			}
-		} else if( ! is_writable( $GLOBALS['thumbs_dir'] ) || ! is_readable( $GLOBALS['thumbs_dir'] ) ) {
-			$indexAdmin->addInfoBoxLine($title, "<label>"._AM_MB_DIRECTORYFORPHOTOS.": ".XOOPS_ROOT_PATH."$myalbum_thumbspath %s</label>", _AM_ERR_READORWRITE, 'Red');
-		} else {
-			$indexAdmin->addInfoBoxLine($title, "<label>"._AM_MB_DIRECTORYFORPHOTOS.": ".XOOPS_ROOT_PATH."$myalbum_thumbspath %s</label>", 'Ok', 'Green');
-		}
-	}
-	   
-    echo $indexAdmin->renderIndex();
-	myalbum_footer_adminMenu();
-	xoops_cp_footer();	
-
-?>
\ No newline at end of file

Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/export.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/export.php	2013-08-08 06:30:41 UTC (rev 11890)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/export.php	2013-08-08 22:07:07 UTC (rev 11891)
@@ -75,7 +75,9 @@
 	$sysperm_handler =& xoops_gethandler('groupperm');
 	if( $sysperm_handler->checkRight('system_admin', XOOPS_SYSTEM_IMAGE, $xoopsUser->getGroups() ) ) {
 	xoops_cp_header();
-	myalbum_adminMenu(basename(__FILE__), 7);
+        $indexAdmin = new ModuleAdmin();
+        echo $indexAdmin->addNavigation('export.php');
+//	myalbum_adminMenu(basename(__FILE__), 7);
 	$GLOBALS['xoopsTpl']->assign('admin_title', sprintf(_AM_H3_FMT_EXPORTTO,$GLOBALS['myalbumModule']->name()));
 	$GLOBALS['xoopsTpl']->assign('mydirname', $GLOBALS['mydirname']);
 	$GLOBALS['xoopsTpl']->assign('photos_url', $GLOBALS['photos_url']);
@@ -85,8 +87,9 @@
 	$GLOBALS['xoopsTpl']->display('db:'.$GLOBALS['mydirname'].'_cpanel_export.html');
 	
 	// check $GLOBALS['myalbumModule']
-	myalbum_footer_adminMenu();
-	xoops_cp_footer();
+//	myalbum_footer_adminMenu();
+include_once 'admin_footer.php';
+
 	} else {
 		redirect_header('dashboard.php', 5, _NOPERM);
 	}

Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/groupperm_global.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/groupperm_global.php	2013-08-08 06:30:41 UTC (rev 11890)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/groupperm_global.php	2013-08-08 22:07:07 UTC (rev 11891)
@@ -10,7 +10,9 @@
 }
 
 xoops_cp_header();
-myalbum_adminMenu(basename(__FILE__), 8);
+$indexAdmin = new ModuleAdmin();
+echo $indexAdmin->addNavigation('groupperm_global.php');
+//myalbum_adminMenu(basename(__FILE__), 8);
 $GLOBALS['xoopsTpl']->assign('admin_title', $GLOBALS['myalbumModule']->name());
 $GLOBALS['xoopsTpl']->assign('mydirname', $GLOBALS['mydirname']);
 $GLOBALS['xoopsTpl']->assign('photos_url', $GLOBALS['photos_url']);
@@ -21,8 +23,5 @@
 
 $GLOBALS['xoopsTpl']->display('db:'.$GLOBALS['mydirname'].'_cpanel_permissions.html');
 
-myalbum_footer_adminMenu();
-xoops_cp_footer();
-
-
-?>
\ No newline at end of file
+//	myalbum_footer_adminMenu();
+include_once 'admin_footer.php';

Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/import.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/import.php	2013-08-08 06:30:41 UTC (rev 11890)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/import.php	2013-08-08 22:07:07 UTC (rev 11891)
@@ -154,7 +154,9 @@
 
 include_once('../include/myalbum.forms.php');
 xoops_cp_header();
-myalbum_adminMenu(basename(__FILE__), 6);
+$indexAdmin = new ModuleAdmin();
+echo $indexAdmin->addNavigation('import.php');
+//myalbum_adminMenu(basename(__FILE__), 6);
 $GLOBALS['xoopsTpl']->assign('admin_title', sprintf(_AM_H3_FMT_IMPORTTO,$xoopsModule->name()));
 $GLOBALS['xoopsTpl']->assign('mydirname', $GLOBALS['mydirname']);
 $GLOBALS['xoopsTpl']->assign('photos_url', $GLOBALS['photos_url']);
@@ -164,7 +166,5 @@
 
 $GLOBALS['xoopsTpl']->display('db:'.$GLOBALS['mydirname'].'_cpanel_import.html');
 
-myalbum_footer_adminMenu();
-xoops_cp_footer();
-
-?>
\ No newline at end of file
+//	myalbum_footer_adminMenu();
+include_once 'admin_footer.php';

Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/index.php
==============================...
 
[truncated message content]

Thread: [xoops-svn] SF.net SVN: xoops-svn:[11891] XoopsModules/myalbum/trunk/htdocs/modules/ myalbum

The world's leading content management systems (CMS) written in PHP

xoops-svn