Menu
▾
▴
xoops-svn — All SVN commits will be posted to this ML
You can subscribe to this list here.
| 2012 |
Jan
|
Feb
(214) |
Mar
(139) |
Apr
(198) |
May
(187) |
Jun
(151) |
Jul
(210) |
Aug
(169) |
Sep
(58) |
Oct
(53) |
Nov
(54) |
Dec
(301) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2013 |
Jan
(348) |
Feb
(178) |
Mar
(219) |
Apr
(154) |
May
(117) |
Jun
(194) |
Jul
(61) |
Aug
(132) |
Sep
(121) |
Oct
(110) |
Nov
(11) |
Dec
(18) |
| 2014 |
Jan
(34) |
Feb
(50) |
Mar
(82) |
Apr
(98) |
May
(39) |
Jun
(111) |
Jul
(67) |
Aug
(36) |
Sep
(33) |
Oct
(26) |
Nov
(53) |
Dec
(44) |
| 2015 |
Jan
(29) |
Feb
(47) |
Mar
(25) |
Apr
(19) |
May
(23) |
Jun
(20) |
Jul
(49) |
Aug
(7) |
Sep
(10) |
Oct
(10) |
Nov
(4) |
Dec
(25) |
| 2016 |
Jan
(8) |
Feb
(7) |
Mar
(1) |
Apr
|
May
(3) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(7) |
Dec
(5) |
| 2017 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(15) |
Jun
|
Jul
(18) |
Aug
(24) |
Sep
|
Oct
(14) |
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
(22) |
Mar
|
Apr
(11) |
May
(1) |
Jun
(17) |
Jul
(2) |
Aug
(2) |
Sep
|
Oct
(6) |
Nov
(5) |
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2025 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <wis...@us...> - 2012-07-27 14:36:05
|
Revision: 9929
http://xoops.svn.sourceforge.net/xoops/?rev=9929&view=rev
Author: wishcraft
Date: 2012-07-27 14:35:55 +0000 (Fri, 27 Jul 2012)
Log Message:
-----------
IP Log 1.01 (RC) - Many Bug Fixes - Crippling of Theme, Session Time management!
Added Paths:
-----------
XoopsModules/iplog/
XoopsModules/iplog/releases/
XoopsModules/iplog/releases/1.01/
XoopsModules/iplog/releases/1.01/htdocs/
XoopsModules/iplog/releases/1.01/htdocs/Frameworks/
XoopsModules/iplog/releases/1.01/htdocs/Frameworks/moduleclasses/
XoopsModules/iplog/releases/1.01/htdocs/Frameworks/moduleclasses/icons/
XoopsModules/iplog/releases/1.01/htdocs/Frameworks/moduleclasses/icons/16/
XoopsModules/iplog/releases/1.01/htdocs/Frameworks/moduleclasses/icons/16/iplog.log.png
XoopsModules/iplog/releases/1.01/htdocs/Frameworks/moduleclasses/icons/32/
XoopsModules/iplog/releases/1.01/htdocs/Frameworks/moduleclasses/icons/32/iplog.log.png
XoopsModules/iplog/releases/1.01/htdocs/modules/
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/about.php
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/dashboard.php
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/footer.php
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/header.php
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/index.html
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/log.php
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/menu.php
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/class/
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/class/countries.php
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/class/index.html
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/class/log.php
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/docs/
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/docs/changelog.txt
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/docs/credits.txt
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/docs/index.html
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/docs/install.txt
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/docs/lang_diff.txt
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/docs/licence.txt
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/docs/readme.txt
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/images/
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/images/logo.png
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/include/
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/include/functions.php
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/include/ip2locationlite.class.php
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/index.html
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/language/
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/language/english/
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/language/english/admin.php
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/language/english/help/
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/language/english/help/help.html
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/language/english/help/index.html
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/language/english/index.html
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/language/english/mail_template/
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/language/english/mail_template/index.html
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/language/english/modinfo.php
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/language/index.html
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/preloads/
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/preloads/index.html
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/preloads/logger.php
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/sql/
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/sql/mysql.sql
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/templates/
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/templates/blocks/
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/templates/blocks/index.html
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/templates/index.html
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/templates/iplog_log_list.html
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/xoops_version.php
XoopsModules/iplog/trunk/
XoopsModules/iplog/trunk/htdocs/
XoopsModules/iplog/trunk/htdocs/Frameworks/
XoopsModules/iplog/trunk/htdocs/Frameworks/moduleclasses/
XoopsModules/iplog/trunk/htdocs/Frameworks/moduleclasses/icons/
XoopsModules/iplog/trunk/htdocs/Frameworks/moduleclasses/icons/16/
XoopsModules/iplog/trunk/htdocs/Frameworks/moduleclasses/icons/16/iplog.log.png
XoopsModules/iplog/trunk/htdocs/Frameworks/moduleclasses/icons/32/
XoopsModules/iplog/trunk/htdocs/Frameworks/moduleclasses/icons/32/iplog.log.png
XoopsModules/iplog/trunk/htdocs/modules/
XoopsModules/iplog/trunk/htdocs/modules/iplog/
XoopsModules/iplog/trunk/htdocs/modules/iplog/admin/
XoopsModules/iplog/trunk/htdocs/modules/iplog/admin/about.php
XoopsModules/iplog/trunk/htdocs/modules/iplog/admin/dashboard.php
XoopsModules/iplog/trunk/htdocs/modules/iplog/admin/footer.php
XoopsModules/iplog/trunk/htdocs/modules/iplog/admin/header.php
XoopsModules/iplog/trunk/htdocs/modules/iplog/admin/index.html
XoopsModules/iplog/trunk/htdocs/modules/iplog/admin/log.php
XoopsModules/iplog/trunk/htdocs/modules/iplog/admin/menu.php
XoopsModules/iplog/trunk/htdocs/modules/iplog/class/
XoopsModules/iplog/trunk/htdocs/modules/iplog/class/countries.php
XoopsModules/iplog/trunk/htdocs/modules/iplog/class/index.html
XoopsModules/iplog/trunk/htdocs/modules/iplog/class/log.php
XoopsModules/iplog/trunk/htdocs/modules/iplog/docs/
XoopsModules/iplog/trunk/htdocs/modules/iplog/docs/changelog.txt
XoopsModules/iplog/trunk/htdocs/modules/iplog/docs/credits.txt
XoopsModules/iplog/trunk/htdocs/modules/iplog/docs/index.html
XoopsModules/iplog/trunk/htdocs/modules/iplog/docs/install.txt
XoopsModules/iplog/trunk/htdocs/modules/iplog/docs/lang_diff.txt
XoopsModules/iplog/trunk/htdocs/modules/iplog/docs/licence.txt
XoopsModules/iplog/trunk/htdocs/modules/iplog/docs/readme.txt
XoopsModules/iplog/trunk/htdocs/modules/iplog/images/
XoopsModules/iplog/trunk/htdocs/modules/iplog/images/logo.png
XoopsModules/iplog/trunk/htdocs/modules/iplog/include/
XoopsModules/iplog/trunk/htdocs/modules/iplog/include/functions.php
XoopsModules/iplog/trunk/htdocs/modules/iplog/include/ip2locationlite.class.php
XoopsModules/iplog/trunk/htdocs/modules/iplog/index.html
XoopsModules/iplog/trunk/htdocs/modules/iplog/language/
XoopsModules/iplog/trunk/htdocs/modules/iplog/language/english/
XoopsModules/iplog/trunk/htdocs/modules/iplog/language/english/admin.php
XoopsModules/iplog/trunk/htdocs/modules/iplog/language/english/help/
XoopsModules/iplog/trunk/htdocs/modules/iplog/language/english/help/help.html
XoopsModules/iplog/trunk/htdocs/modules/iplog/language/english/help/index.html
XoopsModules/iplog/trunk/htdocs/modules/iplog/language/english/index.html
XoopsModules/iplog/trunk/htdocs/modules/iplog/language/english/mail_template/
XoopsModules/iplog/trunk/htdocs/modules/iplog/language/english/mail_template/index.html
XoopsModules/iplog/trunk/htdocs/modules/iplog/language/english/modinfo.php
XoopsModules/iplog/trunk/htdocs/modules/iplog/language/index.html
XoopsModules/iplog/trunk/htdocs/modules/iplog/preloads/
XoopsModules/iplog/trunk/htdocs/modules/iplog/preloads/index.html
XoopsModules/iplog/trunk/htdocs/modules/iplog/preloads/logger.php
XoopsModules/iplog/trunk/htdocs/modules/iplog/sql/
XoopsModules/iplog/trunk/htdocs/modules/iplog/sql/mysql.sql
XoopsModules/iplog/trunk/htdocs/modules/iplog/templates/
XoopsModules/iplog/trunk/htdocs/modules/iplog/templates/blocks/
XoopsModules/iplog/trunk/htdocs/modules/iplog/templates/blocks/index.html
XoopsModules/iplog/trunk/htdocs/modules/iplog/templates/index.html
XoopsModules/iplog/trunk/htdocs/modules/iplog/templates/iplog_log_list.html
XoopsModules/iplog/trunk/htdocs/modules/iplog/xoops_version.php
Added: XoopsModules/iplog/releases/1.01/htdocs/Frameworks/moduleclasses/icons/16/iplog.log.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/iplog/releases/1.01/htdocs/Frameworks/moduleclasses/icons/16/iplog.log.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/iplog/releases/1.01/htdocs/Frameworks/moduleclasses/icons/32/iplog.log.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/iplog/releases/1.01/htdocs/Frameworks/moduleclasses/icons/32/iplog.log.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/about.php
===================================================================
--- XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/about.php (rev 0)
+++ XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/about.php 2012-07-27 14:35:55 UTC (rev 9929)
@@ -0,0 +1,76 @@
+<?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 //
+// ------------------------------------------------------------------------- //
+
+ include ('header.php');
+ xoops_loadLanguage('admin', 'iplog');
+
+ xoops_cp_header();
+ $indexAdmin = new ModuleAdmin();
+ echo $indexAdmin->addNavigation('about.php');
+
+ $aboutAdmin = new ModuleAdmin();
+ $paypalitemno='PROFILE175';
+ $aboutAdmin = new ModuleAdmin();
+ $about = $aboutAdmin->renderabout($paypalitemno, false);
+ $donationform = array( 0 => '<form name="donation" id="donation" action="http://www.chronolabs.com.au/modules/xpayment/" method="post" onsubmit="return xoopsFormValidate_donation();">',
+ 1 => '<table class="outer" cellspacing="1" width="100%"><tbody><tr><th colspan="2">'.constant('_AM_IPLOG_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['iplogModule']->getVar('dirname')), strtoupper($GLOBALS['iplogModule']->getVar('dirname')). ' '.$GLOBALS['iplogModule']->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));
+
+ include(dirname(__FILE__).'/footer.php');
+?>
\ No newline at end of file
Added: XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/dashboard.php
===================================================================
--- XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/dashboard.php (rev 0)
+++ XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/dashboard.php 2012-07-27 14:35:55 UTC (rev 9929)
@@ -0,0 +1,90 @@
+<?php
+// $Id: directory.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 //
+// ------------------------------------------------------------------------- //
+
+ include ('header.php');
+ xoops_loadLanguage('admin', 'profile');
+
+ xoops_cp_header();
+
+ $indexAdmin = new ModuleAdmin();
+ $log_handler = xoops_getmodulehandler('log', 'iplog');
+
+ $indexAdmin = new ModuleAdmin();
+ if (count($log_handler->getNumberByCountry())>1) {
+ $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_COUNTS_BY_COUNTRY);
+ foreach ($log_handler->getNumberByCountry() as $id => $value)
+ $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_COUNTS_BY_COUNTRY, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
+ }
+ if (count($log_handler->getNumberByRegion())>1) {
+ $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_COUNTS_BY_REGION);
+ foreach ($log_handler->getNumberByRegion() as $id => $value)
+ $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_COUNTS_BY_REGION, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
+ }
+ if (count($log_handler->getNumberByContinent())>1) {
+ $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_COUNTS_BY_CONTINENT);
+ foreach ($log_handler->getNumberByContinent() as $id => $value)
+ $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_COUNTS_BY_CONTINENT, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
+ }
+ if (count($log_handler->getTotalSecondsByCountry())>1) {
+ $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_SUM_BY_COUNTRY);
+ foreach ($log_handler->getTotalSecondsByCountry() as $id => $value)
+ $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_SUM_BY_COUNTRY, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
+ }
+ if (count($log_handler->getTotalSecondsByRegion())>1) {
+ $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_SUM_BY_REGION);
+ foreach ($log_handler->getTotalSecondsByRegion() as $id => $value)
+ $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_SUM_BY_REGION, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
+ }
+ if (count($log_handler->getTotalSecondsByContinent())>1) {
+ $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_SUM_BY_CONTINENT);
+ foreach ($log_handler->getTotalSecondsByContinent() as $id => $value)
+ $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_SUM_BY_CONTINENT, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
+ }
+ if (count($log_handler->getAdverageSecondsByCountry())>1) {
+ $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_AVG_BY_COUNTRY);
+ foreach ($log_handler->getAdverageSecondsByCountry() as $id => $value)
+ $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_AVG_BY_COUNTRY, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
+ }
+ if (count($log_handler->getAdverageSecondsByRegion())>1) {
+ $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_AVG_BY_REGION);
+ foreach ($log_handler->getAdverageSecondsByRegion() as $id => $value)
+ $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_AVG_BY_REGION, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
+ }
+ if (count($log_handler->getAdverageSecondsByContinent())>1) {
+ $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_AVG_BY_CONTINENT);
+ foreach ($log_handler->getAdverageSecondsByContinent() as $id => $value)
+ $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_AVG_BY_CONTINENT, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
+ }
+
+ echo $indexAdmin->renderIndex();
+ include(dirname(__FILE__).'/footer.php');
+
+?>
\ No newline at end of file
Added: XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/footer.php
===================================================================
--- XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/footer.php (rev 0)
+++ XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/footer.php 2012-07-27 14:35:55 UTC (rev 9929)
@@ -0,0 +1,22 @@
+<?php
+/**
+ * xSitemMap module
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package xSitemMap
+ * @since 2.5.0
+ * @author XOOPS Module Team
+ * @version $Id $
+**/
+echo "<div align=\"center\"><a href=\"http://www.xoops.org\" target=\"_blank\"><img src=" . XOOPS_URL ."/". $GLOBALS['iplogModule']->getInfo("icons32")."/xoopsmicrobutton.gif"." alt=\"XOOPS\" title=\"XOOPS\"></a></div>";
+echo "<div class='center smallsmall italic pad5'><strong>" . $GLOBALS['iplogModule']->getVar("name") . "</strong> is maintained by the <a class='tooltip' rel='external' href='http://www.xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>";
+
+xoops_cp_footer();
\ No newline at end of file
Added: XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/header.php
===================================================================
--- XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/header.php (rev 0)
+++ XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/header.php 2012-07-27 14:35:55 UTC (rev 9929)
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Extended User iplog
+ *
+ * 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 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package iplog
+ * @since 2.3.0
+ * @author Taiwen Jiang <ph...@us...>
+ * @version $Id: header.php 5204 2010-09-06 20:10:52Z mageg $
+ */
+
+
+ require_once (dirname(dirname(dirname(dirname(__FILE__)))).'/include/cp_header.php');
+
+ if (!defined('_CHARSET'))
+ define ("_CHARSET","UTF-8");
+ if (!defined('_CHARSET_ISO'))
+ define ("_CHARSET_ISO","ISO-8859-1");
+
+ $GLOBALS['myts'] = MyTextSanitizer::getInstance();
+
+ $module_handler = xoops_gethandler('module');
+ $config_handler = xoops_gethandler('config');
+ $GLOBALS['iplogModule'] = $module_handler->getByDirname('iplog');
+ $GLOBALS['iplogModuleConfig'] = $config_handler->getConfigList($GLOBALS['iplogModule']->getVar('mid'));
+
+ xoops_load('pagenav');
+ xoops_load('xoopslists');
+ xoops_load('xoopsformloader');
+
+ include_once $GLOBALS['xoops']->path('class'.DS.'xoopsmailer.php');
+ include_once $GLOBALS['xoops']->path('class'.DS.'xoopstree.php');
+
+ if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){
+ include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
+ }else{
+ echo xoops_error("Error: You don't use the Frameworks \"admin module\". Please install this Frameworks");
+ }
+
+ $GLOBALS['iplogImageIcon'] = XOOPS_URL .'/'. $GLOBALS['iplogModule']->getInfo('icons16');
+ $GLOBALS['iplogImageAdmin'] = XOOPS_URL .'/'. $GLOBALS['iplogModule']->getInfo('icons32');
+
+ if ($GLOBALS['xoopsUser']) {
+ $moduleperm_handler =& xoops_gethandler('groupperm');
+ if (!$moduleperm_handler->checkRight('module_admin', $GLOBALS['iplogModule']->getVar( 'mid' ), $GLOBALS['xoopsUser']->getGroups())) {
+ redirect_header(XOOPS_URL, 1, _NOPERM);
+ exit();
+ }
+ } else {
+ redirect_header(XOOPS_URL . "/user.php", 1, _NOPERM);
+ exit();
+ }
+
+ require_once $GLOBALS['xoops']->path('/modules/iplog/include/functions.php');
+
+ xoops_loadLanguage('user');
+
+ if (!isset($GLOBALS['xoopsTpl']) || !is_object($GLOBALS['xoopsTpl'])) {
+ include_once(XOOPS_ROOT_PATH."/class/template.php");
+ $GLOBALS['xoopsTpl'] = new XoopsTpl();
+ }
+
+ $GLOBALS['xoopsTpl']->assign('pathImageIcon', $GLOBALS['iplogImageIcon']);
+ $GLOBALS['xoopsTpl']->assign('pathImageAdmin', $GLOBALS['iplogImageAdmin']);
+
+ $op = isset($_REQUEST['op'])?$_REQUEST['op']:"dashboard";
+ $fct = isset($_REQUEST['fct'])?$_REQUEST['fct']:"list";
+ $limit = !empty($_REQUEST['limit'])?intval($_REQUEST['limit']):30;
+ $start = !empty($_REQUEST['start'])?intval($_REQUEST['start']):0;
+ $order = !empty($_REQUEST['order'])?$_REQUEST['order']:'DESC';
+ $sort = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'start';
+ $filter = !empty($_REQUEST['filter'])?''.$_REQUEST['filter'].'':'1,1';
+ $id = !empty($_REQUEST['id'])?(is_array($_REQUEST['id'])?array_unique($_REQUEST['id']):intval($_REQUEST['id'])):0;
+
+
+?>
\ No newline at end of file
Added: XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/index.html
===================================================================
--- XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/index.html (rev 0)
+++ XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/index.html 2012-07-27 14:35:55 UTC (rev 9929)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/log.php
===================================================================
--- XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/log.php (rev 0)
+++ XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/log.php 2012-07-27 14:35:55 UTC (rev 9929)
@@ -0,0 +1,109 @@
+<?php
+// $Id: category.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 //
+// ------------------------------------------------------------------------- //
+include 'header.php';
+xoops_cp_header();
+$indexAdmin = new ModuleAdmin();
+
+echo $indexAdmin->addNavigation('log.php');
+
+$op = isset($_REQUEST['op']) ? $_REQUEST['op'] : 'log';
+$fct = isset($_REQUEST['fct']) ? $_REQUEST['fct'] : 'list';
+
+switch($op) {
+case "log":
+ switch ($fct)
+ {
+ default:
+ case "list":
+
+ include_once $GLOBALS['xoops']->path( "/class/pagenav.php" );
+
+ $log_handler =& xoops_getmodulehandler('log', 'iplog');
+
+ $criteria = new Criteria(1,1);
+ $ttl = $log_handler->getCount($criteria);
+ $sort = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'start';
+
+ $pagenav = new XoopsPageNav($ttl, $limit, $start, 'start', 'limit='.$limit.'&sort='.$sort.'&order='.$order.'&op='.$op.'&fct='.$fct.'&filter='.$filter.'&fct='.$fct.'&filter='.$filter);
+ $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
+
+ foreach ($log_handler->getFields() as $id => $key) {
+ $GLOBALS['xoopsTpl']->assign(strtolower(str_replace('-','_',$key).'_th'), '<a href="'.$_SERVER['PHP_SELF'].'?start='.$start.'&limit='.$limit.'&sort='.str_replace('_','-',$key).'&order='.((str_replace('_','-',$key)==$sort)?($order=='DESC'?'ASC':'DESC'):$order).'&op='.$op.'&filter='.$filter.'">'.(defined('_AM_IPLOG_TH_'.strtoupper(str_replace('-','_',$key)))?constant('_AM_IPLOG_TH_'.strtoupper(str_replace('-','_',$key))):'_AM_IPLOG_TH_'.strtoupper(str_replace('-','_',$key))).'</a>');
+ }
+
+ $GLOBALS['xoopsTpl']->assign('limit', $limit);
+ $GLOBALS['xoopsTpl']->assign('start', $start);
+ $GLOBALS['xoopsTpl']->assign('order', $order);
+ $GLOBALS['xoopsTpl']->assign('sort', $sort);
+ $GLOBALS['xoopsTpl']->assign('filter', $filter);
+ $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['xoopsModuleConfig']);
+
+ $criteria->setStart($start);
+ $criteria->setLimit($limit);
+ $criteria->setSort('`'.$sort.'`');
+ $criteria->setOrder($order);
+
+ $logs = $log_handler->getObjects($criteria, true);
+ foreach($logs as $cid => $log) {
+ if (!is_object($log))
+ $log_handler->delete($cid);
+ else
+ $GLOBALS['xoopsTpl']->append('log', $log->toArray());
+ }
+ $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']);
+ $GLOBALS['xoopsTpl']->display('db:iplog_log_list.html');
+ break;
+
+
+ case "delete":
+
+ $log_handler =& xoops_getmodulehandler('log', 'iplog');
+
+ if (isset($_POST['id'])&&$id!=0) {
+ $log = $log_handler->get($id);
+ if (!$log_handler->delete($log)) {
+ redirect_header('index.php?op='.$op.'&fct=list&limit='.$limit.'&start='.$start.'&order='.$order.'&sort='.$sort.'&filter='.$filter, 10, _AM_MSG_LOG_FAILEDTODELETE);
+ exit(0);
+ } else {
+ redirect_header('index.php?op='.$op.'&fct=list&limit='.$limit.'&start='.$start.'&order='.$order.'&sort='.$sort.'&filter='.$filter, 10, _AM_MSG_LOG_DELETED);
+ exit(0);
+ }
+ } else {
+ $log = $log_handler->get($id);
+ xoops_confirm(array('id'=>$id, 'op'=>$_REQUEST['op'], 'fct'=>$_REQUEST['fct'], 'limit'=>$_REQUEST['limit'], 'start'=>$_REQUEST['start'], 'order'=>$_REQUEST['order'], 'sort'=>$_REQUEST['sort'], 'filter'=>$_REQUEST['filter']), 'index.php', sprintf(_AM_MSG_LOG_DELETE, $log->getVar('name')));
+ }
+ break;
+ }
+ break;
+}
+
+include(dirname(__FILE__).'/footer.php');
+?>
\ No newline at end of file
Added: XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/menu.php
===================================================================
--- XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/menu.php (rev 0)
+++ XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/menu.php 2012-07-27 14:35:55 UTC (rev 9929)
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Extended User iplog
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package iplog
+ * @since 2.3.0
+ * @author Jan Pedersen
+ * @author Taiwen Jiang <ph...@us...>
+ * @version $Id: menu.php 2021 2008-08-31 02:02:45Z phppp $
+ */
+$module_handler = xoops_gethandler('module');
+$GLOBALS['iplogModule'] = $module_handler->getByDirname('iplog');
+$adminmenu = array();
+if (is_object($GLOBALS['iplogModule'])) {
+ $adminmenu[0]['title'] = _MI_IPLOG_DASHBOARD;
+ $adminmenu[0]['icon'] = '../../'.$GLOBALS['iplogModule']->getInfo('icons32').'/about.png';
+ $adminmenu[0]['image'] = '../../'.$GLOBALS['iplogModule']->getInfo('icons32').'/about.png';
+ $adminmenu[0]['link'] = "admin/dashboard.php";
+ $adminmenu[1]['title'] = _MI_IPLOG_LOG;
+ $adminmenu[1]['icon'] = '../../'.$GLOBALS['iplogModule']->getInfo('icons32').'/iplog.log.png';
+ $adminmenu[1]['image'] = '../../'.$GLOBALS['iplogModule']->getInfo('icons32').'/iplog.log.png';
+ $adminmenu[1]['link'] = "admin/log.php";
+ $adminmenu[2]['title'] = _MI_IPLOG_ABOUT;
+ $adminmenu[2]['icon'] = '../../'.$GLOBALS['iplogModule']->getInfo('icons32').'/about.png';
+ $adminmenu[2]['image'] = '../../'.$GLOBALS['iplogModule']->getInfo('icons32').'/about.png';
+ $adminmenu[2]['link'] = "admin/about.php";
+}
+?>
\ No newline at end of file
Added: XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/class/countries.php
===================================================================
--- XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/class/countries.php (rev 0)
+++ XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/class/countries.php 2012-07-27 14:35:55 UTC (rev 9929)
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Extended User Iplog
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package Iplog
+ * @since 2.3.0
+ * @author Jan Pedersen
+ * @author Taiwen Jiang <ph...@us...>
+ * @version $Id: Countries.php 4361 2010-02-09 23:36:33Z trabis $
+ */
+
+defined('XOOPS_ROOT_PATH') or die("XOOPS root path not defined");
+
+/**
+ * @package kernel
+ * @copyright copyright © 2000 XOOPS.org
+ */
+class IplogCountries extends XoopsObject
+{
+ function __construct()
+ {
+ $this->initVar('country_id', XOBJ_DTYPE_INT, null, true);
+ $this->initVar('code', XOBJ_DTYPE_TXTBOX);
+ $this->initVar('name', XOBJ_DTYPE_TXTBOX);
+ $this->initVar('dialcode', XOBJ_DTYPE_TXTBOX);
+ $this->initVar('tldexists', XOBJ_DTYPE_TXTBOX);
+ $this->initVar('tld', XOBJ_DTYPE_TXTBOX);
+ $this->initVar('startgmt', XOBJ_DTYPE_DECIMAL);
+ $this->initVar('endgmt', XOBJ_DTYPE_DECIMAL);
+ $this->initVar('region', XOBJ_DTYPE_ENUM, false, false, false, false, array('Antarctica','Australasia','Caribbean','Central Africa','Central America','Central Asia','Eastern Africa','Eastern Asia','Eastern Europe','Middle East','North America','Northern Africa','Northern Asia','Northern Europe','South America','Southeastern Asia','Southeastern Europe','Southern Africa','Southern Asia','Southern Europe','Southwestern Asia','United States','Western Africa','Western Europe','Other'));
+ $this->initVar('continent', XOBJ_DTYPE_ENUM, false, false, false, false, array('Africa','Asia','Europe','North America','South America','Oceania','Other'));
+ $this->initVar('daylightsaving', XOBJ_DTYPE_ENUM, false, false, false, false, array('Yes','No'));
+ $this->initVar('start_dls_day', XOBJ_DTYPE_ENUM, false, false, false, false, array('Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday'));
+ $this->initVar('start_dls_week', XOBJ_DTYPE_ENUM, false, false, false, false, array('1st','2nd','3rd','4th'));
+ $this->initVar('start_dls_month', XOBJ_DTYPE_ENUM, false, false, false, false, array('January','Febuary','March','April','May','June','July','August','September','October','November','December'));
+ $this->initVar('start_dls_dayno', XOBJ_DTYPE_INT);
+ $this->initVar('start_dls_mode', XOBJ_DTYPE_ENUM, false, false, false, false, array('day','dayno'));
+ $this->initVar('end_dls_day', XOBJ_DTYPE_ENUM, false, false, false, false, array('Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday'));
+ $this->initVar('end_dls_week', XOBJ_DTYPE_ENUM, false, false, false, false, array('1st','2nd','3rd','4th'));
+ $this->initVar('end_dls_month', XOBJ_DTYPE_ENUM, false, false, false, false, array('January','Febuary','March','April','May','June','July','August','September','October','November','December'));
+ $this->initVar('end_dls_dayno', XOBJ_DTYPE_INT);
+ $this->initVar('end_dls_mode', XOBJ_DTYPE_ENUM, false, false, false, false, array('day','dayno'));
+
+ $this->initVar('cat_weight', XOBJ_DTYPE_INT);
+ }
+
+}
+
+/**
+ * @package kernel
+ * @copyright copyright © 2000 XOOPS.org
+ */
+class IplogCountriesHandler extends XoopsPersistableObjectHandler
+{
+ function IplogCountriesHandler(&$db)
+ {
+ $this->__construct($db);
+ }
+
+ function __construct(&$db)
+ {
+ parent::__construct($db, "iplog_countries", "IplogCountries", "country_id", 'name');
+ }
+
+ function getIDByCode($code, $as_id = true) {
+ if ($this->getCount(new Criteria('code', strtoupper($code)))) {
+ $objs = $this->getObjects(new Criteria('code', strtoupper($code)), false);
+ if (is_object($objs[0])) {
+ if ($as_id==true)
+ return $objs[0]->getVar('country_id');
+ else
+ return $objs[0];
+ }
+ }
+ return false;
+ }
+}
+?>
\ No newline at end of file
Added: XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/class/index.html
===================================================================
--- XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/class/index.html (rev 0)
+++ XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/class/index.html 2012-07-27 14:35:55 UTC (rev 9929)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/class/log.php
===================================================================
--- XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/class/log.php (rev 0)
+++ XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/class/log.php 2012-07-27 14:35:55 UTC (rev 9929)
@@ -0,0 +1,398 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) {
+ exit();
+}
+
+require_once(dirname(dirname(__FILE__)).'/include/ip2locationlite.class.php');
+/**
+ * Class for Iplog Profiler
+ * @author Simon Roberts (si...@ch...)
+ * @copyright copyright (c) 2000-2009 XOOPS.org
+ * @package kernel
+ */
+class IplogLog extends XoopsObject
+{
+
+ function IplogLog($fid = null)
+ {
+ $this->initVar('ip_id', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('uid', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('agent', XOBJ_DTYPE_TXTBOX, null, false, 255);
+ $this->initVar('uname', XOBJ_DTYPE_TXTBOX, null, false, 32);
+ $this->initVar('ip4', XOBJ_DTYPE_TXTBOX, null, false, 255);
+ $this->initVar('ip6', XOBJ_DTYPE_TXTBOX, null, false, 65535);
+ $this->initVar('long', XOBJ_DTYPE_TXTBOX, null, false, 120);
+ $this->initVar('network-addy', XOBJ_DTYPE_TXTBOX, null, false, 255);
+ $this->initVar('country_id', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('country-code', XOBJ_DTYPE_TXTBOX, null, false, 3);
+ $this->initVar('country-name', XOBJ_DTYPE_TXTBOX, null, false, 128);
+ $this->initVar('region-name', XOBJ_DTYPE_TXTBOX, null, false, 128);
+ $this->initVar('city-name', XOBJ_DTYPE_TXTBOX, null, false, 128);
+ $this->initVar('postcode', XOBJ_DTYPE_TXTBOX, null, false, 15);
+ $this->initVar('latitude', XOBJ_DTYPE_DECIMAL, null, false);
+ $this->initVar('longitude', XOBJ_DTYPE_DECIMAL, null, false);
+ $this->initVar('time-zone', XOBJ_DTYPE_TXTBOX, null, false, 6);
+ $this->initVar('proxy-ip4', XOBJ_DTYPE_TXTBOX, null, false, 255);
+ $this->initVar('proxy-ip6', XOBJ_DTYPE_TXTBOX, null, false, 65535);
+ $this->initVar('proxy-long', XOBJ_DTYPE_TXTBOX, null, false, 65535);
+ $this->initVar('proxy-network-addy', XOBJ_DTYPE_TXTBOX, null, false, 65535);
+ $this->initVar('proxy-country_id', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('proxy-country-code', XOBJ_DTYPE_TXTBOX, null, false, 3);
+ $this->initVar('proxy-country-name', XOBJ_DTYPE_TXTBOX, null, false, 128);
+ $this->initVar('proxy-region-name', XOBJ_DTYPE_TXTBOX, null, false, 128);
+ $this->initVar('proxy-city-name', XOBJ_DTYPE_TXTBOX, null, false, 128);
+ $this->initVar('proxy-postcode', XOBJ_DTYPE_TXTBOX, null, false, 15);
+ $this->initVar('proxy-latitude', XOBJ_DTYPE_DECIMAL, null, false);
+ $this->initVar('proxy-longitude', XOBJ_DTYPE_DECIMAL, null, false);
+ $this->initVar('proxy-time-zone', XOBJ_DTYPE_TXTBOX, null, false, 6);
+ $this->initVar('session_id', XOBJ_DTYPE_TXTBOX, null, false, 128);
+ $this->initVar('start', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('end', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('online', XOBJ_DTYPE_INT, null, false);
+ }
+
+ function toArray() {
+ $ret = parent::toArray();
+ $ret['made'] = date(_DATESTRING, $this->getVar('made'));
+ $countries_handler = xoops_getmodulehandler('countries', 'iplog');
+ $country = $countries_handler->get($this->getVar('country_id'));
+ if (is_object($country))
+ $ret['country'] = $country->toArray();
+ $comment_handler = xoops_gethandler('comment');
+ $module_handler = xoops_gethandler('module');
+ $GLOBALS['moduleIplog'] = $module_handler->getByDirname('iplog');
+ $criteria = new CriteriaCompo(new Criteria('com_itemid', $this->getVar('member_id')));
+ $criteria->add(new Criteria('com_modid', $GLOBALS['moduleIplog']->getVar('mid')));
+ $comments = $comment_handler->getObjects($criteria, true);
+ if (count($comments)>0) {
+ foreach($comments as $com_id => $comment);
+ $ret['comments'][$com_id] = $comment->toArray();
+ }
+ foreach($ret as $key => $value) {
+ if (is_array($value)) {
+ foreach ($value as $keyb => $valueb) {
+ unset($value[$keyb]);
+ $value[str_replace('-', '_', $keyb)] = $valueb;
+ }
+ }
+ unset($ret[$key]);
+ $ret[str_replace('-', '_', $key)] = $value;
+ }
+ $ret['ip'] = $this->getIPAddy().' ('.$this->getIPType().')';
+ $ret['proxy_ip'] = $this->getProxyIPAddy();
+ $ret['start'] = date(_DATESTRING,$ret['start']);
+ $ret['end'] = date(_DATESTRING,$ret['end']);
+ if ($ret['uid']==0)
+ $ret['uname'] = _MI_IPLOG_GUEST;
+ else
+ $ret['uname'] = '<a href="'.XOOPS_URL.'/userinfo.php?uid='.$ret['uid'].'">'.$ret['uname'].'</a>';
+ return $ret;
+
+ }
+
+ function setIPAddy($ip) {
+ if ($this->validateIPv4($ip))
+ $this->setVar('ip4', $ip);
+ elseif ($this->validateIPv6($ip))
+ $this->setVar('ip6', $ip);
+ elseif (strpos($ip,'.')>0&&count(explode('.', $ip))==4)
+ $this->setVar('ip4', $ip);
+ elseif (strpos($ip,':')>0&&count(explode(':', $ip))>=5)
+ $this->setVar('ip6', $ip);
+ }
+
+ function setProxyIPAddy($ip) {
+ if ($this->validateIPv4($ip))
+ $this->setVar('proxy-ip4', $ip);
+ elseif ($this->validateIPv6($ip))
+ $this->setVar('proxy-ip6', $ip);
+ }
+
+ function getIPAddy() {
+ if (strlen($this->getVar('ip4'))>0)
+ return $this->getVar('ip4');
+ elseif (strlen($this->getVar('ip6'))>0)
+ return $this->getVar('ip6');
+ return false;
+ }
+
+ function getProxyIPAddy() {
+ if (strlen($this->getVar('proxy-ip4'))>0)
+ return $this->getVar('proxy-ip4');
+ elseif (strlen($this->getVar('proxy-ip6'))>0)
+ return $this->getVar('proxy-ip6');
+ return false;
+ }
+
+ function getIPType() {
+ if (strlen($this->getVar('ip4'))>0)
+ return _MI_IPLOG_IPV4;
+ elseif (strlen($this->getVar('ip6'))>0)
+ return _MI_IPLOG_IPV6;
+ }
+
+ private function validateIPv4($ip) {
+ if(filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE) === FALSE) // returns IP is valid
+ {
+ return false;
+ } else {
+ return true;
+ }
+ }
+
+ private function validateIPv6($ip) {
+ if(filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) === FALSE) // returns IP is valid
+ {
+ return false;
+ } else {
+ return true;
+ }
+ }
+
+}
+
+
+/**
+* XOOPS Iplog Profiler handler class.
+* This class is responsible for providing data access mechanisms to the data source
+* of XOOPS user class objects.
+*
+* @author Simon Roberts <si...@ch...>
+* @package kernel
+*/
+class IplogLogHandler extends XoopsPersistableObjectHandler
+{
+ function __construct(&$db)
+ {
+ parent::__construct($db, "iplog_log", 'IplogLog', "ip_id", "session_id");
+ }
+
+ function getFields() {
+ return array('ip_id', 'uname', 'ip', 'country_code', 'name', 'region', 'contient', 'network_addy', 'useragent', 'proxy_ip', 'start', 'end', 'online');
+ }
+
+ function writeLog($data) {
+ $obj = $this->create();
+ $obj->setVars($data);
+ $obj->setIPAddy($data['ip']);
+ if ($data['proxied'])
+ $obj->setProxyIPAddy($data['proxy-ip']);
+ return $this->insert($obj, true);
+ }
+
+ function insert($obj, $force = true) {
+ xoops_load('cache');
+ $ping = XoopsCache::read('iplog_ip_ping_unixtimes');
+ if (!is_array($ping)==true) {
+ $ping=array($obj->getIPAddy()=>microtime(true));
+ $oldping=microtime(true);
+ } else {
+ if (time()-$ping[$obj->getIPAddy()]>$GLOBALS['xoopsConfig']['session_expire']*60) {
+ $pingnew = true;
+ } else {
+ $pingnew = false;
+ }
+ $oldping=$ping[$obj->getIPAddy()];
+ $ping[$obj->getIPAddy()]=microtime(true);
+ }
+ XoopsCache::write('iplog_ip_ping_unixtimes', $ping, 60*60*24*7*4);
+
+ if ($this->getCount(new Criteria('session_id', session_id())&&is_object($GLOBALS['xoopsUser']))&&$pingnew!=true) {
+ $criteria = new Criteria('session_id', session_id());
+ $criteria->setSort('`ip_id`');
+ $criteria->setOrder('DESC');
+ $criteria->setLimit(1);
+ $objs = $this->getObjects($criteria, false);
+ if (is_object($objs[0])) {
+ $obj = $objs[0];
+ $obj->setVar('end', $ping[$obj->getIPAddy()]);
+ $obj->setVar('online', $obj->getVar('end')-$obj->getVar('start'));
+ }
+ } elseif (!is_object($GLOBALS['xoopsUser'])&&$GLOBALS['iplogModuleConfig']['anonymous']&&$pingnew!=true) {
+ if ($obj->getIPType()==_MI_IPLOG_IPV4) {
+ $criteria = new Criteria('ip4', $obj->getIPAddy());
+ $criteria->setSort('`ip_id`');
+ $criteria->setOrder('DESC');
+ $criteria->setLimit(1);
+ $objs = $this->getObjects($criteria, false);
+ } elseif ($obj->getIPType()==_MI_IPLOG_IPV6) {
+ $criteria = new Criteria('ip6', $obj->getIPAddy());
+ $criteria->setSort('`ip_id`');
+ $criteria->setOrder('DESC');
+ $criteria->setLimit(1);
+ $objs = $this->getObjects($criteria, false);
+ }
+ if (is_object($objs[0])) {
+ $obj = $objs[0];
+ $obj->setVar('end', $ping[$obj->getIPAddy()]);
+ $obj->setVar('online', $obj->getVar('end')-$obj->getVar('start'));
+ }
+ }
+ if ($obj->isNew()) {
+
+ $obj->setVar('session_id', session_id());
+ $obj->setVar('start', $ping[$obj->getIPAddy()]);
+ $obj->setVar('end', $ping[$obj->getIPAddy()]);
+
+ if (strlen($obj->getVar('ip4'))<>0) {
+ if (strlen($obj->getVar('ip4'))<7) {
+ return false;
+ } elseif (substr($obj->getVar('ip4'), strlen($obj->getVar('ip4'))-1, 1) == '.') {
+ return false;
+ } else {
+ $count = count(explode('.', $obj->getVar('ip4')));
+ if ($count!=4)
+ return false;
+ }
+ } elseif (strlen($obj->getVar('ip6'))<>0) {
+ if (strlen($obj->getVar('ip6'))<15) {
+ return false;
+ } elseif (substr($obj->getVar('ip6'), strlen($obj->getVar('ip6'))-1, 1) == ':') {
+ return false;
+ } else {
+ $count = count(explode(':',$obj->getVar('ip6')));
+ if ($count<5)
+ return false;
+ }
+ }
+
+ if (strlen($obj->getVar('long'))==0)
+ $obj->setVar('long', @ip2long($obj->getIPAddy()));
+
+ if (strlen($obj->getVar('network-addy'))<strlen(strlen($obj->getIPAddy())))
+ $obj->setVar('network-addy', @gethostbyaddr($obj->getIPAddy()));
+
+ $ipLite = new ip2location_lite;
+ $ipLite->setKey($GLOBALS['iplogModuleConfig']['ipinfodb_key']);
+ //Get errors and locations
+ $locations = $ipLite->getCity($obj->getIPAddy());
+ $countries_handler = xoops_getmodulehandler('countries', 'iplog');
+ $obj->setVar('country_id', $countries_handler->getIDByCode(strtoupper($locations['countryCode'])));
+ $obj->setVar('country-code', strtoupper($locations['countryCode']));
+ $obj->setVar('country-name', ucfirst($locations['countryName']));
+ $obj->setVar('region-name', ucfirst($locations['regionName']));
+ $obj->setVar('city-name', ucfirst($locations['cityName']));
+ $obj->setVar('postcode', $locations['zipCode']);
+ $obj->setVar('latitude', $locations['latitude']);
+ $obj->setVar('longitude', $locations['longitude']);
+ $obj->setVar('time-zone', $locations['timeZone']);
+
+ if ($obj->getProxyIPAddy()!=false) {
+ if (strlen($obj->getVar('proxy-long'))==0)
+ $obj->setVar('proxy-long', @ip2long($obj->getProxyIPAddy()));
+
+ if (strlen($obj->getVar('proxy-network-addy'))<strlen(strlen($obj->getProxyIPAddy())))
+ $obj->setVar('proxy-network-addy', @gethostbyaddr($obj->getProxyIPAddy()));
+
+ $locations = $ipLite->getCity($obj->getProxyIPAddy());
+ $countries_handler = xoops_getmodulehandler('countries', 'iplog');
+ $obj->setVar('proxy-country_id', $countries_handler->getIDByCode(strtoupper($locations['countryCode'])));
+ $obj->setVar('proxy-country-code', strtoupper($locations['countryCode']));
+ $obj->setVar('proxy-country-name', ucfirst($locations['countryName']));
+ $obj->setVar('proxy-region-name', ucfirst($locations['regionName']));
+ $obj->setVar('proxy-city-name', ucfirst($locations['cityName']));
+ $obj->setVar('proxy-postcode', $locations['zipCode']);
+ $obj->setVar('proxy-latitude', $locations['latitude']);
+ $obj->setVar('proxy-longitude', $locations['longitude']);
+ $obj->setVar('proxy-time-zone', $locations['timeZone']);
+ }
+ }
+
+ $ret = parent::insert($obj, $force);
+ $this->deleteAll(new Criteria('end', time() - $GLOBALS['iplogModuleConfig']['logdrops'], '<='));
+ return $ret;
+
+ }
+
+ function getNumberByCountry() {
+ $sql = 'SELECT DISTINCT `country-name` as node, count(*) as total FROM `'.$this->table.'`';
+ $result = $GLOBALS['xoopsDB']->queryF($sql);
+ $ret = array();
+ while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
+ $ret[] = $row;
+ }
+ return $ret;
+ }
+
+ function getNumberByRegion() {
+ $sql = 'SELECT DISTINCT `b`.`region` as node, count(*) as total FROM `'.$this->table.'` a INNER JOIN `'.$GLOBALS['xoopsDB']->prefix('iplog_countries').'` b ON a.country_id = b.country_id';
+ $result = $GLOBALS['xoopsDB']->queryF($sql);
+ $ret = array();
+ while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
+ $ret[] = $row;
+ }
+ return $ret;
+ }
+
+ function getNumberByContinent() {
+ $sql = 'SELECT DISTINCT `b`.`continent` as node, count(*) as total FROM `'.$this->table.'` a INNER JOIN `'.$GLOBALS['xoopsDB']->prefix('iplog_countries').'` b ON a.country_id = b.country_id';
+ $result = $GLOBALS['xoopsDB']->queryF($sql);
+ $ret = array();
+ while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
+ $ret[] = $row;
+ }
+ return $ret;
+ }
+
+ function getTotalSecondsByCountry() {
+ $sql = 'SELECT DISTINCT `country-name` as node, sum(`online`)/60 as total FROM `'.$this->table.'`';
+ $result = $GLOBALS['xoopsDB']->queryF($sql);
+ $ret = array();
+ while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
+ $ret[] = $row;
+ }
+ return $ret;
+ }
+
+ function getTotalSecondsByRegion() {
+ $sql = 'SELECT DISTINCT `b`.`region` as node, sum(`online`)/60 as total FROM `'.$this->table.'` a INNER JOIN `'.$GLOBALS['xoopsDB']->prefix('iplog_countries').'` b ON a.country_id = b.country_id';;
+ $result = $GLOBALS['xoopsDB']->queryF($sql);
+ $ret = array();
+ while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
+ $ret[] = $row;
+ }
+ return $ret;
+ }
+
+ function getTotalSecondsByContinent() {
+ $sql = 'SELECT DISTINCT `b`.`continent` as node, sum(`online`)/60 as total FROM `'.$this->table.'` a INNER JOIN `'.$GLOBALS['xoopsDB']->prefix('iplog_countries').'` b ON a.country_id = b.country_id';;
+ $result = $GLOBALS['xoopsDB']->queryF($sql);
+ $ret = array();
+ while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
+ $ret[] = $row;
+ }
+ return $ret;
+ }
+
+ function getAdverageSecondsByCountry() {
+ $sql = 'SELECT DISTINCT `country-name` as node, avg(`online`)/60 as total FROM `'.$this->table.'`';
+ $result = $GLOBALS['xoopsDB']->queryF($sql);
+ $ret = array();
+ while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
+ $ret[] = $row;
+ }
+ return $ret;
+ }
+
+ function getAdverageSecondsByRegion() {
+ $sql = 'SELECT DISTINCT `b`.`region` as node, avg(`online`)/60 as total FROM `'.$this->table.'` a INNER JOIN `'.$GLOBALS['xoopsDB']->prefix('iplog_countries').'` b ON a.country_id = b.country_id';;
+ $result = $GLOBALS['xoopsDB']->queryF($sql);
+ $ret = array();
+ while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
+ $ret[] = $row;
+ }
+ return $ret;
+ }
+
+ function getAdverageSecondsByContinent() {
+ $sql = 'SELECT DISTINCT `b`.`continent` as node, avg(`online`)/60 as total FROM `'.$this->table.'` a INNER JOIN `'.$GLOBALS['xoopsDB']->prefix('iplog_countries').'` b ON a.country_id = b.country_id';;
+ $result = $GLOBALS['xoopsDB']->queryF($sql);
+ $ret = array();
+ while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
+ $ret[] = $row;
+ }
+ return $ret;
+ }
+}
+?>
Added: XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/docs/changelog.txt
===================================================================
Added: XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/docs/credits.txt
===================================================================
--- XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/docs/credits.txt (rev 0)
+++ XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/docs/credits.txt 2012-07-27 14:35:55 UTC (rev 9929)
@@ -0,0 +1,4 @@
+Read Me First
+=============
+
+Please make sure that you download the XOOPS Icon Set, and upload it to uploads/images directory
\ No newline at end of file
Added: XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/docs/index.html
===================================================================
--- XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/docs/index.html (rev 0)
+++ XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/docs/index.html 2012-07-27 14:35:55 UTC (rev 9929)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/iplog/re...
[truncated message content] |
|
From: <lor...@us...> - 2012-07-27 09:58:19
|
Revision: 9928
http://xoops.svn.sourceforge.net/xoops/?rev=9928&view=rev
Author: lord_venom
Date: 2012-07-27 09:58:09 +0000 (Fri, 27 Jul 2012)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_stats.html
XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_summary.html
XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_user_info.html
Modified: XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_stats.html
===================================================================
--- XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_stats.html 2012-07-27 09:57:40 UTC (rev 9927)
+++ XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_stats.html 2012-07-27 09:58:09 UTC (rev 9928)
@@ -1,6 +1,6 @@
<{include file="db:TDMStats_index.html"}>
-<table cellpadding="0" cellspacing="0" style="border-collapse: separate; margin:5px;"><tr><td><ul id="tree_menu">
+<table cellpadding="0" cellspacing="0" style="border-collapse: separate;"><tr><td><ul id="tree_menu">
<li style="width:46%;" class="even"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/day.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('day')"><{$smarty.const._AM_BY_DAY}></h2></a>
<div style="text-align:left">
Modified: XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_summary.html
===================================================================
--- XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_summary.html 2012-07-27 09:57:40 UTC (rev 9927)
+++ XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_summary.html 2012-07-27 09:58:09 UTC (rev 9928)
@@ -1,6 +1,6 @@
<{include file="db:TDMStats_index.html"}>
-<table cellpadding="0" cellspacing="0" style="border-collapse: separate; margin:5px;"><tr><td><ul id="tree_menu">
+<table cellpadding="0" cellspacing="0" style="border-collapse: separate;"><tr><td><ul id="tree_menu">
<li style="width:46%;" class="even"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/resume.png" title="<{$smarty.const._AM_STATS_INFO}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('resum')"><{$smarty.const._AM_STATS_INFO}></h2></a>
<div style="text-align:left"><span id="tree_num"><{$lang_total_visits}> <b><{$total}></b></span><br />
Modified: XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_user_info.html
===================================================================
--- XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_user_info.html 2012-07-27 09:57:40 UTC (rev 9927)
+++ XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_user_info.html 2012-07-27 09:58:09 UTC (rev 9928)
@@ -1,6 +1,6 @@
<{include file="db:TDMStats_index.html"}>
-<table cellpadding="0" cellspacing="0" style="border-collapse: separate; margin:5px;"><tr><td><ul id="tree_menu">
+<table cellpadding="0" cellspacing="0" style="border-collapse: separate;"><tr><td><ul id="tree_menu">
<li style="width:46%;" class="even"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/bro.png" ><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('browser')"><{$smarty.const._AM_BY_BROWSER}></h2></a>
<div style="text-align:left">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2012-07-27 09:57:51
|
Revision: 9927
http://xoops.svn.sourceforge.net/xoops/?rev=9927&view=rev
Author: lord_venom
Date: 2012-07-27 09:57:40 +0000 (Fri, 27 Jul 2012)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php 2012-07-26 09:35:32 UTC (rev 9926)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php 2012-07-27 09:57:40 UTC (rev 9927)
@@ -237,7 +237,7 @@
Global $cat_display;
$ret = '<div style="text-align:right"><a href="javascript:;" onclick="javascript:masque(\'1\')" >+-</a></div>';
- $ret .= '<table cellpadding="0" id="masque_1" cellspacing="0" style="border-collapse: separate; margin:5px;"><tr><td><ul id="tree_menu">';
+ $ret .= '<table cellpadding="0" id="masque_1" cellspacing="0" style="border-collapse: separate;"><tr><td><ul id="tree_menu">';
$chcount = 1;
$GLOBALS['class'] = "odd";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2012-07-26 09:35:43
|
Revision: 9926
http://xoops.svn.sourceforge.net/xoops/?rev=9926&view=rev
Author: lord_venom
Date: 2012-07-26 09:35:32 +0000 (Thu, 26 Jul 2012)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/TDMStats/trunk/TDMStats/counter.php
XoopsModules/TDMStats/trunk/TDMStats/images/user.png
XoopsModules/TDMStats/trunk/TDMStats/include/function.php
XoopsModules/TDMStats/trunk/TDMStats/include/stats.php
XoopsModules/TDMStats/trunk/TDMStats/include/summary.php
XoopsModules/TDMStats/trunk/TDMStats/include/update.php
XoopsModules/TDMStats/trunk/TDMStats/language/french/main.php
XoopsModules/TDMStats/trunk/TDMStats/sql/mysql.sql
XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_summary.html
XoopsModules/TDMStats/trunk/TDMStats/xoops_version.php
Added Paths:
-----------
XoopsModules/TDMStats/trunk/TDMStats/sql/mysql1.2.sql
Modified: XoopsModules/TDMStats/trunk/TDMStats/counter.php
===================================================================
--- XoopsModules/TDMStats/trunk/TDMStats/counter.php 2012-07-25 23:41:27 UTC (rev 9925)
+++ XoopsModules/TDMStats/trunk/TDMStats/counter.php 2012-07-26 09:35:32 UTC (rev 9926)
@@ -36,6 +36,30 @@
} else {
$_SESSION['xoops_stats_expire'] = $time + $xoopsModuleConfig['maxsession'];
}
+
+
+///temp user
+if (!isset($_SESSION['tdmstats'])) {
+$_SESSION['tdmstats'] = true;
+$_SESSION['ip'] = $_SERVER['REMOTE_ADDR'];
+$_SESSION['start'] = time();
+} else {
+ $date = formatTimeStamp(time(), 'Y-m-d');
+ $ip = $_SERVER['REMOTE_ADDR'];
+ $userid = isset($_SESSION['xoopsUserId']) ? $_SESSION['xoopsUserId']: false;
+ $count = round((time() - $_SESSION['start']) / 60);
+ $check2 = getResult("SELECT * FROM ".XOOPS_DB_PREFIX."_TDMStats_usercount WHERE ip='$ip' AND date='$date'");
+ if ($check2) {
+ if($userid) {
+ mysql_query("UPDATE ".XOOPS_DB_PREFIX."_TDMStats_usercount SET userid='$userid', count=count+'$count' WHERE ip='$ip'");
+ }else {
+ mysql_query("UPDATE ".XOOPS_DB_PREFIX."_TDMStats_usercount SET count=count+'$count' WHERE ip='$ip'");
+ }
+ } else {
+ mysql_query("INSERT INTO ".XOOPS_DB_PREFIX."_TDMStats_usercount VALUES('', '$userid', '$ip', '$date', $count)");
+ }
+
+}
////////////
/**
* update page count
Modified: XoopsModules/TDMStats/trunk/TDMStats/images/user.png
===================================================================
(Binary files differ)
Modified: XoopsModules/TDMStats/trunk/TDMStats/include/function.php
===================================================================
--- XoopsModules/TDMStats/trunk/TDMStats/include/function.php 2012-07-25 23:41:27 UTC (rev 9925)
+++ XoopsModules/TDMStats/trunk/TDMStats/include/function.php 2012-07-26 09:35:32 UTC (rev 9926)
@@ -116,53 +116,6 @@
}
}
-
-function ShowDays() {
-
- $date = formatTimeStamp(time(), 'Y-m-d');
- $mth = array(1=>'31', 2=>'28', 3=>'31', 4=>'30', 5=>'31', 6=>'30', 7=>'31', 8=>'31', 9=>'30', 10=>'31', 11=>'30', 12=>'31');
-
- $date = explode("-", $date);
-
- if ($date[2] < 30) {
- $start_day = $date[2] + 1;
- if ($date[1] > 1) {
- $start_month = $date[1] - 1;
- $start_year = $date[0];
- } else {
- $start_month = 12;
- $start_year = $date[0] - 1;
- }
-
- $count = $start_day;
- $end_day = $mth[$start_month];
- $leap = $date[0] % 4;
- if ($start_month == 2 && $leap) {
- $end_day++;
- }
- $check_end = 0;
- while ($count <= $end_day) {
- $days[] = $start_year."-".$start_month."-".$count;
- $count++;
- $check_end++;
- }
-
- $new_day = 1;
- for ($i=$check_end; $i<=30; $i++) {
- $days[] = $date[0]."-".$date[1]."-".$new_day;
- $new_day++;
- }
- } else {
- for ($i=0; $i<$date[2]; $i++) {
- $new_day = 1;
- $new_day += $i;
- $days[] = $date[0]."-".$date[1]."-".$new_day;
- }
- }
-
- return $days;
-}
-
function CountAvg($item) {
global $xoopsDB;
Modified: XoopsModules/TDMStats/trunk/TDMStats/include/stats.php
===================================================================
--- XoopsModules/TDMStats/trunk/TDMStats/include/stats.php 2012-07-25 23:41:27 UTC (rev 9925)
+++ XoopsModules/TDMStats/trunk/TDMStats/include/stats.php 2012-07-26 09:35:32 UTC (rev 9926)
@@ -26,6 +26,11 @@
redirect_header( XOOPS_URL , 1 , _AM_QUERYNOPERM);
}
+//utile
+//strftime( "%H H %M mn %S s", 82.5 * 60 ) => '02 H 22 mn 30 s'
+//
+
+
setlocale(LC_ALL, $xoopsModuleConfig['setlocal'], $xoopsModuleConfig['setlocal2']);
$thisday = date("d");
$thismonth = date("m");
@@ -73,7 +78,6 @@
$day_info = getResult("select distinct day, count from ".$xoopsDB->prefix("TDMStats_mth_days")." order by day limit $mths");
$day_total = getResult("select SUM(count) AS sum from ".$xoopsDB->prefix("TDMStats_mth_days")."");
// $day_max = getResult("select max(count) as max from ".$xoopsDB->prefix("TDMStats_mth_days")." order by day");
- //$day_result = PrintStats($day_total[0]['sum'], $day_max[0]['max'], $day_info, $mths);
for($i=0; $i<$mths; $i++){
Modified: XoopsModules/TDMStats/trunk/TDMStats/include/summary.php
===================================================================
--- XoopsModules/TDMStats/trunk/TDMStats/include/summary.php 2012-07-25 23:41:27 UTC (rev 9925)
+++ XoopsModules/TDMStats/trunk/TDMStats/include/summary.php 2012-07-26 09:35:32 UTC (rev 9926)
@@ -91,7 +91,69 @@
}
$xoopsTpl->assign('lang_per_hour', _AM_PER_HOUR);
+
+ //peux servir
+ //$secondes = $totalsecondes % 60;
+ //$minutes = ($totalsecondes / 60) % 60;
+ //$heures = ($totalsecondes / (60 * 60));
+
+ //echo $totalsecondes."<br />";
+ //echo $heures."<br />";
+ //echo $minutes."<br />";
+ //echo $secondes."<br />";
+//
+///USERCOUNT////////////////////////
+
+//usercount item
+ $date = formatTimeStamp(time(), 'Y-m-d');
+ $user_info = getResult("select * from ".$xoopsDB->prefix("TDMStats_usercount")." where date='$date' order by count DESC LIMIT 3");
+ //$total_hour = getResult("select SUM(count) AS sum from ".$xoopsDB->prefix("TDMStats_today_hour")."");
+
+ if($user_info){
+ for($i=0; $i<sizeof($user_info); $i++){
+ if($user_info[$i]['count'] > 0) {
+ //echo $user_info[$i]['userid'];
+ $userid = !empty($user_info[$i]['userid']) ? XoopsUser::getUnameFromId($user_info[$i]['userid']) : substr($user_info[$i]['ip'],0,(6))."..";
+ //$count = $user_info[$i]['count'] ;
+ $count = gmstrftime( "%H H %M mn %S s", $user_info[$i]['count']);
+
+ $totalsecondes = $user_info[$i]['count'];
+
+ //$hour['hour'][] = $hour_info[$i]['hour'];
+ //$hour['percent'][] = round($hour_percent, '2');
+
+ $xoopsTpl->append('item_users', array('id' => 'hour'.$i, 'userid' => $userid, 'info' => $count));
+}
+ }
+
+ }
+ //
+ $user_info = getResult("select * from ".$xoopsDB->prefix("TDMStats_usercount")." where date='$date' order by count");
+ $user_total = getResult("select SUM(count) AS sum from ".$xoopsDB->prefix("TDMStats_usercount")."");
+
+ if($user_info){
+
+ for($i=0; $i<sizeof($user_info); $i++){
+ if($user_total[0]['sum'] > 0){
+ $user_percent = $user_info[$i]['count'] * 100 / $user_total[0]['sum'] ;
+ // 4*100/62,5 =6,4%
+ }else{
+ $user_percent = 0;
+ }
+
+ $userid = !empty($user_info[$i]['userid']) ? XoopsUser::getUnameFromId($user_info[$i]['userid']) : substr($user_info[$i]['ip'],0,(6))."..";
+ $count = gmstrftime( "%H H %M mn %S s", $user_info[$i]['count']);
+
+ if ($user_percent > 0) {
+ //$xoopsTpl->append('hours', array('id' => 'hour'.$i, 'hour' => $hour_info[$i]['hour'], 'info' => $hour_info[$i]['count'], 'percent' => round($hour_percent, '2')));
+ $xoopsTpl->append('users_map', array('id' => 'user'.$i, 'userid' => $userid, 'info' => $count, 'percent' => round($user_percent, '2')));
+
+ }
+ }
+
+ }
+///////////////////////////////////
$hour= array();
$cur_hour = formatTimeStamp(time(), 'H');
$date = formatTimeStamp(time(), 'Y-m-d');
Modified: XoopsModules/TDMStats/trunk/TDMStats/include/update.php
===================================================================
--- XoopsModules/TDMStats/trunk/TDMStats/include/update.php 2012-07-25 23:41:27 UTC (rev 9925)
+++ XoopsModules/TDMStats/trunk/TDMStats/include/update.php 2012-07-26 09:35:32 UTC (rev 9926)
@@ -31,11 +31,17 @@
function xoops_module_update_TDMStats(&$xoopsModule, $oldVersion = null) {
global $xoopsConfig, $xoopsDB, $xoopsUser, $xoopsModule;
+
+ echo $oldVersion;
if($oldVersion < 101) {
$xoopsDB->queryFromFile(XOOPS_ROOT_PATH."/modules/TDMStats/sql/mysql1.1.sql");
}
+ if($oldVersion < 109) {
+ $xoopsDB->queryFromFile(XOOPS_ROOT_PATH."/modules/TDMStats/sql/mysql1.2.sql");
+ }
+
return true;
}
Modified: XoopsModules/TDMStats/trunk/TDMStats/language/french/main.php
===================================================================
--- XoopsModules/TDMStats/trunk/TDMStats/language/french/main.php 2012-07-25 23:41:27 UTC (rev 9925)
+++ XoopsModules/TDMStats/trunk/TDMStats/language/french/main.php 2012-07-26 09:35:32 UTC (rev 9926)
@@ -133,4 +133,7 @@
//Version 1.6
define('_AM_VIEW', 'Afficher le tableau');
define('_AM_P_LE', 'Le');
+//version 1.7
+define('_AM_BY_USER', 'Utilisateurs');
+define('_AM_BY_TODAY_USER', 'Temps passé Aujourd\'hui');
?>
\ No newline at end of file
Modified: XoopsModules/TDMStats/trunk/TDMStats/sql/mysql.sql
===================================================================
--- XoopsModules/TDMStats/trunk/TDMStats/sql/mysql.sql 2012-07-25 23:41:27 UTC (rev 9925)
+++ XoopsModules/TDMStats/trunk/TDMStats/sql/mysql.sql 2012-07-26 09:35:32 UTC (rev 9926)
@@ -336,3 +336,14 @@
country varchar(100) not null,
count int(10) not null,
primary key(id));
+
+# --------------------------------------------------------
+# Table structure for table 'TDMStats_usercount'
+# --------------------------------------------------------
+create table TDMStats_usercount(
+id int(10) not null auto_increment,
+userid varchar(255) not null);
+ip varchar(255) not null);
+date date not null,
+count int(10) not null,
+primary key(id));
Added: XoopsModules/TDMStats/trunk/TDMStats/sql/mysql1.2.sql
===================================================================
--- XoopsModules/TDMStats/trunk/TDMStats/sql/mysql1.2.sql (rev 0)
+++ XoopsModules/TDMStats/trunk/TDMStats/sql/mysql1.2.sql 2012-07-26 09:35:32 UTC (rev 9926)
@@ -0,0 +1,15 @@
+#
+# PHP i-stats - MySQL schema
+#
+
+
+# --------------------------------------------------------
+# Table structure for table 'TDMStats_usercount'
+# --------------------------------------------------------
+create table TDMStats_usercount(
+id int(10) not null auto_increment,
+userid varchar(255) not null,
+ip varchar(255) not null,
+date date not null,
+count int(10) not null,
+primary key(id));
\ No newline at end of file
Modified: XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_summary.html
===================================================================
--- XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_summary.html 2012-07-25 23:41:27 UTC (rev 9925)
+++ XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_summary.html 2012-07-26 09:35:32 UTC (rev 9926)
@@ -178,5 +178,37 @@
</div></div>
<!--fin-->
+<li style="width:46%;" class="even"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/user.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('user')"><{$smarty.const._AM_BY_TODAY_USER}></h2></a>
+<div style="text-align:left">
+ <{foreach from=$item_users item=item}>
+ <span id="tree_num"><{$item.userid}>, <{$item.info}></span><br />
+ <{/foreach}>
+
+</div></div>
+<div id="tree_form"><a href="javascript:;" onclick="javascript:masque('user')" ><{$smarty.const._AM_VIEW}></a></div></li>
+
+<!-- tableau user -->
+<li id="masque_user" style="display: none;" class="even"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/user.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('pays')"><{$smarty.const._AM_BY_TODAY_USER}></h2></a>
+<div style="text-align:left">
+<div class="Tableau">
+ <p class="legende">
+ <span class="col1"><{$smarty.const._AM_BY_USER}></span>
+ <span class="col2"></span>
+ <span class="col3"><{$smarty.const._AM_DATE_VISITS}></span>
+ <span class="col4"><{$smarty.const._AM_DATE_PERCENT}></span>
+ </p>
+ <{foreach item=user_map from=$users_map}>
+ <p>
+ <span class="col1"><{$user_map.userid}></span>
+ <span class="col2"><img src="./images/bar/<{$img_bar}>" title="<{$user_map.percent}>%" alt="<{$user_map.percent}>%" width="<{$user_map.percent}>%" style="height:16px;" /></span>
+ <span class="col3"><{$user_map.info}></span>
+ <span class="col3"><{$user_map.percent}>%</span>
+ </p>
+ <{/foreach}>
+</div>
+
+</div></div>
+<!--fin-->
+
<br style="clear: both;" /></ul></td></tr></table><br />
\ No newline at end of file
Modified: XoopsModules/TDMStats/trunk/TDMStats/xoops_version.php
===================================================================
--- XoopsModules/TDMStats/trunk/TDMStats/xoops_version.php 2012-07-25 23:41:27 UTC (rev 9925)
+++ XoopsModules/TDMStats/trunk/TDMStats/xoops_version.php 2012-07-26 09:35:32 UTC (rev 9926)
@@ -97,6 +97,7 @@
$modversion['tables'][14] = "TDMStats_page";
$modversion['tables'][15] = "TDMStats_modules";
$modversion['tables'][16] = "TDMStats_pays";
+$modversion['tables'][17] = "TDMStats_usercount";
// Admin things
$modversion['hasAdmin'] = 1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-07-25 23:41:34
|
Revision: 9925
http://xoops.svn.sourceforge.net/xoops/?rev=9925&view=rev
Author: beckmi
Date: 2012-07-25 23:41:27 +0000 (Wed, 25 Jul 2012)
Log Message:
-----------
Replacing names of files
Modified Paths:
--------------
XoopsModules/xaddresses/trunk/xaddresses/admin/about.old.php
XoopsModules/xaddresses/trunk/xaddresses/admin/about.php
Modified: XoopsModules/xaddresses/trunk/xaddresses/admin/about.old.php
===================================================================
--- XoopsModules/xaddresses/trunk/xaddresses/admin/about.old.php 2012-07-25 22:16:16 UTC (rev 9924)
+++ XoopsModules/xaddresses/trunk/xaddresses/admin/about.old.php 2012-07-25 23:41:27 UTC (rev 9925)
@@ -1,34 +1,106 @@
-<?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 $
- * ****************************************************************************
- */
+<?php
+$currentFile = basename(__FILE__);
+include 'admin_header.php';
+$versionInfo =& $module_handler->get($GLOBALS['xoopsModule']->getVar('mid'));
-include "admin_header.php";
+// load classes
+
+// get/check parameters/post
+
+// render start here
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
+
+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;'>" . $GLOBALS['xoopsModule']->getVar('name'). "</legend>";
+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>" . _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;'>" . _AM_XADDRESSES_ABOUT_MODULEINFOS . "</legend>";
+echo "<div style='padding: 8px;'>";
+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;'>" . _AM_XADDRESSES_ABOUT_AUTHORINFOS . "</legend>";
+echo "<div style='padding: 8px;'>";
+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 />";
+
+// DONATE PAYPAL
+$donate = '<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+<input type="hidden" name="cmd" value="_s-xclick">
+<input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----MIIHVwYJKoZIhvcNAQcEoIIHSDCCB0QCAQExggEwMIIBLAIBADCBlDCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20CAQAwDQYJKoZIhvcNAQEBBQAEgYBkoWMtP1IHf29Ib6Hf1/sPXwvSVqdFP1CnCjMvV8TRMZpwXzIq9LZzGpMaowhsAaQSKz7DenW6LcoCuouWMHaek/dD1rfGMArEq8hrfHOgzGD3NttnhJyaJUUsZ9Bv2q9x9InedkXVwuOh0nUNKLxyWdt4Tt91qczYffcIlgXttzELMAkGBSsOAwIaBQAwgdQGCSqGSIb3DQEHATAUBggqhkiG9w0DBwQIBCIjuHY4x36AgbCOOWIyYuCfV/8J1vX3up22RKDQcos/WNi7VC/XRFyKwmCtDfpkSyfFlC/s0NYKnWSELfu/MztQAO7cQ4CCYUaSoa6g324Dyr3Or2L0gLeB9aG8V1YO3bVgnLLaNw45j+X3HRiF1QNZARpp5MBrYrVu98IBHQX61AgJJfdnioLDYzagEBIIyQariajQ6W+MSTJHSP+z0J2bb92SYh/bR7GGGkIPuMviJqH1snU0Eik6MKCCA4cwggODMIIC7KADAgECAgEAMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxFDASBgNVBAoTC1BheVBhbCBJbmMuMRMwEQYDVQQLFApsaXZlX2NlcnRzMREwDwYDVQQDFAhsaXZlX2FwaTEcMBoGCSqGSIb3DQEJARYNcmVAcGF5cGFsLmNvbTAeFw0wNDAyMTMxMDEzMTVaFw0zNTAyMTMxMDEzMTVaMIGOMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxFDASBgNVBAoTC1BheVBhbCBJbmMuMRMwEQYDVQQLFApsaXZlX2NlcnRzMREwDwYDVQQDFAhsaXZlX2FwaTEcMBoGCSqGSIb3DQEJARYNcmVAcGF5cGFsLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwUdO3fxEzEtcnI7ZKZL412XvZPugoni7i7D7prCe0AtaHTc97CYgm7NsAtJyxNLixmhLV8pyIEaiHXWAh8fPKW+R017+EmXrr9EaquPmsVvTywAAE1PMNOKqo2kl4Gxiz9zZqIajOm1fZGWcGS0f5JQ2kBqNbvbg2/Za+GJ/qwUCAwEAAaOB7jCB6zAdBgNVHQ4EFgQUlp98u8ZvF71ZP1LXChvsENZklGswgbsGA1UdIwSBszCBsIAUlp98u8ZvF71ZP1LXChvsENZklGuhgZSkgZEwgY4xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLUGF5UGFsIEluYy4xEzARBgNVBAsUCmxpdmVfY2VydHMxETAPBgNVBAMUCGxpdmVfYXBpMRwwGgYJKoZIhvcNAQkBFg1yZUBwYXlwYWwuY29tggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAgV86VpqAWuXvX6Oro4qJ1tYVIT5DgWpE692Ag422H7yRIr/9j/iKG4Thia/Oflx4TdL+IFJBAyPK9v6zZNZtBgPBynXb048hsP16l2vi0k5Q2JKiPDsEfBhGI+HnxLXEaUWAcVfCsQFvd2A1sxRr67ip5y2wwBelUecP3AjJ+YcxggGaMIIBlgIBATCBlDCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20CAQAwCQYFKw4DAhoFAKBdMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTExMDQxMzE1MDEwM1owIwYJKoZIhvcNAQkEMRYEFCWihdPs7xd/vj+wxUAsz8MvsZ4yMA0GCSqGSIb3DQEBAQUABIGAV+hTiFSTJVdOv6RKFIQqdl6QoF4a+hfKz7tY+4pu+7HEXIYDbXCrYveD8793fg/NUmQ4+js196eOTAvocFj30/LpkFRkt94P4d2uAMJwH6nUG8Rdzxmam3WogA8wQ8T8YHs2zBcPZjeGE79IUbeSSozlkdCEWUbxutDSS/ZOfjo=-----END PKCS7-----
+">
+<input type="image" src="https://www.paypalobjects.com/WEBSCR-640-20110401-1/en_US/GB/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online.">
+<img alt="" border="0" src="https://www.paypalobjects.com/WEBSCR-640-20110401-1/it_IT/i/scr/pixel.gif" width="1" height="1">
+</form>';
+echo "<div style='padding: 8px;'>";
+echo $donate;
+echo "</div>";
+
+echo "</fieldset>";
+echo "<br clear=\"all\" />";
+
+// get language 'description.html' file
+if (file_exists(XOOPS_ROOT_PATH . "/modules/" . $GLOBALS['xoopsModule']->getVar('dirname') . "/language/" . $xoopsConfig['language'] . "/description.html")) {
+ $file = XOOPS_ROOT_PATH . "/modules/" . $GLOBALS['xoopsModule']->getVar('dirname') . "/language/" . $xoopsConfig['language'] . "/description.html";
+} else {
+ $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;'>" . _AM_XADDRESSES_ABOUT_DESCRIPTION . "</legend>";
+ echo "<div style='padding: 8px;'>";
+ echo "<div>". implode('', file($file)) . "</div>";
+ echo "</div>";
+ echo "</fieldset>";
+ echo "<br clear=\"all\" />";
+}
+
+// get language 'changelog.txt' file
+if (file_exists(XOOPS_ROOT_PATH . "/modules/" . $GLOBALS['xoopsModule']->getVar('dirname') . "/language/" . $xoopsConfig['language'] . "/changelog.txt")) {
+ $file = XOOPS_ROOT_PATH . "/modules/" . $GLOBALS['xoopsModule']->getVar('dirname') . "/language/" . $xoopsConfig['language'] . "/changelog.txt";
+} else {
+ $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;'>" . _AM_XADDRESSES_ABOUT_CHANGELOG . "</legend>";
+ echo "<div style='padding: 8px;'>";
+ echo "<div>" . utf8_encode(implode('<br />', file($file))) . "</div>";
+ echo "</div>";
+ echo "</fieldset>";
+ echo "<br clear=\"all\" />";
+}
+
+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-25 22:16:16 UTC (rev 9924)
+++ XoopsModules/xaddresses/trunk/xaddresses/admin/about.php 2012-07-25 23:41:27 UTC (rev 9925)
@@ -1,106 +1,34 @@
-<?php
-$currentFile = basename(__FILE__);
-include 'admin_header.php';
-$versionInfo =& $module_handler->get($GLOBALS['xoopsModule']->getVar('mid'));
+<?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 $
+ * ****************************************************************************
+ */
-// load classes
-
-// get/check parameters/post
-
-// render start here
+include "admin_header.php";
xoops_cp_header();
-
-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;'>" . $GLOBALS['xoopsModule']->getVar('name'). "</legend>";
-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>" . _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;'>" . _AM_XADDRESSES_ABOUT_MODULEINFOS . "</legend>";
-echo "<div style='padding: 8px;'>";
-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;'>" . _AM_XADDRESSES_ABOUT_AUTHORINFOS . "</legend>";
-echo "<div style='padding: 8px;'>";
-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 />";
-
-// DONATE PAYPAL
-$donate = '<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
-<input type="hidden" name="cmd" value="_s-xclick">
-<input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----MIIHVwYJKoZIhvcNAQcEoIIHSDCCB0QCAQExggEwMIIBLAIBADCBlDCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20CAQAwDQYJKoZIhvcNAQEBBQAEgYBkoWMtP1IHf29Ib6Hf1/sPXwvSVqdFP1CnCjMvV8TRMZpwXzIq9LZzGpMaowhsAaQSKz7DenW6LcoCuouWMHaek/dD1rfGMArEq8hrfHOgzGD3NttnhJyaJUUsZ9Bv2q9x9InedkXVwuOh0nUNKLxyWdt4Tt91qczYffcIlgXttzELMAkGBSsOAwIaBQAwgdQGCSqGSIb3DQEHATAUBggqhkiG9w0DBwQIBCIjuHY4x36AgbCOOWIyYuCfV/8J1vX3up22RKDQcos/WNi7VC/XRFyKwmCtDfpkSyfFlC/s0NYKnWSELfu/MztQAO7cQ4CCYUaSoa6g324Dyr3Or2L0gLeB9aG8V1YO3bVgnLLaNw45j+X3HRiF1QNZARpp5MBrYrVu98IBHQX61AgJJfdnioLDYzagEBIIyQariajQ6W+MSTJHSP+z0J2bb92SYh/bR7GGGkIPuMviJqH1snU0Eik6MKCCA4cwggODMIIC7KADAgECAgEAMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxFDASBgNVBAoTC1BheVBhbCBJbmMuMRMwEQYDVQQLFApsaXZlX2NlcnRzMREwDwYDVQQDFAhsaXZlX2FwaTEcMBoGCSqGSIb3DQEJARYNcmVAcGF5cGFsLmNvbTAeFw0wNDAyMTMxMDEzMTVaFw0zNTAyMTMxMDEzMTVaMIGOMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxFDASBgNVBAoTC1BheVBhbCBJbmMuMRMwEQYDVQQLFApsaXZlX2NlcnRzMREwDwYDVQQDFAhsaXZlX2FwaTEcMBoGCSqGSIb3DQEJARYNcmVAcGF5cGFsLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwUdO3fxEzEtcnI7ZKZL412XvZPugoni7i7D7prCe0AtaHTc97CYgm7NsAtJyxNLixmhLV8pyIEaiHXWAh8fPKW+R017+EmXrr9EaquPmsVvTywAAE1PMNOKqo2kl4Gxiz9zZqIajOm1fZGWcGS0f5JQ2kBqNbvbg2/Za+GJ/qwUCAwEAAaOB7jCB6zAdBgNVHQ4EFgQUlp98u8ZvF71ZP1LXChvsENZklGswgbsGA1UdIwSBszCBsIAUlp98u8ZvF71ZP1LXChvsENZklGuhgZSkgZEwgY4xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLUGF5UGFsIEluYy4xEzARBgNVBAsUCmxpdmVfY2VydHMxETAPBgNVBAMUCGxpdmVfYXBpMRwwGgYJKoZIhvcNAQkBFg1yZUBwYXlwYWwuY29tggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAgV86VpqAWuXvX6Oro4qJ1tYVIT5DgWpE692Ag422H7yRIr/9j/iKG4Thia/Oflx4TdL+IFJBAyPK9v6zZNZtBgPBynXb048hsP16l2vi0k5Q2JKiPDsEfBhGI+HnxLXEaUWAcVfCsQFvd2A1sxRr67ip5y2wwBelUecP3AjJ+YcxggGaMIIBlgIBATCBlDCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20CAQAwCQYFKw4DAhoFAKBdMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTExMDQxMzE1MDEwM1owIwYJKoZIhvcNAQkEMRYEFCWihdPs7xd/vj+wxUAsz8MvsZ4yMA0GCSqGSIb3DQEBAQUABIGAV+hTiFSTJVdOv6RKFIQqdl6QoF4a+hfKz7tY+4pu+7HEXIYDbXCrYveD8793fg/NUmQ4+js196eOTAvocFj30/LpkFRkt94P4d2uAMJwH6nUG8Rdzxmam3WogA8wQ8T8YHs2zBcPZjeGE79IUbeSSozlkdCEWUbxutDSS/ZOfjo=-----END PKCS7-----
-">
-<input type="image" src="https://www.paypalobjects.com/WEBSCR-640-20110401-1/en_US/GB/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online.">
-<img alt="" border="0" src="https://www.paypalobjects.com/WEBSCR-640-20110401-1/it_IT/i/scr/pixel.gif" width="1" height="1">
-</form>';
-echo "<div style='padding: 8px;'>";
-echo $donate;
-echo "</div>";
-
-echo "</fieldset>";
-echo "<br clear=\"all\" />";
-
-// get language 'description.html' file
-if (file_exists(XOOPS_ROOT_PATH . "/modules/" . $GLOBALS['xoopsModule']->getVar('dirname') . "/language/" . $xoopsConfig['language'] . "/description.html")) {
- $file = XOOPS_ROOT_PATH . "/modules/" . $GLOBALS['xoopsModule']->getVar('dirname') . "/language/" . $xoopsConfig['language'] . "/description.html";
-} else {
- $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;'>" . _AM_XADDRESSES_ABOUT_DESCRIPTION . "</legend>";
- echo "<div style='padding: 8px;'>";
- echo "<div>". implode('', file($file)) . "</div>";
- echo "</div>";
- echo "</fieldset>";
- echo "<br clear=\"all\" />";
-}
-
-// get language 'changelog.txt' file
-if (file_exists(XOOPS_ROOT_PATH . "/modules/" . $GLOBALS['xoopsModule']->getVar('dirname') . "/language/" . $xoopsConfig['language'] . "/changelog.txt")) {
- $file = XOOPS_ROOT_PATH . "/modules/" . $GLOBALS['xoopsModule']->getVar('dirname') . "/language/" . $xoopsConfig['language'] . "/changelog.txt";
-} else {
- $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;'>" . _AM_XADDRESSES_ABOUT_CHANGELOG . "</legend>";
- echo "<div style='padding: 8px;'>";
- echo "<div>" . utf8_encode(implode('<br />', file($file))) . "</div>";
- echo "</div>";
- echo "</fieldset>";
- echo "<br clear=\"all\" />";
-}
-
-include "admin_footer.php";
-?>
\ No newline at end of file
+$aboutAdmin = new ModuleAdmin();
+echo $aboutAdmin->addNavigation("about.php");
+echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false);
+include "admin_footer.php";
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-07-24 22:09:40
|
Revision: 9923
http://xoops.svn.sourceforge.net/xoops/?rev=9923&view=rev
Author: beckmi
Date: 2012-07-24 22:09:33 +0000 (Tue, 24 Jul 2012)
Log Message:
-----------
Fixing Total price calculations
Modified Paths:
--------------
XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_reductions.php
XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_admin_discounts.html
Modified: XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_reductions.php
===================================================================
--- XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_reductions.php 2012-07-24 22:00:17 UTC (rev 9922)
+++ XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_reductions.php 2012-07-24 22:09:33 UTC (rev 9923)
@@ -707,7 +707,7 @@
$xoopsTpl->assign('totalEcotaxe', $totalEcotaxe);
$vatAmount = $totalVAT;
- $commandAmountTTC = $totalHT + $totalVAT + $totalShipping + $totalEcotaxe;
+ $commandAmountTTC = $discountAmount + $totalVAT + $totalShipping + $totalEcotaxe;
$cartForTemplate = $this->cartForTemplate;
return true;
Modified: XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_admin_discounts.html
===================================================================
--- XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_admin_discounts.html 2012-07-24 22:00:17 UTC (rev 9922)
+++ XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_admin_discounts.html 2012-07-24 22:09:33 UTC (rev 9923)
@@ -5,10 +5,10 @@
<input type='hidden' name='op' id='op' value='discounts' />
<input type='hidden' name='action' id='action' value='saveedit' />
<input type='hidden' name='disc_id' id='disc_id' value='<{$discount.disc_id}>' />
- <div class="center"><h3><{$formTitle}></h3>
+ <div align="center"><h3><{$formTitle}></h3>
<table width='100%' class='outer' cellspacing='1'>
<tr>
- <th colspan="2" class="center"><{$smarty.const._AM_OLEDRION_DISCOUNT_INFORMATION}></th> <{* Informations sur la r\xE9duction *}>
+ <th colspan="2" align="center"><{$smarty.const._AM_OLEDRION_DISCOUNT_INFORMATION}></th> <{* Informations sur la r\xE9duction *}>
</tr>
<tr>
<td class='head'><label for="disc_title"><{$smarty.const._AM_OLEDRION_DISCOUNT_TITLE}></label></td>
@@ -24,7 +24,7 @@
</tr>
<tr> <{* A qui ou selon quoi appliquer la r\xE9duction ? *}>
- <th colspan="2" class="center"><{$smarty.const._AM_OLEDRION_DISCOUNT_WHOWHAT}></th>
+ <th colspan="2" align="center"><{$smarty.const._AM_OLEDRION_DISCOUNT_WHOWHAT}></th>
</tr>
<tr>
<td class='head'><label for="disc_group"><{$smarty.const._AM_OLEDRION_DISCOUNT_XOOPS_GROUP}></label></td>
@@ -47,7 +47,7 @@
</tr>
<tr> <{* R\xE9duction sur le prix du produit ou le montant de la commande *}>
- <th colspan="2" class="center"><{$smarty.const._AM_OLEDRION_DISCOUNT_REDUCTION_PRICE}></th>
+ <th colspan="2" align="center"><{$smarty.const._AM_OLEDRION_DISCOUNT_REDUCTION_PRICE}></th>
</tr>
<tr>
<td class='head' vclass="top"><{$smarty.const._AM_OLEDRION_DISCOUNT_REDUCTION_TYPE}></td>
@@ -111,7 +111,7 @@
</td>
</tr>
<tr>
- <th colspan="2" class="center"><{$smarty.const._AM_OLEDRION_DISCOUNT_SHIPPING_REDUCTIONS}></th> <{* R\xE9ductions sur les frais de port *}>
+ <th colspan="2" align="center"><{$smarty.const._AM_OLEDRION_DISCOUNT_SHIPPING_REDUCTIONS}></th> <{* R\xE9ductions sur les frais de port *}>
</tr>
<tr>
<td class='head' vclass='top'><{$smarty.const._AM_OLEDRION_DISCOUNT_SHIPPINGS_ARE}></td>
@@ -178,4 +178,4 @@
</tr>
</table>
</form>
-<{/if}>
+<{/if}>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2012-07-24 22:00:23
|
Revision: 9922
http://xoops.svn.sourceforge.net/xoops/?rev=9922&view=rev
Author: lord_venom
Date: 2012-07-24 22:00:17 +0000 (Tue, 24 Jul 2012)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/TDMStats/trunk/TDMStats/docs/changelog.txt
Modified: XoopsModules/TDMStats/trunk/TDMStats/docs/changelog.txt
===================================================================
--- XoopsModules/TDMStats/trunk/TDMStats/docs/changelog.txt 2012-07-24 21:56:49 UTC (rev 9921)
+++ XoopsModules/TDMStats/trunk/TDMStats/docs/changelog.txt 2012-07-24 22:00:17 UTC (rev 9922)
@@ -1,5 +1,11 @@
************************************************************
TDM : TDMStats
+Version 1.09 | 2012-07-24
+************************************************************
+- new style and fix bug
+************************************************************
+************************************************************
+TDM : TDMStats
Version 1.08 | 2012-06-27
************************************************************
- fixing bugs reported by Cesag (mamba)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2012-07-24 21:56:56
|
Revision: 9921
http://xoops.svn.sourceforge.net/xoops/?rev=9921&view=rev
Author: lord_venom
Date: 2012-07-24 21:56:49 +0000 (Tue, 24 Jul 2012)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/TDMStats/trunk/TDMStats/include/user_info.php
XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_summary.html
XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_user_info.html
Added Paths:
-----------
XoopsModules/TDMStats/trunk/TDMStats/images/bro.png
XoopsModules/TDMStats/trunk/TDMStats/images/host.png
XoopsModules/TDMStats/trunk/TDMStats/images/os.png
XoopsModules/TDMStats/trunk/TDMStats/images/sc.png
XoopsModules/TDMStats/trunk/TDMStats/images/sw.png
Added: XoopsModules/TDMStats/trunk/TDMStats/images/bro.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/TDMStats/trunk/TDMStats/images/bro.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/TDMStats/trunk/TDMStats/images/host.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/TDMStats/trunk/TDMStats/images/host.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/TDMStats/trunk/TDMStats/images/os.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/TDMStats/trunk/TDMStats/images/os.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/TDMStats/trunk/TDMStats/images/sc.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/TDMStats/trunk/TDMStats/images/sc.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/TDMStats/trunk/TDMStats/images/sw.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/TDMStats/trunk/TDMStats/images/sw.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: XoopsModules/TDMStats/trunk/TDMStats/include/user_info.php
===================================================================
--- XoopsModules/TDMStats/trunk/TDMStats/include/user_info.php 2012-07-24 21:25:32 UTC (rev 9920)
+++ XoopsModules/TDMStats/trunk/TDMStats/include/user_info.php 2012-07-24 21:56:49 UTC (rev 9921)
@@ -33,6 +33,19 @@
$xoopsTpl->assign('lang_by_host', _AM_BY_HOST);
$xoopsTpl->assign('lang_bro_bro', _AM_BRO_BRO);
+//broser item
+ global $xoopsDB;
+ $bro_info = getResult("select * from ".$xoopsDB->prefix("TDMStats_browser")." order by count desc limit 3");
+
+ for ($i = 0; $i < sizeof($bro_info); $i++) {
+
+ //$browser['info'][] = $bro_info[$i]['count'];
+ //$browser['browser'][] = $bro_info[$i]['browser'];
+ //$browser['percent'][] = round($bro_percent, '2');
+
+ $xoopsTpl->append('item_browsers', array('id' => 'bro'.$i, 'browser' => $bro_info[$i]['browser'], 'info' => $bro_info[$i]['count']));
+
+ }
//broser
global $xoopsDB;
@@ -54,13 +67,27 @@
$browser['percent'][] = round($bro_percent, '2');
if ($bro_percent > 0) {
- $xoopsTpl->append('browsers', array('id' => 'bro'.$i, 'browser' => $bro_info[$i]['browser'], 'info' => $bro_info[$i]['count'], 'percent' => round($bro_percent, '2')));
+ //$xoopsTpl->append('browsers', array('id' => 'bro'.$i, 'browser' => $bro_info[$i]['browser'], 'info' => $bro_info[$i]['count'], 'percent' => round($bro_percent, '2')));
$xoopsTpl->append('browsers_map', array('id' => 'bro'.$i, 'browser' => $bro_info[$i]['browser'], 'info' => $bro_info[$i]['count'], 'percent' => round($bro_percent, '2')));
}
}
$xoopsTpl->assign('lang_os_os', _AM_OS_OS);
-
+
+
+///////// ITEM OS ////////////
+ global $xoopsDB;
+ $os_info = getResult("select * from ".$xoopsDB->prefix("TDMStats_os")." order by count desc limit 3");
+
+ for($i=0; $i<sizeof($os_info); $i++){
+
+ //$os['info'][] = $os_info[$i]['count'];
+ //$os['os'][] = $os_info[$i]['os'];
+ //$os['percent'][] = round($os_percent, '2');
+
+ $xoopsTpl->append('item_os', array('id' => 'os'.$i, 'os' => $os_info[$i]['os'], 'info' => $os_info[$i]['count']));
+
+ }
/////////OS ////////////
global $xoopsDB;
$os_info = getResult("select * from ".$xoopsDB->prefix("TDMStats_os")." order by count desc");
@@ -81,11 +108,24 @@
$os['percent'][] = round($os_percent, '2');
if ($os_percent > 0) {
- $xoopsTpl->append('oss', array('id' => 'os'.$i, 'os' => $os_info[$i]['os'], 'info' => $os_info[$i]['count'], 'percent' => round($os_percent, '2')));
+ //$xoopsTpl->append('oss', array('id' => 'os'.$i, 'os' => $os_info[$i]['os'], 'info' => $os_info[$i]['count'], 'percent' => round($os_percent, '2')));
$xoopsTpl->append('oss_map', array('id' => 'os'.$i, 'os' => $os_info[$i]['os'], 'info' => $os_info[$i]['count'], 'percent' => round($os_percent, '2')));
}
}
+///////////////////ITEM SW/////////
+ global $xoopsDB;
+ $sw_info = getResult("select * from ".$xoopsDB->prefix("TDMStats_screen")." order by count desc limit 3");
+
+ for($i=0; $i<sizeof($sw_info); $i++){
+
+ //$sw['info'][] = $sw_info[$i]['count'];
+ //$sw['sw'][] = $sw_info[$i]['width'];
+ //$sw['percent'][] = round($sw_percent, '2');
+
+ $xoopsTpl->append('item_sw', array('id' => 'sw'.$i, 'sw' => $sw_info[$i]['width'], 'info' => $sw_info[$i]['count']));
+
+ }
///////////////////SW/////////
global $xoopsDB;
$sw_info = getResult("select * from ".$xoopsDB->prefix("TDMStats_screen")." order by count desc");
@@ -106,12 +146,24 @@
$sw['percent'][] = round($sw_percent, '2');
if ($sw_percent > 0) {
- $xoopsTpl->append('sws', array('id' => 'sw'.$i, 'sw' => $sw_info[$i]['width'], 'info' => $sw_info[$i]['count'], 'percent' => round($sw_percent, '2')));
+ //$xoopsTpl->append('sws', array('id' => 'sw'.$i, 'sw' => $sw_info[$i]['width'], 'info' => $sw_info[$i]['count'], 'percent' => round($sw_percent, '2')));
$xoopsTpl->append('sws_map', array('id' => 'sw'.$i, 'sw' => $sw_info[$i]['width'], 'info' => $sw_info[$i]['count'], 'percent' => round($sw_percent, '2')));
}
}
-
+/////////////// ITEM SC/////////////////////////
+ global $xoopsDB;
+ $sc_info = getResult("select * from ".$xoopsDB->prefix("TDMStats_color")." order by count desc limit 3");
+
+ for($i=0; $i<sizeof($sc_info); $i++){
+
+ //$sc['info'][] = $sc_info[$i]['count'];
+ //$sc['sc'][] = $sc_info[$i]['color'];
+ //$sc['percent'][] = round($sc_percent, '2');
+
+ $xoopsTpl->append('item_sc', array('id' => 'sc'.$i, 'sc' => $sc_info[$i]['color'], 'info' => $sc_info[$i]['count']));
+
+ }
///////////////SC/////////////////////////
global $xoopsDB;
$sc_info = getResult("select * from ".$xoopsDB->prefix("TDMStats_color")." order by count desc");
@@ -132,13 +184,27 @@
$sc['percent'][] = round($sc_percent, '2');
if ($sc_percent > 0) {
- $xoopsTpl->append('scs', array('id' => 'sc'.$i, 'sc' => $sc_info[$i]['color'], 'info' => $sc_info[$i]['count'], 'percent' => round($sc_percent, '2')));
+ //$xoopsTpl->append('scs', array('id' => 'sc'.$i, 'sc' => $sc_info[$i]['color'], 'info' => $sc_info[$i]['count'], 'percent' => round($sc_percent, '2')));
$xoopsTpl->append('scs_map', array('id' => 'sc'.$i, 'sc' => $sc_info[$i]['color'], 'info' => $sc_info[$i]['count'], 'percent' => round($sc_percent, '2')));
}
}
$xoopsTpl->assign('lang_host_host', _AM_HOST_HOST);
+//////////ITEM HOST/////////////
+ global $xoopsDB;
+ $max = $xoopsModuleConfig['maxpage'];
+ $host_info = getResult("select distinct hostname, count from ".$xoopsDB->prefix("TDMStats_hostname")." order by count desc limit 3");
+
+ for($i=0; $i<sizeof($host_info); $i++){
+
+ //$host['info'][] = $host_info[$i]['count'];
+ //$host['host'][] = $host_info[$i]['hostname'];
+ //$host['percent'][] = round($host_percent, '2');
+
+ $xoopsTpl->append('item_host', array('id' => 'host'.$i, 'host' => $host_info[$i]['hostname'], 'info' => $host_info[$i]['count']));
+ }
+
//////////HOST/////////////
global $xoopsDB;
$max = $xoopsModuleConfig['maxpage'];
@@ -158,7 +224,7 @@
$host['host'][] = $host_info[$i]['hostname'];
$host['percent'][] = round($host_percent, '2');
- $xoopsTpl->append('hosts', array('id' => 'host'.$i, 'host' => $host_info[$i]['hostname'], 'info' => $host_info[$i]['count'], 'percent' => round($host_percent, '2')));
+ //$xoopsTpl->append('hosts', array('id' => 'host'.$i, 'host' => $host_info[$i]['hostname'], 'info' => $host_info[$i]['count'], 'percent' => round($host_percent, '2')));
$xoopsTpl->append('hosts_map', array('id' => 'host'.$i, 'host' => $host_info[$i]['hostname'], 'info' => $host_info[$i]['count'], 'percent' => round($host_percent, '2')));
}
Modified: XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_summary.html
===================================================================
--- XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_summary.html 2012-07-24 21:25:32 UTC (rev 9920)
+++ XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_summary.html 2012-07-24 21:56:49 UTC (rev 9921)
@@ -73,14 +73,12 @@
<!-- fin -->
-
-
-
<li style="width:46%;" class="odd"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/tip.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href ="'.$cat_link.'" title="<{$lang_forecast}>"><{$smarty.const._AM_FORECAST}></h2></a>
<div style="text-align:left"><span id="tree_num"><{$smarty.const.AM_AVE}> <b><{$cur_percent}>%</b> <{$smarty.const.AM_DAILY_VISIT}> <b><{$date_daily}></b>.
<br /><{$smarty.const.AM_BAS_NBR}> <b><{$daycount}></b> <{$smarty.const.AM_SO_FAR}>
<br/><{$smarty.const.AM_SO_FARE}> <b><{$today_hits}></b> <{$smarty.const.AM_PAGE_VIEW}>
</span></div></div></li>
+
<li style="width:46%;" class="even"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/calender.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('hour')"><{$smarty.const._AM_TODAY}></h2></a>
<div style="text-align:left">
@@ -91,6 +89,31 @@
</div></div>
<div id="tree_form"><a href="javascript:;" onclick="javascript:masque('hour')" ><{$smarty.const._AM_VIEW}></a></div></li>
+<!-- tableau hour -->
+<li id="masque_hour" style="display: none;" class="even"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/calender.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('hour')"><{$smarty.const._AM_TODAY}></h2></a>
+<div style="text-align:left">
+<div class="Tableau">
+ <p class="legende">
+ <span class="col1"><{$smarty.const._AM_HR_HOUR}></span>
+ <span class="col2"></span>
+ <span class="col3"><{$smarty.const._AM_DATE_VISITS}></span>
+ <span class="col4"><{$smarty.const._AM_DATE_PERCENT}></span>
+ </p>
+ <{foreach item=hours_map from=$hours_map}>
+ <p>
+ <span class="col1"><{$hours_map.hour}></span>
+ <span class="col2"><img src="./images/bar/<{$img_bar}>" title="<{$hours_map.percent}>%" alt="<{$hours_map.percent}>%" width="<{$hours_map.percent}>%" style="height:16px;" /></span>
+ <span class="col3"><{$hours_map.info}></span>
+ <span class="col3"><{$hours_map.percent}>%</span>
+ </p>
+ <{/foreach}>
+</div>
+
+</div></div>
+<!--fin-->
+
+
+
<li style="width:46%;" class="odd"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/ref.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('ref')"><{$smarty.const._AM_BY_REF}></h2></a>
<div style="text-align:left">
<{foreach from=$item_refs item=item}>
@@ -99,6 +122,30 @@
</div></div>
<div id="tree_form"><a href="javascript:;" onclick="javascript:masque('ref')" ><{$smarty.const._AM_VIEW}></a></div></li>
+<!-- tableau ref -->
+<li id="masque_ref" style="display: none;" class="even"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/ref.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('ref')"><{$smarty.const._AM_BY_REF}></h2></a>
+<div style="text-align:left">
+<div class="Tableau">
+ <p class="legende">
+ <span class="col1"><{$smarty.const._AM_REF_REF}></span>
+ <span class="col2"></span>
+ <span class="col3"><{$smarty.const._AM_DATE_VISITS}></span>
+ <span class="col4"><{$smarty.const._AM_DATE_PERCENT}></span>
+ </p>
+ <{foreach item=refs_map from=$refs_map}>
+ <p>
+ <span class="col1"><{$refs_map.ref}></span>
+ <span class="col2"><img src="./images/bar/<{$img_bar}>" title="<{$refs_map.percent}>%" alt="<{$refs_map.percent}>%" width="<{$refs_map.percent}>%" style="height:16px;" /></span>
+ <span class="col3"><{$refs_map.info}></span>
+ <span class="col3"><{$refs_map.percent}>%</span>
+ </p>
+ <{/foreach}>
+</div>
+
+</div></div>
+<!--fin-->
+
+
<li style="width:46%;" class="even"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/word.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('pays')"><{$smarty.const._AM_BY_COUNTRY}></h2></a>
<div style="text-align:left">
<{foreach from=$item_pays item=item}>
@@ -108,74 +155,28 @@
</div></div>
<div id="tree_form"><a href="javascript:;" onclick="javascript:masque('pays')" ><{$smarty.const._AM_VIEW}></a></div></li>
-
-<br style="clear: both;" /></ul></td></tr></table><br />
-
+<!-- tableau pays -->
+<li id="masque_pays" style="display: none;" class="even"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/word.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('pays')"><{$smarty.const._AM_BY_COUNTRY}></h2></a>
+<div style="text-align:left">
+<div class="Tableau">
+ <p class="legende">
+ <span class="col1"><{$smarty.const._AM_BY_COUNTRY}></span>
+ <span class="col2"></span>
+ <span class="col3"><{$smarty.const._AM_DATE_VISITS}></span>
+ <span class="col4"><{$smarty.const._AM_DATE_PERCENT}></span>
+ </p>
+ <{foreach item=payss_map from=$payss_map}>
+ <p>
+ <span class="col1"><{$payss_map.flag}></span>
+ <span class="col2"><img src="./images/bar/<{$img_bar}>" title="<{$payss_map.percent}>%" alt="<{$payss_map.percent}>%" width="<{$payss_map.percent}>%" style="height:16px;" /></span>
+ <span class="col3"><{$payss_map.info}></span>
+ <span class="col3"><{$payss_map.percent}>%</span>
+ </p>
+ <{/foreach}>
+</div>
+</div></div>
+<!--fin-->
+
- <div id="masque_hour" style="display: none;">
- <h2><{$smarty.const._AM_TODAY}></h2>
- <table class="map" cellspacing="0" cellpadding="0">
- <tr>
- <th style="text-align:center;"><{$smarty.const._AM_HR_HOUR}></th>
- <th></th>
- <th style="text-align:center;"><{$smarty.const._AM_DATE_VISITS}></th>
- <th style="text-align:center;"><{$smarty.const._AM_DATE_PERCENT}></th>
- </tr>
- <{foreach item=hours_map from=$hours_map}>
- <tr>
- <td width="20%" style="text-align:center; vertical-align:middle;"><div style="margin:5px;"><{$hours_map.hour}></div></td>
- <td width="60%" style="vertical-align:middle;"><img src="./images/bar/<{$img_bar}>" title="<{$hours_map.percent}>%" alt="<{$hours_map.percent}>%" width="<{$hours_map.percent}>%" height="16px" /></td>
- <td width="10%" style="text-align:center; vertical-align:middle;"><{$hours_map.info}></td>
- <td width="10%" style="text-align:center; vertical-align:middle;"><{$hours_map.percent}>%</td>
- </tr>
- <{/foreach}>
- </table>
- <br /><br />
- </div>
-
-
- <div id="masque_ref" style="display: none;">
- <h2><{$smarty.const._AM_BY_REF}></h2>
- <table class="map" cellspacing="0" cellpadding="0">
- <tr>
- <th style="text-align:center;"><{$smarty.const._AM_REF_REF}></th>
- <th></th>
- <th style="text-align:center;"><{$smarty.const._AM_DATE_VISITS}></th>
- <th style="text-align:center;"><{$smarty.const._AM_DATE_PERCENT}></th>
- </tr>
- <{foreach item=refs_map from=$refs_map}>
- <tr>
- <td width="20%" style="text-align:center; vertical-align:middle;"><div style="margin:5px;"><{$refs_map.ref}></div></td>
- <td width="60%" style="vertical-align:middle;"><img src="./images/bar/<{$img_bar}>" title="<{$refs_map.percent}>%" alt="<{$refs_map.percent}>%" width="<{$refs_map.percent}>%" height="16px" /></td>
- <td width="10%" style="text-align:center; vertical-align:middle;"><{$refs_map.info}></td>
- <td width="10%" style="text-align:center; vertical-align:middle;"><{$refs_map.percent}>%</td>
- </tr>
- <{/foreach}>
- </table>
- <br /><br />
-</div>
-
- <div id="masque_pays" style="display: none;">
- <h2><{$smarty.const._AM_BY_PAYS}></h2>
- <table class="outer" cellspacing="0" cellpadding="0">
- <tr>
- <th style="text-align:center;"><{$smarty.const._AM_BY_COUNTRY}></th>
- <th></th>
- <th style="text-align:center;"><{$smarty.const._AM_DATE_VISITS}></th>
- <th style="text-align:center;"><{$smarty.const._AM_DATE_PERCENT}></th>
- </tr>
- <{foreach item=payss_map from=$payss_map}>
- <tr>
- <td width="20%" style="text-align:center; vertical-align:middle;"><div style="margin:5px;"><{$payss_map.flag}></div></td>
- <td width="60%" style="vertical-align:middle;"><img src="./images/bar/<{$img_bar}>" title="<{$payss_map.percent}>%" alt="<{$payss_map.percent}>%" width="<{$payss_map.percent}>%" height="16" /></td>
- <td width="10%" style="text-align:center; vertical-align:middle;"><{$payss_map.info}></td>
- <td width="10%" style="text-align:center; vertical-align:middle;"><{$payss_map.percent}>%</td>
- </tr>
- <{/foreach}>
- </table>
- <br /><br />
-</div>
-
-
-<br /><br style="clear: both;" />
\ No newline at end of file
+<br style="clear: both;" /></ul></td></tr></table><br />
\ No newline at end of file
Modified: XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_user_info.html
===================================================================
--- XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_user_info.html 2012-07-24 21:25:32 UTC (rev 9920)
+++ XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_user_info.html 2012-07-24 21:56:49 UTC (rev 9921)
@@ -1,198 +1,165 @@
<{include file="db:TDMStats_index.html"}>
-<script type="text/javascript">
- $(function() {
- $("#tabs").tabs();
- });
- </script>
-
-
-<div id="tabs">
- <ul>
- <li style="list-style-type: none;"><a href="#browser"><{$lang_by_browser}></a></li>
- <li style="list-style-type: none;"><a href="#os"><{$lang_by_os}></a></li>
- <li style="list-style-type: none;"><a href="#sw"><{$lang_sw_sw}></a></li>
- <li style="list-style-type: none;"><a href="#sc"><{$lang_sc_sc}></a></li>
- <li style="list-style-type: none;"><a href="#host"><{$lang_by_host}></a></li>
- </ul>
-<div id="browser">
+<table cellpadding="0" cellspacing="0" style="border-collapse: separate; margin:5px;"><tr><td><ul id="tree_menu">
+
+<li style="width:46%;" class="even"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/bro.png" ><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('browser')"><{$smarty.const._AM_BY_BROWSER}></h2></a>
+<div style="text-align:left">
+ <{foreach from=$item_browsers item=item}>
+ <span id="tree_num"><{$item.browser}>, <{$item.info}> <{$smarty.const._AM_P_VISITS}></span><br />
+ <{/foreach}>
-<table class="map" cellspacing="0" cellpadding="0">
- <caption align="top"><{$smarty.const._AM_BRO_BRO}><br /><br /></caption>
- <tr>
- <th scope="col"><{$smarty.const._AM_BRO_BRO}></th>
- <th scope="col"><{$smarty.const._AM_DATE_VISITS}></th>
- </tr>
- <{foreach item=browsers_map from=$browsers_map}>
- <tr>
- <td width="20%" class="option"><div style="margin:5px;"><{$browsers_map.browser}></div></td>
- <td width="80%" class="value"><img src="./images/bar/<{$img_bar}>" title="<{$browsers_map.percent}>%" alt="<{$browsers_map.percent}>%" width="<{$browsers_map.percent}>%" height="16" /><{$browsers_map.info}></td>
- </tr>
- <{/foreach}>
- </table>
- <span><a href="javascript:;" onclick="javascript:masque('1')" ><{$smarty.const._AM_VIEW}></a></span>
- <br /><br />
- <div id="masque_1" style="display: none;">
- <table class="outer" width="100%" border="0" cellspacing="1" cellpadding="4" align="center">
- <tr>
- <td class="head" align="center"><{$smarty.const._AM_BRO_BRO}></td>
- <td class="head" align="center"><{$smarty.const._AM_DATE_VISITS}></td>
- <td class="head" align="center"><{$smarty.const._AM_DATE_PERCENT}></td>
- </tr>
- <{foreach item=browsers from=$browsers}>
- <tr class="<{cycle values="even,odd"}>" valign="center">
- <td width="33%" align="center"><{$browsers.browser}></td>
- <td width="33%" align="center"><{$browsers.info}></td>
- <td width="33%" align="center"><{$browsers.percent}>%</td>
- </tr>
- <{/foreach}>
- </table>
- </div>
+</div></div>
+<div id="tree_form"><a href="javascript:;" onclick="javascript:masque('browser')" ><{$smarty.const._AM_VIEW}></a></div></li>
+
+<!-- tableau browser -->
+<li id="masque_browser" style="display: none;" class="even"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/bro.png"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('browser')"><{$smarty.const._AM_BY_BROWSER}></h2></a>
+<div style="text-align:left">
+<div class="Tableau">
+ <p class="legende">
+ <span class="col1"><{$smarty.const._AM_BRO_BRO}></span>
+ <span class="col2"></span>
+ <span class="col3"><{$smarty.const._AM_DATE_VISITS}></span>
+ <span class="col4"><{$smarty.const._AM_DATE_PERCENT}></span>
+ </p>
+ <{foreach item=browser_map from=$browsers_map}>
+ <p>
+ <span class="col1"><{$browser_map.browser}></span>
+ <span class="col2"><img src="./images/bar/<{$img_bar}>" title="<{$browser_map.percent}>%" alt="<{$browser_map.percent}>%" width="<{$browser_map.percent}>%" style="height:16px;" /></span>
+ <span class="col3"><{$browser_map.info}></span>
+ <span class="col3"><{$browser_map.percent}>%</span>
+ </p>
+ <{/foreach}>
</div>
+</div></div>
+<!--fin-->
-<div id="os">
+<li style="width:46%;" class="even"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/os.png" ><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('os')"><{$smarty.const._AM_BY_OS}></h2></a>
+<div style="text-align:left">
+ <{foreach from=$item_os item=item}>
+ <span id="tree_num"><{$item.os}>, <{$item.info}> <{$smarty.const._AM_P_VISITS}></span><br />
+ <{/foreach}>
- <table class="map" cellspacing="0" cellpadding="0">
- <caption align="top"><{$smarty.const._AM_OS_OS}><br /><br /></caption>
- <tr>
- <th scope="col"><{$smarty.const._AM_OS_OS}></th>
- <th scope="col"><{$smarty.const._AM_DATE_VISITS}></th>
- </tr>
- <{foreach item=oss_map from=$oss_map}>
- <tr>
- <td width="20%" class="option"><div style="margin:5px;"><{$oss_map.os}></div></td>
- <td width="80%" class="value"><img src="./images/bar/<{$img_bar}>" title="<{$oss_map.percent}>%" alt="<{$oss_map.percent}>%" width="<{$oss_map.percent}>%" height="16" /><{$oss_map.info}></td>
- </tr>
- <{/foreach}>
- </table>
- <span><a href="javascript:;" onclick="javascript:masque('2')" ><{$smarty.const._AM_VIEW}></a></span>
- <br /><br />
- <div id="masque_2" style="display: none;">
- <table class="outer" width="100%" border="0" cellspacing="1" cellpadding="4" align="center">
- <tr>
- <td class="head" align="center"><{$smarty.const._AM_OS_OS}></td>
- <td class="head" align="center"><{$smarty.const._AM_DATE_VISITS}></td>
- <td class="head" align="center"><{$smarty.const._AM_DATE_PERCENT}></td>
- </tr>
- <{foreach item=oss from=$oss}>
- <tr class="<{cycle values="even,odd"}>" valign="center">
- <td width="33%" align="center"><{$oss.os}></td>
- <td width="33%" align="center"><{$oss.info}></td>
- <td width="33%" align="center"><{$oss.percent}>%</td>
- </tr>
- <{/foreach}>
- </table>
- </div>
+</div></div>
+<div id="tree_form"><a href="javascript:;" onclick="javascript:masque('os')" ><{$smarty.const._AM_VIEW}></a></div></li>
+
+<!-- tableau os -->
+<li id="masque_os" style="display: none;" class="even"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/os.png"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('os')"><{$smarty.const._AM_BY_OS}></h2></a>
+<div style="text-align:left">
+<div class="Tableau">
+ <p class="legende">
+ <span class="col1"><{$smarty.const._AM_BY_OS}></span>
+ <span class="col2"></span>
+ <span class="col3"><{$smarty.const._AM_DATE_VISITS}></span>
+ <span class="col4"><{$smarty.const._AM_DATE_PERCENT}></span>
+ </p>
+ <{foreach item=os_map from=$oss_map}>
+ <p>
+ <span class="col1"><{$os_map.os}></span>
+ <span class="col2"><img src="./images/bar/<{$img_bar}>" title="<{$os_map.percent}>%" alt="<{$os_map.percent}>%" width="<{$os_map.percent}>%" style="height:16px;" /></span>
+ <span class="col3"><{$os_map.info}></span>
+ <span class="col3"><{$os_map.percent}>%</span>
+ </p>
+ <{/foreach}>
</div>
+</div></div>
+<!--fin-->
-<div id="sw">
+<li style="width:46%;" class="even"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/sw.png" ><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('sw')"><{$smarty.const._AM_SW_SW}></h2></a>
+<div style="text-align:left">
+ <{foreach from=$item_sw item=item}>
+ <span id="tree_num"><{$item.sw}>, <{$item.info}> <{$smarty.const._AM_P_VISITS}></span><br />
+ <{/foreach}>
-<table class="map" cellspacing="0" cellpadding="0">
- <caption align="top"><{$smarty.const._AM_SW_SW}><br /><br /></caption>
- <tr>
- <th scope="col"><{$smarty.const._AM_SW_SW}></th>
- <th scope="col"><{$smarty.const._AM_DATE_VISITS}></th>
- </tr>
- <{foreach item=sws_map from=$sws_map}>
- <tr>
- <td width="20%" class="option"><div style="margin:5px;"><{$sws_map.sw}></div></td>
- <td width="80%" class="value"><img src="./images/bar/<{$img_bar}>" title="<{$sws_map.percent}>%" alt="<{$sws_map.percent}>%" width="<{$sws_map.percent}>%" height="16" /><{$sws_map.info}></td>
- </tr>
- <{/foreach}>
- </table>
- <span><a href="javascript:;" onclick="javascript:masque('3')" ><{$smarty.const._AM_VIEW}></a></span>
- <br /><br />
- <div id="masque_3" style="display: none;">
- <table class="outer" width="100%" border="0" cellspacing="1" cellpadding="4" align="center">
- <tr>
- <td class="head" align="center"><{$smarty.const._AM_SW_SW}></td>
- <td class="head" align="center"><{$smarty.const._AM_DATE_VISITS}></td>
- <td class="head" align="center"><{$smarty.const._AM_DATE_PERCENT}></td>
- </tr>
- <{foreach item=sws from=$sws}>
- <tr class="<{cycle values="even,odd"}>" valign="center">
- <td width="33%" align="center"><{$sws.sw}></td>
- <td width="33%" align="center"><{$sws.info}></td>
- <td width="33%" align="center"><{$sws.percent}>%</td>
- </tr>
- <{/foreach}>
- </table>
- </div>
+</div></div>
+<div id="tree_form"><a href="javascript:;" onclick="javascript:masque('sw')" ><{$smarty.const._AM_VIEW}></a></div></li>
+
+<!-- tableau sw -->
+<li id="masque_sw" style="display: none;" class="even"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/sw.png"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('sw')"><{$smarty.const._AM_SW_SW}></h2></a>
+<div style="text-align:left">
+<div class="Tableau">
+ <p class="legende">
+ <span class="col1"><{$smarty.const._AM_SW_SW}></span>
+ <span class="col2"></span>
+ <span class="col3"><{$smarty.const._AM_DATE_VISITS}></span>
+ <span class="col4"><{$smarty.const._AM_DATE_PERCENT}></span>
+ </p>
+ <{foreach item=sw_map from=$sws_map}>
+ <p>
+ <span class="col1"><{$sw_map.sw}></span>
+ <span class="col2"><img src="./images/bar/<{$img_bar}>" title="<{$sw_map.percent}>%" alt="<{$sw_map.percent}>%" width="<{$sw_map.percent}>%" style="height:16px;" /></span>
+ <span class="col3"><{$sw_map.info}></span>
+ <span class="col3"><{$sw_map.percent}>%</span>
+ </p>
+ <{/foreach}>
</div>
+</div></div>
+<!--fin-->
-<div id="sc">
-
- <table class="map" cellspacing="0" cellpadding="0">
- <caption align="top"><{$smarty.const._AM_SC_SC}><br /><br /></caption>
- <tr>
- <th scope="col"><{$smarty.const._AM_SC_SC}></th>
- <th scope="col"><{$smarty.const._AM_DATE_VISITS}></th>
- </tr>
- <{foreach item=scs_map from=$scs_map}>
- <tr>
- <td width="20%" class="option"><div style="margin:5px;"><{$scs_map.sc}></div></td>
- <td width="80%" class="value"><img src="./images/bar/<{$img_bar}>" title="<{$scs_map.percent}>%" alt="<{$scs_map.percent}>%" width="<{$scs_map.percent}>%" height="16" /><{$scs_map.info}></td>
- </tr>
- <{/foreach}>
- </table>
- <span><a href="javascript:;" onclick="javascript:masque('4')" ><{$smarty.const._AM_VIEW}></a></span>
- <br /><br />
- <div id="masque_4" style="display: none;">
- <table class="outer" width="100%" border="0" cellspacing="1" cellpadding="4" align="center">
- <tr>
- <td class="head" align="center"><{$smarty.const._AM_SC_SC}></td>
- <td class="head" align="center"><{$smarty.const._AM_DATE_VISITS}></td>
- <td class="head" align="center"><{$smarty.const._AM_DATE_PERCENT}></td>
- </tr>
- <{foreach item=scs from=$scs}>
- <tr class="<{cycle values="even,odd"}>" valign="center">
- <td width="33%" align="center"><{$scs.sc}></td>
- <td width="33%" align="center"><{$scs.info}></td>
- <td width="33%" align="center"><{$scs.percent}>%</td>
- </tr>
- <{/foreach}>
- </table>
- </div>
+<li style="width:46%;" class="even"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/sc.png" ><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('sc')"><{$smarty.const._AM_SC_SC}></h2></a>
+<div style="text-align:left">
+ <{foreach from=$item_sc item=item}>
+ <span id="tree_num"><{$item.sc}>, <{$item.info}> <{$smarty.const._AM_P_VISITS}></span><br />
+ <{/foreach}>
+
+</div></div>
+<div id="tree_form"><a href="javascript:;" onclick="javascript:masque('sc')" ><{$smarty.const._AM_VIEW}></a></div></li>
+
+<!-- tableau sc -->
+<li id="masque_sc" style="display: none;" class="even"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/sc.png"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('sc')"><{$smarty.const._AM_SC_SC}></h2></a>
+<div style="text-align:left">
+<div class="Tableau">
+ <p class="legende">
+ <span class="col1"><{$smarty.const._AM_SC_SC}></span>
+ <span class="col2"></span>
+ <span class="col3"><{$smarty.const._AM_DATE_VISITS}></span>
+ <span class="col4"><{$smarty.const._AM_DATE_PERCENT}></span>
+ </p>
+ <{foreach item=sc_map from=$scs_map}>
+ <p>
+ <span class="col1"><{$sc_map.sc}></span>
+ <span class="col2"><img src="./images/bar/<{$img_bar}>" title="<{$sc_map.percent}>%" alt="<{$sc_map.percent}>%" width="<{$sc_map.percent}>%" style="height:16px;" /></span>
+ <span class="col3"><{$sc_map.info}></span>
+ <span class="col3"><{$sc_map.percent}>%</span>
+ </p>
+ <{/foreach}>
</div>
+</div></div>
+<!--fin-->
-<div id="host">
+<li style="width:46%;" class="even"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/host.png" ><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('host')"><{$smarty.const._AM_BY_HOST}></h2></a>
+<div style="text-align:left">
+ <{foreach from=$item_host item=item}>
+ <span id="tree_num"><{$item.host}>, <{$item.info}> <{$smarty.const._AM_P_VISITS}></span><br />
+ <{/foreach}>
- <table class="map" cellspacing="0" cellpadding="0">
- <caption align="top"><{$smarty.const._AM_HOST_HOST}><br /><br /></caption>
- <tr>
- <th scope="col"><{$smarty.const._AM_HOST_HOST}></th>
- <th scope="col"><{$smarty.const._AM_DATE_VISITS}></th>
- </tr>
- <{foreach item=hosts_map from=$hosts_map}>
- <tr>
- <td width="20%" class="option"><div style="margin:5px;"><{$hosts_map.host}></div></td>
- <td width="80%" class="value"><img src="./images/bar/<{$img_bar}>" title="<{$hosts_map.percent}>%" alt="<{$hosts_map.percent}>%" width="<{$hosts_map.percent}>%" height="16" /><{$hosts_map.info}></td>
- </tr>
- <{/foreach}>
- </table>
- <span><a href="javascript:;" onclick="javascript:masque('5')" ><{$smarty.const._AM_VIEW}></a></span>
- <br /><br />
- <div id="masque_5" style="display: none;">
- <table class="outer" width="100%" border="0" cellspacing="1" cellpadding="4" align="center">
- <tr>
- <td class="head" align="center"><{$smarty.const._AM_HOST_HOST}></td>
- <td class="head" align="center"><{$smarty.const._AM_DATE_VISITS}></td>
- <td class="head" align="center"><{$smarty.const._AM_DATE_PERCENT}></td>
- </tr>
- <{foreach item=hosts from=$hosts}>
- <tr class="<{cycle values="even,odd"}>" valign="center">
- <td width="33%" align="center"><{$hosts.host}></td>
- <td width="33%" align="center"><{$hosts.info}></td>
- <td width="33%" align="center"><{$hosts.percent}>%</td>
- </tr>
- <{/foreach}>
- </table>
- </div>
-</div>
+</div></div>
+<div id="tree_form"><a href="javascript:;" onclick="javascript:masque('host')" ><{$smarty.const._AM_VIEW}></a></div></li>
+<!-- tableau host -->
+<li id="masque_host" style="display: none;" class="even"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/host.png"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('host')"><{$smarty.const._AM_BY_HOST}></h2></a>
+<div style="text-align:left">
+<div class="Tableau">
+ <p class="legende">
+ <span class="col1"><{$smarty.const._AM_BY_HOST}></span>
+ <span class="col2"></span>
+ <span class="col3"><{$smarty.const._AM_DATE_VISITS}></span>
+ <span class="col4"><{$smarty.const._AM_DATE_PERCENT}></span>
+ </p>
+ <{foreach item=host_map from=$hosts_map}>
+ <p>
+ <span class="col1"><{$host_map.host}></span>
+ <span class="col2"><img src="./images/bar/<{$img_bar}>" title="<{$host_map.percent}>%" alt="<{$host_map.percent}>%" width="<{$host_map.percent}>%" style="height:16px;" /></span>
+ <span class="col3"><{$host_map.info}></span>
+ <span class="col3"><{$host_map.percent}>%</span>
+ </p>
+ <{/foreach}>
</div>
-<br /><br style="clear: both;" />
\ No newline at end of file
+
+</div></div>
+<!--fin-->
+
+<br style="clear: both;" /></ul></td></tr></table><br />
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <luc...@us...> - 2012-07-24 21:20:43
|
Revision: 9919
http://xoops.svn.sourceforge.net/xoops/?rev=9919&view=rev
Author: luciorota
Date: 2012-07-24 21:20:35 +0000 (Tue, 24 Jul 2012)
Log Message:
-----------
delete changed files/directories
Removed Paths:
-------------
XoopsModules/xaddresses/trunk/xaddresses/admin/
XoopsModules/xaddresses/trunk/xaddresses/class/
XoopsModules/xaddresses/trunk/xaddresses/images/
XoopsModules/xaddresses/trunk/xaddresses/include/
XoopsModules/xaddresses/trunk/xaddresses/index.php
XoopsModules/xaddresses/trunk/xaddresses/install/
XoopsModules/xaddresses/trunk/xaddresses/kmleditor/
XoopsModules/xaddresses/trunk/xaddresses/language/
XoopsModules/xaddresses/trunk/xaddresses/templates/
XoopsModules/xaddresses/trunk/xaddresses/xoops_version.php
Deleted: XoopsModules/xaddresses/trunk/xaddresses/index.php
===================================================================
--- XoopsModules/xaddresses/trunk/xaddresses/index.php 2012-07-24 21:18:59 UTC (rev 9918)
+++ XoopsModules/xaddresses/trunk/xaddresses/index.php 2012-07-24 21:20:35 UTC (rev 9919)
@@ -1,300 +0,0 @@
-<?php
-$currentFile = basename(__FILE__);
-// include module header
-include_once 'header.php';
-
-// load classes
-$categoryHandler =& xoops_getModuleHandler('locationcategory', 'xaddresses');
-$locationHandler =& xoops_getModuleHandler('location', 'xaddresses');
-//$locations_votedata_handler =& xoops_getModuleHandler('votedata', 'xaddresses');
-//$locations_field_handler =& xoops_getModuleHandler('field', 'xaddresses');
-//$locations_fielddata_handler =& xoops_getModuleHandler('fielddata', 'xaddresses');
-//$locations_broken_handler =& xoops_getModuleHandler('broken', 'xaddresses');
-//load classes
-//$memberHandler =& xoops_gethandler('member');
-// IN PROGRESS
-//$brokenHandler =& xoops_getModuleHandler('broken', 'xaddresses');
-// TO DO
-//$votedataHandler =& xoops_getModuleHandler('votedata', 'xaddresses');
-/*$criteria = new CriteriaCompo();
-$criteria->add(new Criteria('cat_pid', 0));
-$criteria->setSort('cat_weight ASC, cat_title');
-$criteria->setOrder('ASC');
-$mainCategories = $categoryHandler->getAll($criteria);
-
-$viewableCategoriesIds = xaddresses_getMyItemIds();
-//print_r($myCategories);
-//affichage des cat\xE9gories:
-$criteria = new CriteriaCompo();
-$criteria->setSort('cat_weight ASC, cat_title');
-$criteria->setOrder('ASC');
-$criteria->add(new Criteria('cat_id', '(' . implode(',', $viewableCategoriesIds) . ')','IN'));
-$myCategories = $categoryHandler->getall($criteria);
-//print_r($myCategories_array);
-$myTree = new XoopsObjectTree($myCategories, 'cat_id', 'cat_pid');
-
-$prefix = '';
-$sufix = '';
-
-// get all categories sorted by tree structure
-$categoriesList = array();
-foreach ($mainCategories as $mainCategory) {
- $categoriesList[] = array('prefix' => $prefix, 'sufix' => $sufix, 'category' => $mainCategory);
- $mySubCategories = $myTree->getFirstChild($mainCategory->getVar('cat_id'));
- //print_r($mySubCategories_array);
- foreach ($mySubCategories as $mySubCategory)
- $categoriesList[] = array('prefix' => '->', 'sufix' => $sufix, 'category' => $mySubCategory);
-}
-*/
-
-$viewableCategoriesIds = xaddresses_getMyItemIds('in_category_view');
-
-$criteria = new CriteriaCompo();
-$criteria->add(new Criteria('cat_pid', 0));
-$criteria->setSort('cat_weight ASC, cat_title');
-$criteria->setOrder('ASC');
-$criteria->add(new Criteria('cat_id', '(' . implode(',', $viewableCategoriesIds) . ')','IN'));
-$mainCategories = $categoryHandler->getAll($criteria);
-$mainCategoriesAsArray = $categoryHandler->getAll($criteria, null, false); // get categories as array
-
-$prefix = '';
-$sufix = '';
-$order = 'cat_weight ASC, cat_title';
-
-// get all categories sorted by tree structure
-$categoriesAsArrayList = array();
-foreach ($mainCategoriesAsArray as $mainCategoryAsArray) {
- $categoriesAsArrayList[] = array('prefix' => $prefix, 'sufix' => $sufix, 'category' => $mainCategoryAsArray);
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('cat_pid', $mainCategoryAsArray['cat_id']));
- $criteria->setSort('cat_weight ASC, cat_title');
- $criteria->setOrder('ASC');
- $criteria->add(new Criteria('cat_id', '(' . implode(',', $viewableCategoriesIds) . ')','IN'));
- $subCategories = $categoryHandler->getAll($criteria);
- $subCategoriesAsArray = $categoryHandler->getAll($criteria, null, false); // get subcategories as array
- if (count($subCategories) != 0) {
- $subcategoriesList = xaddresses_getChildrenTree($mainCategoryAsArray['cat_id'], $subCategories, $prefix, $sufix, $order);
- $subcategoriesAsArrayList = array();
- foreach($subcategoriesList as $subcategoryList) {
- $subcategoriesAsArrayList[] = array('prefix' => $subcategoryList['prefix'], 'sufix' => $subcategoryList['sufix'], 'category' => $subcategoryList['category']->toArray());
- }
- $categoriesAsArrayList = array_merge ($categoriesAsArrayList, $subcategoriesAsArrayList);
- }
-}
-
-// render start here
-// Load template
-$xoopsOption['template_main'] = 'xaddresses_index.html';
-include_once XOOPS_ROOT_PATH . '/header.php';
-
-// Breadcrumb
-$breadcrumb = array();
-if ($xoopsModuleConfig['show_home_in_breadcrumb']) {
- $crumb['title'] = _MA_XADDRESSES_BREADCRUMB_HOME;
- $crumb['url'] = 'index.php';
- $breadcrumb[] = $crumb;
-}
-// Set breadcrumb array for tamplate
-$breadcrumb = array_reverse($breadcrumb);
-$xoopsTpl->assign('breadcrumb', $breadcrumb);
-unset($breadcrumb, $crumb);
-
-$GLOBALS['xoopsTpl']->assign('categoriesList', $categoriesAsArrayList);
-
-
-
-/*
-// pour les permissions
-//affichage des cat\xE9gories:
-$criteria = new CriteriaCompo();
-$criteria->setSort('weight ASC, cat_title');
-$criteria->setOrder('ASC');
-$criteria->add(new Criteria('loc_cat_id', '(' . implode(',', $viewableCategoriesIds) . ')','IN'));
-$downloadscat_arr = $categoryHandler->getall($criteria);
-$mytree = new XoopsObjectTree($downloadscat_arr, 'cat_id', 'cat_pid');
-
-$criteria = new CriteriaCompo();
-$criteria->setSort('cat_weight ASC, cat_title');
-$criteria->setOrder('ASC');
-$criteria->add(new Criteria('cat_pid', 0));
-$criteria->add(new Criteria('cat_id', '(' . implode(',', $viewableCategoriesIds) . ')','IN'));
-$downloadscat_arr = $categoryHandler->getall($criteria);
-
-$count = 1;
-$keywords = '';
-foreach (array_keys($downloadscat_arr) as $i) {
- $totaldownloads = nombreEntree($downloadscat_arr[$i]->getVar('loc_cat_id'), '1');
- $subcategories_arr = $mytree->getFirstChild($downloadscat_arr[$i]->getVar('loc_cat_id'));
- $chcount = 0;
- $subcategories = '';
- //pour les mots clef
- $keywords .= $downloadscat_arr[$i]->getVar('title') . ',';
- foreach (array_keys($subcategories_arr) as $j) {
- if ($chcount>=$xoopsModuleConfig['nbsouscat']){
- $subcategories .= '<li>[<a href='' . XOOPS_URL . '/modules/xaddresses/viewcat.php?cat_id=' . $downloadscat_arr[$i]->getVar('loc_cat_id') . ''>+</a>]</li>';
- break;
- }
- $subcategories .= '<li><a href='' . XOOPS_URL . '/modules/xaddresses/viewcat.php?loc_cat_id=' . $subcategories_arr[$j]->getVar('loc_cat_id') . ''>' . $subcategories_arr[$j]->getVar('title') . '</a></li>';
- $keywords .= $downloadscat_arr[$i]->getVar('title') . ',';
- $chcount++;
- }
- $xoopsTpl->append('viewableCategoriesId', array('image' => $uploadurl . $downloadscat_arr[$i]->getVar('imgurl'), 'id' => $downloadscat_arr[$i]->getVar('loc_cat_id'), 'title' => $downloadscat_arr[$i]->getVar('title'), 'description_main' => $downloadscat_arr[$i]->getVar('description_main'), 'subcategories' => $subcategories, 'totaldownloads' => $totaldownloads, 'count' => $count));
- $count++;
-}
-*/
-// Get
-// Get more recents locations list
-if($xoopsModuleConfig['index_list_recent'] == true) {
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('loc_status', 0, '!='));
- $criteria->add(new Criteria('loc_cat_id', '(' . implode(',', $viewableCategoriesIds) . ')','IN'));
- $criteria->setSort('loc_date');
- $criteria->setOrder('DESC');
- $criteria->setLimit($xoopsModuleConfig['index_list_number']);
- $locations = $locationHandler->getall($criteria);
- foreach ($locations as $location) {
- $title = $location->getVar('loc_title');
- if (strlen($title) >= $xoopsModuleConfig['index_list_titlelenght']) {
- $title = substr($title, 0, ($xoopsModuleConfig['index_list_titlelenght'])) . '...';
- }
- $date = formatTimestamp($location->getVar('loc_date'), 's');
- $xoopsTpl->append('index_list_recent', array(
- 'loc_id' => $location->getVar('loc_id'),
- 'loc_cat_id' => $location->getVar('loc_cat_id'),
- 'loc_date' => $date,
- 'loc_title' => $title
- ));
- }
- unset($locations);
-}
-
-// Get top rated locations list
-if($xoopsModuleConfig['index_list_toprated'] == true) {
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('loc_status', 0, '!='));
- $criteria->add(new Criteria('loc_cat_id', '(' . implode(',', $viewableCategoriesIds) . ')','IN'));
- $criteria->setSort('loc_rating');
- $criteria->setOrder('DESC');
- $criteria->setLimit($xoopsModuleConfig['index_list_number']);
- $locations = $locationHandler->getall($criteria);
- foreach ($locations as $location) {
- $title = $location->getVar('loc_title');
- if (strlen($title) >= $xoopsModuleConfig['index_list_titlelenght']) {
- $title = substr($title,0,($xoopsModuleConfig['index_list_titlelenght'])) . '...';
- }
- $rating = number_format($location->getVar('rating'), 1);
- $xoopsTpl->append('index_list_toprated', array(
- 'loc_id' => $location->getVar('loc_id'),
- 'loc_cat_id' => $location->getVar('loc_cat_id'),
- 'loc_rating' => $rating,
- 'loc_title' => $title
- ));
- }
- unset($locations);
-}
-
-/*
-//plus t\xE9l\xE9charg\xE9s
-if($xoopsModuleConfig['blpop']==1){
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('status', 0, '!='));
- $criteria->add(new Criteria('loc_cat_id', '(' . implode(',', $viewableCategoriesIds) . ')','IN'));
- $criteria->setSort('hits');
- $criteria->setOrder('DESC');
- $criteria->setLimit($xoopsModuleConfig['index_show_number']);
- $downloads_arr = $locationHandler->getall($criteria);
- foreach (array_keys($downloads_arr) as $i) {
- $title = $downloads_arr[$i]->getVar('title');
- if (strlen($title) >= $xoopsModuleConfig['index_list_titlelenght']) {
- $title = substr($title,0,($xoopsModuleConfig['index_list_titlelenght'])) . '...';
- }
- $xoopsTpl->append('bl_pop', array(
- 'id' => $downloads_arr[$i]->getVar('loc_id'),
- 'loc_cat_id' => $downloads_arr[$i]->getVar('loc_cat_id'),
- 'hits' => $downloads_arr[$i]->getVar('hits'),
- 'title' => $title
- ));
- }
-}
-
-// affichage des t\xE9l\xE9chargements
-//Utilisation d'une copie d'\xE9cran avec la largeur selon les pr\xE9f\xE9rences
-
-$criteria = new CriteriaCompo();
-$criteria->add(new Criteria('status', 0, '!='));
-$criteria->add(new Criteria('loc_cat_id', '(' . implode(',', $viewableCategoriesIds) . ')','IN'));
-$numrows = $locationHandler->getCount($criteria);
-$xoopsTpl->assign('lang_thereare', sprintf(_MD_XADDRESSES_INDEX_THEREARE,$numrows));
-$criteria->setLimit($xoopsModuleConfig['newdownloads']);
-$tblsort = array();
-$tblsort[1]='date';
-$tblsort[2]='date';
-$tblsort[3]='hits';
-$tblsort[4]='hits';
-$tblsort[5]='rating';
-$tblsort[6]='rating';
-$tblsort[7]='title';
-$tblsort[8]='title';
-$tblorder = array();
-$tblorder[1]='DESC';
-$tblorder[2]='ASC';
-$tblorder[3]='DESC';
-$tblorder[4]='ASC';
-$tblorder[5]='DESC';
-$tblorder[6]='ASC';
-$tblorder[7]='DESC';
-$tblorder[8]='ASC';
-$sort = isset($xoopsModuleConfig['toporder']) ? $xoopsModuleConfig['toporder'] : 1;
-$order = isset($xoopsModuleConfig['toporder']) ? $xoopsModuleConfig['toporder'] : 1;
-$criteria->setSort($tblsort[$sort]);
-$criteria->setOrder($tblorder[$order]);
-$downloads_arr = $locationHandler->getall($criteria);
-
-foreach (array_keys($downloads_arr) as $i) {
- $dtitle = $downloads_arr[$i]->getVar('title');
- $url = $downloads_arr[$i]->getVar('url');
- $logourl = $downloads_arr[$i]->getVar('logourl');
- $logourl = $uploadurl_shots . $logourl;
- $datetime = formatTimestamp($downloads_arr[$i]->getVar('date'),'s');
- $loc_cat_id = $downloads_arr[$i]->getVar('loc_cat_id');
- $loc_id = $downloads_arr[$i]->getVar('loc_id');
- $submitter = XoopsUser::getUnameFromId($downloads_arr[$i]->getVar('submitter'));
- $description = $downloads_arr[$i]->getVar('description');
- // pour r\xE9f\xE9rentiel de module
- $description = str_replace('[block]','<h2><u>' . _MD_XADDRESSES_SUP_BLOCS . '</u></h2>',$description);
- $description = str_replace('[notes]','<h2><u>' . _MD_XADDRESSES_SUP_NOTES . '</u></h2>',$description);
- $description = str_replace('[evolutions]','<h2><u>' . _MD_XADDRESSES_SUP_EVOLUTIONS . '</u></h2>',$description);
- $description = str_replace('[infos]','<h2><u>' . _MD_XADDRESSES_SUP_INFOS . '</u></h2>',$description);
- $description = str_replace('[changelog]','<h2><u>' . _MD_XADDRESSES_SUP_CHANGELOG . '</u></h2>',$description);
- $description = str_replace('[backoffice]','<h2><u>' . _MD_XADDRESSES_SUP_BACKOFFICE . '</u></h2>',$description);
- $description = str_replace('[frontoffice]','<h2><u>' . _MD_XADDRESSES_SUP_FRONTOFFICE . '</u></h2>',$description);
- //permet d'afficher uniquement la description courte
- if (strpos($description,'[pagebreak]')==false){
- $description_short = $description;
- } else {
- $description_short = substr($description,0,strpos($description,'[pagebreak]'));
- }
- // pour les vignettes 'new' et 'mis \xE0 jour'
- $new = nouveau_image($downloads_arr[$i]->getVar('date'), $downloads_arr[$i]->getVar('status'));
- $pop = populaire_image($downloads_arr[$i]->getVar('hits'));
-
- // D\xE9fini si la personne est un admin
- if (is_object($GLOBALS['xoopsUser']) && $GLOBALS['xoopsUser']->isAdmin($xoopsModule->mid())) {
- $adminlink = '<a href='' . XOOPS_URL . '/modules/TDMDownloads/admin/addresses.php?op=view_downloads&downloads_loc_id=' . $loc_id . '' title='' . _MD_XADDRESSES_EDITTHISDL . ''><img src='' . XOOPS_URL . '/modules/TDMDownloads/images/editicon.png' width='16px' height='16px' border='0' alt='' . _MD_XADDRESSES_EDITTHISDL . '' /></a>';
- } else {
- $adminlink = '';
- }
- $xoopsTpl->append('file', array('id' => $loc_id,'loc_cat_id'=>$loc_cat_id, 'title' => $dtitle.$new.$pop,'logourl' => $logourl,'updated' => $datetime,'description_short' => $description_short,
- 'adminlink' => $adminlink, 'submitter' => $submitter));
- //pour les mots clef
- $keywords .= $dtitle . ',';
-}
-// r\xE9f\xE9rencement
-//description
-$xoTheme->addMeta('meta', 'description', strip_tags($xoopsModule->name()));
-//keywords
-$keywords = substr($keywords,0,-1);
-$xoTheme->addMeta('meta', 'keywords', $keywords);
-*/
-include XOOPS_ROOT_PATH . '/footer.php';
-?>
\ No newline at end of file
Deleted: XoopsModules/xaddresses/trunk/xaddresses/xoops_version.php
===================================================================
--- XoopsModules/xaddresses/trunk/xaddresses/xoops_version.php 2012-07-24 21:18:59 UTC (rev 9918)
+++ XoopsModules/xaddresses/trunk/xaddresses/xoops_version.php 2012-07-24 21:20:35 UTC (rev 9919)
@@ -1,516 +0,0 @@
-<?php
-if (!defined('XOOPS_ROOT_PATH')){ exit(); }
-$dirname = basename( dirname( __FILE__ ) ) ;
-
-xoops_load('XoopsLists');
-
-$modversion['name'] = _MI_XADDRESSES_NAME;
-$modversion['version'] = '1.0';
-$modversion['description'] = _MI_XADDRESSES_DESC;
-$modversion['author'] = "Rota Lucio";
-$modversion['author_mail'] = 'luc...@gm...';
-$modversion['author_website_url'] = 'http://luciorota.altervista.org';
-$modversion['author_website_name'] = 'http://luciorota.altervista.org';
-$modversion['credits'] = "XOOPS";
-$modversion['help'] = 'page=help';
-$modversion['license'] = 'GNU GPL 2.0 see Licence';
-$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/";
-
-$modversion['release_info'] = "RC";
-$modversion['release_file'] = XOOPS_URL."/modules/{$dirname}/docs/RC";
-$modversion['release_date'] = "2012/07/23"; // 'Y/m/d'
-
-$modversion['manual'] = 'Help';
-$modversion['manual_file'] = XOOPS_URL."/modules/{$dirname}/docs/help.html";
-$modversion['min_php'] = '5.2';
-$modversion['min_xoops'] = '2.4.5'; // 'XOOPS 2.5';
-$modversion['min_admin']= '1.1';
-$modversion['min_db']= array('mysql'=>'5.0.7', 'mysqli'=>'5.0.7');
-$modversion['image'] = "images/xaddresses_slogo.png";
-$modversion['dirname'] = "{$dirname}";
-$modversion['official'] = false;
-
-$modversion['dirmoduleadmin'] = "Frameworks/moduleclasses";
-$modversion['icons16'] = "modules/{$dirname}/images/icons/16x16";
-$modversion['icons32'] = "modules/{$dirname}/images/icons/32x32";
-
-//About
-$modversion['demo_site_url'] = "IN PROGRESS";
-$modversion['demo_site_name'] = "IN PROGRESS";
-$modversion['forum_site_url'] = "IN PROGRESS";
-$modversion['forum_site_name'] = "IN PROGRESS";
-$modversion['module_website_url'] = "IN PROGRESS";
-$modversion['module_website_name'] = "IN PROGRESS";
-//$modversion['support_site_url'] = "http://www.xoops.org";
-//$modversion['support_site_name'] = "www.xoops.org";
-$modversion['release'] = "release";
-$modversion['module_status'] = 'In progress'; //"Stable";
-
-// Admin things
-$modversion['hasAdmin'] = true;
-// Admin system menu
-$modversion['system_menu'] = true;
-$modversion['adminindex'] = "admin/index.php";
-$modversion['adminmenu'] = "admin/menu.php";
-// Mysql file
-$modversion['sqlfile']['mysql'] = "sql/mysql.sql";
-// Mysql file
-$modversion['sqlfile']['mysql'] = "sql/mysql.sql";
-// Tables created by sql file (without prefix!)
-$modversion['tables'][0] = "xaddresses_locationcategory";
-$modversion['tables'][1] = "xaddresses_location";
-
-$modversion['tables'][2] = "xaddresses_fieldcategory";
-$modversion['tables'][3] = "xaddresses_field";
-// IN PROGRESS
-$modversion['tables'][4] = "xaddresses_broken";
-$modversion['tables'][5] = "xaddresses_modify";
-$modversion['tables'][6] = "xaddresses_votedata";
-// TO DO
-$modversion['tables'][7] = "xaddresses_marker";
-
-// Scripts to run upon installation or update
-$modversion['onInstall'] = 'include/install_function.php';
-//$modversion['onUpdate'] = 'include/update_function.php';
-$modversion['onUninstall'] = 'include/uninstall_function.php';
-
-// Menu
-$modversion['hasMain'] = true;
-if (is_object($GLOBALS['xoopsModule']) && $GLOBALS['xoopsModule']->getVar('dirname') == $modversion['dirname']) {
- $i = 0;
- $isAdmin = false;
- if (!empty($GLOBALS['xoopsUser'])) {
- //$modversion['sub'][0]['name'] = _MI_XADDRESSES_TODO;
- //$modversion['sub'][0]['url'] = "public-useralbum.php?id=".$GLOBALS['xoopsUser']->uid();
- // Check if xoopsUser is a module administrator
- $isAdmin = ($GLOBALS['xoopsUser']->isAdmin($GLOBALS['xoopsModule']->getVar('mid')));
- }
- // Add the Submit new item button
- if ($isAdmin || (isset($GLOBALS['xoopsModuleConfig']['allowsubmit']) &&
- $GLOBALS['xoopsModuleConfig']['allowsubmit'] == true &&
- (is_object($GLOBALS['xoopsUser']) ||
- (isset($GLOBALS['xoopsModuleConfig']['anonpost']) && $GLOBALS['xoopsModuleConfig']['anonpost'] == 1)))) {
- $i++;
- $modversion['sub'][$i]['name'] = _MI_XADDRESSES_SUBMIT;
- $modversion['sub'][$i]['url'] = "locationedit.php?op=new_location";
- }
- $i++;
- $modversion['sub'][$i]['name'] = _MI_XADDRESSES_SEARCH;
- $modversion['sub'][$i]['url'] = "locationsearch.php";
- if ($isAdmin) {
- $i++;
- $modversion['sub'][$i]['name'] = _MI_XADDRESSES_ADMIN;
- $modversion['sub'][$i]['url'] = "admin/index.php";
- }
-}
-
-// Pour les blocs
-$modversion['blocks'][1]['file'] = "xaddresses_top.php";
-$modversion['blocks'][1]['name'] = _MI_XADDRESSES_BNAME1;
-$modversion['blocks'][1]['description'] = _MI_XADDRESSES_BNAMEDSC1;
-$modversion['blocks'][1]['show_func'] = "b_xaddresses_top_show";
-$modversion['blocks'][1]['edit_func'] = "b_xaddresses_top_edit";
-$modversion['blocks'][1]['options'] = "date|10|19|0";
-$modversion['blocks'][1]['template'] = 'xaddresses_block_new.html';
-
-$modversion['blocks'][2]['file'] = "xaddresses_top.php";
-$modversion['blocks'][2]['name'] = _MI_XADDRESSES_BNAME2;
-$modversion['blocks'][2]['description'] = _MI_XADDRESSES_BNAMEDSC2;
-$modversion['blocks'][2]['show_func'] = "b_xaddresses_top_show";
-$modversion['blocks'][2]['edit_func'] = "b_xaddresses_top_edit";
-$modversion['blocks'][2]['options'] = "hits|10|19|0";
-$modversion['blocks'][2]['template'] = 'xaddresses_block_top.html';
-
-$modversion['blocks'][3]['file'] = "xaddresses_top.php";
-$modversion['blocks'][3]['name'] = _MI_XADDRESSES_BNAME3;
-$modversion['blocks'][3]['description'] = _MI_XADDRESSES_BNAMEDSC3;
-$modversion['blocks'][3]['show_func'] = "b_xaddresses_top_show";
-$modversion['blocks'][3]['edit_func'] = "b_xaddresses_top_edit";
-$modversion['blocks'][3]['options'] = "rating|10|19|0";
-$modversion['blocks'][3]['template'] = 'xaddresses_block_rating.html';
-
-$modversion['blocks'][4]['file'] = "xaddresses_top.php";
-$modversion['blocks'][4]['name'] = _MI_XADDRESSES_BNAME4;
-$modversion['blocks'][4]['description'] = _MI_XADDRESSES_BNAMEDSC4;
-$modversion['blocks'][4]['show_func'] = "b_xaddresses_top_show";
-$modversion['blocks'][4]['edit_func'] = "b_xaddresses_top_edit";
-$modversion['blocks'][4]['options'] = "random|10|19|0";
-$modversion['blocks'][4]['template'] = 'xaddresses_block_random.html';
-
-
-
-// Search
-$modversion['hasSearch'] = true;
-$modversion['search']['file'] = "include/search_functions.php";
-$modversion['search']['func'] = "xaddresses_search";
-
-
-
-// Comments
-$modversion['hasComments'] = true;
-$modversion['comments']['itemName'] = 'loc_id';
-$modversion['comments']['pageName'] = 'locationview.php';
-$modversion['comments']['extraParams'] = array('loc_cat_id');
-// Comment callback functions
-$modversion['comments']['callbackFile'] = 'include/comment_functions.php';
-$modversion['comments']['callback']['approve'] = 'xaddresses_com_approve';
-$modversion['comments']['callback']['update'] = 'xaddresses_com_update';
-
-
-
-// Templates
-$i = 0;
-$i++;
-$modversion['templates'][$i]['file'] = 'xaddresses_index.html';
-$modversion['templates'][$i]['description'] = '';
-$i++;
-$modversion['templates'][$i]['file'] = 'xaddresses_locationcategoryview.html';
-$modversion['templates'][$i]['description'] = '';
-$i++;
-$modversion['templates'][$i]['file'] = 'xaddresses_locationview.html';
-$modversion['templates'][$i]['description'] = '';
-$i++;
-$modversion['templates'][$i]['file'] = 'xaddresses_locationedit.html';
-$modversion['templates'][$i]['description'] = '';
-$i++;
-$modversion['templates'][$i]['file'] = 'xaddresses_locationbroken.html';
-$modversion['templates'][$i]['description'] = '';
-$i++;
-$modversion['templates'][$i]['file'] = 'xaddresses_locationrate.html';
-$modversion['templates'][$i]['description'] = '';
-$i++;
-$modversion['templates'][$i]['file'] = 'xaddresses_locationmodify.html';
-$modversion['templates'][$i]['description'] = '';
-$i++;
-$modversion['templates'][$i]['file'] = 'xaddresses_locationsearch.html';
-$modversion['templates'][$i]['description'] = '';
-$i++;
-$modversion['templates'][$i]['file'] = 'xaddresses_locationsearchresults.html';
-$modversion['templates'][$i]['description'] = '';
-
-// Admin Templates
-$i++;
-$modversion['templates'][$i]['file'] = 'xaddresses_admin_locationcategorylist.html';
-$modversion['templates'][$i]['description'] = '';
-//$modversion['templates'][$i]['type'] = 'admin';
-$i++;
-$modversion['templates'][$i]['file'] = 'xaddresses_admin_locationlist.html';
-$modversion['templates'][$i]['description'] = '';
-//$modversion['templates'][$i]['type'] = 'admin';
- $i++;
- $modversion['templates'][$i]['file'] = 'xaddresses_admin_locationbrokenlist.html';
- $modversion['templates'][$i]['description'] = '';
- //$modversion['templates'][$i]['type'] = 'admin';
- $i++;
- $modversion['templates'][$i]['file'] = 'xaddresses_admin_locationmodifylist.html';
- $modversion['templates'][$i]['description'] = '';
- //$modversion['templates'][$i]['type'] = 'admin';
-$i++;
-$modversion['templates'][$i]['file'] = 'xaddresses_admin_fieldcategorylist.html';
-$modversion['templates'][$i]['description'] = '';
-//$modversion['templates'][$i]['type'] = 'admin';
-$i++;
-$modversion['templates'][$i]['file'] = 'xaddresses_admin_fieldlist.html';
-$modversion['templates'][$i]['description'] = '';
-//$modversion['templates'][$i]['type'] = 'admin';
-
-// Image Manager Templates
-$i++;
-$modversion['templates'][$i]['file'] = 'xaddresses_imagemanager.html';
-$modversion['templates'][$i]['description'] = '';
-$i++;
-$modversion['templates'][$i]['file'] = 'xaddresses_imagemanager2.html';
-$modversion['templates'][$i]['description'] = '';
-
-
-
-// Preferences
-// FOR FUTURE XOOPS VERSIONS
-/*
-$i = 0;
-$i++;
-$modversion['config']['category'][$i]['name'] = 'global';
-$modversion['config']['category'][$i]['title'] = _MI_XADDRESSES_GLOBAL_CONFIG;
-$modversion['config']['category'][$i]['description'] = _MI_XADDRESSES_GLOBAL_CONFIG_DESC;
-$i++;
-$modversion['config']['category'][$i]['name'] = 'category';
-$modversion['config']['category'][$i]['title'] = _MI_XADDRESSES_CATEGORY_CONFIG;
-$modversion['config']['category'][$i]['description'] = _MI_XADDRESSES_CATEGORY_CONFIG_DESC;
-$i++;
-$modversion['config']['category'][$i]['name'] = 'location';
-$modversion['config']['category'][$i]['title'] = _MI_XADDRESSES_LOCATION_CONFIG;
-$modversion['config']['category'][$i]['description'] = _MI_XADDRESSES_LOCATION_CONFIG_DESC;
-*/
-
-$i = 0;
-$i++;
- $modversion['config'][$i]['name'] = 'google_apikey';
- $modversion['config'][$i]['title'] = '_MI_XADDRESSES_GOOGLE_APIKEY';
- $modversion['config'][$i]['description'] = '_MI_XADDRESSES_GOOGLE_APIKEY_DESC';
- $modversion['config'][$i]['formtype'] = 'textbox';
- $modversion['config'][$i]['valuetype'] = 'text';
- $modversion['config'][$i]['default'] = '';
- $modversion["config"][$i]["category"] = "global";
-$i++;
- $modversion['config'][$i]['name'] = 'popular';
- $modversion['config'][$i]['title'] = '_MI_XADDRESSES_POPULAR';
- $modversion['config'][$i]['description'] = '_MI_XADDRESSES_POPULAR_DESC';
- $modversion['config'][$i]['formtype'] = 'textbox';
- $modversion['config'][$i]['valuetype'] = 'int';
- $modversion['config'][$i]['default'] = 100;
- $modversion["config"][$i]["category"] = "global";
- $i++;
- $modversion['config'][$i]['name'] = 'nbsouscat';
- $modversion['config'][$i]['title'] = '_MI_XADDRESSES_SUBCATPARENT';
- $modversion['config'][$i]['description'] = '_MI_XADDRESSES_SUBCATPARENT_DESC';
- $modversion['config'][$i]['formtype'] = 'textbox';
- $modversion['config'][$i]['valuetype'] = 'int';
- $modversion['config'][$i]['default'] = 5;
- $modversion["config"][$i]["category"] = "global";
-$i++;
-$modversion['config'][$i]['name'] = 'index_list_recent';
-$modversion['config'][$i]['title'] = '_MI_XADDRESSES_LIST_RECENT';
-$modversion['config'][$i]['description'] = '_MI_XADDRESSES_LIST_RECENT_DESC';
-$modversion['config'][$i]['formtype'] = 'yesno';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 1; // true
-$modversion["config"][$i]["category"] = "global";
- $i++;
- $modversion['config'][$i]['name'] = 'blpop';
- $modversion['config'][$i]['title'] = '_MI_XADDRESSES_BLPOP';
- $modversion['config'][$i]['description'] = '_MI_XADDRESSES_BLPOP_DESC';
- $modversion['config'][$i]['formtype'] = 'yesno';
- $modversion['config'][$i]['valuetype'] = 'int';
- $modversion['config'][$i]['default'] = 1; // true
- $modversion["config"][$i]["category"] = "global";
-$i++;
-$modversion['config'][$i]['name'] = 'index_list_toprated';
-$modversion['config'][$i]['title'] = '_MI_XADDRESSES_LIST_TOPRATED';
-$modversion['config'][$i]['description'] = '_MI_XADDRESSES_LIST_TOPRATED_DESC';
-$modversion['config'][$i]['formtype'] = 'yesno';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 1; // true
-$modversion["config"][$i]["category"] = "global";
-$i++;
-$modversion['config'][$i]['name'] = 'index_list_number';
-$modversion['config'][$i]['title'] = '_MI_XADDRESSES_LIST_NUMBER';
-$modversion['config'][$i]['description'] = '_MI_XADDRESSES_LIST_NUMBER_DESC';
-$modversion['config'][$i]['formtype'] = 'textbox';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 5;
-$modversion["config"][$i]["category"] = "global";
-$i++;
-$modversion['config'][$i]['name'] = 'index_list_titlelenght';
-$modversion['config'][$i]['title'] = '_MI_XADDRESSES_LIST_TITLELENGHT';
-$modversion['config'][$i]['description'] = '_MI_XADDRESSES_LIST_TITLELENGHT_DESC';
-$modversion['config'][$i]['formtype'] = 'textbox';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 20;
-$modversion["config"][$i]["category"] = "global";
-$i++;
-$modversion['config'][$i]['name'] = 'show_home_in_breadcrumb';
-$modversion['config'][$i]['title'] = '_MI_XADDRESSES_SHOWHOMEINBREADCRUMB';
-$modversion['config'][$i]['description'] = '_MI_XADDRESSES_SHOWHOMEINBREADCRUMB_DESC';
-$modversion['config'][$i]['formtype'] = 'yesno';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 1; // true/yes
-$modversion["config"][$i]["category"] = "global";
-$i++;
-$modversion['config'][$i]['name'] = 'usetellafriend';
-$modversion['config'][$i]['title'] = '_MI_XADDRESSES_USETELLAFRIEND';
-$modversion['config'][$i]['description'] = '_MI_XADDRESSES_USETELLAFRIEND_DESC';
-$modversion['config'][$i]['formtype'] = 'yesno';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 0; // false/no
-$modversion["config"][$i]["category"] = "global";
-$i++;
-$modversion['config'][$i]['name'] = 'usetag';
-$modversion['config'][$i]['title'] = '_MI_XADDRESSES_USETAG';
-$modversion['config'][$i]['description'] = '_MI_XADDRESSES_USETAG_DESC';
-$modversion['config'][$i]['formtype'] = 'yesno';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 0; // false/no
-$modversion["config"][$i]["category"] = "global";
-$i++;
-$modversion['config'][$i]['name'] = 'useajaxfilemanager';
-$modversion['config'][$i]['title'] = '_MI_XADDRESSES_USEAJAXFILEMANAGER';
-$modversion['config'][$i]['description'] = '_MI_XADDRESSES_USAJAXFILEMANAGER_DESC';
-$modversion['config'][$i]['formtype'] = 'yesno';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 0; // false/no
-$modversion["config"][$i]["category"] = "global";
- $i++;
- $modversion['config'][$i]['name'] = 'autoapprove';
- $modversion['config'][$i]['title'] = '_MI_XADDRESSES_AUTOAPPROVE';
- $modversion['config'][$i]['description'] = '_MI_XADDRESSES_AUTOAPPROVE_DESC';
- $modversion['config'][$i]['formtype'] = 'yesno';
- $modversion['config'][$i]['valuetype'] = 'int';
- $modversion['config'][$i]['default'] = 0;
- $modversion["config"][$i]["category"] = "global";
-$i++;
-$modversion["config"][$i]["name"] = "editor";
-$modversion["config"][$i]["title"] = "_MI_XADDRESSES_FORM_OPTIONS";
-$modversion["config"][$i]["description"] = "_MI_XADDRESSES_FORM_OPTIONS_DESC";
-$modversion["config"][$i]["formtype"] = "select";
-$modversion["config"][$i]["valuetype"] = "text";
-$modversion["config"][$i]["default"] = "dhtmltextarea";
-$modversion["config"][$i]["options"] = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . "/class/xoopseditor");
-$modversion["config"][$i]["category"] = "global";
- $i++;
- $modversion['config'][$i]['name'] = 'toporder';
- $modversion['config'][$i]['title'] = '_MI_XADDRESSES_TOPORDER';
- $modversion['config'][$i]['description'] = '_MI_XADDRESSES_TOPORDER_DESC';
- $modversion['config'][$i]['formtype'] = 'select';
- $modversion['config'][$i]['valuetype'] = 'int';
- $modversion['config'][$i]['default'] = 1;
- $modversion['config'][$i]['options'] = array('_MI_XADDRESSES_TOPORDER1' => 1, '_MI_XADDRESSES_TOPORDER2' => 2, '_MI_XADDRESSES_TOPORDER3' => 3, '_MI_XADDRESSES_TOPORDER4' => 4, '_MI_XADDRESSES_TOPORDER5' => 5, '_MI_XADDRESSES_TOPORDER6' => 6, '_MI_XADDRESSES_TOPORDER7' => 7, '_MI_XADDRESSES_TOPORDER8' => 8);
- $modversion["config"][$i]["category"] = "global";
- $i++;
- $modversion['config'][$i]['name'] = 'newdownloads';
- $modversion['config'][$i]['title'] = '_MI_XADDRESSES_NEWDLS';
- $modversion['config'][$i]['description'] = '_MI_XADDRESSES_NEWDLS_DESC';
- $modversion['config'][$i]['formtype'] = 'textbox';
- $modversion['config'][$i]['valuetype'] = 'int';
- $modversion['config'][$i]['default'] = 10;
- $modversion["config"][$i]["category"] = "global";
- $i++;
- $modversion['config'][$i]['name'] = 'searchorder';
- $modversion['config'][$i]['title'] = '_MI_XADDRESSES_SEARCHORDER';
- $modversion['config'][$i]['description'] = '_MI_XADDRESSES_SEARCHORDER_DESC';
- $modversion['config'][$i]['formtype'] = 'select';
- $modversion['config'][$i]['valuetype'] = 'int';
- $modversion['config'][$i]['default'] = 8;
- $modversion['config'][$i]['options'] = array('_MI_XADDRESSES_TOPORDER1' => 1, '_MI_XADDRESSES_TOPORDER2' => 2, '_MI_XADDRESSES_TOPORDER3' => 3, '_MI_XADDRESSES_TOPORDER4' => 4, '_MI_XADDRESSES_TOPORDER5' => 5, '_MI_XADDRESSES_TOPORDER6' => 6, '_MI_XADDRESSES_TOPORDER7' => 7, '_MI_XADDRESSES_TOPORDER8' => 8);
- $modversion["config"][$i]["category"] = "global";
- $i++;
- $modversion['config'][$i]['name'] = 'perpageliste';
- $modversion['config'][$i]['title'] = '_MI_XADDRESSES_PERPAGELISTE';
- $modversion['config'][$i]['description'] = '_MI_XADDRESSES_PERPAGELISTE_DESC';
- $modversion['config'][$i]['formtype'] = 'textbox';
- $modversion['config'][$i]['valuetype'] = 'int';
- $modversion['config'][$i]['default'] = 15;
- $modversion["config"][$i]["category"] = "global";
- $i++;
- $modversion['config'][$i]['name'] = 'perpage';
- $modversion['config'][$i]['title'] = '_MI_XADDRESSES_PERPAGE';
- $modversion['config'][$i]['description'] = '_MI_XADDRESSES_PERPAGE_DESC';
- $modversion['config'][$i]['formtype'] = 'textbox';
- $modversion['config'][$i]['valuetype'] = 'int';
- $modversion['config'][$i]['default'] = 10;
- $modversion["config"][$i]["category"] = "global";
- $i++;
- $modversion['config'][$i]['name'] = 'perpageadmin';
- $modversion['config'][$i]['title'] = '_MI_XADDRESSES_PERPAGEADMIN';
- $modversion['config'][$i]['description'] = '_MI_XADDRESSES_PERPAGEADMIN_DESC';
- $modversion['config'][$i]['formtype'] = 'textbox';
- $modversion['config'][$i]['valuetype'] = 'int';
- $modversion['config'][$i]['default'] = 15;
- $modversion["config"][$i]["category"] = "global";
- $i++;
- $modversion['config'][$i]['name'] = 'showupdated';
- $modversion['config'][$i]['title'] = '_MI_XADDRESSES_SHOW_UPDATED';
- $modversion['config'][$i]['description'] = '_MI_XADDRESSES_SHOW_UPDATED_DESC';
- $modversion['config'][$i]['formtype'] = 'yesno';
- $modversion['config'][$i]['valuetype'] = 'int';
- $modversion['config'][$i]['default'] = 1;
- $modversion["config"][$i]["category"] = "global";
-
-
-
-// Notifications
-$modversion['hasNotification'] = true;
-$modversion['notification']['lookup_file'] = 'include/notification_functions.php';
-$modversion['notification']['lookup_func'] = 'xaddresses_notify_iteminfo';
-
-$i = 0;
-$i++;
-$modversion['notification']['category'][$i]['name'] = 'global';
-$modversion['notification']['category'][$i]['title'] = _MI_XADDRESSES_GLOBAL_NOTIFY;
-$modversion['notification']['category'][$i]['description'] = _MI_XADDRESSES_GLOBAL_NOTIFYDESC;
-$modversion['notification']['category'][$i]['subscribe_from'] = array('index.php', 'locationcategoryview.php', 'locationview.php');
-$i++;
-$modversion['notification']['category'][$i]['name'] = 'category';
-$modversion['notification']['category'][$i]['title'] = _MI_XADDRESSES_CATEGORY_NOTIFY;
-$modversion['notification']['category'][$i]['description'] = _MI_XADDRESSES_CATEGORY_NOTIFYDESC;
-$modversion['notification']['category'][$i]['subscribe_from'] = array('locationcategoryview.php', 'locationview.php');
-$modversion['notification']['category'][$i]['item_name'] = 'cat_id';
-$modversion['notification']['category'][$i]['allow_bookmark'] = true;
-$i++;
-$modversion['notification']['category'][$i]['name'] = 'location';
-$modversion['notification']['category'][$i]['title'] = _MI_XADDRESSES_LOCATION_NOTIFY;
-$modversion['notification']['category'][$i]['description'] = _MI_XADDRESSES_LOCATION_NOTIFYDESC;
-$modversion['notification']['category'][$i]['subscribe_from'] = 'locationview.php';
-$modversion['notification']['category'][$i]['item_name'] = 'loc_id';
-$modversion['notification']['category'][$i]['allow_bookmark'] = true;
-
-$i = 0;
-$i++;
-$modversion['notification']['event'][$i]['name'] = 'new_category';
-$modversion['notification']['event'][$i]['category'] = 'global';
-$modversion['notification']['event'][$i]['title'] = _MI_XADDRESSES_GLOBAL_NEWCATEGORY_NOTIFY;
-$modversion['notification']['event'][$i]['caption'] = _MI_XADDRESSES_GLOBAL_NEWCATEGORY_NOTIFYCAP;
-$modversion['notification']['event'][$i]['description'] = _MI_XADDRESSES_GLOBAL_NEWCATEGORY_NOTIFYDESC;
-$modversion['notification']['event'][$i]['mail_template'] = 'global_newcategory_notify';
-$modversion['notification']['event'][$i]['mail_subject'] = _MI_XADDRESSES_GLOBAL_NEWCATEGORY_NOTIFYSBJ;
-$i++;
-$modversion['notification']['event'][$i]['name'] = 'location_modify';
-$modversion['notification']['event'][$i]['category'] = 'global';
-$modversion['notification']['event'][$i]['admin_only'] = true;
-$modversion['notification']['event'][$i]['title'] = _MI_XADDRESSES_GLOBAL_LOCATIONMODIFY_NOTIFY;
-$modversion['notification']['event'][$i]['caption'] = _MI_XADDRESSES_GLOBAL_LOCATIONMODIFY_NOTIFYCAP;
-$modversion['notification']['event'][$i]['description'] = _MI_XADDRESSES_GLOBAL_LOCATIONMODIFY_NOTIFYDESC;
-$modversion['notification']['event'][$i]['mail_template'] = 'global_locationmodify_notify';
-$modversion['notification']['event'][$i]['mail_subject'] = _MI_XADDRESSES_GLOBAL_LOCATIONMODIFY_NOTIFYSBJ;
-$i++;
-$modversion['notification']['event'][$i]['name'] = 'location_broken';
-$modversion['notification']['event'][$i]['category'] = 'global';
-$modversion['notification']['event'][$i]['admin_only'] = true;
-$modversion['notification']['event'][$i]['title'] = _MI_XADDRESSES_GLOBAL_LOCATIONBROKEN_NOTIFY;
-$modversion['notification']['event'][$i]['caption'] = _MI_XADDRESSES_GLOBAL_LOCATIONBROKEN_NOTIFYCAP;
-$modversion['notification']['event'][$i]['description'] = _MI_XADDRESSES_GLOBAL_LOCATIONBROKEN_NOTIFYDESC;
-$modversion['notification']['event'][$i]['mail_template'] = 'global_locationbroken_notify';
-$modversion['notification']['event'][$i]['mail_subject'] = _MI_XADDRESSES_GLOBAL_LOCATIONBROKEN_NOTIFYSBJ;
-$i++;
-$modversion['notification']['event'][$i]['name'] = 'location_submit';
-$modversion['notification']['event'][$i]['category'] = 'global';
-$modversion['notification']['event'][$i]['admin_only'] = true;
-$modversion['notification']['event'][$i]['title'] = _MI_XADDRESSES_GLOBAL_LOCATIONSUBMIT_NOTIFY;
-$modversion['notification']['event'][$i]['caption'] = _MI_XADDRESSES_GLOBAL_LOCATIONSUBMIT_NOTIFYCAP;
-$modversion['notification']['event'][$i]['description'] = _MI_XADDRESSES_GLOBAL_LOCATIONSUBMIT_NOTIFYDESC;
-$modversion['notification']['event'][$i]['mail_template'] = 'global_locationsubmit_notify';
-$modversion['notification']['event'][$i]['mail_subject'] = _MI_XADDRESSES_GLOBAL_LOCATIONSUBMIT_NOTIFYSBJ;
-$i++;
-$modversion['notification']['event'][$i]['name'] = 'new_location';
-$modversion['notification']['event'][$i]['category'] = 'global';
-$modversion['notification']['event'][$i]['title'] = _MI_XADDRESSES_GLOBAL_NEWLOCATION_NOTIFY;
-$modversion['notification']['event'][$i]['caption'] = _MI_XADDRESSES_GLOBAL_NEWLOCATION_NOTIFYCAP;
-$modversion['notification']['event'][$i]['description'] = _MI_XADDRESSES_GLOBAL_NEWLOCATION_NOTIFYDESC;
-$modversion['notification']['event'][$i]['mail_template'] = 'global_newlocation_notify';
-$modversion['notification']['event'][$i]['mail_subject'] = _MI_XADDRESSES_GLOBAL_NEWLOCATION_NOTIFYSBJ;
-$i++;
-$modversion['notification']['event'][$i]['name'] = 'location_submit';
-$modversion['notification']['event'][$i]['category'] = 'category';
-$modversion['notification']['event'][$i]['admin_only'] = true;
-$modversion['notification']['event'][$i]['title'] = _MI_XADDRESSES_CATEGORY_LOCATIONSUBMIT_NOTIFY;
-$modversion['notification']['event'][$i]['caption'] = _MI_XADDRESSES_CATEGORY_LOCATIONSUBMIT_NOTIFYCAP;
-$modversion['notification']['event'][$i]['description'] = _MI_XADDRESSES_CATEGORY_LOCATIONSUBMIT_NOTIFYDESC;
-$modversion['notification']['event'][$i]['mail_template'] = 'category_locationsubmit_notify';
-$modversion['notification']['event'][$i]['mail_subject'] = _MI_XADDRESSES_CATEGORY_LOCATIONSUBMIT_NOTIFYSBJ;
-$i++;
-$modversion['notification']['event'][$i]['name'] = 'new_location';
-$modversion['notification']['event'][$i]['category'] = 'category';
-$modversion['notification']['event'][$i]['title'] = _MI_XADDRESSES_CATEGORY_NEWLOCATION_NOTIFY;
-$modversion['notification']['event'][$i]['caption'] = _MI_XADDRESSES_CATEGORY_NEWLOCATION_NOTIFYCAP;
-$modversion['notification']['event'][$i]['description'] = _MI_XADDRESSES_CATEGORY_NEWLOCATION_NOTIFYDESC;
-$modversion['notification']['event'][$i]['mail_template'] = 'category_newlocation_notify';
-$modversion['notification']['event'][$i]['mail_subject'] = _MI_XADDRESSES_CATEGORY_NEWLOCATION_NOTIFYSBJ;
-$i++;
-$modversion['notification']['event'][$i]['name'] = 'approve';
-$modversion['notification']['event'][$i]['category'] = 'location';
-$modversion['notification']['event'][$i]['invisible'] = true;
-$modversion['notification']['event'][$i]['title'] = _MI_XADDRESSES_LOCATION_APPROVE_NOTIFY;
-$modversion['notification']['event'][$i]['caption'] = _MI_XADDRESSES_LOCATION_APPROVE_NOTIFYCAP;
-$modversion['notification']['event'][$i]['description'] = _MI_XADDRESSES_LOCATION_APPROVE_NOTIFYDESC;
-$modversion['notification']['event'][$i]['mail_template'] = 'location_approve_notify';
-$modversion['notification']['event'][$i]['mail_subject'] = _MI_XADDRESSES_LOCATION_APPROVE_NOTIFYSBJ;
-?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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] |
|
From: <lor...@us...> - 2012-07-24 10:57:40
|
Revision: 9917
http://xoops.svn.sourceforge.net/xoops/?rev=9917&view=rev
Author: lord_venom
Date: 2012-07-24 10:57:29 +0000 (Tue, 24 Jul 2012)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html
XoopsModules/TDMPicture/trunk/TDMPicture/viewfile.php
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html 2012-07-23 23:14:15 UTC (rev 9916)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html 2012-07-24 10:57:29 UTC (rev 9917)
@@ -165,6 +165,6 @@
<{/if}>
-<br class="clear"/> <br />
+<br class="clear"/><br />
</div>
\ No newline at end of file
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/viewfile.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/viewfile.php 2012-07-23 23:14:15 UTC (rev 9916)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/viewfile.php 2012-07-24 10:57:29 UTC (rev 9917)
@@ -97,7 +97,7 @@
//$cat_cel = $xoopsModuleConfig['tdmpicture_cat_cel'];
$display_cat = $mytree->makeCatBox($file_handler, 'cat_title','-', $ct);
$xoopsTpl->assign('display_cat', $display_cat);
- $xoopsTpl->assign('numfile', $GLOBALS['cat_count']);
+
//navigation
$navigation = '';
@@ -158,7 +158,7 @@
$criteria2->setLimit(1);
$file_arr = $file_handler->getObjects($criteria2);
$numfile = $file_handler->getCount($criteria2);
- //$xoopsTpl->assign('numfile', $numfile);
+ $xoopsTpl->assign('numfile', $numfile);
$file = array();
$files = array();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-07-23 23:14:21
|
Revision: 9916
http://xoops.svn.sourceforge.net/xoops/?rev=9916&view=rev
Author: beckmi
Date: 2012-07-23 23:14:15 +0000 (Mon, 23 Jul 2012)
Log Message:
-----------
Fixed: adding new discount didn't work
Modified Paths:
--------------
XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/discounts.php
XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/products.php
XoopsModules/oledrion/branches/mamba/oledrion/admin/main.php
XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_reductions.php
XoopsModules/oledrion/branches/mamba/oledrion/docs/changelog.txt
Modified: XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/discounts.php
===================================================================
--- XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/discounts.php 2012-07-23 19:58:26 UTC (rev 9915)
+++ XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/discounts.php 2012-07-23 23:14:15 UTC (rev 9916)
@@ -81,8 +81,9 @@
case 'add': // Ajout d'une promotion
case 'edit': // Edition d'une promo
// ****************************************************************************************************************
- xoops_cp_header();
-// oledrion_adminMenu(7);
+
+ xoops_cp_header();
+ //oledrion_adminMenu(7);
if($action == 'edit') {
$title = _AM_OLEDRION_EDIT_DISCOUNT;
$id = isset($_GET['id']) ? intval($_GET['id']) : 0;
@@ -103,8 +104,10 @@
$label_submit = _AM_OLEDRION_ADD;
$edit = false;
}
+
include_once XOOPS_ROOT_PATH.'/class/template.php';
- $xoopsTpl = new XoopsTpl();
+ global $xoopsTpl;
+// $xoopsTpl = new XoopsTpl();
$xoopsTpl->assign('formTitle', $title);
$xoopsTpl->assign('action', 'edit');
$xoopsTpl->assign('baseurl', $baseurl);
@@ -244,8 +247,11 @@
$xoopsTpl->assign('currencyName', oledrion_utils::getModuleOption('money_full'));
//$editor = oledrion_utils::getWysiwygForm(_AM_OLEDRION_DISCOUNT_DESCR, 'disc_description', $item->getVar('disc_description','e'), 15, 60, 'description_hidden');
//$xoopsTpl->assign('editor', $editor->render());
+
$xoopsTpl->display('db:oledrion_admin_discounts.html');
include_once 'admin_footer.php';
+
+
break;
// ****************************************************************************************************************
Modified: XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/products.php
===================================================================
--- XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/products.php 2012-07-23 19:58:26 UTC (rev 9915)
+++ XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/products.php 2012-07-23 23:14:15 UTC (rev 9916)
@@ -756,7 +756,7 @@
echo "<tr>\n";
}
echo '</table>';
- //include_once 'admin_footer.php';
+ include_once 'admin_footer.php';
}
break;
}
Modified: XoopsModules/oledrion/branches/mamba/oledrion/admin/main.php
===================================================================
--- XoopsModules/oledrion/branches/mamba/oledrion/admin/main.php 2012-07-23 19:58:26 UTC (rev 9915)
+++ XoopsModules/oledrion/branches/mamba/oledrion/admin/main.php 2012-07-23 23:14:15 UTC (rev 9916)
@@ -111,5 +111,6 @@
oledrion_utils::redirect(_AM_OLEDRION_SAVE_OK, $baseurl, 2);
break;
}
-xoops_cp_footer();
+//xoops_cp_footer();
+include_once 'admin_footer.php';
?>
\ No newline at end of file
Modified: XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_reductions.php
===================================================================
--- XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_reductions.php 2012-07-23 19:58:26 UTC (rev 9915)
+++ XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_reductions.php 2012-07-23 23:14:15 UTC (rev 9916)
@@ -411,7 +411,7 @@
$caddyCount = count($this->cart);
// Initialisation des totaux g\xE9n\xE9raux (ht, tva et frais de port)
- $totalHT = $totalVAT = $totalShipping = $totalEcotaxe = 0.0;
+ $totalHT = $totalVAT = $totalShipping = $totalEcotaxe = $totalDiscountPrice = 0.0;
// Boucle sur tous les produits et sur chacune des r\xE8gles pour calculer le prix du produit (et ses frais de port) et voir si on doit y appliquer une r\xE9duction
foreach($this->cart as $cartProduct) {
Modified: XoopsModules/oledrion/branches/mamba/oledrion/docs/changelog.txt
===================================================================
--- XoopsModules/oledrion/branches/mamba/oledrion/docs/changelog.txt 2012-07-23 19:58:26 UTC (rev 9915)
+++ XoopsModules/oledrion/branches/mamba/oledrion/docs/changelog.txt 2012-07-23 23:14:15 UTC (rev 9916)
@@ -14,8 +14,9 @@
TODO:
- selecting Product Option should be reflected in total Price
-- Adding new Discount doesn't work
+- make sure that discounts are calculated properly
+
---------------------------------------
2.31 Final 2009-11-08 (Hervet)
---------------------------------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-07-23 19:58:35
|
Revision: 9915
http://xoops.svn.sourceforge.net/xoops/?rev=9915&view=rev
Author: beckmi
Date: 2012-07-23 19:58:26 +0000 (Mon, 23 Jul 2012)
Log Message:
-----------
Restructuring folders
Added Paths:
-----------
XoopsModules/oledrion/releases/2.31/oledrion/.htaccess
XoopsModules/oledrion/releases/2.31/oledrion/admin/
XoopsModules/oledrion/releases/2.31/oledrion/ajax.php
XoopsModules/oledrion/releases/2.31/oledrion/all-lists.php
XoopsModules/oledrion/releases/2.31/oledrion/all-products.php
XoopsModules/oledrion/releases/2.31/oledrion/blocks/
XoopsModules/oledrion/releases/2.31/oledrion/caddy.php
XoopsModules/oledrion/releases/2.31/oledrion/cancel-payment.php
XoopsModules/oledrion/releases/2.31/oledrion/categories-map.php
XoopsModules/oledrion/releases/2.31/oledrion/category.php
XoopsModules/oledrion/releases/2.31/oledrion/cgv.php
XoopsModules/oledrion/releases/2.31/oledrion/changelog.php
XoopsModules/oledrion/releases/2.31/oledrion/checkout.php
XoopsModules/oledrion/releases/2.31/oledrion/class/
XoopsModules/oledrion/releases/2.31/oledrion/comment_delete.php
XoopsModules/oledrion/releases/2.31/oledrion/comment_edit.php
XoopsModules/oledrion/releases/2.31/oledrion/comment_new.php
XoopsModules/oledrion/releases/2.31/oledrion/comment_post.php
XoopsModules/oledrion/releases/2.31/oledrion/comment_reply.php
XoopsModules/oledrion/releases/2.31/oledrion/config.php
XoopsModules/oledrion/releases/2.31/oledrion/dewplayer/
XoopsModules/oledrion/releases/2.31/oledrion/download.php
XoopsModules/oledrion/releases/2.31/oledrion/extra/
XoopsModules/oledrion/releases/2.31/oledrion/gateway-notify.php
XoopsModules/oledrion/releases/2.31/oledrion/header.php
XoopsModules/oledrion/releases/2.31/oledrion/images/
XoopsModules/oledrion/releases/2.31/oledrion/include/
XoopsModules/oledrion/releases/2.31/oledrion/index.php
XoopsModules/oledrion/releases/2.31/oledrion/invoice.php
XoopsModules/oledrion/releases/2.31/oledrion/js/
XoopsModules/oledrion/releases/2.31/oledrion/lang.diff
XoopsModules/oledrion/releases/2.31/oledrion/language/
XoopsModules/oledrion/releases/2.31/oledrion/licence.txt
XoopsModules/oledrion/releases/2.31/oledrion/list.php
XoopsModules/oledrion/releases/2.31/oledrion/list.tag.php
XoopsModules/oledrion/releases/2.31/oledrion/manufacturer.php
XoopsModules/oledrion/releases/2.31/oledrion/media.php
XoopsModules/oledrion/releases/2.31/oledrion/mime/
XoopsModules/oledrion/releases/2.31/oledrion/my-lists.php
XoopsModules/oledrion/releases/2.31/oledrion/notification_update.php
XoopsModules/oledrion/releases/2.31/oledrion/paypal-notify.php
XoopsModules/oledrion/releases/2.31/oledrion/pdf/
XoopsModules/oledrion/releases/2.31/oledrion/plugins/
XoopsModules/oledrion/releases/2.31/oledrion/product.php
XoopsModules/oledrion/releases/2.31/oledrion/rate-product.php
XoopsModules/oledrion/releases/2.31/oledrion/recommended.php
XoopsModules/oledrion/releases/2.31/oledrion/rss.php
XoopsModules/oledrion/releases/2.31/oledrion/search.php
XoopsModules/oledrion/releases/2.31/oledrion/sql/
XoopsModules/oledrion/releases/2.31/oledrion/templates/
XoopsModules/oledrion/releases/2.31/oledrion/thankyou.php
XoopsModules/oledrion/releases/2.31/oledrion/view.tag.php
XoopsModules/oledrion/releases/2.31/oledrion/whoswho.php
XoopsModules/oledrion/releases/2.31/oledrion/xoops_version.php
Removed Paths:
-------------
XoopsModules/oledrion/releases/2.31/.htaccess
XoopsModules/oledrion/releases/2.31/admin/
XoopsModules/oledrion/releases/2.31/ajax.php
XoopsModules/oledrion/releases/2.31/all-lists.php
XoopsModules/oledrion/releases/2.31/all-products.php
XoopsModules/oledrion/releases/2.31/blocks/
XoopsModules/oledrion/releases/2.31/caddy.php
XoopsModules/oledrion/releases/2.31/cancel-payment.php
XoopsModules/oledrion/releases/2.31/categories-map.php
XoopsModules/oledrion/releases/2.31/category.php
XoopsModules/oledrion/releases/2.31/cgv.php
XoopsModules/oledrion/releases/2.31/changelog.php
XoopsModules/oledrion/releases/2.31/checkout.php
XoopsModules/oledrion/releases/2.31/class/
XoopsModules/oledrion/releases/2.31/comment_delete.php
XoopsModules/oledrion/releases/2.31/comment_edit.php
XoopsModules/oledrion/releases/2.31/comment_new.php
XoopsModules/oledrion/releases/2.31/comment_post.php
XoopsModules/oledrion/releases/2.31/comment_reply.php
XoopsModules/oledrion/releases/2.31/config.php
XoopsModules/oledrion/releases/2.31/dewplayer/
XoopsModules/oledrion/releases/2.31/download.php
XoopsModules/oledrion/releases/2.31/extra/
XoopsModules/oledrion/releases/2.31/gateway-notify.php
XoopsModules/oledrion/releases/2.31/header.php
XoopsModules/oledrion/releases/2.31/images/
XoopsModules/oledrion/releases/2.31/include/
XoopsModules/oledrion/releases/2.31/index.php
XoopsModules/oledrion/releases/2.31/invoice.php
XoopsModules/oledrion/releases/2.31/js/
XoopsModules/oledrion/releases/2.31/lang.diff
XoopsModules/oledrion/releases/2.31/language/
XoopsModules/oledrion/releases/2.31/licence.txt
XoopsModules/oledrion/releases/2.31/list.php
XoopsModules/oledrion/releases/2.31/list.tag.php
XoopsModules/oledrion/releases/2.31/manufacturer.php
XoopsModules/oledrion/releases/2.31/media.php
XoopsModules/oledrion/releases/2.31/mime/
XoopsModules/oledrion/releases/2.31/my-lists.php
XoopsModules/oledrion/releases/2.31/notification_update.php
XoopsModules/oledrion/releases/2.31/paypal-notify.php
XoopsModules/oledrion/releases/2.31/pdf/
XoopsModules/oledrion/releases/2.31/plugins/
XoopsModules/oledrion/releases/2.31/product.php
XoopsModules/oledrion/releases/2.31/rate-product.php
XoopsModules/oledrion/releases/2.31/recommended.php
XoopsModules/oledrion/releases/2.31/rss.php
XoopsModules/oledrion/releases/2.31/search.php
XoopsModules/oledrion/releases/2.31/sql/
XoopsModules/oledrion/releases/2.31/templates/
XoopsModules/oledrion/releases/2.31/thankyou.php
XoopsModules/oledrion/releases/2.31/view.tag.php
XoopsModules/oledrion/releases/2.31/whoswho.php
XoopsModules/oledrion/releases/2.31/xoops_version.php
Deleted: XoopsModules/oledrion/releases/2.31/.htaccess
===================================================================
--- XoopsModules/oledrion/releases/2.31/.htaccess 2012-07-23 19:48:32 UTC (rev 9914)
+++ XoopsModules/oledrion/releases/2.31/.htaccess 2012-07-23 19:58:26 UTC (rev 9915)
@@ -1,6 +0,0 @@
-RewriteEngine On
-RewriteRule ^category-([0-9]+)(-).*(\.html)$ category.php?cat_cid=$1
-RewriteRule ^category-([0-9]+)(-)([0-9]+)(-).*(\.html)$ category.php?cat_cid=$1&start=$3
-RewriteRule ^product-([0-9]+)(-).*(\.html)$ product.php?product_id=$1
-RewriteRule ^manufacturer-([0-9]+)(-).*(\.html)$ manufacturer.php?manu_id=$1
-RewriteRule ^list-([0-9]+)(-).*(\.html)$ list.php?list_id=$1
\ No newline at end of file
Deleted: XoopsModules/oledrion/releases/2.31/ajax.php
===================================================================
--- XoopsModules/oledrion/releases/2.31/ajax.php 2012-07-23 19:48:32 UTC (rev 9914)
+++ XoopsModules/oledrion/releases/2.31/ajax.php 2012-07-23 19:58:26 UTC (rev 9915)
@@ -1,123 +0,0 @@
-<?php
-/**
- * ****************************************************************************
- * oledrion - MODULE FOR XOOPS
- * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
- *
- * 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 Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package oledrion
- * @author Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
- *
- * Version : $Id:
- * ****************************************************************************
- */
-
-/**
- * Script pour tout ce qui est relatif \xE0 Ajax et JSON
- *
- * @since 2.3.2009.03.17
- */
-require_once 'header.php';
-error_reporting(0);
-@$xoopsLogger->activated = false;
-
-$op = isset($_POST['op']) ? $_POST['op'] : '';
-if($op =='') {
- $op = isset($_GET['op']) ? $_GET['op'] : '';
-}
-$return = '';
-$uid = oledrion_utils::getCurrentUserID();
-$isAdmin = oledrion_utils::isAdmin();
-
-
-switch($op) {
- // ****************************************************************************************************************
- case 'updatePrice': // Mise \xE0 jour du prix du produit en fonction des attributs s\xE9lectionn\xE9s
- // ****************************************************************************************************************
- $product_id = isset($_POST['product_id']) ? intval($_POST['product_id']) : 0;
- if(isset($_POST['formcontent']) && $product_id > 0) {
- $data = $data = $attributesIds = $attributes = $templateProduct = array();
- $handlers = oledrion_handler::getInstance();
- $product = null;
- $product = $handlers->h_oledrion_products->get($product_id);
- if(!is_object($product)) {
- return _OLEDRION_NA;
- }
- if(!$product->isProductVisible()) {
- return _OLEDRION_NA;
- }
- $vat_id = $product->getVar('product_vat_id');
-
- if( intval($product->getVar('product_discount_price', '')) != 0 ) {
- $productPrice = floatval($product->getVar('product_discount_price', 'e'));
- } else {
- $productPrice = floatval($product->getVar('product_price', 'e'));
- }
-
- parse_str(utf8_decode(urldecode($_POST['formcontent'])), $data);
-/*
- require_once 'FirePHPCore/FirePHP.class.php';
- $firephp = FirePHP::getInstance(true);
- $firephp->log($data, 'Iterators');
-*/
- // On r\xE9cup\xE8re les ID des attributs valoris\xE9s
- foreach($data as $key => $value) {
- $attributesIds[] = oledrion_utils::getId($key);
- }
- if(count($attributesIds) == 0) {
- return _OLEDRION_NA;
- }
- // Puis les attributs
- $attributes = $handlers->h_oledrion_attributes->getItemsFromIds($attributesIds);
- if(count($attributes) == 0) {
- return _OLEDRION_NA;
- }
-
- // Et on recalcule le prix
- foreach($attributes as $attribute) {
- $attributeNameInForm = xoops_trim($attribute->getVar('attribute_name').'_'.$attribute->getVar('attribute_id'));
- if(isset($data[$attributeNameInForm])) {
- $attributeValues = $data[$attributeNameInForm];
- if(is_array($attributeValues)) {
- foreach($attributeValues as $attributeValue) {
- $optionName = oledrion_utils::getName($attributeValue);
- $optionPrice = $attribute->getOptionPriceFromValue($optionName);
- $productPrice += $optionPrice;
- }
- } else {
- $optionPrice = $attribute->getOptionPriceFromValue(oledrion_utils::getName($attributeValues));
- $productPrice += $optionPrice;
- }
- }
- }
- // Mise en template
- include_once XOOPS_ROOT_PATH.'/class/template.php';
- $template = new XoopsTpl();
- $vat = null;
- $vat = $handlers->h_oledrion_vat->get($vat_id);
- $productPriceTTC = oledrion_utils::getAmountWithVat($productPrice, $vat_id);
-
- $oledrion_Currency = oledrion_Currency::getInstance();
-
- $templateProduct = $product->toArray();
- $templateProduct['product_final_price_ht_formated_long'] = $oledrion_Currency->amountForDisplay($productPrice, 'l');
- $templateProduct['product_final_price_ttc_formated_long'] = $oledrion_Currency->amountForDisplay($productPriceTTC, 'l');
- if(is_object($vat)) {
- $templateProduct['product_vat_rate'] = $vat->toArray();
- }
- $templateProduct['product_vat_amount_formated_long'] = $oledrion_Currency->amountForDisplay($productPriceTTC - $productPrice, 'l');
- $template->assign('product', $templateProduct);
- $return = $template->fetch('db:oledrion_product_price.html');
- }
- break;
-}
-echo utf8_encode($return);
-?>
\ No newline at end of file
Deleted: XoopsModules/oledrion/releases/2.31/all-lists.php
===================================================================
--- XoopsModules/oledrion/releases/2.31/all-lists.php 2012-07-23 19:48:32 UTC (rev 9914)
+++ XoopsModules/oledrion/releases/2.31/all-lists.php 2012-07-23 19:58:26 UTC (rev 9915)
@@ -1,63 +0,0 @@
-<?php
-/**
- * ****************************************************************************
- * oledrion - MODULE FOR XOOPS
- * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
- *
- * 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 Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package oledrion
- * @author Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
- *
- * Version : $Id:
- * ****************************************************************************
- */
-
-/**
- * Toutes les listes publiques
- *
- * @param integer $start Position de d\xE9part dans les listes
- */
-require 'header.php';
-$GLOBALS['current_category'] = -1;
-$xoopsOption['template_main'] = 'oledrion_all_lists.html';
-require_once XOOPS_ROOT_PATH.'/header.php';
-require_once XOOPS_ROOT_PATH.'/class/pagenav.php';
-
-$xoopsTpl->assign('mod_pref', $mod_pref); // Pr\xE9f\xE9rences du module
-$start = isset($_GET['start']) ? intval($_GET['start']) : 0;
-$limit = oledrion_utils::getModuleOption('perpage');
-
-if($limit > 0) {
- $handlers = oledrion_handler::getInstance();
- $itemsCount = $handlers->h_oledrion_lists->getRecentListsCount(OLEDRION_LISTS_ALL_PUBLIC);
- if($itemsCount > $limit) {
- $pagenav = new XoopsPageNav( $itemsCount, $limit, $start, 'start');
- $xoopsTpl->assign('pagenav', $pagenav->renderNav());
- }
- $items = array();
- $items = $handlers->h_oledrion_lists->getRecentLists(new oledrion_parameters(array('start' => $start, 'limit' => $limit, 'sort' => 'list_date', 'order' => 'DESC', 'idAsKey' => true, 'listType' => OLEDRION_LISTS_ALL_PUBLIC)));
- if(count($items) > 0) {
- foreach($items as $item) {
- $xoopsTpl->append('lists', $item->toArray());
- }
- }
-}
-
-oledrion_utils::setCSS();
-oledrion_utils::loadLanguageFile('modinfo.php');
-
-$xoopsTpl->assign('global_advert', oledrion_utils::getModuleOption('advertisement'));
-$xoopsTpl->assign('breadcrumb', oledrion_utils::breadcrumb(array(OLEDRION_URL.basename(__FILE__) => _MI_OLEDRION_SMNAME11)));
-
-$title = _MI_OLEDRION_SMNAME11.' - '.oledrion_utils::getModuleName();
-oledrion_utils::setMetas($title, $title);
-require_once XOOPS_ROOT_PATH.'/footer.php';
-?>
\ No newline at end of file
Deleted: XoopsModules/oledrion/releases/2.31/all-products.php
===================================================================
--- XoopsModules/oledrion/releases/2.31/all-products.php 2012-07-23 19:48:32 UTC (rev 9914)
+++ XoopsModules/oledrion/releases/2.31/all-products.php 2012-07-23 19:58:26 UTC (rev 9915)
@@ -1,75 +0,0 @@
-<?php
-/**
- * ****************************************************************************
- * oledrion - MODULE FOR XOOPS
- * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
- *
- * 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 Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package oledrion
- * @author Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
- *
- * Version : $Id:
- * ****************************************************************************
- */
-
-/**
- * Liste de tous les produits du catalogue (en fonction des param\xE8tres du module)
- */
-require 'header.php';
-$GLOBALS['current_category'] = -1;
-$xoopsOption['template_main'] = 'oledrion_allproducts.html';
-require_once XOOPS_ROOT_PATH.'/header.php';
-require_once XOOPS_ROOT_PATH.'/class/pagenav.php';
-
-$categories = $vatArray = array();
-
-// Lecture des TVA
-$vatArray = $h_oledrion_vat->getAllVats(new oledrion_parameters());
-// Pr\xE9f\xE9rences du module
-$xoopsTpl->assign('mod_pref', $mod_pref);
-
-$start = isset($_GET['start']) ? intval($_GET['start']) : 0;
-$limit = oledrion_utils::getModuleOption('perpage');
-
-// Lecture des produits
-$itemsCount = $oledrion_shelf->getProductsCount('recent');
-if($itemsCount > $limit) {
- $pagenav = new XoopsPageNav( $itemsCount, $limit, $start, 'start');
- $xoopsTpl->assign('pagenav', $pagenav->renderNav());
-}
-
-$products = array();
-$oledrion_shelf_parameters->resetDefaultValues()->setProductsType('recent')->setStart($start)->setLimit($limit)->setSort('product_submitted DESC, product_title');
-$products = $oledrion_shelf->getProducts($oledrion_shelf_parameters);
-if(isset($products['lastTitle'])) {
- $lastTitle = strip_tags($products['lastTitle']);
- unset($products['lastTitle']);
-}
-$xoopsTpl->assign('products', $products);
-
-$xoopsTpl->assign('pdf_catalog', oledrion_utils::getModuleOption('pdf_catalog'));
-
-oledrion_utils::setCSS();
-if(!OLEDRION_MY_THEME_USES_JQUERY) {
- oledrion_utils::callJavascriptFile('jquery/jquery.js');
-}
-oledrion_utils::callJavascriptFile('noconflict.js');
-oledrion_utils::callJavascriptFile('tablesorter/jquery.tablesorter.min.js');
-
-oledrion_utils::loadLanguageFile('modinfo.php');
-
-$xoopsTpl->assign('global_advert', oledrion_utils::getModuleOption('advertisement'));
-$xoopsTpl->assign('breadcrumb', oledrion_utils::breadcrumb(array(OLEDRION_URL.basename(__FILE__) => _MI_OLEDRION_SMNAME6)));
-
-$title = _MI_OLEDRION_SMNAME6.' - '.oledrion_utils::getModuleName();
-oledrion_utils::setMetas($title, $title);
-require_once(XOOPS_ROOT_PATH.'/footer.php');
-?>
\ No newline at end of file
Deleted: XoopsModules/oledrion/releases/2.31/caddy.php
===================================================================
--- XoopsModules/oledrion/releases/2.31/caddy.php 2012-07-23 19:48:32 UTC (rev 9914)
+++ XoopsModules/oledrion/releases/2.31/caddy.php 2012-07-23 19:58:26 UTC (rev 9915)
@@ -1,211 +0,0 @@
-<?php
-/**
- * ****************************************************************************
- * oledrion - MODULE FOR XOOPS
- * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
- *
- * 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 Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package oledrion
- * @author Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
- *
- * Version : $Id:
- * ****************************************************************************
- */
-
-/**
- * Affichage et gestion du caddy
- */
-require 'header.php';
-$GLOBALS['current_category'] = -1;
-$xoopsOption['template_main'] = 'oledrion_caddy.html';
-require_once XOOPS_ROOT_PATH.'/header.php';
-require_once OLEDRION_PATH.'class/registryfile.php';
-
-$xoopsTpl->assign('mod_pref', $mod_pref); // Pr\xE9f\xE9rences du module
-
-if(oledrion_utils::getModuleOption('restrict_orders', false)) {
- $registry = new oledrion_registryfile();
- $text = $registry->getfile(OLEDRION_TEXTFILE5);
- $xoopsTpl->assign('restrict_orders_text', xoops_trim($text));
-} else {
- $xoopsTpl->assign('restrict_orders_text', '');
-}
-
-
-$op = 'default';
-if(isset($_POST['op'])) {
- $op = $_POST['op'];
-} elseif(isset($_GET['op'])) {
- $op = $_GET['op'];
-}
-
-$productId = 0;
-if(isset($_POST['product_id'])) {
- $productId = intval($_POST['product_id']);
-} elseif(isset($_GET['product_id'])) {
- $productId = intval($_GET['product_id']);
-}
-
-$xoopsTpl->assign('op', $op);
-$xoopsTpl->assign('confEmpty', oledrion_utils::javascriptLinkConfirm(_OLEDRION_EMPTY_CART_SURE,true));
-$xoopsTpl->assign('confirm_delete_item', oledrion_utils::javascriptLinkConfirm(_OLEDRION_EMPTY_ITEM_SURE, false));
-
-$uid = oledrion_utils::getCurrentUserID();
-if($uid > 0) {
- $xoopsTpl->assign('isCartExists', $h_oledrion_persistent_cart->isCartExists());
-} else {
- $xoopsTpl->assign('isCartExists', false);
-}
-
-
-// ********************************************************************************************************************
-// Liste le contenu du caddy
-// ********************************************************************************************************************
-function listCart()
-{
- global $xoopsTpl, $uid;
- $cartForTemplate = $discountsDescription = array();
- $emptyCart = false;
- $shippingAmount = $commandAmount = $vatAmount = $commandAmountTTC = $discountsCount = 0;
- $goOn = '';
- $reductions = new oledrion_reductions();
- $reductions->computeCart($cartForTemplate, $emptyCart, $shippingAmount, $commandAmount, $vatAmount, $goOn, $commandAmountTTC, $discountsDescription, $discountsCount);
- $oledrion_Currency = & oledrion_Currency::getInstance();
- $xoopsTpl->assign('emptyCart', $emptyCart); // Caddy Vide ?
- $xoopsTpl->assign('caddieProducts', $cartForTemplate); // Produits dans le caddy
- $xoopsTpl->assign('shippingAmount', $oledrion_Currency->amountForDisplay($shippingAmount)); // Montant des frais de port
- $xoopsTpl->assign('commandAmount', $oledrion_Currency->amountForDisplay($commandAmount)); // Montant HT de la commande
- $xoopsTpl->assign('vatAmount', $oledrion_Currency->amountForDisplay($vatAmount)); // Montant de la TVA
- $xoopsTpl->assign('discountsCount', $discountsCount); // Nombre de r\xE9ductions appliqu\xE9es
- $xoopsTpl->assign('goOn', $goOn); // Adresse \xE0 utiliser pour continuer ses achats
- $xoopsTpl->assign('commandAmountTTC', $oledrion_Currency->amountForDisplay($commandAmountTTC, 'l')); // Montant TTC de la commande
- $xoopsTpl->assign('discountsDescription', $discountsDescription); // Liste des r\xE9ductions accord\xE9es
- $showOrderButton = true;
- $showRegistredOnly = false;
- if(oledrion_utils::getModuleOption('restrict_orders', false) && $uid == 0) {
- $showRegistredOnly = true;
- $showOrderButton = false;
- }
- $xoopsTpl->assign('showRegistredOnly', $showRegistredOnly);
- $xoopsTpl->assign('showOrderButton', $showOrderButton);
-}
-
-// ********************************************************************************************************************
-// ********************************************************************************************************************
-// ********************************************************************************************************************
-switch ($op) {
- // ****************************************************************************************************************
- case 'update': // Recalcul des quantit\xE9s
- // ****************************************************************************************************************
- $h_oledrion_caddy->updateQuantites();
- listCart();
- break;
-
- // ****************************************************************************************************************
- case 'reload': // Chargement du dernier panier enregistr\xE9
- // ****************************************************************************************************************
- $h_oledrion_caddy->reloadPersistentCart();
- listCart();
- break;
-
- // ****************************************************************************************************************
- case 'delete': // Suppression d'un \xE9l\xE9ment
- // ****************************************************************************************************************
- $productId--;
- $h_oledrion_caddy->deleteProduct($productId);
- listCart();
- break;
-
- // ****************************************************************************************************************
- case 'addproduct': // Ajout d'un produit
- // ****************************************************************************************************************
- if($productId == 0) {
- oledrion_utils::redirect(_OLEDRION_ERROR9, 'index.php', 4);
- }
- $product = null;
- $product = $h_oledrion_products->get($productId);
- if(!is_object($product)) {
- oledrion_utils::redirect(_OLEDRION_ERROR9, 'index.php', 4);
- }
- if($product->getVar('product_online') == 0) {
- oledrion_utils::redirect(_OLEDRION_ERROR2, 'index.php', 4);
- }
-
- if($product->getVar('product_stock') - 1 >= 0) {
- // Les attributs
- $userAttributes = array();
- if($product->productAttributesCount() > 0) { // Si le produit a des attributs
- $productAttributes = array();
- // On commence par v\xE9rifier que les attributs obligatoires sont renseign\xE9s
- if($product->getProductMandatoryAttributesCount()) {
- $mandatoryFieldsList = array();
- $mandatoryFieldsList = $product->getProductMandatoryFieldsList();
- if(count($mandatoryFieldsList) > 0) {
- $productUrl = $product->getLink();
- foreach($mandatoryFieldsList as $mandatoryField) {
- $mandatoryFieldKey = $mandatoryField->getAttributeNameInForm();
- $mandatoryFielText = $mandatoryField->getVar('attribute_title');
- if(!isset($_POST[$mandatoryFieldKey]) && !$mandatoryField->hasDefaultValue()) {
- oledrion_utils::redirect(sprintf(_OLEDRION_MANDATORY_MISSED, $mandatoryFielText), $productUrl, 4);
- }
- }
- }
- }
- // Toujours l\xE0 c'est que le produit a des attributs et qu'ils sont renseign\xE9s
- $productAttributes = $product->getProductsAttributesList();
- foreach($productAttributes as $attribute) {
- $nameInForm = $attribute->getAttributeNameInForm();
- if(isset($_POST[$nameInForm])) {
- $userAttributes[$attribute->attribute_id] = $_POST[$nameInForm];
- } else { // On va chercher sa valeur par d\xE9faut
- if($attribute->hasDefaultValue()) {
- $userAttributes[$attribute->attribute_id] = $attribute->getAttributeDefaultValue();
- }
- }
- }
- }
- $h_oledrion_caddy->addProduct($productId, 1, $userAttributes);
- $url = OLEDRION_URL.'caddy.php';
- if(!OLEDRION_CART_BUG) {
- header("Location: $url");
- } else {
- listCart();
- }
- } else {
- oledrion_utils::redirect(_OLEDRION_PROBLEM_QTY, 'index.php', 5); // Plus de stock !
- }
- listCart();
- break;
-
- // ****************************************************************************************************************
- case 'empty': // Suppression du contenu du caddy
- // ****************************************************************************************************************
- $h_oledrion_caddy->emptyCart();
- listCart();
- break;
-
- // ****************************************************************************************************************
- case 'default': // Action par d\xE9faut
- // ****************************************************************************************************************
- listCart();
- break;
-}
-
-oledrion_utils::setCSS();
-oledrion_utils::loadLanguageFile('modinfo.php');
-
-$xoopsTpl->assign('global_advert', oledrion_utils::getModuleOption('advertisement'));
-$xoopsTpl->assign('breadcrumb', oledrion_utils::breadcrumb(array(OLEDRION_URL.basename(__FILE__) => _MI_OLEDRION_SMNAME1)));
-
-$title = _MI_OLEDRION_SMNAME1.' - '.oledrion_utils::getModuleName();
-oledrion_utils::setMetas($title, $title);
-require_once XOOPS_ROOT_PATH.'/footer.php';
-?>
\ No newline at end of file
Deleted: XoopsModules/oledrion/releases/2.31/cancel-payment.php
===================================================================
--- XoopsModules/oledrion/releases/2.31/cancel-payment.php 2012-07-23 19:48:32 UTC (rev 9914)
+++ XoopsModules/oledrion/releases/2.31/cancel-payment.php 2012-07-23 19:58:26 UTC (rev 9915)
@@ -1,56 +0,0 @@
-<?php
-/**
- * ****************************************************************************
- * oledrion - MODULE FOR XOOPS
- * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
- *
- * 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 Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package oledrion
- * @author Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
- *
- * Version : $Id:
- * ****************************************************************************
- */
-
-/**
- * Page appel\xE9e par la passerelle de paiement dans le cas de l'annulation d'une commande
- */
-require 'header.php';
-$GLOBALS['current_category'] = -1;
-$xoopsOption['template_main'] = 'oledrion_cancelpurchase.html';
-require_once XOOPS_ROOT_PATH.'/header.php';
-
-// On donne la possibilit\xE9 \xE0 la passerelle d'annuler la commande
-$gateway = null;
-$gateway = oledrion_gateways::getGatewayObject();
-if(is_object($gateway) && method_exists($gateway, 'cancelOrder')) {
- if(!file_exists(OLEDRION_GATEWAY_LOG_PATH)) {
- file_put_contents(OLEDRION_GATEWAY_LOG_PATH, '<?php exit(); ?>');
- }
- $gateway->cancelOrder(OLEDRION_GATEWAY_LOG_PATH);
- unset($gateway);
-} elseif(isset($_GET['id'])) {
- $order = null;
- $order = $h_oledrion_commands->getOrderFromCancelPassword($_GET['id']);
- if(is_object($order)) {
- $h_oledrion_commands->setOrderCanceled($order);
- }
-}
-$h_oledrion_caddy->emptyCart();
-
-$xoopsTpl->assign('global_advert', oledrion_utils::getModuleOption('advertisement'));
-$xoopsTpl->assign('breadcrumb', oledrion_utils::breadcrumb(array(OLEDRION_URL.basename(__FILE__) => _OLEDRION_ORDER_CANCELED)));
-
-$title = _OLEDRION_ORDER_CANCELED.' - '.oledrion_utils::getModuleName();
-oledrion_utils::setMetas($title, $title);
-oledrion_utils::setCSS();
-require_once(XOOPS_ROOT_PATH.'/footer.php');
-?>
Deleted: XoopsModules/oledrion/releases/2.31/categories-map.php
===================================================================
--- XoopsModules/oledrion/releases/2.31/categories-map.php 2012-07-23 19:48:32 UTC (rev 9914)
+++ XoopsModules/oledrion/releases/2.31/categories-map.php 2012-07-23 19:58:26 UTC (rev 9915)
@@ -1,53 +0,0 @@
-<?php
-/**
- * ****************************************************************************
- * oledrion - MODULE FOR XOOPS
- * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
- *
- * 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 Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package oledrion
- * @author Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
- *
- * Version : $Id:
- * ****************************************************************************
- */
-
-/**
- * Plan des cat\xE9gories
- */
-require 'header.php';
-$GLOBALS['current_category'] = -1;
-$xoopsOption['template_main'] = 'oledrion_map.html';
-require_once XOOPS_ROOT_PATH.'/header.php';
-require_once OLEDRION_PATH.'class/tree.php';
-
-$xoopsTpl->assign('mod_pref', $mod_pref); // Pr\xE9f\xE9rences du module
-$categories = array();
-$categories = $h_oledrion_cat->getAllCategories(new oledrion_parameters());
-$mytree = new Oledrion_XoopsObjectTree($categories, 'cat_cid', 'cat_pid');
-$tree = $mytree->makeTreeAsArray('cat_title', '-');
-foreach($tree as $key => $value) {
- if(isset($categories[$key])) {
- $category = $categories[$key];
- $xoopsTpl->append('categories', array('cat_url_rewrited' => $category->getLink(), 'cat_href_title' => $category->getHrefTitle(), 'cat_title' => $value));
- }
-}
-
-oledrion_utils::setCSS();
-oledrion_utils::loadLanguageFile('modinfo.php');
-
-$xoopsTpl->assign('global_advert', oledrion_utils::getModuleOption('advertisement'));
-$xoopsTpl->assign('breadcrumb', oledrion_utils::breadcrumb(array(OLEDRION_URL.basename(__FILE__) => _MI_OLEDRION_SMNAME4)));
-
-$title = _MI_OLEDRION_SMNAME4.' - '.oledrion_utils::getModuleName();
-oledrion_utils::setMetas($title, $title);
-require_once XOOPS_ROOT_PATH.'/footer.php';
-?>
\ No newline at end of file
Deleted: XoopsModules/oledrion/releases/2.31/category.php
===================================================================
--- XoopsModules/oledrion/releases/2.31/category.php 2012-07-23 19:48:32 UTC (rev 9914)
+++ XoopsModules/oledrion/releases/2.31/category.php 2012-07-23 19:58:26 UTC (rev 9915)
@@ -1,245 +0,0 @@
-<?php
-/**
- * ****************************************************************************
- * oledrion - MODULE FOR XOOPS
- * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
- *
- * 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 Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package oledrion
- * @author Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
- *
- * Version : $Id:
- * ****************************************************************************
- */
-
-/**
- * Page des cat\xE9gories
- * Principe :
- * Quand on est sur une cat\xE9gorie m\xE8re (pas de parent) ou si on n'a pas sp\xE9cifi\xE9 de cat\xE9gorie,
- * on affiche (si c'est demand\xE9), les 4 blocs, sinon on affiche les produits de la cat\xE9gorie
- */
-require 'header.php';
-$cat_cid = isset($_GET['cat_cid']) ? intval($_GET['cat_cid']) : 0;
-$GLOBALS['current_category'] = $cat_cid;
-$start = isset($_GET['start']) ? intval($_GET['start']) : 0;
-
-$category = null;
-if($cat_cid > 0) {
- $category = $h_oledrion_cat->get($cat_cid);
- if(!is_object($category)) {
- oledrion_utils::redirect(_OLEDRION_ERROR8, 'index.php', 5);
- }
-}
-// On peut afficher les blocs *********************************************************************
-$xoopsOption['template_main'] = 'oledrion_category.html';
-require_once XOOPS_ROOT_PATH.'/header.php';
-$vatArray = $tbl_categories = array();
-$limit = oledrion_utils::getModuleOption('perpage');
-
-// Lecture des TVA ********************************************************************************
-$vatArray = $h_oledrion_vat->getAllVats(new oledrion_parameters());
-
-// Lecture des cat\xE9gories *************************************************************************
-$categories = $h_oledrion_cat->getAllCategories(new oledrion_parameters());
-
-// Options pour le template ***********************************************************************
-$xoopsTpl->assign('mod_pref', $mod_pref); // Pr\xE9f\xE9rences du module
-$xoopsTpl->assign('columnsCount', oledrion_utils::getModuleOption('catagory_colums'));
-
-require_once OLEDRION_PATH.'class/tree.php';
-$tbl_tmp = array();
-$mytree = new Oledrion_XoopsObjectTree($categories, 'cat_cid', 'cat_pid');
-$subCategoriesSearched = false;
-// Si on est sur une cat\xE9gorie m\xE8re ou si on n'a pas sp\xE9cifi\xE9 de cat\xE9gorie
-if( (is_object($category) && $category->getVar('cat_pid') == 0) || $cat_cid == 0 ) { // On affiche les 4 blocs
- $xoopsTpl->assign('case', 1);
-
- $tblChildsO = $tblChilds = array();
- if($cat_cid != 0) {
- $tblChilds[] = $cat_cid;
- }
- if($cat_cid > 0) {
- $tblChildsO = $mytree->getAllChild($cat_cid);
- foreach($tblChildsO as $item) {
- $tblChilds[] = $item->getVar('cat_cid');
- }
- }
-
- if(is_object($category)) { // On est sur une cat\xE9gorie particuli\xE8re
- $xoopsTpl->assign('category', $category->toArray());
- $title = _OLEDRION_CATEGORYC.' '.$category->getVar('cat_title').' - '.oledrion_utils::getModuleName();
- if(!oledrion_utils::getModuleOption('manual_meta')) {
- oledrion_utils::setMetas($title, $title);
- } else {
- $pageTitle = xoops_trim($category->getVar('cat_metatitle')) == '' ? $title : $category->getVar('cat_metatitle');
- $metaDescription = xoops_trim($category->getVar('cat_metadescription')) != '' ? $category->getVar('cat_metadescription') : $title;
- $metaKeywords = xoops_trim($category->getVar('cat_metakeywords'));
- oledrion_utils::setMetas($pageTitle, $metaDescription, $metaKeywords);
- }
- $xoopsTpl->assign('breadcrumb', oledrion_utils::breadcrumb(array(OLEDRION_URL.basename(__FILE__) => $category->getVar('cat_title'))));
- if(OLEDRION_SHOW_SUB_CATEGORIES) {
- $count = 1;
- $firstChilds = array();
- $firstChilds = $mytree->getFirstChild($category->getVar('cat_cid'));
- foreach($firstChilds as $children) {
- $tmpCategory = array();
- $tmpCategory = $children->toArray();
- $tmpCategory['count'] = $count;
- $xoopsTpl->append('subCategories', $tmpCategory);
- $count++;
- }
- $subCategoriesSearched = true;
- }
- } else { // page d'accueil des cat\xE9gories
- $title = _OLEDRION_CATEGORIES.' - '.oledrion_utils::getModuleName();
- oledrion_utils::setMetas($title, $title);
- $xoopsTpl->assign('breadcrumb', oledrion_utils::breadcrumb(array(OLEDRION_URL.basename(__FILE__) => _OLEDRION_CATEGORIES)));
- if(OLEDRION_SHOW_MAIN_CATEGORIES) {
- $count = 1;
- $motherCategories = $h_oledrion_cat->getMotherCategories();
- foreach($motherCategories as $mothercategory) {
- $tmpCategory = array();
- $tmpCategory = $mothercategory->toArray();
- $tmpCategory['count'] = $count;
- $xoopsTpl->append('motherCategories', $tmpCategory);
- $count++;
- }
- }
- }
-
- // Param\xE9trage des cat\xE9gories
- $chunk1 = oledrion_utils::getModuleOption('chunk1'); // Produits les plus r\xE9cents
- $chunk2 = oledrion_utils::getModuleOption('chunk2'); // Produits les plus achet\xE9s
- $chunk3 = oledrion_utils::getModuleOption('chunk3'); // Produits les plus vus
- $chunk4 = oledrion_utils::getModuleOption('chunk4'); // Produits les mieux not\xE9s
-
- if( $chunk1 > 0 ) { // Produits les plus r\xE9cents (dans cette cat\xE9gorie ou dans toutes les cat\xE9gories)
- $products = array();
- $oledrion_shelf_parameters->resetDefaultValues()->setProductsType('recent')->setCategory($tblChilds)->setStart($start)->setLimit($limit)->setSort('product_submitted DESC, product_title');
- $products = $oledrion_shelf->getProducts($oledrion_shelf_parameters);
- if(count($products) > 0) {
- $xoopsTpl->assign('chunk'.$chunk1.'Title', _OLEDRION_MOST_RECENT);
- if(isset($products['lastTitle'])) {
- unset($products['lastTitle']);
- }
- $xoopsTpl->assign('chunk'.$chunk1, $products);
- }
- }
-
- if( $chunk2 > 0 ) { // Produits les plus achet\xE9s (dans cette cat\xE9gorie ou dans toutes les cat\xE9gories)
- $products = array();
- $oledrion_shelf_parameters->resetDefaultValues()->setProductsType('mostsold')->setStart($start)->setLimit($limit)->setSort('product_submitted DESC, product_title')->setCategory($tblChilds);
- $products = $oledrion_shelf->getProducts($oledrion_shelf_parameters);
- if(count($products) > 0) {
- $xoopsTpl->assign('chunk'.$chunk2.'Title', _OLEDRION_MOST_SOLD);
- if(isset($products['lastTitle'])) {
- unset($products['lastTitle']);
- }
- $xoopsTpl->assign('chunk'.$chunk2, $products);
- }
- }
-
- if( $chunk3 > 0 ) { // Produits les plus vus
- $products = array();
- $oledrion_shelf_parameters->resetDefaultValues()->setProductsType('mostviewed')->setStart($start)->setLimit($limit)->setSort('product_hits')->setOrder('DESC')->setCategory($tblChilds);
- $products = $oledrion_shelf->getProducts($oledrion_shelf_parameters);
- if(count($products) > 0) {
- $xoopsTpl->assign('chunk'.$chunk3.'Title', _OLEDRION_MOST_VIEWED);
- if(isset($products['lastTitle'])) {
- unset($products['lastTitle']);
- }
- $xoopsTpl->assign('chunk'.$chunk3, $products);
- }
- }
-
- if( $chunk4 > 0 ) { // Produits les mieux not\xE9s
- $products = array();
- $oledrion_shelf_parameters->resetDefaultValues()->setProductsType('bestrated')->setStart($start)->setLimit($limit)->setSort('product_rating')->setOrder('DESC')->setCategory($tblChilds);
- $products = $oledrion_shelf->getProducts($oledrion_shelf_parameters);
- if(count($products) > 0) {
- $xoopsTpl->assign('chunk'.$chunk4.'Title', _OLEDRION_MOST_RATED);
- if(isset($products['lastTitle'])) {
- unset($products['lastTitle']);
- }
- $xoopsTpl->assign('chunk'.$chunk4, $products);
- }
- }
-}
-
-if( is_object($category) && $cat_cid > 0 ) { // On est sur une cat\xE9gorie d\xE9finie donc on affiche les produits de cette cat\xE9gorie
- $xoopsTpl->assign('case', 2);
- $xoopsTpl->assign('category', $category->toArray());
- if(OLEDRION_SHOW_SUB_CATEGORIES && ! $subCategoriesSearched) {
- $count = 1;
- $firstChilds = array();
- $firstChilds = $mytree->getFirstChild($category->getVar('cat_cid'));
- foreach($firstChilds as $children) {
- $tmpCategory = array();
- $tmpCategory = $children->toArray();
- $tmpCategory['count'] = $count;
- $xoopsTpl->append('subCategories', $tmpCategory);
- $count++;
- }
- }
-
- // Pager ******************************************************************************************
- // Recherche du nombre de produits dans cette cat\xE9gorie
- $productsCount = $h_oledrion_products->getTotalPublishedProductsCount($cat_cid);
- $limit = oledrion_utils::getModuleOption('perpage');
- if ( $productsCount > $limit ) {
- require_once XOOPS_ROOT_PATH.'/class/pagenav.php';
- $catLink = $category->getLink();
- $pagenav = new XoopsPageNav( $productsCount, $limit, $start, 'start', 'cat_cid='.$cat_cid);
- $xoopsTpl->assign('pagenav', $pagenav->renderNav());
- } else {
- $xoopsTpl->assign('pagenav', '');
- }
-
- // Breadcrumb *********************************************************************************
- $ancestors = $mytree->getAllParent($cat_cid);
- $ancestors = array_reverse($ancestors);
- $tbl_tmp[] = "<a href='".OLEDRION_URL."index.php' title='".oledrion_utils::makeHrefTitle(oledrion_utils::getModuleName())."'>".oledrion_utils::getModuleName().'</a>';
- foreach($ancestors as $item) {
- $tbl_tmp[] = "<a href='".$item->getLink()."' title='".oledrion_utils::makeHrefTitle($item->getVar('cat_title'))."'>".$item->getVar('cat_title').'</a>';
- }
- // Ajout de la cat\xE9gorie courante
- $tbl_tmp[] = "<a href='".$category->getLink()."' title='".oledrion_utils::makeHrefTitle($category->getVar('cat_title'))."'>".$category->getVar('cat_title').'</a>';
- $breadcrumb = implode(' » ', $tbl_tmp);
- $xoopsTpl->assign('breadcrumb', $breadcrumb);
-
- // Meta ***************************************************************************************
- $title = strip_tags($breadcrumb);
- if(!oledrion_utils::getModuleOption('manual_meta')) {
- oledrion_utils::setMetas($title, $title, str_replace('»', ',', $title));
- } else {
- $pageTitle = xoops_trim($category->getVar('cat_metatitle')) == '' ? $title : $category->getVar('cat_metatitle');
- $metaDescription = xoops_trim($category->getVar('cat_metadescription')) != '' ? $category->getVar('cat_metadescription') : $title;
- $metaKeywords = xoops_trim($category->getVar('cat_metakeywords'));
- oledrion_utils::setMetas($pageTitle, $metaDescription, $metaKeywords);
- }
-
-
- // Donn\xE9es des Produits *************************************************************************
- $products = array();
- $oledrion_shelf_parameters->resetDefaultValues()->setProductsType('recent')->setCategory($cat_cid)->setStart($start)->setLimit($limit)->setSort('product_submitted DESC, product_title');
- $products = $oledrion_shelf->getProducts($oledrion_shelf_parameters);
-
- if(count($products) > 0) {
- if(isset($products['lastTitle'])) {
- unset($products['lastTitle']);
- }
- $xoopsTpl->assign('products', $products);
- }
-}
-
-oledrion_utils::setCSS();
-require_once(XOOPS_ROOT_PATH.'/footer.php');
-?>
\ No newline at end of file
Deleted: XoopsModules/oledrion/releases/2.31/cgv.php
===================================================================
--- XoopsModules/oledrion/releases/2.31/cgv.php 2012-07-23 19:48:32 UTC (rev 9914)
+++ XoopsModules/oledrion/releases/2.31/cgv.php 2012-07-23 19:58:26 UTC (rev 9915)
@@ -1,44 +0,0 @@
-<?php
-/**
- * ****************************************************************************
- * oledrion - MODULE FOR XOOPS
- * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
- *
- * 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 Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package oledrion
- * @author Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
- *
- * Version : $Id:
- * ****************************************************************************
- */
-
-/**
- * Affichage des conditions g\xE9n\xE9rales de vente
- */
-require 'header.php';
-$GLOBALS['current_category'] = -1;
-$xoopsOption['template_main'] = 'oledrion_cgv.html';
-require_once XOOPS_ROOT_PATH.'/header.php';
-require_once OLEDRION_PATH.'class/registryfile.php';
-
-$registry = new oledrion_registryfile();
-
-$xoopsTpl->assign('nostock_msg', oledrion_utils::getModuleOption('nostock_msg'));
-$xoopsTpl->assign('mod_pref', $mod_pref); // Pr\xE9f\xE9rences du module
-$xoopsTpl->assign('cgv_msg', $registry->getfile(OLEDRION_TEXTFILE2));
-
-$xoopsTpl->assign('global_advert', oledrion_utils::getModuleOption('advertisement'));
-$xoopsTpl->assign('breadcrumb', oledrion_utils::breadcrumb(array(OLEDRION_URL.basename(__FILE__) => _OLEDRION_CGV)));
-
-oledrion_utils::setCSS();
-oledrion_utils::setMetas(_OLEDRION_CGV.' '.oledrion_utils::getModuleName(), _OLEDRION_CGV.' '.oledrion_utils::getModuleName());
-require_once(XOOPS_ROOT_PATH.'/footer.php');
-?>
Deleted: XoopsModules/oledrion/releases/2.31/changelog.php
===================================================================
--- XoopsModules/oledrion/releases/2.31/changelog.php 2012-07-23 19:48:32 UTC (rev 9914)
+++ XoopsModules/oledrion/releases/2.31/changelog.php 2012-07-23 19:58:26 UTC (rev 9915)
@@ -1,244 +0,0 @@
-*************
-Version 2.31
-*************
-- Changelog.txt was renamed to changelog.php
-- Code refactoring
-- The block used to show categories can now show all categories unfolded (useful if you need to create a scrolling menu)
-- You have 2 new options to select the columns count on the module's index page and on the category page
-- The page used to show the list of recommended products was added to the Xoops menu
-- In the orders manager, you can now see the total of your orders
-- Addition of wish lists.
- There are some new pages and blocks
-- The module does not use anymore extJs (the module is lighter of 6 Mb), so the "all products" page was changed
-- The module does not use anymore swfobject, instead it uses a jQuery plugin
-- Corrections in the module's administration, in the part used to manage files attached to products
-- Correction of a bug in the PayPal's Gateway
-- You can set a message to display on the checkout form
-- Some changes in the gateways structures
-- Correction of a bug in the module's administration, in the products filters
-- Bug correction in the CSV export
-- Addition of a new option to enable clients to enter their VAT number
-- Addition of a new block : Recently Sold
- This block shows the products that were recently sold
-- Addition of a new parameter in config.php, OLEDRION_CART_BUG, set this to true if you can't see products when you add them to the cart
-- Correction of several bugs in the cart, be sure to update your templates (Herv\xE9/sailjapan)
-- The product's page now uses a lightview effect to show the product's picture
-- You have a new tab, "blocks", to see the module's blocks
-- The module will automatically update the monetary fields in its tables to decimal(10,2) to accept billions
-- You have a news preferences called "Maximum products count to display before to replace the list with an adapted list".
- When the module reach a certain count of products, they are too much to be seen in the module's list so the module replace this standard
- lists with a new kind of list (and search).
-- The module now uses jQuery intensively
-- Several bugs corrections when a product is removed
-- Addition of products attributes
- Addition of 3 new templates (for attributes) :
- - oledrion_attribute_select.html
- - oledrion_attribute_checkbox.html
- - oledrion_attribute_radio.html
- - YOU MUST UPDATE THE MODULE IN THE XOOPS MODULES MANAGER
- - YOU MUST GO AT LEAST ONE TIME IN THE MODULE'S ADMINISTRATION (to create some new tables in the database)
- For this moment, persistent cart does not save products attributes
-- You can now use and create plugins for the module (see the "plugins" folder for examples)
- As an example, the notifications on a new product and new category are made with plugins
-
-- Notes for the translators:
- - There is a new file (in your language folder) called messages.js to translate, take care, this file is a Javascript file
- - There's also a picture to "translate", in your language folder, addtocart.png (this picture is used when products have attributes) and addtowishlist.png
-
-*************
-Version 2.2
-*************
-- Code refactoring
-- Bugs corrections in the checkout page
-- New option in config.php : OLEDRION_DONT_RESIZE_IF_SMALLER, when this option is on "true", if pictures are smaller than defined dimensions, then they are not resized
-- Addition of a new option in config.php => OLEDRION_AUTO_FILL_MANUAL_DATE
- When this option is set to true, the module will automatically fill the manual date when you create a new product
-- Bugs correction in the advanced search and addition of a pager
-- Better support of Xoops 2.3
-- Change in the gateways class and structure
-- In the module's administration, manufacturer's name are now clickable
-- In the module's administration, the count of products is now visible
-- When you add a product, in the module's administration, the module shows you an example for the "Path of the file to download" field
-- Correction of several bugs with the Paypal gateway and orders records on some hosts (burning/herve)
-- Bug correction in the shelf class (Bezoops/Herv\xE9)
-- There were 2 minor changes in the translations, see lang.diff
-
-
-*************
-Version 2.1
-*************
-- You can now use the Xoops TAG module
-- In the file config.php, you can select where to place the "duplicated" word (at the beginning or at the end of the product's title and in the reductions)
-- In config.php, addition of an option to select the visible tabs in the module's administration (see config.php for some explanations)
-- There was a problem in the CSS class used to represent the breadcrumb in the categories page
-- The products duplication had several problems :
- a) The attached files were not save
- b) The product's picture and thumb was identical to the original product so in case of deletion (the original product), the pictures of the clone product were also removed (de facto)
-- Addition of a new parameter in config.php, "OLEDRION_RELATED_BOTH"
- When this option is set to false, if Product A has Product B as a related product but Product A is not noted as related to Product B then the display of product A will display Product B as a related product.
- But Product B will not show Product A as a related product.
- When this option is set to true, Product A and Product B display each other as two related products even if Product A was not set as a related product to Product A.
-
- By default this option is set to false to respect the initial module's behavior.
-- When sending template mails, the module is now verifying that the language folder for your translation exists (if you are not English).
- If the translation folder does not exist then it will use the English folder.
-- The cache Lite class was updated
-- New translations (see lang.diff)
-
-*************
-Version 2.0
-*************
-- It was not possible to see a product if you did not defined a VAT - philou
-- When you duplicate a product you are now redirected to the product - philou
-- It was not possible to see the list of all products when you was not using the price field - philou
-- Bug correction in the categories list (categories were duplicated) - philou
-- There was a bug, still in the categories list, when you was not using the price field - philou
-- Correction on the product's page (product.php) and in the page used to rate a product (rate-product.php),
- it was not possible to vote for products - blueteen
-- There were many changes in the translations (see lang.diff)
- There is a new file to translate here : /xoops/modules/admin/gateways/paypal/language/mylanguage/main.php
-- Bug correction in the reductions when prices was not used - philou
-- Bug correction in the cart when a product was removed but still present in a user's cart - philou
-- Some templates were modified so you need to update them
-- Addition of a new table in the database to manage gateways options
-- Addition of a new field (cmd_comment) in the "oledrion_commands" table
-- In the module's administration, and in the part used to manage the products, the products list was changed,
- you can now filter products
-- The templates used to send emails were changed (command_shop.tpl, command_shop_verified.tpl, command_shop_fraud.tpl, command_shop_pending.tpl, command_shop_failed.tpl, command_shop_cancel.tpl)
- I have added {COMMENT}
-- The file config.php was changed
-- The module was deeply modified to be able to use other payment gateways (that's why the module's version was changed to a major one)
-
- - YOU MUST UPDATE THE MODULE IN THE XOOPS MODULES MANAGER
- - YOU MUST GO AT LEAST ONE TIME IN THE MODULE'S ADMINISTRATION (to create a new table in the database)
- - YOU MUST REVALIDATE AT LEAST ONE TIME THE MODULE'S PREFENCES
- - YOU MUST GO IN THE MODULE'S ADMINISTRATION AND IN THE "GATEWAY" TAB, SELECT PAYPAL AND SET ITS PREFERENCES
-
-
-*************
-Version 1.65
-*************
-- The module's administration will verify that the cache folder is writable
-- Some bugs were corrected in the page called category.php
-- Bug correction in the shopping cart
-- The module is capable of using the editors of Xoops 2.3 more easily
-- In the module's search, there was a problem with the categories selector
-- The support for the Spaw editor is abandoned
-- The support of Xoops 2.2.x is abandoned
-- You can use tinymce if you are running Xoops 2.3 (but there are some bugs in Xoops)
-- TCPDF was updated
-- No changes in the translations (except some typo corrections in the english translation)
-- Some changes in the templates
-
-*************
-Version 1.64
-*************
-- Correction of a bug in the csv export
-- TCPDF was updated
-- Correction of a bug in the products prices in the PDF catalog
-- Addition of a pager in the module's index page
-- Correction of a bug in the discount system, there was a problem when you was creating a discount with a starting and ending date
-- Correction of a bug in the cart's template (for the link used to remove a product from the cart)
-- New module option to select if you want to multiply the produt's shipping amount by the product's quantity.
- New translation in modinfo.php :
- _MI_OLEDRION_SHIPPING_QUANTITY
-
-*************
-Version 1.63
-*************
-- Bug correction in the PDF catalog
-- Bug correction in the shipping's calculation (quantites was not used for shipping calculation)
-- Bug correction in the cart/order tables (as a consequence, there was some bugs in the invoice and dashboard)
-- Bugs corrections in the emails sent to the website and to the client after his/her order
-- You have a plugin for RssFit & Sitemap
-
-
-*************
-Version 1.62
-*************
-- Correction of a bug in download.php (thank you Trabis)
-- TCPDF was updated
-- Correction of a bug when the product's quantity as changed in the cart (thank you Trabis)
-
-*************
-Version 1.61
-*************
-- Rajout d'une option permettant de d\xE9sactiver la zone prix (des produits)
-- Dans la fiche d'un produit, la liste des produits r\xE9cents ne contient plus le produit en cours
-- Ajout d'une zone cat_footer dans les cat\xE9gories (pour pouvoir mettre un pied de page par cat\xE9gorie)
-- Eclatement de l'administration en plusieurs fichiers
-- M\xE9nage dans /admin/functions.php
-- Ajout de cache aux flux RSS
-- Beaucoup de refactorisation du code (conventions d'\xE9criture)
-- Ajout de ExtJs pour la page qui liste tous les produits
-- Mise \xE0 jour de TCPDF
-- Modification de la page des cat\xE9gories afin de pouvoir y afficher les cat\xE9gories m\xE8res ou les cat\xE9gories filles (selon le cas) sur param\xE9trage (cf config.php)
-...
[truncated message content] |
|
From: <be...@us...> - 2012-07-23 19:48:38
|
Revision: 9914
http://xoops.svn.sourceforge.net/xoops/?rev=9914&view=rev
Author: beckmi
Date: 2012-07-23 19:48:32 +0000 (Mon, 23 Jul 2012)
Log Message:
-----------
Restructuring folders
Added Paths:
-----------
XoopsModules/oledrion/releases/2.31/oledrion/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-07-23 19:21:14
|
Revision: 9913
http://xoops.svn.sourceforge.net/xoops/?rev=9913&view=rev
Author: beckmi
Date: 2012-07-23 19:21:03 +0000 (Mon, 23 Jul 2012)
Log Message:
-----------
Adding Oledrion 2.3.3 Beta 1 (Converted to XOOPS 2.5.5 GUI)
Modified Paths:
--------------
XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/attributes.php
XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/categories.php
XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/dashboard.php
XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/discounts.php
XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/files.php
XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/gateways.php
XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/lists.php
XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/lowstock.php
XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/manufacturers.php
XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/newsletter.php
XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/orders.php
XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/products.php
XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/property.php
XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/texts.php
XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/vat.php
XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/vendors.php
XoopsModules/oledrion/branches/mamba/oledrion/admin/dbupdate.php
XoopsModules/oledrion/branches/mamba/oledrion/admin/exports/csv.php
XoopsModules/oledrion/branches/mamba/oledrion/admin/exports/dbase.php
XoopsModules/oledrion/branches/mamba/oledrion/admin/exports/export.php
XoopsModules/oledrion/branches/mamba/oledrion/admin/functions.php
XoopsModules/oledrion/branches/mamba/oledrion/admin/gateways/gateway.php
XoopsModules/oledrion/branches/mamba/oledrion/admin/gateways/paypal/gateway.php
XoopsModules/oledrion/branches/mamba/oledrion/admin/gateways/paypal/language/english/main.php
XoopsModules/oledrion/branches/mamba/oledrion/admin/gateways/paypal/language/french/main.php
XoopsModules/oledrion/branches/mamba/oledrion/admin/index.php
XoopsModules/oledrion/branches/mamba/oledrion/admin/menu.php
XoopsModules/oledrion/branches/mamba/oledrion/admin/productsselector.php
XoopsModules/oledrion/branches/mamba/oledrion/admin/tablefunctions.php
XoopsModules/oledrion/branches/mamba/oledrion/ajax.php
XoopsModules/oledrion/branches/mamba/oledrion/all-lists.php
XoopsModules/oledrion/branches/mamba/oledrion/all-products.php
XoopsModules/oledrion/branches/mamba/oledrion/blocks/oledrion_best_sales.php
XoopsModules/oledrion/branches/mamba/oledrion/blocks/oledrion_block_tag.php
XoopsModules/oledrion/branches/mamba/oledrion/blocks/oledrion_cart.php
XoopsModules/oledrion/branches/mamba/oledrion/blocks/oledrion_categories.php
XoopsModules/oledrion/branches/mamba/oledrion/blocks/oledrion_categoy_lists.php
XoopsModules/oledrion/branches/mamba/oledrion/blocks/oledrion_mostviewed_lists.php
XoopsModules/oledrion/branches/mamba/oledrion/blocks/oledrion_my_lists.php
XoopsModules/oledrion/branches/mamba/oledrion/blocks/oledrion_new.php
XoopsModules/oledrion/branches/mamba/oledrion/blocks/oledrion_promotion.php
XoopsModules/oledrion/branches/mamba/oledrion/blocks/oledrion_random.php
XoopsModules/oledrion/branches/mamba/oledrion/blocks/oledrion_random_lists.php
XoopsModules/oledrion/branches/mamba/oledrion/blocks/oledrion_rated.php
XoopsModules/oledrion/branches/mamba/oledrion/blocks/oledrion_recent_lists.php
XoopsModules/oledrion/branches/mamba/oledrion/blocks/oledrion_recentlysold.php
XoopsModules/oledrion/branches/mamba/oledrion/blocks/oledrion_recommended.php
XoopsModules/oledrion/branches/mamba/oledrion/blocks/oledrion_top.php
XoopsModules/oledrion/branches/mamba/oledrion/caddy.php
XoopsModules/oledrion/branches/mamba/oledrion/cancel-payment.php
XoopsModules/oledrion/branches/mamba/oledrion/categories-map.php
XoopsModules/oledrion/branches/mamba/oledrion/category.php
XoopsModules/oledrion/branches/mamba/oledrion/cgv.php
XoopsModules/oledrion/branches/mamba/oledrion/checkout.php
XoopsModules/oledrion/branches/mamba/oledrion/class/PEAR.php
XoopsModules/oledrion/branches/mamba/oledrion/class/PersistableObjectHandler.php
XoopsModules/oledrion/branches/mamba/oledrion/class/classheader.php
XoopsModules/oledrion/branches/mamba/oledrion/class/lite.php
XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_attributes.php
XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_caddy.php
XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_caddy_attributes.php
XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_cat.php
XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_commands.php
XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_currency.php
XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_discounts.php
XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_files.php
XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_gateways.php
XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_gateways_options.php
XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_handlers.php
XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_lists.php
XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_manufacturer.php
XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_parameters.php
XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_persistent_cart.php
XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_plugins.php
XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_products.php
XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_products_list.php
XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_productsmanu.php
XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_reductions.php
XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_related.php
XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_shelf.php
XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_shelf_parameters.php
XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_utils.php
XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_vat.php
XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_vendors.php
XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_votedata.php
XoopsModules/oledrion/branches/mamba/oledrion/class/registryfile.php
XoopsModules/oledrion/branches/mamba/oledrion/comment_delete.php
XoopsModules/oledrion/branches/mamba/oledrion/comment_edit.php
XoopsModules/oledrion/branches/mamba/oledrion/comment_new.php
XoopsModules/oledrion/branches/mamba/oledrion/comment_post.php
XoopsModules/oledrion/branches/mamba/oledrion/comment_reply.php
XoopsModules/oledrion/branches/mamba/oledrion/config.php
XoopsModules/oledrion/branches/mamba/oledrion/download.php
XoopsModules/oledrion/branches/mamba/oledrion/extra/modules/rss/plugins/rssfit.oledrion.php
XoopsModules/oledrion/branches/mamba/oledrion/extra/modules/sitemap/plugins/oledrion.php
XoopsModules/oledrion/branches/mamba/oledrion/gateway-notify.php
XoopsModules/oledrion/branches/mamba/oledrion/header.php
XoopsModules/oledrion/branches/mamba/oledrion/include/comment_functions.php
XoopsModules/oledrion/branches/mamba/oledrion/include/common.php
XoopsModules/oledrion/branches/mamba/oledrion/include/functions.php
XoopsModules/oledrion/branches/mamba/oledrion/include/notification.inc.php
XoopsModules/oledrion/branches/mamba/oledrion/include/plugin.tag.php
XoopsModules/oledrion/branches/mamba/oledrion/include/product_search_form.php
XoopsModules/oledrion/branches/mamba/oledrion/include/search.inc.php
XoopsModules/oledrion/branches/mamba/oledrion/index.php
XoopsModules/oledrion/branches/mamba/oledrion/invoice.php
XoopsModules/oledrion/branches/mamba/oledrion/js/attributes.js
XoopsModules/oledrion/branches/mamba/oledrion/js/jquery/jquery.js
XoopsModules/oledrion/branches/mamba/oledrion/language/english/addtocart.png
XoopsModules/oledrion/branches/mamba/oledrion/language/english/addtowishlist.png
XoopsModules/oledrion/branches/mamba/oledrion/language/english/admin.php
XoopsModules/oledrion/branches/mamba/oledrion/language/english/blocks.php
XoopsModules/oledrion/branches/mamba/oledrion/language/english/main.php
XoopsModules/oledrion/branches/mamba/oledrion/language/english/modinfo.php
XoopsModules/oledrion/branches/mamba/oledrion/language/french/Copie de addtowishlist.png
XoopsModules/oledrion/branches/mamba/oledrion/language/french/addtowishlist.png
XoopsModules/oledrion/branches/mamba/oledrion/language/french/admin.php
XoopsModules/oledrion/branches/mamba/oledrion/language/french/blocks.php
XoopsModules/oledrion/branches/mamba/oledrion/language/french/mail_template/command_client.tpl
XoopsModules/oledrion/branches/mamba/oledrion/language/french/mail_template/command_client_cancel.tpl
XoopsModules/oledrion/branches/mamba/oledrion/language/french/mail_template/command_client_verified.tpl
XoopsModules/oledrion/branches/mamba/oledrion/language/french/mail_template/command_shop.tpl
XoopsModules/oledrion/branches/mamba/oledrion/language/french/mail_template/command_shop_cancel.tpl
XoopsModules/oledrion/branches/mamba/oledrion/language/french/mail_template/command_shop_failed.tpl
XoopsModules/oledrion/branches/mamba/oledrion/language/french/mail_template/command_shop_fraud.tpl
XoopsModules/oledrion/branches/mamba/oledrion/language/french/mail_template/command_shop_pending.tpl
XoopsModules/oledrion/branches/mamba/oledrion/language/french/mail_template/command_shop_verified.tpl
XoopsModules/oledrion/branches/mamba/oledrion/language/french/mail_template/global_newcategory_notify.tpl
XoopsModules/oledrion/branches/mamba/oledrion/language/french/mail_template/global_newproduct_notify.tpl
XoopsModules/oledrion/branches/mamba/oledrion/language/french/mail_template/shop_lowstock.tpl
XoopsModules/oledrion/branches/mamba/oledrion/language/french/main.php
XoopsModules/oledrion/branches/mamba/oledrion/language/french/messages.js
XoopsModules/oledrion/branches/mamba/oledrion/language/french/modinfo.php
XoopsModules/oledrion/branches/mamba/oledrion/language/french/newsletter.php
XoopsModules/oledrion/branches/mamba/oledrion/language/persian/admin.php
XoopsModules/oledrion/branches/mamba/oledrion/language/persian/blocks.php
XoopsModules/oledrion/branches/mamba/oledrion/language/persian/main.php
XoopsModules/oledrion/branches/mamba/oledrion/language/persian/modinfo.php
XoopsModules/oledrion/branches/mamba/oledrion/list.php
XoopsModules/oledrion/branches/mamba/oledrion/list.tag.php
XoopsModules/oledrion/branches/mamba/oledrion/manufacturer.php
XoopsModules/oledrion/branches/mamba/oledrion/media.php
XoopsModules/oledrion/branches/mamba/oledrion/my-lists.php
XoopsModules/oledrion/branches/mamba/oledrion/notification_update.php
XoopsModules/oledrion/branches/mamba/oledrion/paypal-notify.php
XoopsModules/oledrion/branches/mamba/oledrion/pdf/catalog.php
XoopsModules/oledrion/branches/mamba/oledrion/pdf/config/tcpdf_config.php
XoopsModules/oledrion/branches/mamba/oledrion/plugins/actions/newelements/plugins.php
XoopsModules/oledrion/branches/mamba/oledrion/plugins/models/oledrion_action.php
XoopsModules/oledrion/branches/mamba/oledrion/plugins/models/oledrion_filter.php
XoopsModules/oledrion/branches/mamba/oledrion/product.php
XoopsModules/oledrion/branches/mamba/oledrion/rate-product.php
XoopsModules/oledrion/branches/mamba/oledrion/recommended.php
XoopsModules/oledrion/branches/mamba/oledrion/rss.php
XoopsModules/oledrion/branches/mamba/oledrion/search.php
XoopsModules/oledrion/branches/mamba/oledrion/templates/blocks/oledrion_block_bestsales.html
XoopsModules/oledrion/branches/mamba/oledrion/templates/blocks/oledrion_block_cart.html
XoopsModules/oledrion/branches/mamba/oledrion/templates/blocks/oledrion_block_categories.html
XoopsModules/oledrion/branches/mamba/oledrion/templates/blocks/oledrion_block_category_lists.html
XoopsModules/oledrion/branches/mamba/oledrion/templates/blocks/oledrion_block_mostviewed_lists.html
XoopsModules/oledrion/branches/mamba/oledrion/templates/blocks/oledrion_block_my_lists.html
XoopsModules/oledrion/branches/mamba/oledrion/templates/blocks/oledrion_block_new.html
XoopsModules/oledrion/branches/mamba/oledrion/templates/blocks/oledrion_block_promotion.html
XoopsModules/oledrion/branches/mamba/oledrion/templates/blocks/oledrion_block_random.html
XoopsModules/oledrion/branches/mamba/oledrion/templates/blocks/oledrion_block_random_lists.html
XoopsModules/oledrion/branches/mamba/oledrion/templates/blocks/oledrion_block_rated.html
XoopsModules/oledrion/branches/mamba/oledrion/templates/blocks/oledrion_block_recent_lists.html
XoopsModules/oledrion/branches/mamba/oledrion/templates/blocks/oledrion_block_recentlysold.html
XoopsModules/oledrion/branches/mamba/oledrion/templates/blocks/oledrion_block_recommended.html
XoopsModules/oledrion/branches/mamba/oledrion/templates/blocks/oledrion_block_top.html
XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_all_lists.html
XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_allproducts.html
XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_bill.html
XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_caddy.html
XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_cancelpurchase.html
XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_categories_list.html
XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_category.html
XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_cgv.html
XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_chunk.html
XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_command.html
XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_index.html
XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_list.html
XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_manufacturer.html
XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_map.html
XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_mylists.html
XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_product.html
XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_productsselector.html
XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_rate_product.html
XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_recommended.html
XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_search.html
XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_thankyou.html
XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_whoswho.html
XoopsModules/oledrion/branches/mamba/oledrion/thankyou.php
XoopsModules/oledrion/branches/mamba/oledrion/view.tag.php
XoopsModules/oledrion/branches/mamba/oledrion/whoswho.php
XoopsModules/oledrion/branches/mamba/oledrion/xoops_version.php
Added Paths:
-----------
XoopsModules/oledrion/branches/mamba/oledrion/admin/about.php
XoopsModules/oledrion/branches/mamba/oledrion/admin/admin_footer.php
XoopsModules/oledrion/branches/mamba/oledrion/admin/admin_header.php
XoopsModules/oledrion/branches/mamba/oledrion/admin/main.php
XoopsModules/oledrion/branches/mamba/oledrion/class/PEAR5.php
XoopsModules/oledrion/branches/mamba/oledrion/docs/
XoopsModules/oledrion/branches/mamba/oledrion/docs/changelog.txt
XoopsModules/oledrion/branches/mamba/oledrion/docs/credits.txt
XoopsModules/oledrion/branches/mamba/oledrion/docs/error_log
XoopsModules/oledrion/branches/mamba/oledrion/docs/index.html
XoopsModules/oledrion/branches/mamba/oledrion/docs/install.txt
XoopsModules/oledrion/branches/mamba/oledrion/docs/lang_diff.txt
XoopsModules/oledrion/branches/mamba/oledrion/docs/licence.txt
XoopsModules/oledrion/branches/mamba/oledrion/docs/readme.txt
XoopsModules/oledrion/branches/mamba/oledrion/js/jquery/jquery_132.js
XoopsModules/oledrion/branches/mamba/oledrion/language/english/help/
XoopsModules/oledrion/branches/mamba/oledrion/language/english/help/help.html
XoopsModules/oledrion/branches/mamba/oledrion/language/english/help/index.html
Removed Paths:
-------------
XoopsModules/oledrion/branches/mamba/oledrion/changelog.php
XoopsModules/oledrion/branches/mamba/oledrion/error_log
XoopsModules/oledrion/branches/mamba/oledrion/lang.diff
XoopsModules/oledrion/branches/mamba/oledrion/language/english.old/
XoopsModules/oledrion/branches/mamba/oledrion/language/englishUTF8/
XoopsModules/oledrion/branches/mamba/oledrion/language/frenchUTF8/
XoopsModules/oledrion/branches/mamba/oledrion/licence.txt
Added: XoopsModules/oledrion/branches/mamba/oledrion/admin/about.php
===================================================================
--- XoopsModules/oledrion/branches/mamba/oledrion/admin/about.php (rev 0)
+++ XoopsModules/oledrion/branches/mamba/oledrion/admin/about.php 2012-07-23 19:21:03 UTC (rev 9913)
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Birthday module
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright The XOOPS Project (http://www.xoops.org)
+ * @license {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License}
+ * @package birthday
+ * @since 2.5.0
+ * @author XOOPS Module 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/oledrion/branches/mamba/oledrion/admin/actions/attributes.php
===================================================================
--- XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/attributes.php 2012-07-23 19:10:37 UTC (rev 9912)
+++ XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/attributes.php 2012-07-23 19:21:03 UTC (rev 9913)
@@ -2,7 +2,7 @@
/**
* ****************************************************************************
* oledrion - MODULE FOR XOOPS
- * Copyright (c) Hervé Thouzard of Instant Zero (http://www.instant-zero.com)
+ * Copyright (c) Hervé Thouzard (http://www.herve-thouzard.com/)
*
* 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
@@ -11,10 +11,10 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
- * @copyright Hervé Thouzard of Instant Zero (http://www.instant-zero.com)
+ * @copyright Hervé Thouzard (http://www.herve-thouzard.com/)
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @package oledrion
- * @author Hervé Thouzard of Instant Zero (http://www.instant-zero.com)
+ * @author Hervé Thouzard (http://www.herve-thouzard.com/)
*
* Version : $Id:
* ****************************************************************************
@@ -182,7 +182,7 @@
if(isset($pagenav) && is_object($pagenav)) {
echo "<div align='right'>".$pagenav->renderNav()."</div>";
}
- show_footer();
+ include_once 'admin_footer.php';
break;
// ****************************************************************************************************************
@@ -243,7 +243,7 @@
echo "<tr>\n";
}
echo '</table>';
- show_footer();
+ include_once 'admin_footer.php';
}
break;
@@ -354,7 +354,7 @@
oledrion_utils::callJavascriptFile('attributes.js', false, true);
$sform = oledrion_utils::formMarkRequiredFields($sform);
$sform->display();
- show_footer();
+ include_once 'admin_footer.php';
break;
// ****************************************************************************************************************
Modified: XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/categories.php
===================================================================
--- XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/categories.php 2012-07-23 19:10:37 UTC (rev 9912)
+++ XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/categories.php 2012-07-23 19:21:03 UTC (rev 9913)
@@ -2,7 +2,7 @@
/**
* ****************************************************************************
* oledrion - MODULE FOR XOOPS
- * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
+ * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
*
* 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
@@ -11,10 +11,10 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
- * @copyright Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
+ * @copyright Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @package oledrion
- * @author Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
+ * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
*
* Version : $Id:
* ****************************************************************************
@@ -82,7 +82,7 @@
$sform->addElement($button_tray);
$sform = oledrion_utils::formMarkRequiredFields($sform);
$sform->display();
- show_footer();
+ include_once 'admin_footer.php';
break;
@@ -175,7 +175,7 @@
$sform = oledrion_utils::formMarkRequiredFields($sform);
$sform->display();
- show_footer();
+ include_once 'admin_footer.php';
break;
@@ -245,7 +245,7 @@
oledrion_utils::redirect(_AM_OLEDRION_ERROR_10, $baseurl, 5);
}
$msg = sprintf(_AM_OLEDRION_CONF_DEL_CATEG, $category->getVar('cat_title'));
- xoops_confirm(array( 'op' => 'categories', 'action' => 'confdelete', 'id' => $id), 'index.php', $msg);
+ xoops_confirm(array( 'op' => 'categories', 'action' => 'confdelete', 'id' => $id), 'main.php', $msg);
break;
Modified: XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/dashboard.php
===================================================================
--- XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/dashboard.php 2012-07-23 19:10:37 UTC (rev 9912)
+++ XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/dashboard.php 2012-07-23 19:21:03 UTC (rev 9913)
@@ -2,7 +2,7 @@
/**
* ****************************************************************************
* oledrion - MODULE FOR XOOPS
- * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
+ * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
*
* 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
@@ -11,10 +11,10 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
- * @copyright Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
+ * @copyright Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @package oledrion
- * @author Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
+ * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
*
* Version : $Id:
* ****************************************************************************
@@ -121,7 +121,7 @@
echo "</td></tr>\n";
echo "</table>\n";
}
- show_footer();
+ include_once 'admin_footer.php';
break;
Modified: XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/discounts.php
===================================================================
--- XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/discounts.php 2012-07-23 19:10:37 UTC (rev 9912)
+++ XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/discounts.php 2012-07-23 19:21:03 UTC (rev 9913)
@@ -2,7 +2,7 @@
/**
* ****************************************************************************
* oledrion - MODULE FOR XOOPS
- * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
+ * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
*
* 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
@@ -11,10 +11,10 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
- * @copyright Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
+ * @copyright Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @package oledrion
- * @author Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
+ * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
*
* Version : $Id:
* ****************************************************************************
@@ -31,7 +31,7 @@
case 'default': // Gestion des r\xE9ductions
// ****************************************************************************************************************
xoops_cp_header();
- oledrion_adminMenu(7);
+ //oledrion_adminMenu(7);
$form = "<form method='post' action='$baseurl' name='frmadddiscount' id='frmadddiscount'><input type='hidden' name='op' id='op' value='discounts' /><input type='hidden' name='action' id='action' value='add' /><input type='submit' name='btngo' id='btngo' value='"._AM_OLEDRION_ADD_ITEM."' /></form>";
echo $form;
oledrion_utils::htitle(_MI_OLEDRION_ADMENU6, 4);
@@ -74,7 +74,7 @@
}
$oledrion_reductions = new oledrion_reductions();
- show_footer();
+ include_once 'admin_footer.php';
break;
// ****************************************************************************************************************
@@ -82,7 +82,7 @@
case 'edit': // Edition d'une promo
// ****************************************************************************************************************
xoops_cp_header();
- oledrion_adminMenu(7);
+// oledrion_adminMenu(7);
if($action == 'edit') {
$title = _AM_OLEDRION_EDIT_DISCOUNT;
$id = isset($_GET['id']) ? intval($_GET['id']) : 0;
@@ -242,10 +242,10 @@
$xoopsTpl->assign('discount', $discountForTemplate);
$xoopsTpl->assign('currencyName', oledrion_utils::getModuleOption('money_full'));
- $editor = oledrion_utils::getWysiwygForm(_AM_OLEDRION_DISCOUNT_DESCR, 'disc_description', $item->getVar('disc_description','e'), 15, 60, 'description_hidden');
- $xoopsTpl->assign('editor', $editor->render());
+ //$editor = oledrion_utils::getWysiwygForm(_AM_OLEDRION_DISCOUNT_DESCR, 'disc_description', $item->getVar('disc_description','e'), 15, 60, 'description_hidden');
+ //$xoopsTpl->assign('editor', $editor->render());
$xoopsTpl->display('db:oledrion_admin_discounts.html');
- show_footer();
+ include_once 'admin_footer.php';
break;
// ****************************************************************************************************************
Modified: XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/files.php
===================================================================
--- XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/files.php 2012-07-23 19:10:37 UTC (rev 9912)
+++ XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/files.php 2012-07-23 19:21:03 UTC (rev 9913)
@@ -2,7 +2,7 @@
/**
* ****************************************************************************
* oledrion - MODULE FOR XOOPS
- * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
+ * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
*
* 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
@@ -11,10 +11,10 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
- * @copyright Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
+ * @copyright Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @package oledrion
- * @author Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
+ * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
*
* Version : $Id:
* ****************************************************************************
@@ -74,7 +74,7 @@
if(isset($pagenav) && is_object($pagenav)) {
echo "<div align='right'>".$pagenav->renderNav()."</div>";
}
- show_footer();
+ include_once 'admin_footer.php';
break;
// ****************************************************************************************************************
@@ -134,7 +134,7 @@
$sform->addElement($button_tray);
$sform = oledrion_utils::formMarkRequiredFields($sform);
$sform->display();
- show_footer();
+ include_once 'admin_footer.php';
break;
// ****************************************************************************************************************
Modified: XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/gateways.php
===================================================================
--- XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/gateways.php 2012-07-23 19:10:37 UTC (rev 9912)
+++ XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/gateways.php 2012-07-23 19:21:03 UTC (rev 9913)
@@ -2,7 +2,7 @@
/**
* ****************************************************************************
* oledrion - MODULE FOR XOOPS
- * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
+ * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
*
* 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
@@ -11,10 +11,10 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
- * @copyright Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
+ * @copyright Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @package oledrion
- * @author Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
+ * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
*
* Version : $Id:
* ****************************************************************************
@@ -68,7 +68,7 @@
echo '<br />'._AM_OLEDRION_GATEWAYS_CREDITS.$gatewayInformation['credits'];
}
echo "</td>\n";
- echo "<td>".formatTimestamp(strtotime($gatewayInformation['releaseDate']), 's')."</td>\n";
+ echo "<td align='center'>".formatTimestamp(strtotime($gatewayInformation['releaseDate']), 's')."</td>\n";
echo "<td align='center'>";
$checked = '';
$isCurrentGateway = false;
@@ -94,7 +94,7 @@
echo "</tr>\n";
}
echo "</table>\n";
- show_footer();
+ include_once 'admin_footer.php';
break;
// ****************************************************************************************************************
@@ -114,7 +114,7 @@
echo $logContent;
echo "</pre>\n";
echo "</div>\n";
- show_footer();
+ include_once 'admin_footer.php';
break;
// ****************************************************************************************************************
Modified: XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/lists.php
===================================================================
--- XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/lists.php 2012-07-23 19:10:37 UTC (rev 9912)
+++ XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/lists.php 2012-07-23 19:21:03 UTC (rev 9913)
@@ -2,7 +2,7 @@
/**
* ****************************************************************************
* oledrion - MODULE FOR XOOPS
- * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
+ * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
*
* 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
@@ -11,10 +11,10 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
- * @copyright Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
+ * @copyright Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @package oledrion
- * @author Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
+ * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
*
* Version : $Id:
* ****************************************************************************
@@ -74,7 +74,7 @@
if(isset($pagenav) && is_object($pagenav)) {
echo "<div align='right'>".$pagenav->renderNav()."</div>";
}
- show_footer();
+ include_once 'admin_footer.php';
break;
// ****************************************************************************************************************
Modified: XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/lowstock.php
===================================================================
--- XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/lowstock.php 2012-07-23 19:10:37 UTC (rev 9912)
+++ XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/lowstock.php 2012-07-23 19:21:03 UTC (rev 9913)
@@ -2,7 +2,7 @@
/**
* ****************************************************************************
* oledrion - MODULE FOR XOOPS
- * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
+ * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
*
* 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
@@ -11,10 +11,10 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
- * @copyright Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
+ * @copyright Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @package oledrion
- * @author Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
+ * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
*
* Version : $Id:
* ****************************************************************************
@@ -51,7 +51,7 @@
echo "<tr class='".$class."'>\n";
$name = 'qty_'.$id;
$names[] = $id;
- echo '<td>'.$link."</td><td align='right'>".$item->getVar('product_stock')."</td><td align='right'>".$item->getVar('product_alert_stock')."</td><td align='center'><input type='text' name='$name' id='$name' size='3' maxlength='5' value='' /></td>\n";
+ echo '<td>'.$link."</td><td align='center'>".$item->getVar('product_stock')."</td><td align='center'>".$item->getVar('product_alert_stock')."</td><td align='center'><input type='text' name='$name' id='$name' size='3' maxlength='5' value='' /></td>\n";
echo "<tr>\n";
}
$class = ($class == 'even') ? 'odd' : 'even';
@@ -62,7 +62,7 @@
if(isset($pagenav) && is_object($pagenav)) {
echo "<div align='right'>".$pagenav->renderNav().'</div>';
}
- show_footer();
+ include_once 'admin_footer.php';
break;
// ****************************************************************************************************************
Modified: XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/manufacturers.php
===================================================================
--- XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/manufacturers.php 2012-07-23 19:10:37 UTC (rev 9912)
+++ XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/manufacturers.php 2012-07-23 19:21:03 UTC (rev 9913)
@@ -2,7 +2,7 @@
/**
* ****************************************************************************
* oledrion - MODULE FOR XOOPS
- * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
+ * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
*
* 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
@@ -11,10 +11,10 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
- * @copyright Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
+ * @copyright Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @package oledrion
- * @author Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
+ * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
*
* Version : $Id:
* ****************************************************************************
@@ -73,7 +73,7 @@
if(isset($pagenav) && is_object($pagenav)) {
echo "<div align='right'>".$pagenav->renderNav()."</div>";
}
- show_footer();
+ include_once 'admin_footer.php';
break;
@@ -140,7 +140,7 @@
$sform = oledrion_utils::formMarkRequiredFields($sform);
$sform->display();
- show_footer();
+ include_once 'admin_footer.php';
break;
// ****************************************************************************************************************
Modified: XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/newsletter.php
===================================================================
--- XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/newsletter.php 2012-07-23 19:10:37 UTC (rev 9912)
+++ XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/newsletter.php 2012-07-23 19:21:03 UTC (rev 9913)
@@ -2,7 +2,7 @@
/**
* ****************************************************************************
* oledrion - MODULE FOR XOOPS
- * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
+ * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
*
* 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
@@ -11,10 +11,10 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
- * @copyright Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
+ * @copyright Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @package oledrion
- * @author Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
+ * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
*
* Version : $Id:
* ****************************************************************************
@@ -59,7 +59,7 @@
$sform->addElement($button_tray);
$sform = oledrion_utils::formMarkRequiredFields($sform);
$sform->display();
- show_footer();
+ include_once 'admin_footer.php';
break;
// ****************************************************************************************************************
@@ -129,7 +129,7 @@
fclose($fp);
$newsfile = OLEDRION_NEWSLETTER_URL;
echo "<a href='$newsfile' target='_blank'>"._AM_OLEDRION_NEWSLETTER_READY."</a>";
- show_footer();
+ include_once 'admin_footer.php';
break;
}
?>
\ No newline at end of file
Modified: XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/orders.php
===================================================================
--- XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/orders.php 2012-07-23 19:10:37 UTC (rev 9912)
+++ XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/orders.php 2012-07-23 19:21:03 UTC (rev 9913)
@@ -2,7 +2,7 @@
/**
* ****************************************************************************
* oledrion - MODULE FOR XOOPS
- * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
+ * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
*
* 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
@@ -11,10 +11,10 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
- * @copyright Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
+ * @copyright Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @package oledrion
- * @author Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
+ * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
*
* Version : $Id:
* ****************************************************************************
@@ -88,7 +88,7 @@
$actions[] = "<a href='$baseurl?op=orders&action=delete&id=".$id."' title='"._OLEDRION_DELETE."'".$conf_msg.">".$icones['delete'].'</a>';
$actions[] = "<a href='$baseurl?op=orders&action=validate&id=".$id."' ".$confValidateOrder." title='"._OLEDRION_VALIDATE_COMMAND."'>".$icones['ok'].'</a>';
echo "<tr class='".$class."'>\n";
- echo "<td align='right'>".$id."</td><td align='center'>".$date."</td><td align='center'>".$item->getVar('cmd_lastname').' '.$item->getVar('cmd_firstname')."</td><td align='center'>".$oledrion_Currency->amountForDisplay($item->getVar('cmd_total', 'n')).' / '.$oledrion_Currency->amountForDisplay($item->getVar('cmd_shipping'))."</td><td align='center'>".implode(' ', $actions)."</td>\n";
+ echo "<td align='center'>".$id."</td><td align='center'>".$date."</td><td align='center'>".$item->getVar('cmd_lastname').' '.$item->getVar('cmd_firstname')."</td><td align='center'>".$oledrion_Currency->amountForDisplay($item->getVar('cmd_total', 'n')).' / '.$oledrion_Currency->amountForDisplay($item->getVar('cmd_shipping'))."</td><td align='center'>".implode(' ', $actions)."</td>\n";
echo "<tr>\n";
$totalOrder += floatval($item->getVar('cmd_total', 'n'));
}
@@ -98,7 +98,7 @@
if(isset($pagenav) && is_object($pagenav)) {
echo "<div align='right'>".$pagenav->renderNav()."</div>";
}
- show_footer();
+ include_once 'admin_footer.php';
break;
// ****************************************************************************************************************
@@ -112,7 +112,7 @@
}
$item = $h_oledrion_commands->get($id);
if(is_object($item)) {
- xoops_confirm(array( 'op' => 'orders', 'action' => 'remove', 'id' => $id), 'index.php', _AM_OLEDRION_CONF_DELITEM);
+ xoops_confirm(array( 'op' => 'orders', 'action' => 'remove', 'id' => $id), 'main.php', _AM_OLEDRION_CONF_DELITEM);
} else {
oledrion_utils::redirect(_AM_OLEDRION_NOT_FOUND, $baseurl.'?op='.$opRedirect,5);
}
@@ -186,7 +186,7 @@
} else {
oledrion_utils::redirect(_AM_OLEDRION_ERROR_11);
}
- show_footer();
+ include_once 'admin_footer.php';
break;
}
Modified: XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/products.php
===================================================================
--- XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/products.php 2012-07-23 19:10:37 UTC (rev 9912)
+++ XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/products.php 2012-07-23 19:21:03 UTC (rev 9913)
@@ -2,7 +2,7 @@
/**
* ****************************************************************************
* oledrion - MODULE FOR XOOPS
- * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
+ * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
*
* 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
@@ -11,10 +11,10 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
- * @copyright Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
+ * @copyright Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @package oledrion
- * @author Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
+ * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
*
* Version : $Id:
* ****************************************************************************
@@ -200,7 +200,7 @@
if(isset($pagenav) && is_object($pagenav)) {
echo "<div align='right'>".$pagenav->renderNav()."</div>";
}
- show_footer();
+ //include_once 'admin_footer.php';
break;
@@ -477,8 +477,8 @@
}
$downloadFile = new XoopsFormFile(_OLEDRION_ATTACHED_FILE , 'attachedfile3', oledrion_utils::getModuleOption('maxuploadsize'));
$downloadFile->setDescription(_AM_OLEDRION_ATTACHED_HLP);
- $sform->addElement($downloadFile, false);
-
+ $sform->addElement($downloadFile, false);
+
if(oledrion_utils::getModuleOption('product_property1')) {
$property1select = new XoopsFormSelect(_AM_OLEDRION_PRODUCT_PROPERTY1, 'product_property1', $item->getVar('product_property1'));
$property1Array = explode('|',oledrion_utils::getModuleOption('product_property1'));
@@ -486,8 +486,8 @@
$property1select->addOption($property1);
}
$sform->addElement($property1select, false);
- }
-
+ }
+
if(oledrion_utils::getModuleOption('product_property2')) {
$property2select = new XoopsFormSelect(_AM_OLEDRION_PRODUCT_PROPERTY2, 'product_property2', $item->getVar('product_property2'));
$property2Array = explode('|',oledrion_utils::getModuleOption('product_property2'));
@@ -495,8 +495,8 @@
$property2select->addOption($property2);
}
$sform->addElement($property2select, false);
- }
-
+ }
+
if(oledrion_utils::getModuleOption('product_property3')) {
$property3select = new XoopsFormSelect(_AM_OLEDRION_PRODUCT_PROPERTY3, 'product_property3', $item->getVar('product_property3'));
$property3Array = explode('|',oledrion_utils::getModuleOption('product_property3'));
@@ -504,8 +504,8 @@
$property3select->addOption($property3);
}
$sform->addElement($property3select, false);
- }
-
+ }
+
if(oledrion_utils::getModuleOption('product_property4')) {
$property4select = new XoopsFormSelect(_AM_OLEDRION_PRODUCT_PROPERTY4, 'product_property4', $item->getVar('product_property4'));
$property4Array = explode('|',oledrion_utils::getModuleOption('product_property4'));
@@ -513,8 +513,8 @@
$property4select->addOption($property4);
}
$sform->addElement($property4select, false);
- }
-
+ }
+
if(oledrion_utils::getModuleOption('product_property5')) {
$property5select = new XoopsFormSelect(_AM_OLEDRION_PRODUCT_PROPERTY5, 'product_property5', $item->getVar('product_property5'));
$property5Array = explode('|',oledrion_utils::getModuleOption('product_property5'));
@@ -522,8 +522,8 @@
$property5select->addOption($property5);
}
$sform->addElement($property5select, false);
- }
-
+ }
+
$button_tray = new XoopsFormElementTray('' ,'');
$submit_btn = new XoopsFormButton('', 'post', $label_submit, 'submit');
$button_tray->addElement($submit_btn);
@@ -531,7 +531,7 @@
$sform = oledrion_utils::formMarkRequiredFields($sform);
$sform->display();
- show_footer();
+ include_once 'admin_footer.php';
break;
@@ -710,7 +710,7 @@
if(!is_object($item)) {
oledrion_utils::redirect(_AM_OLEDRION_NOT_FOUND, $baseurl, 5);
}
- xoops_confirm(array( 'op' => 'products', 'action' => 'delete', 'id' => $id), 'index.php', _AM_OLEDRION_CONF_DELITEM.'<br />'.$item->getVar('product_title'));
+ xoops_confirm(array( 'op' => 'products', 'action' => 'delete', 'id' => $id), 'main.php', _AM_OLEDRION_CONF_DELITEM.'<br />'.$item->getVar('product_title'));
break;
@@ -756,7 +756,7 @@
echo "<tr>\n";
}
echo '</table>';
- show_footer();
+ //include_once 'admin_footer.php';
}
break;
}
Modified: XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/property.php
===================================================================
--- XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/property.php 2012-07-23 19:10:37 UTC (rev 9912)
+++ XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/property.php 2012-07-23 19:21:03 UTC (rev 9913)
@@ -1,41 +1,41 @@
-<?php
-/**
- * ****************************************************************************
- * oledrion - MODULE FOR XOOPS
- * Copyright (c) Hervé Thouzard of Instant Zero (http://www.instant-zero.com)
- *
- * 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 Hervé Thouzard of Instant Zero (http://www.instant-zero.com)
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package oledrion
- * @author Hervé Thouzard of Instant Zero (http://www.instant-zero.com)
- *
- * Version : $Id:
- * ****************************************************************************
- */
-
-/**
- * Gestion des textes affichés sur certaines pages pour les utilisateurs
- */
-if(!defined("OLEDRION_ADMIN")) exit();
-
+<?php
+/**
+ * ****************************************************************************
+ * oledrion - MODULE FOR XOOPS
+ * Copyright (c) Hervé Thouzard (http://www.herve-thouzard.com/)
+ *
+ * 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 Hervé Thouzard (http://www.herve-thouzard.com/)
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package oledrion
+ * @author Hervé Thouzard (http://www.herve-thouzard.com/)
+ *
+ * Version : $Id:
+ * ****************************************************************************
+ */
+
+/**
+ * Gestion des textes affichés sur certaines pages pour les utilisateurs
+ */
+if(!defined("OLEDRION_ADMIN")) exit();
+
$configHandler =& xoops_gethandler('config');
$moduleIdCriteria = new Criteria('conf_modid',$xoopsModule->getVar('mid'));
-
-switch($action) {
-
- case 'default':
- xoops_cp_header();
+switch($action) {
+
+ case 'default':
+
+ xoops_cp_header();
- $sform = new XoopsThemeForm(_MI_OLEDRION_ADMENU17, 'property', $baseurl);
- $sform->addElement(new XoopsFormHidden('op', 'property'));
+ $sform = new XoopsThemeForm(_MI_OLEDRION_ADMENU17, 'property', $baseurl);
+ $sform->addElement(new XoopsFormHidden('op', 'property'));
$sform->addElement(new XoopsFormHidden('action', 'fromproperty'));
$property1 = new XoopsFormTextArea ( _AM_OLEDRION_PRODUCT_PROPERTY1, 'product_property1', oledrion_utils::getModuleOption('product_property1'), 5, 90 );
@@ -58,15 +58,15 @@
$property5->setDescription ( _AM_OLEDRION_PRODUCT_PROPERTY5_DESC );
$sform->addElement ( $property5 );
- $button_tray = new XoopsFormElementTray('' ,'');
- $submit_btn = new XoopsFormButton('', 'post', _AM_OLEDRION_MODIFY, 'submit');
- $button_tray->addElement($submit_btn);
- $sform->addElement($button_tray);
- $sform = oledrion_utils::formMarkRequiredFields($sform);
+ $button_tray = new XoopsFormElementTray('' ,'');
+ $submit_btn = new XoopsFormButton('', 'post', _AM_OLEDRION_MODIFY, 'submit');
+ $button_tray->addElement($submit_btn);
+ $sform->addElement($button_tray);
+ $sform = oledrion_utils::formMarkRequiredFields($sform);
$sform->display();
-
- show_footer();
-
+
+ include_once 'admin_footer.php';
+
break;
case 'fromproperty':
@@ -173,8 +173,8 @@
}
}
- oledrion_utils::updateCache();
- oledrion_utils::redirect(_AM_OLEDRION_SAVE_OK, $baseurl.'?op=property', 2);
+ oledrion_utils::updateCache();
+ oledrion_utils::redirect(_AM_OLEDRION_SAVE_OK, $baseurl.'?op=property', 2);
break;
-}
+}
?>
\ No newline at end of file
Modified: XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/texts.php
===================================================================
--- XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/texts.php 2012-07-23 19:10:37 UTC (rev 9912)
+++ XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/texts.php 2012-07-23 19:21:03 UTC (rev 9913)
@@ -2,7 +2,7 @@
/**
* ****************************************************************************
* oledrion - MODULE FOR XOOPS
- * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
+ * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
*
* 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
@@ -11,10 +11,10 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
- * @copyright Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
+ * @copyright Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @package oledrion
- * @author Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
+ * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
*
* Version : $Id:
* ****************************************************************************
Modified: XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/vat.php
===================================================================
--- XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/vat.php 2012-07-23 19:10:37 UTC (rev 9912)
+++ XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/vat.php 2012-07-23 19:21:03 UTC (rev 9913)
@@ -2,7 +2,7 @@
/**
* ****************************************************************************
* oledrion - MODULE FOR XOOPS
- * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
+ * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
*
* 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
@@ -11,10 +11,10 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
- * @copyright Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
+ * @copyright Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @package oledrion
- * @author Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
+ * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
*
* Version : $Id:
* ****************************************************************************
@@ -46,7 +46,7 @@
$actions[] = "<a href='$baseurl?op=vat&action=edit&id=".$id."' title='"._OLEDRION_EDIT."'>".$icones['edit'].'</a>';
$actions[] = "<a href='$baseurl?op=vat&action=delete&id=".$id."' title='"._OLEDRION_DELETE."'".$conf_msg.">".$icones['delete'].'</a>';
echo "<tr class='".$class."'>\n";
- echo "<td>".$id."</td><td align='right'>".$oledrion_Currency->amountInCurrency($item->getVar('vat_rate'))."</td><td align='left'>".ucfirst($item->getVar('vat_country'))."</td><td align='center'>".implode(' ', $actions)."</td>\n";
+ echo "<td align='center'>".$id."</td><td align='center'>".$oledrion_Currency->amountInCurrency($item->getVar('vat_rate'))."</td><td align='center'>".ucfirst($item->getVar('vat_country'))."</td><td align='center'>".implode(' ', $actions)."</td>\n";
echo "<tr>\n";
}
$class = ($class == 'even') ? 'odd' : 'even';
@@ -54,7 +54,7 @@
echo "<td colspan='3' align='center'>".$form."</td>\n";
echo "</tr>\n";
echo '</table>';
- show_footer();
+ include_once 'admin_footer.php';
break;
// ****************************************************************************************************************
@@ -96,7 +96,7 @@
$sform->addElement($button_tray);
$sform = oledrion_utils::formMarkRequiredFields($sform);
$sform->display();
- show_footer();
+ include_once 'admin_footer.php';
break;
// ****************************************************************************************************************
Modified: XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/vendors.php
===================================================================
--- XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/vendors.php 2012-07-23 19:10:37 UTC (rev 9912)
+++ XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/vendors.php 2012-07-23 19:21:03 UTC (rev 9913)
@@ -2,7 +2,7 @@
/**
* ****************************************************************************
* oledrion - MODULE FOR XOOPS
- * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
+ * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
*
* You may not change or alter any portion of this comment or credits
* of supporting developers from this source code or any supporting source ...
[truncated message content] |
|
From: <be...@us...> - 2012-07-23 19:10:42
|
Revision: 9912
http://xoops.svn.sourceforge.net/xoops/?rev=9912&view=rev
Author: beckmi
Date: 2012-07-23 19:10:37 +0000 (Mon, 23 Jul 2012)
Log Message:
-----------
forking Voltan's version
Added Paths:
-----------
XoopsModules/oledrion/branches/mamba/oledrion/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-07-23 19:08:27
|
Revision: 9911
http://xoops.svn.sourceforge.net/xoops/?rev=9911&view=rev
Author: beckmi
Date: 2012-07-23 19:08:20 +0000 (Mon, 23 Jul 2012)
Log Message:
-----------
Cleaning up directory
Added Paths:
-----------
XoopsModules/oledrion/branches/mamba/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2012-07-23 08:38:11
|
Revision: 9910
http://xoops.svn.sourceforge.net/xoops/?rev=9910&view=rev
Author: lord_venom
Date: 2012-07-23 08:38:04 +0000 (Mon, 23 Jul 2012)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/TDMStats/trunk/TDMStats/css/styles.css
XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_stats.html
XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_summary.html
Modified: XoopsModules/TDMStats/trunk/TDMStats/css/styles.css
===================================================================
--- XoopsModules/TDMStats/trunk/TDMStats/css/styles.css 2012-07-22 19:10:12 UTC (rev 9909)
+++ XoopsModules/TDMStats/trunk/TDMStats/css/styles.css 2012-07-23 08:38:04 UTC (rev 9910)
@@ -90,6 +90,7 @@
width:80px;
height:80px;
}
+
ul#tree_menu h2{
left:0;
Modified: XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_stats.html
===================================================================
--- XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_stats.html 2012-07-22 19:10:12 UTC (rev 9909)
+++ XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_stats.html 2012-07-23 08:38:04 UTC (rev 9910)
@@ -1,10 +1,6 @@
<{include file="db:TDMStats_index.html"}>
-<script type="text/javascript">
- $(function() {
- $("#tabs").tabs();
- });
- </script>
-<table cellpadding="0" id="masque_1" cellspacing="0" style="border-collapse: separate; margin:5px;"><tr><td><ul id="tree_menu">
+
+<table cellpadding="0" cellspacing="0" style="border-collapse: separate; margin:5px;"><tr><td><ul id="tree_menu">
<li style="width:46%;" class="even"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/day.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('day')"><{$smarty.const._AM_BY_DAY}></h2></a>
<div style="text-align:left">
@@ -16,7 +12,7 @@
<div id="tree_form"><a href="javascript:;" onclick="javascript:masque('day')" ><{$smarty.const._AM_VIEW}></a></div></li>
<!-- tableau day -->
-<li id="masque_day" style="display: none;" class="odd"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/day.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('day')"><{$smarty.const._AM_BY_DAY}></h2></a>
+<li id="masque_day" style="display: none;" class="even"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/day.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('day')"><{$smarty.const._AM_BY_DAY}></h2></a>
<div style="text-align:left">
<div class="Tableau">
<p class="legende">
@@ -81,7 +77,7 @@
<div id="tree_form"><a href="javascript:;" onclick="javascript:masque('last')" ><{$smarty.const._AM_VIEW}></a></div></li>
<!-- tableau last -->
-<li id="masque_last" style="display: none;" class="odd"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/week.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('last')"><{$smarty.const._AM_BY_WEEK}></h2></a>
+<li id="masque_last" style="display: none;" class="even"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/week.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('last')"><{$smarty.const._AM_BY_WEEK}></h2></a>
<div style="text-align:left">
<div class="Tableau">
<p class="legende">
@@ -147,7 +143,7 @@
<div id="tree_form"><a href="javascript:;" onclick="javascript:masque('hour')" ><{$smarty.const._AM_VIEW}></a></div></li>
<!-- tableau hours -->
-<li id="masque_hour" style="display: none;" class="odd"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/hour.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('hour')"><{$smarty.const._AM_BY_HOUR}></h2></a>
+<li id="masque_hour" style="display: none;" class="even"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/hour.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('hour')"><{$smarty.const._AM_BY_HOUR}></h2></a>
<div style="text-align:left">
<div class="Tableau">
<p class="legende">
@@ -212,7 +208,7 @@
<div id="tree_form"><a href="javascript:;" onclick="javascript:masque('module')" ><{$smarty.const._AM_VIEW}></a></div></li>
<!-- tableau module -->
-<li id="masque_module" style="display: none;" class="odd"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/module.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('module')"><{$smarty.const._AM_BY_MODULE}></h2></a>
+<li id="masque_module" style="display: none;" class="even"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/module.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('module')"><{$smarty.const._AM_BY_MODULE}></h2></a>
<div style="text-align:left">
<div class="Tableau">
<p class="legende">
@@ -234,7 +230,4 @@
</div></div>
<!--fin-->
-<br style="clear: both;" /></ul></td></tr></table><br />
-
-
-<br /><br style="clear: both;" />
\ No newline at end of file
+<br style="clear: both;" /></ul></td></tr></table><br />
\ No newline at end of file
Modified: XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_summary.html
===================================================================
--- XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_summary.html 2012-07-22 19:10:12 UTC (rev 9909)
+++ XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_summary.html 2012-07-23 08:38:04 UTC (rev 9910)
@@ -1,20 +1,88 @@
<{include file="db:TDMStats_index.html"}>
-<table cellpadding="0" id="masque_1" cellspacing="0" style="margin:5px;"><tr><td><ul id="tree_menu">
+<table cellpadding="0" cellspacing="0" style="border-collapse: separate; margin:5px;"><tr><td><ul id="tree_menu">
-<li style="width:47%;" class="even"><div><img src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/resume.png" title="<{$smarty.const._AM_STATS_INFO}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('resum')"><{$smarty.const._AM_STATS_INFO}></h2></a>
+<li style="width:46%;" class="even"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/resume.png" title="<{$smarty.const._AM_STATS_INFO}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('resum')"><{$smarty.const._AM_STATS_INFO}></h2></a>
<div style="text-align:left"><span id="tree_num"><{$lang_total_visits}> <b><{$total}></b></span><br />
<span id="tree_num"><{$lang_today}> <b><{$today}></b></span><br />
<span id="tree_num"><{$lang_ave_day}> <b><{$ava_day}></b></span></div></div>
<div id="tree_form"><a href="javascript:;" onclick="javascript:masque('resum')" ><{$smarty.const._AM_VIEW}></a></div></li>
-<li style="width:47%;" class="odd"><div><img src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/tip.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href ="'.$cat_link.'" title="<{$lang_forecast}>"><{$smarty.const._AM_FORECAST}></h2></a>
+<!-- tableau resum -->
+<li id="masque_resum" style="display: none;" class="even"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/resume.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('resum')"><{$smarty.const._AM_STATS_INFO}></h2></a>
+<div style="text-align:left">
+<div class="Tableau">
+ <p class="legende">
+ <span class="col1"><{$smarty.const._AM_TOTAL_VISITS}></span>
+ <span class="col1"><{$total}></span>
+ <span class="col1"><{$smarty.const._AM_NOW}></span>
+ <span class="col1"><{$date_now}></span>
+ </p>
+
+ <p>
+ <span class="col1"><{$smarty.const._AM_TODAY}></span>
+ <span class="col1"><{$today}></span>
+ <span class="col1"><{$smarty.const._AM_AVE_DAY}></span>
+ <span class="col1"><{$ava_day}></span>
+ </p>
+
+ <p class="legende">
+ <span class="col1"><{$smarty.const._AM_THIS_WEEK}></span>
+ <span class="col1"><{$this_week}></span>
+ <span class="col1"><{$smarty.const._AM_AVE_WEEK}></span>
+ <span class="col1"><{$ava_week}></span>
+ </p>
+
+ <p>
+ <span class="col1"><{$smarty.const._AM_THIS_MTH}></span>
+ <span class="col1"><{$this_mth}></span>
+ <span class="col1"><{$smarty.const._AM_AVE_MTH}></span>
+ <span class="col1"><{$ava_mth}></span>
+ </p>
+
+ <p class="legende">
+ <span class="col1"><{$smarty.const._AM_TOTAL_DAYS}></span>
+ <span class="col1"><{$days}></span>
+ <span class="col1"><{$smarty.const._AM_AVE_HOUR}></span>
+ <span class="col1"><{$ava_hour}></span>
+ </p>
+
+ <p>
+ <span class="col1"><{$smarty.const._AM_MAX_DAYCOUNT}></span>
+ <span class="col1"><{$max_daycount}></span>
+ <span class="col1"><{$smarty.const._AM_MAX_DATE}></span>
+ <span class="col1"><{$max_date}></span>
+ </p>
+
+ <p class="legende">
+ <span class="col1"><{$smarty.const._AM_MAX_WEEKCOUNT}></span>
+ <span class="col1"><{$max_weekcount}></span>
+ <span class="col1"><{$smarty.const._AM_MAX_WEEK}></span>
+ <span class="col1"><{$max_week}></span>
+ </p>
+
+ <p>
+ <span class="col1"><{$smarty.const._AM_MAX_MTHCOUNT}></span>
+ <span class="col1"><{$max_mthcount}></span>
+ <span class="col1"><{$smarty.const._AM_MAX_MTH}></span>
+ <span class="col1"><{$max_mth}></span>
+ </p>
+</div>
+
+</div></div>
+
+<!-- fin -->
+
+
+
+
+<li style="width:46%;" class="odd"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/tip.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href ="'.$cat_link.'" title="<{$lang_forecast}>"><{$smarty.const._AM_FORECAST}></h2></a>
<div style="text-align:left"><span id="tree_num"><{$smarty.const.AM_AVE}> <b><{$cur_percent}>%</b> <{$smarty.const.AM_DAILY_VISIT}> <b><{$date_daily}></b>.
<br /><{$smarty.const.AM_BAS_NBR}> <b><{$daycount}></b> <{$smarty.const.AM_SO_FAR}>
<br/><{$smarty.const.AM_SO_FARE}> <b><{$today_hits}></b> <{$smarty.const.AM_PAGE_VIEW}>
</span></div></div></li>
-<li style="width:47%;" class="even"><div><img src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/calender.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('hour')"><{$smarty.const._AM_TODAY}></h2></a>
+<li style="width:46%;" class="even"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/calender.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('hour')"><{$smarty.const._AM_TODAY}></h2></a>
<div style="text-align:left">
<{foreach from=$item_hours item=item}>
<span id="tree_num"><{$smarty.const._AM_P_A}> <{$item.hour}>h, <{$item.info}> <{$smarty.const._AM_P_VISITS}></span><br />
@@ -23,7 +91,7 @@
</div></div>
<div id="tree_form"><a href="javascript:;" onclick="javascript:masque('hour')" ><{$smarty.const._AM_VIEW}></a></div></li>
-<li style="width:47%;" class="odd"><div><img src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/ref.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('ref')"><{$smarty.const._AM_BY_REF}></h2></a>
+<li style="width:46%;" class="odd"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/ref.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('ref')"><{$smarty.const._AM_BY_REF}></h2></a>
<div style="text-align:left">
<{foreach from=$item_refs item=item}>
<span id="tree_num"><{$item.url}>, <{$item.info}> <{$smarty.const._AM_P_VISITS}></span><br />
@@ -31,7 +99,7 @@
</div></div>
<div id="tree_form"><a href="javascript:;" onclick="javascript:masque('ref')" ><{$smarty.const._AM_VIEW}></a></div></li>
-<li style="width:47%;" class="even"><div><img src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/word.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('pays')"><{$smarty.const._AM_BY_COUNTRY}></h2></a>
+<li style="width:46%;" class="even"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/word.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('pays')"><{$smarty.const._AM_BY_COUNTRY}></h2></a>
<div style="text-align:left">
<{foreach from=$item_pays item=item}>
<span id="tree_num"><{$item.country}>, <{$item.info}> <{$smarty.const._AM_P_VISITS}></span><br />
@@ -42,62 +110,6 @@
<br style="clear: both;" /></ul></td></tr></table><br />
-
-
- <div id="masque_resum" style="display: none;">
-<h2><{$lang_stats_info}></h2>
- <table width="100%" border="0" cellspacing="1" cellpadding="4" class="outer">
- <tr class="even">
- <td align="center" width="28%"><{$lang_total_visits}></td>
- <td align="center" width="22%"><{$total}></td>
- <td align="center" width="28%"><{$lang_now}></td>
- <td align="center" nowrap width="22%"><{$date_now}></td>
- </tr>
- <tr class="odd">
- <td align="center" width="28%"><{$lang_today}></td>
- <td align="center" width="22%"><{$today}></td>
- <td align="center" width="28%"><{$lang_ave_day}></td>
- <td align="center" width="22%"><{$ava_day}></td>
- </tr>
- <tr class="even">
- <td align="center" width="28%"><{$lang_this_week}></td>
- <td align="center" width="22%"><{$this_week}></td>
- <td align="center" width="28%"><{$lang_ave_week}></td>
- <td align="center" width="22%"><{$ava_week}></td>
- </tr>
- <tr class="odd">
- <td align="center" width="28%"><{$lang_this_mth}></td>
- <td align="center" width="22%"><{$this_mth}></td>
- <td align="center" width="28%"><{$lang_ave_mth}></td>
- <td align="center" width="22%"><{$ava_mth}></td>
- </tr>
- <tr class="even">
- <td align="center" width="28%"><{$lang_total_days}></td>
- <td align="center" width="22%"><{$days}></td>
- <td align="center" width="28%"><{$lang_ave_hour}></td>
- <td align="center" width="22%"><{$ava_hour}></td>
- </tr>
- <tr class="odd">
- <td align="center" width="28%"><{$lang_max_daycount}></td>
- <td align="center" width="22%"><{$max_daycount}></td>
- <td align="center" width="28%"><{$lang_max_date}></td>
- <td align="center" width="22%"><{$max_date}></td>
- </tr>
- <tr class="even">
- <td align="center" width="28%"><{$lang_max_weekcount}></td>
- <td align="center" width="22%"><{$max_weekcount}></td>
- <td align="center" width="28%"><{$lang_max_week}></td>
- <td align="center" width="22%"><{$max_week}></td>
- </tr>
- <tr class="odd">
- <td align="center" width="28%"><{$lang_max_mthcount}></td>
- <td align="center" width="22%"><{$max_mthcount}></td>
- <td align="center" width="28%"><{$lang_max_mth}></td>
- <td align="center" width="22%"><{$max_mth}></td>
- </tr>
- </table>
-
-</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2012-07-22 19:10:18
|
Revision: 9909
http://xoops.svn.sourceforge.net/xoops/?rev=9909&view=rev
Author: lord_venom
Date: 2012-07-22 19:10:12 +0000 (Sun, 22 Jul 2012)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/TDMPicture/trunk/TDMPicture/blocks/tdmpicture_minitable.php
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/blocks/tdmpicture_minitable.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/blocks/tdmpicture_minitable.php 2012-07-22 19:09:43 UTC (rev 9908)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/blocks/tdmpicture_minitable.php 2012-07-22 19:10:12 UTC (rev 9909)
@@ -24,7 +24,7 @@
global $xoopsModuleConfig, $xoopsModule;
include_once XOOPS_ROOT_PATH."/modules/".basename(dirname(dirname(__FILE__)))."/include/common.php";
-echo TDMPICTURE_URL."passe";
+
function addCatSelect($cats) {
if(is_array($cats)) {
$cat_sql = '('.current($cats);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2012-07-22 19:09:51
|
Revision: 9908
http://xoops.svn.sourceforge.net/xoops/?rev=9908&view=rev
Author: lord_venom
Date: 2012-07-22 19:09:43 +0000 (Sun, 22 Jul 2012)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/TDMStats/trunk/TDMStats/css/styles.css
XoopsModules/TDMStats/trunk/TDMStats/include/stats.php
XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_index.html
XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_stats.html
Modified: XoopsModules/TDMStats/trunk/TDMStats/css/styles.css
===================================================================
--- XoopsModules/TDMStats/trunk/TDMStats/css/styles.css 2012-07-22 08:47:54 UTC (rev 9907)
+++ XoopsModules/TDMStats/trunk/TDMStats/css/styles.css 2012-07-22 19:09:43 UTC (rev 9908)
@@ -1,6 +1,30 @@
+.Tableau span {
+ display:inline;
+ float:left;
+ border:1px solid #CCCCCC;
+ margin:3px;
+ padding:3px;
+ }
+.Tableau p {
+ clear:left;
+ margin:0px;
+ padding:0px;
+ height:100% !important; height:1em;
+
+ }
+.Tableau p.legende {font-weight:bold}
+.Tableau span.col1 {text-align:center; height:16px; width:200px; overflow:hidden;}
+.Tableau span.col2 {text-align:left; height:16px; width:350px;
+ background-image: url(../images/bg_fade.png);
+ background-repeat: repeat-x;
+ background-position: left top;
+ background-color:transparent;
+ overflow:hidden;
+ }
+.Tableau span.col3 {text-align:center; height:16px; width:100px; overflow:hidden;}
+.Tableau span.col4 {text-align:center; height:16px; width:100px; overflow:hidden;}
-
.ui-tabs .ui-tabs-nav li.ui-state-active {
cursor: text;
color: #666;
@@ -35,10 +59,9 @@
}
ul#tree_menu {
- margin: 0 auto;
- padding:0 auto;
text-align: center;
width:100%;
+
}
ul#tree_menu li {
@@ -57,9 +80,9 @@
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
-moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
- box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
+ box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
}
- ul#tree_menu img {
+ ul#tree_menu .img {
float:left;
padding-left:20px;
padding-right:20px;
Modified: XoopsModules/TDMStats/trunk/TDMStats/include/stats.php
===================================================================
--- XoopsModules/TDMStats/trunk/TDMStats/include/stats.php 2012-07-22 08:47:54 UTC (rev 9907)
+++ XoopsModules/TDMStats/trunk/TDMStats/include/stats.php 2012-07-22 19:09:43 UTC (rev 9908)
@@ -114,7 +114,6 @@
}
///////////WEEK////////////
-echo $is_week = formatTimeStamp(time(), 'w');
$week= array(0 => _AM_WD_7, 1=> _AM_WD_1, 2 => _AM_WD_2, 3 => _AM_WD_3, 4 => _AM_WD_4, 5 => _AM_WD_5, 6 => _AM_WD_6);
$week_day= array();
global $xoopsDB;
@@ -191,7 +190,7 @@
//$mth['percent'][] = round($mth_percent, '2');
if ($mth_percent > 0) {
- $xoopsTpl->append('mths', array('id' => 'mth'.$i, 'mth' => $mth_info[$i]['mth'], 'year' => $mth_info[$i]['year'], 'info' => $mth_info[$i]['count'], 'percent' => round($mth_percent, '2')));
+ //$xoopsTpl->append('mths', array('id' => 'mth'.$i, 'mth' => $mth_info[$i]['mth'], 'year' => $mth_info[$i]['year'], 'info' => $mth_info[$i]['count'], 'percent' => round($mth_percent, '2')));
$xoopsTpl->append('mths_map', array('id' => 'mth'.$i, 'mth' => $mth, 'year' => $mth_info[$i]['year'], 'info' => $mth_info[$i]['count'], 'percent' => round($mth_percent, '2')));
}
}
@@ -281,9 +280,9 @@
$hour_percent = 0;
}
- $hour['info'][] = $hour_info[$i]['count'];
- $hour['week'][] = $hour_info[$i]['hour'];
- $hour['percent'][] = round($hour_percent, '2');
+ //$hour['info'][] = $hour_info[$i]['count'];
+ //$hour['week'][] = $hour_info[$i]['hour'];
+ //$hour['percent'][] = round($hour_percent, '2');
if ($hour_percent > 0) {
//$xoopsTpl->append('hours', array('id' => 'hour'.$i, 'hour' => $hour_info[$i]['hour'], 'info' => $hour_info[$i]['count'], 'percent' => round($hour_percent, '2')));
@@ -331,15 +330,15 @@
$page_percent = 0;
}
- $page['info'][] = $page_info[$i]['count'];
- $page['page'][] = (strlen(basename($page_info[$i]['page'])) > 50 ? substr(basename($page_info[$i]['page']),0,(50))."..." : basename($page_info[$i]['page']));
- $url = (strlen(basename($page_info[$i]['page'])) > 50 ? substr(basename($page_info[$i]['page']),0,(50))."..." : basename($page_info[$i]['page']));
+ //$page['info'][] = $page_info[$i]['count'];
+ //$page['page'][] = (strlen(basename($page_info[$i]['page'])) > 50 ? substr(basename($page_info[$i]['page']),0,(50))."..." : basename($page_info[$i]['page']));
+ $url = (strlen(basename($page_info[$i]['page'])) > 20 ? substr(basename($page_info[$i]['page']),0,(20))."..." : basename($page_info[$i]['page']));
$title = $page_info[$i]['page'];
$page['percent'][] = round($page_percent, '2');
if ($page_percent > 0) {
- $xoopsTpl->append('pages', array('id' => 'page'.$i, 'page' => $url, 'title' => $title, 'info' => $page_info[$i]['count'], 'percent' => round($page_percent, '2')));
- $xoopsTpl->append('pages_map', array('id' => 'page'.$i, 'page' => $url, 'title' => $title, 'info' => $page_info[$i]['count'], 'percent' => round($page_percent, '2')));
+ //$xoopsTpl->append('pages', array('id' => 'page'.$i, 'page' => $url, 'title' => $title, 'info' => $page_info[$i]['count'], 'percent' => round($page_percent, '2')));
+ $xoopsTpl->append('pages_map', array('id' => 'page'.$i, 'page' => $url, 'title' => $page_info[$i]['page'], 'info' => $page_info[$i]['count'], 'percent' => round($page_percent, '2')));
}
}
}
Modified: XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_index.html
===================================================================
--- XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_index.html 2012-07-22 08:47:54 UTC (rev 9907)
+++ XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_index.html 2012-07-22 19:09:43 UTC (rev 9908)
@@ -55,7 +55,7 @@
} else {
$tdmstats("#masque_" +id).fadeOut("fast", function() {
$tdmstats("div[id^='masque']").fadeIn("fast").hide();
- $tdmstats("#masque_" +id).fadeIn("fast").show();
+ $tdmstats("#masque_" +id).slideToggle("fast").show();
});
}
Modified: XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_stats.html
===================================================================
--- XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_stats.html 2012-07-22 08:47:54 UTC (rev 9907)
+++ XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_stats.html 2012-07-22 19:09:43 UTC (rev 9908)
@@ -4,19 +4,43 @@
$("#tabs").tabs();
});
</script>
-<table cellpadding="0" id="masque_1" cellspacing="0" style="margin:5px;"><tr><td><ul id="tree_menu">
+<table cellpadding="0" id="masque_1" cellspacing="0" style="border-collapse: separate; margin:5px;"><tr><td><ul id="tree_menu">
-<li style="width:47%;" class="even"><div><img src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/day.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('day')"><{$smarty.const._AM_BY_DAY}></h2></a>
+<li style="width:46%;" class="even"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/day.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('day')"><{$smarty.const._AM_BY_DAY}></h2></a>
<div style="text-align:left">
<{foreach from=$item_days item=item}>
<span id="tree_num"><{$item.day}>, <{$item.info}> <{$smarty.const._AM_P_VISITS}></span><br />
<{/foreach}>
</div></div>
-<div id="tree_form"><a href="#masque_day" onclick="javascript:masque('day')" ><{$smarty.const._AM_VIEW}></a></div></li>
+<div id="tree_form"><a href="javascript:;" onclick="javascript:masque('day')" ><{$smarty.const._AM_VIEW}></a></div></li>
-<li style="width:47%;" class="odd"><div><img src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/weekday.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('weekday')"><{$smarty.const._AM_BY_WEEKDAY}></h2></a>
+<!-- tableau day -->
+<li id="masque_day" style="display: none;" class="odd"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/day.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('day')"><{$smarty.const._AM_BY_DAY}></h2></a>
<div style="text-align:left">
+<div class="Tableau">
+ <p class="legende">
+ <span class="col1"><{$smarty.const._AM_BY_DAY}></span>
+ <span class="col2"></span>
+ <span class="col3"><{$smarty.const._AM_DATE_VISITS}></span>
+ <span class="col4"><{$smarty.const._AM_DATE_PERCENT}></span>
+ </p>
+ <{foreach item=days_map from=$days_map}>
+ <p>
+ <span class="col1"><{$days_map.day}></span>
+ <span class="col2"><img src="./images/bar/<{$img_bar}>" title="<{$days_map.percent}>%" alt="<{$days_map.percent}>%" width="<{$days_map.percent}>%" style="height:16px;" /></span>
+ <span class="col3"><{$days_map.info}></span>
+ <span class="col3"><{$days_map.percent}>%</span>
+ </p>
+ <{/foreach}>
+</div>
+
+</div></div>
+<!--fin-->
+
+
+<li style="width:46%;" class="odd"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/weekday.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('week')"><{$smarty.const._AM_BY_WEEKDAY}></h2></a>
+<div style="text-align:left">
<{foreach from=$item_weeks item=item}>
<span id="tree_num"><{$item.week_day}>, <{$item.info}> <{$smarty.const._AM_P_VISITS}></span><br />
<{/foreach}>
@@ -24,8 +48,31 @@
</div></div>
<div id="tree_form"><a href="javascript:;" onclick="javascript:masque('week')" ><{$smarty.const._AM_VIEW}></a></div></li>
-<li style="width:47%;" class="even"><div><img src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/week.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('week')"><{$smarty.const._AM_BY_WEEK}></h2></a>
+<!-- tableau week -->
+<li id="masque_week" style="display: none;" class="odd"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/weekday.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('week')"><{$smarty.const._AM_BY_WEEKDAY}></h2></a>
<div style="text-align:left">
+<div class="Tableau">
+ <p class="legende">
+ <span class="col1"><{$smarty.const._AM_BY_WEEKDAY}></span>
+ <span class="col2"></span>
+ <span class="col3"><{$smarty.const._AM_DATE_VISITS}></span>
+ <span class="col4"><{$smarty.const._AM_DATE_PERCENT}></span>
+ </p>
+ <{foreach item=week_days_map from=$week_days_map}>
+ <p>
+ <span class="col1"><{$week_days_map.week_day}></span>
+ <span class="col2"><img src="./images/bar/<{$img_bar}>" title="<{$week_days_map.percent}>%" alt="<{$week_days_map.percent}>%" width="<{$week_days_map.percent}>%" style="height:16px;" /></span>
+ <span class="col3"><{$week_days_map.info}></span>
+ <span class="col3"><{$week_days_map.percent}>%</span>
+ </p>
+ <{/foreach}>
+</div>
+
+</div></div>
+<!--fin-->
+
+<li style="width:46%;" class="even"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/week.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('last')"><{$smarty.const._AM_BY_WEEK}></h2></a>
+<div style="text-align:left">
<{foreach from=$item_lasts item=item}>
<span id="tree_num"><{$item.week}>: <{$item.year}>, <{$item.info}> <{$smarty.const._AM_P_VISITS}></span><br />
<{/foreach}>
@@ -33,8 +80,32 @@
</div></div>
<div id="tree_form"><a href="javascript:;" onclick="javascript:masque('last')" ><{$smarty.const._AM_VIEW}></a></div></li>
-<li style="width:47%;" class="odd"><div><img src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/mth.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('mth')"><{$smarty.const._AM_BY_MTH}></h2></a>
+<!-- tableau last -->
+<li id="masque_last" style="display: none;" class="odd"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/week.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('last')"><{$smarty.const._AM_BY_WEEK}></h2></a>
<div style="text-align:left">
+<div class="Tableau">
+ <p class="legende">
+ <span class="col1"><{$smarty.const._AM_BY_WEEK}></span>
+ <span class="col2"></span>
+ <span class="col3"><{$smarty.const._AM_DATE_VISITS}></span>
+ <span class="col4"><{$smarty.const._AM_DATE_PERCENT}></span>
+ </p>
+ <{foreach item=lasts_map from=$lasts_map}>
+ <p>
+ <span class="col1"><{$lasts_map.week}> (<{$lasts_map.year}>)</span>
+ <span class="col2"><img src="./images/bar/<{$img_bar}>" title="<{$lasts_map.percent}>%" alt="<{$lasts_map.percent}>%" width="<{$lasts_map.percent}>%" style="height:16px;" /></span>
+ <span class="col3"><{$lasts_map.info}></span>
+ <span class="col3"><{$lasts_map.percent}>%</span>
+ </p>
+ <{/foreach}>
+</div>
+
+</div></div>
+<!--fin-->
+
+
+<li style="width:46%;" class="odd"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/mth.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('mth')"><{$smarty.const._AM_BY_MTH}></h2></a>
+<div style="text-align:left">
<{foreach from=$item_mths item=item}>
<span id="tree_num"><{$item.mth}>, <{$item.info}> <{$smarty.const._AM_P_VISITS}></span><br />
<{/foreach}>
@@ -42,8 +113,32 @@
</div></div>
<div id="tree_form"><a href="javascript:;" onclick="javascript:masque('mth')" ><{$smarty.const._AM_VIEW}></a></div></li>
-<li style="width:47%;" class="even"><div><img src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/hour.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('mth')"><{$smarty.const._AM_BY_HOUR}></h2></a>
+<!-- tableau mth -->
+<li id="masque_mth" style="display: none;" class="odd"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/mth.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('mth')"><{$smarty.const._AM_BY_MTH}></h2></a>
<div style="text-align:left">
+<div class="Tableau">
+ <p class="legende">
+ <span class="col1"><{$smarty.const._AM_BY_MTH}></span>
+ <span class="col2"></span>
+ <span class="col3"><{$smarty.const._AM_DATE_VISITS}></span>
+ <span class="col4"><{$smarty.const._AM_DATE_PERCENT}></span>
+ </p>
+ <{foreach item=mths_map from=$mths_map}>
+ <p>
+ <span class="col1"><{$mths_map.mth}></span>
+ <span class="col2"><img src="./images/bar/<{$img_bar}>" title="<{$mths_map.percent}>%" alt="<{$mths_map.percent}>%" width="<{$mths_map.percent}>%" style="height:16px;" /></span>
+ <span class="col3"><{$mths_map.info}></span>
+ <span class="col3"><{$mths_map.percent}>%</span>
+ </p>
+ <{/foreach}>
+</div>
+
+</div></div>
+<!--fin-->
+
+
+<li style="width:46%;" class="even"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/hour.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('mth')"><{$smarty.const._AM_BY_HOUR}></h2></a>
+<div style="text-align:left">
<{foreach from=$item_hours item=item}>
<span id="tree_num"><{$item.hour}>h, <{$item.info}> <{$smarty.const._AM_P_VISITS}></span><br />
<{/foreach}>
@@ -51,18 +146,64 @@
</div></div>
<div id="tree_form"><a href="javascript:;" onclick="javascript:masque('hour')" ><{$smarty.const._AM_VIEW}></a></div></li>
+<!-- tableau hours -->
+<li id="masque_hour" style="display: none;" class="odd"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/hour.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('hour')"><{$smarty.const._AM_BY_HOUR}></h2></a>
+<div style="text-align:left">
+<div class="Tableau">
+ <p class="legende">
+ <span class="col1"><{$smarty.const._AM_BY_HOUR}></span>
+ <span class="col2"></span>
+ <span class="col3"><{$smarty.const._AM_DATE_VISITS}></span>
+ <span class="col4"><{$smarty.const._AM_DATE_PERCENT}></span>
+ </p>
+ <{foreach item=hours_map from=$hours_map}>
+ <p>
+ <span class="col1"><{$hours_map.hour}></span>
+ <span class="col2"><img src="./images/bar/<{$img_bar}>" title="<{$hours_map.percent}>%" alt="<{$hours_map.percent}>%" width="<{$hours_map.percent}>%" style="height:16px;" /></span>
+ <span class="col3"><{$hours_map.info}></span>
+ <span class="col3"><{$hours_map.percent}>%</span>
+ </p>
+ <{/foreach}>
+</div>
-<li style="width:47%;" class="odd"><div><img src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/page.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('mth')"><{$smarty.const._AM_BY_PAGE}></h2></a>
+</div></div>
+<!--fin-->
+
+
+<li style="width:46%;" class="odd"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/page.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('page')"><{$smarty.const._AM_BY_PAGE}></h2></a>
<div style="text-align:left">
<{foreach from=$item_pages item=item}>
- <span id="tree_num"><{$item.page}>h, <{$item.info}> <{$smarty.const._AM_P_VISITS}></span><br />
+ <span id="tree_num"><{$item.page}>, <{$item.info}> <{$smarty.const._AM_P_VISITS}></span><br />
<{/foreach}>
</div></div>
<div id="tree_form"><a href="javascript:;" onclick="javascript:masque('page')" ><{$smarty.const._AM_VIEW}></a></div></li>
-<li style="width:47%;" class="even"><div><img src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/module.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('mth')"><{$smarty.const._AM_BY_MODULE}></h2></a>
+<!-- tableau pages -->
+<li id="masque_page" style="display: none;" class="odd"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/page.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('page')"><{$smarty.const._AM_BY_PAGE}></h2></a>
<div style="text-align:left">
+<div class="Tableau">
+ <p class="legende">
+ <span class="col1"><{$smarty.const._AM_BY_PAGE}></span>
+ <span class="col2"></span>
+ <span class="col3"><{$smarty.const._AM_DATE_VISITS}></span>
+ <span class="col4"><{$smarty.const._AM_DATE_PERCENT}></span>
+ </p>
+ <{foreach item=pages_map from=$pages_map}>
+ <p>
+ <span class="col1" title="<{$pages_map.title}>"><{$pages_map.page}></span>
+ <span class="col2"><img src="./images/bar/<{$img_bar}>" title="<{$pages_map.percent}>%" alt="<{$pages_map.percent}>%" width="<{$pages_map.percent}>%" style="height:16px;" /></span>
+ <span class="col3"><{$pages_map.info}></span>
+ <span class="col3"><{$pages_map.percent}>%</span>
+ </p>
+ <{/foreach}>
+</div>
+
+</div></div>
+<!--fin-->
+
+<li style="width:46%;" class="even"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/module.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('mth')"><{$smarty.const._AM_BY_MODULE}></h2></a>
+<div style="text-align:left">
<{foreach from=$item_modules item=item}>
<span id="tree_num"><{$item.module}>, <{$item.info}> <{$smarty.const._AM_P_VISITS}></span><br />
<{/foreach}>
@@ -70,142 +211,30 @@
</div></div>
<div id="tree_form"><a href="javascript:;" onclick="javascript:masque('module')" ><{$smarty.const._AM_VIEW}></a></div></li>
-
-<br style="clear: both;" /></ul></td></tr></table><br />
-
-
-<div id="masque_day" style="display: none;">
-<h2><{$smarty.const._AM_BY_DAY}></h2>
- <table width="100%" class="outer map">
- <tr>
- <th style="text-align:center;"><{$smarty.const._AM_BY_DAY}></th>
- <th></th>
- <th style="text-align:center;"><{$smarty.const._AM_DATE_VISITS}></th>
- <th style="text-align:center;"><{$smarty.const._AM_DATE_PERCENT}></th>
- </tr>
- <{foreach item=days_map from=$days_map}>
- <tr>
- <td class="odd" width="20%" style="text-align:center; vertical-align:middle;"><div style="margin:5px;"><{$days_map.day}></div></td>
- <td class="even value" width="60%" style="vertical-align:middle;"><img src="./images/bar/<{$img_bar}>" title="<{$days_map.percent}>%" alt="<{$days_map.percent}>%" width="<{$days_map.percent}>%" height="16" /></td>
- <td class="odd" width="10%" style="text-align:center; vertical-align:middle;"><div style="margin:5px;"><{$days_map.info}></div></td>
- <td class="even" width="10%" style="text-align:center; vertical-align:middle;"><div style="margin:5px;"><{$days_map.percent}>%</div></td>
- </tr>
- <{/foreach}>
- </table>
- <br /><br />
- </div>
-
-
-<div id="masque_week" style="display: none;">
-<h2><{$smarty.const._AM_BY_WEEKDAY}></h2>
- <table class="map" cellspacing="0" cellpadding="0">
- <tr>
- <th style="text-align:center;"><{$smarty.const._AM_BY_WEEKDAY}></th>
- <th></th>
- <th style="text-align:center;"><{$smarty.const._AM_DATE_VISITS}></th>
- <th style="text-align:center;"><{$smarty.const._AM_DATE_PERCENT}></th>
- </tr>
- <{foreach item=week_days_map from=$week_days_map}>
- <tr>
- <td class="odd" width="20%" style="text-align:center; vertical-align:middle;"><div style="margin:5px;"><{$week_days_map.week_day}></div></td>
- <td class="even value" width="60%" style="vertical-align:middle;"><img src="./images/bar/<{$img_bar}>" title="<{$week_days_map.percent}>%" alt="<{$week_days_map.percent}>%" width="<{$week_days_map.percent}>%" height="16" /></td>
- <td class="odd" width="10%" style="text-align:center; vertical-align:middle;"><div style="margin:5px;"><{$week_days_map.info}></div></td>
- <td class="even" width="10%" style="text-align:center; vertical-align:middle;"><div style="margin:5px;"><{$week_days_map.percent}>%</div></td>
- </tr>
- <{/foreach}>
- </table>
- </div>
+<!-- tableau module -->
+<li id="masque_module" style="display: none;" class="odd"><div><img class="img" src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/module.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('module')"><{$smarty.const._AM_BY_MODULE}></h2></a>
+<div style="text-align:left">
+<div class="Tableau">
+ <p class="legende">
+ <span class="col1"><{$smarty.const._AM_BY_MODULE}></span>
+ <span class="col2"></span>
+ <span class="col3"><{$smarty.const._AM_DATE_VISITS}></span>
+ <span class="col4"><{$smarty.const._AM_DATE_PERCENT}></span>
+ </p>
+ <{foreach item=modules_map from=$modules_map}>
+ <p>
+ <span class="col1" title="<{$modules_map.modules}>"><{$modules_map.modules}></span>
+ <span class="col2"><img src="./images/bar/<{$img_bar}>" title="<{$modules_map.percent}>%" alt="<{$modules_map.percent}>%" width="<{$modules_map.percent}>%" style="height:16px;" /></span>
+ <span class="col3"><{$modules_map.info}></span>
+ <span class="col3"><{$modules_map.percent}>%</span>
+ </p>
+ <{/foreach}>
</div>
+</div></div>
+<!--fin-->
-<div id="masque_last" style="display: none;">
-<h2><{$smarty.const._AM_BY_WEEK}></h2>
+<br style="clear: both;" /></ul></td></tr></table><br />
- <table class="map" cellspacing="0" cellpadding="0">
- <tr>
- <th scope="col"><{$smarty.const._AM_BY_WEEK}></th>
- <th scope="col"><{$smarty.const._AM_DATE_VISITS}></th>
- </tr>
- <{foreach item=lasts_map from=$lasts_map}>
- <tr>
- <td width="20%" class="option"><div style="margin:5px;"><{$lasts_map.week}> (<{$lasts_map.year}>)</div></td>
- <td width="80%" class="value"><img src="./images/bar/<{$img_bar}>" title="<{$lasts_map.percent}>%" alt="<{$lasts_map.percent}>%" width="<{$lasts_map.percent}>%" height="16" /><{$lasts_map.info}></td>
- </tr>
- <{/foreach}>
- </table>
-</div>
-
-
-<div id="masque_mth" style="display: none;">
-<h2><{$smarty.const._AM_BY_MTH}></h2>
- <table class="map" cellspacing="0" cellpadding="0">
- <tr>
- <th scope="col"><{$smarty.const._AM_BY_MTH}></th>
- <th scope="col"><{$smarty.const._AM_DATE_VISITS}></th>
- </tr>
- <{foreach item=mths_map from=$mths_map}>
- <tr>
- <td width="20%" class="option"><div style="margin:5px;"><{$mths_map.mth}> (<{$mths_map.year}>)</div></td>
- <td width="80%" class="value"><img src="./images/bar/<{$img_bar}>" title="<{$mths_map.percent}>%" alt="<{$mths_map.percent}>%" width="<{$mths_map.percent}>%" height="16" /><{$mths_map.info}></td>
- </tr>
- <{/foreach}>
- </table>
- </div>
-
-
-<div id="masque_hour" style="display: none;">
-<h2><{$smarty.const._AM_BY_HOUR}></h2>
- <table class="map" cellspacing="0" cellpadding="0">
- <tr>
- <th scope="col"><{$smarty.const._AM_BY_HOUR}></th>
- <th scope="col"><{$smarty.const._AM_DATE_VISITS}></th>
- </tr>
- <{foreach item=hours_map from=$hours_map}>
- <tr>
- <td width="20%" class="option"><div style="margin:5px;"><{$hours_map.hour}></div></td>
- <td width="80%" class="value"><img src="./images/bar/<{$img_bar}>" title="<{$hours_map.percent}>%" alt="<{$hours_map.percent}>%" width="<{$hours_map.percent}>%" height="16" /><{$hours_map.info}></td>
- </tr>
- <{/foreach}>
- </table>
- </div>
-
-<div id="masque_page" style="display: none;">
-<h2><{$smarty.const._AM_BY_PAGE}></h2>
-
- <table class="map" cellspacing="0" cellpadding="0">
- <tr>
- <th scope="col"><{$smarty.const._AM_BY_PAGE}></th>
- <th scope="col"><{$smarty.const._AM_DATE_VISITS}></th>
- </tr>
- <{foreach item=pages_map from=$pages_map}>
- <tr>
- <td width="20%" class="option"><div style="margin:5px;"><{$pages_map.page}></div></td>
- <td width="80%" class="value"><img src="./images/bar/<{$img_bar}>" title="<{$pages_map.percent}>%" alt="<{$pages_map.percent}>%" width="<{$pages_map.percent}>%" height="16" /><{$pages_map.info}></td>
- </tr>
- <{/foreach}>
- </table>
-</div>
-
-
-
-<div id="masque_module" style="display: none;">
-<h2><{$smarty.const._AM_BY_MODULE}></h2>
-<table class="map" cellspacing="0" cellpadding="0">
- <tr>
- <th scope="col"><{$smarty.const._AM_BY_MODULE}></th>
- <th scope="col"><{$smarty.const._AM_DATE_VISITS}></th>
- </tr>
- <{foreach item=modules_map from=$modules_map}>
- <tr>
- <td width="20%" class="option"><div style="margin:5px;"><{$modules_map.modules}></div></td>
- <td width="80%" class="value"><img src="./images/bar/<{$img_bar}>" title="<{$modules_map.percent}>%" alt="<{$modules_map.percent}>%" width="<{$modules_map.percent}>%" height="16" /><{$modules_map.info}></td>
- </tr>
- <{/foreach}>
- </table>
-</div>
-
-
-</div>
-
<br /><br style="clear: both;" />
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-07-22 08:48:03
|
Revision: 9907
http://xoops.svn.sourceforge.net/xoops/?rev=9907&view=rev
Author: beckmi
Date: 2012-07-22 08:47:54 +0000 (Sun, 22 Jul 2012)
Log Message:
-----------
Updating to Birthday 2.3 RC3 (removed PEAR and Cache_Lite)
Modified Paths:
--------------
XoopsModules/birthday/trunk/birthday/admin/about.php
XoopsModules/birthday/trunk/birthday/admin/admin_footer.php
XoopsModules/birthday/trunk/birthday/admin/admin_header.php
XoopsModules/birthday/trunk/birthday/admin/index.php
XoopsModules/birthday/trunk/birthday/admin/main.php
XoopsModules/birthday/trunk/birthday/admin/menu.php
XoopsModules/birthday/trunk/birthday/blocks/b_birthday.php
XoopsModules/birthday/trunk/birthday/class/birthday_utils.php
XoopsModules/birthday/trunk/birthday/class/formtextdateselect.php
XoopsModules/birthday/trunk/birthday/class/users_birthday.php
XoopsModules/birthday/trunk/birthday/comment_delete.php
XoopsModules/birthday/trunk/birthday/comment_edit.php
XoopsModules/birthday/trunk/birthday/comment_new.php
XoopsModules/birthday/trunk/birthday/comment_post.php
XoopsModules/birthday/trunk/birthday/comment_reply.php
XoopsModules/birthday/trunk/birthday/docs/changelog.txt
XoopsModules/birthday/trunk/birthday/docs/credits.txt
XoopsModules/birthday/trunk/birthday/docs/readme.txt
XoopsModules/birthday/trunk/birthday/footer.php
XoopsModules/birthday/trunk/birthday/header.php
XoopsModules/birthday/trunk/birthday/include/calendarjs.php
XoopsModules/birthday/trunk/birthday/include/comment_functions.php
XoopsModules/birthday/trunk/birthday/include/common.php
XoopsModules/birthday/trunk/birthday/include/function.php
XoopsModules/birthday/trunk/birthday/include/search.inc.php
XoopsModules/birthday/trunk/birthday/index.php
XoopsModules/birthday/trunk/birthday/language/arabic/admin.php
XoopsModules/birthday/trunk/birthday/language/english/admin.php
XoopsModules/birthday/trunk/birthday/language/english/blocks.php
XoopsModules/birthday/trunk/birthday/language/english/main.php
XoopsModules/birthday/trunk/birthday/language/english/modinfo.php
XoopsModules/birthday/trunk/birthday/language/french/admin.php
XoopsModules/birthday/trunk/birthday/language/french/blocks.php
XoopsModules/birthday/trunk/birthday/language/french/main.php
XoopsModules/birthday/trunk/birthday/language/french/modinfo.php
XoopsModules/birthday/trunk/birthday/language/persian/admin.php
XoopsModules/birthday/trunk/birthday/language/persian/blocks.php
XoopsModules/birthday/trunk/birthday/language/persian/main.php
XoopsModules/birthday/trunk/birthday/language/persian/modinfo.php
XoopsModules/birthday/trunk/birthday/language/spanish/admin.php
XoopsModules/birthday/trunk/birthday/language/spanish/blocks.php
XoopsModules/birthday/trunk/birthday/language/spanish/main.php
XoopsModules/birthday/trunk/birthday/language/spanish/modinfo.php
XoopsModules/birthday/trunk/birthday/user.php
XoopsModules/birthday/trunk/birthday/users.php
XoopsModules/birthday/trunk/birthday/xoops_version.php
Removed Paths:
-------------
XoopsModules/birthday/trunk/birthday/admin/functions.php
XoopsModules/birthday/trunk/birthday/class/PEAR.php
XoopsModules/birthday/trunk/birthday/class/PEAR5.php
XoopsModules/birthday/trunk/birthday/class/PersistableObjectHandler.php
XoopsModules/birthday/trunk/birthday/class/lite.php
Modified: XoopsModules/birthday/trunk/birthday/admin/about.php
===================================================================
--- XoopsModules/birthday/trunk/birthday/admin/about.php 2012-07-21 17:14:11 UTC (rev 9906)
+++ XoopsModules/birthday/trunk/birthday/admin/about.php 2012-07-22 08:47:54 UTC (rev 9907)
@@ -1,29 +1,29 @@
-<?php
-/**
- * Birthday module
- *
- * You may not change or alter any portion of this comment or credits
- * of supporting developers from this source code or any supporting source code
- * which is considered copyrighted (c) material of the original comment or credit authors.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @copyright The XOOPS Project (http://www.xoops.org)
- * @license {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License}
- * @package birthday
- * @since 2.5.0
- * @author XOOPS Module 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);
-
+<?php
+/**
+ * Birthday module
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright The XOOPS Project (http://www.xoops.org)
+ * @license {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License}
+ * @package birthday
+ * @since 2.5.0
+ * @author XOOPS Module 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/birthday/trunk/birthday/admin/admin_footer.php
===================================================================
--- XoopsModules/birthday/trunk/birthday/admin/admin_footer.php 2012-07-21 17:14:11 UTC (rev 9906)
+++ XoopsModules/birthday/trunk/birthday/admin/admin_footer.php 2012-07-22 08:47:54 UTC (rev 9907)
@@ -19,7 +19,7 @@
echo "<div class='adminfooter'>\n"
." <div style='text-align: center;'>\n"
- ." <a href='http://www.xoops.org' target='_blank'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\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>";
Modified: XoopsModules/birthday/trunk/birthday/admin/admin_header.php
===================================================================
--- XoopsModules/birthday/trunk/birthday/admin/admin_header.php 2012-07-21 17:14:11 UTC (rev 9906)
+++ XoopsModules/birthday/trunk/birthday/admin/admin_header.php 2012-07-22 08:47:54 UTC (rev 9907)
@@ -1,45 +1,45 @@
-<?php
-/**
- * Birthday module
- *
- * You may not change or alter any portion of this comment or credits
- * of supporting developers from this source code or any supporting source code
- * which is considered copyrighted (c) material of the original comment or credit authors.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License
- * @package birthday
- * @since 2.5.0
- * @author XOOPS Module 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');
-
-if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))){
- include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
- }else{
- redirect_header("../../../admin.php", 5, _AM_BIRTHDAY_MODULEADMIN_MISSING, false);
+<?php
+/**
+ * Birthday module
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License
+ * @package birthday
+ * @since 2.5.0
+ * @author XOOPS Module 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');
+
+if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))){
+ include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
+ }else{
+ redirect_header("../../../admin.php", 5, _AM_BIRTHDAY_MODULEADMIN_MISSING, false);
}
\ No newline at end of file
Deleted: XoopsModules/birthday/trunk/birthday/admin/functions.php
===================================================================
--- XoopsModules/birthday/trunk/birthday/admin/functions.php 2012-07-21 17:14:11 UTC (rev 9906)
+++ XoopsModules/birthday/trunk/birthday/admin/functions.php 2012-07-22 08:47:54 UTC (rev 9907)
@@ -1,67 +0,0 @@
-<?php
-/**
- * ****************************************************************************
- * birthday - MODULE FOR XOOPS
- * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
- * Created on 20 oct. 07 at 14:38:20
- * Version : $Id:
- * ****************************************************************************
- */
-
-function birthday_adminMenu($currentoption = 0, $breadcrumb = '')
-{
- global $xoopsConfig, $xoopsModule;
- if(file_exists(XOOPS_ROOT_PATH.'/modules/birthday/language/'.$xoopsConfig['language'].'/modinfo.php')) {
- include_once XOOPS_ROOT_PATH.'/modules/birthday/language/'.$xoopsConfig['language'].'/modinfo.php';
- } else {
- include_once XOOPS_ROOT_PATH.'/modules/birthday/language/english/modinfo.php';
- }
- global $adminmenu;
- include 'menu.php';
-
- echo "<style type=\"text/css\">\n";
- echo "#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; }\n";
- echo "#buttonbar { float:left; width:100%; background: #e7e7e7 url('../images/modadminbg.gif') repeat-x left bottom; font-size:93%; line-height:normal; border-left: 1px solid black; border-right: 1px solid black; margin-bottom: 12px; }\n";
- echo "#buttonbar ul { margin:0; margin-top: 15px; padding:10px 10px 0; list-style:none; }\n";
- echo "#buttonbar li { display:inline; margin:0; padding:0; }";
- echo "#buttonbar a { float:left; background:url('../images/left_both.gif') no-repeat left top; margin:0; padding:0 0 0 9px; border-bottom:1px solid #000; text-decoration:none; }\n";
- echo "#buttonbar a span { float:left; display:block; background:url('../images/right_both.gif') no-repeat right top; padding:5px 15px 4px 6px; font-weight:bold; color:#765; }\n";
- echo "/* Commented Backslash Hack hides rule from IE5-Mac \*/\n";
- echo "#buttonbar a span {float:none;}\n";
- echo "/* End IE5-Mac hack */\n";
- echo "#buttonbar a:hover span { color:#333; }\n";
- echo "#buttonbar .current a { background-position:0 -150px; border-width:0; }\n";
- echo "#buttonbar .current a span { background-position:100% -150px; padding-bottom:5px; color:#333; }\n";
- echo "#buttonbar a:hover { background-position:0% -150px; }\n";
- echo "#buttonbar a:hover span { background-position:100% -150px; }\n";
- echo "</style>\n";
-
- echo "<div id=\"buttontop\">\n";
- echo "<table style=\"width: 100%; padding: 0; \" cellspacing=\"0\">\n";
- echo "<tr>\n";
- echo "<td style=\"width: 70%; font-size: 10px; text-align: left; color: #2F5376; padding: 0 6px; line-height: 18px;\">\n";
- echo "<a href=\"../index.php\">"._AM_BIRTHDAY_GO_TO_MODULE."</a> | <a href=\"".XOOPS_URL."/modules/system/admin.php?fct=preferences&op=showmod&mod=".$xoopsModule->getVar('mid')."\">"._AM_BIRTHDAY_PREFERENCES."</a> | <a href='index.php?op=maintain'>"._AM_BIRTHDAY_MAINTAIN."</a>\n";
- echo "</td>\n";
- echo "<td style=\"width: 30%; font-size: 10px; text-align: right; color: #2F5376; padding: 0 6px; line-height: 18px;\">\n";
- echo "<b>".$xoopsModule->getVar('name')." "._AM_BIRTHDAY_ADMINISTRATION."</b> ".$breadcrumb."\n";
- echo "</td>\n";
- echo "</tr>\n";
- echo "</table>\n";
- echo "</div>\n";
- echo "<div id=\"buttonbar\">\n";
- echo "<ul>\n";
- foreach($GLOBALS['adminmenu'] as $key=>$link) {
- if($key == $currentoption) {
- echo "<li class=\"current\">\n";
- } else {
- echo "<li>\n";
- }
- echo "<a href=\"".XOOPS_URL."/modules/birthday/".$link['link']."\"><span>".$link['title']."</span></a>\n";
- echo "</li>\n";
- }
- echo "</ul>\n";
- echo "</div>\n";
- echo "<br style=\"clear:both;\" />\n";
-
-}
-?>
\ No newline at end of file
Modified: XoopsModules/birthday/trunk/birthday/admin/index.php
===================================================================
--- XoopsModules/birthday/trunk/birthday/admin/index.php 2012-07-21 17:14:11 UTC (rev 9906)
+++ XoopsModules/birthday/trunk/birthday/admin/index.php 2012-07-22 08:47:54 UTC (rev 9907)
@@ -1,34 +1,34 @@
-<?php
-/**
- * ****************************************************************************
- * Birthday - MODULE FOR XOOPS
- * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com)
- *
- * 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 Herv\xE9 Thouzard (http://www.herve-thouzard.com)
- * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License
- * @package birthday
- * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com)
- *
- * 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();
-
+<?php
+/**
+ * ****************************************************************************
+ * Birthday - MODULE FOR XOOPS
+ * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com)
+ *
+ * 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 Herv\xE9 Thouzard (http://www.herve-thouzard.com)
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License
+ * @package birthday
+ * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com)
+ *
+ * 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
Modified: XoopsModules/birthday/trunk/birthday/admin/main.php
===================================================================
--- XoopsModules/birthday/trunk/birthday/admin/main.php 2012-07-21 17:14:11 UTC (rev 9906)
+++ XoopsModules/birthday/trunk/birthday/admin/main.php 2012-07-22 08:47:54 UTC (rev 9907)
@@ -1,168 +1,184 @@
-<?php
-/**
- * ****************************************************************************
- * birthday - MODULE FOR XOOPS
- * Copyright (c) Herv� Thouzard of Instant Zero (http://www.instant-zero.com)
- * Created on 10 juil. 08 at 11:38:52
- * Version : $Id:
- * ****************************************************************************
- */
-require_once '../../../include/cp_header.php';
-require_once '../include/common.php';
-require_once XOOPS_ROOT_PATH.'/class/pagenav.php';
-require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
-include_once 'admin_header.php';
-
-$indexAdmin = new ModuleAdmin();
-
-$op = 'default';
-if (isset($_POST['op'])) {
- $op = $_POST['op'];
-} elseif ( isset($_GET['op'])) {
- $op = $_GET['op'];
-}
-
-// Lecture de certains param�tres de l'application ********************************************************************
-$limit = birthday_utils::getModuleOption('perpage'); // Nombre maximum d'�l�ments � afficher
-$baseurl = BIRTHDAY_URL.'admin/'.basename(__FILE__); // URL de ce script
-$conf_msg = birthday_utils::javascriptLinkConfirm(_AM_BIRTHDAY_CONF_DELITEM);
-$images_width = birthday_utils::getModuleOption('images_width');
-$images_height = birthday_utils::getModuleOption('images_height');
-$destname = '';
-
-$cacheFolder = XOOPS_UPLOAD_PATH.'/'.BIRTHDAY_DIRNAME;
-if(!is_dir($cacheFolder)) {
- mkdir($cacheFolder, 0777);
- file_put_contents($cacheFolder.'/index.html', '<script>history.go(-1);</script>');
-}
-
-
-switch($op)
-{
- // ****************************************************************************************************************
- case 'default': // List birthdays and show form to add a someone
- // ****************************************************************************************************************
- xoops_cp_header();
- //echo '<h1>'.birthday_utils::getModuleName().'</h1>';
- echo $indexAdmin->addNavigation('main.php');
-
-
-
- $start = isset($_GET['start']) ? intval($_GET['start']) : 0;
- $itemsCount = $hBdUsersBirthday->getCount();
- if($itemsCount > $limit) {
- $pagenav = new XoopsPageNav($itemsCount, $limit, $start, 'start');
- }
- if(isset($pagenav) && is_object($pagenav)) {
- echo "<div align='right'>".$pagenav->renderNav()."</div>";
- }
- if($itemsCount > 0) {
- $class = '';
- $items = $hBdUsersBirthday->getItems($start, $limit, 'birthday_lastname');
- echo "<table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'>";
- echo "<tr><th align='center'>"._BIRTHDAY_DATE."</th><th align='center'>"._BIRTHDAY_USERNAME."</th><th align='center'>"._BIRTHDAY_LASTNAME.', '._BIRTHDAY_FIRSTNAME."</th><th align='center'>"._AM_BIRTHDAY_ACTION."</th></tr>";
- foreach ($items as $item) {
- $class = ($class == 'even') ? 'odd' : 'even';
- $id = $item->getVar('birthday_id');
- $user = null;
- $user = $item->getXoopsUser();
- $uname = '';
- if(is_object($user)) {
- $uname = $user->getVar('uname');
- }
- $action_edit = "<a href='$baseurl?op=edit&id=".$id."' title='"._EDIT."'>".$birdthday_icones['edit'].'</a>';
- $action_delete = "<a href='$baseurl?op=delete&id=".$id."' title='"._DELETE."'".$conf_msg.">".$birdthday_icones['delete'].'</a>';
-
- echo "<tr class='".$class."'>\n";
- echo "<td align='center'>".birthday_utils::SQLDateToHuman($item->getVar('birthday_date'))."</td>";
- echo "<td align='center'>".$uname.'</td>';
- echo "<td align='center'>".$item->getFullName().'</td>';
- echo "<td align='center'>".$action_edit.' '.$action_delete.'</td>';
- echo "</tr>\n";
- }
- echo "</table>\n";
- if(isset($pagenav) && is_object($pagenav)) {
- echo "<div align='left'>".$pagenav->renderNav()."</div>";
- }
- echo "<br /><br />\n";
- }
- $item = $hBdUsersBirthday->create(true);
- $form = $hBdUsersBirthday->getForm($item, $baseurl);
- $form->display();
- break;
-
- // ****************************************************************************************************************
- case 'maintain': // Maintenance des tables et du cache
- // ****************************************************************************************************************
- xoops_cp_header();
- require_once '../xoops_version.php';
- $tables = array();
- foreach ($modversion['tables'] as $table) {
- $tables[] = $xoopsDB->prefix($table);
- }
- if(count($tables) > 0) {
- $list = implode(',', $tables);
- $xoopsDB->queryF('CHECK TABLE '.$list);
- $xoopsDB->queryF('ANALYZE TABLE '.$list);
- $xoopsDB->queryF('OPTIMIZE TABLE '.$list);
- }
- birthday_utils::updateCache();
- $hBdUsersBirthday->forceCacheClean();
- birthday_utils::redirect(_AM_BIRTHDAY_SAVE_OK, $baseurl, 2);
- break;
-
- // ****************************************************************************************************************
- case 'edit': // Edition d'un utilisateur existant
- // ****************************************************************************************************************
- xoops_cp_header();
- echo $indexAdmin->addNavigation('main.php');
- $id = isset($_GET['id']) ? intval($_GET['id']) : 0;
- if(empty($id)) {
- birthday_utils::redirect(_AM_BIRTHDAY_ERROR_1, $baseurl, 5);
- }
- // Item exits ?
- $item = null;
- $item = $hBdUsersBirthday->get($id);
- if(!is_object($item)) {
- birthday_utils::redirect(_AM_BIRTHDAY_NOT_FOUND, $baseurl, 5);
- }
- $form = $hBdUsersBirthday->getForm($item, $baseurl);
- $form->display();
- break;
-
- // ****************************************************************************************************************
- case 'saveedit': // Enregistrement des modifications
- // ****************************************************************************************************************
- xoops_cp_header();
- echo $indexAdmin->addNavigation('main.php');
- $result = $hBdUsersBirthday->saveUser();
- if($result) {
- birthday_utils::redirect(_AM_BIRTHDAY_SAVE_OK, $baseurl, 1);
- } else {
- birthday_utils::redirect(_AM_BIRTHDAY_SAVE_PB, $baseurl, 3);
- }
- break;
-
- // ****************************************************************************************************************
- case 'delete': // Suppression d'un utilisateur
- // ****************************************************************************************************************
- $id = isset($_GET['id']) ? intval($_GET['id']) : 0;
- if(empty($id)) {
- birthday_utils::redirect(_AM_BIRTHDAY_ERROR_1, $baseurl, 5);
- }
- // Item exits ?
- $item = null;
- $item = $hBdUsersBirthday->get($id);
- if(!is_object($item)) {
- birthday_utils::redirect(_AM_BIRTHDAY_NOT_FOUND, $baseurl, 5);
- }
- $result = $hBdUsersBirthday->deleteUser($item);
- if($result) {
- birthday_utils::redirect(_AM_BIRTHDAY_SAVE_OK, $baseurl, 1);
- } else {
- birthday_utils::redirect(_AM_BIRTHDAY_SAVE_PB, $baseurl, 3);
- }
-
-}
-include "admin_footer.php";
+<?php
+/**
+ * ****************************************************************************
+ * birthday - MODULE FOR XOOPS
+ * Copyright (c) Herv� Thouzard of Instant Zero (http://www.herve-thouzard.com/)
+ * Created on 10 juil. 08 at 11:38:52
+ * Version : $Id:
+ * ****************************************************************************
+ */
+require_once '../../../include/cp_header.php';
+require_once '../include/common.php';
+require_once XOOPS_ROOT_PATH.'/class/pagenav.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
+include_once 'admin_header.php';
+
+$indexAdmin = new ModuleAdmin();
+
+$op = 'default';
+if (isset($_POST['op'])) {
+ $op = $_POST['op'];
+} elseif ( isset($_GET['op'])) {
+ $op = $_GET['op'];
+}
+
+// Lecture de certains param�tres de l'application ********************************************************************
+$limit = birthday_utils::getModuleOption('perpage'); // Nombre maximum d'�l�ments � afficher
+$baseurl = BIRTHDAY_URL.'admin/'.basename(__FILE__); // URL de ce script
+$conf_msg = birthday_utils::javascriptLinkConfirm(_AM_BIRTHDAY_CONF_DELITEM);
+$images_width = birthday_utils::getModuleOption('images_width');
+$images_height = birthday_utils::getModuleOption('images_height');
+$destname = '';
+
+$cacheFolder = XOOPS_UPLOAD_PATH.'/'.BIRTHDAY_DIRNAME;
+if(!is_dir($cacheFolder)) {
+ mkdir($cacheFolder, 0777);
+ file_put_contents($cacheFolder.'/index.html', '<script>history.go(-1);</script>');
+}
+
+
+switch($op)
+{
+ // ****************************************************************************************************************
+ case 'default': // List birthdays and show form to add a someone
+ // ****************************************************************************************************************
+ xoops_cp_header();
+ //echo '<h1>'.birthday_utils::getModuleName().'</h1>';
+ echo $indexAdmin->addNavigation('main.php');
+
+
+
+ $start = isset($_GET['start']) ? intval($_GET['start']) : 0;
+ $itemsCount = $hBdUsersBirthday->getCount();
+ if($itemsCount > $limit) {
+ $pagenav = new XoopsPageNav($itemsCount, $limit, $start, 'start');
+ }
+ if(isset($pagenav) && is_object($pagenav)) {
+ echo "<div align='right'>".$pagenav->renderNav()."</div>";
+ }
+ if($itemsCount > 0) {
+ $class = '';
+ //$items = $hBdUsersBirthday->getItems($start, $limit, 'birthday_lastname');
+
+ $tblItems = array();
+ //$critere = new Criteria($this->keyName, 0 ,'<>');
+ $critere = new Criteria('birthday_id', 0 ,'<>');
+ $critere->setLimit($limit);
+ $critere->setStart($start);
+ $critere->setSort('birthday_lastname');
+// $critere->setOrder($order);
+// $tblItems = $this->getObjects($critere, $idAsKey);
+
+
+
+ $items = $hBdUsersBirthday->getObjects($start, $limit, 'birthday_lastname');
+
+
+
+ echo "<table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'>";
+ echo "<tr><th align='center'>"._BIRTHDAY_DATE."</th><th align='center'>"._BIRTHDAY_USERNAME."</th><th align='center'>"._BIRTHDAY_LASTNAME.', '._BIRTHDAY_FIRSTNAME."</th><th align='center'>"._AM_BIRTHDAY_ACTION."</th></tr>";
+ foreach ($items as $item) {
+ $class = ($class == 'even') ? 'odd' : 'even';
+ $id = $item->getVar('birthday_id');
+ $user = null;
+ $user = $item->getXoopsUser();
+ $uname = '';
+ if(is_object($user)) {
+ $uname = $user->getVar('uname');
+ }
+ $action_edit = "<a href='$baseurl?op=edit&id=".$id."' title='"._EDIT."'>".$birdthday_icones['edit'].'</a>';
+ $action_delete = "<a href='$baseurl?op=delete&id=".$id."' title='"._DELETE."'".$conf_msg.">".$birdthday_icones['delete'].'</a>';
+
+ echo "<tr class='".$class."'>\n";
+ echo "<td align='center'>".birthday_utils::SQLDateToHuman($item->getVar('birthday_date'))."</td>";
+ echo "<td align='center'>".$uname.'</td>';
+ echo "<td align='center'>".$item->getFullName().'</td>';
+ echo "<td align='center'>".$action_edit.' '.$action_delete.'</td>';
+ echo "</tr>\n";
+ }
+ echo "</table>\n";
+ if(isset($pagenav) && is_object($pagenav)) {
+ echo "<div align='left'>".$pagenav->renderNav()."</div>";
+ }
+ echo "<br /><br />\n";
+ }
+ $item = $hBdUsersBirthday->create(true);
+ $form = $hBdUsersBirthday->getForm($item, $baseurl);
+ $form->display();
+ break;
+
+ // ****************************************************************************************************************
+ case 'maintain': // Maintenance des tables et du cache
+ // ****************************************************************************************************************
+ xoops_cp_header();
+ require_once '../xoops_version.php';
+ $tables = array();
+ foreach ($modversion['tables'] as $table) {
+ $tables[] = $xoopsDB->prefix($table);
+ }
+ if(count($tables) > 0) {
+ $list = implode(',', $tables);
+ $xoopsDB->queryF('CHECK TABLE '.$list);
+ $xoopsDB->queryF('ANALYZE TABLE '.$list);
+ $xoopsDB->queryF('OPTIMIZE TABLE '.$list);
+ }
+ birthday_utils::updateCache();
+ $hBdUsersBirthday->forceCacheClean();
+ birthday_utils::redirect(_AM_BIRTHDAY_SAVE_OK, $baseurl, 2);
+ break;
+
+ // ****************************************************************************************************************
+ case 'edit': // Edition d'un utilisateur existant
+ // ****************************************************************************************************************
+ xoops_cp_header();
+ echo $indexAdmin->addNavigation('main.php');
+ $id = isset($_GET['id']) ? intval($_GET['id']) : 0;
+ if(empty($id)) {
+ birthday_utils::redirect(_AM_BIRTHDAY_ERROR_1, $baseurl, 5);
+ }
+ // Item exits ?
+ $item = null;
+ $item = $hBdUsersBirthday->get($id);
+ if(!is_object($item)) {
+ birthday_utils::redirect(_AM_BIRTHDAY_NOT_FOUND, $baseurl, 5);
+ }
+ $form = $hBdUsersBirthday->getForm($item, $baseurl);
+ $form->display();
+ break;
+
+ // ****************************************************************************************************************
+ case 'saveedit': // Enregistrement des modifications
+ // ****************************************************************************************************************
+ xoops_cp_header();
+ echo $indexAdmin->addNavigation('main.php');
+ $result = $hBdUsersBirthday->saveUser();
+ if($result) {
+ birthday_utils::redirect(_AM_BIRTHDAY_SAVE_OK, $baseurl, 1);
+ } else {
+ birthday_utils::redirect(_AM_BIRTHDAY_SAVE_PB, $baseurl, 3);
+ }
+ break;
+
+ // ****************************************************************************************************************
+ case 'delete': // Suppression d'un utilisateur
+ // ****************************************************************************************************************
+ $id = isset($_GET['id']) ? intval($_GET['id']) : 0;
+ if(empty($id)) {
+ birthday_utils::redirect(_AM_BIRTHDAY_ERROR_1, $baseurl, 5);
+ }
+ // Item exits ?
+ $item = null;
+ $item = $hBdUsersBirthday->get($id);
+ if(!is_object($item)) {
+ birthday_utils::redirect(_AM_BIRTHDAY_NOT_FOUND, $baseurl, 5);
+ }
+ $result = $hBdUsersBirthday->deleteUser($item);
+ if($result) {
+ birthday_utils::redirect(_AM_BIRTHDAY_SAVE_OK, $baseurl, 1);
+ } else {
+ birthday_utils::redirect(_AM_BIRTHDAY_SAVE_PB, $baseurl, 3);
+ }
+
+}
+include "admin_footer.php";
//xoops_cp_footer();
\ No newline at end of file
Modified: XoopsModules/birthday/trunk/birthday/admin/menu.php
===================================================================
--- XoopsModules/birthday/trunk/birthday/admin/menu.php 2012-07-21 17:14:11 UTC (rev 9906)
+++ XoopsModules/birthday/trunk/birthday/admin/menu.php 2012-07-22 08:47:54 UTC (rev 9907)
@@ -2,7 +2,7 @@
/**
* ****************************************************************************
* Birthday - MODULE FOR XOOPS
- * Script made by Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
+ * Script made by Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
* Created on 10 jully. 08 at 11:32:40
* ****************************************************************************
*/
@@ -23,12 +23,11 @@
$adminmenu[$i]["title"] = _MI_BIRTHDAY_BIRTHDAYS;
$adminmenu[$i]["link"] = "admin/main.php";
$adminmenu[$i]["icon"] = './images/cake.png';
+//$i++;
+//$adminmenu[$i]["title"] = _MI_BIRTHDAY_MAINTAIN;
+//$adminmenu[$i]["link"] = "admin/main.php?op=maintain";
+//$adminmenu[$i]["icon"] = './images/maintenance.png';
$i++;
-$adminmenu[$i]["title"] = _MI_BIRTHDAY_MAINTAIN;
-$adminmenu[$i]["link"] = "admin/main.php?op=maintain";
-$adminmenu[$i]["icon"] = './images/maintenance.png';
-$i++;
-
$adminmenu[$i]["title"] =_MI_BIRTHDAY_ABOUT;
$adminmenu[$i]["link"] = "admin/about.php";
$adminmenu[$i]["icon"] = $pathIcon32.'/about.png';
\ No newline at end of file
Modified: XoopsModules/birthday/trunk/birthday/blocks/b_birthday.php
===================================================================
--- XoopsModules/birthday/trunk/birthday/blocks/b_birthday.php 2012-07-21 17:14:11 UTC (rev 9906)
+++ XoopsModules/birthday/trunk/birthday/blocks/b_birthday.php 2012-07-22 08:47:54 UTC (rev 9907)
@@ -1,38 +1,38 @@
-<?php
-function b_birthday_show($options) {
- global $xoopsUser;
- $block = array();
- include XOOPS_ROOT_PATH.'/modules/birthday/include/common.php';
- $start = 0;
- $limit = intval($options[0]);
- $itemsCount = $hBdUsersBirthday->getTodayBirthdaysCount();
- $users = $hBdUsersBirthday->getTodayBirthdays($start, $limit);
- if(count($users) > 0) {
- foreach($users as $user) {
- $block['birthday_today_users'][] = $user->toArray();
- }
- }
- if($itemsCount > $limit) {
- $block['birthday_today_more'] = true;
- } else {
- $block['birthday_today_more'] = false;
- }
-
- if (is_object($xoopsUser) && birthday_utils::getModuleOption('enable_users')) {
- $block['birthday_today_mypage'] = true;
- } else {
- $block['birthday_today_mypage'] = false;
- }
- return $block;
-}
-
-function b_birthday_edit($options)
-{
- include XOOPS_ROOT_PATH.'/modules/birthday/include/common.php';
- $form = '';
- $form .= "<table border='0'>";
- $form .= '<tr><td>'._MB_BIRTHDAY_MAX_ITEMS."</td><td><input type='text' name='options[]' id='options' value='".$options[0]."' /></td></tr>\n";
- $form .= "</table>\n";
- return $form;
-}
-?>
+<?php
+function b_birthday_show($options) {
+ global $xoopsUser;
+ $block = array();
+ include XOOPS_ROOT_PATH.'/modules/birthday/include/common.php';
+ $start = 0;
+ $limit = intval($options[0]);
+ $itemsCount = $hBdUsersBirthday->getTodayBirthdaysCount();
+ $users = $hBdUsersBirthday->getTodayBirthdays($start, $limit);
+ if(count($users) > 0) {
+ foreach($users as $user) {
+ $block['birthday_today_users'][] = $user->toArray();
+ }
+ }
+ if($itemsCount > $limit) {
+ $block['birthday_today_more'] = true;
+ } else {
+ $block['birthday_today_more'] = false;
+ }
+
+ if (is_object($xoopsUser) && birthday_utils::getModuleOption('enable_users')) {
+ $block['birthday_today_mypage'] = true;
+ } else {
+ $block['birthday_today_mypage'] = false;
+ }
+ return $block;
+}
+
+function b_birthday_edit($options)
+{
+ include XOOPS_ROOT_PATH.'/modules/birthday/include/common.php';
+ $form = '';
+ $form .= "<table border='0'>";
+ $form .= '<tr><td>'._MB_BIRTHDAY_MAX_ITEMS."</td><td><input type='text' name='options[]' id='options' value='".$options[0]."' /></td></tr>\n";
+ $form .= "</table>\n";
+ return $form;
+}
+?>
Deleted: XoopsModules/birthday/trunk/birthday/class/PEAR.php
===================================================================
--- XoopsModules/birthday/trunk/birthday/class/PEAR.php 2012-07-21 17:14:11 UTC (rev 9906)
+++ XoopsModules/birthday/trunk/birthday/class/PEAR.php 2012-07-22 08:47:54 UTC (rev 9907)
@@ -1,1064 +0,0 @@
-<?php
-/**
- * PEAR, the PHP Extension and Application Repository
- *
- * PEAR class and PEAR_Error class
- *
- * PHP versions 4 and 5
- *
- * @category pear
- * @package PEAR
- * @author Sterling Hughes <ste...@ph...>
- * @author Stig Bakken <ss...@ph...>
- * @author Tomas V.V.Cox <co...@id...>
- * @author Greg Beaver <ce...@ph...>
- * @copyright 1997-2010 The Authors
- * @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
- * @link http://pear.php.net/package/PEAR
- * @since File available since Release 0.1
- */
-
-/**#@+
- * ERROR constants
- */
-define('PEAR_ERROR_RETURN', 1);
-define('PEAR_ERROR_PRINT', 2);
-define('PEAR_ERROR_TRIGGER', 4);
-define('PEAR_ERROR_DIE', 8);
-define('PEAR_ERROR_CALLBACK', 16);
-/**
- * WARNING: obsolete
- * @deprecated
- */
-define('PEAR_ERROR_EXCEPTION', 32);
-/**#@-*/
-define('PEAR_ZE2', (function_exists('version_compare') &&
- version_compare(zend_version(), "2-dev", "ge")));
-
-if (substr(PHP_OS, 0, 3) == 'WIN') {
- define('OS_WINDOWS', true);
- define('OS_UNIX', false);
- define('PEAR_OS', 'Windows');
-} else {
- define('OS_WINDOWS', false);
- define('OS_UNIX', true);
- define('PEAR_OS', 'Unix'); // blatant assumption
-}
-
-$GLOBALS['_PEAR_default_error_mode'] = PEAR_ERROR_RETURN;
-$GLOBALS['_PEAR_default_error_options'] = E_USER_NOTICE;
-$GLOBALS['_PEAR_destructor_object_list'] = array();
-$GLOBALS['_PEAR_shutdown_funcs'] = array();
-$GLOBALS['_PEAR_error_handler_stack'] = array();
-
-@ini_set('track_errors', true);
-
-/**
- * Base class for other PEAR classes. Provides rudimentary
- * emulation of destructors.
- *
- * If you want a destructor in your class, inherit PEAR and make a
- * destructor method called _yourclassname (same name as the
- * constructor, but with a "_" prefix). Also, in your constructor you
- * have to call the PEAR constructor: $this->PEAR();.
- * The destructor method will be called without parameters. Note that
- * at in some SAPI implementations (such as Apache), any output during
- * the request shutdown (in which destructors are called) seems to be
- * discarded. If you need to get any debug information from your
- * destructor, use error_log(), syslog() or something similar.
- *
- * IMPORTANT! To use the emulated destructors you need to create the
- * objects by reference: $obj =& new PEAR_child;
- *
- * @category pear
- * @package PEAR
- * @author Stig Bakken <ss...@ph...>
- * @author Tomas V.V. Cox <co...@id...>
- * @author Greg Beaver <ce...@ph...>
- * @copyright 1997-2006 The PHP Group
- * @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.4
- * @link http://pear.php.net/package/PEAR
- * @see PEAR_Error
- * @since Class available since PHP 4.0.2
- * @link http://pear.php.net/manual/en/core.pear.php#core.pear.pear
- */
-class PEAR
-{
- /**
- * Whether to enable internal debug messages.
- *
- * @var bool
- * @access private
- */
- var $_debug = false;
-
- /**
- * Default error mode for this object.
- *
- * @var int
- * @access private
- */
- var $_default_error_mode = null;
-
- /**
- * Default error options used for this object when error mode
- * is PEAR_ERROR_TRIGGER.
- *
- * @var int
- * @access private
- */
- var $_default_error_options = null;
-
- /**
- * Default error handler (callback) for this object, if error mode is
- * PEAR_ERROR_CALLBACK.
- *
- * @var string
- * @access private
- */
- var $_default_error_handler = '';
-
- /**
- * Which class to use for error objects.
- *
- * @var string
- * @access private
- */
- var $_error_class = 'PEAR_Error';
-
- /**
- * An array of expected errors.
- *
- * @var array
- * @access private
- */
- var $_expected_errors = array();
-
- /**
- * Constructor. Registers this object in
- * $_PEAR_destructor_object_list for destructor emulation if a
- * destructor object exists.
- *
- * @param string $error_class (optional) which class to use for
- * error objects, defaults to PEAR_Error.
- * @access public
- * @return void
- */
- function PEAR($error_class = null)
- {
- $classname = strtolower(get_class($this));
- if ($this->_debug) {
- print "PEAR constructor called, class=$classname\n";
- }
-
- if ($error_class !== null) {
- $this->_error_class = $error_class;
- }
-
- while ($classname && strcasecmp($classname, "pear")) {
- $destructor = "_$classname";
- if (method_exists($this, $destructor)) {
- global $_PEAR_destructor_object_list;
- $_PEAR_destructor_object_list[] = &$this;
- if (!isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) {
- register_shutdown_function("_PEAR_call_destructors");
- $GLOBALS['_PEAR_SHUTDOWN_REGISTERED'] = true;
- }
- break;
- } else {
- $classname = get_parent_class($classname);
- }
- }
- }
-
- /**
- * Destructor (the emulated type of...). Does nothing right now,
- * but is included for forward compatibility, so subclass
- * destructors should always call it.
- *
- * See the note in the class desciption about output from
- * destructors.
- *
- * @access public
- * @return void
- */
- function _PEAR() {
- if ($this->_debug) {
- printf("PEAR destructor called, class=%s\n", strtolower(get_class($this)));
- }
- }
-
- /**
- * If you have a class that's mostly/entirely static, and you need static
- * properties, you can use this method to simulate them. Eg. in your method(s)
- * do this: $myVar = &PEAR::getStaticProperty('myclass', 'myVar');
- * You MUST use a reference, or they will not persist!
- *
- * @access public
- * @param string $class The calling classname, to prevent clashes
- * @param string $var The variable to retrieve.
- * @return mixed A reference to the variable. If not set it will be
- * auto initialised to NULL.
- */
- function &getStaticProperty($class, $var)
- {
- static $properties;
- if (!isset($properties[$class])) {
- $properties[$class] = array();
- }
-
- if (!array_key_exists($var, $properties[$class])) {
- $properties[$class][$var] = null;
- }
-
- return $properties[$class][$var];
- }
-
- /**
- * Use this function to register a shutdown method for static
- * classes.
- *
- * @access public
- * @param mixed $func The function name (or array of class/method) to call
- * @param mixed $args The arguments to pass to the function
- * @return void
- */
- function registerShutdownFunc($func, $args = array())
- {
- // if we are called statically, there is a potential
- // that no shutdown func is registered. Bug #6445
- if (!isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) {
- register_shutdown_function("_PEAR_call_destructors");
- $GLOBALS['_PEAR_SHUTDOWN_REGISTERED'] = true;
- }
- $GLOBALS['_PEAR_shutdown_funcs'][] = array($func, $args);
- }
-
- /**
- * Tell whether a value is a PEAR error.
- *
- * @param mixed $data the value to test
- * @param int $code if $data is an error object, return true
- * only if $code is a string and
- * $obj->getMessage() == $code or
- * $code is an integer and $obj->getCode() == $code
- * @access public
- * @return bool true if parameter is an error
- */
- function isError($data, $code = null)
- {
- if (!is_a($data, 'PEAR_Error')) {
- return false;
- }
-
- if (is_null($code)) {
- return true;
- } elseif (is_string($code)) {
- return $data->getMessage() == $code;
- }
-
- return $data->getCode() == $code;
- }
-
- /**
- * Sets how errors generated by this object should be handled.
- * Can be invoked both in objects and statically. If called
- * statically, setErrorHandling sets the default behaviour for all
- * PEAR objects. If called in an object, setErrorHandling sets
- * the default behaviour for that object.
- *
- * @param int $mode
- * One of PEAR_ERROR_RETURN, PEAR_ERROR_PRINT,
- * PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
- * PEAR_ERROR_CALLBACK or PEAR_ERROR_EXCEPTION.
- *
- * @param mixed $options
- * When $mode is PEAR_ERROR_TRIGGER, this is the error level (one
- * of E_USER_NOTICE, E_USER_WARNING or E_USER_ERROR).
- *
- * When $mode is PEAR_ERROR_CALLBACK, this parameter is expected
- * to be the callback function or method. A callback
- * function is a string with the name of the function, a
- * callback method is an array of two elements: the element
- * at index 0 is the object, and the element at index 1 is
- * the name of the method to call in the object.
- *
- * When $mode is PEAR_ERROR_PRINT or PEAR_ERROR_DIE, this is
- * a printf format string used when printing the error
- * message.
- *
- * @access public
- * @return void
- * @see PEAR_ERROR_RETURN
- * @see PEAR_ERROR_PRINT
- * @see PEAR_ERROR_TRIGGER
- * @see PEAR_ERROR_DIE
- * @see PEAR_ERROR_CALLBACK
- * @see PEAR_ERROR_EXCEPTION
- *
- * @since PHP 4.0.5
- */
- function setErrorHandling($mode = null, $options = null)
- {
- if (isset($this) && is_a($this, 'PEAR')) {
- $setmode = &$this->_default_error_mode;
- $setoptions = &$this->_default_error_options;
- } else {
- $setmode = &$GLOBALS['_PEAR_default_error_mode'];
- $setoptions = &$GLOBALS['_PEAR_default_error_options'];
- }
-
- switch ($mode) {
- case PEAR_ERROR_EXCEPTION:
- case PEAR_ERROR_RETURN:
- case PEAR_ERROR_PRINT:
- case PEAR_ERROR_TRIGGER:
- case PEAR_ERROR_DIE:
- case null:
- $setmode = $mode;
- $setoptions = $options;
- break;
-
- case PEAR_ERROR_CALLBACK:
- $setmode = $mode;
- // class/object method callback
- if (is_callable($options)) {
- $setoptions = $options;
- } else {
- trigger_error("invalid error callback", E_USER_WARNING);
- }
- break;
-
- default:
- trigger_error("invalid error mode", E_USER_WARNING);
- break;
- }
- }
-
- /**
- * This method is used to tell which errors you expect to get.
- * Expected errors are always returned with error mode
- * PEAR_ERROR_RETURN. Expected error codes are stored in a stack,
- * and this method pushes a new element onto it. The list of
- * expected errors are in effect until they are popped off the
- * stack with the popExpect() method.
- *
- * Note that this method can not be called statically
- *
- * @param mixed $code a single error code or an array of error codes to expect
- *
- * @return int the new depth of the "expected errors" stack
- * @access public
- */
- function expectError($code = '*')
- {
- if (is_array($code)) {
- array_push($this->_expected_errors, $code);
- } else {
- array_push($this->_expected_errors, array($code));
- }
- return count($this->_expected_errors);
- }
-
- /**
- * This method pops one element off the expected error codes
- * stack.
- *
- * @return array the list of error codes that were popped
- */
- function popExpect()
- {
- return array_pop($this->_expected_errors);
- }
-
- /**
- * This method checks unsets an error code if available
- *
- * @param mixed error code
- * @return bool true if the error code was unset, false otherwise
- * @access private
- * @since PHP 4.3.0
- */
- function _checkDelExpect($error_code)
- {
- $deleted = false;
- foreach ($this->_expected_errors as $key => $error_array) {
- if (in_array($error_code, $error_array)) {
- unset($this->_expected_errors[$key][array_search($error_code, $error_array)]);
- $deleted = true;
- }
-
- // clean up empty arrays
- if (0 == count($this->_expected_errors[$key])) {
- unset($this->_expected_errors[$key]);
- }
- }
-
- return $deleted;
- }
-
- /**
- * This method deletes all occurences of the specified element from
- * the expected error codes stack.
- *
- * @param mixed $error_code error code that should be deleted
- * @return mixed list of error codes that were deleted or error
- * @access public
- * @since PHP 4.3.0
- */
- function delExpect($error_code)
- {
- $deleted = false;
- if ((is_array($error_code) && (0 != count($error_code)))) {
- // $error_code is a non-empty array here; we walk through it trying
- // to unset all values
- foreach ($error_code as $key => $error) {
- $deleted = $this->_checkDelExpect($error) ? true : false;
- }
-
- return $deleted ? true : PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
- } elseif (!empty($error_code)) {
- // $error_code comes alone, trying to unset it
- if ($this->_checkDelExpect($error_code)) {
- return true;
- }
-
- return PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
- }
-
- // $error_code is empty
- return PEAR::raiseError("The expected error you submitted is empty"); // IMPROVE ME
- }
-
- /**
- * This method is a wrapper that returns an instance of the
- * configured error class with this object's default error
- * handling applied. If the $mode and $options parameters are not
- * specified, the object's defaults are used.
- *
- * @param mixed $message a text error message or a PEAR error object
- *
- * @param int $code a numeric error code (it is up to your class
- * to define these if you want to use codes)
- *
- * @param int $mode One of PEAR_ERROR_RETURN, PEAR_ERROR_PRINT,
- * PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
- * PEAR_ERROR_CALLBACK, PEAR_ERROR_EXCEPTION.
- *
- * @param mixed $options If $mode is PEAR_ERROR_TRIGGER, this parameter
- * specifies the PHP-internal error level (one of
- * E_USER_NOTICE, E_USER_WARNING or E_USER_ERROR).
- * If $mode is PEAR_ERROR_CALLBACK, this
- * parameter specifies the callback function or
- * method. In other error modes this parameter
- * is ignored.
- *
- * @param string $userinfo If you need to pass along for example debug
- * information, this parameter is meant for that.
- *
- * @param string $error_class The returned error object will be
- * instantiated from this class, if specified.
- *
- * @param bool $skipmsg If true, raiseError will only pass error codes,
- * the error message parameter will be dropped.
- *
- * @access public
- * @return object a PEAR error object
- * @see PEAR::setErrorHandling
- * @since PHP 4.0.5
- */
- function &raiseError($message = null,
- $code = null,
- $mode = null,
- $options = null,
- $userinfo = null,
- $error_class = null,
- $skipmsg = false)
- {
- // The error is yet a PEAR error object
- if (is_object($message)) {
- $code = $message->getCode();
- $userinfo = $message->getUserInfo();
- $error_class = $message->getType();
- $message->error_message_prefix = '';
- $message = $message->getMessage();
- }
-
- if (
- isset($this) &&
- isset($this->_expected_errors) &&
- count($this->_expected_errors) > 0 &&
- count($exp = end($this->_expected_errors))
- ) {
- if ($exp[0] == "*" ||
- (is_int(reset($exp)) && in_array($code, $exp)) ||
- (is_string(reset($exp)) && in_array($message, $exp))
- ) {
- $mode = PEAR_ERROR_RETURN;
- }
- }
-
- // No mode given, try global ones
- if ($mode === null) {
- // Class error handler
- if (isset($this) && isset($this->_default_error_mode)) {
- $mode = $this->_default_error_mode;
- $options = $this->_default_error_options;
- // Global error handler
- } elseif (isset($GLOBALS['_PEAR_default_error_mode'])) {
- $mode = $GLOBALS['_PEAR_default_error_mode'];
- $options = $GLOBALS['_PEAR_default_error_options'];
- }
- }
-
- if ($error_class !== null) {
- $ec = $error_class;
- } elseif (isset($this) && isset($this->_error_class)) {
- $ec = $this->_error_class;
- } else {
- $ec = 'PEAR_Error';
- }
-
- if (intval(PHP_VERSION) < 5) {
- // little non-eval hack to fix bug #12147
- include 'PEAR/FixPHP5PEARWarnings.php';
- return $a;
- }
-
- if ($skipmsg) {
- $a = new $ec($code, $mode, $options, $userinfo);
- } else {
- $a = new $ec($message, $code, $mode, $options, $userinfo);
- }
-
- return $a;
- }
-
- /**
- * Simpler form of raiseError with fewer options. In most cases
- * message, code and userinfo are enough.
- *
- * @param mixed $message a text error message or a PEAR error object
- *
- * @param int $code a numeric error code (it is up to your class
- * to define these if you want to use codes)
- *
- * @param string $userinfo If you need to pass along for example debug
- * information, this parameter is meant for that.
- *
- * @access public
- * @return object a PEAR error object
- * @see PEAR::raiseError
- */
- function &throwError($message = null, $code = null, $userinfo = null)
- {
- if (isset($this) && is_a($this, 'PEAR')) {
- $a = &$this->raiseError($message, $code, null, null, $userinfo);
- return $a;
- }
-
- $a = &PEAR::raiseError($message, $code, null, null, $userinfo);
- return $a;
- }
-
- function staticPushErrorHandling($mode, $options = null)
- {
- $stack = &$GLOBALS['_PEAR_error_handler_stack'];
- $def_mode = &$GLOBALS['_PEAR_default_error_mode'];
- $def_options = &$GLOBALS['_PEAR_default_error_options'];
- $stack[] = array($def_mode, $def_options);
- switch ($mode) {
- case PEAR_ERROR_EXCEPTION:
- case PEAR_ERROR_RETURN:
- case PEAR_ERROR_PRINT:
- case PEAR_ERROR_TRIGGER:
- case PEAR_ERROR_DIE:
- case null:
- $def_mode = $mode;
- $def_options = $options;
- break;
-
- case PEAR_ERROR_CALLBACK:
- $def_mode = $mode;
- // class/object method callback
- if (is_callable($options)) {
- $def_options = $options;
- } else {
- trigger_error("invalid error callback", E_USER_WARNING);
- }
- break;
-
- default:
- trigger_error("invalid error mode", E_USER_WARNING);
- break;
- }
- $stack[] = array($mode, $options);
- return true;
- }
-
- function staticPopErrorHandling()
- {
- $stack = &$GLOBALS['_PEAR_error_handler_stack'];
- $setmode = &$GLOBALS['_PEAR_default_error_mode'];
- $setoptions = &$GLOBALS['_PEAR_default_error_options'];
- array_pop($stack);
- list($mode, $options) = $stack[sizeof($stack) - 1];
- array_pop($stack);
- switch ($mode) {
- case PEAR_ERROR_EXCEPTION:
- case PEAR_ERROR_RETURN:
- case PEAR_ERROR_PRINT:
- case PEAR_ERROR_TRIGGER:
- case PEAR_ERROR_DIE:
- case null:
- $setmode = $mode;
- $setoptions = $options;
- break;
-
- case PEAR_ERROR_CALLBACK:
- $setmode = $mode;
- // class/object method callback
- if (is_callable($options)) {
- $setoptions = $options;
- } else {
- trigger_error("invalid error callback", E_USER_WARNING);
- }
- break;
-
- default:
- trigger_error("invalid error mode", E_USER_WARNING);
- break;
- }
- return true;
- }
-
- /**
- * Push a new error handler on top of the error handler options stack. With this
- * you can easily override the actual error handler for some code and restore
- * it later with popErrorHandling.
- *
- * @param mixed $mode (same as setErrorHandling)
- * @param mixed $options (same as setErrorHandling)
- *
- * @return bool Always true
- *
- * @see PEAR::setErrorHandling
- */
- function pushErrorHandling($mode, $options = null)
- {
- $stack = &$GLOBALS['_PEAR_error_handler_stack'];
- if (isset($this) && is_a($this, 'PEAR')) {
- $def_mode = &$this->_default_error_mode;
- $def_options = &$this->_default_error_options;
- } else {
- $def_mode = &$GLOBALS['_PEAR_default_error_mode'];
- $def_options = &$GLOBALS['_PEAR_default_error_options'];
- }
- $stack[] = array($def_mode, $def_options);
-
- if (isset($this) && is_a($this, 'PEAR')) {
- $this->setErrorHandling($mode, $options);
- } else {
- PEAR::setErrorHandling($mode, $options);
- }
- $stack[] = array($mode, $options);
- r...
[truncated message content] |
|
From: <lor...@us...> - 2012-07-21 17:14:19
|
Revision: 9906
http://xoops.svn.sourceforge.net/xoops/?rev=9906&view=rev
Author: lord_venom
Date: 2012-07-21 17:14:11 +0000 (Sat, 21 Jul 2012)
Log Message:
-----------
news setlocal
Modified Paths:
--------------
XoopsModules/TDMStats/trunk/TDMStats/include/stats.php
XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_stats.html
Modified: XoopsModules/TDMStats/trunk/TDMStats/include/stats.php
===================================================================
--- XoopsModules/TDMStats/trunk/TDMStats/include/stats.php 2012-07-21 11:44:24 UTC (rev 9905)
+++ XoopsModules/TDMStats/trunk/TDMStats/include/stats.php 2012-07-21 17:14:11 UTC (rev 9906)
@@ -26,7 +26,11 @@
redirect_header( XOOPS_URL , 1 , _AM_QUERYNOPERM);
}
-setlocale(LC_ALL, $xoopsModuleConfig['setlocal'], $xoopsModuleConfig['setlocal2']);
+setlocale(LC_ALL, $xoopsModuleConfig['setlocal'], $xoopsModuleConfig['setlocal2']);
+$thisday = date("d");
+$thismonth = date("m");
+$thisyear = date("Y");
+$thisnumday = date("w");
$xoopsTpl->assign('lang_by_weekday', _AM_BY_WEEKDAY);
$xoopsTpl->assign('lang_by_week', _AM_BY_WEEK);
@@ -101,13 +105,16 @@
if($week_info){
for($i=0; $i<sizeof($week_info); $i++){
- $week_day = $week[$week_info[$i]['day']];
+ //$week_day = $week[$week_info[$i]['day']];
+ $day = strftime("%A", mktime(0, 0, 0,1 ,$week_info[$i]['day'] , 1973));
- $xoopsTpl->append('item_weeks', array('id' => 'week_day'.$i, 'week_day' => $week_day, 'info' => $week_info[$i]['count']));
+ $xoopsTpl->append('item_weeks', array('id' => 'week_day'.$i, 'week_day' => $day, 'info' => $week_info[$i]['count']));
}
}
+
///////////WEEK////////////
+echo $is_week = formatTimeStamp(time(), 'w');
$week= array(0 => _AM_WD_7, 1=> _AM_WD_1, 2 => _AM_WD_2, 3 => _AM_WD_3, 4 => _AM_WD_4, 5 => _AM_WD_5, 6 => _AM_WD_6);
$week_day= array();
global $xoopsDB;
@@ -124,14 +131,14 @@
$week_day_percent = 0;
}
-
- $week_day['info'][] = $week_info[$i]['count'];
+ $day = strftime("%A", mktime(0, 0, 0,1 ,$week_info[$i]['day'] , 1973));
+ //$week_day['info'][] = $week_info[$i]['count'];
//$week_day['week_day'][] = $week_day[$i]['day'];
- $week_day['percent'][] = round($week_day_percent, '2');
+ //$week_day['percent'][] = round($week_day_percent, '2');
if ($week_day_percent > 0) {
//$xoopsTpl->append('week_days', array('id' => 'week_day'.$i, 'week_day' => $week[$i], 'info' => $week_info[$i]['count'], 'percent' => round($week_day_percent, '2')));
- $xoopsTpl->append('week_days_map', array('id' => 'week_day'.$i, 'week_day' => $week[$i], 'info' => $week_info[$i]['count'], 'percent' => round($week_day_percent, '2')));
+ $xoopsTpl->append('week_days_map', array('id' => 'week_day'.$i, 'week_day' => $day, 'info' => $week_info[$i]['count'], 'percent' => round($week_day_percent, '2')));
}
}
}
@@ -177,14 +184,15 @@
}
//echo "nous sommes le". strftime ("%A %d %B %Y et il est %Hh%M", 1207742661);
- $week = strftime("%B %Y", mktime(0, 0, 0,$mth_info[$i]['mth'] ,01 ,$mth_info[$i]['year']));
- $mth['info'][] = $mth_info[$i]['count'];
+ //$week = strftime("%B %Y", mktime(0, 0, 0,$mth_info[$i]['mth'] ,01 ,$mth_info[$i]['year']));
+ $mth = strftime("%B %Y", mktime(0, 0, 0,$mth_info[$i]['mth'] ,01 ,$mth_info[$i]['year']));
+ //$mth['info'][] = $mth_info[$i]['count'];
//$mth['week'][] = $mth_info[$i]['week'];
- $mth['percent'][] = round($mth_percent, '2');
+ //$mth['percent'][] = round($mth_percent, '2');
if ($mth_percent > 0) {
$xoopsTpl->append('mths', array('id' => 'mth'.$i, 'mth' => $mth_info[$i]['mth'], 'year' => $mth_info[$i]['year'], 'info' => $mth_info[$i]['count'], 'percent' => round($mth_percent, '2')));
- $xoopsTpl->append('mths_map', array('id' => 'mth'.$i, 'mth' => $mth_info[$i]['mth'], 'year' => $mth_info[$i]['year'], 'info' => $mth_info[$i]['count'], 'percent' => round($mth_percent, '2')));
+ $xoopsTpl->append('mths_map', array('id' => 'mth'.$i, 'mth' => $mth, 'year' => $mth_info[$i]['year'], 'info' => $mth_info[$i]['count'], 'percent' => round($mth_percent, '2')));
}
}
}
Modified: XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_stats.html
===================================================================
--- XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_stats.html 2012-07-21 11:44:24 UTC (rev 9905)
+++ XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_stats.html 2012-07-21 17:14:11 UTC (rev 9906)
@@ -64,7 +64,7 @@
<li style="width:47%;" class="even"><div><img src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/module.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('mth')"><{$smarty.const._AM_BY_MODULE}></h2></a>
<div style="text-align:left">
<{foreach from=$item_modules item=item}>
- <span id="tree_num"><{$item.module}> <{$item.info}> <{$smarty.const._AM_P_VISITS}></span><br />
+ <span id="tree_num"><{$item.module}>, <{$item.info}> <{$smarty.const._AM_P_VISITS}></span><br />
<{/foreach}>
</div></div>
@@ -100,14 +100,18 @@
<h2><{$smarty.const._AM_BY_WEEKDAY}></h2>
<table class="map" cellspacing="0" cellpadding="0">
<tr>
- <th scope="col"><{$smarty.const._AM_BY_WEEKDAY}></th>
- <th scope="col"><{$smarty.const._AM_DATE_VISITS}></th>
+ <th style="text-align:center;"><{$smarty.const._AM_BY_WEEKDAY}></th>
+ <th></th>
+ <th style="text-align:center;"><{$smarty.const._AM_DATE_VISITS}></th>
+ <th style="text-align:center;"><{$smarty.const._AM_DATE_PERCENT}></th>
</tr>
<{foreach item=week_days_map from=$week_days_map}>
<tr>
- <td width="20%" class="option"><div style="margin:5px;"><{$week_days_map.week_day}></div></td>
- <td width="80%" class="value"><img src="./images/bar/<{$img_bar}>" title="<{$week_days_map.percent}>%" alt="<{$week_days_map.percent}>%" width="<{$week_days_map.percent}>%" height="16" /><{$week_days_map.info}></td>
- </tr>
+ <td class="odd" width="20%" style="text-align:center; vertical-align:middle;"><div style="margin:5px;"><{$week_days_map.week_day}></div></td>
+ <td class="even value" width="60%" style="vertical-align:middle;"><img src="./images/bar/<{$img_bar}>" title="<{$week_days_map.percent}>%" alt="<{$week_days_map.percent}>%" width="<{$week_days_map.percent}>%" height="16" /></td>
+ <td class="odd" width="10%" style="text-align:center; vertical-align:middle;"><div style="margin:5px;"><{$week_days_map.info}></div></td>
+ <td class="even" width="10%" style="text-align:center; vertical-align:middle;"><div style="margin:5px;"><{$week_days_map.percent}>%</div></td>
+ </tr>
<{/foreach}>
</table>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2012-07-21 11:44:31
|
Revision: 9905
http://xoops.svn.sourceforge.net/xoops/?rev=9905&view=rev
Author: lord_venom
Date: 2012-07-21 11:44:24 +0000 (Sat, 21 Jul 2012)
Log Message:
-----------
news style
Modified Paths:
--------------
XoopsModules/TDMStats/trunk/TDMStats/admin/index.php
XoopsModules/TDMStats/trunk/TDMStats/css/styles.css
XoopsModules/TDMStats/trunk/TDMStats/include/stats.php
XoopsModules/TDMStats/trunk/TDMStats/include/summary.php
XoopsModules/TDMStats/trunk/TDMStats/language/french/admin.php
XoopsModules/TDMStats/trunk/TDMStats/language/french/main.php
XoopsModules/TDMStats/trunk/TDMStats/language/french/modinfo.php
XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_stats.html
XoopsModules/TDMStats/trunk/TDMStats/xoops_version.php
Modified: XoopsModules/TDMStats/trunk/TDMStats/admin/index.php
===================================================================
--- XoopsModules/TDMStats/trunk/TDMStats/admin/index.php 2012-07-21 07:35:48 UTC (rev 9904)
+++ XoopsModules/TDMStats/trunk/TDMStats/admin/index.php 2012-07-21 11:44:24 UTC (rev 9905)
@@ -4,6 +4,13 @@
xoops_cp_header();
$indexAdmin = new ModuleAdmin();
+$langue = htmlEntities($_SERVER["HTTP_ACCEPT_LANGUAGE"]);
+$langs= explode(",",$_SERVER["HTTP_ACCEPT_LANGUAGE"]);
+$file = "Vous acceptez les langues suivantes: ".$langue."<br/>
+ mais votre langue principale est: ".$langs[0]."";
+//$file_protection = $date = formatTimestamp(time(), "A d B")."Tatane, Xoopsfr<br /><br />
+//Cesag, Xoopsfr<br /><br />Grosdunord, Xoopsfr<br /><br />Phira, Xoopsfr<br />";
+$indexAdmin->addConfigBoxLine(_AM_ISTATS_TEST.": ".$langue);
echo $indexAdmin->addNavigation('index.php');
echo $indexAdmin->renderIndex();
Modified: XoopsModules/TDMStats/trunk/TDMStats/css/styles.css
===================================================================
--- XoopsModules/TDMStats/trunk/TDMStats/css/styles.css 2012-07-21 07:35:48 UTC (rev 9904)
+++ XoopsModules/TDMStats/trunk/TDMStats/css/styles.css 2012-07-21 11:44:24 UTC (rev 9905)
@@ -1,3 +1,6 @@
+
+
+
.ui-tabs .ui-tabs-nav li.ui-state-active {
cursor: text;
color: #666;
@@ -39,18 +42,22 @@
}
ul#tree_menu li {
- list-style: none;
+ list-style: none;
float:left;
width:97%;
- height: 130px;
- overflow:hidden;
- margin: 10px; padding: 0px;
+ min-height:130px;
+ /*height: 130px;*/
+ border: 2px solid white;
+ margin: 10px;
+ padding: 5px;
+
-webkit-border-radius: 4px;
border-radius: 4px;
- border: 2px solid white;
- /* background: whiteSmoke url(../images/decos/downloads-bg.gif) repeat-x left top; */
+ -moz-border-radius: 4px;
+
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
- overflow: auto;
+ -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
+ box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
}
ul#tree_menu img {
float:left;
@@ -73,11 +80,14 @@
}
#tdmstats_text, ul#tree_menu #tree_text {
+ display:block;
+ height:50px;
font-size: 13px;
font-weight: normal;
color: #728DA9;
-text-shadow: 0 1px 0 white;
line-height: 20px;
+word-wrap: break-word;
+overflow:hidden;
}
#tdmstats_num, #tdmstats_num a, ul#tree_menu #tree_num{
Modified: XoopsModules/TDMStats/trunk/TDMStats/include/stats.php
===================================================================
--- XoopsModules/TDMStats/trunk/TDMStats/include/stats.php 2012-07-21 07:35:48 UTC (rev 9904)
+++ XoopsModules/TDMStats/trunk/TDMStats/include/stats.php 2012-07-21 11:44:24 UTC (rev 9905)
@@ -26,6 +26,8 @@
redirect_header( XOOPS_URL , 1 , _AM_QUERYNOPERM);
}
+setlocale(LC_ALL, $xoopsModuleConfig['setlocal'], $xoopsModuleConfig['setlocal2']);
+
$xoopsTpl->assign('lang_by_weekday', _AM_BY_WEEKDAY);
$xoopsTpl->assign('lang_by_week', _AM_BY_WEEK);
$xoopsTpl->assign('lang_by_mth', _AM_BY_MTH);
@@ -44,9 +46,25 @@
$mths++;
}
- ////day
+ ////info day
$day= array();
global $xoopsDB;
+ //$mth = formatTimeStamp(time(), 'Y-m-');
+ $day_info = getResult("select distinct day, count from ".$xoopsDB->prefix("TDMStats_mth_days")." order by count DESC LIMIT 3");
+
+
+ if($day_info){
+ for($i=0; $i<sizeof($day_info); $i++){
+
+ $day['info'][] = $day_info[$i]['count'];
+ $day['day'][] = $day_info[$i]['day'];
+
+ $xoopsTpl->append('item_days', array('id' => 'day'.$i, 'day' => $day_info[$i]['day'], 'info' => $day_info[$i]['count']));
+
+ } }
+ ///day
+$day= array();
+ global $xoopsDB;
$mth = formatTimeStamp(time(), 'Y-m-');
$day_info = getResult("select distinct day, count from ".$xoopsDB->prefix("TDMStats_mth_days")." order by day limit $mths");
$day_total = getResult("select SUM(count) AS sum from ".$xoopsDB->prefix("TDMStats_mth_days")."");
@@ -68,12 +86,27 @@
$day['percent'][] = round($day_percent, '2');
if ($day_percent > 0) {
- $xoopsTpl->append('days', array('id' => 'day'.$i, 'day' => $day_info[$i]['day'], 'info' => $day_info[$i]['count'], 'percent' => round($day_percent, '2')));
+ //$xoopsTpl->append('days', array('id' => 'day'.$i, 'day' => $day_info[$i]['day'], 'info' => $day_info[$i]['count'], 'percent' => round($day_percent, '2')));
$xoopsTpl->append('days_map', array('id' => 'day'.$i, 'day' => $day_info[$i]['day'], 'info' => $day_info[$i]['count'], 'percent' => round($day_percent, '2')));
}
}
+///week info
+$week= array(0 => _AM_WD_7, 1=> _AM_WD_1, 2 => _AM_WD_2, 3 => _AM_WD_3, 4 => _AM_WD_4, 5 => _AM_WD_5, 6 => _AM_WD_6);
+$week_day= array();
+ global $xoopsDB;
+ $week_info = getResult("select * from ".$xoopsDB->prefix("TDMStats_week")." order by count DESC limit 3");
+ //$week_sum = getResult("select SUM(count) AS sum from ".$xoopsDB->prefix("TDMStats_week")."");
+if($week_info){
+ for($i=0; $i<sizeof($week_info); $i++){
+
+ $week_day = $week[$week_info[$i]['day']];
+
+ $xoopsTpl->append('item_weeks', array('id' => 'week_day'.$i, 'week_day' => $week_day, 'info' => $week_info[$i]['count']));
+
+ }
+ }
///////////WEEK////////////
$week= array(0 => _AM_WD_7, 1=> _AM_WD_1, 2 => _AM_WD_2, 3 => _AM_WD_3, 4 => _AM_WD_4, 5 => _AM_WD_5, 6 => _AM_WD_6);
$week_day= array();
@@ -97,15 +130,32 @@
$week_day['percent'][] = round($week_day_percent, '2');
if ($week_day_percent > 0) {
- $xoopsTpl->append('week_days', array('id' => 'week_day'.$i, 'week_day' => $week[$i], 'info' => $week_info[$i]['count'], 'percent' => round($week_day_percent, '2')));
+ //$xoopsTpl->append('week_days', array('id' => 'week_day'.$i, 'week_day' => $week[$i], 'info' => $week_info[$i]['count'], 'percent' => round($week_day_percent, '2')));
$xoopsTpl->append('week_days_map', array('id' => 'week_day'.$i, 'week_day' => $week[$i], 'info' => $week_info[$i]['count'], 'percent' => round($week_day_percent, '2')));
}
}
}
+///mont info///
+ global $xoopsDB;
+ $year = formatTimeStamp(time(), 'Y');
+ $mth_info = getResult("select distinct mth, year, count from ".$xoopsDB->prefix("TDMStats_mth")." where year='$year' order by count DESC limit 3");
+// $mth_result = PrintStats($mth_sum[0]['sum'], $mth_max[0]['max'], $mth_info, sizeof($mth_info));
+ if($mth_info){
+ for($i=0; $i<sizeof($mth_info); $i++){
+
+ $mth = strftime("%B %Y", mktime(0, 0, 0,$mth_info[$i]['mth'] ,01 ,$mth_info[$i]['year']));
+ //$mth['percent'][] = round($mth_percent, '2');
+
+
+ $xoopsTpl->append('item_mths', array('id' => 'mth'.$i, 'mth' => $mth, 'info' => $mth_info[$i]['count']));
+
+ }
+ }
///mont///
+
$mth = array();
global $xoopsDB;
$year = formatTimeStamp(time(), 'Y');
@@ -126,7 +176,8 @@
$mth_percent = 0;
}
-
+ //echo "nous sommes le". strftime ("%A %d %B %Y et il est %Hh%M", 1207742661);
+ $week = strftime("%B %Y", mktime(0, 0, 0,$mth_info[$i]['mth'] ,01 ,$mth_info[$i]['year']));
$mth['info'][] = $mth_info[$i]['count'];
//$mth['week'][] = $mth_info[$i]['week'];
$mth['percent'][] = round($mth_percent, '2');
@@ -137,7 +188,24 @@
}
}
}
+///week info
+ global $xoopsDB;
+ $last_info = getResult("select distinct week, year, count from ".$xoopsDB->prefix("TDMStats_week_count")." where year='$year' order by count desc limit 3");
+ //$week_max = getResult("select max(count) as max from ".$xoopsDB->prefix("TDMStats_week_count")." where year='$year'");
+ //$last_sum = getResult("select sum(count) as sum from ".$xoopsDB->prefix("TDMStats_week_count")." where year='$year'");
+ //$week_result = PrintStats($week_sum[0]['sum'], $week_max[0]['max'], $week_info, sizeof($week_info));
+
+ if($last_info){
+ for($i=0; $i<sizeof($last_info); $i++){
+
+ //$last['info'][] = $last_info[$i]['count'];
+ //$last['week'][] = $last_info[$i]['week'];
+ //$last['percent'][] = round($last_percent, '2');
+ $xoopsTpl->append('item_lasts', array('id' => 'last'.$i, 'week' => $last_info[$i]['week'], 'year' => $last_info[$i]['year'], 'info' => $last_info[$i]['count']));
+
+ }
+ }
//////WEEK/////////////
$last = array();
global $xoopsDB;
@@ -175,7 +243,20 @@
+ /////////////ITEM HOUR
+ global $xoopsDB;
+ $hour_info = getResult("select * from ".$xoopsDB->prefix("TDMStats_hour")." order by count desc limit 3");
+ //$max_hour = getResult("select max(count) as max from ".$xoopsDB->prefix("TDMStats_hour")."");
+ if ($hour_info) {
+ for ($i = 0; $i < sizeof($hour_info); $i++) {
+
+ //$hour['info'][] = $hour_info[$i]['count'];
+ //$hour['week'][] = $hour_info[$i]['hour'];
+ //$hour['percent'][] = round($hour_percent, '2');
+ $xoopsTpl->append('item_hours', array('id' => 'hour'.$i, 'hour' => $hour_info[$i]['hour'], 'info' => $hour_info[$i]['count']));
+ }
+ }
/////////////HOUR
$hour = array();
global $xoopsDB;
@@ -197,13 +278,29 @@
$hour['percent'][] = round($hour_percent, '2');
if ($hour_percent > 0) {
- $xoopsTpl->append('hours', array('id' => 'hour'.$i, 'hour' => $hour_info[$i]['hour'], 'info' => $hour_info[$i]['count'], 'percent' => round($hour_percent, '2')));
+ //$xoopsTpl->append('hours', array('id' => 'hour'.$i, 'hour' => $hour_info[$i]['hour'], 'info' => $hour_info[$i]['count'], 'percent' => round($hour_percent, '2')));
$xoopsTpl->append('hours_map', array('id' => 'hour'.$i, 'hour' => $hour_info[$i]['hour'], 'info' => $hour_info[$i]['count'], 'percent' => round($hour_percent, '2')));
}
}
}
+//page item
+ global $xoopsDB;
+ $page_info = getResult("select distinct page, count from ".$xoopsDB->prefix("TDMStats_page")." order by count desc limit 3 ");
+
+ if ($page_info) {
+ for ($i = 0; $i < sizeof($page_info); $i++) {
+ //$page['info'][] = $page_info[$i]['count'];
+ //$page['page'][] = (strlen(basename($page_info[$i]['page'])) > 50 ? substr(basename($page_info[$i]['page']),0,(50))."..." : basename($page_info[$i]['page']));
+ $url = (strlen(basename($page_info[$i]['page'])) > 20 ? substr(basename($page_info[$i]['page']),0,(20))."..." : basename($page_info[$i]['page']));
+ //$title = $page_info[$i]['page'];
+ //$page['percent'][] = round($page_percent, '2');
+
+ $xoopsTpl->append('item_pages', array('id' => 'page'.$i, 'page' => $url, 'info' => $page_info[$i]['count']));
+}
+ }
+
/**
* @feature
* Displays Top xx page requests
@@ -239,6 +336,22 @@
}
}
+
+ //item module
+ global $xoopsDB;
+
+ $module_info = getResult("select distinct modules, count from ".$xoopsDB->prefix("TDMStats_modules")." order by count desc limit 3 ");
+
+ if ($module_info) {
+ for ($i = 0; $i < sizeof($module_info); $i++) {
+
+ //$module['info'][] = $module_info[$i]['count'];
+ //$module['modules'][] = $module_info[$i]['modules'];
+ //$module['percent'][] = round($module_percent, '2');
+
+ $xoopsTpl->append('item_modules', array('id' => 'modules'.$i, 'module' => $module_info[$i]['modules'], 'info' => $module_info[$i]['count']));
+ }
+ }
/**
* @feature
* Displays Top module requests
Modified: XoopsModules/TDMStats/trunk/TDMStats/include/summary.php
===================================================================
--- XoopsModules/TDMStats/trunk/TDMStats/include/summary.php 2012-07-21 07:35:48 UTC (rev 9904)
+++ XoopsModules/TDMStats/trunk/TDMStats/include/summary.php 2012-07-21 11:44:24 UTC (rev 9905)
@@ -90,21 +90,6 @@
$text);
}
- global $xoopsDB;
- $per_hour_info = getResult("select * from ".$xoopsDB->prefix("TDMStats_hour")." order by hour");
- $sum_hour = getResult("select sum(count) as sum from ".$xoopsDB->prefix("TDMStats_hour")."");
-
- for ($i = 0; $i < sizeof($per_hour_info); $i = $i + 2) {
- $check_no = $i + 2;
- for ($j = $i; $j < $check_no; $j++) {
- if ($sum_hour[0]['sum'] > 0) {
- $per_hour_percent = $per_hour_info[$j]['count'] / $sum_hour[0]['sum'] * 100;
- } else {
- $per_hour_percent = 0;
- }
- $xoopsTpl->append('hour_info', array('hour' => $per_hour_info[$j]["hour"], 'percent' => sprintf ("%.2f", $per_hour_percent)));
- }
- }
$xoopsTpl->assign('lang_per_hour', _AM_PER_HOUR);
$hour= array();
@@ -186,7 +171,7 @@
if($ref_info){
for($i=0; $i<sizeof($ref_info); $i++){
if($ref_info[$i]['count'] > 0) {
- $url = (strlen($ref_info[$i]['url']) > 30 ? substr($ref_info[$i]['url'],0,(30))."..." : $ref_info[$i]['url']);
+ $url = (strlen($ref_info[$i]['url']) > 20 ? substr($ref_info[$i]['url'],0,(20))."..." : $ref_info[$i]['url']);
$ref['info'][] = $ref_info[$i]['count'];
//$hour['percent'][] = round($hour_percent, '2');
Modified: XoopsModules/TDMStats/trunk/TDMStats/language/french/admin.php
===================================================================
--- XoopsModules/TDMStats/trunk/TDMStats/language/french/admin.php 2012-07-21 07:35:48 UTC (rev 9904)
+++ XoopsModules/TDMStats/trunk/TDMStats/language/french/admin.php 2012-07-21 11:44:24 UTC (rev 9905)
@@ -79,5 +79,6 @@
define("_AM_ISTATS_PERM_4","Résumé");
define("_AM_ISTATS_PERM_8","Stats du traffic");
define("_AM_ISTATS_PERM_16","Système");
+define("_AM_ISTATS_TEST","Votre système accepte les langues suivantes");
?>
\ No newline at end of file
Modified: XoopsModules/TDMStats/trunk/TDMStats/language/french/main.php
===================================================================
--- XoopsModules/TDMStats/trunk/TDMStats/language/french/main.php 2012-07-21 07:35:48 UTC (rev 9904)
+++ XoopsModules/TDMStats/trunk/TDMStats/language/french/main.php 2012-07-21 11:44:24 UTC (rev 9905)
@@ -132,4 +132,5 @@
//Version 1.6
define('_AM_VIEW', 'Afficher le tableau');
+define('_AM_P_LE', 'Le');
?>
\ No newline at end of file
Modified: XoopsModules/TDMStats/trunk/TDMStats/language/french/modinfo.php
===================================================================
--- XoopsModules/TDMStats/trunk/TDMStats/language/french/modinfo.php 2012-07-21 07:35:48 UTC (rev 9904)
+++ XoopsModules/TDMStats/trunk/TDMStats/language/french/modinfo.php 2012-07-21 11:44:24 UTC (rev 9905)
@@ -62,4 +62,6 @@
define('_MI_ISTATS_SUMMARY', 'Résumé');
define('_MI_ISTATS_SYSTEM', 'Système');
define('_MI_ISTATS_TRAFFIC', 'Stats du Trafic ');
+
+define("_MI_ISTATS_SETLOCAL","Choisissez votre localité");
?>
Modified: XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_stats.html
===================================================================
--- XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_stats.html 2012-07-21 07:35:48 UTC (rev 9904)
+++ XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_stats.html 2012-07-21 11:44:24 UTC (rev 9905)
@@ -8,44 +8,44 @@
<li style="width:47%;" class="even"><div><img src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/day.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('day')"><{$smarty.const._AM_BY_DAY}></h2></a>
<div style="text-align:left">
- <{foreach from=$item_hours item=item}>
- <span id="tree_num"><{$smarty.const._AM_P_A}> <{$item.hour}>h, <{$item.info}> <{$smarty.const._AM_P_VISITS}></span><br />
+ <{foreach from=$item_days item=item}>
+ <span id="tree_num"><{$item.day}>, <{$item.info}> <{$smarty.const._AM_P_VISITS}></span><br />
<{/foreach}>
</div></div>
-<div id="tree_form"><a href="javascript:;" onclick="javascript:masque('hour')" ><{$smarty.const._AM_VIEW}></a></div></li>
+<div id="tree_form"><a href="#masque_day" onclick="javascript:masque('day')" ><{$smarty.const._AM_VIEW}></a></div></li>
<li style="width:47%;" class="odd"><div><img src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/weekday.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('weekday')"><{$smarty.const._AM_BY_WEEKDAY}></h2></a>
<div style="text-align:left">
- <{foreach from=$item_hours item=item}>
- <span id="tree_num"><{$smarty.const._AM_P_A}> <{$item.hour}>h, <{$item.info}> <{$smarty.const._AM_P_VISITS}></span><br />
+ <{foreach from=$item_weeks item=item}>
+ <span id="tree_num"><{$item.week_day}>, <{$item.info}> <{$smarty.const._AM_P_VISITS}></span><br />
<{/foreach}>
</div></div>
-<div id="tree_form"><a href="javascript:;" onclick="javascript:masque('hour')" ><{$smarty.const._AM_VIEW}></a></div></li>
+<div id="tree_form"><a href="javascript:;" onclick="javascript:masque('week')" ><{$smarty.const._AM_VIEW}></a></div></li>
<li style="width:47%;" class="even"><div><img src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/week.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('week')"><{$smarty.const._AM_BY_WEEK}></h2></a>
<div style="text-align:left">
- <{foreach from=$item_hours item=item}>
- <span id="tree_num"><{$smarty.const._AM_P_A}> <{$item.hour}>h, <{$item.info}> <{$smarty.const._AM_P_VISITS}></span><br />
+ <{foreach from=$item_lasts item=item}>
+ <span id="tree_num"><{$item.week}>: <{$item.year}>, <{$item.info}> <{$smarty.const._AM_P_VISITS}></span><br />
<{/foreach}>
</div></div>
-<div id="tree_form"><a href="javascript:;" onclick="javascript:masque('hour')" ><{$smarty.const._AM_VIEW}></a></div></li>
+<div id="tree_form"><a href="javascript:;" onclick="javascript:masque('last')" ><{$smarty.const._AM_VIEW}></a></div></li>
<li style="width:47%;" class="odd"><div><img src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/mth.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('mth')"><{$smarty.const._AM_BY_MTH}></h2></a>
<div style="text-align:left">
- <{foreach from=$item_hours item=item}>
- <span id="tree_num"><{$smarty.const._AM_P_A}> <{$item.hour}>h, <{$item.info}> <{$smarty.const._AM_P_VISITS}></span><br />
+ <{foreach from=$item_mths item=item}>
+ <span id="tree_num"><{$item.mth}>, <{$item.info}> <{$smarty.const._AM_P_VISITS}></span><br />
<{/foreach}>
</div></div>
-<div id="tree_form"><a href="javascript:;" onclick="javascript:masque('hour')" ><{$smarty.const._AM_VIEW}></a></div></li>
+<div id="tree_form"><a href="javascript:;" onclick="javascript:masque('mth')" ><{$smarty.const._AM_VIEW}></a></div></li>
<li style="width:47%;" class="even"><div><img src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/hour.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('mth')"><{$smarty.const._AM_BY_HOUR}></h2></a>
<div style="text-align:left">
<{foreach from=$item_hours item=item}>
- <span id="tree_num"><{$smarty.const._AM_P_A}> <{$item.hour}>h, <{$item.info}> <{$smarty.const._AM_P_VISITS}></span><br />
+ <span id="tree_num"><{$item.hour}>h, <{$item.info}> <{$smarty.const._AM_P_VISITS}></span><br />
<{/foreach}>
</div></div>
@@ -54,77 +54,51 @@
<li style="width:47%;" class="odd"><div><img src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/page.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('mth')"><{$smarty.const._AM_BY_PAGE}></h2></a>
<div style="text-align:left">
- <{foreach from=$item_hours item=item}>
- <span id="tree_num"><{$smarty.const._AM_P_A}> <{$item.hour}>h, <{$item.info}> <{$smarty.const._AM_P_VISITS}></span><br />
+ <{foreach from=$item_pages item=item}>
+ <span id="tree_num"><{$item.page}>h, <{$item.info}> <{$smarty.const._AM_P_VISITS}></span><br />
<{/foreach}>
</div></div>
-<div id="tree_form"><a href="javascript:;" onclick="javascript:masque('hour')" ><{$smarty.const._AM_VIEW}></a></div></li>
+<div id="tree_form"><a href="javascript:;" onclick="javascript:masque('page')" ><{$smarty.const._AM_VIEW}></a></div></li>
<li style="width:47%;" class="even"><div><img src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/module.png" title="<{$lang_forecast}>"><br/></div><div><h2><a href="javascript:;" onclick="javascript:masque('mth')"><{$smarty.const._AM_BY_MODULE}></h2></a>
<div style="text-align:left">
- <{foreach from=$item_hours item=item}>
- <span id="tree_num"><{$smarty.const._AM_P_A}> <{$item.hour}>h, <{$item.info}> <{$smarty.const._AM_P_VISITS}></span><br />
+ <{foreach from=$item_modules item=item}>
+ <span id="tree_num"><{$item.module}> <{$item.info}> <{$smarty.const._AM_P_VISITS}></span><br />
<{/foreach}>
</div></div>
-<div id="tree_form"><a href="javascript:;" onclick="javascript:masque('hour')" ><{$smarty.const._AM_VIEW}></a></div></li>
+<div id="tree_form"><a href="javascript:;" onclick="javascript:masque('module')" ><{$smarty.const._AM_VIEW}></a></div></li>
<br style="clear: both;" /></ul></td></tr></table><br />
-<div id="tabs">
- <ul>
- <li style="list-style-type: none;"><a href="#day"><{$lang_by_day}></a></li>
- <li style="list-style-type: none;"><a href="#week_day"><{$lang_by_weekday}></a></li>
- <li style="list-style-type: none;"><a href="#week"><{$lang_by_week}></a></li>
- <li style="list-style-type: none;"><a href="#mth"><{$lang_by_mth}></a></li>
- <li style="list-style-type: none;"><a href="#hour"><{$lang_by_hour}></a></li>
- <li style="list-style-type: none;"><a href="#page"><{$lang_by_page}></a></li>
- <li style="list-style-type: none;"><a href="#module"><{$smarty.const._AM_BY_MODULE}></a></li>
- </ul>
- <div id="day">
-
- <table class="map" cellspacing="0" cellpadding="0">
- <caption align="top"><{$smarty.const._AM_BY_DAY}><br /><br /></caption>
+<div id="masque_day" style="display: none;">
+<h2><{$smarty.const._AM_BY_DAY}></h2>
+ <table width="100%" class="outer map">
<tr>
- <th scope="col"><{$smarty.const._AM_BY_DAY}></th>
- <th scope="col"><{$smarty.const._AM_DATE_VISITS}></th>
+ <th style="text-align:center;"><{$smarty.const._AM_BY_DAY}></th>
+ <th></th>
+ <th style="text-align:center;"><{$smarty.const._AM_DATE_VISITS}></th>
+ <th style="text-align:center;"><{$smarty.const._AM_DATE_PERCENT}></th>
</tr>
<{foreach item=days_map from=$days_map}>
<tr>
- <td width="20%" class="option"><div style="margin:5px;"><{$days_map.day}></div></td>
- <td width="80%" class="value"><img src="./images/bar/<{$img_bar}>" title="<{$days_map.percent}>%" alt="<{$days_map.percent}>%" width="<{$days_map.percent}>%" height="16" /><{$days_map.info}></td>
- </tr>
+ <td class="odd" width="20%" style="text-align:center; vertical-align:middle;"><div style="margin:5px;"><{$days_map.day}></div></td>
+ <td class="even value" width="60%" style="vertical-align:middle;"><img src="./images/bar/<{$img_bar}>" title="<{$days_map.percent}>%" alt="<{$days_map.percent}>%" width="<{$days_map.percent}>%" height="16" /></td>
+ <td class="odd" width="10%" style="text-align:center; vertical-align:middle;"><div style="margin:5px;"><{$days_map.info}></div></td>
+ <td class="even" width="10%" style="text-align:center; vertical-align:middle;"><div style="margin:5px;"><{$days_map.percent}>%</div></td>
+ </tr>
<{/foreach}>
</table>
- <span><a href="javascript:;" onclick="javascript:masque('1')" ><{$smarty.const._AM_VIEW}></a></span>
<br /><br />
- <div id="masque_1" style="display: none;">
- <table class="outer" width="100%" border="0" cellspacing="1" cellpadding="4" align="center">
- <tr>
- <td class="head" align="center"><{$smarty.const._AM_BY_DAY}></td>
- <td class="head" align="center"><{$smarty.const._AM_DATE_VISITS}></td>
- <td class="head" align="center"><{$smarty.const._AM_DATE_PERCENT}></td>
- </tr>
- <{foreach item=days from=$days}>
- <tr class="<{cycle values="even,odd"}>" valign="center">
- <td width="33%" align="center"><{$days.day}></td>
- <td width="33%" align="center"><{$days.info}></td>
- <td width="33%" align="center"><{$days.percent}>%</td>
- </tr>
- <{/foreach}>
- </table>
</div>
-</div>
- <div id="week_day">
-
-
+<div id="masque_week" style="display: none;">
+<h2><{$smarty.const._AM_BY_WEEKDAY}></h2>
<table class="map" cellspacing="0" cellpadding="0">
- <caption align="top"><{$smarty.const._AM_BY_WEEKDAY}><br /><br /></caption>
<tr>
<th scope="col"><{$smarty.const._AM_BY_WEEKDAY}></th>
<th scope="col"><{$smarty.const._AM_DATE_VISITS}></th>
@@ -136,32 +110,14 @@
</tr>
<{/foreach}>
</table>
- <span><a href="javascript:;" onclick="javascript:masque('2')" ><{$smarty.const._AM_VIEW}></a></span>
- <br /><br />
- <div id="masque_2" style="display: none;">
- <table class="outer" width="100%" border="0" cellspacing="1" cellpadding="4" align="center">
- <tr>
- <td class="head" align="center"><{$smarty.const._AM_BY_WEEKDAY}></td>
- <td class="head" align="center"><{$smarty.const._AM_DATE_VISITS}></td>
- <td class="head" align="center"><{$smarty.const._AM_DATE_PERCENT}></td>
- </tr>
- <{foreach item=week_days from=$week_days}>
- <tr class="<{cycle values="even,odd"}>" valign="center">
- <td width="33%" align="center"><{$week_days.week_day}></td>
- <td width="33%" align="center"><{$week_days.info}></td>
- <td width="33%" align="center"><{$week_days.percent}>%</td>
- </tr>
- <{/foreach}>
- </table>
</div>
</div>
-<div id="week">
+<div id="masque_last" style="display: none;">
+<h2><{$smarty.const._AM_BY_WEEK}></h2>
-
<table class="map" cellspacing="0" cellpadding="0">
- <caption align="top"><{$smarty.const._AM_BY_WEEK}><br /><br /></caption>
<tr>
<th scope="col"><{$smarty.const._AM_BY_WEEK}></th>
<th scope="col"><{$smarty.const._AM_DATE_VISITS}></th>
@@ -173,32 +129,13 @@
</tr>
<{/foreach}>
</table>
- <span><a href="javascript:;" onclick="javascript:masque('3')" ><{$smarty.const._AM_VIEW}></a></span>
- <br /><br />
- <div id="masque_3" style="display: none;">
- <table class="outer" width="100%" border="0" cellspacing="1" cellpadding="4" align="center">
- <tr>
- <td class="head" align="center"><{$smarty.const._AM_BY_WEEK}></td>
- <td class="head" align="center"><{$smarty.const._AM_DATE_VISITS}></td>
- <td class="head" align="center"><{$smarty.const._AM_DATE_PERCENT}></td>
- </tr>
- <{foreach item=lasts from=$lasts}>
- <tr class="<{cycle values="even,odd"}>" valign="center">
- <td width="33%" align="center"><{$lasts.week}> (<{$lasts.year}>)</td>
- <td width="33%" align="center"><{$lasts.info}></td>
- <td width="33%" align="center"><{$lasts.percent}>%</td>
- </tr>
- <{/foreach}>
- </table>
- </div>
</div>
- <div id="mth">
-
+<div id="masque_mth" style="display: none;">
+<h2><{$smarty.const._AM_BY_MTH}></h2>
<table class="map" cellspacing="0" cellpadding="0">
- <caption align="top"><{$smarty.const._AM_BY_MTH}><br /><br /></caption>
<tr>
<th scope="col"><{$smarty.const._AM_BY_MTH}></th>
<th scope="col"><{$smarty.const._AM_DATE_VISITS}></th>
@@ -210,31 +147,12 @@
</tr>
<{/foreach}>
</table>
- <span><a href="javascript:;" onclick="javascript:masque('4')" ><{$smarty.const._AM_VIEW}></a></span>
- <br /><br />
- <div id="masque_4" style="display: none;">
- <table class="outer" width="100%" border="0" cellspacing="1" cellpadding="4" align="center">
- <tr>
- <td class="head" align="center"><{$smarty.const._AM_BY_MTH}></td>
- <td class="head" align="center"><{$smarty.const._AM_DATE_VISITS}></td>
- <td class="head" align="center"><{$smarty.const._AM_DATE_PERCENT}></td>
- </tr>
- <{foreach item=mths from=$mths}>
- <tr class="<{cycle values="even,odd"}>" valign="center">
- <td width="33%" align="center"><{$mths.mth}> (<{$mths.year}>)</td>
- <td width="33%" align="center"><{$mths.info}></td>
- <td width="33%" align="center"><{$mths.percent}>%</td>
- </tr>
- <{/foreach}>
- </table>
</div>
-</div>
- <div id="hour">
-
+<div id="masque_hour" style="display: none;">
+<h2><{$smarty.const._AM_BY_HOUR}></h2>
<table class="map" cellspacing="0" cellpadding="0">
- <caption align="top"><{$smarty.const._AM_BY_HOUR}><br /><br /></caption>
<tr>
<th scope="col"><{$smarty.const._AM_BY_HOUR}></th>
<th scope="col"><{$smarty.const._AM_DATE_VISITS}></th>
@@ -246,32 +164,12 @@
</tr>
<{/foreach}>
</table>
- <span><a href="javascript:;" onclick="javascript:masque('5')" ><{$smarty.const._AM_VIEW}></a></span>
- <br /><br />
- <div id="masque_5" style="display: none;">
- <table class="outer" width="100%" border="0" cellspacing="1" cellpadding="4" align="center">
- <tr>
- <td class="head" align="center"><{$smarty.const._AM_BY_HOUR}></td>
- <td class="head" align="center"><{$smarty.const._AM_DATE_VISITS}></td>
- <td class="head" align="center"><{$smarty.const._AM_DATE_PERCENT}></td>
- <td class="head" align="center"></td>
- </tr>
- <{foreach item=hours from=$hours}>
- <tr class="<{cycle values="even,odd"}>" valign="center">
- <td width="33%" align="center"><{$hours.hour}></td>
- <td width="33%" align="center"><{$hours.info}></td>
- <td width="33%" align="center"><{$hours.percent}>%</td>
- </tr>
- <{/foreach}>
- </table>
</div>
-</div>
- <div id="page">
-
+<div id="masque_page" style="display: none;">
+<h2><{$smarty.const._AM_BY_PAGE}></h2>
<table class="map" cellspacing="0" cellpadding="0">
- <caption align="top"><{$smarty.const._AM_BY_PAGE}><br /><br /></caption>
<tr>
<th scope="col"><{$smarty.const._AM_BY_PAGE}></th>
<th scope="col"><{$smarty.const._AM_DATE_VISITS}></th>
@@ -283,35 +181,13 @@
</tr>
<{/foreach}>
</table>
- <span><a href="javascript:;" onclick="javascript:masque('6')" ><{$smarty.const._AM_VIEW}></a></span>
- <br /><br />
- <div id="masque_6" style="display: none;">
- <table class="outer" width="100%" border="0" cellspacing="1" cellpadding="4" align="center">
- <tr>
- <td class="head" align="center"></td>
- <td class="head" align="center"><{$smarty.const._AM_BY_PAGE}></td>
- <td class="head" align="center"><{$smarty.const._AM_DATE_VISITS}></td>
- <td class="head" align="center"><{$smarty.const._AM_DATE_PERCENT}></td>
- <td class="head" align="center"></td>
- </tr>
- <{foreach item=pages from=$pages}>
- <tr class="<{cycle values="even,odd"}>" valign="center">
- <td width="33%" align="center"><span title="<{$pages.title}>" alt="<{$pages.title}>"><{$pages.page}></span></td>
- <td width="33%" align="center"><{$pages.info}></td>
- <td width="33%" align="center"><{$pages.percent}>%</td>
- </tr>
- <{/foreach}>
- </table>
- </div>
</div>
-
- <div id="module">
-
+<div id="masque_module" style="display: none;">
+<h2><{$smarty.const._AM_BY_MODULE}></h2>
<table class="map" cellspacing="0" cellpadding="0">
- <caption align="top"><{$smarty.const._AM_BY_MODULE}><br /><br /></caption>
<tr>
<th scope="col"><{$smarty.const._AM_BY_MODULE}></th>
<th scope="col"><{$smarty.const._AM_DATE_VISITS}></th>
@@ -323,24 +199,6 @@
</tr>
<{/foreach}>
</table>
- <span><a href="javascript:;" onclick="javascript:masque('7')" ><{$smarty.const._AM_VIEW}></a></span>
- <br /><br />
- <div id="masque_7" style="display: none;">
- <table class="outer" width="100%" border="0" cellspacing="1" cellpadding="4" align="center">
- <tr>
- <td class="head" align="center"><{$smarty.const._AM_BY_MODULE}></td>
- <td class="head" align="center"><{$smarty.const._AM_DATE_VISITS}></td>
- <td class="head" align="center"><{$smarty.const._AM_DATE_PERCENT}></td>
- </tr>
- <{foreach item=modules from=$modules}>
- <tr class="<{cycle values="even,odd"}>" valign="center">
- <td width="33%" align="center"><{$modules.modules}></td>
- <td width="33%" align="center"><{$modules.info}></td>
- <td width="33%" align="center"><{$modules.percent}>%</td>
- </tr>
- <{/foreach}>
- </table>
- </div>
</div>
Modified: XoopsModules/TDMStats/trunk/TDMStats/xoops_version.php
===================================================================
--- XoopsModules/TDMStats/trunk/TDMStats/xoops_version.php 2012-07-21 07:35:48 UTC (rev 9904)
+++ XoopsModules/TDMStats/trunk/TDMStats/xoops_version.php 2012-07-21 11:44:24 UTC (rev 9905)
@@ -131,35 +131,76 @@
$modversion['templates'][4]['file'] = 'tdmstats_user_info.html';
$modversion['templates'][4]['description'] = '';
+$i=1;
+$modversion['config'][$i]['name'] = 'longdate';
+$modversion['config'][$i]['title'] = '_MI_ISTATS_DATE';
+$modversion['config'][$i]['description'] = '_MI_ISTATS_DATE_DESC';
+$modversion['config'][$i]['formtype'] = 'select';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 1;
+$modversion['config'][$i]['options'] = array('_MI_ISTATS_DATE_FR' => '1','_MI_ISTATS_DATE_US' => '2');
+$i++;
+$modversion['config'][$i]['name'] = 'setlocal';
+$modversion['config'][$i]['title'] = '_MI_ISTATS_SETLOCAL';
+$modversion['config'][$i]['description'] = '';
+$modversion['config'][$i]['formtype'] = 'select';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = 'en_US.UTF-8';
+$modversion['config'][$i]['options'] = array(
+'fr_FR.UTF-8' => 'fr_FR.UTF-8',
+'cs_CZ.UTF-8' => 'cs_CZ.UTF-8',
+'de_DE.UTF-8' => 'de_DE.UTF-8',
+'en_GB.UTF-8' => 'en_GB.UTF-8',
+'en_IE.UTF-8' => 'en_IE.UTF-8',
+'en_US.UTF-8' => 'en_US.UTF-8',
+'es_ES.UTF-8' => 'es_ES.UTF-8',
+'it_IT.UTF-8' => 'it_IT.UTF-8',
+'pt_PT.UTF-8' => 'pt_PT.UTF-8',
+'ru_RU.UTF-8' => 'ru_RU.UTF-8'
-$modversion['config'][1]['name'] = 'longdate';
-$modversion['config'][1]['title'] = '_MI_ISTATS_DATE';
-$modversion['config'][1]['description'] = '_MI_ISTATS_DATE_DESC';
-$modversion['config'][1]['formtype'] = 'select';
-$modversion['config'][1]['valuetype'] = 'int';
-$modversion['config'][1]['default'] = 1;
-$modversion['config'][1]['options'] = array('_MI_ISTATS_DATE_FR' => '1','_MI_ISTATS_DATE_US' => '2');
-$modversion['config'][2]['name'] = 'maxpage';
-$modversion['config'][2]['title'] = '_MI_ISTATS_MAXPAGE';
-$modversion['config'][2]['description'] = '';
-$modversion['config'][2]['formtype'] = 'texbox';
-$modversion['config'][2]['valuetype'] = 'int';
-$modversion['config'][2]['default'] = 20;
+);
+$i++;
+$modversion['config'][$i]['name'] = 'setlocal2';
+$modversion['config'][$i]['title'] = '';
+$modversion['config'][$i]['description'] = '';
+$modversion['config'][$i]['formtype'] = 'select';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = 'eng';
+$modversion['config'][$i]['options'] = array(
+'fra' => 'fra',
+'ces' => 'ces',
+'deu' => 'deu',
+'eng' => 'eng',
+'esl' => 'esl',
+'ita' => 'ita',
+'por' => 'por',
+'rus' => 'rus',
-$modversion['config'][3]['name'] = 'maxsession';
-$modversion['config'][3]['title'] = '_MI_ISTATS_MAXSESSION';
-$modversion['config'][3]['description'] = '_MI_ISTATS_MAXSESSION_DESC';
-$modversion['config'][3]['formtype'] = 'texbox';
-$modversion['config'][3]['valuetype'] = 'int';
-$modversion['config'][3]['default'] = 600;
-$modversion['config'][4]['name'] = 'maxuser';
-$modversion['config'][4]['title'] = '_MI_ISTATS_MAXUSER';
-$modversion['config'][4]['description'] = '';
-$modversion['config'][4]['formtype'] = 'yesno';
-$modversion['config'][4]['valuetype'] = 'int';
-$modversion['config'][4]['default'] = 0;
+);
+$i++;
+$modversion['config'][$i]['name'] = 'maxpage';
+$modversion['config'][$i]['title'] = '_MI_ISTATS_MAXPAGE';
+$modversion['config'][$i]['description'] = '';
+$modversion['config'][$i]['formtype'] = 'texbox';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 20;
+$i++;
+$modversion['config'][$i]['name'] = 'maxsession';
+$modversion['config'][$i]['title'] = '_MI_ISTATS_MAXSESSION';
+$modversion['config'][$i]['description'] = '_MI_ISTATS_MAXSESSION_DESC';
+$modversion['config'][$i]['formtype'] = 'texbox';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 600;
+$i++;
+$modversion['config'][$i]['name'] = 'maxuser';
+$modversion['config'][$i]['title'] = '_MI_ISTATS_MAXUSER';
+$modversion['config'][$i]['description'] = '';
+$modversion['config'][$i]['formtype'] = 'yesno';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 0;
+$i++;
//$modversion['config'][5]['name'] = 'tdmstats_style';
//$modversion['config'][5]['title'] = '_MI_ISTATS_ONGLET';
@@ -171,13 +212,13 @@
// 'dark-hive' => 'dark-hive', 'excite' => 'excite', 'vader' => 'vader', 'trontastic' => 'trontastic' );
//
include_once XOOPS_ROOT_PATH . "/class/xoopslists.php";
-$modversion["config"][6]["name"] = "tdmstats_bar";
-$modversion["config"][6]["title"] = "_MI_ISTATS_BAR";
-$modversion["config"][6]["description"] = "";
-$modversion["config"][6]["formtype"] = "select";
-$modversion["config"][6]["valuetype"] = "text";
-$modversion["config"][6]["default"] = "bar0.png";
-$modversion["config"][6]["options"] = XoopsLists::getFileListAsArray(XOOPS_ROOT_PATH . "/modules/".basename( dirname( __FILE__ ) )."/images/bar");
-$modversion["config"][6]["category"] = "global";
-
+$modversion["config"][$i]["name"] = "tdmstats_bar";
+$modversion["config"][$i]["title"] = "_MI_ISTATS_BAR";
+$modversion["config"][$i]["description"] = "";
+$modversion["config"][$i]["formtype"] = "select";
+$modversion["config"][$i]["valuetype"] = "text";
+$modversion["config"][$i]["default"] = "bar0.png";
+$modversion["config"][$i]["options"] = XoopsLists::getFileListAsArray(XOOPS_ROOT_PATH . "/modules/".basename( dirname( __FILE__ ) )."/images/bar");
+$modversion["config"][$i]["category"] = "global";
+$i++;
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2012-07-21 07:35:54
|
Revision: 9904
http://xoops.svn.sourceforge.net/xoops/?rev=9904&view=rev
Author: lord_venom
Date: 2012-07-21 07:35:48 +0000 (Sat, 21 Jul 2012)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/TDMPicture/trunk/TDMPicture/admin/about.php
XoopsModules/TDMPicture/trunk/TDMPicture/language/french/admin.php
XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/about.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/admin/about.php 2012-07-21 07:10:19 UTC (rev 9903)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/about.php 2012-07-21 07:35:48 UTC (rev 9904)
@@ -22,7 +22,10 @@
xoops_cp_header();
$aboutAdmin = new ModuleAdmin();
-
+$file_protection = "Tatane, Xoopsfr<br /><br />
+Cesag, Xoopsfr<br /><br />Grosdunord, Xoopsfr<br /><br />Phira, Xoopsfr<br />";
+$aboutAdmin->addInfoBox(_AM_TDMPICTURE_TEST);
+$aboutAdmin->addInfoBoxLine(_AM_TDMPICTURE_TEST, $file_protection, '', '', 'information');
echo $aboutAdmin->addNavigation('about.php');
echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', FALSE);
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/french/admin.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/french/admin.php 2012-07-21 07:10:19 UTC (rev 9903)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/french/admin.php 2012-07-21 07:35:48 UTC (rev 9904)
@@ -25,6 +25,7 @@
define("_AM_TDMPICTURE_NAVPERMISSIONS","Permissions");
define("_AM_TDMPICTURE_NAVUPDATE","Update");
define("_AM_TDMPICTURE_NAVABOUT","About");
+define("_AM_TDMPICTURE_TEST","Beta Testeur");
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php 2012-07-21 07:10:19 UTC (rev 9903)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php 2012-07-21 07:35:48 UTC (rev 9904)
@@ -24,8 +24,8 @@
$modversion['name'] = "TDMPicture";
$modversion['version'] = 1.067;
$modversion['description'] = 'Image manager';
-$modversion['credits'] = "none";
-$modversion['author'] = 'TDM';
+$modversion['credits'] = "";
+$modversion['author'] = 'TDM, Venom';
$modversion['pseudo'] = 'Venom';
$modversion['website'] = '';
$modversion['name_website'] = '';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2012-07-21 07:10:26
|
Revision: 9903
http://xoops.svn.sourceforge.net/xoops/?rev=9903&view=rev
Author: lord_venom
Date: 2012-07-21 07:10:19 +0000 (Sat, 21 Jul 2012)
Log Message:
-----------
bug install
Modified Paths:
--------------
XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php 2012-07-21 04:48:44 UTC (rev 9902)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php 2012-07-21 07:10:19 UTC (rev 9903)
@@ -22,7 +22,7 @@
}
$modversion['name'] = "TDMPicture";
-$modversion['version'] = 1.066;
+$modversion['version'] = 1.067;
$modversion['description'] = 'Image manager';
$modversion['credits'] = "none";
$modversion['author'] = 'TDM';
@@ -42,7 +42,7 @@
$modversion['status_version'] = 'Final';
$modversion['release_date'] = '2012/06/30';
$modversion['sqlfile']['mysql'] = 'sql/mysql.sql';
-$modversion['onInstall'] = 'include/install.php';
+//$modversion['onInstall'] = 'include/install.php';
$modversion['onUpdate'] = 'include/update.php';
$modversion['help'] = 'page=help';
$modversion['min_php'] = '5.2';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
8 messages has been excluded from this view by a project administrator.
![https://www.paypal.com/fr_FR/i/scr/pixel.gif"](https://www.paypal.com/fr_FR/i/scr/pixel.gif"){kind=link}
![https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif"](https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif"){kind=link}
![https://www.paypalobjects.com/WEBSCR-640-20110401-1/en_US/GB/i/btn/btn_donateCC_LG.gif"](https://www.paypalobjects.com/WEBSCR-640-20110401-1/en_US/GB/i/btn/btn_donateCC_LG.gif"){kind=link}
![https://www.paypalobjects.com/WEBSCR-640-20110401-1/it_IT/i/scr/pixel.gif"](https://www.paypalobjects.com/WEBSCR-640-20110401-1/it_IT/i/scr/pixel.gif"){kind=link}