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. |