From: <luc...@us...> - 2012-07-24 21:19:29
|
Revision: 9918 http://xoops.svn.sourceforge.net/xoops/?rev=9918&view=rev Author: luciorota Date: 2012-07-24 21:18:59 +0000 (Tue, 24 Jul 2012) Log Message: ----------- change directory structure & update to 2.5.x admin gui Modified Paths: -------------- XoopsModules/xaddresses/trunk/xaddresses/admin/about.php XoopsModules/xaddresses/trunk/xaddresses/admin/admin_functions.php XoopsModules/xaddresses/trunk/xaddresses/admin/admin_header.php XoopsModules/xaddresses/trunk/xaddresses/admin/field.php XoopsModules/xaddresses/trunk/xaddresses/admin/fieldcategory.php XoopsModules/xaddresses/trunk/xaddresses/admin/import.php XoopsModules/xaddresses/trunk/xaddresses/admin/index.php XoopsModules/xaddresses/trunk/xaddresses/admin/location.php XoopsModules/xaddresses/trunk/xaddresses/admin/locationcategory.php XoopsModules/xaddresses/trunk/xaddresses/admin/menu.php XoopsModules/xaddresses/trunk/xaddresses/admin/modified.php XoopsModules/xaddresses/trunk/xaddresses/admin/permissions.php XoopsModules/xaddresses/trunk/xaddresses/class/broken.php XoopsModules/xaddresses/trunk/xaddresses/class/field.php XoopsModules/xaddresses/trunk/xaddresses/class/fieldcategory.php XoopsModules/xaddresses/trunk/xaddresses/class/formfilemanager.php XoopsModules/xaddresses/trunk/xaddresses/class/formgooglemap.php XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor.php XoopsModules/xaddresses/trunk/xaddresses/class/formmultiplexoopsimage.php XoopsModules/xaddresses/trunk/xaddresses/class/formxoopsimage.php XoopsModules/xaddresses/trunk/xaddresses/class/locationcategory.php XoopsModules/xaddresses/trunk/xaddresses/class/marker.php XoopsModules/xaddresses/trunk/xaddresses/class/modify.php XoopsModules/xaddresses/trunk/xaddresses/class/votedata.php XoopsModules/xaddresses/trunk/xaddresses/docs/credits.txt XoopsModules/xaddresses/trunk/xaddresses/docs/install.txt XoopsModules/xaddresses/trunk/xaddresses/docs/lang_diff.txt XoopsModules/xaddresses/trunk/xaddresses/docs/licence.txt XoopsModules/xaddresses/trunk/xaddresses/docs/readme.txt XoopsModules/xaddresses/trunk/xaddresses/include/forms.php XoopsModules/xaddresses/trunk/xaddresses/include/functions.php XoopsModules/xaddresses/trunk/xaddresses/include/install_function.php XoopsModules/xaddresses/trunk/xaddresses/index.php XoopsModules/xaddresses/trunk/xaddresses/language/english/admin.php XoopsModules/xaddresses/trunk/xaddresses/language/english/main.php XoopsModules/xaddresses/trunk/xaddresses/language/english/modinfo.php XoopsModules/xaddresses/trunk/xaddresses/language/lang_diff.txt XoopsModules/xaddresses/trunk/xaddresses/locationbroken.php XoopsModules/xaddresses/trunk/xaddresses/locationcategoryview.php XoopsModules/xaddresses/trunk/xaddresses/locationedit.php XoopsModules/xaddresses/trunk/xaddresses/locationmodify.php XoopsModules/xaddresses/trunk/xaddresses/locationrate.php XoopsModules/xaddresses/trunk/xaddresses/locationview.php XoopsModules/xaddresses/trunk/xaddresses/templates/xaddresses_admin_fieldcategorylist.html XoopsModules/xaddresses/trunk/xaddresses/templates/xaddresses_admin_fieldlist.html XoopsModules/xaddresses/trunk/xaddresses/templates/xaddresses_admin_locationbrokenlist.html XoopsModules/xaddresses/trunk/xaddresses/templates/xaddresses_admin_locationcategorylist.html XoopsModules/xaddresses/trunk/xaddresses/templates/xaddresses_admin_locationlist.html XoopsModules/xaddresses/trunk/xaddresses/templates/xaddresses_index.html XoopsModules/xaddresses/trunk/xaddresses/templates/xaddresses_locationbroken.html XoopsModules/xaddresses/trunk/xaddresses/templates/xaddresses_locationcategoryview.html XoopsModules/xaddresses/trunk/xaddresses/templates/xaddresses_locationedit.html XoopsModules/xaddresses/trunk/xaddresses/templates/xaddresses_locationmodify.html XoopsModules/xaddresses/trunk/xaddresses/templates/xaddresses_locationrate.html XoopsModules/xaddresses/trunk/xaddresses/templates/xaddresses_locationsearch.html XoopsModules/xaddresses/trunk/xaddresses/templates/xaddresses_locationview.html XoopsModules/xaddresses/trunk/xaddresses/xoops_version.php Added Paths: ----------- XoopsModules/xaddresses/trunk/xaddresses/admin/about.new.php XoopsModules/xaddresses/trunk/xaddresses/admin/admin_footer.php XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/ XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/images/ XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/images/bar.png XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/images/blue-dot.png XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/images/blue.png XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/images/dd-end.png XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/images/dd-start.png XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/images/down-arrow.gif XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/images/golfer.png XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/images/green-dot.png XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/images/green.png XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/images/lodging.png XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/images/markerA.png XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/images/marker_blackA.png XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/images/marker_brownA.png XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/images/marker_greenA.png XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/images/marker_greyA.png XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/images/marker_orangeA.png XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/images/marker_purpleA.png XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/images/marker_whiteA.png XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/images/marker_yellowA.png XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/images/mm_20_black.png XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/images/mm_20_blue.png XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/images/mm_20_brown.png XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/images/mm_20_gray.png XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/images/mm_20_green.png XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/images/mm_20_orange.png XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/images/mm_20_purple.png XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/images/mm_20_red.png XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/images/mm_20_white.png XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/images/mm_20_yellow.png XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/images/orange-dot.png XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/images/orange.png XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/images/plane.png XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/images/purple-dot.png XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/images/purple.png XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/images/red-dot.png XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/images/red.png XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/images/restaurant.png XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/images/sportvenue.png XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/images/square.png XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/images/yellow-dot.png XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/images/yellow.png XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/kmleditor.css XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/kmleditor.js XoopsModules/xaddresses/trunk/xaddresses/class/formkmleditor/kmleditor.php XoopsModules/xaddresses/trunk/xaddresses/class/language/ XoopsModules/xaddresses/trunk/xaddresses/class/language/english/ XoopsModules/xaddresses/trunk/xaddresses/class/language/english/formfilemanager.php XoopsModules/xaddresses/trunk/xaddresses/class/language/english/formgooglemap.php XoopsModules/xaddresses/trunk/xaddresses/class/language/english/formkmleditor.php XoopsModules/xaddresses/trunk/xaddresses/class/language/english/formmultiplefilemanager.php XoopsModules/xaddresses/trunk/xaddresses/class/language/english/formmultiplexoopsimage.php XoopsModules/xaddresses/trunk/xaddresses/class/language/english/formxoopsimage.php XoopsModules/xaddresses/trunk/xaddresses/css/ XoopsModules/xaddresses/trunk/xaddresses/css/index.html XoopsModules/xaddresses/trunk/xaddresses/css/style.css XoopsModules/xaddresses/trunk/xaddresses/docs/changelog.txt XoopsModules/xaddresses/trunk/xaddresses/extra/ XoopsModules/xaddresses/trunk/xaddresses/extra/index.html XoopsModules/xaddresses/trunk/xaddresses/extra/plugins/ XoopsModules/xaddresses/trunk/xaddresses/extra/plugins/index.html XoopsModules/xaddresses/trunk/xaddresses/extra/plugins/sitemap/ XoopsModules/xaddresses/trunk/xaddresses/extra/plugins/sitemap/index.html XoopsModules/xaddresses/trunk/xaddresses/extra/plugins/sitemap/xaddresses.php XoopsModules/xaddresses/trunk/xaddresses/extra/plugins/tag/ XoopsModules/xaddresses/trunk/xaddresses/extra/plugins/tag/xaddresses.php XoopsModules/xaddresses/trunk/xaddresses/extra/plugins/waiting/ XoopsModules/xaddresses/trunk/xaddresses/extra/plugins/waiting/xaddresses.php XoopsModules/xaddresses/trunk/xaddresses/extra/plugins/whatsnew/ XoopsModules/xaddresses/trunk/xaddresses/extra/plugins/whatsnew/index.html XoopsModules/xaddresses/trunk/xaddresses/extra/plugins/whatsnew/xaddresses/ XoopsModules/xaddresses/trunk/xaddresses/extra/plugins/whatsnew/xaddresses/data.inc.php XoopsModules/xaddresses/trunk/xaddresses/extra/plugins/whatsnew/xaddresses/index.html XoopsModules/xaddresses/trunk/xaddresses/extra/templates_rtf/ XoopsModules/xaddresses/trunk/xaddresses/extra/templates_rtf/blocks/ XoopsModules/xaddresses/trunk/xaddresses/extra/templates_rtf/blocks/index.html XoopsModules/xaddresses/trunk/xaddresses/extra/templates_rtf/blocks/tdmdownloads_block_new.html XoopsModules/xaddresses/trunk/xaddresses/extra/templates_rtf/blocks/tdmdownloads_block_random.html XoopsModules/xaddresses/trunk/xaddresses/extra/templates_rtf/blocks/tdmdownloads_block_rating.html XoopsModules/xaddresses/trunk/xaddresses/extra/templates_rtf/blocks/tdmdownloads_block_top.html XoopsModules/xaddresses/trunk/xaddresses/extra/templates_rtf/index.html XoopsModules/xaddresses/trunk/xaddresses/extra/templates_rtf/tdmdownloads_brokenfile.html XoopsModules/xaddresses/trunk/xaddresses/extra/templates_rtf/tdmdownloads_download.html XoopsModules/xaddresses/trunk/xaddresses/extra/templates_rtf/tdmdownloads_index.html XoopsModules/xaddresses/trunk/xaddresses/extra/templates_rtf/tdmdownloads_liste.html XoopsModules/xaddresses/trunk/xaddresses/extra/templates_rtf/tdmdownloads_modfile.html XoopsModules/xaddresses/trunk/xaddresses/extra/templates_rtf/tdmdownloads_ratefile.html XoopsModules/xaddresses/trunk/xaddresses/extra/templates_rtf/tdmdownloads_singlefile.html XoopsModules/xaddresses/trunk/xaddresses/extra/templates_rtf/tdmdownloads_submit.html XoopsModules/xaddresses/trunk/xaddresses/extra/templates_rtf/tdmdownloads_viewcat.html XoopsModules/xaddresses/trunk/xaddresses/extra/textsanitizer.extension/ XoopsModules/xaddresses/trunk/xaddresses/extra/textsanitizer.extension/xaddresses/ XoopsModules/xaddresses/trunk/xaddresses/extra/textsanitizer.extension/xaddresses/index.html XoopsModules/xaddresses/trunk/xaddresses/extra/textsanitizer.extension/xaddresses/xaddresses.php XoopsModules/xaddresses/trunk/xaddresses/images/bookmarks/ XoopsModules/xaddresses/trunk/xaddresses/images/bookmarks/index.html XoopsModules/xaddresses/trunk/xaddresses/images/icons/16x16/index.html XoopsModules/xaddresses/trunk/xaddresses/images/icons/arrow.gif XoopsModules/xaddresses/trunk/xaddresses/images/icons/index.html XoopsModules/xaddresses/trunk/xaddresses/images/icons/off.png XoopsModules/xaddresses/trunk/xaddresses/images/icons/on.png XoopsModules/xaddresses/trunk/xaddresses/images/menu/ XoopsModules/xaddresses/trunk/xaddresses/images/menu/bg.png XoopsModules/xaddresses/trunk/xaddresses/images/menu/index.html XoopsModules/xaddresses/trunk/xaddresses/images/menu/left_both.png XoopsModules/xaddresses/trunk/xaddresses/images/menu/right_both.png XoopsModules/xaddresses/trunk/xaddresses/images/xoopsmicrobutton.gif XoopsModules/xaddresses/trunk/xaddresses/include/config.php XoopsModules/xaddresses/trunk/xaddresses/js/ XoopsModules/xaddresses/trunk/xaddresses/js/index.html XoopsModules/xaddresses/trunk/xaddresses/js/script.js XoopsModules/xaddresses/trunk/xaddresses/kml/js_parser_Kml.js.html XoopsModules/xaddresses/trunk/xaddresses/language/english/changelog.org.txt XoopsModules/xaddresses/trunk/xaddresses/templates/xaddresses_admin_locationmodifylist.html Added: XoopsModules/xaddresses/trunk/xaddresses/admin/about.new.php =================================================================== --- XoopsModules/xaddresses/trunk/xaddresses/admin/about.new.php (rev 0) +++ XoopsModules/xaddresses/trunk/xaddresses/admin/about.new.php 2012-07-24 21:18:59 UTC (rev 9918) @@ -0,0 +1,34 @@ +<?php +/** + * **************************************************************************** + * - A Project by Developers TEAM For Xoops - ( http://www.xoops.org ) + * **************************************************************************** + * XADDRESSES - MODULE FOR XOOPS + * Copyright (c) 2007 - 2012 + * Rota Lucio ( http://luciorota.altervista.org/xoops/ ) + * + * 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. + * --------------------------------------------------------------------------- + * @copyright Rota Lucio ( http://luciorota.altervista.org/xoops/ ) + * @license GPL see LICENSE + * @package xaddresses + * @author Rota Lucio ( luc...@gm... ) + * + * Version : 1.0 Mon 2012/07/23 14:17:52 : XOOPS Exp $ + * **************************************************************************** + */ + +include "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/xaddresses/trunk/xaddresses/admin/about.php =================================================================== --- XoopsModules/xaddresses/trunk/xaddresses/admin/about.php 2012-07-24 10:57:29 UTC (rev 9917) +++ XoopsModules/xaddresses/trunk/xaddresses/admin/about.php 2012-07-24 21:18:59 UTC (rev 9918) @@ -10,10 +10,6 @@ // render start here xoops_cp_header(); -// main admin menu -include (XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['xoopsModule']->dirname() . '/admin/menu.php'); -echo moduleAdminTabMenu($adminmenu, $currentFile); - echo " <style type=\"text/css\"> label,text { @@ -36,27 +32,27 @@ echo "<div style='padding: 8px;'>"; echo "<img src='" . XOOPS_URL . "/modules/" . $GLOBALS['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>" . _XADDRESSES_AM_ABOUT_RELEASEDATE . ":</label><text>" . date(_SHORTDATESTRING, $versionInfo->getInfo('release')) . "</text><br />"; -echo "<label>" . _XADDRESSES_AM_ABOUT_AUTHOR . ":</label><text>" . $versionInfo->getInfo('author') . "</text><br />"; -echo "<label>" . _XADDRESSES_AM_ABOUT_CREDITS . ":</label><text>" . $versionInfo->getInfo('credits') . "</text><br />"; -echo "<label>" . _XADDRESSES_AM_ABOUT_LICENSE . ":</label><text><a href=\"".$versionInfo->getInfo('license_file')."\" target=\"_blank\" >" . $versionInfo->getInfo('license') . "</a></text>\n"; +echo "<label>" . _AM_XADDRESSES_ABOUT_RELEASEDATE . ":</label><text>" . date(_SHORTDATESTRING, strtotime($versionInfo->getInfo('release_date'))) . "</text><br />"; +echo "<label>" . _AM_XADDRESSES_ABOUT_AUTHOR . ":</label><text>" . $versionInfo->getInfo('author') . "</text><br />"; +echo "<label>" . _AM_XADDRESSES_ABOUT_CREDITS . ":</label><text>" . $versionInfo->getInfo('credits') . "</text><br />"; +echo "<label>" . _AM_XADDRESSES_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;'>" . _XADDRESSES_AM_ABOUT_MODULEINFOS . "</legend>"; +echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_XADDRESSES_ABOUT_MODULEINFOS . "</legend>"; echo "<div style='padding: 8px;'>"; -echo "<label>" . _XADDRESSES_AM_ABOUT_STATUS . ":</label><text>" . $versionInfo->getInfo('module_status') . "</text><br />"; -echo "<label>" . _XADDRESSES_AM_ABOUT_MODULEWEBSITE . ":</label><text>" . "<a href='" . $versionInfo->getInfo('support_site_url') . "' target='_blank'>" . $versionInfo->getInfo('support_site_name') . "</a>" . "</text><br />"; +echo "<label>" . _AM_XADDRESSES_ABOUT_STATUS . ":</label><text>" . $versionInfo->getInfo('module_status') . "</text><br />"; +echo "<label>" . _AM_XADDRESSES_ABOUT_MODULEWEBSITE . ":</label><text>" . "<a href='" . $versionInfo->getInfo('support_site_url') . "' target='_blank'>" . $versionInfo->getInfo('support_site_name') . "</a>" . "</text><br />"; echo "</div>"; echo "</fieldset>"; echo "<br clear=\"all\" />"; -echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _XADDRESSES_AM_ABOUT_AUTHORINFOS . "</legend>"; +echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_XADDRESSES_ABOUT_AUTHORINFOS . "</legend>"; echo "<div style='padding: 8px;'>"; -echo "<label>" . _XADDRESSES_AM_ABOUT_AUTHOR . ":</label><text>" . $versionInfo->getInfo('author') . "</text><br />"; -echo "<label>" . _XADDRESSES_AM_ABOUT_AUTHORWEBSITE . ":</label><text>" . "<a href='" . $versionInfo->getInfo('author_website_url') . "' target='_blank'>" . $versionInfo->getInfo('author_website_name') . "</a>" . "</text><br />"; -echo "<label>" . _XADDRESSES_AM_ABOUT_AUTHOREMAIL . ":</label><text>" . "<a href='emailto:" . $versionInfo->getInfo('author_mail') . "' target='_blank'>" . $versionInfo->getInfo('author_mail') . "</a>" . "</text><br />"; +echo "<label>" . _AM_XADDRESSES_ABOUT_AUTHOR . ":</label><text>" . $versionInfo->getInfo('author') . "</text><br />"; +echo "<label>" . _AM_XADDRESSES_ABOUT_AUTHORWEBSITE . ":</label><text>" . "<a href='" . $versionInfo->getInfo('author_website_url') . "' target='_blank'>" . $versionInfo->getInfo('author_website_name') . "</a>" . "</text><br />"; +echo "<label>" . _AM_XADDRESSES_ABOUT_AUTHOREMAIL . ":</label><text>" . "<a href='emailto:" . $versionInfo->getInfo('author_mail') . "' target='_blank'>" . $versionInfo->getInfo('author_mail') . "</a>" . "</text><br />"; echo "</div>"; echo "<br />"; @@ -83,7 +79,7 @@ $file = XOOPS_ROOT_PATH . "/modules/" . $GLOBALS['xoopsModule']->getVar('dirname') . "/language/english/description.html"; } if (is_readable($file)) { - echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _XADDRESSES_AM_ABOUT_DESCRIPTION . "</legend>"; + echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_XADDRESSES_ABOUT_DESCRIPTION . "</legend>"; echo "<div style='padding: 8px;'>"; echo "<div>". implode('', file($file)) . "</div>"; echo "</div>"; @@ -98,7 +94,7 @@ $file = XOOPS_ROOT_PATH . "/modules/" . $GLOBALS['xoopsModule']->getVar('dirname') . "/language/english/changelog.txt"; } if (is_readable($file)) { - echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _XADDRESSES_AM_ABOUT_CHANGELOG . "</legend>"; + echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_XADDRESSES_ABOUT_CHANGELOG . "</legend>"; echo "<div style='padding: 8px;'>"; echo "<div>" . utf8_encode(implode('<br />', file($file))) . "</div>"; echo "</div>"; @@ -106,5 +102,5 @@ echo "<br clear=\"all\" />"; } -xoops_cp_footer(); +include "admin_footer.php"; ?> \ No newline at end of file Added: XoopsModules/xaddresses/trunk/xaddresses/admin/admin_footer.php =================================================================== --- XoopsModules/xaddresses/trunk/xaddresses/admin/admin_footer.php (rev 0) +++ XoopsModules/xaddresses/trunk/xaddresses/admin/admin_footer.php 2012-07-24 21:18:59 UTC (rev 9918) @@ -0,0 +1,35 @@ +<?php +/** + * **************************************************************************** + * - A Project by Developers TEAM For Xoops - ( http://www.xoops.org ) + * **************************************************************************** + * XADDRESSES - MODULE FOR XOOPS + * Copyright (c) 2007 - 2012 + * Rota Lucio ( http://luciorota.altervista.org/xoops/ ) + * + * 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. + * --------------------------------------------------------------------------- + * @copyright Rota Lucio ( http://luciorota.altervista.org/xoops/ ) + * @license GPL see LICENSE + * @package xaddresses + * @author Rota Lucio ( luc...@gm... ) + * + * Version : 1.0 Mon 2012/07/23 14:17:52 : XOOPS Exp $ + * **************************************************************************** + */ + +global $pathImageAdmin; +echo "<div align='center'><a href='http://www.xoops.org' target='_blank'> + <img src='".$pathImageModule."/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a></div>"; +echo "<div class='center small italic pad5'> + <strong>" . $xoopsModule->getVar('name') . "</strong> "._AM_XADDRESSES_MAINTAINEDBY." + <a href='IN PROGRESS' title='Visit IN PROGRESS' class='tooltip' rel='external'>IN PROGRESS</a></div>"; +xoops_cp_footer(); Modified: XoopsModules/xaddresses/trunk/xaddresses/admin/admin_functions.php =================================================================== --- XoopsModules/xaddresses/trunk/xaddresses/admin/admin_functions.php 2012-07-24 10:57:29 UTC (rev 9917) +++ XoopsModules/xaddresses/trunk/xaddresses/admin/admin_functions.php 2012-07-24 21:18:59 UTC (rev 9918) @@ -17,11 +17,11 @@ $adminTabCss = " <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('" . $moduleLink . "images/bg.png') repeat-x left bottom; font-size:93%; line-height:normal; border-left: 1px solid black; border-right: 1px solid black; margin-bottom: 12px; } + #buttonbar { float:left; width:100%; background: #e7e7e7 url('" . $moduleLink . "images/deco/bg.png') 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('" . $moduleLink . "images/left_both.png') 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('" . $moduleLink . "images/right_both.png') no-repeat right top; padding:5px 15px 4px 6px; font-weight:bold; color:#765; } + #buttonbar a { float:left; background:url('" . $moduleLink . "images/deco/left_both.png') 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('" . $moduleLink . "images/deco/right_both.png') 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 */ @@ -79,7 +79,7 @@ function moduleAdminSubmenu ($submenuItems) { - echo "<div class='head'>"; + echo "<div class='xo-buttons'>"; echo implode($submenuItems, ' | '); echo "</div>"; } @@ -99,11 +99,11 @@ echo " <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('" . XOOPS_URL . "/modules/xaddresses/images/bg.png') repeat-x left bottom; font-size:93%; line-height:normal; border-left: 1px solid black; border-right: 1px solid black; margin-bottom: 12px; } + #buttonbar { float:left; width:100%; background: #e7e7e7 url('" . XOOPS_URL . "/modules/xaddresses/images/deco/bg.png') 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('" . XOOPS_URL . "/modules/xaddresses/images/left_both.png') 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('" . XOOPS_URL . "/modules/xaddresses/images/right_both.png') no-repeat right top; padding:5px 15px 4px 6px; font-weight:bold; color:#765; } + #buttonbar a { float:left; background:url('" . XOOPS_URL . "/modules/xaddresses/images/deco/left_both.png') 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('" . XOOPS_URL . "/modules/xaddresses/images/deco/right_both.png') 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 */ @@ -136,11 +136,11 @@ echo "<div id='buttonbar'>"; echo "<ul>"; - echo "<li id='" . $tblColors[0] . "'><a href=\"" . XOOPS_URL . "/modules/" . $GLOBALS['xoopsModule']->getVar('dirname') . "/admin/index.php\"><span>" . _XADDRESSES_MI_ADMENU1 . "</span></a></li>"; - echo "<li id='" . $tblColors[1] . "'><a href=\"" . XOOPS_URL . "/modules/" . $GLOBALS['xoopsModule']->getVar('dirname') . "/admin/category.php\"><span>" . _XADDRESSES_MI_ADMENU2 . "</span></a></li>"; - echo "<li id='" . $tblColors[2] . "'><a href=\"" . XOOPS_URL . "/modules/" . $GLOBALS['xoopsModule']->getVar('dirname') . "/admin/addresses.php\"><span>" . _XADDRESSES_MI_ADMENU3 . "</span></a></li>"; - echo "<li id='" . $tblColors[3] . "'><a href=\"" . XOOPS_URL . "/modules/" . $GLOBALS['xoopsModule']->getVar('dirname') . "/admin/champs.php\"><span>" . _XADDRESSES_MI_ADMENU6 . "</span></a></li>"; - echo "<li id='" . $tblColors[4] . "'><a href=\"" . XOOPS_URL . "/modules/" . $GLOBALS['xoopsModule']->getVar('dirname') . "/admin/permissions.php\"><span>" . _XADDRESSES_MI_ADMENU7 . "</span></a></li>"; + echo "<li id='" . $tblColors[0] . "'><a href=\"" . XOOPS_URL . "/modules/" . $GLOBALS['xoopsModule']->getVar('dirname') . "/admin/index.php\"><span>" . _MI_XADDRESSES_ADMENU1 . "</span></a></li>"; + echo "<li id='" . $tblColors[1] . "'><a href=\"" . XOOPS_URL . "/modules/" . $GLOBALS['xoopsModule']->getVar('dirname') . "/admin/category.php\"><span>" . _MI_XADDRESSES_ADMENU2 . "</span></a></li>"; + echo "<li id='" . $tblColors[2] . "'><a href=\"" . XOOPS_URL . "/modules/" . $GLOBALS['xoopsModule']->getVar('dirname') . "/admin/addresses.php\"><span>" . _MI_XADDRESSES_ADMENU3 . "</span></a></li>"; + echo "<li id='" . $tblColors[3] . "'><a href=\"" . XOOPS_URL . "/modules/" . $GLOBALS['xoopsModule']->getVar('dirname') . "/admin/champs.php\"><span>" . _MI_XADDRESSES_ADMENU6 . "</span></a></li>"; + echo "<li id='" . $tblColors[4] . "'><a href=\"" . XOOPS_URL . "/modules/" . $GLOBALS['xoopsModule']->getVar('dirname') . "/admin/permissions.php\"><span>" . _MI_XADDRESSES_ADMENU7 . "</span></a></li>"; echo "</ul></div> "; } Modified: XoopsModules/xaddresses/trunk/xaddresses/admin/admin_header.php =================================================================== --- XoopsModules/xaddresses/trunk/xaddresses/admin/admin_header.php 2012-07-24 10:57:29 UTC (rev 9917) +++ XoopsModules/xaddresses/trunk/xaddresses/admin/admin_header.php 2012-07-24 21:18:59 UTC (rev 9918) @@ -1,50 +1,98 @@ -<?php -// include Xoops admin header -include '../../../include/cp_header.php'; +<?php +/** + * **************************************************************************** + * - A Project by Developers TEAM For Xoops - ( http://www.xoops.org ) + * **************************************************************************** + * XADDRESSES - MODULE FOR XOOPS + * Copyright (c) 2007 - 2012 + * Rota Lucio ( http://luciorota.altervista.org/xoops/ ) + * + * 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. + * --------------------------------------------------------------------------- + * @copyright Rota Lucio ( http://luciorota.altervista.org/xoops/ ) + * @license GPL see LICENSE + * @package xaddresses + * @author Rota Lucio ( luc...@gm... ) + * + * Version : 1.0 Mon 2012/07/23 14:17:52 : XOOPS Exp $ + * **************************************************************************** + */ -include_once XOOPS_ROOT_PATH . '/class/xoopsmodule.php'; -include_once XOOPS_ROOT_PATH . '/class/xoopstree.php'; -include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php'; -include_once XOOPS_ROOT_PATH . '/class/tree.php'; -include_once XOOPS_ROOT_PATH . '/class/xoopslists.php'; -include_once XOOPS_ROOT_PATH . '/class/pagenav.php'; -include_once XOOPS_ROOT_PATH . '/class/xoopstopic.php'; -include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php'; +include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php'; +include_once XOOPS_ROOT_PATH . '/include/cp_functions.php'; +include_once '../include/config.php'; +include_once '../include/functions.php'; -$myts =& MyTextSanitizer::getInstance(); + include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php'; + include_once XOOPS_ROOT_PATH . '/class/tree.php'; + include_once XOOPS_ROOT_PATH . '/class/pagenav.php'; + xoops_load ('XoopsUserUtility'); -// Only Xoops or Module administrators can access admin area -if ( $GLOBALS['xoopsUser'] ) { - if ( !$GLOBALS['xoopsUser']->isAdmin($GLOBALS['xoopsModule']->mid()) ) { - redirect_header(XOOPS_URL . '/', 3, _NOPERM); - exit(); - } +$pathDir = $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin'); +$globlang = $GLOBALS['xoopsConfig']['language']; + +if ( file_exists($pathDir.'/language/'.$globlang.'/main.php')){ + include_once $pathDir.'/language/'.$globlang.'/main.php'; } else { - redirect_header(XOOPS_URL . '/', 3, _NOPERM); - exit(); + include_once $pathDir.'/language/english/main.php'; } + +if ( file_exists($pathDir.'/moduleadmin.php')){ + include_once $pathDir.'/moduleadmin.php'; + //return true; +}else{ + xoops_cp_header(); + echo xoops_error(_AM_XADDRESSES_NOFRAMEWORKS); + xoops_cp_footer(); + //return false; +} +$dirname = basename(dirname(dirname( __FILE__ ) )); +$module_handler =& xoops_gethandler('module'); +$xoopsModule = & $module_handler->getByDirname($dirname); +$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid')); +$pathImageIcon = XOOPS_URL .'/'. $moduleInfo->getInfo('icons16'); +$pathImageAdmin = XOOPS_URL .'/'. $moduleInfo->getInfo('icons32'); +$pathImageModule = XOOPS_URL . '/modules/'. $GLOBALS['xoopsModule']->getVar('dirname') .'/images'; + +$myts =& MyTextSanitizer::getInstance(); + // Get user groups $groupPermHandler =& xoops_gethandler('groupperm'); -if (is_object($GLOBALS['xoopsUser'])) { - $groups = $GLOBALS['xoopsUser']->getGroups(); +if ($xoopsUser) { + $moduleperm_handler =& xoops_gethandler('groupperm'); + if (!$moduleperm_handler->checkRight('module_admin', $xoopsModule->getVar( 'mid' ), $xoopsUser->getGroups())) { + redirect_header(XOOPS_URL, 1, _NOPERM); + exit(); + } } else { - $groups = XOOPS_GROUP_ANONYMOUS; + redirect_header(XOOPS_URL . "/user.php", 1, _NOPERM); + exit(); } -if ( !isset($GLOBALS['xoopsTpl']) || !is_object($GLOBALS['xoopsTpl']) ) { - include_once $GLOBALS['xoops']->path( '/class/template.php' ); - $GLOBALS['xoopsTpl'] = new XoopsTpl(); +if (!isset($xoopsTpl) || !is_object($xoopsTpl)) { + include_once(XOOPS_ROOT_PATH."/class/template.php"); + $xoopsTpl = new XoopsTpl(); } -// Include language files -xoops_loadLanguage('admin', 'system'); -xoops_loadLanguage('modinfo', $GLOBALS['xoopsModule']->getVar('dirname')); -xoops_loadLanguage('admin', $GLOBALS['xoopsModule']->getVar('dirname')); -xoops_loadLanguage('main', $GLOBALS['xoopsModule']->getVar('dirname')); +$xoopsTpl->assign('pathImageIcon', $pathImageIcon); +$xoopsTpl->assign('pathImageAdmin', $pathImageAdmin); +//xoops_cp_header(); +//Load languages +xoops_loadLanguage('admin', $xoopsModule->getVar("dirname")); +xoops_loadLanguage('modinfo', $xoopsModule->getVar("dirname")); +xoops_loadLanguage('main', $xoopsModule->getVar("dirname")); + // Include module functions include_once XOOPS_ROOT_PATH . '/modules/'. $GLOBALS['xoopsModule']->getVar('dirname') .'/include/functions.php'; include_once XOOPS_ROOT_PATH . '/modules/'. $GLOBALS['xoopsModule']->getVar('dirname') .'/admin/admin_functions.php'; // admin functions include_once XOOPS_ROOT_PATH . '/modules/'. $GLOBALS['xoopsModule']->getVar('dirname') .'/include/forms.php'; -?> \ No newline at end of file Modified: XoopsModules/xaddresses/trunk/xaddresses/admin/field.php =================================================================== --- XoopsModules/xaddresses/trunk/xaddresses/admin/field.php 2012-07-24 10:57:29 UTC (rev 9917) +++ XoopsModules/xaddresses/trunk/xaddresses/admin/field.php 2012-07-24 21:18:59 UTC (rev 9918) @@ -14,13 +14,10 @@ case 'list_fields': // render start here xoops_cp_header(); - // main admin menu - include (XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['xoopsModule']->dirname() . '/admin/menu.php'); - echo moduleAdminTabMenu($adminmenu, $currentFile); // submenu $status_display = isset($_REQUEST['status_display']) ? $_REQUEST['status_display'] : 1; - $submenuItem[] = ($op == 'new_field' ? _XADDRESSES_AM_FIELD_NEW : '<a href="' . $currentFile . '?op=new_field">' . _XADDRESSES_AM_FIELD_NEW . '</a>'); - $submenuItem[] = ($op == 'list_fields' ? _XADDRESSES_AM_FIELD_LIST : '<a href="' . $currentFile . '?op=list_fields">' . _XADDRESSES_AM_FIELD_LIST . '</a>'); + $submenuItem[] = ($op == 'new_field' ? _AM_XADDRESSES_FIELD_NEW : '<a href="' . $currentFile . '?op=new_field">' . _AM_XADDRESSES_FIELD_NEW . '</a>'); + $submenuItem[] = ($op == 'list_fields' ? _AM_XADDRESSES_FIELD_LIST : '<a href="' . $currentFile . '?op=list_fields">' . _AM_XADDRESSES_FIELD_LIST . '</a>'); xaddressesAdminSubmenu ($submenuItem); // get fields categories @@ -28,7 +25,7 @@ $criteria->setSort('cat_weight'); $cats = $fieldCategoryHandler->getObjects($criteria, true); unset($criteria); - $categories[0] = _XADDRESSES_AM_FIELD_CATEGORY_DEFAULT; + $categories[0] = _AM_XADDRESSES_FIELD_CATEGORY_NONE; if ( count($cats) > 0 ) { foreach (array_keys($cats) as $i ) { $categories[$cats[$i]->getVar('cat_id')] = $cats[$i]->getVar('cat_title'); @@ -38,39 +35,39 @@ unset($categories); $valuetypes = array( - XOBJ_DTYPE_ARRAY => _XADDRESSES_AM_FIELD_ARRAY, - XOBJ_DTYPE_EMAIL => _XADDRESSES_AM_FIELD_EMAIL, - XOBJ_DTYPE_INT => _XADDRESSES_AM_FIELD_INT, - XOBJ_DTYPE_TXTAREA => _XADDRESSES_AM_FIELD_TXTAREA, - XOBJ_DTYPE_TXTBOX => _XADDRESSES_AM_FIELD_TXTBOX, - XOBJ_DTYPE_URL => _XADDRESSES_AM_FIELD_URL, - XOBJ_DTYPE_OTHER => _XADDRESSES_AM_FIELD_OTHER, - XOBJ_DTYPE_MTIME => _XADDRESSES_AM_FIELD_DATE + XOBJ_DTYPE_ARRAY => _AM_XADDRESSES_FIELD_ARRAY, + XOBJ_DTYPE_EMAIL => _AM_XADDRESSES_FIELD_EMAIL, + XOBJ_DTYPE_INT => _AM_XADDRESSES_FIELD_INT, + XOBJ_DTYPE_TXTAREA => _AM_XADDRESSES_FIELD_TXTAREA, + XOBJ_DTYPE_TXTBOX => _AM_XADDRESSES_FIELD_TXTBOX, + XOBJ_DTYPE_URL => _AM_XADDRESSES_FIELD_URL, + XOBJ_DTYPE_OTHER => _AM_XADDRESSES_FIELD_OTHER, + XOBJ_DTYPE_MTIME => _AM_XADDRESSES_FIELD_DATE ); $fieldtypes = array( - 'checkbox' => _XADDRESSES_AM_FIELD_CHECKBOX, - 'group' => _XADDRESSES_AM_FIELD_GROUP, - 'group_multi' => _XADDRESSES_AM_FIELD_GROUPMULTI, - 'language' => _XADDRESSES_AM_FIELD_LANGUAGE, - 'radio' => _XADDRESSES_AM_FIELD_RADIO, - 'select' => _XADDRESSES_AM_FIELD_SELECT, - 'select_multi' => _XADDRESSES_AM_FIELD_SELECTMULTI, - 'textarea' => _XADDRESSES_AM_FIELD_TEXTAREA, - 'dhtml' => _XADDRESSES_AM_FIELD_DHTMLTEXTAREA, - 'textbox' => _XADDRESSES_AM_FIELD_TEXTBOX, - 'timezone' => _XADDRESSES_AM_FIELD_TIMEZONE, - 'yesno' => _XADDRESSES_AM_FIELD_YESNO, - 'date' => _XADDRESSES_AM_FIELD_DATE, - 'datetime' => _XADDRESSES_AM_FIELD_DATETIME, - 'longdate' => _XADDRESSES_AM_FIELD_LONGDATE, - 'theme' => _XADDRESSES_AM_FIELD_THEME, - 'autotext' => _XADDRESSES_AM_FIELD_AUTOTEXT, - 'rank' => _XADDRESSES_AM_FIELD_RANK, - 'image' => _XADDRESSES_AM_FIELD_XOOPSIMAGE, - 'multipleimage' => _XADDRESSES_AM_FIELD_MULTIPLEXOOPSIMAGE, - 'file' => _XADDRESSES_AM_FIELD_FILE, - 'multiplefile' => _XADDRESSES_AM_FIELD_MULTIPLEFILE, - 'kmlmap' => _XADDRESSES_AM_FIELD_KMLMAP + 'checkbox' => _AM_XADDRESSES_FIELD_CHECKBOX, + 'group' => _AM_XADDRESSES_FIELD_GROUP, + 'group_multi' => _AM_XADDRESSES_FIELD_GROUPMULTI, + 'language' => _AM_XADDRESSES_FIELD_LANGUAGE, + 'radio' => _AM_XADDRESSES_FIELD_RADIO, + 'select' => _AM_XADDRESSES_FIELD_SELECT, + 'select_multi' => _AM_XADDRESSES_FIELD_SELECTMULTI, + 'textarea' => _AM_XADDRESSES_FIELD_TEXTAREA, + 'dhtml' => _AM_XADDRESSES_FIELD_DHTMLTEXTAREA, + 'textbox' => _AM_XADDRESSES_FIELD_TEXTBOX, + 'timezone' => _AM_XADDRESSES_FIELD_TIMEZONE, + 'yesno' => _AM_XADDRESSES_FIELD_YESNO, + 'date' => _AM_XADDRESSES_FIELD_DATE, + 'datetime' => _AM_XADDRESSES_FIELD_DATETIME, + 'longdate' => _AM_XADDRESSES_FIELD_LONGDATE, + 'theme' => _AM_XADDRESSES_FIELD_THEME, + 'autotext' => _AM_XADDRESSES_FIELD_AUTOTEXT, + 'rank' => _AM_XADDRESSES_FIELD_RANK, + 'image' => _AM_XADDRESSES_FIELD_XOOPSIMAGE, + 'multipleimage' => _AM_XADDRESSES_FIELD_MULTIPLEXOOPSIMAGE, + 'file' => _AM_XADDRESSES_FIELD_FILE, + 'multiplefile' => _AM_XADDRESSES_FIELD_MULTIPLEFILE, + //'kmlmap' => _AM_XADDRESSES_FIELD_KMLMAP ); // get fields @@ -94,9 +91,9 @@ $GLOBALS['xoopsTpl']->assign('token', $GLOBALS['xoopsSecurity']->getTokenHTML() ); $GLOBALS['xoopsTpl']->display("db:xaddresses_admin_fieldlist.html"); } else { - echo '<div class="errorMsg">' . _XADDRESSES_AM_ERROR_NO_FIELDS . '</div>'; + echo '<div class="errorMsg">' . _AM_XADDRESSES_ERROR_NO_FIELDS . '</div>'; } - xoops_cp_footer(); + include "admin_footer.php"; break; @@ -104,13 +101,10 @@ case 'new_field': // render start here xoops_cp_header(); - // main admin menu - include (XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['xoopsModule']->dirname() . '/admin/menu.php'); - echo moduleAdminTabMenu($adminmenu, $currentFile); // submenu $status_display = isset($_REQUEST['status_display']) ? $_REQUEST['status_display'] : 1; - $submenuItem[] = ($op == 'new_field' ? _XADDRESSES_AM_FIELD_NEW : '<a href="' . $currentFile . '?op=new_field">' . _XADDRESSES_AM_FIELD_NEW . '</a>'); - $submenuItem[] = ($op == 'list_fields' ? _XADDRESSES_AM_FIELD_LIST : '<a href="' . $currentFile . '?op=list_fields">' . _XADDRESSES_AM_FIELD_LIST . '</a>'); + $submenuItem[] = ($op == 'new_field' ? _AM_XADDRESSES_FIELD_NEW : '<a href="' . $currentFile . '?op=new_field">' . _AM_XADDRESSES_FIELD_NEW . '</a>'); + $submenuItem[] = ($op == 'list_fields' ? _AM_XADDRESSES_FIELD_LIST : '<a href="' . $currentFile . '?op=list_fields">' . _AM_XADDRESSES_FIELD_LIST . '</a>'); xaddressesAdminSubmenu ($submenuItem); include_once('../include/forms.php'); @@ -118,7 +112,7 @@ $form = xaddresses_getFieldForm($field); $form->display(); - xoops_cp_footer(); + include "admin_footer.php"; break; @@ -126,24 +120,21 @@ case 'edit_field': $field =& $fieldHandler->get($_REQUEST['field_id']); if ( !$field->getVar('field_config') && !$field->getVar('field_show') && !$field->getVar('field_edit') ) { //If no configs exist - redirect_header($currentFile, 2, _XADDRESSES_AM_FIELDNOTCONFIGURABLE); + redirect_header($currentFile, 2, _AM_XADDRESSES_FIELDNOTCONFIGURABLE); } // render start here xoops_cp_header(); - // main admin menu - include (XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['xoopsModule']->dirname() . '/admin/menu.php'); - echo moduleAdminTabMenu($adminmenu, $currentFile); // submenu $status_display = isset($_REQUEST['status_display']) ? $_REQUEST['status_display'] : 1; - $submenuItem[] = ($op == 'new_field' ? _XADDRESSES_AM_FIELD_NEW : '<a href="' . $currentFile . '?op=new_field">' . _XADDRESSES_AM_FIELD_NEW . '</a>'); - $submenuItem[] = ($op == 'list_fields' ? _XADDRESSES_AM_FIELD_LIST : '<a href="' . $currentFile . '?op=list_fields">' . _XADDRESSES_AM_FIELD_LIST . '</a>'); + $submenuItem[] = ($op == 'new_field' ? _AM_XADDRESSES_FIELD_NEW : '<a href="' . $currentFile . '?op=new_field">' . _AM_XADDRESSES_FIELD_NEW . '</a>'); + $submenuItem[] = ($op == 'list_fields' ? _AM_XADDRESSES_FIELD_LIST : '<a href="' . $currentFile . '?op=list_fields">' . _AM_XADDRESSES_FIELD_LIST . '</a>'); xaddressesAdminSubmenu ($submenuItem); include_once('../include/forms.php'); $form = xaddresses_getFieldForm($field); $form->display(); - xoops_cp_footer(); + include "admin_footer.php"; break; @@ -177,7 +168,7 @@ } if ( count($errors) == 0 ) { //no errors - redirect_header($currentFile, 2, sprintf(_XADDRESSES_AM_SAVEDSUCCESS, _XADDRESSES_AM_FIELDS) ); + redirect_header($currentFile, 2, sprintf(_AM_XADDRESSES_SAVEDSUCCESS, _AM_XADDRESSES_FIELDS) ); } else { redirect_header($currentFile, 3, implode('<br />', $errors) ); } @@ -197,7 +188,7 @@ $field =& $fieldHandler->get($_REQUEST['field_id']); // if no configs exist if (!$field->getVar('field_config') && !$field->getVar('field_show') && !$field->getVar('field_edit')) { - redirect_header('admin.php', 2, _XADDRESSES_AM_FIELDNOTCONFIGURABLE); + redirect_header('admin.php', 2, _AM_XADDRESSES_FIELDNOTCONFIGURABLE); } } else { // if is a new field @@ -363,21 +354,18 @@ } } if ($redirectToEdit) { - redirect_header($currentFile . '?op=edit_field&field_id=' . $field->getVar('field_id'), 3, sprintf("//IN PROGRESS " . _XADDRESSES_AM_NEXT_STEP, _XADDRESSES_AM_FIELD)); + redirect_header($currentFile . '?op=edit_field&field_id=' . $field->getVar('field_id'), 3, _AM_XADDRESSES_FIELD_NEXT_STEP); } else { - redirect_header($currentFile, 3, sprintf(_XADDRESSES_AM_SAVEDSUCCESS, _XADDRESSES_AM_FIELD)); + redirect_header($currentFile, 3, sprintf(_AM_XADDRESSES_SAVEDSUCCESS, _AM_XADDRESSES_FIELD)); } } // render start here xoops_cp_header(); - // main admin menu - include (XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['xoopsModule']->dirname() . '/admin/menu.php'); - echo moduleAdminTabMenu($adminmenu, $currentFile); // submenu $status_display = isset($_REQUEST['status_display']) ? $_REQUEST['status_display'] : 1; - $submenuItem[] = ($op == 'new_field' ? _XADDRESSES_AM_FIELD_NEW : '<a href="' . $currentFile . '?op=new_field">' . _XADDRESSES_AM_FIELD_NEW . '</a>'); - $submenuItem[] = ($op == 'list_fields' ? _XADDRESSES_AM_FIELD_LIST : '<a href="' . $currentFile . '?op=list_fields">' . _XADDRESSES_AM_FIELD_LIST . '</a>'); + $submenuItem[] = ($op == 'new_field' ? _AM_XADDRESSES_FIELD_NEW : '<a href="' . $currentFile . '?op=new_field">' . _AM_XADDRESSES_FIELD_NEW . '</a>'); + $submenuItem[] = ($op == 'list_fields' ? _AM_XADDRESSES_FIELD_LIST : '<a href="' . $currentFile . '?op=list_fields">' . _AM_XADDRESSES_FIELD_LIST . '</a>'); xaddressesAdminSubmenu ($submenuItem); include_once('../include/forms.php'); @@ -385,7 +373,7 @@ $form = xaddresses_getFieldForm($field); $form->display(); - xoops_cp_footer(); + include "admin_footer.php"; break; @@ -393,21 +381,21 @@ case 'delete_field': $field =& $fieldHandler->get($_REQUEST['field_id']); if ( !$field->getVar('field_config') ) { - redirect_header('index.php', 2, _XADDRESSES_AM_FIELDNOTCONFIGURABLE); + redirect_header('index.php', 2, _AM_XADDRESSES_FIELDNOTCONFIGURABLE); } if ( isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1 ) { if ( !$GLOBALS['xoopsSecurity']->check() ) { redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors() )); } if ( $fieldHandler->delete($field) ) { - redirect_header($currentFile, 3, sprintf(_XADDRESSES_AM_DELETEDSUCCESS, _XADDRESSES_AM_FIELD) ); + redirect_header($currentFile, 3, sprintf(_AM_XADDRESSES_DELETEDSUCCESS, _AM_XADDRESSES_FIELD) ); } else { echo $field->getHtmlErrors(); } } else { // render start here xoops_cp_header(); - xoops_confirm(array('ok' => 1, 'field_id' => $_REQUEST['field_id'], 'op' => 'delete_field'), $_SERVER['REQUEST_URI'], sprintf(_XADDRESSES_AM_RUSUREDEL, $field->getVar('field_title') )); + xoops_confirm(array('ok' => 1, 'field_id' => $_REQUEST['field_id'], 'op' => 'delete_field'), $_SERVER['REQUEST_URI'], sprintf(_AM_XADDRESSES_RUSUREDEL, $field->getVar('field_title') )); xoops_cp_footer(); } break; Modified: XoopsModules/xaddresses/trunk/xaddresses/admin/fieldcategory.php =================================================================== --- XoopsModules/xaddresses/trunk/xaddresses/admin/fieldcategory.php 2012-07-24 10:57:29 UTC (rev 9917) +++ XoopsModules/xaddresses/trunk/xaddresses/admin/fieldcategory.php 2012-07-24 21:18:59 UTC (rev 9918) @@ -16,13 +16,10 @@ case 'list_fieldcategories': // render start here xoops_cp_header(); - // render main admin menu - include (XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['xoopsModule']->dirname() . '/admin/menu.php'); - echo moduleAdminTabMenu($adminmenu, $currentFile); // render submenu $status_display = isset($_REQUEST['status_display']) ? $_REQUEST['status_display'] : 1; - $submenuItem[] = ($op == 'new_fieldcategory' ? _XADDRESSES_AM_FIELDCAT_NEW : '<a href="' . $currentFile . '?op=new_fieldcategory">' . _XADDRESSES_AM_FIELDCAT_NEW . '</a>'); - $submenuItem[] = ($op == 'list_fieldcategories' ? _XADDRESSES_AM_FIELDCAT_LIST : '<a href="' . $currentFile . '?op=list_fieldcategories">' . _XADDRESSES_AM_FIELDCAT_LIST . '</a>'); + $submenuItem[] = ($op == 'new_fieldcategory' ? _AM_XADDRESSES_FIELDCAT_NEW : '<a href="' . $currentFile . '?op=new_fieldcategory">' . _AM_XADDRESSES_FIELDCAT_NEW . '</a>'); + $submenuItem[] = ($op == 'list_fieldcategories' ? _AM_XADDRESSES_FIELDCAT_LIST : '<a href="' . $currentFile . '?op=list_fieldcategories">' . _AM_XADDRESSES_FIELDCAT_LIST . '</a>'); xaddressesAdminSubmenu ($submenuItem); $criteria = new CriteriaCompo(); @@ -37,7 +34,7 @@ $GLOBALS['xoopsTpl']->assign('token', $GLOBALS['xoopsSecurity']->getTokenHTML() ); $GLOBALS['xoopsTpl']->display("db:xaddresses_admin_fieldcategorylist.html"); - xoops_cp_footer(); + include "admin_footer.php"; break; @@ -68,7 +65,7 @@ } if (count($errors) == 0) { //no errors - redirect_header($currentFile, 2, sprintf(_XADDRESSES_AM_SAVEDSUCCESS, _XADDRESSES_AM_CATEGORIES)); + redirect_header($currentFile, 2, sprintf(_AM_XADDRESSES_SAVEDSUCCESS, _AM_XADDRESSES_CATEGORIES)); } else { redirect_header($currentFile, 3, implode('<br />', $errors)); } @@ -81,13 +78,10 @@ case 'new_fieldcategory': // render start here xoops_cp_header(); - // render main admin menu - include (XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['xoopsModule']->dirname() . '/admin/menu.php'); - echo moduleAdminTabMenu($adminmenu, $currentFile); // render submenu $status_display = isset($_REQUEST['status_display']) ? $_REQUEST['status_display'] : 1; - $submenuItem[] = ($op == 'new_fieldcategory' ? _XADDRESSES_AM_FIELDCAT_NEW : '<a href="' . $currentFile . '?op=new_fieldcategory">' . _XADDRESSES_AM_FIELDCAT_NEW . '</a>'); - $submenuItem[] = ($op == 'list_fieldcategories' ? _XADDRESSES_AM_FIELDCAT_LIST : '<a href="' . $currentFile . '?op=list_fieldcategories">' . _XADDRESSES_AM_FIELDCAT_LIST . '</a>'); + $submenuItem[] = ($op == 'new_fieldcategory' ? _AM_XADDRESSES_FIELDCAT_NEW : '<a href="' . $currentFile . '?op=new_fieldcategory">' . _AM_XADDRESSES_FIELDCAT_NEW . '</a>'); + $submenuItem[] = ($op == 'list_fieldcategories' ? _AM_XADDRESSES_FIELDCAT_LIST : '<a href="' . $currentFile . '?op=list_fieldcategories">' . _AM_XADDRESSES_FIELDCAT_LIST . '</a>'); xaddressesAdminSubmenu ($submenuItem); include_once '../include/forms.php'; @@ -95,7 +89,7 @@ $form = $obj->getForm(); $form->display(); - xoops_cp_footer(); + include "admin_footer.php"; break; @@ -103,13 +97,10 @@ case 'edit_fieldcategory': // render start here xoops_cp_header(); - // render main admin menu - include (XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['xoopsModule']->dirname() . '/admin/menu.php'); - echo moduleAdminTabMenu($adminmenu, $currentFile); // render submenu $status_display = isset($_REQUEST['status_display']) ? $_REQUEST['status_display'] : 1; - $submenuItem[] = ($op == 'new_fieldcategory' ? _XADDRESSES_AM_FIELDCAT_NEW : '<a href="' . $currentFile . '?op=new_fieldcategory">' . _XADDRESSES_AM_FIELDCAT_NEW . '</a>'); - $submenuItem[] = ($op == 'list_fieldcategories' ? _XADDRESSES_AM_FIELDCAT_LIST : '<a href="' . $currentFile . '?op=list_fieldcategories">' . _XADDRESSES_AM_FIELDCAT_LIST . '</a>'); + $submenuItem[] = ($op == 'new_fieldcategory' ? _AM_XADDRESSES_FIELDCAT_NEW : '<a href="' . $currentFile . '?op=new_fieldcategory">' . _AM_XADDRESSES_FIELDCAT_NEW . '</a>'); + $submenuItem[] = ($op == 'list_fieldcategories' ? _AM_XADDRESSES_FIELDCAT_LIST : '<a href="' . $currentFile . '?op=list_fieldcategories">' . _AM_XADDRESSES_FIELDCAT_LIST . '</a>'); xaddressesAdminSubmenu ($submenuItem); include_once '../include/forms.php'; @@ -117,7 +108,7 @@ $form = $obj->getForm(); $form->display(); - xoops_cp_footer(); + include "admin_footer.php"; break; @@ -135,7 +126,7 @@ $obj->setVar('cat_description', $_REQUEST['cat_description']); $obj->setVar('cat_weight', $_REQUEST['cat_weight']); if ( $fieldCategoryHandler->insert($obj) ) { - redirect_header($currentFile, 3, sprintf(_XADDRESSES_AM_SAVEDSUCCESS, _XADDRESSES_AM_CATEGORY) ); + redirect_header($currentFile, 3, sprintf(_AM_XADDRESSES_SAVEDSUCCESS, _AM_XADDRESSES_CATEGORY) ); } else { // render start here xoops_cp_header(); @@ -144,8 +135,8 @@ echo moduleAdminTabMenu($adminmenu, $currentFile); // render submenu $status_display = isset($_REQUEST['status_display']) ? $_REQUEST['status_display'] : 1; - $submenuItem[] = ($op == 'new_fieldcategory' ? _XADDRESSES_AM_FIELDCAT_NEW : '<a href="' . $currentFile . '?op=new_fieldcategory">' . _XADDRESSES_AM_FIELDCAT_NEW . '</a>'); - $submenuItem[] = ($op == 'list_fieldcategories' ? _XADDRESSES_AM_FIELDCAT_LIST : '<a href="' . $currentFile . '?op=list_fieldcategories">' . _XADDRESSES_AM_FIELDCAT_LIST . '</a>'); + $submenuItem[] = ($op == 'new_fieldcategory' ? _AM_XADDRESSES_FIELDCAT_NEW : '<a href="' . $currentFile . '?op=new_fieldcategory">' . _AM_XADDRESSES_FIELDCAT_NEW . '</a>'); + $submenuItem[] = ($op == 'list_fieldcategories' ? _AM_XADDRESSES_FIELDCAT_LIST : '<a href="' . $currentFile . '?op=list_fieldcategories">' . _AM_XADDRESSES_FIELDCAT_LIST . '</a>'); xaddressesAdminSubmenu ($submenuItem); include_once '../include/forms.php'; @@ -153,7 +144,7 @@ $form =& $obj->getForm(); $form->display(); - xoops_cp_footer(); + include "admin_footer.php"; } break; @@ -166,14 +157,14 @@ redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors() )); } if ( $fieldCategoryHandler->delete($obj) ) { - redirect_header($currentFile, 3, sprintf(_XADDRESSES_AM_DELETEDSUCCESS, _XADDRESSES_AM_CATEGORY) ); + redirect_header($currentFile, 3, sprintf(_AM_XADDRESSES_DELETEDSUCCESS, _AM_XADDRESSES_CATEGORY) ); } else { echo $obj->getHtmlErrors(); } } else { // render start here xoops_cp_header(); - xoops_confirm(array('ok' => 1, 'id' => $_REQUEST['id'], 'op' => 'delete_fieldcategory'), $_SERVER['REQUEST_URI'], sprintf(_XADDRESSES_AM_RU_SURE_DEL, $obj->getVar('cat_title') )); + xoops_confirm(array('ok' => 1, 'id' => $_REQUEST['id'], 'op' => 'delete_fieldcategory'), $_SERVER['REQUEST_URI'], sprintf(_AM_XADDRESSES_RU_SURE_DEL, $obj->getVar('cat_title') )); xoops_cp_footer(); } break; Modified: XoopsModules/xaddresses/trunk/xaddresses/admin/import.php =================================================================== --- XoopsModules/xaddresses/trunk/xaddresses/admin/import.php 2012-07-24 10:57:29 UTC (rev 9917) +++ XoopsModules/xaddresses/trunk/xaddresses/admin/import.php 2012-07-24 21:18:59 UTC (rev 9918) @@ -1,283 +1,160 @@ <?php $currentFile = basename(__FILE__); + +// include module admin header include_once 'admin_header.php'; +//load classes +$categoryHandler =& xoops_getModuleHandler('locationcategory', 'xaddresses'); +$locationHandler =& xoops_getModuleHandler('location', 'xaddresses'); +$fieldHandler =& xoops_getModuleHandler('field', 'xaddresses'); +$memberHandler =& xoops_gethandler('member'); + +// count location categories +$countCategories = $categoryHandler->getCount(); +// redirection if no categories +if ($categoryHandler->getCount() == 0) { + //redirect_header('index.php', 2, _AM_XADDRESSES_PERM_NOCAT); +} + +// get/check parameters/post +$op = isset($_REQUEST['op']) ? $_REQUEST['op'] : 'import'; + +// render start here xoops_cp_header(); -// main admin menu -include (XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['xoopsModule']->dirname() . '/admin/menu.php'); -echo moduleAdminTabMenu($adminmenu, $currentFile); -//Action dans switch -if (isset($_REQUEST['op'])) { - $op = $_REQUEST['op']; -} else { - $op = 'index'; -} -// import depuis mydownloads -function Import_mydownloads($path='', $imgurl='') -{ - $ok = isset($_POST['ok']) ? intval($_POST['ok']) : 0; - global $xoopsDB; - if ( $ok == 1 ){ - //param\xE8tres: - // pour les images des cat\xE9gories: - $uploaddir = XOOPS_ROOT_PATH . '/uploads/xaddresses/images/cats/'; - // pour les fichiers - $uploaddir_downloads = XOOPS_ROOT_PATH . '/uploads/xaddresses/downloads/'; - //Vider les tables - $query = $xoopsDB->queryF("truncate table ".$xoopsDB->prefix("xaddresses_broken")); - $query = $xoopsDB->queryF("truncate table ".$xoopsDB->prefix("xaddresses_categories")); - $query = $xoopsDB->queryF("truncate table ".$xoopsDB->prefix("xaddresses_addresses")); - $query = $xoopsDB->queryF("truncate table ".$xoopsDB->prefix("xaddresses_fielddata")); - $query = $xoopsDB->queryF("truncate table ".$xoopsDB->prefix("xaddresses_modfielddata")); - $query = $xoopsDB->queryF("truncate table ".$xoopsDB->prefix("xaddresses_votedata")); - //Inserer les donn\xE9es des cat\xE9gories - $query_topic = $xoopsDB->query("SELECT cid, pid, title, imgurl FROM ".$xoopsDB->prefix("xaddresses_categories")); - while ($donnees = $xoopsDB->fetchArray($query_topic)) - { - if ( $donnees['imgurl'] == "" ) - { - $img = "blank.gif"; - } else { - $img = substr_replace($donnees['imgurl'],'',0,strlen($imgurl)); - copy($path . $img, XOOPS_ROOT_PATH . "/uploads/TDMDownloads/images/cats/" . $img); - } - - $title = $donnees['title']; - $insert = $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix("tdmdownloads_cat")." (cid, pid, title, imgurl, description_main, weight ) VALUES ('".$donnees['cid']."', '".$donnees['pid']."', '".$title."', '".$img."', '', '0')"); - if (!$insert) { - echo "<font color='red'>" . _XADDRESSES_AM_IMPORT_ERROR_DATA .": </font> " . $donnees['title'] . "<br />"; - } - echo sprintf(_XADDRESSES_AM_IMPORT_CAT_IMP . '<br/>', $donnees['t... [truncated message content] |