From: <be...@us...> - 2012-05-13 09:13:33
|
Revision: 9501 http://xoops.svn.sourceforge.net/xoops/?rev=9501&view=rev Author: beckmi Date: 2012-05-13 09:13:24 +0000 (Sun, 13 May 2012) Log Message: ----------- Converting to XOOPS 2.5.x Admin GUI Modified Paths: -------------- XoopsModules/TDMStats/trunk/TDMStats/admin/about.php XoopsModules/TDMStats/trunk/TDMStats/admin/index.php XoopsModules/TDMStats/trunk/TDMStats/admin/menu.php XoopsModules/TDMStats/trunk/TDMStats/admin/permissions.php XoopsModules/TDMStats/trunk/TDMStats/admin/plug.php XoopsModules/TDMStats/trunk/TDMStats/include/function.php XoopsModules/TDMStats/trunk/TDMStats/language/english/admin.php XoopsModules/TDMStats/trunk/TDMStats/language/english/modinfo.php XoopsModules/TDMStats/trunk/TDMStats/xoops_version.php Added Paths: ----------- XoopsModules/TDMStats/trunk/TDMStats/admin/admin_footer.php XoopsModules/TDMStats/trunk/TDMStats/admin/admin_header.php XoopsModules/TDMStats/trunk/TDMStats/admin/main.php XoopsModules/TDMStats/trunk/TDMStats/docs/ XoopsModules/TDMStats/trunk/TDMStats/docs/changelog.txt XoopsModules/TDMStats/trunk/TDMStats/docs/credits.txt XoopsModules/TDMStats/trunk/TDMStats/docs/index.html XoopsModules/TDMStats/trunk/TDMStats/docs/install.txt XoopsModules/TDMStats/trunk/TDMStats/docs/lang_diff.txt XoopsModules/TDMStats/trunk/TDMStats/docs/licence.txt XoopsModules/TDMStats/trunk/TDMStats/docs/readme.txt XoopsModules/TDMStats/trunk/TDMStats/docs/readme_fr.txt XoopsModules/TDMStats/trunk/TDMStats/language/english/help/ XoopsModules/TDMStats/trunk/TDMStats/language/english/help/help.html XoopsModules/TDMStats/trunk/TDMStats/language/english/help/index.html Removed Paths: ------------- XoopsModules/TDMStats/trunk/TDMStats/changelog.txt XoopsModules/TDMStats/trunk/TDMStats/license_gpl.txt XoopsModules/TDMStats/trunk/TDMStats/readme_fr.txt Modified: XoopsModules/TDMStats/trunk/TDMStats/admin/about.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/admin/about.php 2012-05-13 08:50:29 UTC (rev 9500) +++ XoopsModules/TDMStats/trunk/TDMStats/admin/about.php 2012-05-13 09:13:24 UTC (rev 9501) @@ -1,100 +1,29 @@ -<?php -/** - * **************************************************************************** - * - TDMStats By TDM - TEAM DEV MODULE FOR XOOPS - * - GNU Licence Copyright (c) (http://www.) - * - * La licence GNU GPL, garanti \xE0 l'utilisateur les droits suivants - * - * 1. La libert\xE9 d'ex\xE9cuter le logiciel, pour n'importe quel usage, - * 2. La libert\xE9 de l' \xE9tudier et de l'adapter \xE0 ses besoins, - * 3. La libert\xE9 de redistribuer des copies, - * 4. La libert\xE9 d'am\xE9liorer et de rendre publiques les modifications afin - * que l'ensemble de la communaut\xE9 en b\xE9n\xE9ficie. - * - * @copyright (http://www.tdmxoops.net) - * @license http://www.fsf.org/copyleft/gpl.html GNU public license - * @author TDM ; TEAM DEV MODULE - * - * **************************************************************************** - */ - -include '../../../include/cp_header.php'; -include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php"); -include_once(XOOPS_ROOT_PATH."/class/tree.php"); -include_once XOOPS_ROOT_PATH.'/class/pagenav.php'; -include_once("../include/function.php"); - -xoops_cp_header(); -if ( !is_readable(XOOPS_ROOT_PATH . "/Frameworks/art/functions.admin.php")) { -Adminmenu(2, _AM_ISTATS_ABOUT); -} else { -include_once XOOPS_ROOT_PATH.'/Frameworks/art/functions.admin.php'; -loadModuleAdminMenu (2, _AM_ISTATS_ABOUT); -} - -//menu -echo '<div class="CPbigTitle" style="background-image: url(../images/decos/about.png); background-repeat: no-repeat; background-position: left; padding-left: 60px; padding-top:20px; padding-bottom:15px;"> -<h3><strong>'._AM_ISTATS_ABOUT.'</strong></h3>'; -echo '</div><br />'; - -$versioninfo =& $module_handler->get( $xoopsModule->getVar( 'mid' ) ); -echo " - <style type=\"text/css\"> - label,text { - display: block; - float: left; - margin-bottom: 2px; - } - label { - text-align: right; - width: 150px; - padding-right: 20px; - } - br { - clear: left; - } - </style> -"; - -echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . $xoopsModule->getVar("name"). "</legend>"; -echo "<div style='padding: 8px;'>"; -echo "<img src='" . XOOPS_URL . "/modules/" . $xoopsModule->getVar("dirname") . "/" . $versioninfo->getInfo( 'image' ) . "' alt='' hspace='10' vspace='0' /></a>\n"; -echo "<div style='padding: 5px;'><strong>" . $versioninfo->getInfo( 'name' ) . " version " . $versioninfo->getInfo( 'version' ) . "</strong></div>\n"; -echo "<label>" ._AM_ABOUT_RELEASEDATE. ":</label><text>" . $versioninfo->getInfo( 'release' ) . "</text><br />"; -echo "<label>" ._AM_ABOUT_AUTHOR. ":</label><text>" . $versioninfo->getInfo( 'author' ) . "</text><br />"; -echo "<label>" ._AM_ABOUT_CREDITS. ":</label><text>" . $versioninfo->getInfo( 'credits' ) . "</text><br />"; -echo "<label>" ._AM_ABOUT_LICENSE. ":</label><text><a href=\"".$versioninfo->getInfo( 'license_file' )."\" target=\"_blank\" >" . $versioninfo->getInfo( 'license' ) . "</a></text>\n"; -echo "</div>"; -echo "</fieldset>"; -echo "<br clear=\"all\" />"; - -echo "<fieldset><legend style='font-weight: bold; color: #900;'>" ._AM_ABOUT_MODULE_INFO. "</legend>"; -echo "<div style='padding: 8px;'>"; -echo "<label>" ._AM_ABOUT_MODULE_STATUS. ":</label><text>" . $versioninfo->getInfo( 'module_status' ) . "</text><br />"; -echo "<label>" ._AM_ABOUT_WEBSITE. ":</label><text>" . "<a href='" . $versioninfo->getInfo( 'module_website_url' ) . "' target='_blank'>" . $versioninfo->getInfo( 'module_website_name' ) . "</a>" . "</text><br />"; -echo "</div>"; -echo "</fieldset>"; -echo "<br clear=\"all\" />"; - -echo "<fieldset><legend style='font-weight: bold; color: #900;'>" ._AM_ABOUT_AUTHOR_INFO. "</legend>"; -echo "<div style='padding: 8px;'>"; -echo "<label>" ._AM_ABOUT_AUTHOR_NAME. ":</label><text>" . $versioninfo->getInfo( 'author' ) . "</text><br />"; -echo "<label>" ._AM_ABOUT_WEBSITE. ":</label><text>" . "<a href='" . $versioninfo->getInfo( 'author_website_url' ) . "' target='_blank'>" . $versioninfo->getInfo( 'author_website_name' ) . "</a>" . "</text><br />"; -echo "</div>"; -echo "</fieldset>"; -echo "<br clear=\"all\" />"; - - -$file = XOOPS_ROOT_PATH. "/modules/TDMStats/changelog.txt"; -if ( is_readable( $file ) ){ - echo "<fieldset><legend style='font-weight: bold; color: #900;'>" ._AM_ABOUT_CHANGELOG. "</legend>"; - echo "<div style='padding: 8px;'>"; - echo "<div>". implode("<br />", file( $file )) . "</div>"; - echo "</div>"; - echo "</fieldset>"; - echo "<br clear=\"all\" />"; -} - -xoops_cp_footer(); -?> \ No newline at end of file +<?php +/** + * Mastop Go2 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 MastopGo2 + * @since 2.5.0 + * @author Mage, Mamba + * @version $Id $ + **/ + +include_once dirname(__FILE__) . '/admin_header.php'; + +xoops_cp_header(); + +$aboutAdmin = new ModuleAdmin(); + +echo $aboutAdmin->addNavigation('about.php'); +echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', FALSE); + +include 'admin_footer.php'; \ No newline at end of file Added: XoopsModules/TDMStats/trunk/TDMStats/admin/admin_footer.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/admin/admin_footer.php (rev 0) +++ XoopsModules/TDMStats/trunk/TDMStats/admin/admin_footer.php 2012-05-13 09:13:24 UTC (rev 9501) @@ -0,0 +1,6 @@ +<?php +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" + . " </div>\n" . " " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n" . "</div>"; + +xoops_cp_footer(); \ No newline at end of file Added: XoopsModules/TDMStats/trunk/TDMStats/admin/admin_header.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/admin/admin_header.php (rev 0) +++ XoopsModules/TDMStats/trunk/TDMStats/admin/admin_header.php 2012-05-13 09:13:24 UTC (rev 9501) @@ -0,0 +1,25 @@ +<?php + +$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'); + +// 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_TDMSTATS_MODULEADMIN_MISSING, false); + } \ No newline at end of file Modified: XoopsModules/TDMStats/trunk/TDMStats/admin/index.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/admin/index.php 2012-05-13 08:50:29 UTC (rev 9500) +++ XoopsModules/TDMStats/trunk/TDMStats/admin/index.php 2012-05-13 09:13:24 UTC (rev 9501) @@ -1,282 +1,10 @@ -<?php -/** - * **************************************************************************** - * - TDMStats By TDM - TEAM DEV MODULE FOR XOOPS - * - GNU Licence Copyright (c) (http://www.) - * - * La licence GNU GPL, garanti \xE0 l'utilisateur les droits suivants - * - * 1. La libert\xE9 d'ex\xE9cuter le logiciel, pour n'importe quel usage, - * 2. La libert\xE9 de l' \xE9tudier et de l'adapter \xE0 ses besoins, - * 3. La libert\xE9 de redistribuer des copies, - * 4. La libert\xE9 d'am\xE9liorer et de rendre publiques les modifications afin - * que l'ensemble de la communaut\xE9 en b\xE9n\xE9ficie. - * - * @copyright (http://www.tdmxoops.net) - * @license http://www.fsf.org/copyleft/gpl.html GNU public license - * @author TDM ; TEAM DEV MODULE - * - * **************************************************************************** - */ - -include '../../../include/cp_header.php'; -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_cp_header(); -//apelle du menu admin -if ( !is_readable(XOOPS_ROOT_PATH . "/Frameworks/art/functions.admin.php")) { -Adminmenu(0, _AM_ISTATS_INDEXDESC); -} else { -include_once XOOPS_ROOT_PATH.'/Frameworks/art/functions.admin.php'; -loadModuleAdminMenu (0, _AM_ISTATS_INDEXDESC); -} - - -//TDMStats_count -$sq1 = "SHOW TABLE STATUS FROM `".XOOPS_DB_NAME."` LIKE '".$xoopsDB->prefix("TDMStats_count")."'"; -$result1=$xoopsDB->queryF($sq1); -$count=$xoopsDB->fetchArray($result1); -//TDMStats_daycount -$sq1 = "SHOW TABLE STATUS FROM `".XOOPS_DB_NAME."` LIKE '".$xoopsDB->prefix("TDMStats_daycount")."'"; -$result1=$xoopsDB->queryF($sq1); -$daycount=$xoopsDB->fetchArray($result1); -//TDMStats_referer -$sq1 = "SHOW TABLE STATUS FROM `".XOOPS_DB_NAME."` LIKE '".$xoopsDB->prefix("TDMStats_referer")."'"; -$result1=$xoopsDB->queryF($sq1); -$referer=$xoopsDB->fetchArray($result1); -//TDMStats_hour -$sq1 = "SHOW TABLE STATUS FROM `".XOOPS_DB_NAME."` LIKE '".$xoopsDB->prefix("TDMStats_hour")."'"; -$result1=$xoopsDB->queryF($sq1); -$hour=$xoopsDB->fetchArray($result1); -//TDMStats_today_hour -$sq1 = "SHOW TABLE STATUS FROM `".XOOPS_DB_NAME."` LIKE '".$xoopsDB->prefix("TDMStats_today_hour")."'"; -$result1=$xoopsDB->queryF($sq1); -$today_hour=$xoopsDB->fetchArray($result1); -//TDMStats_browser -$sq1 = "SHOW TABLE STATUS FROM `".XOOPS_DB_NAME."` LIKE '".$xoopsDB->prefix("TDMStats_browser")."'"; -$result1=$xoopsDB->queryF($sq1); -$browser=$xoopsDB->fetchArray($result1); -//TDMStats_os -$sq1 = "SHOW TABLE STATUS FROM `".XOOPS_DB_NAME."` LIKE '".$xoopsDB->prefix("TDMStats_os")."'"; -$result1=$xoopsDB->queryF($sq1); -$os=$xoopsDB->fetchArray($result1); -//TDMStats_hostname -$sq1 = "SHOW TABLE STATUS FROM `".XOOPS_DB_NAME."` LIKE '".$xoopsDB->prefix("TDMStats_hostname")."'"; -$result1=$xoopsDB->queryF($sq1); -$hostname=$xoopsDB->fetchArray($result1); -//TDMStats_week -$sq1 = "SHOW TABLE STATUS FROM `".XOOPS_DB_NAME."` LIKE '".$xoopsDB->prefix("TDMStats_week")."'"; -$result1=$xoopsDB->queryF($sq1); -$week=$xoopsDB->fetchArray($result1); -//TDMStats_week_count -$sq1 = "SHOW TABLE STATUS FROM `".XOOPS_DB_NAME."` LIKE '".$xoopsDB->prefix("TDMStats_week_count")."'"; -$result1=$xoopsDB->queryF($sq1); -$week_count=$xoopsDB->fetchArray($result1); -//TDMStats_mth -$sq1 = "SHOW TABLE STATUS FROM `".XOOPS_DB_NAME."` LIKE '".$xoopsDB->prefix("TDMStats_mth")."'"; -$result1=$xoopsDB->queryF($sq1); -$mth=$xoopsDB->fetchArray($result1); -//TDMStats_mth_days -$sq1 = "SHOW TABLE STATUS FROM `".XOOPS_DB_NAME."` LIKE '".$xoopsDB->prefix("TDMStats_mth_days")."'"; -$result1=$xoopsDB->queryF($sq1); -$mth_days=$xoopsDB->fetchArray($result1); -//TDMStats_screen -$sq1 = "SHOW TABLE STATUS FROM `".XOOPS_DB_NAME."` LIKE '".$xoopsDB->prefix("TDMStats_screen")."'"; -$result1=$xoopsDB->queryF($sq1); -$screen=$xoopsDB->fetchArray($result1); -//TDMStats_color -$sq1 = "SHOW TABLE STATUS FROM `".XOOPS_DB_NAME."` LIKE '".$xoopsDB->prefix("TDMStats_color")."'"; -$result1=$xoopsDB->queryF($sq1); -$color=$xoopsDB->fetchArray($result1); -//TDMStats_page -$sq1 = "SHOW TABLE STATUS FROM `".XOOPS_DB_NAME."` LIKE '".$xoopsDB->prefix("TDMStats_page")."'"; -$result1=$xoopsDB->queryF($sq1); -$page=$xoopsDB->fetchArray($result1); -//TDMStats_modules -$sq1 = "SHOW TABLE STATUS FROM `".XOOPS_DB_NAME."` LIKE '".$xoopsDB->prefix("TDMStats_modules")."'"; -$result1=$xoopsDB->queryF($sq1); -$modules=$xoopsDB->fetchArray($result1); -//TDMStats_pays -$sq1 = "SHOW TABLE STATUS FROM `".XOOPS_DB_NAME."` LIKE '".$xoopsDB->prefix("TDMStats_pays")."'"; -$result1=$xoopsDB->queryF($sq1); -$pays=$xoopsDB->fetchArray($result1); -//////////////// - -include_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->dirname().'/class/menu.php'; -include_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->dirname().'/include/function.php'; - -//// - if (isset($_REQUEST['table']) && $_REQUEST['op'] == 'optimise') - { - $sq1 = "OPTIMIZE TABLE ".$xoopsDB->prefix("".$_REQUEST['table'].""); - $result1 = $xoopsDB->queryF($sq1); - if($result1){ - redirect_header( 'index.php', 1, _AM_ISTATS_BASE); - }else{ - redirect_header( 'index.php', 1, _AM_ISTATS_BASEERROR); - } -} -// - - - //showIndex(); - $menu = new Menu(); - $menu->addItem('plug', 'plug.php', '../images/decos/plug.png', _AM_ISTATS_PLUG); - $menu->addItem('about', 'about.php', '../images/decos/about.png', _AM_ISTATS_ABOUT); - $menu->addItem('update', '../../system/admin.php?fct=modulesadmin&op=update&module='.$xoopsModule ->getVar('dirname') - , '../images/decos/update.png', _AM_ISTATS_UPDATE); - $menu->addItem('permissions', 'permissions.php', '../images/decos/permissions.png', _AM_ISTATS_NAVPERMISSIONS); - $menu->addItem('Preference', '../../system/admin.php?fct=preferences&op=showmod&mod='.$xoopsModule ->getVar('mid'). - '&&confcat_id=1', '../images/decos/pref.png', _AM_ISTATS_NAVPREFERENCES); - - echo $menu->getCSS(); - -echo '<div class="CPbigTitle" style="background-image: url(../images/decos/index.png); background-repeat: no-repeat; background-position: left; padding-left: 60px; padding-top:20px; padding-bottom:15px;"> - <h3><strong>'._AM_ISTATS_INDEXDESC.'</strong></h3> - </div><br /><table width="100%" border="0" cellspacing="10" cellpadding="4"> - <tr> - <td valign="top"> - '.$menu->render().'</td> - <td valign="top" width="60%"> - <fieldset><legend class="CPmediumTitle">'.$count['Name'].'</legend> - <br/>'; - echo _AM_ISTATS_FREE.':<b> ' . istats_PrettySize($count['Data_free']).' <a href="index.php?op=optimise&table=TDMStats_count">'._AM_ISTATS_OPT.'</a></b>'; - echo '<br/><br/>'; - echo _AM_ISTATS_TOTAL.':<b> ' . istats_PrettySize($count['Data_length'] + $count['Index_length']) . '</b>'; - echo '<br /><br /> - </fieldset><br /> - - <fieldset><legend class="CPmediumTitle">'.$daycount['Name'].'</legend> - <br/>'; - echo _AM_ISTATS_FREE.':<b> ' . istats_PrettySize($daycount['Data_free']).' <a href="index.php?op=optimise&table=TDMStats_daycount">'._AM_ISTATS_OPT.'</a></b>'; - echo '<br/><br/>'; - echo _AM_ISTATS_TOTAL.':<b> ' . istats_PrettySize($daycount['Data_length'] + $daycount['Index_length']) . '</b>'; - echo '<br /><br /> - </fieldset><br /> - - <fieldset><legend class="CPmediumTitle">'.$referer['Name'].'</legend> - <br/>'; - echo _AM_ISTATS_FREE.':<b> ' . istats_PrettySize($referer['Data_free']).' <a href="index.php?op=optimise&table=TDMStats_referer">'._AM_ISTATS_OPT.'</a></b>'; - echo '<br/><br/>'; - echo _AM_ISTATS_TOTAL.':<b> ' . istats_PrettySize($referer['Data_length'] + $referer['Index_length']) . '</b>'; - echo '<br /><br /> - </fieldset><br /> - - <fieldset><legend class="CPmediumTitle">'.$hour['Name'].'</legend> - <br/>'; - echo _AM_ISTATS_FREE.':<b> ' . istats_PrettySize($hour['Data_free']).' <a href="index.php?op=optimise&table=TDMStats_hour">'._AM_ISTATS_OPT.'</a></b>'; - echo '<br/><br/>'; - echo _AM_ISTATS_TOTAL.':<b> ' . istats_PrettySize($hour['Data_length'] + $hour['Index_length']) . '</b>'; - echo '<br /><br /> - </fieldset><br /> - - <fieldset><legend class="CPmediumTitle">'.$today_hour['Name'].'</legend> - <br/>'; - echo _AM_ISTATS_FREE.':<b> ' . istats_PrettySize($today_hour['Data_free']).' <a href="index.php?op=optimise&table=TDMStats_today_hour">'._AM_ISTATS_OPT.'</a></b>'; - echo '<br/><br/>'; - echo _AM_ISTATS_TOTAL.':<b> ' . istats_PrettySize($today_hour['Data_length'] + $today_hour['Index_length']) . '</b>'; - echo '<br /><br /> - </fieldset><br /> - - <fieldset><legend class="CPmediumTitle">'.$browser['Name'].'</legend> - <br/>'; - echo _AM_ISTATS_FREE.':<b> ' . istats_PrettySize($browser['Data_free']).' <a href="index.php?op=optimise&table=TDMStats_browser">'._AM_ISTATS_OPT.'</a></b>'; - echo '<br/><br/>'; - echo _AM_ISTATS_TOTAL.':<b> ' . istats_PrettySize($browser['Data_length'] + $browser['Index_length']) . '</b>'; - echo '<br /><br /> - </fieldset><br /> - - <fieldset><legend class="CPmediumTitle">'.$os['Name'].'</legend> - <br/>'; - echo _AM_ISTATS_FREE.':<b> ' . istats_PrettySize($os['Data_free']).' <a href="index.php?op=optimise&table=TDMStats_os">'._AM_ISTATS_OPT.'</a></b>'; - echo '<br/><br/>'; - echo _AM_ISTATS_TOTAL.':<b> ' . istats_PrettySize($os['Data_length'] + $os['Index_length']) . '</b>'; - echo '<br /><br /> - </fieldset><br /> - - <fieldset><legend class="CPmediumTitle">'.$hostname['Name'].'</legend> - <br/>'; - echo _AM_ISTATS_FREE.':<b> ' . istats_PrettySize($hostname['Data_free']).' <a href="index.php?op=optimise&table=TDMStats_hostname">'._AM_ISTATS_OPT.'</a></b>'; - echo '<br/><br/>'; - echo _AM_ISTATS_TOTAL.':<b> ' . istats_PrettySize($hostname['Data_length'] + $hostname['Index_length']) . '</b>'; - echo '<br /><br /> - </fieldset><br /> - - <fieldset><legend class="CPmediumTitle">'.$week['Name'].'</legend> - <br/>'; - echo _AM_ISTATS_FREE.':<b> ' . istats_PrettySize($week['Data_free']).' <a href="index.php?op=optimise&table=TDMStats_week">'._AM_ISTATS_OPT.'</a></b>'; - echo '<br/><br/>'; - echo _AM_ISTATS_TOTAL.':<b> ' . istats_PrettySize($week['Data_length'] + $week['Index_length']) . '</b>'; - echo '<br /><br /> - </fieldset><br /> - - <fieldset><legend class="CPmediumTitle">'.$week_count['Name'].'</legend> - <br/>'; - echo _AM_ISTATS_FREE.':<b> ' . istats_PrettySize($week_count['Data_free']).' <a href="index.php?op=optimise&table=TDMStats_week_count">'._AM_ISTATS_OPT.'</a></b>'; - echo '<br/><br/>'; - echo _AM_ISTATS_TOTAL.':<b> ' . istats_PrettySize($week_count['Data_length'] + $week_count['Index_length']) . '</b>'; - echo '<br /><br /> - </fieldset><br /> - - <fieldset><legend class="CPmediumTitle">'.$mth['Name'].'</legend> - <br/>'; - echo _AM_ISTATS_FREE.':<b> ' . istats_PrettySize($mth['Data_free']).' <a href="index.php?op=optimise&table=TDMStats_mth">'._AM_ISTATS_OPT.'</a></b>'; - echo '<br/><br/>'; - echo _AM_ISTATS_TOTAL.':<b> ' . istats_PrettySize($mth['Data_length'] + $mth['Index_length']) . '</b>'; - echo '<br /><br /> - </fieldset><br /> - - <fieldset><legend class="CPmediumTitle">'.$mth_days['Name'].'</legend> - <br/>'; - echo _AM_ISTATS_FREE.':<b> ' . istats_PrettySize($mth_days['Data_free']).' <a href="index.php?op=optimise&table=TDMStats_mth_days">'._AM_ISTATS_OPT.'</a></b>'; - echo '<br/><br/>'; - echo _AM_ISTATS_TOTAL.':<b> ' . istats_PrettySize($mth_days['Data_length'] + $mth_days['Index_length']) . '</b>'; - echo '<br /><br /> - </fieldset><br /> - - <fieldset><legend class="CPmediumTitle">'.$screen['Name'].'</legend> - <br/>'; - echo _AM_ISTATS_FREE.':<b> ' . istats_PrettySize($screen['Data_free']).' <a href="index.php?op=optimise&table=TDMStats_screen">'._AM_ISTATS_OPT.'</a></b>'; - echo '<br/><br/>'; - echo _AM_ISTATS_TOTAL.':<b> ' . istats_PrettySize($screen['Data_length'] + $screen['Index_length']) . '</b>'; - echo '<br /><br /> - </fieldset><br /> - - <fieldset><legend class="CPmediumTitle">'.$color['Name'].'</legend> - <br/>'; - echo _AM_ISTATS_FREE.':<b> ' . istats_PrettySize($color['Data_free']).' <a href="index.php?op=optimise&table=TDMStats_color">'._AM_ISTATS_OPT.'</a></b>'; - echo '<br/><br/>'; - echo _AM_ISTATS_TOTAL.':<b> ' . istats_PrettySize($color['Data_length'] + $color['Index_length']) . '</b>'; - echo '<br /><br /> - </fieldset><br /> - - <fieldset><legend class="CPmediumTitle">'.$page['Name'].'</legend> - <br/>'; - echo _AM_ISTATS_FREE.':<b> ' . istats_PrettySize($page['Data_free']).' <a href="index.php?op=optimise&table=TDMStats_page">'._AM_ISTATS_OPT.'</a></b>'; - echo '<br/><br/>'; - echo _AM_ISTATS_TOTAL.':<b> ' . istats_PrettySize($page['Data_length'] + $page['Index_length']) . '</b>'; - echo '<br /><br /> - </fieldset><br /> - - <fieldset><legend class="CPmediumTitle">'.$modules['Name'].'</legend> - <br/>'; - echo _AM_ISTATS_FREE.':<b> ' . istats_PrettySize($modules['Data_free']).' <a href="index.php?op=optimise&table=TDMStats_modules">'._AM_ISTATS_OPT.'</a></b>'; - echo '<br/><br/>'; - echo _AM_ISTATS_TOTAL.':<b> ' . istats_PrettySize($modules['Data_length'] + $modules['Index_length']) . '</b>'; - echo '<br /><br /> - </fieldset><br /> - - <fieldset><legend class="CPmediumTitle">'.$pays['Name'].'</legend> - <br/>'; - echo _AM_ISTATS_FREE.':<b> ' . istats_PrettySize($pays['Data_free']).' <a href="index.php?op=optimise&table=TDMStats_pays">'._AM_ISTATS_OPT.'</a></b>'; - echo '<br/><br/>'; - echo _AM_ISTATS_TOTAL.':<b> ' . istats_PrettySize($pays['Data_length'] + $pays['Index_length']) . '</b>'; - echo '<br /><br /> - </fieldset><br /><br />'; - - - echo '</td></tr></table>'; -xoops_cp_footer(); -?> \ No newline at end of file +<?php + +include_once 'admin_header.php'; +xoops_cp_header(); + +$indexAdmin = new ModuleAdmin(); +echo $indexAdmin->addNavigation('index.php'); +echo $indexAdmin->renderIndex(); + +include 'admin_footer.php'; \ No newline at end of file Added: XoopsModules/TDMStats/trunk/TDMStats/admin/main.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/admin/main.php (rev 0) +++ XoopsModules/TDMStats/trunk/TDMStats/admin/main.php 2012-05-13 09:13:24 UTC (rev 9501) @@ -0,0 +1,266 @@ +<?php +/** + * **************************************************************************** + * - TDMStats By TDM - TEAM DEV MODULE FOR XOOPS + * - GNU Licence Copyright (c) (http://www.) + * + * La licence GNU GPL, garanti \xE0 l'utilisateur les droits suivants + * + * 1. La libert\xE9 d'ex\xE9cuter le logiciel, pour n'importe quel usage, + * 2. La libert\xE9 de l' \xE9tudier et de l'adapter \xE0 ses besoins, + * 3. La libert\xE9 de redistribuer des copies, + * 4. La libert\xE9 d'am\xE9liorer et de rendre publiques les modifications afin + * que l'ensemble de la communaut\xE9 en b\xE9n\xE9ficie. + * + * @copyright (http://www.tdmxoops.net) + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * @author TDM ; TEAM DEV MODULE + * + * **************************************************************************** + */ + +include '../../../include/cp_header.php'; +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_cp_header(); +include_once 'admin_header.php'; + +//apelle du menu admin + +$indexAdmin = new ModuleAdmin(); +echo $indexAdmin->addNavigation('main.php'); +//echo $indexAdmin->renderIndex(); + + +//TDMStats_count +$sq1 = "SHOW TABLE STATUS FROM `".XOOPS_DB_NAME."` LIKE '".$xoopsDB->prefix("TDMStats_count")."'"; +$result1=$xoopsDB->queryF($sq1); +$count=$xoopsDB->fetchArray($result1); +//TDMStats_daycount +$sq1 = "SHOW TABLE STATUS FROM `".XOOPS_DB_NAME."` LIKE '".$xoopsDB->prefix("TDMStats_daycount")."'"; +$result1=$xoopsDB->queryF($sq1); +$daycount=$xoopsDB->fetchArray($result1); +//TDMStats_referer +$sq1 = "SHOW TABLE STATUS FROM `".XOOPS_DB_NAME."` LIKE '".$xoopsDB->prefix("TDMStats_referer")."'"; +$result1=$xoopsDB->queryF($sq1); +$referer=$xoopsDB->fetchArray($result1); +//TDMStats_hour +$sq1 = "SHOW TABLE STATUS FROM `".XOOPS_DB_NAME."` LIKE '".$xoopsDB->prefix("TDMStats_hour")."'"; +$result1=$xoopsDB->queryF($sq1); +$hour=$xoopsDB->fetchArray($result1); +//TDMStats_today_hour +$sq1 = "SHOW TABLE STATUS FROM `".XOOPS_DB_NAME."` LIKE '".$xoopsDB->prefix("TDMStats_today_hour")."'"; +$result1=$xoopsDB->queryF($sq1); +$today_hour=$xoopsDB->fetchArray($result1); +//TDMStats_browser +$sq1 = "SHOW TABLE STATUS FROM `".XOOPS_DB_NAME."` LIKE '".$xoopsDB->prefix("TDMStats_browser")."'"; +$result1=$xoopsDB->queryF($sq1); +$browser=$xoopsDB->fetchArray($result1); +//TDMStats_os +$sq1 = "SHOW TABLE STATUS FROM `".XOOPS_DB_NAME."` LIKE '".$xoopsDB->prefix("TDMStats_os")."'"; +$result1=$xoopsDB->queryF($sq1); +$os=$xoopsDB->fetchArray($result1); +//TDMStats_hostname +$sq1 = "SHOW TABLE STATUS FROM `".XOOPS_DB_NAME."` LIKE '".$xoopsDB->prefix("TDMStats_hostname")."'"; +$result1=$xoopsDB->queryF($sq1); +$hostname=$xoopsDB->fetchArray($result1); +//TDMStats_week +$sq1 = "SHOW TABLE STATUS FROM `".XOOPS_DB_NAME."` LIKE '".$xoopsDB->prefix("TDMStats_week")."'"; +$result1=$xoopsDB->queryF($sq1); +$week=$xoopsDB->fetchArray($result1); +//TDMStats_week_count +$sq1 = "SHOW TABLE STATUS FROM `".XOOPS_DB_NAME."` LIKE '".$xoopsDB->prefix("TDMStats_week_count")."'"; +$result1=$xoopsDB->queryF($sq1); +$week_count=$xoopsDB->fetchArray($result1); +//TDMStats_mth +$sq1 = "SHOW TABLE STATUS FROM `".XOOPS_DB_NAME."` LIKE '".$xoopsDB->prefix("TDMStats_mth")."'"; +$result1=$xoopsDB->queryF($sq1); +$mth=$xoopsDB->fetchArray($result1); +//TDMStats_mth_days +$sq1 = "SHOW TABLE STATUS FROM `".XOOPS_DB_NAME."` LIKE '".$xoopsDB->prefix("TDMStats_mth_days")."'"; +$result1=$xoopsDB->queryF($sq1); +$mth_days=$xoopsDB->fetchArray($result1); +//TDMStats_screen +$sq1 = "SHOW TABLE STATUS FROM `".XOOPS_DB_NAME."` LIKE '".$xoopsDB->prefix("TDMStats_screen")."'"; +$result1=$xoopsDB->queryF($sq1); +$screen=$xoopsDB->fetchArray($result1); +//TDMStats_color +$sq1 = "SHOW TABLE STATUS FROM `".XOOPS_DB_NAME."` LIKE '".$xoopsDB->prefix("TDMStats_color")."'"; +$result1=$xoopsDB->queryF($sq1); +$color=$xoopsDB->fetchArray($result1); +//TDMStats_page +$sq1 = "SHOW TABLE STATUS FROM `".XOOPS_DB_NAME."` LIKE '".$xoopsDB->prefix("TDMStats_page")."'"; +$result1=$xoopsDB->queryF($sq1); +$page=$xoopsDB->fetchArray($result1); +//TDMStats_modules +$sq1 = "SHOW TABLE STATUS FROM `".XOOPS_DB_NAME."` LIKE '".$xoopsDB->prefix("TDMStats_modules")."'"; +$result1=$xoopsDB->queryF($sq1); +$modules=$xoopsDB->fetchArray($result1); +//TDMStats_pays +$sq1 = "SHOW TABLE STATUS FROM `".XOOPS_DB_NAME."` LIKE '".$xoopsDB->prefix("TDMStats_pays")."'"; +$result1=$xoopsDB->queryF($sq1); +$pays=$xoopsDB->fetchArray($result1); +//////////////// + +include_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->dirname().'/class/menu.php'; +include_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->dirname().'/include/function.php'; + +//// + if (isset($_REQUEST['table']) && $_REQUEST['op'] == 'optimise') + { + $sq1 = "OPTIMIZE TABLE ".$xoopsDB->prefix("".$_REQUEST['table'].""); + $result1 = $xoopsDB->queryF($sq1); + if($result1){ + redirect_header( 'main.php', 1, _AM_ISTATS_BASE); + }else{ + redirect_header( 'index.php', 1, _AM_ISTATS_BASEERROR); + } +} + + +echo ' + <tr> + <td valign="top"> + </td> + <td valign="top" width="60%"> + <fieldset><legend class="CPmediumTitle">'.$count['Name'].'</legend> + <br/>'; + echo _AM_ISTATS_FREE.':<b> ' . istats_PrettySize($count['Data_free']).' <a href="main.php?op=optimise&table=TDMStats_count">'._AM_ISTATS_OPT.'</a></b>'; + echo '<br/><br/>'; + echo _AM_ISTATS_TOTAL.':<b> ' . istats_PrettySize($count['Data_length'] + $count['Index_length']) . '</b>'; + echo '<br /><br /> + </fieldset><br /> + + <fieldset><legend class="CPmediumTitle">'.$daycount['Name'].'</legend> + <br/>'; + echo _AM_ISTATS_FREE.':<b> ' . istats_PrettySize($daycount['Data_free']).' <a href="main.php?op=optimise&table=TDMStats_daycount">'._AM_ISTATS_OPT.'</a></b>'; + echo '<br/><br/>'; + echo _AM_ISTATS_TOTAL.':<b> ' . istats_PrettySize($daycount['Data_length'] + $daycount['Index_length']) . '</b>'; + echo '<br /><br /> + </fieldset><br /> + + <fieldset><legend class="CPmediumTitle">'.$referer['Name'].'</legend> + <br/>'; + echo _AM_ISTATS_FREE.':<b> ' . istats_PrettySize($referer['Data_free']).' <a href="main.php?op=optimise&table=TDMStats_referer">'._AM_ISTATS_OPT.'</a></b>'; + echo '<br/><br/>'; + echo _AM_ISTATS_TOTAL.':<b> ' . istats_PrettySize($referer['Data_length'] + $referer['Index_length']) . '</b>'; + echo '<br /><br /> + </fieldset><br /> + + <fieldset><legend class="CPmediumTitle">'.$hour['Name'].'</legend> + <br/>'; + echo _AM_ISTATS_FREE.':<b> ' . istats_PrettySize($hour['Data_free']).' <a href="main.php?op=optimise&table=TDMStats_hour">'._AM_ISTATS_OPT.'</a></b>'; + echo '<br/><br/>'; + echo _AM_ISTATS_TOTAL.':<b> ' . istats_PrettySize($hour['Data_length'] + $hour['Index_length']) . '</b>'; + echo '<br /><br /> + </fieldset><br /> + + <fieldset><legend class="CPmediumTitle">'.$today_hour['Name'].'</legend> + <br/>'; + echo _AM_ISTATS_FREE.':<b> ' . istats_PrettySize($today_hour['Data_free']).' <a href="main.php?op=optimise&table=TDMStats_today_hour">'._AM_ISTATS_OPT.'</a></b>'; + echo '<br/><br/>'; + echo _AM_ISTATS_TOTAL.':<b> ' . istats_PrettySize($today_hour['Data_length'] + $today_hour['Index_length']) . '</b>'; + echo '<br /><br /> + </fieldset><br /> + + <fieldset><legend class="CPmediumTitle">'.$browser['Name'].'</legend> + <br/>'; + echo _AM_ISTATS_FREE.':<b> ' . istats_PrettySize($browser['Data_free']).' <a href="main.php?op=optimise&table=TDMStats_browser">'._AM_ISTATS_OPT.'</a></b>'; + echo '<br/><br/>'; + echo _AM_ISTATS_TOTAL.':<b> ' . istats_PrettySize($browser['Data_length'] + $browser['Index_length']) . '</b>'; + echo '<br /><br /> + </fieldset><br /> + + <fieldset><legend class="CPmediumTitle">'.$os['Name'].'</legend> + <br/>'; + echo _AM_ISTATS_FREE.':<b> ' . istats_PrettySize($os['Data_free']).' <a href="main.php?op=optimise&table=TDMStats_os">'._AM_ISTATS_OPT.'</a></b>'; + echo '<br/><br/>'; + echo _AM_ISTATS_TOTAL.':<b> ' . istats_PrettySize($os['Data_length'] + $os['Index_length']) . '</b>'; + echo '<br /><br /> + </fieldset><br /> + + <fieldset><legend class="CPmediumTitle">'.$hostname['Name'].'</legend> + <br/>'; + echo _AM_ISTATS_FREE.':<b> ' . istats_PrettySize($hostname['Data_free']).' <a href="main.php?op=optimise&table=TDMStats_hostname">'._AM_ISTATS_OPT.'</a></b>'; + echo '<br/><br/>'; + echo _AM_ISTATS_TOTAL.':<b> ' . istats_PrettySize($hostname['Data_length'] + $hostname['Index_length']) . '</b>'; + echo '<br /><br /> + </fieldset><br /> + + <fieldset><legend class="CPmediumTitle">'.$week['Name'].'</legend> + <br/>'; + echo _AM_ISTATS_FREE.':<b> ' . istats_PrettySize($week['Data_free']).' <a href="main.php?op=optimise&table=TDMStats_week">'._AM_ISTATS_OPT.'</a></b>'; + echo '<br/><br/>'; + echo _AM_ISTATS_TOTAL.':<b> ' . istats_PrettySize($week['Data_length'] + $week['Index_length']) . '</b>'; + echo '<br /><br /> + </fieldset><br /> + + <fieldset><legend class="CPmediumTitle">'.$week_count['Name'].'</legend> + <br/>'; + echo _AM_ISTATS_FREE.':<b> ' . istats_PrettySize($week_count['Data_free']).' <a href="main.php?op=optimise&table=TDMStats_week_count">'._AM_ISTATS_OPT.'</a></b>'; + echo '<br/><br/>'; + echo _AM_ISTATS_TOTAL.':<b> ' . istats_PrettySize($week_count['Data_length'] + $week_count['Index_length']) . '</b>'; + echo '<br /><br /> + </fieldset><br /> + + <fieldset><legend class="CPmediumTitle">'.$mth['Name'].'</legend> + <br/>'; + echo _AM_ISTATS_FREE.':<b> ' . istats_PrettySize($mth['Data_free']).' <a href="main.php?op=optimise&table=TDMStats_mth">'._AM_ISTATS_OPT.'</a></b>'; + echo '<br/><br/>'; + echo _AM_ISTATS_TOTAL.':<b> ' . istats_PrettySize($mth['Data_length'] + $mth['Index_length']) . '</b>'; + echo '<br /><br /> + </fieldset><br /> + + <fieldset><legend class="CPmediumTitle">'.$mth_days['Name'].'</legend> + <br/>'; + echo _AM_ISTATS_FREE.':<b> ' . istats_PrettySize($mth_days['Data_free']).' <a href="main.php?op=optimise&table=TDMStats_mth_days">'._AM_ISTATS_OPT.'</a></b>'; + echo '<br/><br/>'; + echo _AM_ISTATS_TOTAL.':<b> ' . istats_PrettySize($mth_days['Data_length'] + $mth_days['Index_length']) . '</b>'; + echo '<br /><br /> + </fieldset><br /> + + <fieldset><legend class="CPmediumTitle">'.$screen['Name'].'</legend> + <br/>'; + echo _AM_ISTATS_FREE.':<b> ' . istats_PrettySize($screen['Data_free']).' <a href="main.php?op=optimise&table=TDMStats_screen">'._AM_ISTATS_OPT.'</a></b>'; + echo '<br/><br/>'; + echo _AM_ISTATS_TOTAL.':<b> ' . istats_PrettySize($screen['Data_length'] + $screen['Index_length']) . '</b>'; + echo '<br /><br /> + </fieldset><br /> + + <fieldset><legend class="CPmediumTitle">'.$color['Name'].'</legend> + <br/>'; + echo _AM_ISTATS_FREE.':<b> ' . istats_PrettySize($color['Data_free']).' <a href="main.php?op=optimise&table=TDMStats_color">'._AM_ISTATS_OPT.'</a></b>'; + echo '<br/><br/>'; + echo _AM_ISTATS_TOTAL.':<b> ' . istats_PrettySize($color['Data_length'] + $color['Index_length']) . '</b>'; + echo '<br /><br /> + </fieldset><br /> + + <fieldset><legend class="CPmediumTitle">'.$page['Name'].'</legend> + <br/>'; + echo _AM_ISTATS_FREE.':<b> ' . istats_PrettySize($page['Data_free']).' <a href="main.php?op=optimise&table=TDMStats_page">'._AM_ISTATS_OPT.'</a></b>'; + echo '<br/><br/>'; + echo _AM_ISTATS_TOTAL.':<b> ' . istats_PrettySize($page['Data_length'] + $page['Index_length']) . '</b>'; + echo '<br /><br /> + </fieldset><br /> + + <fieldset><legend class="CPmediumTitle">'.$modules['Name'].'</legend> + <br/>'; + echo _AM_ISTATS_FREE.':<b> ' . istats_PrettySize($modules['Data_free']).' <a href="main.php?op=optimise&table=TDMStats_modules">'._AM_ISTATS_OPT.'</a></b>'; + echo '<br/><br/>'; + echo _AM_ISTATS_TOTAL.':<b> ' . istats_PrettySize($modules['Data_length'] + $modules['Index_length']) . '</b>'; + echo '<br /><br /> + </fieldset><br /> + + <fieldset><legend class="CPmediumTitle">'.$pays['Name'].'</legend> + <br/>'; + echo _AM_ISTATS_FREE.':<b> ' . istats_PrettySize($pays['Data_free']).' <a href="main.php?op=optimise&table=TDMStats_pays">'._AM_ISTATS_OPT.'</a></b>'; + echo '<br/><br/>'; + echo _AM_ISTATS_TOTAL.':<b> ' . istats_PrettySize($pays['Data_length'] + $pays['Index_length']) . '</b>'; + echo '<br /><br /> + </fieldset><br /><br />'; + + + echo '</td></tr></table>'; +include_once 'admin_footer.php'; \ No newline at end of file Modified: XoopsModules/TDMStats/trunk/TDMStats/admin/menu.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/admin/menu.php 2012-05-13 08:50:29 UTC (rev 9500) +++ XoopsModules/TDMStats/trunk/TDMStats/admin/menu.php 2012-05-13 09:13:24 UTC (rev 9501) @@ -18,14 +18,51 @@ * * **************************************************************************** */ - -$adminmenu[0]['title'] = _MI_ISTATS_INDEX; -$adminmenu[0]['link'] = "admin/index.php"; -$adminmenu[1]['title'] = _MI_ISTATS_PLUG; -$adminmenu[1]['link'] = "admin/plug.php"; -$adminmenu[2]['title'] = _MI_ISTATS_ABOUT; -$adminmenu[2]['link'] = "admin/about.php"; -$adminmenu[3]['title'] = _MI_ISTATS_PERMISSIONS; -$adminmenu[3]['link'] = "admin/permissions.php"; -?> + + +defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined"); + +$path = dirname(dirname(dirname(dirname(__FILE__)))); +include_once $path . '/mainfile.php'; + +$dirname = basename(dirname(dirname(__FILE__))); +$module_handler = xoops_gethandler('module'); +$module = $module_handler->getByDirname($dirname); +$pathIcon32 = $module->getInfo('icons32'); +$pathModuleAdmin = $module->getInfo('dirmoduleadmin'); +$pathLanguage = $path . $pathModuleAdmin; + + +if (!file_exists($fileinc = $pathLanguage . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/' . 'main.php')) { + $fileinc = $pathLanguage . '/language/english/main.php'; +} + +include_once $fileinc; + +$adminmenu = array(); + +$i = 1; +$adminmenu[$i]["title"] = _AM_MODULEADMIN_HOME; +$adminmenu[$i]["link"] = "admin/index.php"; +$adminmenu[$i]["icon"] = $pathIcon32 . '/home.png'; + +$i++; +$adminmenu[$i]["title"] = _MI_ISTATS_INDEX; +$adminmenu[$i]["link"] = "admin/main.php"; +$adminmenu[$i]["icon"] = $pathIcon32 . '/manage.png'; + +$i++; +$adminmenu[$i]["title"] = _MI_ISTATS_PLUG; +$adminmenu[$i]["link"] = "admin/plug.php"; +$adminmenu[$i]["icon"] = $pathIcon32 . '/addlink.png'; + +$i++; +$adminmenu[$i]["title"] = _MI_ISTATS_PERMISSIONS; +$adminmenu[$i]["link"] = "admin/permissions.php"; +$adminmenu[$i]["icon"] = $pathIcon32 . '/permissions.png'; + +$i++; +$adminmenu[$i]['title'] = _AM_MODULEADMIN_ABOUT; +$adminmenu[$i]["link"] = "admin/about.php"; +$adminmenu[$i]["icon"] = $pathIcon32 . '/about.png'; \ No newline at end of file Modified: XoopsModules/TDMStats/trunk/TDMStats/admin/permissions.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/admin/permissions.php 2012-05-13 08:50:29 UTC (rev 9500) +++ XoopsModules/TDMStats/trunk/TDMStats/admin/permissions.php 2012-05-13 09:13:24 UTC (rev 9501) @@ -34,20 +34,14 @@ if( ! empty( $_POST['submit'] ) ) { redirect_header( XOOPS_URL."/modules/".$xoopsModule->dirname()."/admin/permissions.php" , 1 , _AM_XD_GPERMUPDATED); } - xoops_cp_header(); -if ( !is_readable(XOOPS_ROOT_PATH . "/Frameworks/art/functions.admin.php")) { -Adminmenu(3, _AM_ISTATS_PERM); -} else { -include_once XOOPS_ROOT_PATH.'/Frameworks/art/functions.admin.php'; -loadModuleAdminMenu (3, _AM_ISTATS_PERM); -} +include_once 'admin_header.php'; -//menu -echo '<div class="CPbigTitle" style="background-image: url(../images/decos/permissions.png); background-repeat: no-repeat; background-position: left; padding-left: 60px; padding-top:20px; padding-bottom:15px;"> -<h3><strong>'._AM_ISTATS_PERM.'</strong></h3>'; -echo '</div><br />'; +$indexAdmin = new ModuleAdmin(); +echo $indexAdmin->addNavigation('permissions.php'); + + $module_id = $xoopsModule->getVar('mid'); @@ -69,6 +63,4 @@ echo $permform->render(); -xoops_cp_footer() ; - -?> \ No newline at end of file +include_once 'admin_footer.php'; \ No newline at end of file Modified: XoopsModules/TDMStats/trunk/TDMStats/admin/plug.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/admin/plug.php 2012-05-13 08:50:29 UTC (rev 9500) +++ XoopsModules/TDMStats/trunk/TDMStats/admin/plug.php 2012-05-13 09:13:24 UTC (rev 9501) @@ -26,24 +26,15 @@ include_once("../include/function.php"); xoops_cp_header(); - -//apelle du menu admin -if ( !is_readable(XOOPS_ROOT_PATH . "/Frameworks/art/functions.admin.php")) { -Adminmenu(1, _AM_ISTATS_PLUG); -} else { -include_once XOOPS_ROOT_PATH.'/Frameworks/art/functions.admin.php'; -loadModuleAdminMenu (1, _AM_ISTATS_PLUG); -} +include_once 'admin_header.php'; +$indexAdmin = new ModuleAdmin(); +echo $indexAdmin->addNavigation('plug.php'); + $myts =& MyTextSanitizer::getInstance(); $op = isset($_REQUEST['op']) ? $_REQUEST['op'] : 'list'; -//menu -echo '<div class="CPbigTitle" style="background-image: url(../images/decos/plug.png); background-repeat: no-repeat; background-position: left; padding-left: 60px; padding-top:20px; padding-bottom:15px;"> -<h3><strong>'._AM_ISTATS_PLUG.'</strong></h3>'; -echo '</div><br />'; - switch($op) { //sauv @@ -79,5 +70,4 @@ break; } -xoops_cp_footer(); -?> \ No newline at end of file +include_once 'admin_footer.php'; \ No newline at end of file Deleted: XoopsModules/TDMStats/trunk/TDMStats/changelog.txt =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/changelog.txt 2012-05-13 08:50:29 UTC (rev 9500) +++ XoopsModules/TDMStats/trunk/TDMStats/changelog.txt 2012-05-13 09:13:24 UTC (rev 9501) @@ -1,69 +0,0 @@ -************************************************************ -TDM : TDMStats -Version 1.06 | 27-01-2010 -Dev: 2.2.4 -************************************************************ -- Correction des fichiers admin refonte du design et option. -- Correction d'un bug avec la taille de base de donn\xE9e. -- Modifier tous les fichiers pour inclure les nouveaux graphique. -************************************************************ -************************************************************ -TDM : TDMStats -Version 1.05 | 17-12-2009 -Dev: 2.2.3 -************************************************************ -- correction des fichiers de langue FR en utf8 -- correction d'un bug avec l'hrs du serveur -- le module ne marchait pas sur les serveur linux (probl\xE8me majuscule) -- supression bug avec les blocs. -************************************************************ -************************************************************ -TDM : TDMStats -Version 1.04 | 15-12-2009 -Dev: 2.2.3 -************************************************************ -- supression bug avec les blocs (les blocs ne marchait pas) -- ajout du bloc compteur -************************************************************ -************************************************************ -TDM : TDMStats -Version 1.03 | 05-10-2009 -Dev: 2.2.3 -************************************************************ -- modifi\xE9 summary.php vs summary.html modification du system pays. -- modifi\xE9 summary.html r\xE9organisation du template. -- modifi\xE9 summary.php vs stats.php limitation du texte. -- modifi\xE9 xoops_version.php vs index.php ajout de choix du theme. -************************************************************ -************************************************************ -TDM : TDMStats -Version 1.02 | 25-09-2009 -Dev: 2.2.3 -************************************************************ -- modifi\xE9 sql/mysql.sql pour bug. -- modifi\xE9 sql/mysql1.1.sql pour bug. -- ajout du fichier readme_fr.txt -- ajout du fichier license_gpl.txt -************************************************************ -************************************************************ -TDM : TDMStats -Version 1.01 | 21-07-2009 -Dev: 2.2.3 -************************************************************ -- ajoute firefox et 1920 about.php. -- modifi\xE9 counter.php pour linux. -- modifi\xE9 counter.php pour le pays. -************************************************************ -************************************************************ -TDM : TDMStats -Version 1.00 | 21-07-2009 -Dev: 2.2.3 -************************************************************ -- ajoute changelog et modifie about.php. -- modifi\xE9 function.xoStats.php pour la fonction page. -- modifi\xE9 counter.php pour le pays. -- modifi\xE9 mysql.sql bug windows vista. - -************************************************************ - - Added: XoopsModules/TDMStats/trunk/TDMStats/docs/changelog.txt =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/docs/changelog.txt (rev 0) +++ XoopsModules/TDMStats/trunk/TDMStats/docs/changelog.txt 2012-05-13 09:13:24 UTC (rev 9501) @@ -0,0 +1,76 @@ +************************************************************ +TDM : TDMStats +Version 1.07 | 12-05-2012 +Dev: 2.2.4 +************************************************************ +- conversion to XOOPS 2.5.x Admin GUI +************************************************************ +************************************************************ +TDM : TDMStats +Version 1.06 | 27-01-2010 +Dev: 2.2.4 +************************************************************ +- Correction des fichiers admin refonte du design et option. +- Correction d'un bug avec la taille de base de donn\xE9e. +- Modifier tous les fichiers pour inclure les nouveaux graphique. +************************************************************ +************************************************************ +TDM : TDMStats +Version 1.05 | 17-12-2009 +Dev: 2.2.3 +************************************************************ +- correction des fichiers de langue FR en utf8 +- correction d'un bug avec l'hrs du serveur +- le module ne marchait pas sur les serveur linux (probl\xE8me majuscule) +- supression bug avec les blocs. +************************************************************ +************************************************************ +TDM : TDMStats +Version 1.04 | 15-12-2009 +Dev: 2.2.3 +************************************************************ +- supression bug avec les blocs (les blocs ne marchait pas) +- ajout du bloc compteur +************************************************************ +************************************************************ +TDM : TDMStats +Version 1.03 | 05-10-2009 +Dev: 2.2.3 +************************************************************ +- modifi\xE9 summary.php vs summary.html modification du system pays. +- modifi\xE9 summary.html r\xE9organisation du template. +- modifi\xE9 summary.php vs stats.php limitation du texte. +- modifi\xE9 xoops_version.php vs index.php ajout de choix du theme. +************************************************************ +************************************************************ +TDM : TDMStats +Version 1.02 | 25-09-2009 +Dev: 2.2.3 +************************************************************ +- modifi\xE9 sql/mysql.sql pour bug. +- modifi\xE9 sql/mysql1.1.sql pour bug. +- ajout du fichier readme_fr.txt +- ajout du fichier license_gpl.txt +************************************************************ +************************************************************ +TDM : TDMStats +Version 1.01 | 21-07-2009 +Dev: 2.2.3 +************************************************************ +- ajoute firefox et 1920 about.php. +- modifi\xE9 counter.php pour linux. +- modifi\xE9 counter.php pour le pays. +************************************************************ +************************************************************ +TDM : TDMStats +Version 1.00 | 21-07-2009 +Dev: 2.2.3 +************************************************************ +- ajoute changelog et modifie about.php. +- modifi\xE9 function.xoStats.php pour la fonction page. +- modifi\xE9 counter.php pour le pays. +- modifi\xE9 mysql.sql bug windows vista. + +************************************************************ + + Added: XoopsModules/TDMStats/trunk/TDMStats/docs/credits.txt =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/docs/credits.txt (rev 0) +++ XoopsModules/TDMStats/trunk/TDMStats/docs/credits.txt 2012-05-13 09:13:24 UTC (rev 9501) @@ -0,0 +1,9 @@ +Credits +=============== +Author:Original module: Paul Cooke (alias Scripter) +Adaptation/rewrite: TDM +Credits:Sam Tang for the original i_Stats script. +Traduction Spanish thanks Don Curioso +Traduction Persian thanks Voltan + +Updated to XOOPS 2.5.x Admin GUI by Michael Beck (Mamba) Added: XoopsModules/TDMStats/trunk/TDMStats/docs/index.html =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/docs/index.html (rev 0) +++ XoopsModules/TDMStats/trunk/TDMStats/docs/index.html 2012-05-13 09:13:24 UTC (rev 9501) @@ -0,0 +1 @@ +<script>history.go(-1);</script> \ No newline at end of file Added: XoopsModules/TDMStats/trunk/TDMStats/docs/install.txt =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/docs/install.txt (rev 0) +++ XoopsModules/TDMStats/trunk/TDMStats/docs/install.txt 2012-05-13 09:13:24 UTC (rev 9501) @@ -0,0 +1,6 @@ +INSTALL/UNISTALL +================= + +No special measures necessary, follow the standard installation process \x96 extract the /TDMStats folder into the ../modules directory. Install the module through Admin -> System Module -> Modules. + +Detailed instructions on installing modules are available in the XOOPS Operations Manual (http://goo.gl/adT2i) \ No newline at end of file Added: XoopsModules/TDMStats/trunk/TDMStats/docs/lang_diff.txt =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/docs/lang_diff.txt (rev 0) +++ XoopsModules/TDMStats/trunk/TDMStats/docs/lang_diff.txt 2012-05-13 09:13:24 UTC (rev 9501) @@ -0,0 +1,12 @@ +LANGUAGE DIFFERENCES +===================== + +Below are language differences from a version to next version. + +Version 1.07 +---------------- + +admin.php +---------- +define ( "_AM_ISTATS_KB", "KB"); +define ( "_AM_ISTATS_MB", "MB"); \ No newline at end of file Added: XoopsModules/TDMStats/trunk/TDMStats/docs/licence.txt =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/docs/licence.txt (rev 0) +++ XoopsModules/TDMStats/trunk/TDMStats/docs/licence.txt 2012-05-13 09:13:24 UTC (rev 9501) @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the sou... [truncated message content] |
From: <be...@us...> - 2012-05-28 09:53:09
|
Revision: 9595 http://xoops.svn.sourceforge.net/xoops/?rev=9595&view=rev Author: beckmi Date: 2012-05-28 09:52:59 +0000 (Mon, 28 May 2012) Log Message: ----------- Updating to 1.07 Final Modified Paths: -------------- XoopsModules/TDMStats/trunk/TDMStats/index.php XoopsModules/TDMStats/trunk/TDMStats/language/english/admin.php XoopsModules/TDMStats/trunk/TDMStats/language/english/blocks.php XoopsModules/TDMStats/trunk/TDMStats/language/english/main.php XoopsModules/TDMStats/trunk/TDMStats/language/english/modinfo.php Added Paths: ----------- XoopsModules/TDMStats/trunk/TDMStats/admin/about2.php Added: XoopsModules/TDMStats/trunk/TDMStats/admin/about2.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/admin/about2.php (rev 0) +++ XoopsModules/TDMStats/trunk/TDMStats/admin/about2.php 2012-05-28 09:52:59 UTC (rev 9595) @@ -0,0 +1,100 @@ +<?php +/** + * **************************************************************************** + * - TDMStats By TDM - TEAM DEV MODULE FOR XOOPS + * - GNU Licence Copyright (c) (http://www.) + * + * La licence GNU GPL, garanti \xE0 l'utilisateur les droits suivants + * + * 1. La libert\xE9 d'ex\xE9cuter le logiciel, pour n'importe quel usage, + * 2. La libert\xE9 de l' \xE9tudier et de l'adapter \xE0 ses besoins, + * 3. La libert\xE9 de redistribuer des copies, + * 4. La libert\xE9 d'am\xE9liorer et de rendre publiques les modifications afin + * que l'ensemble de la communaut\xE9 en b\xE9n\xE9ficie. + * + * @copyright (http://www.tdmxoops.net) + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * @author TDM ; TEAM DEV MODULE + * + * **************************************************************************** + */ + +include '../../../include/cp_header.php'; +include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php"); +include_once(XOOPS_ROOT_PATH."/class/tree.php"); +include_once XOOPS_ROOT_PATH.'/class/pagenav.php'; +include_once("../include/function.php"); + +xoops_cp_header(); +if ( !is_readable(XOOPS_ROOT_PATH . "/Frameworks/art/functions.admin.php")) { +Adminmenu(2, _AM_ISTATS_ABOUT); +} else { +include_once XOOPS_ROOT_PATH.'/Frameworks/art/functions.admin.php'; +loadModuleAdminMenu (2, _AM_ISTATS_ABOUT); +} + +//menu +echo '<div class="CPbigTitle" style="background-image: url(../images/decos/about.png); background-repeat: no-repeat; background-position: left; padding-left: 60px; padding-top:20px; padding-bottom:15px;"> +<h3><strong>'._AM_ISTATS_ABOUT.'</strong></h3>'; +echo '</div><br />'; + +$versioninfo =& $module_handler->get( $xoopsModule->getVar( 'mid' ) ); +echo " + <style type=\"text/css\"> + label,text { + display: block; + float: left; + margin-bottom: 2px; + } + label { + text-align: right; + width: 150px; + padding-right: 20px; + } + br { + clear: left; + } + </style> +"; + +echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . $xoopsModule->getVar("name"). "</legend>"; +echo "<div style='padding: 8px;'>"; +echo "<img src='" . XOOPS_URL . "/modules/" . $xoopsModule->getVar("dirname") . "/" . $versioninfo->getInfo( 'image' ) . "' alt='' hspace='10' vspace='0' /></a>\n"; +echo "<div style='padding: 5px;'><strong>" . $versioninfo->getInfo( 'name' ) . " version " . $versioninfo->getInfo( 'version' ) . "</strong></div>\n"; +echo "<label>" ._AM_ABOUT_RELEASEDATE. ":</label><text>" . $versioninfo->getInfo( 'release' ) . "</text><br />"; +echo "<label>" ._AM_ABOUT_AUTHOR. ":</label><text>" . $versioninfo->getInfo( 'author' ) . "</text><br />"; +echo "<label>" ._AM_ABOUT_CREDITS. ":</label><text>" . $versioninfo->getInfo( 'credits' ) . "</text><br />"; +echo "<label>" ._AM_ABOUT_LICENSE. ":</label><text><a href=\"".$versioninfo->getInfo( 'license_file' )."\" target=\"_blank\" >" . $versioninfo->getInfo( 'license' ) . "</a></text>\n"; +echo "</div>"; +echo "</fieldset>"; +echo "<br clear=\"all\" />"; + +echo "<fieldset><legend style='font-weight: bold; color: #900;'>" ._AM_ABOUT_MODULE_INFO. "</legend>"; +echo "<div style='padding: 8px;'>"; +echo "<label>" ._AM_ABOUT_MODULE_STATUS. ":</label><text>" . $versioninfo->getInfo( 'module_status' ) . "</text><br />"; +echo "<label>" ._AM_ABOUT_WEBSITE. ":</label><text>" . "<a href='" . $versioninfo->getInfo( 'module_website_url' ) . "' target='_blank'>" . $versioninfo->getInfo( 'module_website_name' ) . "</a>" . "</text><br />"; +echo "</div>"; +echo "</fieldset>"; +echo "<br clear=\"all\" />"; + +echo "<fieldset><legend style='font-weight: bold; color: #900;'>" ._AM_ABOUT_AUTHOR_INFO. "</legend>"; +echo "<div style='padding: 8px;'>"; +echo "<label>" ._AM_ABOUT_AUTHOR_NAME. ":</label><text>" . $versioninfo->getInfo( 'author' ) . "</text><br />"; +echo "<label>" ._AM_ABOUT_WEBSITE. ":</label><text>" . "<a href='" . $versioninfo->getInfo( 'author_website_url' ) . "' target='_blank'>" . $versioninfo->getInfo( 'author_website_name' ) . "</a>" . "</text><br />"; +echo "</div>"; +echo "</fieldset>"; +echo "<br clear=\"all\" />"; + + +$file = XOOPS_ROOT_PATH. "/modules/TDMStats/changelog.txt"; +if ( is_readable( $file ) ){ + echo "<fieldset><legend style='font-weight: bold; color: #900;'>" ._AM_ABOUT_CHANGELOG. "</legend>"; + echo "<div style='padding: 8px;'>"; + echo "<div>". implode("<br />", file( $file )) . "</div>"; + echo "</div>"; + echo "</fieldset>"; + echo "<br clear=\"all\" />"; +} + +xoops_cp_footer(); +?> \ No newline at end of file Modified: XoopsModules/TDMStats/trunk/TDMStats/index.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/index.php 2012-05-28 07:45:53 UTC (rev 9594) +++ XoopsModules/TDMStats/trunk/TDMStats/index.php 2012-05-28 09:52:59 UTC (rev 9595) @@ -71,7 +71,8 @@ $xoopsTpl->assign('action', $action); $xoopsTpl->assign('lang_traffic_report', _AM_TRAFFIC_REPORT); $xoopsTpl->assign('lang_summary', _AM_SUMMARY); - $xoopsTpl->assign('img_bar', $xoopsModuleConfig['tdmstats_bar']); +if (isset($xoopsModuleConfig['tdmstats_bar'])) + $xoopsTpl->assign('img_bar', $xoopsModuleConfig['tdmstats_bar']); $xoopsTpl->assign('lang_traffic', _AM_TRAFFIC); $xoopsTpl->assign('lang_visitor_info', _AM_VISITOR_INFO); $xoopsTpl->assign('lang_referer', _AM_REFERER); Modified: XoopsModules/TDMStats/trunk/TDMStats/language/english/admin.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/language/english/admin.php 2012-05-28 07:45:53 UTC (rev 9594) +++ XoopsModules/TDMStats/trunk/TDMStats/language/english/admin.php 2012-05-28 09:52:59 UTC (rev 9595) @@ -27,7 +27,7 @@ define ( "_AM_ISTATS_COOKIE_DESC", "Determine the life of your cookie, in seconds (eg 1 hour = 3600)"); define ( "_AM_ISTATS_SAVE", "Save"); define ( "_AM_ISTATS_CANCEL", "Cancel"); -define ( "_AM_ISTATS_CONFIG", "Configuring Istat"); +define ( "_AM_ISTATS_CONFIG", "Configuring Stats"); define ( "_AM_GENERALCONF", "General configuration"); define ( "_AM_ISTATS_NOTUPDATED", "The config.php file was not updated! <br /> Scripture impossible! <br /> Please check the file permissions (chmod 666) or cache directory (chmod 777) "); define ( "_AM_ISTATS_UPDATED", "File updated config.php"); @@ -36,22 +36,22 @@ define ( "_AM_ISTATS_INDEXDESC", "module index"); define ( "_AM_ISTATS_TABLE", "Table Name"); define ( "_AM_ISTATS_LENGTH", "Size of data file"); -define ( "_AM_ISTATS_FREE", "lost space"); +define ( "_AM_ISTATS_FREE", "Lost space"); define ( "_AM_ISTATS_TOTAL", "Total file data"); define ( "_AM_ISTATS_OPT", "Optimize"); -define ( "_AM_ISTATS_BASE", "Your changes are saved with succées"); +define ( "_AM_ISTATS_BASE", "Your changes are saved successfully"); define ( "_AM_ISTATS_BASEERROR", "Error: Your changes are not saved"); define ( "_AM_ISTATS_ABOUT", "About the Module"); define ( "_AM_ISTATS_UPDATE", "Update Module"); define ( "_AM_ISTATS_PERM", "Managing Permissions"); -define ( '_AM_ISTATS_PLUG', 'Management pluging'); +define ( '_AM_ISTATS_PLUG', 'Plugin Management'); // plug.php define ( '_AM_ISTATS_PLUGHELP', '<b> Note: </ b> Remember to copy the code "<b> <xoStats ()> </ b>" in the file of your theme theme.html underway to account for visits ...'); define ( '_AM_ISTATS_PLUGERROR', 'Please copy the file "xoops_plugins / function.xoStats.php" in your site root, "/ class / smarty / xoops_plugins /"'); -define ( '_AM_ISTATS_PLUGOK', 'pluging installed'); +define ( '_AM_ISTATS_PLUGOK', 'Plugin installed'); define ( '_AM_ISTATS_PLUGETAT', 'State of the plugin'); // About (about.php) @@ -81,6 +81,4 @@ //1.07 define ( "_AM_ISTATS_KB", "KB"); -define ( "_AM_ISTATS_MB", "MB"); - -?> +define ( "_AM_ISTATS_MB", "MB"); \ No newline at end of file Modified: XoopsModules/TDMStats/trunk/TDMStats/language/english/blocks.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/language/english/blocks.php 2012-05-28 07:45:53 UTC (rev 9594) +++ XoopsModules/TDMStats/trunk/TDMStats/language/english/blocks.php 2012-05-28 09:52:59 UTC (rev 9595) @@ -30,14 +30,14 @@ define ( '_MB_ISTATS_TOTAL_VISITS', 'Total Hits'); define ( '_MB_ISTATS_TODAY', 'Visitors Today \' s'); define ( '_MB_ISTATS_THIS_WEEK', 'Visitors this week'); -define ( '_MB_ISTATS_THIS_MTH', 'visitors this month'); +define ( '_MB_ISTATS_THIS_MTH', 'Visitors this month'); define ( '_MB_ISTATS_AVE_HOUR', 'Average per hour'); -define ( '_MB_ISTATS_AVE_DAY', 'Average day'); +define ( '_MB_ISTATS_AVE_DAY', 'Average per day'); define ( '_MB_ISTATS_AVE_WEEK', 'Average per week'); -define ( '_MB_ISTATS_AVE_MTH', 'Average monthly'); -define ( '_MB_ISTATS_PER_HOUR', 'visits per hour'); +define ( '_MB_ISTATS_AVE_MTH', 'Average per monthl'); +define ( '_MB_ISTATS_PER_HOUR', 'Visits per hour'); define ( '_MB_ISTATS_P_PAGE', 'Total Pages'); -define ( "_MB_ISTATS_DISPLAY_DATE", "S'lectionnez the date format"); +define ( "_MB_ISTATS_DISPLAY_DATE", "Select the date format"); define ( "_MB_ISTATS_FR", "(d-m-Y)"); define ( "_MB_ISTATS_US", "U.S. (Y-n-d)"); @@ -46,12 +46,10 @@ define ( "_MB_ISTATS_ANONYMOUS", "Guest"); define ( "_MB_ISTATS_THERE", "There are already:"); define ( "_MB_ISTATS_VISITOR", "visitors who have visited this site"); -define ( "_MB_ISTATS_DISPLAY_AVATAR", "Show the avatar of the State"); +define ( "_MB_ISTATS_DISPLAY_AVATAR", "Show the Avatar"); define ( "_MB_ISTATS_YES", "Yes"); define ( "_MB_ISTATS_NO", "No"); -define ( "_MB_ISTATS_COUNTER_DISPLAY", "show a counter to% s figures (images)"); +define ( "_MB_ISTATS_COUNTER_DISPLAY", "Show a counter to% s figures (images)"); define ( "_MB_ISTATS_COUNTER_IMG_DIR", "Name of the images directory under% s"); define ( "_MB_ISTATS_DIR", "to use"); -define ( "_MB_ISTATS_DIRS_NAME", "(default / blkonwhite / whiteonblk / another you have uploaded)"); - -?> +define ( "_MB_ISTATS_DIRS_NAME", "(default / blkonwhite / whiteonblk / another you have uploaded)"); \ No newline at end of file Modified: XoopsModules/TDMStats/trunk/TDMStats/language/english/main.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/language/english/main.php 2012-05-28 07:45:53 UTC (rev 9594) +++ XoopsModules/TDMStats/trunk/TDMStats/language/english/main.php 2012-05-28 09:52:59 UTC (rev 9595) @@ -30,40 +30,40 @@ // text of stats topic define ( '_AM_BY_TODAY_HOUR', 'Traffic Graph of the Day'); define ( '_AM_BY_DAY', 'Days of the Month'); -define ( '_AM_BY_WEEKDAY', 'Days of the week'); +define ( '_AM_BY_WEEKDAY', 'Days of the Week'); define ( '_AM_BY_WEEK', 'Weekly'); -define ( '_AM_BY_MTH', 'Per Month'); +define ( '_AM_BY_MTH', 'Monthly'); define ( '_AM_BY_PAYS', 'Country Hits'); define ( '_AM_BY_COUNTRY', 'Country / City'); define ( '_AM_BY_REF', 'Visits by Referee'); -define ( '_AM_BY_HOUR', 'In Time'); +define ( '_AM_BY_HOUR', 'Time'); define ( '_AM_BY_PAGE', 'Pages'); define ( '_AM_BY_MODULE', 'Modules'); define ( '_AM_BY_BROWSER', 'Browser'); -define ( '_AM_BY_OS', 'System exploitation '); +define ( '_AM_BY_OS', 'Operating System'); define ( '_AM_BY_HOST', 'Hostname'); -define ( '_AM_FORECAST', 'Forecasting Day'); +define ( '_AM_FORECAST', 'Day Forcast'); // text of summary define ( '_AM_STATS_INFO', 'Description'); define ( '_AM_SITENAME', 'Website'); define ( '_AM_NOW', 'Today'); -define ( '_AM_MAX_DATE', 'Better Date'); -define ( '_AM_MAX_DAYCOUNT', 'Best Day Tours'); +define ( '_AM_MAX_DATE', 'Best Day'); +define ( '_AM_MAX_DAYCOUNT', 'Best Day Hits'); define ( '_AM_MAX_WEEK', 'Best Week'); -define ( '_AM_MAX_WEEKCOUNT', 'Best Hits of the Week'); +define ( '_AM_MAX_WEEKCOUNT', 'Best Week Hits'); define ( '_AM_MAX_MTH', 'Best Month'); -define ( '_AM_MAX_MTHCOUNT', 'Hits Best Month'); +define ( '_AM_MAX_MTHCOUNT', 'Best Month Hits'); define ( '_AM_TOTAL_DAYS', 'Total Days'); define ( '_AM_TOTAL_VISITS', 'Total Hits'); -define ( '_AM_TODAY', 'Visitors Today \' s'); -define ( '_AM_THIS_WEEK', 'Visitors this week'); -define ( '_AM_THIS_MTH', 'visitors this month'); -define ( '_AM_AVE_HOUR', 'Hits Average per hour'); -define ( '_AM_AVE_DAY', 'Hits Average per day'); -define ( '_AM_AVE_WEEK', 'Hits Average per week'); -define ( '_AM_AVE_MTH', 'visits per month'); -define ( '_AM_PER_HOUR', 'visits per hour'); +define ( '_AM_TODAY', 'Visitors Today'); +define ( '_AM_THIS_WEEK', 'Visitors this Week'); +define ( '_AM_THIS_MTH', 'Visitors this Month'); +define ( '_AM_AVE_HOUR', 'Average Hits per hour'); +define ( '_AM_AVE_DAY', 'Average Hits per day'); +define ( '_AM_AVE_WEEK', 'Average Hits per week'); +define ( '_AM_AVE_MTH', 'Average Hits per month'); +define ( '_AM_PER_HOUR', 'Visits per hour'); // text of "Visits by day" section define ( '_AM_DATE_DATE', 'Date'); @@ -106,7 +106,7 @@ define ( '_AM_BRO_BRO', 'Browser'); // text of "OS" section -define ( '_AM_OS_OS', 'System exploitation '); +define ( '_AM_OS_OS', 'Operating System'); // Text of "Screen Width" section define ( '_AM_SW_SW', 'Screen Resolution'); @@ -119,14 +119,14 @@ define ( '_AM_HOST_IP', 'IP only'); // Text of "Forecast for today" section -define ( 'AM_AVE', 'average'); +define ( 'AM_AVE', 'An average'); define ( 'AM_DAILY_VISIT', 'visits take place before'); define ( 'AM_BAS_NBR', 'Based on a number of'); define ( 'AM_SO_FAR', 'visitors at the moment, your site should achieve'); define ( 'AM_PAGE_VIEW', 'page (s) found (s ).'); // perm -define ( "_AM_QUERYNOPERM", "You do not have permission for this action efectua"); +define ( "_AM_QUERYNOPERM", "You do not have permission for this action"); //Version 1.6 define('_AM_VIEW', 'View the row'); Modified: XoopsModules/TDMStats/trunk/TDMStats/language/english/modinfo.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/language/english/modinfo.php 2012-05-28 07:45:53 UTC (rev 9594) +++ XoopsModules/TDMStats/trunk/TDMStats/language/english/modinfo.php 2012-05-28 09:52:59 UTC (rev 9595) @@ -38,7 +38,7 @@ define ( "_MI_ISTATS_COOKIE_MENU", "Config Cookie"); define ( "_MI_ISTATS_DATE", "Date format"); -define ( "_MI_ISTATS_PIE", "Format of the cheese:"); +define ( "_MI_ISTATS_PIE", "Format of the chart:"); define ( "_MI_ISTATS_PIE_3D", "3D"); define ( "_MI_ISTATS_PIE_SIMPLE", "Simple"); define ( "_MI_ISTATS_DATE_DESC", "Choose between the date format <b> EN </ b> (d / m / YG: i) or the date format <b> U.S. </ b> (Y / n / dg: ia) "); @@ -55,6 +55,6 @@ define("_MI_ISTATS_ONGLET","Style Tabs:"); // -define("_MI_ISTATS_MAXLABEL","View label cheese :"); -define("_MI_ISTATS_MAXTITLE","Show title cheeses :"); +define("_MI_ISTATS_MAXLABEL","View chart label:"); +define("_MI_ISTATS_MAXTITLE","Show chart title:"); ?> \ 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-05-28 21:42:47
|
Revision: 9597 http://xoops.svn.sourceforge.net/xoops/?rev=9597&view=rev Author: beckmi Date: 2012-05-28 21:42:40 +0000 (Mon, 28 May 2012) Log Message: ----------- Updating install.txt and English language entries Modified Paths: -------------- XoopsModules/TDMStats/trunk/TDMStats/docs/install.txt XoopsModules/TDMStats/trunk/TDMStats/include/stats.php XoopsModules/TDMStats/trunk/TDMStats/language/english/admin.php XoopsModules/TDMStats/trunk/TDMStats/language/english/main.php Modified: XoopsModules/TDMStats/trunk/TDMStats/docs/install.txt =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/docs/install.txt 2012-05-28 14:24:53 UTC (rev 9596) +++ XoopsModules/TDMStats/trunk/TDMStats/docs/install.txt 2012-05-28 21:42:40 UTC (rev 9597) @@ -1,6 +1,43 @@ -INSTALL/UNISTALL -================= -No special measures necessary, follow the standard installation process \x96 extract the /TDMStats folder into the ../modules directory. Install the module through Admin -> System Module -> Modules. +************************************************** ********** +UPDATE +************************************************** ********** -Detailed instructions on installing modules are available in the XOOPS Operations Manual (http://goo.gl/adT2i) \ No newline at end of file +- Overwrite the file TDMStats, to update the module from the site administration. +- When using a custom template set, remove the module's templates for regnrer. +- Use the tab admin / plugin for copying the plugin or refer you to the "manual copy" +- Appointments in the administration module To create permissions. + + +************************************************** ********** +INSTALLATION +************************************************** ********** + +- Upload the entire folder 'TDMStats' folder to / modules / +- Go to Admin of your site to install the module. +- Go to the Administration module, then use the tab 'plugin' to copy the plugin or refer you to the "manual copy". +- Set permissions. + + + +************************************************** ********** +Manually copy the files in the folder "xoops_plugins" +************************************************** ********** + +follow the structure of folders and subfolders + +function.xoStats.php (new file) + +Copy the file TDMStats/xoops_plugins/function.xoStats.php + +into + +/class/smarty/xoops_plugins/ + +************************************************** ********** +SMARTY TDMStats +************************************************** ********** + +1) <{xoStats}> (account visits) + +Note: Remember to copy the code "<{xoStats}>" to theme.html in your theme in order to record the visits ... \ No newline at end of file Modified: XoopsModules/TDMStats/trunk/TDMStats/include/stats.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/include/stats.php 2012-05-28 14:24:53 UTC (rev 9596) +++ XoopsModules/TDMStats/trunk/TDMStats/include/stats.php 2012-05-28 21:42:40 UTC (rev 9597) @@ -105,6 +105,38 @@ +///mont/// +$mth = array(); + global $xoopsDB; + $mth_info = getResult("select distinct mth, year, count from ".$xoopsDB->prefix("TDMStats_mth")." where year='$year' order by id desc"); + //$mth_max = getResult("select max(count) as max from ".$xoopsDB->prefix("TDMStats_mth")." where year='$year'"); + $mth_sum = getREsult("select sum(count) as sum from ".$xoopsDB->prefix("TDMStats_mth")." where year='$year'"); + + +// $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++){ + + if ($mth_sum[0]['sum'] > 0) { + + $mth_percent = $mth_info[$i]['count'] * 100 / $mth_sum[0]['sum'] ; + + } else { + $mth_percent = 0; + + } + + $mth['info'][] = $mth_info[$i]['count']; + //$mth['week'][] = $mth_info[$i]['week']; + $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'))); + } + } + } + //////WEEK///////////// $last = array(); global $xoopsDB; @@ -141,40 +173,8 @@ $xoopsTpl->assign('lang_mth_mth', _AM_MTH_VISITS); - -///mont/// -$mth = array(); - global $xoopsDB; - $mth_info = getResult("select distinct mth, year, count from ".$xoopsDB->prefix("TDMStats_mth")." where year='$year' order by id desc"); - //$mth_max = getResult("select max(count) as max from ".$xoopsDB->prefix("TDMStats_mth")." where year='$year'"); - $mth_sum = getREsult("select sum(count) as sum from ".$xoopsDB->prefix("TDMStats_mth")." where year='$year'"); - -// $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++){ - - if ($mth_sum[0]['sum'] > 0) { - - $mth_percent = $mth_info[$i]['count'] * 100 / $mth_sum[0]['sum'] ; - - } else { - $mth_percent = 0; - - } - - $mth['info'][] = $mth_info[$i]['count']; - //$mth['week'][] = $mth_info[$i]['week']; - $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'))); - } - } - } - /////////////HOUR $hour = array(); global $xoopsDB; Modified: XoopsModules/TDMStats/trunk/TDMStats/language/english/admin.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/language/english/admin.php 2012-05-28 14:24:53 UTC (rev 9596) +++ XoopsModules/TDMStats/trunk/TDMStats/language/english/admin.php 2012-05-28 21:42:40 UTC (rev 9597) @@ -33,7 +33,7 @@ define ( "_AM_ISTATS_UPDATED", "File updated config.php"); // index.php -define ( "_AM_ISTATS_INDEXDESC", "module index"); +define ( "_AM_ISTATS_INDEXDESC", "Module index"); define ( "_AM_ISTATS_TABLE", "Table Name"); define ( "_AM_ISTATS_LENGTH", "Size of data file"); define ( "_AM_ISTATS_FREE", "Lost space"); @@ -46,13 +46,13 @@ define ( "_AM_ISTATS_ABOUT", "About the Module"); define ( "_AM_ISTATS_UPDATE", "Update Module"); define ( "_AM_ISTATS_PERM", "Managing Permissions"); -define ( '_AM_ISTATS_PLUG', 'Plugin Management'); +define ( '_AM_ISTATS_PLUG', 'Management Plugin'); // plug.php -define ( '_AM_ISTATS_PLUGHELP', '<b> Note: </ b> Remember to copy the code "<b> <xoStats ()> </ b>" in the file of your theme theme.html underway to account for visits ...'); +define ( '_AM_ISTATS_PLUGHELP', "<b> Note: </b> Remember to copy the code '<b> <{xoStats}> </b>' to the theme.html file of your current theme after the '<b> < body ></b>' tag, to record visits ..."); define ( '_AM_ISTATS_PLUGERROR', 'Please copy the file "xoops_plugins / function.xoStats.php" in your site root, "/ class / smarty / xoops_plugins /"'); define ( '_AM_ISTATS_PLUGOK', 'Plugin installed'); -define ( '_AM_ISTATS_PLUGETAT', 'State of the plugin'); +define ( '_AM_ISTATS_PLUGETAT', 'Plugin status'); // About (about.php) define ( "_AM_ABOUT_RELEASEDATE", "Release Date"); Modified: XoopsModules/TDMStats/trunk/TDMStats/language/english/main.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/language/english/main.php 2012-05-28 14:24:53 UTC (rev 9596) +++ XoopsModules/TDMStats/trunk/TDMStats/language/english/main.php 2012-05-28 21:42:40 UTC (rev 9597) @@ -21,14 +21,14 @@ // text of top head define ( '_AM_TRAFFIC_REPORT', 'Traffic Report Site'); -define ( '_AM_SUMMARY', 'Description'); +define ( '_AM_SUMMARY', 'Summary'); define ( '_AM_REFERER', 'References'); define ( '_AM_VISITOR_INFO', 'System'); define ( '_AM_TRAFFIC', 'Traffic Stats'); define ( '_AM_LOCA', 'Location'); // text of stats topic -define ( '_AM_BY_TODAY_HOUR', 'Traffic Graph of the Day'); +define ( '_AM_BY_TODAY_HOUR', 'Traffic Graph of Today'); define ( '_AM_BY_DAY', 'Days of the Month'); define ( '_AM_BY_WEEKDAY', 'Days of the Week'); define ( '_AM_BY_WEEK', 'Weekly'); @@ -36,16 +36,16 @@ define ( '_AM_BY_PAYS', 'Country Hits'); define ( '_AM_BY_COUNTRY', 'Country / City'); define ( '_AM_BY_REF', 'Visits by Referee'); -define ( '_AM_BY_HOUR', 'Time'); +define ( '_AM_BY_HOUR', 'Hourly'); define ( '_AM_BY_PAGE', 'Pages'); define ( '_AM_BY_MODULE', 'Modules'); define ( '_AM_BY_BROWSER', 'Browser'); define ( '_AM_BY_OS', 'Operating System'); define ( '_AM_BY_HOST', 'Hostname'); -define ( '_AM_FORECAST', 'Day Forcast'); +define ( '_AM_FORECAST', "Today's Forcast"); // text of summary -define ( '_AM_STATS_INFO', 'Description'); +define ( '_AM_STATS_INFO', 'Overview'); define ( '_AM_SITENAME', 'Website'); define ( '_AM_NOW', 'Today'); define ( '_AM_MAX_DATE', 'Best Day'); @@ -122,8 +122,8 @@ define ( 'AM_AVE', 'An average'); define ( 'AM_DAILY_VISIT', 'visits take place before'); define ( 'AM_BAS_NBR', 'Based on a number of'); -define ( 'AM_SO_FAR', 'visitors at the moment, your site should achieve'); -define ( 'AM_PAGE_VIEW', 'page (s) found (s ).'); +define ( 'AM_SO_FAR', 'visitors at the moment, your site should reach'); +define ( 'AM_PAGE_VIEW', 'page views.'); // perm define ( "_AM_QUERYNOPERM", "You do not have permission for this action"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2012-06-27 22:46:21
|
Revision: 9733 http://xoops.svn.sourceforge.net/xoops/?rev=9733&view=rev Author: beckmi Date: 2012-06-27 22:46:13 +0000 (Wed, 27 Jun 2012) Log Message: ----------- fixing bugs reported by Cesag updating to 1.08 RC Modified Paths: -------------- XoopsModules/TDMStats/trunk/TDMStats/admin/admin_footer.php XoopsModules/TDMStats/trunk/TDMStats/docs/changelog.txt XoopsModules/TDMStats/trunk/TDMStats/docs/readme.txt XoopsModules/TDMStats/trunk/TDMStats/include/stats.php XoopsModules/TDMStats/trunk/TDMStats/xoops_version.php Modified: XoopsModules/TDMStats/trunk/TDMStats/admin/admin_footer.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/admin/admin_footer.php 2012-06-27 20:16:21 UTC (rev 9732) +++ XoopsModules/TDMStats/trunk/TDMStats/admin/admin_footer.php 2012-06-27 22:46:13 UTC (rev 9733) @@ -1,6 +1,6 @@ <?php 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>"; xoops_cp_footer(); \ No newline at end of file Modified: XoopsModules/TDMStats/trunk/TDMStats/docs/changelog.txt =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/docs/changelog.txt 2012-06-27 20:16:21 UTC (rev 9732) +++ XoopsModules/TDMStats/trunk/TDMStats/docs/changelog.txt 2012-06-27 22:46:13 UTC (rev 9733) @@ -1,5 +1,10 @@ ************************************************************ TDM : TDMStats +Version 1.08 | 2012-06-27 +************************************************************ +- fixing bugs reported by Cesag (mamba) +************************************************************ +TDM : TDMStats Version 1.07 | 12-05-2012 Dev: 2.2.4 ************************************************************ Modified: XoopsModules/TDMStats/trunk/TDMStats/docs/readme.txt =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/docs/readme.txt 2012-06-27 20:16:21 UTC (rev 9732) +++ XoopsModules/TDMStats/trunk/TDMStats/docs/readme.txt 2012-06-27 22:46:13 UTC (rev 9733) @@ -9,7 +9,7 @@ ************************************************** ********** - Overwrite the file TDMStats, to update the module from the site administration. -- When using a custom template set, remove the module's templates for regnrer. +- When using a custom template set, remove the module's templates for regeneration. - Use the tab admin / plugin for copying the plugin or refer you to the "manual copy" - Appointments in the administration module To create permissions. Modified: XoopsModules/TDMStats/trunk/TDMStats/include/stats.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/include/stats.php 2012-06-27 20:16:21 UTC (rev 9732) +++ XoopsModules/TDMStats/trunk/TDMStats/include/stats.php 2012-06-27 22:46:13 UTC (rev 9733) @@ -108,6 +108,7 @@ ///mont/// $mth = array(); global $xoopsDB; +$year = formatTimeStamp(time(), 'Y'); $mth_info = getResult("select distinct mth, year, count from ".$xoopsDB->prefix("TDMStats_mth")." where year='$year' order by id desc"); //$mth_max = getResult("select max(count) as max from ".$xoopsDB->prefix("TDMStats_mth")." where year='$year'"); $mth_sum = getREsult("select sum(count) as sum from ".$xoopsDB->prefix("TDMStats_mth")." where year='$year'"); @@ -140,7 +141,7 @@ //////WEEK///////////// $last = array(); global $xoopsDB; - $year = formatTimeStamp(time(), 'Y'); + //$year = formatTimeStamp(time(), 'Y'); $last_info = getResult("select distinct week, year, count from ".$xoopsDB->prefix("TDMStats_week_count")." where year='$year' order by id desc"); //$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'"); Modified: XoopsModules/TDMStats/trunk/TDMStats/xoops_version.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/xoops_version.php 2012-06-27 20:16:21 UTC (rev 9732) +++ XoopsModules/TDMStats/trunk/TDMStats/xoops_version.php 2012-06-27 22:46:13 UTC (rev 9733) @@ -20,7 +20,7 @@ */ $modversion['name'] = "TDMStats"; -$modversion['version'] = "1.07"; +$modversion['version'] = "1.08"; $modversion['description'] = _MI_ISTATS_DESC; $modversion['author'] = 'Original module: Paul Cooke (alias Scripter)<br /><b>Adaptation/rewrite: TDM.</b>'; @@ -47,7 +47,7 @@ $modversion['release_date'] = '2012/05/12'; $modversion["module_website_url"] = "http://www.xoops.org/"; $modversion["module_website_name"] = "XOOPS"; -$modversion["module_status"] = "Final"; +$modversion["module_status"] = "RC"; $modversion['min_php'] = '5.2'; $modversion['min_xoops'] = "2.5"; $modversion['min_admin'] = '1.1'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lor...@us...> - 2012-07-12 18:06:41
|
Revision: 9857 http://xoops.svn.sourceforge.net/xoops/?rev=9857&view=rev Author: lord_venom Date: 2012-07-12 18:06:34 +0000 (Thu, 12 Jul 2012) Log Message: ----------- news version. Modified Paths: -------------- XoopsModules/TDMStats/trunk/TDMStats/include/summary.php XoopsModules/TDMStats/trunk/TDMStats/index.php XoopsModules/TDMStats/trunk/TDMStats/language/english/modinfo.php XoopsModules/TDMStats/trunk/TDMStats/language/french/main.php XoopsModules/TDMStats/trunk/TDMStats/language/french/modinfo.php XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_index.html XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_summary.html XoopsModules/TDMStats/trunk/TDMStats/xoops_version.php Added Paths: ----------- XoopsModules/TDMStats/trunk/TDMStats/css/styles.css XoopsModules/TDMStats/trunk/TDMStats/images/calender.png XoopsModules/TDMStats/trunk/TDMStats/images/resume.png XoopsModules/TDMStats/trunk/TDMStats/images/tip.png Added: XoopsModules/TDMStats/trunk/TDMStats/css/styles.css =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/css/styles.css (rev 0) +++ XoopsModules/TDMStats/trunk/TDMStats/css/styles.css 2012-07-12 18:06:34 UTC (rev 9857) @@ -0,0 +1,105 @@ +.ui-tabs .ui-tabs-nav li.ui-state-active { + cursor: text; + color: #666; + border-bottom: 1px solid #fff; +} +.ui-tabs .ui-tabs-nav li.ui-tabs-selected a { + + background: #fff; +} +.ui-tabs .ui-tabs-nav li a, +.ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { + float:right; + cursor: pointer; + padding:10px; +} + + +.ui-tabs .ui-tabs-panel { + display: block; + border-top: none; + overflow: hidden; + clear: both; + background: #fff; + margin: 0; + padding: 10px 10px 0; + font-family: "Trebuchet MS"; + font-size: 14px; +} + +.ui-tabs .ui-tabs-hide { + display: none !important; +} + + ul#tree_menu { + margin: 0 auto; + padding:0 auto; + text-align: center; + width:100%; + + } + ul#tree_menu li { + list-style: none; + float:left; + width:97%; + height: 130px; + overflow:hidden; + margin: 10px; padding: 0px; + -webkit-border-radius: 4px; + border-radius: 4px; + border: 2px solid white; + /* background: whiteSmoke url(../images/decos/downloads-bg.gif) repeat-x left top; */ + -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4); + overflow: auto; + } + ul#tree_menu img { + float:left; + padding-left:20px; + padding-right:20px; + padding-top:10px; + width:80px; + height:80px; + } + + ul#tree_menu h2{ + left:0; + text-align:left; +padding-top:10px; +padding-bottom:5px; + } + + ul#tree_menu div{ + float:left; + + } + #tdmstats_text, ul#tree_menu #tree_text { + font-size: 13px; + font-weight: normal; +color: #728DA9; +text-shadow: 0 1px 0 white; +line-height: 20px; +} + + #tdmstats_num, #tdmstats_num a, ul#tree_menu #tree_num{ + text-align: center; + font-weight: normal; +font-size: 11px; +color: #25587C; +text-shadow: 0 1px 0 white; + + } + #tdmstats_num a{ + font-weight: bold; + } + + ul#tree_menu #tree_form{ + float:right; + padding-top:100px; + padding-right:20px; + text-align: center; +font-size: 11px; +color: #25587C; +font-weight: bold; +text-shadow: 0 1px 0 white; + + } \ No newline at end of file Added: XoopsModules/TDMStats/trunk/TDMStats/images/calender.png =================================================================== (Binary files differ) Property changes on: XoopsModules/TDMStats/trunk/TDMStats/images/calender.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: XoopsModules/TDMStats/trunk/TDMStats/images/resume.png =================================================================== (Binary files differ) Property changes on: XoopsModules/TDMStats/trunk/TDMStats/images/resume.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: XoopsModules/TDMStats/trunk/TDMStats/images/tip.png =================================================================== (Binary files differ) Property changes on: XoopsModules/TDMStats/trunk/TDMStats/images/tip.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: XoopsModules/TDMStats/trunk/TDMStats/include/summary.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/include/summary.php 2012-07-12 14:50:26 UTC (rev 9856) +++ XoopsModules/TDMStats/trunk/TDMStats/include/summary.php 2012-07-12 18:06:34 UTC (rev 9857) @@ -131,14 +131,30 @@ } $xoopsTpl->assign('cur_percent', sprintf ("%.0f", $cur_percent)); $curvisits = $cur_visits[0]['daycount']; +//heure item + $hour_info = getResult("select * from ".$xoopsDB->prefix("TDMStats_today_hour")." order by count DESC LIMIT 3"); + //$total_hour = getResult("select SUM(count) AS sum from ".$xoopsDB->prefix("TDMStats_today_hour").""); + if($hour_info){ + for($i=0; $i<sizeof($hour_info); $i++){ + if($hour_info[$i]['count'] > 0) { + $hour['info'][] = $hour_info[$i]['count']; + $hour['hour'][] = $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_info = getResult("select * from ".$xoopsDB->prefix("TDMStats_today_hour")." order by hour"); $total_hour = getResult("select SUM(count) AS sum from ".$xoopsDB->prefix("TDMStats_today_hour").""); - if($hour_info){ + if($hour_info){ for($i=0; $i<sizeof($hour_info); $i++){ if($total_hour[0]['sum'] > 0){ - $hour_percent = $hour_info[$i]['count'] * 100 / $total_hour[0]['sum'] ; + $hour_percent = $hour_info[$i]['count'] * 100 / $total_hour[0]['sum'] ; // 4*100/62,5 =6,4% }else{ $hour_percent = 0; @@ -151,8 +167,10 @@ 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_map', array('id' => 'hour'.$i, 'hour' => $hour_info[$i]['hour'], 'info' => $hour_info[$i]['count'], 'percent' => round($hour_percent, '2'))); + } } + } Modified: XoopsModules/TDMStats/trunk/TDMStats/index.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/index.php 2012-07-12 14:50:26 UTC (rev 9856) +++ XoopsModules/TDMStats/trunk/TDMStats/index.php 2012-07-12 18:06:34 UTC (rev 9857) @@ -20,8 +20,10 @@ */ include_once "../../mainfile.php"; +require(XOOPS_ROOT_PATH.'/header.php'); + include_once('include/function.php'); -include_once('include/GphpChart.class.php'); +//include_once('include/GphpChart.class.php'); $gperm_handler =& xoops_gethandler('groupperm'); //permission if (is_object($xoopsUser)) { @@ -30,8 +32,13 @@ $groups = XOOPS_GROUP_ANONYMOUS; } +define("TDMSTATS_DIRNAME", $xoopsModule->getVar("dirname")); +define("TDMSTATS_URL", XOOPS_URL . '/modules/' . TDMSTATS_DIRNAME); +define("TDMSTATS_IMAGES_URL", TDMSTATS_URL . '/images'); -$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : "list"; + +$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : 1; + switch($action) { case "3": @@ -54,6 +61,7 @@ include_once XOOPS_ROOT_PATH."/header.php"; +// pour les permissions $perm_4 = ($gperm_handler->checkRight('istats_view', 4, $groups, $xoopsModule->getVar('mid'))) ? true : false ; $perm_8 = ($gperm_handler->checkRight('istats_view', 8, $groups, $xoopsModule->getVar('mid'))) ? true : false ; $perm_16 = ($gperm_handler->checkRight('istats_view', 16, $groups, $xoopsModule->getVar('mid'))) ? true : false ; @@ -81,7 +89,7 @@ //include script $xoTheme->addScript(XOOPS_URL."/modules/".$xoopsModule->dirname()."/js/jquery.js"); $xoTheme->addScript(XOOPS_URL."/modules/".$xoopsModule->dirname()."/js/jquery-ui-1.7.2.custom.min.js"); -$xoTheme->addStylesheet(XOOPS_URL."/modules/".$xoopsModule->dirname()."/css/".$tdmstats_style."/jquery-ui-1.7.2.custom.css"); -// +//$xoTheme->addStylesheet(XOOPS_URL."/modules/".$xoopsModule->dirname()."/css/".$tdmstats_style."/jquery-ui-1.7.2.custom.css"); +$xoTheme->addStylesheet( XOOPS_URL."/modules/".$xoopsModule->dirname()."/css/styles.css"); include_once XOOPS_ROOT_PATH."/footer.php"; ?> \ No newline at end of file Modified: XoopsModules/TDMStats/trunk/TDMStats/language/english/modinfo.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/language/english/modinfo.php 2012-07-12 14:50:26 UTC (rev 9856) +++ XoopsModules/TDMStats/trunk/TDMStats/language/english/modinfo.php 2012-07-12 18:06:34 UTC (rev 9857) @@ -57,4 +57,8 @@ // define("_MI_ISTATS_MAXLABEL","View chart label:"); define("_MI_ISTATS_MAXTITLE","Show chart title:"); +// +define('_MI_ISTATS_SUMMARY', 'Sum'); +define('_MI_ISTATS_SYSTEM', 'System'); +define('_MI_ISTATS_TRAFFIC', 'Traffic stats'); ?> \ 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-12 14:50:26 UTC (rev 9856) +++ XoopsModules/TDMStats/trunk/TDMStats/language/french/main.php 2012-07-12 18:06:34 UTC (rev 9857) @@ -98,9 +98,10 @@ define('_AM_WD_7', 'Dimanche'); // text of "Visits by pages" section -define('_AM_P_VISITS', 'Visite'); +define('_AM_P_VISITS', 'Visite(s)'); define('_AM_P_PERCENT', 'Pourcentage'); define('_AM_P_PAGE', 'Pages Totales'); +define('_AM_P_A', 'A'); // text of "Browser" section define('_AM_BRO_BRO', 'Navigateur'); @@ -122,7 +123,8 @@ define('AM_AVE', 'En moyenne'); define('AM_DAILY_VISIT', 'des visites ont lieu avant'); define('AM_BAS_NBR', 'Basé sur un nombre de'); -define('AM_SO_FAR', 'visiteurs pour le moment, votre site devrait atteindre'); +define('AM_SO_FAR', 'visiteurs pour le moment.'); +define('AM_SO_FARE', 'Votre site devrait atteindre'); define('AM_PAGE_VIEW', 'page(s) consultée(s).'); //perm Modified: XoopsModules/TDMStats/trunk/TDMStats/language/french/modinfo.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/language/french/modinfo.php 2012-07-12 14:50:26 UTC (rev 9856) +++ XoopsModules/TDMStats/trunk/TDMStats/language/french/modinfo.php 2012-07-12 18:06:34 UTC (rev 9857) @@ -58,4 +58,8 @@ define("_MI_ISTATS_MAXTITLE","Afficher le titre des fromages :"); //version 1.6 define("_MI_ISTATS_BAR","Style de la barre:"); +// +define('_MI_ISTATS_SUMMARY', 'Résumé'); +define('_MI_ISTATS_SYSTEM', 'Système'); +define('_MI_ISTATS_TRAFFIC', 'Stats du Trafic '); ?> Modified: XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_index.html =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_index.html 2012-07-12 14:50:26 UTC (rev 9856) +++ XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_index.html 2012-07-12 18:06:34 UTC (rev 9857) @@ -64,23 +64,21 @@ } </script> <br /> -<div align="right"> -<select onchange="if(this.options[this.selectedIndex].value.length >0 ) { window.document.location=this.options[this.selectedIndex].value;}"> - <option value=""><{$lang_traffic_report}></option> - <option value="">--------</option> - <option value="index.php?action=1"><{$lang_summary}></option> - <option value="index.php?action=2"><{$lang_traffic}></option> - <option value="">--------</option> - <option value="index.php?action=3"><{$lang_visitor_info}></option> - <option value="">--------</option> - </select> -</div> <{if $show_index}> <br /> <h2><{$smarty.const._AM_TRAFFIC_REPORT}></h2> <hr> <br /> +<table cellpadding="0" id="masque_1" cellspacing="0" style="margin:5px;"><tr><td><ul id="tree_menu"> + +<li style="width:47%;" class="even"><div><img src="<{$smarty.const.TDMSTATS_IMAGES_URL}>/resum.png" title="<{$smarty.const._AM_SUMMARY}>"><br/></div><div><h2><a href ="index.php?action=1" title="<{$smarty.const._AM_SUMMARY}>"><{$smarty.const._AM_SUMMARY}></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">go win</div></li> + +<br style="clear: both;" /></ul></td></tr></table><br /> + <div align="center"> <{if $perm_4}> <div style="float:left; text-align:center; width:30%; padding:10px;" class="outer"><a href="index.php?action=1"><img src="./images/resum.png" title="<{$smarty.const._AM_SUMMARY}>"></a><br /><a href="index.php?action=1"><{$smarty.const._AM_SUMMARY}></a></div> Modified: XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_summary.html =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_summary.html 2012-07-12 14:50:26 UTC (rev 9856) +++ XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_summary.html 2012-07-12 18:06:34 UTC (rev 9857) @@ -5,7 +5,30 @@ }); </script> +<table cellpadding="0" id="masque_1" cellspacing="0" style="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 ="'.$cat_link.'" title="<{$smarty.const._AM_STATS_INFO}>"><{$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">go win</div></li> +<li style="width:47%;" class="even"><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> +<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 ="'.$cat_link.'" title="<{$lang_forecast}>"><{$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 /> + <{/foreach}> + +</div></div><div id="tree_form">go win</div></li> + +<br style="clear: both;" /></ul></td></tr></table><br /> + + <div id="tabs"> <ul> <li style="list-style-type: none;"><a href="#stats"><{$smarty.const._AM_STATS_INFO}></a></li> @@ -13,7 +36,7 @@ <li style="list-style-type: none;"><a href="#hour"><{$smarty.const._AM_BY_TODAY_HOUR}></a></li> <li style="list-style-type: none;"><a href="#ref"><{$smarty.const._AM_BY_REF}></a></li> <li style="list-style-type: none;"><a href="#pays"><{$smarty.const._AM_BY_PAYS}></a></li> - </ul> + </ul><br style="clear: both;" /> <div id="stats"> Modified: XoopsModules/TDMStats/trunk/TDMStats/xoops_version.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/xoops_version.php 2012-07-12 14:50:26 UTC (rev 9856) +++ XoopsModules/TDMStats/trunk/TDMStats/xoops_version.php 2012-07-12 18:06:34 UTC (rev 9857) @@ -108,6 +108,12 @@ // Menu $modversion['hasMain'] = 1; +$modversion['sub'][1]['name'] = _MI_ISTATS_SUMMARY; +$modversion['sub'][1]['url'] = "index.php?action=1"; +$modversion['sub'][2]['name'] = _MI_ISTATS_SYSTEM; +$modversion['sub'][2]['url'] = "index.php?action=2"; +$modversion['sub'][3]['name'] = _MI_ISTATS_TRAFFIC; +$modversion['sub'][3]['url'] = "index.php?action=3"; // Search $modversion['hasSearch'] = 0; @@ -164,14 +170,14 @@ //$modversion['config'][5]['options'] = array('cupertino' => 'cupertino', 'lightness' => 'lightness', 'darkness' => 'darkness', 'smoothness' => 'smoothness', 'start' => 'start', 'redmond' => 'redmond', 'sunny' => 'sunny', 'pepper' => 'pepper', 'eggplant' => 'eggplant' , // '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"; +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"; ?> \ 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-13 19:09:50
|
Revision: 9862 http://xoops.svn.sourceforge.net/xoops/?rev=9862&view=rev Author: lord_venom Date: 2012-07-13 19:09:43 +0000 (Fri, 13 Jul 2012) Log Message: ----------- news design Modified Paths: -------------- XoopsModules/TDMStats/trunk/TDMStats/counter.php XoopsModules/TDMStats/trunk/TDMStats/include/summary.php XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_index.html XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_stats.html XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_summary.html Modified: XoopsModules/TDMStats/trunk/TDMStats/counter.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/counter.php 2012-07-13 16:07:40 UTC (rev 9861) +++ XoopsModules/TDMStats/trunk/TDMStats/counter.php 2012-07-13 19:09:43 UTC (rev 9862) @@ -42,7 +42,7 @@ * @feature * Keeps total count of pages served, including refreshes and revisits */ -$page = $_REQUEST['page']; + $page = $_REQUEST['page']; if ($page != "") { $check_page = getResult("SELECT * FROM ".XOOPS_DB_PREFIX."_TDMStats_page WHERE page='$page'"); Modified: XoopsModules/TDMStats/trunk/TDMStats/include/summary.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/include/summary.php 2012-07-13 16:07:40 UTC (rev 9861) +++ XoopsModules/TDMStats/trunk/TDMStats/include/summary.php 2012-07-13 19:09:43 UTC (rev 9862) @@ -165,7 +165,7 @@ $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'))); } @@ -179,6 +179,25 @@ $ref['percent'][] = 0; $ref['color'][] = 0; $max = $xoopsModuleConfig['maxpage']; + + $ref_info = getResult("select * from ".$xoopsDB->prefix("TDMStats_referer")." order by count DESC LIMIT 3"); + //$total_hour = getResult("select SUM(count) AS sum from ".$xoopsDB->prefix("TDMStats_today_hour").""); + + 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']); + $ref['info'][] = $ref_info[$i]['count']; + //$hour['percent'][] = round($hour_percent, '2'); + + $xoopsTpl->append('item_refs', array('id' => 'ref'.$i, 'info' => $ref_info[$i]['count'], 'url' => $url)); +} + } + + } + + + $ref_info = getResult("select distinct url, count from ".$xoopsDB->prefix("TDMStats_referer")." order by count desc limit $max"); $ref_total = getResult("select SUM(count) AS sum from ".$xoopsDB->prefix("TDMStats_referer").""); for ($i = 0; $i < sizeof($ref_info); $i++) { @@ -191,19 +210,34 @@ } $ref['info'][] = $ref_info[$i]['count']; - $ref['ref'][] = (strlen($ref_info[$i]['url']) > 50 ? substr($ref_info[$i]['url'],0,(50))."..." : $ref_info[$i]['url']); + //$ref['ref'][] = (strlen($ref_info[$i]['url']) > 50 ? substr($ref_info[$i]['url'],0,(50))."..." : $ref_info[$i]['url']); $title = $ref_info[$i]['url']; $url = (strlen($ref_info[$i]['url']) > 50 ? substr($ref_info[$i]['url'],0,(50))."..." : $ref_info[$i]['url']); $ref['percent'][] = round($ref_percent, '2'); if ($ref_percent > 0) { - $xoopsTpl->append('refs', array('id' => 'ref'.$i, 'ref' => $url, 'title' => $title, 'info' => $ref_info[$i]['count'], 'percent' => round($ref_percent, '2'))); + //$xoopsTpl->append('refs', array('id' => 'ref'.$i, 'ref' => $url, 'title' => $title, 'info' => $ref_info[$i]['count'], 'percent' => round($ref_percent, '2'))); $xoopsTpl->append('refs_map', array('id' => 'ref'.$i, 'ref' => $url, 'title' => $title, 'info' => $ref_info[$i]['count'], 'percent' => round($ref_percent, '2'))); } } +///////////PAYSSS + $pays_info = getResult("select * from ".$xoopsDB->prefix("TDMStats_pays")." order by count DESC LIMIT 3"); + //$total_hour = getResult("select SUM(count) AS sum from ".$xoopsDB->prefix("TDMStats_today_hour").""); -///////////PAYSSS + if($pays_info){ + for($i=0; $i<sizeof($pays_info); $i++){ + if($pays_info[$i]['count'] > 0) { + $pays['country'][] = $pays_info[$i]['country']; + $pays['info'][] = $pays_info[$i]['count']; + //$hour['percent'][] = round($hour_percent, '2'); + + $xoopsTpl->append('item_pays', array('id' => 'pay'.$i, 'info' => $pays_info[$i]['count'], 'country' => $pays_info[$i]['country'],)); +} + } + + } + $max = $xoopsModuleConfig['maxpage']; $pays_info = getResult("select distinct country, pays, count from ".$xoopsDB->prefix("TDMStats_pays")." order by count desc limit $max"); $pays_total = getResult("select SUM(count) AS sum from ".$xoopsDB->prefix("TDMStats_pays").""); @@ -230,7 +264,7 @@ //$pays['percent'][] = round($pays_percent, '2'); //print_r($maxcolor[$i]); if ($pays_percent > 0) { - $xoopsTpl->append('payss', array('id' => 'pays'.$i, 'flag' => $flag, 'country' => $pays_info[$i]['country'], 'pays' => $pays_info[$i]['pays'], 'info' => $pays_info[$i]['count'], 'percent' => round($pays_percent, '2'))); + //$xoopsTpl->append('payss', array('id' => 'pays'.$i, 'flag' => $flag, 'country' => $pays_info[$i]['country'], 'pays' => $pays_info[$i]['pays'], 'info' => $pays_info[$i]['count'], 'percent' => round($pays_percent, '2'))); $xoopsTpl->append('payss_map', array('id' => 'pays'.$i, 'flag' => $flag, 'country' => $pays_info[$i]['country'], 'pays' => $pays_info[$i]['pays'], 'info' => $pays_info[$i]['count'], 'percent' => round($pays_percent, '2'))); } } Modified: XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_index.html =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_index.html 2012-07-13 16:07:40 UTC (rev 9861) +++ XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_index.html 2012-07-13 19:09:43 UTC (rev 9862) @@ -53,8 +53,10 @@ }); } else { - $tdmstats("#masque_" +id).fadeOut("fast", function() { + $tdmstats("#masque_" +id).fadeOut("fast", function() { + $tdmstats("div[id^='masque']").fadeIn("fast").hide(); $tdmstats("#masque_" +id).fadeIn("fast").show(); + }); } Modified: XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_stats.html =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_stats.html 2012-07-13 16:07:40 UTC (rev 9861) +++ XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_stats.html 2012-07-13 19:09:43 UTC (rev 9862) @@ -4,7 +4,75 @@ $("#tabs").tabs(); }); </script> +<table cellpadding="0" id="masque_1" cellspacing="0" style="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> +<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}> + +</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="even"><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}> + +</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="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}> + +</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="even"><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}> + +</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="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 /> + <{/foreach}> + +</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="even"><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}> + +</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="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}> + +</div></div> +<div id="tree_form"><a href="javascript:;" onclick="javascript:masque('hour')" ><{$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> Modified: XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_summary.html =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_summary.html 2012-07-13 16:07:40 UTC (rev 9861) +++ XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_summary.html 2012-07-13 19:09:43 UTC (rev 9862) @@ -1,16 +1,12 @@ <{include file="db:TDMStats_index.html"}> -<script type="text/javascript"> - $(function() { - $("#tabs").tabs(); - }); - </script> <table cellpadding="0" id="masque_1" cellspacing="0" style="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 ="'.$cat_link.'" title="<{$smarty.const._AM_STATS_INFO}>"><{$smarty.const._AM_STATS_INFO}></h2></a> +<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> <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">go win</div></li> +<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="even"><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> <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>. @@ -18,32 +14,39 @@ <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 ="'.$cat_link.'" title="<{$lang_forecast}>"><{$smarty.const._AM_TODAY}></h2></a> +<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> <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}> -</div></div><div id="tree_form">go win</div></li> +</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="even"><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> +<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 /> +<{/foreach}> +</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> +<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 /> + <{/foreach}> + +</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 /> +<br style="clear: both;" /></ul></td></tr></table><br /> - -<div id="tabs"> - <ul> - <li style="list-style-type: none;"><a href="#stats"><{$smarty.const._AM_STATS_INFO}></a></li> - <li style="list-style-type: none;"><a href="#prevision"><{$smarty.const._AM_FORECAST}></a></li> - <li style="list-style-type: none;"><a href="#hour"><{$smarty.const._AM_BY_TODAY_HOUR}></a></li> - <li style="list-style-type: none;"><a href="#ref"><{$smarty.const._AM_BY_REF}></a></li> - <li style="list-style-type: none;"><a href="#pays"><{$smarty.const._AM_BY_PAYS}></a></li> - </ul><br style="clear: both;" /> - <div id="stats"> - + <div id="masque_resum" style="display: none;"> +<h2><{$lang_stats_info}></h2> <table width="100%" border="0" cellspacing="1" cellpadding="4" class="outer"> - <tr> - <th colspan="4" align="center"><{$lang_stats_info}></th> - </tr> <tr class="even"> <td align="center" width="28%"><{$lang_total_visits}></td> <td align="center" width="22%"><{$total}></td> @@ -97,126 +100,70 @@ </div> -<div id="prevision"> - - <table width="100%" border="0" cellspacing="1" cellpadding="4" class="outer"> - <tr> - <th align="center"><{$lang_forecast}></th> - </tr> - <tr class="even"> - <td align="center" class="statstable"><{$lang_ave}> <b><{$cur_percent}>%</b> <{$lang_daily_visit}> <b><{$date_daily}></b>.<br /><{$lang_bas_nbr}> <b><{$daycount}></b> <{$lang_so_far}> <b><{$today_hits}></b> <{$lang_page_view}></td> - </tr> - </table> -</div> - - -<div id="hour"> - + <div id="masque_hour" style="display: none;"> + <h2><{$smarty.const._AM_TODAY}></h2> <table class="map" cellspacing="0" cellpadding="0"> - <caption align="top"><{$smarty.const._AM_TODAY}><br /><br /></caption> <tr> - <th scope="col"><{$smarty.const._AM_HR_HOUR}></th> - <th scope="col"><{$smarty.const._AM_DATE_VISITS}></th> + <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%" 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> + <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> - <span><a href="javascript:;" onclick="javascript:masque('<{$smarty.const._AM_HR_HOUR}>')" ><{$smarty.const._AM_VIEW}></a></span> <br /><br /> - <div id="masque_<{$smarty.const._AM_HR_HOUR}>" style="display: none;"> - <table class="outer" width="100%" border="0" cellspacing="1" cellpadding="4" align="center"> - <tr> - <td class="head" width="33%" align="center"><{$smarty.const._AM_HR_HOUR}></td> - <td class="head" width="33%" align="center"><{$smarty.const._AM_DATE_VISITS}></td> - <td class="head" width="33%" align="center"><{$smarty.const._AM_DATE_PERCENT}></td> - </tr> - <{foreach item=hours from=$hours}> - <tr class="<{cycle values="even,odd"}>" valign="center"> - <td align="center"><{$hours.hour}></td> - <td align="center"><{$hours.info}></td> - <td align="center"><{$hours.percent}>%</td> - </tr> - <{/foreach}> - </table> </div> -</div> - <div id="ref"> + <div id="masque_ref" style="display: none;"> + <h2><{$smarty.const._AM_BY_REF}></h2> <table class="map" cellspacing="0" cellpadding="0"> - <caption align="top"><{$smarty.const._AM_BY_REF}><br /><br /></caption> <tr> - <th scope="col"><{$smarty.const._AM_REF_REF}></th> - <th scope="col"><{$smarty.const._AM_DATE_VISITS}></th> + <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%" class="option"><div style="margin:5px;" title="<{$refs_map.title}>" alt="<{$refs_map.title}>"><{$refs_map.ref}></div></td> - <td width="80%" class="value"><img src="./images/bar/<{$img_bar}>" title="<{$refs_map.percent}>%" alt="<{$refs_map.percent}>%" width="<{$refs_map.percent}>%" height="16" /><{$refs_map.info}></td> - </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> - <span><a href="javascript:;" onclick="javascript:masque('<{$smarty.const._AM_REF_REF}>')" ><{$smarty.const._AM_VIEW}></a></span> <br /><br /> - <div id="masque_<{$smarty.const._AM_REF_REF}>" 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_REF_REF}></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=refs from=$refs}> - <tr class="<{cycle values="even,odd"}>" valign="center"> - <td width="33%" align="center"><span title="<{$refs.title}>" alt="<{$refs.title}>"><{$refs.ref}></span></td> - <td width="33%" align="center"><{$refs.info}></td> - <td width="33%" align="center"><{$refs.percent}>%</td> - </tr> - <{/foreach}> - </table> - </div> </div> - <div id="pays"> - <table class="map" cellspacing="0" cellpadding="0"> - <caption align="top"><{$smarty.const._AM_BY_PAYS}><br /><br /></caption> + <div id="masque_pays" style="display: none;"> + <h2><{$smarty.const._AM_BY_PAYS}></h2> + <table class="outer" cellspacing="0" cellpadding="0"> <tr> - <th scope="col"><{$smarty.const._AM_BY_COUNTRY}></th> - <th scope="col"><{$smarty.const._AM_DATE_VISITS}></th> + <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%" class="option"><div style="margin:1px;"><{$payss_map.flag}></div></td> - <td width="80%" class="value"><img src="./images/bar/<{$img_bar}>" title="<{$payss_map.percent}>%" alt="<{$payss_map.percent}>%" width="<{$payss_map.percent}>%" height="16" /><{$payss_map.info}></td> - </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> - <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"></td> - <td class="head" align="center"><{$smarty.const._AM_BY_COUNTRY}></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=payss from=$payss}> - <tr class="<{cycle values="even,odd"}>" valign="center"> - <td width="10%" align="center"><{$payss.flag}></td> - <td width="30%" align="center"><{$payss.pays}></td> - <td width="10%" align="center"><{$payss.info}></td> - <td width="10%" align="center"><{$payss.percent}>%</td> - </tr> - <{/foreach}> - </table> - </div> </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: <lor...@us...> - 2012-07-13 19:39:00
|
Revision: 9863 http://xoops.svn.sourceforge.net/xoops/?rev=9863&view=rev Author: lord_venom Date: 2012-07-13 19:38:54 +0000 (Fri, 13 Jul 2012) Log Message: ----------- new style Modified Paths: -------------- XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_stats.html XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_summary.html XoopsModules/TDMStats/trunk/TDMStats/xoops_version.php Added Paths: ----------- XoopsModules/TDMStats/trunk/TDMStats/images/day.png XoopsModules/TDMStats/trunk/TDMStats/images/hour.png XoopsModules/TDMStats/trunk/TDMStats/images/module.png XoopsModules/TDMStats/trunk/TDMStats/images/mth.png XoopsModules/TDMStats/trunk/TDMStats/images/page.png XoopsModules/TDMStats/trunk/TDMStats/images/ref.png XoopsModules/TDMStats/trunk/TDMStats/images/week.png XoopsModules/TDMStats/trunk/TDMStats/images/weekday.png XoopsModules/TDMStats/trunk/TDMStats/images/word.png Added: XoopsModules/TDMStats/trunk/TDMStats/images/day.png =================================================================== (Binary files differ) Property changes on: XoopsModules/TDMStats/trunk/TDMStats/images/day.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: XoopsModules/TDMStats/trunk/TDMStats/images/hour.png =================================================================== (Binary files differ) Property changes on: XoopsModules/TDMStats/trunk/TDMStats/images/hour.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: XoopsModules/TDMStats/trunk/TDMStats/images/module.png =================================================================== (Binary files differ) Property changes on: XoopsModules/TDMStats/trunk/TDMStats/images/module.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: XoopsModules/TDMStats/trunk/TDMStats/images/mth.png =================================================================== (Binary files differ) Property changes on: XoopsModules/TDMStats/trunk/TDMStats/images/mth.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: XoopsModules/TDMStats/trunk/TDMStats/images/page.png =================================================================== (Binary files differ) Property changes on: XoopsModules/TDMStats/trunk/TDMStats/images/page.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: XoopsModules/TDMStats/trunk/TDMStats/images/ref.png =================================================================== (Binary files differ) Property changes on: XoopsModules/TDMStats/trunk/TDMStats/images/ref.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: XoopsModules/TDMStats/trunk/TDMStats/images/week.png =================================================================== (Binary files differ) Property changes on: XoopsModules/TDMStats/trunk/TDMStats/images/week.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: XoopsModules/TDMStats/trunk/TDMStats/images/weekday.png =================================================================== (Binary files differ) Property changes on: XoopsModules/TDMStats/trunk/TDMStats/images/weekday.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: XoopsModules/TDMStats/trunk/TDMStats/images/word.png =================================================================== (Binary files differ) Property changes on: XoopsModules/TDMStats/trunk/TDMStats/images/word.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_stats.html =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_stats.html 2012-07-13 19:09:43 UTC (rev 9862) +++ XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_stats.html 2012-07-13 19:38:54 UTC (rev 9863) @@ -15,7 +15,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="even"><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> +<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 /> @@ -33,7 +33,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="even"><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> +<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 /> @@ -52,7 +52,7 @@ <div id="tree_form"><a href="javascript:;" onclick="javascript:masque('hour')" ><{$smarty.const._AM_VIEW}></a></div></li> -<li style="width:47%;" class="even"><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> +<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 /> Modified: XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_summary.html =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_summary.html 2012-07-13 19:09:43 UTC (rev 9862) +++ XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_summary.html 2012-07-13 19:38:54 UTC (rev 9863) @@ -8,7 +8,7 @@ <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="even"><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> +<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> <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}> @@ -23,7 +23,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="even"><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: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> <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 /> Modified: XoopsModules/TDMStats/trunk/TDMStats/xoops_version.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/xoops_version.php 2012-07-13 19:09:43 UTC (rev 9862) +++ XoopsModules/TDMStats/trunk/TDMStats/xoops_version.php 2012-07-13 19:38:54 UTC (rev 9863) @@ -111,9 +111,9 @@ $modversion['sub'][1]['name'] = _MI_ISTATS_SUMMARY; $modversion['sub'][1]['url'] = "index.php?action=1"; $modversion['sub'][2]['name'] = _MI_ISTATS_SYSTEM; -$modversion['sub'][2]['url'] = "index.php?action=2"; +$modversion['sub'][2]['url'] = "index.php?action=3"; $modversion['sub'][3]['name'] = _MI_ISTATS_TRAFFIC; -$modversion['sub'][3]['url'] = "index.php?action=3"; +$modversion['sub'][3]['url'] = "index.php?action=2"; // Search $modversion['hasSearch'] = 0; 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 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-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: <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-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: <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: <lor...@us...> - 2012-07-28 18:05:39
|
Revision: 9942 http://xoops.svn.sourceforge.net/xoops/?rev=9942&view=rev Author: lord_venom Date: 2012-07-28 18:05:31 +0000 (Sat, 28 Jul 2012) Log Message: ----------- Modified Paths: -------------- XoopsModules/TDMStats/trunk/TDMStats/css/styles.css XoopsModules/TDMStats/trunk/TDMStats/include/stats.php XoopsModules/TDMStats/trunk/TDMStats/language/french/modinfo.php XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_index.html 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 XoopsModules/TDMStats/trunk/TDMStats/xoops_version.php Modified: XoopsModules/TDMStats/trunk/TDMStats/css/styles.css =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/css/styles.css 2012-07-28 18:04:55 UTC (rev 9941) +++ XoopsModules/TDMStats/trunk/TDMStats/css/styles.css 2012-07-28 18:05:31 UTC (rev 9942) @@ -58,15 +58,19 @@ display: none !important; } + ul#tree_menu { text-align: center; width:100%; - + list-style: none; + margin: 0; + padding: 0; } - ul#tree_menu li { - list-style: none; - float:left; + ul#tree_menu li , .tree_menu{ + list-style: none; + + display: inline-block; width:97%; min-height:130px; /*height: 130px;*/ Modified: XoopsModules/TDMStats/trunk/TDMStats/include/stats.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/include/stats.php 2012-07-28 18:04:55 UTC (rev 9941) +++ XoopsModules/TDMStats/trunk/TDMStats/include/stats.php 2012-07-28 18:05:31 UTC (rev 9942) @@ -395,5 +395,55 @@ } } } +///USERCOUNT//////////////////////// +//usercount item + $date = formatTimeStamp(time(), 'Y-m-d'); + $user_info = getResult("select *, SUM(count) AS sum from ".$xoopsDB->prefix("TDMStats_usercount")." GROUP BY ip 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]['sum'] > 0) { + + $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]['sum']); + + + //$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 *, SUM(count) AS sum from ".$xoopsDB->prefix("TDMStats_usercount")." GROUP BY ip order by count desc"); + $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]['sum'] * 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]['sum']); + + 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'))); + + } + } + + } +//////////////////////////////// ?> \ 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-28 18:04:55 UTC (rev 9941) +++ XoopsModules/TDMStats/trunk/TDMStats/language/french/modinfo.php 2012-07-28 18:05:31 UTC (rev 9942) @@ -49,6 +49,7 @@ define("_MI_ISTATS_MAXSESSION_DESC","L'utilisateur ne sera pas compté pendants ce temps"); define("_MI_ISTATS_MAXBG","Choisissez la couleur d'arriere plants sans le #"); define("_MI_ISTATS_MAXUSER","Compter les admins :"); +define("_MI_ISTATS_MAXUSERCOUNT","Limite du compteur de temps / jours :"); define("_MI_ISTATS_MAXHEIGHT","Choisissez la hauteur maxi. (500px max)"); define("_MI_ISTATS_MAXWIDTH","Choisissez la largeur maxi. (500px max)"); define("_MI_ISTATS_MAXCOLOR","Choisissez les couleurs utiliser séparer par |"); Modified: XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_index.html =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_index.html 2012-07-28 18:04:55 UTC (rev 9941) +++ XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_index.html 2012-07-28 18:05:31 UTC (rev 9942) @@ -54,7 +54,7 @@ } else { $tdmstats("#masque_" +id).fadeOut("fast", function() { - $tdmstats("div[id^='masque']").fadeIn("fast").hide(); + $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-28 18:04:55 UTC (rev 9941) +++ XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_stats.html 2012-07-28 18:05:31 UTC (rev 9942) @@ -12,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="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 id="masque_day" style="display: none;" class="tree_menu 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"> @@ -31,7 +31,7 @@ <{/foreach}> </div> -</div></div> +</div></div><br style="clear: both;" /><br /></div> <!--fin--> @@ -45,7 +45,7 @@ <div id="tree_form"><a href="javascript:;" onclick="javascript:masque('week')" ><{$smarty.const._AM_VIEW}></a></div></li> <!-- 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 id="masque_week" style="display: none;" class="tree_menu 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"> @@ -64,7 +64,7 @@ <{/foreach}> </div> -</div></div> +</div></div><br style="clear: both;" /><br /></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> @@ -77,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="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 id="masque_last" style="display: none;" class="tree_menu 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"> @@ -96,7 +96,7 @@ <{/foreach}> </div> -</div></div> +</div></div><br style="clear: both;" /><br /></div> <!--fin--> @@ -110,7 +110,7 @@ <div id="tree_form"><a href="javascript:;" onclick="javascript:masque('mth')" ><{$smarty.const._AM_VIEW}></a></div></li> <!-- 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 id="masque_mth" style="display: none;" class="tree_menu 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"> @@ -129,7 +129,7 @@ <{/foreach}> </div> -</div></div> +</div></div><br style="clear: both;" /><br /></div> <!--fin--> @@ -143,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="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 id="masque_hour" style="display: none;" class="tree_menu 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"> @@ -162,7 +162,7 @@ <{/foreach}> </div> -</div></div> +</div></div><br style="clear: both;" /><br /></div> <!--fin--> @@ -176,7 +176,7 @@ <div id="tree_form"><a href="javascript:;" onclick="javascript:masque('page')" ><{$smarty.const._AM_VIEW}></a></div></li> <!-- 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 id="masque_page" style="display: none;" class="tree_menu 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"> @@ -195,7 +195,7 @@ <{/foreach}> </div> -</div></div> +</div></div><br style="clear: both;" /><br /></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> @@ -208,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="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 id="masque_module" style="display: none;" class="tree_menu 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"> @@ -227,7 +227,39 @@ <{/foreach}> </div> -</div></div> +</div></div><br style="clear: both;" /><br /></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_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 --> +<div id="masque_user" style="display: none;" class="tree_menu 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_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><br style="clear: both;" /><br /></div> +<!--fin--> + <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-28 18:04:55 UTC (rev 9941) +++ XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_summary.html 2012-07-28 18:05:31 UTC (rev 9942) @@ -9,7 +9,7 @@ <div id="tree_form"><a href="javascript:;" onclick="javascript:masque('resum')" ><{$smarty.const._AM_VIEW}></a></div></li> <!-- 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 id="masque_resum" style="display: none;" class="tree_menu 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"> @@ -69,7 +69,7 @@ </p> </div> -</div></div> +</div></div><br style="clear: both;" /><br /></div> <!-- fin --> @@ -90,7 +90,7 @@ <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 id="masque_hour" style="display: none;" class="tree_menu 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"> @@ -109,7 +109,7 @@ <{/foreach}> </div> -</div></div> +</div></div><br style="clear: both;" /><br /></div> <!--fin--> @@ -123,7 +123,7 @@ <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 id="masque_ref" style="display: none;" class="tree_menu 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"> @@ -142,7 +142,7 @@ <{/foreach}> </div> -</div></div> +</div></div><br style="clear: both;" /><br /></div> <!--fin--> @@ -156,7 +156,7 @@ <div id="tree_form"><a href="javascript:;" onclick="javascript:masque('pays')" ><{$smarty.const._AM_VIEW}></a></div></li> <!-- 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 id="masque_pays" style="display: none;" class="tree_menu 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"> @@ -175,7 +175,7 @@ <{/foreach}> </div> -</div></div> +</div></div><br style="clear: both;" /><br /></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> @@ -188,7 +188,7 @@ <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 id="masque_user" style="display: none;" class="tree_menu 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"> @@ -207,7 +207,7 @@ <{/foreach}> </div> -</div></div> +</div></div><br style="clear: both;" /><br /></div> <!--fin--> Modified: XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_user_info.html =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_user_info.html 2012-07-28 18:04:55 UTC (rev 9941) +++ XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_user_info.html 2012-07-28 18:05:31 UTC (rev 9942) @@ -1,6 +1,8 @@ <{include file="db:TDMStats_index.html"}> -<table cellpadding="0" cellspacing="0" style="border-collapse: separate;"><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"> @@ -12,7 +14,7 @@ <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 id="masque_browser" style="display: none;" class="even tree_menu"><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"> @@ -31,7 +33,7 @@ <{/foreach}> </div> -</div></div> +</div></div><br style="clear: both;" /><br /></div> <!--fin--> <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> @@ -44,7 +46,7 @@ <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 id="masque_os" style="display: none;" class="tree_menu 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"> @@ -63,7 +65,7 @@ <{/foreach}> </div> -</div></div> +</div></div><br style="clear: both;" /><br /></div> <!--fin--> <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> @@ -76,7 +78,7 @@ <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 id="masque_sw" style="display: none;" class="tree_menu 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"> @@ -95,7 +97,7 @@ <{/foreach}> </div> -</div></div> +</div></div><br style="clear: both;" /><br /></div> <!--fin--> <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> @@ -108,7 +110,7 @@ <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 id="masque_sc" style="display: none;" class="tree_menu 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"> @@ -127,7 +129,7 @@ <{/foreach}> </div> -</div></div> +</div></div><br style="clear: both;" /><br /></div> <!--fin--> <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> @@ -140,7 +142,7 @@ <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 id="masque_host" style="display: none;" class="tree_menu 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"> @@ -159,7 +161,7 @@ <{/foreach}> </div> -</div></div> +</div></div><br style="clear: both;" /><br /></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-28 18:04:55 UTC (rev 9941) +++ XoopsModules/TDMStats/trunk/TDMStats/xoops_version.php 2012-07-28 18:05:31 UTC (rev 9942) @@ -202,6 +202,13 @@ $modversion['config'][$i]['valuetype'] = 'int'; $modversion['config'][$i]['default'] = 0; $i++; +$modversion['config'][$i]['name'] = 'maxusercount'; +$modversion['config'][$i]['title'] = '_MI_ISTATS_MAXUSERCOUNT'; +$modversion['config'][$i]['description'] = ''; +$modversion['config'][$i]['formtype'] = 'texbox'; +$modversion['config'][$i]['valuetype'] = 'int'; +$modversion['config'][$i]['default'] = 7; +$i++; //$modversion['config'][5]['name'] = 'tdmstats_style'; //$modversion['config'][5]['title'] = '_MI_ISTATS_ONGLET'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lor...@us...> - 2012-07-29 20:06:15
|
Revision: 9944 http://xoops.svn.sourceforge.net/xoops/?rev=9944&view=rev Author: lord_venom Date: 2012-07-29 20:06:09 +0000 (Sun, 29 Jul 2012) Log Message: ----------- Modified Paths: -------------- XoopsModules/TDMStats/trunk/TDMStats/blocks/TDMStats_blocks.php XoopsModules/TDMStats/trunk/TDMStats/include/stats.php XoopsModules/TDMStats/trunk/TDMStats/xoops_version.php Modified: XoopsModules/TDMStats/trunk/TDMStats/blocks/TDMStats_blocks.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/blocks/TDMStats_blocks.php 2012-07-29 12:04:13 UTC (rev 9943) +++ XoopsModules/TDMStats/trunk/TDMStats/blocks/TDMStats_blocks.php 2012-07-29 20:06:09 UTC (rev 9944) @@ -131,6 +131,41 @@ return $block; } +function b_TDMStats_info_show($options) { + global $xoopsConfig, $xoopsUser, $xoopsModule; + + include_once(XOOPS_ROOT_PATH . '/modules/TDMStats/include/function.php'); + include_once(XOOPS_ROOT_PATH . '/modules/TDMStats/include/display.php'); + + $result = CountDays(); + + $block = array(); + + $block['welcome'] = _MB_ISTATS_WELCOME; + $block['uname'] = !empty($xoopsUser) ? $xoopsUser->getVar('uname','E') : _MB_ISTATS_ANONYMOUS; + + if ( $options[0] == 1 ) { + if (is_object($xoopsUser)) { + $block['avatar'] = $xoopsUser->getVar('user_avatar'); + if (file_exists(XOOPS_ROOT_PATH.'/uploads/'.$block['avatar'])) { + $block['avatar'] = '<img src="'.XOOPS_URL.'/uploads/'.$block['avatar'].'" alt="avatar" />'; + } else { + $block['avatar'] = ''; + } + } else { + $block['avatar'] = '<img src="'.XOOPS_URL.'/modules/TDMStats/images/guest.gif" alt="avatar" />'; + } + } else { + $block['avatar'] = ''; + } + + $block['lang_there'] = _MB_ISTATS_THERE; + $block['graphics'] = num_to_graphics($result['total'], $options[1], XOOPS_URL . '/modules/TDMStats/images/'.$options[2].'','jpg'); + $block['lang_visitor'] = _MB_ISTATS_VISITOR; + + return $block; +} + function b_TDMStats_edit($options) { global $xoopsConfig; @@ -181,4 +216,29 @@ return $form; } + +function b_TDMStats_info_edit($options) +{ + global $xoopsConfig; + + include_once XOOPS_ROOT_PATH.'/mainfile.php'; + + $form = ""._MB_ISTATS_DISPLAY_AVATAR." <input type='radio' id='options[]' name='options[]' value='1'"; + if ( $options[0] == 1 ) { + $form .= " checked='checked'"; + } + $form .= " /> "._MB_ISTATS_YES." <input type='radio' id='options[]' name='options[]' value='0'"; + if ( $options[0] == 0 ) { + $form .= " checked='checked'"; + } + $form .= " /> "._MB_ISTATS_NO."<br />"; + $inputtag = "<input type='text' name='options[]' value='".intval($options[1])."' />"; + $form .= sprintf(_MB_ISTATS_COUNTER_DISPLAY,$inputtag); + $form .= "<br />".sprintf(_MB_ISTATS_COUNTER_IMG_DIR,XOOPS_URL."modules/TDMStats/images/")." "; + $form .= "<input type='text' name='options[]' value='".$options[2]."' />"; + $form .= " "._MB_ISTATS_DIR.""; + $form .= "<br />"._MB_ISTATS_DIRS_NAME.""; + + return $form; +} ?> Modified: XoopsModules/TDMStats/trunk/TDMStats/include/stats.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/include/stats.php 2012-07-29 12:04:13 UTC (rev 9943) +++ XoopsModules/TDMStats/trunk/TDMStats/include/stats.php 2012-07-29 20:06:09 UTC (rev 9944) @@ -399,6 +399,10 @@ //usercount item $date = formatTimeStamp(time(), 'Y-m-d'); + $date_before = date("Y-m-d", strtotime("-6 day")); +//netoyage + mysql_query("delete from ".$xoopsDB->prefix("TDMStats_usercount")." WHERE date < '$date_before'"); + $user_info = getResult("select *, SUM(count) AS sum from ".$xoopsDB->prefix("TDMStats_usercount")." GROUP BY ip order by count DESC LIMIT 3"); //$total_hour = getResult("select SUM(count) AS sum from ".$xoopsDB->prefix("TDMStats_today_hour").""); Modified: XoopsModules/TDMStats/trunk/TDMStats/xoops_version.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/xoops_version.php 2012-07-29 12:04:13 UTC (rev 9943) +++ XoopsModules/TDMStats/trunk/TDMStats/xoops_version.php 2012-07-29 20:06:09 UTC (rev 9944) @@ -74,6 +74,14 @@ $modversion['blocks'][2]['edit_func'] = "b_TDMStats_counter_edit"; $modversion['blocks'][2]['template'] = 'tdmstats_block_counter.html'; +$modversion['blocks'][3]['file'] = 'TDMStats_blocks.php'; +$modversion['blocks'][3]['name'] = _MI_ISTATS_CNT; +$modversion['blocks'][3]['description'] = 'Show info user'; +$modversion['blocks'][3]['show_func'] = 'b_TDMStats_info_show'; +$modversion['blocks'][3]['options'] = "1|6|default"; +$modversion['blocks'][3]['edit_func'] = "b_TDMStats_info_edit"; +$modversion['blocks'][3]['template'] = 'tdmstats_block_info.html'; + //update $modversion['onUpdate'] = 'include/update.php'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lor...@us...> - 2012-07-31 09:29:08
|
Revision: 9953 http://xoops.svn.sourceforge.net/xoops/?rev=9953&view=rev Author: lord_venom Date: 2012-07-31 09:28:57 +0000 (Tue, 31 Jul 2012) Log Message: ----------- Modified Paths: -------------- XoopsModules/TDMStats/trunk/TDMStats/blocks/TDMStats_blocks.php XoopsModules/TDMStats/trunk/TDMStats/counter.php XoopsModules/TDMStats/trunk/TDMStats/language/french/modinfo.php XoopsModules/TDMStats/trunk/TDMStats/xoops_version.php Added Paths: ----------- XoopsModules/TDMStats/trunk/TDMStats/templates/blocks/tdmstats_block_info.html Modified: XoopsModules/TDMStats/trunk/TDMStats/blocks/TDMStats_blocks.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/blocks/TDMStats_blocks.php 2012-07-30 21:53:52 UTC (rev 9952) +++ XoopsModules/TDMStats/trunk/TDMStats/blocks/TDMStats_blocks.php 2012-07-31 09:28:57 UTC (rev 9953) @@ -135,13 +135,119 @@ global $xoopsConfig, $xoopsUser, $xoopsModule; include_once(XOOPS_ROOT_PATH . '/modules/TDMStats/include/function.php'); - include_once(XOOPS_ROOT_PATH . '/modules/TDMStats/include/display.php'); + include_once(XOOPS_ROOT_PATH . '/modules/TDMStats/include/function.php'); + + //news member + $criteria = new CriteriaCompo(new Criteria('level', 0, '>')); + // $limit = (!empty($options[0])) ? $options[0] : 10; + $criteria->setOrder('DESC'); + $criteria->setSort('user_regdate'); + $criteria->setLimit(5); + $member_handler =& xoops_gethandler('member'); + $newmembers = $member_handler->getUsers($criteria); + $count = count($newmembers); + for ($i = 0; $i < $count; $i++) { + $block['users'][$i]['id'] = $newmembers[$i]->getVar('uid'); + $block['users'][$i]['name'] = $newmembers[$i]->getVar('uname'); + $block['users'][$i]['joindate'] = formatTimestamp($newmembers[$i]->getVar('user_regdate'), 's'); + } + + //online +global $xoopsDB, $xoopsUser, $xoopsModule; + $online_handler =& xoops_gethandler('online'); + + mt_srand((double)microtime()*1000000); + // set gc probabillity to 10% for now.. + if (mt_rand(1, 100) < 11) { + $online_handler->gc(300); + } + if (is_object($xoopsUser)) { + $uid = $xoopsUser->getVar('uid'); + $uname = $xoopsUser->getVar('uname'); + } else { + $uid = 0; + $uname = ''; + } + if (is_object($xoopsModule)) { + $online_handler->write($uid, $uname, time(), $xoopsModule->getVar('mid'), $_SERVER['REMOTE_ADDR']); + } else { + $online_handler->write($uid, $uname, time(), 0, $_SERVER['REMOTE_ADDR']); + } + $onlines = $online_handler->getAll(); + $module_handler =& xoops_gethandler('module'); + $modules = $module_handler->getList(new Criteria('isactive', 1)); + if (false != $onlines) { + $total = count($onlines); + //$block = array(); + $guests = 0; + $members = ''; + for ($i = 0; $i < $total; $i++) { + $userid = XoopsUser::getUnameFromId($onlines[$i]['online_uid']); + if ($onlines[$i]['online_uid'] > 0) { + $members .= ' <a href="' . XOOPS_URL . '/userinfo.php?uid=' . $onlines[$i]['online_uid'] . '" title="' . $onlines[$i]['online_uname'] . '">' . $userid . '</a>: '; + + } else { + $members .= $userid.": "; + $guests++; + } + + if ($onlines[$i]['online_module']) { + $members .= $modules[$onlines[$i]['online_module']].", "; + } else { + $members .= _YOURHOME.", "; + } + + } + //$block['online']['online_total'] = sprintf(_ONLINEPHRASE, $total); + if (is_object($xoopsModule)) { + $mytotal = $online_handler->getCount(new Criteria('online_module', $xoopsModule->getVar('mid'))); + $block['online']['online_total'] = sprintf(_ONLINEPHRASEX, $mytotal, $xoopsModule->getVar('name')); + + } + + //$block['lang_members'] = _MEMBERS; + //$block['lang_guests'] = _GUESTS; + $block['online']['online_names'] = $members; + $block['online']['online_members'] = $total - $guests; + $block['online']['online_guests'] = $guests; + //$block['online']['online_module'] = $module; + //$block['lang_more'] = _MORE; + } else { + return false; + } + //inststats + $results = CountDays(); + $block['stats']['today'] = $results['today']; + $block['stats']['total'] = $results['total']; + $block['stats']['mth'] = $results['this_mth']; - $result = CountDays(); + //time + //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 5"); + //$total_hour = getResult("select SUM(count) AS sum from ".$xoopsDB->prefix("TDMStats_today_hour").""); + $times = ""; + if($user_info){ + for($i=0; $i<sizeof($user_info); $i++){ + if($user_info[$i]['count'] > 0) { + + $userid = !empty($user_info[$i]['userid']) ? XoopsUser::getUnameFromId($user_info[$i]['userid']) : XoopsUser::getUnameFromId(); + //$count = $user_info[$i]['count'] ; + $count = gmstrftime( "%H H %M mn %S s", $user_info[$i]['count']); + $times .= "<b>".$userid."</b>: ".$count.", "; + //$hour['hour'][] = $hour_info[$i]['hour']; + //$hour['percent'][] = round($hour_percent, '2'); - $block = array(); + } + } + + $block['times'] = $times; + } + + + return $block; - $block['welcome'] = _MB_ISTATS_WELCOME; + $block['uname'] = !empty($xoopsUser) ? $xoopsUser->getVar('uname','E') : _MB_ISTATS_ANONYMOUS; if ( $options[0] == 1 ) { @@ -163,7 +269,7 @@ $block['graphics'] = num_to_graphics($result['total'], $options[1], XOOPS_URL . '/modules/TDMStats/images/'.$options[2].'','jpg'); $block['lang_visitor'] = _MB_ISTATS_VISITOR; - return $block; + //return $block; } function b_TDMStats_edit($options) @@ -232,7 +338,7 @@ $form .= " checked='checked'"; } $form .= " /> "._MB_ISTATS_NO."<br />"; - $inputtag = "<input type='text' name='options[]' value='".intval($options[1])."' />"; + $inputtag = "<input type='textaera' name='options[]' value='".intval($options[1])."' />"; $form .= sprintf(_MB_ISTATS_COUNTER_DISPLAY,$inputtag); $form .= "<br />".sprintf(_MB_ISTATS_COUNTER_IMG_DIR,XOOPS_URL."modules/TDMStats/images/")." "; $form .= "<input type='text' name='options[]' value='".$options[2]."' />"; Modified: XoopsModules/TDMStats/trunk/TDMStats/counter.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/counter.php 2012-07-30 21:53:52 UTC (rev 9952) +++ XoopsModules/TDMStats/trunk/TDMStats/counter.php 2012-07-31 09:28:57 UTC (rev 9953) @@ -13,6 +13,7 @@ //permission if (is_object($xoopsUser)) { $groups = $xoopsUser->getGroups(); + $uid = $xoopsUser->getVar('uid'); } else { $groups = XOOPS_GROUP_ANONYMOUS; } @@ -46,7 +47,7 @@ } else { $date = formatTimeStamp(time(), 'Y-m-d'); $ip = $_SERVER['REMOTE_ADDR']; - $userid = isset($_SESSION['xoopsUserId']) ? $_SESSION['xoopsUserId']: false; + $userid = isset($uid) ? $uid : false; $count = round((time() - $_SESSION['start']) / 60); $check2 = getResult("SELECT * FROM ".XOOPS_DB_PREFIX."_TDMStats_usercount WHERE ip='$ip' AND date='$date'"); if ($check2) { Modified: XoopsModules/TDMStats/trunk/TDMStats/language/french/modinfo.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/language/french/modinfo.php 2012-07-30 21:53:52 UTC (rev 9952) +++ XoopsModules/TDMStats/trunk/TDMStats/language/french/modinfo.php 2012-07-31 09:28:57 UTC (rev 9953) @@ -65,4 +65,8 @@ define('_MI_ISTATS_TRAFFIC', 'Stats du Trafic '); define("_MI_ISTATS_SETLOCAL","Choisissez votre localité"); +define("_MI_ISTATS_NEWUSER","Dernier utilisateur inscrit"); +define("_MI_ISTATS_NOWONLINE","Actuellement onligne"); +define("_MI_ISTATS_USERONLINE","Onligne aujourd'hui"); + ?> Added: XoopsModules/TDMStats/trunk/TDMStats/templates/blocks/tdmstats_block_info.html =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/templates/blocks/tdmstats_block_info.html (rev 0) +++ XoopsModules/TDMStats/trunk/TDMStats/templates/blocks/tdmstats_block_info.html 2012-07-31 09:28:57 UTC (rev 9953) @@ -0,0 +1,21 @@ +<div style="float:left"><{$smarty.const._MI_ISTATS_NEWUSER}>: + <{foreach item=user from=$block.users}> +<b><{$user.name}></b> <{$user.joindate}>, + <{/foreach}></div> + +<br /> + +<div style="float:left">Membre en ligne: <b><{$block.online.online_members}></b></div><br /> +<div style="float:left">Inviter en ligne: <b><{$block.online.online_guests}></b></div> +<div style="float:right">Aujourd'hui: <{$block.stats.today}><br /></div><br /> +<div style="float:right">ce mois: <{$block.stats.mth}><br /></div><br /> +<div style="float:right">total: <{$block.stats.total}></div><br /> + +<hr> +<{$smarty.const._MI_ISTATS_NOWONLINE}> : <{$block.online.online_names}><{$block.online.online_module}> +<br /> +<{if $block.online.online_total}> +<{$block.online.online_total}> +<br /> +<{/if}> +<{$smarty.const._MI_ISTATS_USERONLINE}> : <{$block.times}> <br /><br /> \ No newline at end of file Modified: XoopsModules/TDMStats/trunk/TDMStats/xoops_version.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/xoops_version.php 2012-07-30 21:53:52 UTC (rev 9952) +++ XoopsModules/TDMStats/trunk/TDMStats/xoops_version.php 2012-07-31 09:28:57 UTC (rev 9953) @@ -75,7 +75,7 @@ $modversion['blocks'][2]['template'] = 'tdmstats_block_counter.html'; $modversion['blocks'][3]['file'] = 'TDMStats_blocks.php'; -$modversion['blocks'][3]['name'] = _MI_ISTATS_CNT; +$modversion['blocks'][3]['name'] = 'info'; $modversion['blocks'][3]['description'] = 'Show info user'; $modversion['blocks'][3]['show_func'] = 'b_TDMStats_info_show'; $modversion['blocks'][3]['options'] = "1|6|default"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lor...@us...> - 2012-08-24 19:57:53
|
Revision: 10097 http://xoops.svn.sourceforge.net/xoops/?rev=10097&view=rev Author: lord_venom Date: 2012-08-24 19:57:46 +0000 (Fri, 24 Aug 2012) Log Message: ----------- Modifications by Mamba Modified Paths: -------------- XoopsModules/TDMStats/trunk/TDMStats/admin/admin_header.php XoopsModules/TDMStats/trunk/TDMStats/include/function.php XoopsModules/TDMStats/trunk/TDMStats/include/summary.php XoopsModules/TDMStats/trunk/TDMStats/index.php XoopsModules/TDMStats/trunk/TDMStats/language/english/admin.php XoopsModules/TDMStats/trunk/TDMStats/language/english/main.php XoopsModules/TDMStats/trunk/TDMStats/language/english/modinfo.php XoopsModules/TDMStats/trunk/TDMStats/language/french/admin.php XoopsModules/TDMStats/trunk/TDMStats/language/french/modinfo.php XoopsModules/TDMStats/trunk/TDMStats/language/persian/admin.php XoopsModules/TDMStats/trunk/TDMStats/language/spanish/admin.php Modified: XoopsModules/TDMStats/trunk/TDMStats/admin/admin_header.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/admin/admin_header.php 2012-08-24 17:40:00 UTC (rev 10096) +++ XoopsModules/TDMStats/trunk/TDMStats/admin/admin_header.php 2012-08-24 19:57:46 UTC (rev 10097) @@ -22,4 +22,6 @@ include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'); }else{ redirect_header("../../../admin.php", 5, _AM_TDMSTATS_MODULEADMIN_MISSING, false); - } \ No newline at end of file + } + +?> \ No newline at end of file Modified: XoopsModules/TDMStats/trunk/TDMStats/include/function.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/include/function.php 2012-08-24 17:40:00 UTC (rev 10096) +++ XoopsModules/TDMStats/trunk/TDMStats/include/function.php 2012-08-24 19:57:46 UTC (rev 10097) @@ -89,6 +89,8 @@ $result['max_week_y'] = $max_week[0]['year']; $result['max_weekcount'] = $max_week[0]['count']; } else { + $result['max_week_w'] = false; + $result['max_week_y'] = false; $result['max_week'] = "------"; $result['max_weekcount'] = 0; } @@ -98,6 +100,8 @@ $result['max_mth_y'] = $max_mth[0]['year']; $result['max_mthcount'] = $max_mth[0]['count']; } else { + $result['max_mth_m'] = false; + $result['max_mth_y'] = false; $result['max_mth'] = "------"; $result['max_mthcount'] = 0; } Modified: XoopsModules/TDMStats/trunk/TDMStats/include/summary.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/include/summary.php 2012-08-24 17:40:00 UTC (rev 10096) +++ XoopsModules/TDMStats/trunk/TDMStats/include/summary.php 2012-08-24 19:57:46 UTC (rev 10097) @@ -64,6 +64,12 @@ $xoopsTpl->assign('lang_max_weekcount', _AM_MAX_WEEKCOUNT); $xoopsTpl->assign('max_weekcount', $summary['max_weekcount']); $xoopsTpl->assign('lang_max_week', _AM_MAX_WEEK); + +if (!isset($summary['max_week_w'])) + $summary['max_week_w']=0; +if (!isset($summary['max_week_y'])) + $summary['max_week_y']=0; + if ($xoopsModuleConfig['longdate'] == 1) { $summary['max_week'] = "#".$summary['max_week_w']." ".$summary['max_week_y']; } else { @@ -73,6 +79,12 @@ $xoopsTpl->assign('lang_max_mthcount', _AM_MAX_MTHCOUNT); $xoopsTpl->assign('max_mthcount', $summary['max_mthcount']); $xoopsTpl->assign('lang_max_mth', _AM_MAX_MTH); + +if (!isset($summary['max_mth_m'])) + $summary['max_mth_m']=0; +if (!isset($summary['max_mth_y'])) + $summary['max_mth_y']=0; + if ($xoopsModuleConfig['longdate'] == 1) { $summary['max_mth'] = $summary['max_mth_m']."/".$summary['max_mth_y']; } else { @@ -325,7 +337,7 @@ $xoopsTpl->assign('date_daily', formatTimeStamp(time(), 'H:i')); $xoopsTpl->assign('lang_bas_nbr', AM_BAS_NBR); $xoopsTpl->assign('daycount', $curvisits); -$xoopsTpl->assign('lang_so_far', AM_SO_FAR); +$xoopsTpl->assign('lang_so_far', AM_SO_FARE); $xoopsTpl->assign('today_hits', sprintf ("%.0f", $today_hits)); $xoopsTpl->assign('lang_page_view', AM_PAGE_VIEW); $xoopsTpl->assign('lang_by_today_hour', _AM_BY_TODAY_HOUR); Modified: XoopsModules/TDMStats/trunk/TDMStats/index.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/index.php 2012-08-24 17:40:00 UTC (rev 10096) +++ XoopsModules/TDMStats/trunk/TDMStats/index.php 2012-08-24 19:57:46 UTC (rev 10097) @@ -55,12 +55,12 @@ case "list": default: - + $xoopsOption['template_main'] = 'tdmstats_index.html'; - include_once XOOPS_ROOT_PATH."/header.php"; + // pour les permissions $perm_4 = ($gperm_handler->checkRight('istats_view', 4, $groups, $xoopsModule->getVar('mid'))) ? true : false ; $perm_8 = ($gperm_handler->checkRight('istats_view', 8, $groups, $xoopsModule->getVar('mid'))) ? true : false ; Modified: XoopsModules/TDMStats/trunk/TDMStats/language/english/admin.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/language/english/admin.php 2012-08-24 17:40:00 UTC (rev 10096) +++ XoopsModules/TDMStats/trunk/TDMStats/language/english/admin.php 2012-08-24 19:57:46 UTC (rev 10097) @@ -18,67 +18,68 @@ * * **************************************************************************** */ -define("_AM_ISTATS_NAVPREFERENCES","Preferences"); -define("_AM_ISTATS_NAVPERMISSIONS","Permissions"); +define ( "_AM_ISTATS_NAVPREFERENCES", "Preferences"); +define ( "_AM_ISTATS_NAVPERMISSIONS", "Permissions"); -define("_AM_ISTATS_COOKIE_CONF","Setting the Cookie"); -define("_AM_ISTATS_COOKIE","Setting the Cookie"); -define("_AM_ISTATS_COOKIE_DESC","Determine the life of your cookie, in seconds (eg 1 hour = 3600)"); -define("_AM_ISTATS_SAVE","Save"); -define("_AM_ISTATS_CANCEL","Cancel"); -define("_AM_ISTATS_CONFIG","Configuring Stats"); -define("_AM_GENERALCONF","General configuration"); -define("_AM_ISTATS_NOTUPDATED","The config.php file was not updated! <br /> Scripture impossible! <br /> Please check the file permissions (chmod 666) or cache directory (chmod 777) "); -define("_AM_ISTATS_UPDATED","File updated config.php"); +define ( "_AM_ISTATS_COOKIE_CONF", "Setting the Cookie"); +define ( "_AM_ISTATS_COOKIE", "Setting the Cookie"); +define ( "_AM_ISTATS_COOKIE_DESC", "Determine the life of your cookie, in seconds (eg 1 hour = 3600)"); +define ( "_AM_ISTATS_SAVE", "Save"); +define ( "_AM_ISTATS_CANCEL", "Cancel"); +define ( "_AM_ISTATS_CONFIG", "Configuring Stats"); +define ( "_AM_GENERALCONF", "General configuration"); +define ( "_AM_ISTATS_NOTUPDATED", "The config.php file was not updated! <br /> Scripture impossible! <br /> Please check the file permissions (chmod 666) or cache directory (chmod 777) "); +define ( "_AM_ISTATS_UPDATED", "File updated config.php"); // index.php -define("_AM_ISTATS_INDEXDESC","Module index"); -define("_AM_ISTATS_TABLE","Table Name"); -define("_AM_ISTATS_LENGTH","Size of data file"); -define("_AM_ISTATS_FREE","Lost space"); -define("_AM_ISTATS_TOTAL","Total file data"); -define("_AM_ISTATS_OPT","Optimize"); +define ( "_AM_ISTATS_INDEXDESC", "Module index"); +define ( "_AM_ISTATS_TABLE", "Table Name"); +define ( "_AM_ISTATS_LENGTH", "Size of data file"); +define ( "_AM_ISTATS_FREE", "Lost space"); +define ( "_AM_ISTATS_TOTAL", "Total file data"); +define ( "_AM_ISTATS_OPT", "Optimize"); -define("_AM_ISTATS_BASE","Your changes are saved successfully"); -define("_AM_ISTATS_BASEERROR","Error: Your changes are not saved"); +define ( "_AM_ISTATS_BASE", "Your changes are saved successfully"); +define ( "_AM_ISTATS_BASEERROR", "Error: Your changes are not saved"); -define("_AM_ISTATS_ABOUT","About the Module"); -define("_AM_ISTATS_UPDATE","Update Module"); -define("_AM_ISTATS_PERM","Managing Permissions"); -define('_AM_ISTATS_PLUG','Management Plugin'); +define ( "_AM_ISTATS_ABOUT", "About the Module"); +define ( "_AM_ISTATS_UPDATE", "Update Module"); +define ( "_AM_ISTATS_PERM", "Managing Permissions"); +define ( '_AM_ISTATS_PLUG', 'Management Plugin'); // plug.php -define('_AM_ISTATS_PLUGHELP',"<b> Note: </b> Remember to copy the code '<b> <{xoStats}> </b>' to the theme.html file of your current theme after the '<b> < body ></b>' tag, to record visits ..."); -define('_AM_ISTATS_PLUGERROR','Please copy the file "xoops_plugins / function.xoStats.php" in your site root, "/ class / smarty / xoops_plugins /"'); -define('_AM_ISTATS_PLUGOK','Plugin installed'); -define('_AM_ISTATS_PLUGETAT','Plugin status'); +define ( '_AM_ISTATS_PLUGHELP', "<b> Note: </b> Remember to copy the code '<b> <{xoStats}> </b>' to the theme.html file of your current theme after the '<b> < body ></b>' tag, to record visits ..."); +define ( '_AM_ISTATS_PLUGERROR', 'Please copy the file "xoops_plugins / function.xoStats.php" in your site root, "/ class / smarty / xoops_plugins /"'); +define ( '_AM_ISTATS_PLUGOK', 'Plugin installed'); +define ( '_AM_ISTATS_PLUGETAT', 'Plugin status'); // About (about.php) -define("_AM_ABOUT_RELEASEDATE","Release Date"); -define("_AM_ABOUT_AUTHOR","Author"); -define("_AM_ABOUT_CREDITS","Credits"); -define("_AM_ABOUT_README","General Info"); -define("_AM_ABOUT_MANUAL","Help"); -define("_AM_ABOUT_LICENSE","License"); -define("_AM_ABOUT_MODULE_STATUS","Status"); -define("_AM_ABOUT_WEBSITE","Web Site"); -define("_AM_ABOUT_AUTHOR_NAME","Author Name"); -define("_AM_ABOUT_AUTHOR_WORD","Author Word"); -define("_AM_ABOUT_CHANGELOG","Change Log"); -define("_AM_ABOUT_MODULE_INFO","Module Info"); -define("_AM_ABOUT_AUTHOR_INFO","Author Info"); -define("_AM_ABOUT_DISCLAIMER","Disclaimer"); -define("_AM_ABOUT_DISCLAIMER_TEXT","GPL Licensed - No Warranty"); +define ( "_AM_ABOUT_RELEASEDATE", "Release Date"); +define ( "_AM_ABOUT_AUTHOR", "Author"); +define ( "_AM_ABOUT_CREDITS", "Credits"); +define ( "_AM_ABOUT_README", "General Info"); +define ( "_AM_ABOUT_MANUAL", "Help"); +define ( "_AM_ABOUT_LICENSE", "License"); +define ( "_AM_ABOUT_MODULE_STATUS", "Status"); +define ( "_AM_ABOUT_WEBSITE", "Web Site"); +define ( "_AM_ABOUT_AUTHOR_NAME", "Author Name"); +define ( "_AM_ABOUT_AUTHOR_WORD", "Author Word"); +define ( "_AM_ABOUT_CHANGELOG", "Change Log"); +define ( "_AM_ABOUT_MODULE_INFO", "Module Info"); +define ( "_AM_ABOUT_AUTHOR_INFO", "Author Info"); +define ( "_AM_ABOUT_DISCLAIMER", "Disclaimer"); +define ( "_AM_ABOUT_DISCLAIMER_TEXT", "GPL Licensed - No Warranty"); // perm.php -define('_AM_ISTATS_PERM2','enabled \' view '); +define ( '_AM_ISTATS_PERM2', 'enabled \' view '); // permission -define("_AM_ISTATS_PERM_4","Description"); -define("_AM_ISTATS_PERM_8","Traffic Stats"); -define("_AM_ISTATS_PERM_16","System"); +define ( "_AM_ISTATS_PERM_4","Description"); +define ( "_AM_ISTATS_PERM_8","Traffic Stats"); +define ( "_AM_ISTATS_PERM_16","System"); +define ("_AM_ISTATS_TEST","Your system supports the following languages"); //1.07 -define("_AM_ISTATS_KB","KB"); -define("_AM_ISTATS_MB","MB"); \ No newline at end of file +define ( "_AM_ISTATS_KB", "KB"); +define ( "_AM_ISTATS_MB", "MB"); \ No newline at end of file Modified: XoopsModules/TDMStats/trunk/TDMStats/language/english/main.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/language/english/main.php 2012-08-24 17:40:00 UTC (rev 10096) +++ XoopsModules/TDMStats/trunk/TDMStats/language/english/main.php 2012-08-24 19:57:46 UTC (rev 10097) @@ -1,4 +1,4 @@ -<?php +<?php /** * **************************************************************************** * - TDMStats By TDM - TEAM DEV MODULE FOR XOOPS @@ -20,114 +20,118 @@ */ // text of top head -define('_AM_TRAFFIC_REPORT','Traffic Report Site'); -define('_AM_SUMMARY','Summary'); -define('_AM_REFERER','References'); -define('_AM_VISITOR_INFO','System'); -define('_AM_TRAFFIC','Traffic Stats'); -define('_AM_LOCA','Location'); +define ( '_AM_TRAFFIC_REPORT', 'Traffic Report Site'); +define ( '_AM_SUMMARY', 'Summary'); +define ( '_AM_REFERER', 'References'); +define ( '_AM_VISITOR_INFO', 'System'); +define ( '_AM_TRAFFIC', 'Traffic Stats'); +define ( '_AM_LOCA', 'Location'); // text of stats topic -define('_AM_BY_TODAY_HOUR','Traffic Graph of Today'); -define('_AM_BY_DAY','Days of the Month'); -define('_AM_BY_WEEKDAY','Days of the Week'); -define('_AM_BY_WEEK','Weekly'); -define('_AM_BY_MTH','Monthly'); -define('_AM_BY_PAYS','Country Hits'); -define('_AM_BY_COUNTRY','Country / City'); -define('_AM_BY_REF','Visits by Referee'); -define('_AM_BY_HOUR','Hourly'); -define('_AM_BY_PAGE','Pages'); -define('_AM_BY_MODULE','Modules'); -define('_AM_BY_BROWSER','Browser'); -define('_AM_BY_OS','Operating System'); -define('_AM_BY_HOST','Hostname'); -define('_AM_FORECAST',"Today's Forcast"); +define ( '_AM_BY_TODAY_HOUR', 'Traffic Graph of Today'); +define ( '_AM_BY_DAY', 'Days of the Month'); +define ( '_AM_BY_WEEKDAY', 'Days of the Week'); +define ( '_AM_BY_WEEK', 'Weekly'); +define ( '_AM_BY_MTH', 'Monthly'); +define ( '_AM_BY_PAYS', 'Country Hits'); +define ( '_AM_BY_COUNTRY', 'Country / City'); +define ( '_AM_BY_REF', 'Visits by Referee'); +define ( '_AM_BY_HOUR', 'Hourly'); +define ( '_AM_BY_PAGE', 'Pages'); +define ( '_AM_BY_MODULE', 'Modules'); +define ( '_AM_BY_BROWSER', 'Browser'); +define ( '_AM_BY_OS', 'Operating System'); +define ( '_AM_BY_HOST', 'Hostname'); +define ( '_AM_FORECAST', "Today's Forcast"); // text of summary -define('_AM_STATS_INFO','Overview'); -define('_AM_SITENAME','Website'); -define('_AM_NOW','Today'); -define('_AM_MAX_DATE','Best Day'); -define('_AM_MAX_DAYCOUNT','Best Day Hits'); -define('_AM_MAX_WEEK','Best Week'); -define('_AM_MAX_WEEKCOUNT','Best Week Hits'); -define('_AM_MAX_MTH','Best Month'); -define('_AM_MAX_MTHCOUNT','Best Month Hits'); -define('_AM_TOTAL_DAYS','Total Days'); -define('_AM_TOTAL_VISITS','Total Hits'); -define('_AM_TODAY','Visitors Today'); -define('_AM_THIS_WEEK','Visitors this Week'); -define('_AM_THIS_MTH','Visitors this Month'); -define('_AM_AVE_HOUR','Average Hits per hour'); -define('_AM_AVE_DAY','Average Hits per day'); -define('_AM_AVE_WEEK','Average Hits per week'); -define('_AM_AVE_MTH','Average Hits per month'); -define('_AM_PER_HOUR','Visits per hour'); +define ( '_AM_STATS_INFO', 'Overview'); +define ( '_AM_SITENAME', 'Website'); +define ( '_AM_NOW', 'Today'); +define ( '_AM_MAX_DATE', 'Best Day'); +define ( '_AM_MAX_DAYCOUNT', 'Best Day Hits'); +define ( '_AM_MAX_WEEK', 'Best Week'); +define ( '_AM_MAX_WEEKCOUNT', 'Best Week Hits'); +define ( '_AM_MAX_MTH', 'Best Month'); +define ( '_AM_MAX_MTHCOUNT', 'Best Month Hits'); +define ( '_AM_TOTAL_DAYS', 'Total Days'); +define ( '_AM_TOTAL_VISITS', 'Total Hits'); +define ( '_AM_TODAY', 'Visitors Today'); +define ( '_AM_THIS_WEEK', 'Visitors this Week'); +define ( '_AM_THIS_MTH', 'Visitors this Month'); +define ( '_AM_AVE_HOUR', 'Average Hits per hour'); +define ( '_AM_AVE_DAY', 'Average Hits per day'); +define ( '_AM_AVE_WEEK', 'Average Hits per week'); +define ( '_AM_AVE_MTH', 'Average Hits per month'); +define ( '_AM_PER_HOUR', 'Visits per hour'); // text of "Visits by day" section -define('_AM_DATE_DATE','Date'); -define('_AM_DATE_VISITS','Hits'); -define('_AM_DATE_PERCENT','Percent'); +define ( '_AM_DATE_DATE', 'Date'); +define ( '_AM_DATE_VISITS', 'Hits'); +define ( '_AM_DATE_PERCENT', 'Percent'); // text of "Visits by week" section -define('_AM_WEEK_WEEK','Week'); -define('_AM_WEEK_VISITS','Hits'); +define ( '_AM_WEEK_WEEK', 'Week'); +define ( '_AM_WEEK_VISITS', 'Hits'); // Text of "Visits by month" section -define('_AM_MTH_MTH','Month'); -define('_AM_MTH_VISITS','Hits'); +define ( '_AM_MTH_MTH', 'Month'); +define ( '_AM_MTH_VISITS', 'Hits'); // Text of "Visits by Referer" section -define('_AM_REF_VISITS','Hits'); -define('_AM_REF_PERCENT','Percent'); -define('_AM_REF_REF','Contact'); +define ( '_AM_REF_VISITS', 'Hits'); +define ( '_AM_REF_PERCENT', 'Percent'); +define ( '_AM_REF_REF', 'Contact'); // text of "Visits by hour" section -define('_AM_HR_HOUR','Time'); -define('_AM_HR_VISITS','Hits'); -define('_AM_VS','vs'); +define ( '_AM_HR_HOUR', 'Time'); +define ( '_AM_HR_VISITS', 'Hits'); +define('_AM_VS', 'vs'); // text of "Visits by week-days" section -define('_AM_WD_1','Monday'); -define('_AM_WD_2','Tuesday'); -define('_AM_WD_3','Wednesday'); -define('_AM_WD_4','Thursday'); -define('_AM_WD_5','Friday'); -define('_AM_WD_6','Saturday'); -define('_AM_WD_7','Sunday'); +define ( '_AM_WD_1', 'Monday'); +define ( '_AM_WD_2', 'Tuesday'); +define ( '_AM_WD_3', 'Wednesday'); +define ( '_AM_WD_4', 'Thursday'); +define ( '_AM_WD_5', 'Friday'); +define ( '_AM_WD_6', 'Saturday'); +define ( '_AM_WD_7', 'Sunday'); // Text of "Visits by pages" section -define('_AM_P_VISITS','Hits'); -define('_AM_P_PERCENT','Percent'); -define('_AM_P_PAGE','Total Pages'); +define ( '_AM_P_VISITS', 'Hits'); +define ( '_AM_P_PERCENT', 'Percent'); +define ( '_AM_P_PAGE', 'Total Pages'); // Text of "Browser" section -define('_AM_BRO_BRO','Browser'); +define ( '_AM_BRO_BRO', 'Browser'); // text of "OS" section -define('_AM_OS_OS','Operating System'); +define ( '_AM_OS_OS', 'Operating System'); // Text of "Screen Width" section -define('_AM_SW_SW','Screen Resolution'); +define ( '_AM_SW_SW', 'Screen Resolution'); // Text of "Color Screen" section -define('_AM_SC_SC','Color Screen'); +define ( '_AM_SC_SC', 'Color Screen'); // Text of "hostname" section -define('_AM_HOST_HOST','Hostname'); -define('_AM_HOST_IP','IP only'); +define ( '_AM_HOST_HOST', 'Hostname'); +define ( '_AM_HOST_IP', 'IP only'); // Text of "Forecast for today" section -define('AM_AVE','An average'); -define('AM_DAILY_VISIT','visits take place before'); -define('AM_BAS_NBR','Based on a number of'); -define('AM_SO_FAR','visitors at the moment, your site should reach'); -define('AM_PAGE_VIEW','page views.'); +define ( 'AM_AVE', 'An average'); +define ( 'AM_DAILY_VISIT', 'visits take place before'); +define ( 'AM_BAS_NBR', 'Based on a number of'); +define ( 'AM_SO_FARE', 'visitors at the moment, your site should reach'); +define ( 'AM_PAGE_VIEW', 'page views.'); // perm -define("_AM_QUERYNOPERM","You do not have permission for this action"); +define ( "_AM_QUERYNOPERM", "You do not have permission for this action"); //Version 1.6 define('_AM_VIEW', 'View the row'); -?> \ No newline at end of file +define('_AM_P_LE', 'The'); +//version 1.7 +define('_AM_BY_USER', 'Users'); +define('_AM_BY_TODAY_USER', 'Users Today'); +define('_AM_P_A', 'At'); Modified: XoopsModules/TDMStats/trunk/TDMStats/language/english/modinfo.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/language/english/modinfo.php 2012-08-24 17:40:00 UTC (rev 10096) +++ XoopsModules/TDMStats/trunk/TDMStats/language/english/modinfo.php 2012-08-24 19:57:46 UTC (rev 10097) @@ -1,4 +1,4 @@ -<?php +<?php /** * **************************************************************************** * - TDMStats By TDM - TEAM DEV MODULE FOR XOOPS @@ -20,45 +20,55 @@ */ // The name of this module -define("_MI_ISTATS_NAME","TDMStats"); -define("_MI_ISTATS_CNT","Stats Counter"); +define ( "_MI_ISTATS_NAME", "TDMStats"); +define ( "_MI_ISTATS_CNT", "Stats Counter"); // A brief description of this module -define("_MI_ISTATS_DESC","Statistics of visits"); +define ( "_MI_ISTATS_DESC", "Statistics of visits"); // menu // The name of this module -define('_MI_ISTATS_INDEX','Management'); -define('_MI_ISTATS_PLUG','Plugins'); -define('_MI_ISTATS_PERMISSIONS','Permissions'); -define('_MI_ISTATS_ABOUT','About'); -define('_MI_ISTATS_PREF','Preferences'); +define ( '_MI_ISTATS_INDEX', 'Management'); +define ( '_MI_ISTATS_PLUG', 'Plugins'); +define ( '_MI_ISTATS_PERMISSIONS', 'Permissions'); +define ( '_MI_ISTATS_ABOUT', 'About'); +define ( '_MI_ISTATS_PREF', 'Preferences'); // A brief description of this module -define("_MI_ISTATS_COOKIE_MENU","Config Cookie"); +define ( "_MI_ISTATS_COOKIE_MENU", "Config Cookie"); -define("_MI_ISTATS_DATE","Date format"); -define("_MI_ISTATS_PIE","Format of the chart:"); -define("_MI_ISTATS_PIE_3D","3D"); -define("_MI_ISTATS_PIE_SIMPLE","Simple"); -define("_MI_ISTATS_DATE_DESC","Choose between the date format <b> EN </ b> (d / m / YG: i) or the date format <b> U.S. </ b> (Y / n / dg: ia) "); -define("_MI_ISTATS_DATE_US","U.S."); -define("_MI_ISTATS_DATE_FR","FR"); -define("_MI_ISTATS_MAXPAGE","Choose the number of stats to display"); -define("_MI_ISTATS_MAXSESSION","Determine the lifetime of session in seconds (eg 1 hour = 3600)"); -define("_MI_ISTATS_MAXSESSION_DESC","The user will not be counted during this time"); -define("_MI_ISTATS_MAXBG","Choose the color of plants without arriere #"); -define("_MI_ISTATS_MAXUSER","Count the admins:"); -define("_MI_ISTATS_MAXHEIGHT","Choose the maximum height."); -define("_MI_ISTATS_MAXWIDTH","Choose the maximum width."); -define("_MI_ISTATS_MAXCOLOR","Choose colors used to separate by |"); +define ( "_MI_ISTATS_DATE", "Date format"); +define ( "_MI_ISTATS_PIE", "Format of the chart:"); +define ( "_MI_ISTATS_PIE_3D", "3D"); +define ( "_MI_ISTATS_PIE_SIMPLE", "Simple"); +define ( "_MI_ISTATS_DATE_DESC", "Choose between the date format <b> EN </ b> (d / m / YG: i) or the date format <b> U.S. </ b> (Y / n / dg: ia) "); +define ( "_MI_ISTATS_DATE_US", "U.S."); +define ( "_MI_ISTATS_DATE_FR", "FR"); +define ( "_MI_ISTATS_MAXPAGE", "Choose the number of stats to display"); +define ( "_MI_ISTATS_MAXSESSION", "Determine the lifetime of session in seconds (eg 1 hour = 3600)"); +define ( "_MI_ISTATS_MAXSESSION_DESC", "The user will not be counted during this time"); +define ( "_MI_ISTATS_MAXBG", "Choose the color of plants without arriere #"); +define ( "_MI_ISTATS_MAXUSER", "Count the admins:"); +define ( "_MI_ISTATS_MAXHEIGHT", "Choose the maximum height."); +define ( "_MI_ISTATS_MAXWIDTH", "Choose the maximum width."); +define ( "_MI_ISTATS_MAXCOLOR", "Choose colors used to separate by |"); define("_MI_ISTATS_ONGLET","Style Tabs:"); // define("_MI_ISTATS_MAXLABEL","View chart label:"); define("_MI_ISTATS_MAXTITLE","Show chart title:"); // -define('_MI_ISTATS_SUMMARY', 'Sum'); -define('_MI_ISTATS_SYSTEM', 'System'); -define('_MI_ISTATS_TRAFFIC', 'Traffic stats'); -?> \ No newline at end of file +define('_MI_ISTATS_SUMMARY','Sum'); +define('_MI_ISTATS_SYSTEM','System'); +define('_MI_ISTATS_TRAFFIC','Traffic stats'); + +define("_MI_ISTATS_SETLOCAL","Choose your location:"); + + +//version 1.6 +define("_MI_ISTATS_BAR","Bar style:"); +// +define("_MI_ISTATS_MAXUSERCOUNT","Max number of times/day:"); +define("_MI_ISTATS_NEWUSER","Last registered user"); +define("_MI_ISTATS_NOWONLINE","Currently online"); +define("_MI_ISTATS_USERONLINE","Online Today"); \ No newline at end of file Modified: XoopsModules/TDMStats/trunk/TDMStats/language/french/admin.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/language/french/admin.php 2012-08-24 17:40:00 UTC (rev 10096) +++ XoopsModules/TDMStats/trunk/TDMStats/language/french/admin.php 2012-08-24 19:57:46 UTC (rev 10097) @@ -81,4 +81,6 @@ define("_AM_ISTATS_PERM_16","Système"); define("_AM_ISTATS_TEST","Votre système accepte les langues suivantes"); -?> \ No newline at end of file +//1.07 +define ( "_AM_ISTATS_KB", "KB"); +define ( "_AM_ISTATS_MB", "MB"); \ No newline at end of file Modified: XoopsModules/TDMStats/trunk/TDMStats/language/french/modinfo.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/language/french/modinfo.php 2012-08-24 17:40:00 UTC (rev 10096) +++ XoopsModules/TDMStats/trunk/TDMStats/language/french/modinfo.php 2012-08-24 19:57:46 UTC (rev 10097) @@ -67,6 +67,4 @@ define("_MI_ISTATS_SETLOCAL","Choisissez votre localité"); define("_MI_ISTATS_NEWUSER","Dernier utilisateur inscrit"); define("_MI_ISTATS_NOWONLINE","Actuellement onligne"); -define("_MI_ISTATS_USERONLINE","Onligne aujourd'hui"); - -?> +define("_MI_ISTATS_USERONLINE","Onligne aujourd'hui"); \ No newline at end of file Modified: XoopsModules/TDMStats/trunk/TDMStats/language/persian/admin.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/language/persian/admin.php 2012-08-24 17:40:00 UTC (rev 10096) +++ XoopsModules/TDMStats/trunk/TDMStats/language/persian/admin.php 2012-08-24 19:57:46 UTC (rev 10097) @@ -18,64 +18,68 @@ * * **************************************************************************** */ -define("_AM_ISTATS_NAVPREFERENCES","ویژگی ها"); -define("_AM_ISTATS_NAVPERMISSIONS","دسترسی ها"); +define ( "_AM_ISTATS_NAVPREFERENCES", "ویژگی ها"); +define ( "_AM_ISTATS_NAVPERMISSIONS", "دسترسی ها"); -define("_AM_ISTATS_COOKIE_CONF","تغییرات در کوکی ها"); -define("_AM_ISTATS_COOKIE","تغییرات در کوکی ها"); -define("_AM_ISTATS_COOKIE_DESC","زمان نگهداری کوکی ها را به ثانیه مشخص کنید. (برای مثال یک ساعت=3600 ثانیه)"); -define("_AM_ISTATS_SAVE","ذخیره سازی"); -define("_AM_ISTATS_CANCEL","انصراف"); -define("_AM_ISTATS_CONFIG","تنظیمات ماژول"); -define("_AM_GENERALCONF","تنظیمات کلی"); -define("_AM_ISTATS_NOTUPDATED","فایل config.php تغییری نکرده است!<br />قابل نوشتن نیست!<br />لطفاً تنظیمات دسترسی آنرا اصلاح کنید (chmod 777)"); -define("_AM_ISTATS_UPDATED","فایل config.php اصلاح شد."); +define ( "_AM_ISTATS_COOKIE_CONF","تغییرات در کوکی ها"); +define ( "_AM_ISTATS_COOKIE","تغییرات در کوکی ها"); +define ( "_AM_ISTATS_COOKIE_DESC","زمان نگهداری کوکی ها را به ثانیه مشخص کنید. (برای مثال یک ساعت=3600 ثانیه)"); +define ( "_AM_ISTATS_SAVE","ذخیره سازی"); +define ( "_AM_ISTATS_CANCEL","انصراف"); +define ( "_AM_ISTATS_CONFIG","تنظیمات ماژول"); +define ( "_AM_GENERALCONF","تنظیمات کلی"); +define ( "_AM_ISTATS_NOTUPDATED","فایل config.php تغییری نکرده است!<br />قابل نوشتن نیست!<br />لطفاً تنظیمات دسترسی آنرا اصلاح کنید (chmod 777)"); +define ( "_AM_ISTATS_UPDATED","فایل config.php اصلاح شد."); // index.php -define("_AM_ISTATS_INDEXDESC","صفحه اصلی ماژول"); -define("_AM_ISTATS_TABLE","نام جدول"); -define("_AM_ISTATS_LENGTH","اندازه فایل اطلاعات"); -define("_AM_ISTATS_FREE","آخرین فاصله"); -define("_AM_ISTATS_TOTAL","مجموع فایل اطلاعات"); -define("_AM_ISTATS_OPT","بهینه"); +define ( "_AM_ISTATS_INDEXDESC", "صفحه اصلی ماژول"); +define ( "_AM_ISTATS_TABLE", "نام جدول"); +define ( "_AM_ISTATS_LENGTH", "اندازه فایل اطلاعات"); +define ( "_AM_ISTATS_FREE", "آخرین فاصله"); +define ( "_AM_ISTATS_TOTAL", "مجموع فایل اطلاعات"); +define ( "_AM_ISTATS_OPT", "بهینه"); -define("_AM_ISTATS_BASE","تغییرات شما با موفقیت ذخیره شد"); -define("_AM_ISTATS_BASEERROR","خطا: تغییرات شما ذخیره نشد"); +define ( "_AM_ISTATS_BASE", "تغییرات شما با موفقیت ذخیره شد"); +define ( "_AM_ISTATS_BASEERROR", "خطا: تغییرات شما ذخیره نشد"); -define("_AM_ISTATS_ABOUT","درباره ماژول"); -define("_AM_ISTATS_UPDATE","به روز رسانی ماژول"); -define("_AM_ISTATS_PERM","مدیریت دسترسی ها"); -define('_AM_ISTATS_PLUG','مدیریت افزونه ها'); +define ( "_AM_ISTATS_ABOUT", "درباره ماژول"); +define ( "_AM_ISTATS_UPDATE", "به روز رسانی ماژول"); +define ( "_AM_ISTATS_PERM", "مدیریت دسترسی ها"); +define ( '_AM_ISTATS_PLUG', 'مدیریت افزونه ها'); // plug.php -define('_AM_ISTATS_PLUGHELP','<b> توجه: </ b> به یاد داشته باشید کپی کد "<b><{xoStats}></b> " در فایل theme.html راه دیگر اجرا آمار برای بازدید کنندگان است.'); -define('_AM_ISTATS_PLUGERROR','لطفا فایل "xoops_plugins / function.xoStats.php" را در مسیر, "/ class / smarty / xoops_plugins /" کپی نمایید'); -define('_AM_ISTATS_PLUGOK','افزونه با موفقیت نصب شده است.'); -define('_AM_ISTATS_PLUGETAT','آمار به وسیله افزونه'); +define ( '_AM_ISTATS_PLUGHELP', '<b> توجه: </ b> به یاد داشته باشید کپی کد "<b><{xoStats}></b> " در فایل theme.html راه دیگر اجرا آمار برای بازدید کنندگان است.'); +define ( '_AM_ISTATS_PLUGERROR', 'لطفا فایل "xoops_plugins / function.xoStats.php" را در مسیر, "/ class / smarty / xoops_plugins /" کپی نمایید'); +define ( '_AM_ISTATS_PLUGOK', 'افزونه با موفقیت نصب شده است.'); +define ( '_AM_ISTATS_PLUGETAT', 'آمار به وسیله افزونه'); // About (about.php) -define("_AM_ABOUT_RELEASEDATE","تاریخ انتشار"); -define("_AM_ABOUT_AUTHOR","سازنده"); -define("_AM_ABOUT_CREDITS","کپی رایت"); -define("_AM_ABOUT_README","اطلاعات اصلی"); -define("_AM_ABOUT_MANUAL","راهنمایی"); -define("_AM_ABOUT_LICENSE","مجوز"); -define("_AM_ABOUT_MODULE_STATUS","وضعیت"); -define("_AM_ABOUT_WEBSITE","وب سایت"); -define("_AM_ABOUT_AUTHOR_NAME","نام سازنده"); -define("_AM_ABOUT_AUTHOR_WORD","دنیای سازنده"); -define("_AM_ABOUT_CHANGELOG","گزارش تغییرات"); -define("_AM_ABOUT_MODULE_INFO","اطلاعات ماژول"); -define("_AM_ABOUT_AUTHOR_INFO","اطلاعات سازنده"); -define("_AM_ABOUT_DISCLAIMER","سلب مسئولیت"); -define("_AM_ABOUT_DISCLAIMER_TEXT","مجوز GPL - بدون ضمانت"); +define ( "_AM_ABOUT_RELEASEDATE", "تاریخ انتشار"); +define ( "_AM_ABOUT_AUTHOR", "سازنده"); +define ( "_AM_ABOUT_CREDITS", "کپی رایت"); +define ( "_AM_ABOUT_README", "اطلاعات اصلی"); +define ( "_AM_ABOUT_MANUAL", "راهنمایی"); +define ( "_AM_ABOUT_LICENSE", "مجوز"); +define ( "_AM_ABOUT_MODULE_STATUS", "وضعیت"); +define ( "_AM_ABOUT_WEBSITE", "وب سایت"); +define ( "_AM_ABOUT_AUTHOR_NAME", "نام سازنده"); +define ( "_AM_ABOUT_AUTHOR_WORD", "دنیای سازنده"); +define ( "_AM_ABOUT_CHANGELOG", "گزارش تغییرات"); +define ( "_AM_ABOUT_MODULE_INFO", "اطلاعات ماژول"); +define ( "_AM_ABOUT_AUTHOR_INFO", "اطلاعات سازنده"); +define ( "_AM_ABOUT_DISCLAIMER", "سلب مسئولیت"); +define ( "_AM_ABOUT_DISCLAIMER_TEXT", "مجوز GPL - بدون ضمانت"); // perm.php -define('_AM_ISTATS_PERM2','فعال سازی \' نمایش '); +define ( '_AM_ISTATS_PERM2', 'فعال سازی \' نمایش '); // permission -define("_AM_ISTATS_PERM_4","توضیحات"); -define("_AM_ISTATS_PERM_8","آمار ترافیک"); -define("_AM_ISTATS_PERM_16","سیستم"); -?> +define ( "_AM_ISTATS_PERM_4", "توضیحات"); +define ( "_AM_ISTATS_PERM_8", "آمار ترافیک"); +define ( "_AM_ISTATS_PERM_16", "سیستم"); +define ("_AM_ISTATS_TEST","Your system supports the following languages"); + +//1.07 +define ( "_AM_ISTATS_KB", "KB"); +define ( "_AM_ISTATS_MB", "MB"); \ No newline at end of file Modified: XoopsModules/TDMStats/trunk/TDMStats/language/spanish/admin.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/language/spanish/admin.php 2012-08-24 17:40:00 UTC (rev 10096) +++ XoopsModules/TDMStats/trunk/TDMStats/language/spanish/admin.php 2012-08-24 19:57:46 UTC (rev 10097) @@ -19,64 +19,68 @@ * Traducido por Hispaxoops www.hispaxoops.com - Don Curioso * **************************************************************************** */ -define("_AM_ISTATS_NAVPREFERENCES","Preferencias"); -define("_AM_ISTATS_NAVPERMISSIONS","Permisos"); +define ( "_AM_ISTATS_NAVPREFERENCES", "Preferencias"); +define ( "_AM_ISTATS_NAVPERMISSIONS", "Permisos"); -define("_AM_ISTATS_COOKIE_CONF","Ajuste de la galleta"); -define("_AM_ISTATS_COOKIE","Ajustando la galleta"); -define("_AM_ISTATS_COOKIE_DESC","Determina el tiempo de vida de tu galleta en segundos (ej 1 hora = 3600)"); -define("_AM_ISTATS_SAVE","Grabar"); -define("_AM_ISTATS_CANCEL","Cancelar"); -define("_AM_ISTATS_CONFIG","Configurando el m�dulo"); -define("_AM_GENERALCONF","Configuraci�n general"); -define("_AM_ISTATS_NOTUPDATED","El archivo config.php no ha sido encontrado! <br /> Por favor, verifique los permisos de archivos (chmod 666) o del directorio del cach� (chmod 777) "); -define("_AM_ISTATS_UPDATED","Archivo config.php actualizado"); +define ( "_AM_ISTATS_COOKIE_CONF", "Ajuste de la galleta"); +define ( "_AM_ISTATS_COOKIE", "Ajustando la galleta"); +define ( "_AM_ISTATS_COOKIE_DESC", "Determina el tiempo de vida de tu galleta en segundos (ej 1 hora = 3600)"); +define ( "_AM_ISTATS_SAVE", "Grabar"); +define ( "_AM_ISTATS_CANCEL", "Cancelar"); +define ( "_AM_ISTATS_CONFIG", "Configurando el m\xF3dulo"); +define ( "_AM_GENERALCONF", "Configuraci\xF3n general"); +define ( "_AM_ISTATS_NOTUPDATED", "El archivo config.php no ha sido encontrado! <br /> Por favor, verifique los permisos de archivos (chmod 666) o del directorio del cach\xE9 (chmod 777) "); +define ( "_AM_ISTATS_UPDATED", "Archivo config.php actualizado"); // index.php -define("_AM_ISTATS_INDEXDESC","Inicio del m�dulo"); -define("_AM_ISTATS_TABLE","Nombre de la tabla"); -define("_AM_ISTATS_LENGTH","TAma�o del archivo de datos"); -define("_AM_ISTATS_FREE","Espacio libre"); -define("_AM_ISTATS_TOTAL","Archivo total"); -define("_AM_ISTATS_OPT","Optimizar"); +define ( "_AM_ISTATS_INDEXDESC", "Inicio del m\xF3dulo"); +define ( "_AM_ISTATS_TABLE", "Nombre de la tabla"); +define ( "_AM_ISTATS_LENGTH", "TAma\xF1o del archivo de datos"); +define ( "_AM_ISTATS_FREE", "Espacio libre"); +define ( "_AM_ISTATS_TOTAL", "Archivo total"); +define ( "_AM_ISTATS_OPT", "Optimizar"); -define("_AM_ISTATS_BASE","Los cambios han sido grabados"); -define("_AM_ISTATS_BASEERROR","Error:No se han grabado los cambios"); +define ( "_AM_ISTATS_BASE", "Los cambios han sido grabados"); +define ( "_AM_ISTATS_BASEERROR", "Error:No se han grabado los cambios"); -define("_AM_ISTATS_ABOUT","Acerca del m�dulo"); -define("_AM_ISTATS_UPDATE","Actualizar el m�dulo"); -define("_AM_ISTATS_PERM","Manejar permisos"); -define('_AM_ISTATS_PLUG','Plugin'); +define ( "_AM_ISTATS_ABOUT", "Acerca del m\xF3dulo"); +define ( "_AM_ISTATS_UPDATE", "Actualizar el m\xF3dulo"); +define ( "_AM_ISTATS_PERM", "Manejar permisos"); +define ( '_AM_ISTATS_PLUG', 'Plugin'); // plug.php -define('_AM_ISTATS_PLUGHELP','<b> Nota: </b> Recuerda, para que funcione, tienes que incluir el c�digo < xoStats () > en tu theme.html - Recuerda que tienes que eliminar los espacios que hay entre < x �Y! ) >'); -define('_AM_ISTATS_PLUGERROR','Copia el archivo "xoops_plugins / function.xoStats.php" en la ra�z de tu sitio "/ class / smarty / xoops_plugins /"'); -define('_AM_ISTATS_PLUGOK','Plugin instalado'); -define('_AM_ISTATS_PLUGETAT','Estado del plugin'); +define ( '_AM_ISTATS_PLUGHELP', '<b> Nota: </b> Recuerda, para que funcione, tienes que incluir el c\xF3digo < xoStats () > en tu theme.html - Recuerda que tienes que eliminar los espacios que hay entre < x \xA1Y! ) >'); +define ( '_AM_ISTATS_PLUGERROR', 'Copia el archivo "xoops_plugins / function.xoStats.php" en la ra\xEDz de tu sitio "/ class / smarty / xoops_plugins /"'); +define ( '_AM_ISTATS_PLUGOK', 'Plugin instalado'); +define ( '_AM_ISTATS_PLUGETAT', 'Estado del plugin'); // About (about.php) -define("_AM_ABOUT_RELEASEDATE","Fecha de la versi�n"); -define("_AM_ABOUT_AUTHOR","Autor"); -define("_AM_ABOUT_CREDITS","Creditos"); -define("_AM_ABOUT_README","Informaci�n general"); -define("_AM_ABOUT_MANUAL","Ayuda"); -define("_AM_ABOUT_LICENSE","Licencia"); -define("_AM_ABOUT_MODULE_STATUS","Estatus"); -define("_AM_ABOUT_WEBSITE","Sitio Web"); -define("_AM_ABOUT_AUTHOR_NAME","Autor"); -define("_AM_ABOUT_AUTHOR_WORD","Palabra del autor"); -define("_AM_ABOUT_CHANGELOG","Cambios en el registro"); -define("_AM_ABOUT_MODULE_INFO","Informaci�n del m�dulo"); -define("_AM_ABOUT_AUTHOR_INFO","Informaci�n del autor"); -define("_AM_ABOUT_DISCLAIMER","Cl�usula de exenci�n de responsabilidad "); -define("_AM_ABOUT_DISCLAIMER_TEXT","Licencia GPL - Sin garant�as"); +define ( "_AM_ABOUT_RELEASEDATE", "Fecha de la versi\xF3n"); +define ( "_AM_ABOUT_AUTHOR", "Autor"); +define ( "_AM_ABOUT_CREDITS", "Creditos"); +define ( "_AM_ABOUT_README", "Informaci\xF3n general"); +define ( "_AM_ABOUT_MANUAL", "Ayuda"); +define ( "_AM_ABOUT_LICENSE", "Licencia"); +define ( "_AM_ABOUT_MODULE_STATUS", "Estatus"); +define ( "_AM_ABOUT_WEBSITE", "Sitio Web"); +define ( "_AM_ABOUT_AUTHOR_NAME", "Autor"); +define ( "_AM_ABOUT_AUTHOR_WORD", "Palabra del autor"); +define ( "_AM_ABOUT_CHANGELOG", "Cambios en el registro"); +define ( "_AM_ABOUT_MODULE_INFO", "Informaci\xF3n del m\xF3dulo"); +define ( "_AM_ABOUT_AUTHOR_INFO", "Informaci\xF3n del autor"); +define ( "_AM_ABOUT_DISCLAIMER", "Cl\xE1usula de exenci\xF3n de responsabilidad "); +define ( "_AM_ABOUT_DISCLAIMER_TEXT", "Licencia GPL - Sin garant\xEDas"); // perm.php -define('_AM_ISTATS_PERM2','Permisos'); +define ( '_AM_ISTATS_PERM2', 'Permisos'); // permission -define("_AM_ISTATS_PERM_4","Descripci�n"); -define("_AM_ISTATS_PERM_8","Estad�sticas del tr�fico"); -define("_AM_ISTATS_PERM_16","Sistema"); -?> +define ( "_AM_ISTATS_PERM_4", "Descripci\xF3n"); +define ( "_AM_ISTATS_PERM_8", "Estad\xEDsticas del tr\xE1fico"); +define ( "_AM_ISTATS_PERM_16", "Sistema"); +define("_AM_ISTATS_TEST","Your system supports the following languages"); + +//1.07 +define ( "_AM_ISTATS_KB", "KB"); +define ( "_AM_ISTATS_MB", "MB"); \ 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-08-25 09:40:24
|
Revision: 10098 http://xoops.svn.sourceforge.net/xoops/?rev=10098&view=rev Author: lord_venom Date: 2012-08-25 09:40:16 +0000 (Sat, 25 Aug 2012) Log Message: ----------- counter fix Modified Paths: -------------- XoopsModules/TDMStats/trunk/TDMStats/blocks/TDMStats_blocks.php XoopsModules/TDMStats/trunk/TDMStats/counter.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/templates/tdmstats_stats.html XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_summary.html Modified: XoopsModules/TDMStats/trunk/TDMStats/blocks/TDMStats_blocks.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/blocks/TDMStats_blocks.php 2012-08-24 19:57:46 UTC (rev 10097) +++ XoopsModules/TDMStats/trunk/TDMStats/blocks/TDMStats_blocks.php 2012-08-25 09:40:16 UTC (rev 10098) @@ -233,7 +233,7 @@ $userid = !empty($user_info[$i]['userid']) ? XoopsUser::getUnameFromId($user_info[$i]['userid']) : XoopsUser::getUnameFromId(); //$count = $user_info[$i]['count'] ; - $count = gmstrftime( "%H H %M mn %S s", $user_info[$i]['count']); + $count = strftime( "%H H %M mn %S s", $user_info[$i]['count'] * 60); $times .= "<b>".$userid."</b>: ".$count.", "; //$hour['hour'][] = $hour_info[$i]['hour']; //$hour['percent'][] = round($hour_percent, '2'); Modified: XoopsModules/TDMStats/trunk/TDMStats/counter.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/counter.php 2012-08-24 19:57:46 UTC (rev 10097) +++ XoopsModules/TDMStats/trunk/TDMStats/counter.php 2012-08-25 09:40:16 UTC (rev 10098) @@ -53,11 +53,14 @@ if ($check2) { if($userid) { mysql_query("UPDATE ".XOOPS_DB_PREFIX."_TDMStats_usercount SET userid='$userid', count=count+'$count' WHERE ip='$ip'"); + $_SESSION['start'] = time(); }else { mysql_query("UPDATE ".XOOPS_DB_PREFIX."_TDMStats_usercount SET count=count+'$count' WHERE ip='$ip'"); + $_SESSION['start'] = time(); } } else { mysql_query("INSERT INTO ".XOOPS_DB_PREFIX."_TDMStats_usercount VALUES('', '$userid', '$ip', '$date', $count)"); + $_SESSION['start'] = time(); } } Modified: XoopsModules/TDMStats/trunk/TDMStats/css/styles.css =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/css/styles.css 2012-08-24 19:57:46 UTC (rev 10097) +++ XoopsModules/TDMStats/trunk/TDMStats/css/styles.css 2012-08-25 09:40:16 UTC (rev 10098) @@ -13,7 +13,7 @@ } .Tableau p.legende {font-weight:bold} -.Tableau span.col1 {text-align:center; height:16px; width:200px; overflow:hidden;} +.Tableau span.col1 {text-align:center; height:16px; width:250px; overflow:hidden;} .Tableau span.col2 {text-align:left; height:16px; width:350px; background-image: url(../images/bg_fade.png); background-repeat: repeat-x; Modified: XoopsModules/TDMStats/trunk/TDMStats/include/stats.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/include/stats.php 2012-08-24 19:57:46 UTC (rev 10097) +++ XoopsModules/TDMStats/trunk/TDMStats/include/stats.php 2012-08-25 09:40:16 UTC (rev 10098) @@ -412,7 +412,7 @@ $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]['sum']); + $count = strftime( "%H H %M mn %S s", $user_info[$i]['sum'] * 60); //$hour['hour'][] = $hour_info[$i]['hour']; @@ -422,8 +422,25 @@ } } - } + } + + echo gmdate('d/m/Y H:i:s', $_SESSION['start'])."<br/>"; + echo gmdate('d/m/Y H:i:s', time())."<br/>"; // +//echo $total = round((time() - $_SESSION['start']) / 60); + //echo strftime( "%H H %M mn %S s", $total * 60); +//echo $difdate = (time()-$_SESSION['start'])/(60*60*24); // l +//$heure = intval(abs($total / 3600)); + +//$total = $total - ($heure * 3600); + +//$minute = intval(abs($total / 60)); + +//$total = $total - ($minute * 60); + +///$seconde = $total; +//echo "$heure H : $minute min : $seconde sec"; + $user_info = getResult("select *, SUM(count) AS sum from ".$xoopsDB->prefix("TDMStats_usercount")." GROUP BY ip order by count desc"); $user_total = getResult("select SUM(count) AS sum from ".$xoopsDB->prefix("TDMStats_usercount").""); @@ -439,7 +456,7 @@ } $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]['sum']); + $count = strftime( "%H H %M mn %S s", $user_info[$i]['sum'] * 60); 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'))); Modified: XoopsModules/TDMStats/trunk/TDMStats/include/summary.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/include/summary.php 2012-08-24 19:57:46 UTC (rev 10097) +++ XoopsModules/TDMStats/trunk/TDMStats/include/summary.php 2012-08-25 09:40:16 UTC (rev 10098) @@ -128,9 +128,9 @@ //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']); + $count = strftime( "%H H %M mn %S s", $user_info[$i]['count'] * 60); - $totalsecondes = $user_info[$i]['count']; + //$totalsecondes = $user_info[$i]['count']; //$hour['hour'][] = $hour_info[$i]['hour']; //$hour['percent'][] = round($hour_percent, '2'); Modified: XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_stats.html =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_stats.html 2012-08-24 19:57:46 UTC (rev 10097) +++ XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_stats.html 2012-08-25 09:40:16 UTC (rev 10098) @@ -133,7 +133,7 @@ <!--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> +<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('hour')"><{$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 /> @@ -198,7 +198,7 @@ </div></div><br style="clear: both;" /><br /></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> +<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('module')"><{$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 /> Modified: XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_summary.html =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_summary.html 2012-08-24 19:57:46 UTC (rev 10097) +++ XoopsModules/TDMStats/trunk/TDMStats/templates/tdmstats_summary.html 2012-08-25 09:40:16 UTC (rev 10098) @@ -14,56 +14,56 @@ <div class="Tableau"> <p class="legende"> <span class="col1"><{$smarty.const._AM_TOTAL_VISITS}></span> - <span class="col1"><{$total}></span> + <span class="col3"><{$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="col3"><{$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="col3"><{$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="col3"><{$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="col3"><{$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="col3"><{$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="col3"><{$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="col3"><{$max_mthcount}></span> <span class="col1"><{$smarty.const._AM_MAX_MTH}></span> <span class="col1"><{$max_mth}></span> </p> @@ -73,7 +73,7 @@ <!-- 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> +<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="javascript:;" 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}> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lor...@us...> - 2012-09-01 06:27:26
|
Revision: 10137 http://xoops.svn.sourceforge.net/xoops/?rev=10137&view=rev Author: lord_venom Date: 2012-09-01 06:27:16 +0000 (Sat, 01 Sep 2012) Log Message: ----------- purge Modified Paths: -------------- XoopsModules/TDMStats/trunk/TDMStats/include/stats.php XoopsModules/TDMStats/trunk/TDMStats/index.php Removed Paths: ------------- XoopsModules/TDMStats/trunk/TDMStats/include/GphpChart.class.php Deleted: XoopsModules/TDMStats/trunk/TDMStats/include/GphpChart.class.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/include/GphpChart.class.php 2012-08-30 07:57:41 UTC (rev 10136) +++ XoopsModules/TDMStats/trunk/TDMStats/include/GphpChart.class.php 2012-09-01 06:27:16 UTC (rev 10137) @@ -1,455 +0,0 @@ -<?php -/** - * **************************************************************************** - * - TDMStats By TDM - TEAM DEV MODULE FOR XOOPS - * - GNU Licence Copyright (c) (http://www.) - * - * La licence GNU GPL, garanti \xE0 l'utilisateur les droits suivants - * - * 1. La libert\xE9 d'ex\xE9cuter le logiciel, pour n'importe quel usage, - * 2. La libert\xE9 de l' \xE9tudier et de l'adapter \xE0 ses besoins, - * 3. La libert\xE9 de redistribuer des copies, - * 4. La libert\xE9 d'am\xE9liorer et de rendre publiques les modifications afin - * que l'ensemble de la communaut\xE9 en b\xE9n\xE9ficie. - * - * @copyright (http://www.tdmxoops.net) - * @license http://www.fsf.org/copyleft/gpl.html GNU public license - * @author TDM ; TEAM DEV MODULE - * - * **************************************************************************** - */ - -class GphpChart - { - var $chart; - var $chart_url; - var $legend_params = false; - var $world_params = false; - var $base_url = "http://chart.apis.google.com/chart?"; - var $width = 300; - var $height = 200; - var $types = array ("lc","lxy","bhs","bvs","bhg","bvg","p","p3","v","s", "t"); - var $chart_types = array('l' => 'line','b' => 'bar','p'=> 'pie','v' => 'venn','s' => 'scatter', 't' => 'world'); - var $mandatory_parameters = array('chs','chd','cht'); - var $data_prepared = false; - var $allowed_parameters = array( - 'l' => array('chtt','chdl','chco','chf','chxt','chg','chm','chls','chxp'), - 'b' => array('chtt','chbh','chdl','chco','chf','chxt','chxp','chm'), - 'p' => array('chtt','chco','chf','chl', 'chdl'), - 'v' => array('chtt','chdl','chco','chf'), - 's' => array('chtt','chdl','chco','chf','chxt','chg','chm','chxp'), - 't' => array('chtt','chco','chl', 'chld', 'chtm'), - ); - var $range = 1; - var $encodings = array( - 's' => array('sep' => '','set' => ',','range' => 61,'missing' => '_'), - 't' => array('sep' => ',','set' => '|','range' => 100,'missing' => -1), - 'e' => array('sep' => '','set' => ',','range' => 4096,'missing' => '__'), - ); - var $simple_encoding = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; - // min and max values of horizontal axis - var $max_xt = 0; - var $min_xt = 100000; // fake value to be sure we got the min data value - // min and max values for vertical axis - var $max_yr = 0; - var $min_yr = 100000; // fake value to be sure we got the min data value - var $ratio = false; - var $cached = true; - var $prepared = false; - - function GphpChart($type = 'lc',$encoding = 't') - { - $this->chart = (object) NULL; - // $chart = new stdClass(); - - if(!in_array($type,$this->types)) return false; - else $this->chart->cht = $type; - $this->chart_type = $this->chart_types[substr($this->chart->cht,0,1)]; - - if(!in_array($encoding,array_keys($this->encodings))) return false; - else $this->encoding = $encoding; - - $this->sep = $this->encodings[$this->encoding]['sep']; - $this->range = $this->encodings[$this->encoding]['range']; - $this->missing = $this->encodings[$this->encoding]['missing']; - $this->set = $this->encodings[$this->encoding]['set']; // set separator - if($this->chart_type == 'venn') $this->set = ','; - - - $string = $this->simple_encoding; - unset($this->simple_encoding); - for($i = 0;$i< strlen($string);$i++) $this->simple_encoding[] = $string[$i]; - - $this->extended_encoding = $this->simple_encoding; - $this->extended_encoding[] = '-'; $this->extended_encoding[] = '.'; $this->extended_encoding[] = '_'; $this->extended_encoding[] = ','; - } - - -/* PRE GENERATION : add labels, data, axis, etc */ - - function add_data($values,$color = '') - { - $this->cached = false; - $this->chart->chco = $color; - $this->datas[] = $values; - - } - - function add_labels($axis,$values) - { - $this->cached = false; - - // reverse order for Bar Horizontal - if($this->chart->cht == 'bhs' && is_string($values[0])) $values = array_combine(array_keys($values),array_reverse(array_values($values))); - $this->labels[$axis][] = $values; - - if($axis == 'x' || $axis == 't') - { - $this->max_xt = max($this->max_xt,max($values)); - $this->min_xt = min($this->min_xt,min($values)); - } - - // min and max values for vertical axis are calculated in prepare_data() - } - - function set_bar_width($width,$space = 0) - { - $this->cached = false; - $this->chart->chbh = (int) $width; - if($space != 0) $this->chart->chbh .= ','.$space; - } - function fill($area,$type,$params) - { - $this->cached = false; - $this->chart->chf[] = "$area,$type,$params"; - } - function add_legend($array, $params) - { - $this->cached = false; - $this->chart->chdl = implode($params.'|',$array); - } - - function legend_params($params) - { - $this->cached = false; - $this->chart->chdlp = "$params"; - } - - function world_params($params) - { - $this->cached = false; - $this->chart->chtm = "$params"; - } - - function add_style($string) - { - $this->cached = false; - if($this->chart_type == 'line') $this->chart->chls[] = $string; - } - function add_grid($string) - { - $this->cached = false; - if($this->chart_type == 'line' || $this->chart_type == 'scatter') $this->chart->chg[] = $string; - } - function add_marker($string) - { - $this->cached = false; - if($this->chart_type == 'line' || $this->chart_type == 'bar' || $this->chart_type == 'scatter') $this->chart->chm[] = $string; - } -/* END PRE GENERATION FUNCTIONS */ - - - - - -/* GENERATE FUNCTIONS : call prepare functions, prepare url, outputs url or full image string */ - function get_Image_URL() - { - if($this->cached) - { - if(!$this->filename) $this->generate_filename(); - return $this->filename; - } - else - { - if(!$this->prepared) $this->prepare(); - return $this->chart_url; - } - } - function get_Image_String() - { - if($this->cached) - { - if(!$this->filename) $this->generate_filename(); - $string = '<img width="70%" alt="'.$this->title.'" src="'.$this->filename.'" />'; - } - else - { - if(!$this->prepared) $this->prepare(); - $string = '<img width="70%" alt="'.@$this->title.'" src="'.$this->chart_url.'" />'; - } - return $string; - } - - function prepare() - { - if(!$this->data_prepared) $this->prepare_data(); - $this->prepare_labels(); - $this->prepare_title(); - $this->prepare_styles(); - $this->prepare_url(); - $this->prepared = true; - } -/* END GENERATE FUNCTIONS */ - - - /* CACHE FUNCTIONS */ - function generate_filename() - { - $this->filename = urlencode($this->title).'.png'; - } - - function save_Image() - { - if(!$this->filename) $this->generate_filename(); - /* get image file */ - //$this->chart_url = htmlspecialchars($this->chart_url); - //$this->chart_url = urlencode($this->chart_url); - - if( function_exists('file_get_contents') && $this->image_content = file_get_contents($this->chart_url) ) - $this->image_fetched = true; - - if(!$this->image_fetched) - { - if($fp = fopen($this->chart_url,'r')) - { - $this->image_content = fread($fp); - fclose($fp); - $this->image_fetched = true; - } - } - - /* write image to cache */ - if($this->image_fetched) - { - $fp = fopen($this->filename,'w+'); - if($fp) - { - fwrite($fp,$this->image_content); - fclose($fp); - } - else { return false; } - } - else { return false; } - - return true; - } - - -/* PREPARE FUNCTIONS : called by generate functions, these ones parse labels and data */ - function prepare_url() - { - $this->chart_url = $this->base_url; - /* - foreach($this->mandatory_parameters as $param) - { - if(!isset($this->chart->$param)) return false; - $params[] = $param.'='.$this->chart->$param; - } - */ - foreach($this->chart as $k => $v) - { - if($v != '') $params[] = "$k=$v"; - } - $this->chart_url .= implode('&',$params); - } - function prepare_styles() - { -// SIZE - - if(($this->width * $this->height) > 300000) - { - - // reduces dimensions to match API limits ( 300mpixels ) - $size = $this->width * $this->height; - $this->width = round($this->width * (300000 / $size),0); - $this->height = round($this->height * (300000 / $size),0); - } - $this->chart->chs = $this->width.'x'.$this->height; - -// colors - if(isset($this->chart->chco) && is_array($this->chart->chco)){ - $this->chart->chco = implode(',',$this->chart->chco); - } - if(isset($this->chart->chf) && is_array($this->chart->chf)) $this->chart->chf = implode('|',$this->chart->chf); - -// styles - if($this->chart_type == 'scatter' || $this->chart_type == 'bar' || $this->chart_type == 'line') - { - if($this->chart_type == 'line') if(isset($this->chart->chls) && count($this->chart->chls)) $this->chart->chls = implode('|',$this->chart->chls); - if(isset($this->chart->chg) && count($this->chart->chg)) $this->chart->chg = implode('|',$this->chart->chg); -// markers - if(isset($this->chart->chm) && count($this->chart->chm)) $this->chart->chm = implode('|',$this->chart->chm); - } - - - - } - - function prepare_size() - { - } - - function prepare_data() - { - // for lines charts, calculate ratio - if($this->chart_type == 'line' || $this->chart_type == 'bar' || $this->chart_type == 'scatter') - { - $this->max_yr = 0; - foreach($this->datas as $n => $data) - { - if($this->chart_type == 'scatter' && $n == 2) continue; // ignore min max values for plots sizes - $this->max_yr = max($this->max_yr,max($data)); - $this->min_yr = min($this->min_yr,min($data)); - } - $this->ratio = 0.9 * $this->range / $this->max_yr; - } - - foreach($this->datas as $n => $data) - { - if($this->chart_type == 'scatter' && $n == 2) $data = $this->encode_data($data,false); // do not normalize plots sizes - //else $data = $this->encode_data($data); - - if($this->chart->cht == 'lxy') - { - $this->datas[$n] = implode($this->sep,array_keys($data)).'|'.implode($this->sep,array_values($data)); - } - else $this->datas[$n] = implode($this->sep,$data); - } - - $this->chart->chd = "$this->encoding:"; - $this->chart->chd .= implode($this->set,$this->datas); - $this->data_prepared = true; - } - - - function prepare_labels() - { - //chxt= axis titles - //chxl= set:labels - //chxr= range - //chxp= positions - if(isset($this->labels)) { - $n = 0; - if(count($this->labels)) - foreach($this->labels as $axis => $labelles) - { - foreach($labelles as $pos => $labels) - { - // axis type - $this->chart->chxt[$n] = $axis; - if(!count($labels)) continue; // no values = "neither positions nor labels. The Chart API therefore assumes a range of 0 to 100 and spaces the values evenly." - // axis range - - - if($this->chart_type == 'line' || $this->chart_type == 'bar') - { - if($axis == 'x' || $axis == 't') - { - if($this->max_xt) $this->chart->chxr[$n] = $n.','.$this->min_xt.','.$this->max_xt; - } - else - { - if($this->max_yr) $this->chart->chxr[$n] = $n.','.$this->min_yr.','.$this->max_yr; - } - } - - // axis labels - if($this->chart_type == 'pie') - { - if ($axis == "p") { - $this->chart->chl[$n] = implode('|',$labels); - } - } - - if($this->chart_type == 'world') - { - $this->chart->chld[$n] = implode('|',$labels); - } - - $n++; - } - } - } - if(isset($this->chart->chxr)) $this->chart->chxr = implode('|',$this->chart->chxr); - if(isset($this->chart->chxp)) $this->chart->chxp = implode('|',$this->chart->chxp); - if(isset($this->chart->chxt)) $this->chart->chxt = implode(',',$this->chart->chxt); - if(isset($this->chart->chxl)) $this->chart->chxl = implode('|',$this->chart->chxl); - if(isset($this->chart->chl)) $this->chart->chl = implode(',',$this->chart->chl); - if(isset($this->chart->chld)) $this->chart->chld = implode('|',$this->chart->chld); - } - function prepare_title() - { - //chtt=first+line|second+line - if(isset($this->title)) { - $this->chart->chtt = str_replace(array("\n","\n\r",'<br />','<br>'),'|',$this->title); - $this->chart->chtt = str_replace(' ','+',$this->chart->chtt); - } - } - -/* END PREPARE FUNCTIONS */ - -/* ENCODING */ - function encode_data($data,$ratio = true) - { - if($this->encoding == 's') - { - foreach($data as $n => $value) - { - if(empty($value) || $value == '') $data[$n] = $this->missing; - else $data[$n] = $this->simple_encoding[$value]; - } - } - elseif($this->encoding == 't') - { - foreach($data as $n => $value) - { - - if(empty($value) || $value == '') $data[$n] = $this->missing; - elseif($ratio && $this->ratio) $data[$n] = (float) round($value * $this->ratio,1); - else $data[$n] = (float) $value; - } - } - elseif($this->encoding == 'e') - { - $max = 0; $min = 100000; - foreach($data as $n => $value) - { - if(empty($value) || $value == '') $data[$n] = $this->missing; - else - { - // normalize - if($ratio && $this->ratio) $value = round($value * $this->ratio,0); - // encode - $max = max($max,$value); - $min = min($min,$value); - $value = $this->extended_encode($value); - $data[$n] = $value; - } - } - } - return $data; - } - - function extended_encode($value) - { - $first = floor($value / 64); - $second = $value - ($first * 64); - $first = $this->extended_encoding[$first]; - $second = $this->extended_encoding[$second]; - return $first.$second; - } - - } - -?> Modified: XoopsModules/TDMStats/trunk/TDMStats/include/stats.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/include/stats.php 2012-08-30 07:57:41 UTC (rev 10136) +++ XoopsModules/TDMStats/trunk/TDMStats/include/stats.php 2012-09-01 06:27:16 UTC (rev 10137) @@ -475,7 +475,6 @@ } -// echo '<img src="include/gd.php" border = 5 width="800" heigth="600"> '; //////////////////////////////// ?> \ No newline at end of file Modified: XoopsModules/TDMStats/trunk/TDMStats/index.php =================================================================== --- XoopsModules/TDMStats/trunk/TDMStats/index.php 2012-08-30 07:57:41 UTC (rev 10136) +++ XoopsModules/TDMStats/trunk/TDMStats/index.php 2012-09-01 06:27:16 UTC (rev 10137) @@ -20,10 +20,9 @@ */ include_once "../../mainfile.php"; -require(XOOPS_ROOT_PATH.'/header.php'); - include_once('include/function.php'); -//include_once('include/GphpChart.class.php'); + + $gperm_handler =& xoops_gethandler('groupperm'); //permission if (is_object($xoopsUser)) { @@ -39,6 +38,14 @@ $action = isset($_REQUEST['action']) ? $_REQUEST['action'] : 1; +// pour les permissions + $perm_4 = ($gperm_handler->checkRight('istats_view', 4, $groups, $xoopsModule->getVar('mid'))) ? true : false ; + $perm_8 = ($gperm_handler->checkRight('istats_view', 8, $groups, $xoopsModule->getVar('mid'))) ? true : false ; + $perm_16 = ($gperm_handler->checkRight('istats_view', 16, $groups, $xoopsModule->getVar('mid'))) ? true : false ; + if ($perm_4 == false && $perm_8 == false && $perm_16 == false){ + redirect_header(XOOPS_URL, 2, _NOPERM); + } + switch($action) { case "3": @@ -50,42 +57,17 @@ break; case "1": + default: include "include/summary.php"; break; - case "list": - default: +} -$xoopsOption['template_main'] = 'tdmstats_index.html'; -include_once XOOPS_ROOT_PATH."/header.php"; + $xoopsTpl->assign('img_bar', $xoopsModuleConfig['tdmstats_bar']); - -// pour les permissions - $perm_4 = ($gperm_handler->checkRight('istats_view', 4, $groups, $xoopsModule->getVar('mid'))) ? true : false ; - $perm_8 = ($gperm_handler->checkRight('istats_view', 8, $groups, $xoopsModule->getVar('mid'))) ? true : false ; - $perm_16 = ($gperm_handler->checkRight('istats_view', 16, $groups, $xoopsModule->getVar('mid'))) ? true : false ; - if ($perm_4 == false && $perm_8 == false && $perm_16 == false){ - redirect_header(XOOPS_URL, 2, _NOPERM); - } - //perm - $xoopsTpl->assign('perm_4', $perm_4); - $xoopsTpl->assign('perm_8', $perm_8); - $xoopsTpl->assign('perm_16', $perm_16); - $xoopsTpl->assign('show_index', true); - break; -} - - $xoopsTpl->assign('action', $action); - $xoopsTpl->assign('lang_traffic_report', _AM_TRAFFIC_REPORT); - $xoopsTpl->assign('lang_summary', _AM_SUMMARY); -if (isset($xoopsModuleConfig['tdmstats_bar'])) - $xoopsTpl->assign('img_bar', $xoopsModuleConfig['tdmstats_bar']); - $xoopsTpl->assign('lang_traffic', _AM_TRAFFIC); - $xoopsTpl->assign('lang_visitor_info', _AM_VISITOR_INFO); - $xoopsTpl->assign('lang_referer', _AM_REFERER); -$tdmstats_style = isset($xoopsModuleConfig['tdmstats_style']) ? $xoopsModuleConfig['tdmstats_style'] : 'cupertino'; +//$tdmstats_style = isset($xoopsModuleConfig['tdmstats_style']) ? $xoopsModuleConfig['tdmstats_style'] : 'cupertino'; //include script $xoTheme->addScript(XOOPS_URL."/modules/".$xoopsModule->dirname()."/js/jquery.js"); $xoTheme->addScript(XOOPS_URL."/modules/".$xoopsModule->dirname()."/js/jquery-ui-1.7.2.custom.min.js"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |