Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[9926] XoopsModules/TDMStats/trunk/TDMStats
|
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.
|
