From: <be...@us...> - 2012-08-07 16:56:27
|
Revision: 10008 http://xoops.svn.sourceforge.net/xoops/?rev=10008&view=rev Author: beckmi Date: 2012-08-07 16:56:18 +0000 (Tue, 07 Aug 2012) Log Message: ----------- Modifications by Mamba Modified Paths: -------------- XoopsModules/TDMStats/branches/mamba/TDMStats/admin/admin_header.php XoopsModules/TDMStats/branches/mamba/TDMStats/include/summary.php XoopsModules/TDMStats/branches/mamba/TDMStats/index.php XoopsModules/TDMStats/branches/mamba/TDMStats/language/english/admin.php XoopsModules/TDMStats/branches/mamba/TDMStats/language/english/main.php XoopsModules/TDMStats/branches/mamba/TDMStats/language/english/modinfo.php XoopsModules/TDMStats/branches/mamba/TDMStats/language/french/admin.php XoopsModules/TDMStats/branches/mamba/TDMStats/language/french/modinfo.php XoopsModules/TDMStats/branches/mamba/TDMStats/language/persian/admin.php XoopsModules/TDMStats/branches/mamba/TDMStats/language/spanish/admin.php XoopsModules/TDMStats/branches/mamba/TDMStats/sql/mysql.sql XoopsModules/TDMStats/branches/mamba/TDMStats/templates/tdmstats_summary.html XoopsModules/TDMStats/branches/mamba/TDMStats/xoops_version.php Modified: XoopsModules/TDMStats/branches/mamba/TDMStats/admin/admin_header.php =================================================================== --- XoopsModules/TDMStats/branches/mamba/TDMStats/admin/admin_header.php 2012-08-07 16:54:02 UTC (rev 10007) +++ XoopsModules/TDMStats/branches/mamba/TDMStats/admin/admin_header.php 2012-08-07 16:56:18 UTC (rev 10008) @@ -18,8 +18,5 @@ $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 + +include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'); \ No newline at end of file Modified: XoopsModules/TDMStats/branches/mamba/TDMStats/include/summary.php =================================================================== --- XoopsModules/TDMStats/branches/mamba/TDMStats/include/summary.php 2012-08-07 16:54:02 UTC (rev 10007) +++ XoopsModules/TDMStats/branches/mamba/TDMStats/include/summary.php 2012-08-07 16:56:18 UTC (rev 10008) @@ -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/branches/mamba/TDMStats/index.php =================================================================== --- XoopsModules/TDMStats/branches/mamba/TDMStats/index.php 2012-08-07 16:54:02 UTC (rev 10007) +++ XoopsModules/TDMStats/branches/mamba/TDMStats/index.php 2012-08-07 16:56:18 UTC (rev 10008) @@ -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/branches/mamba/TDMStats/language/english/admin.php =================================================================== --- XoopsModules/TDMStats/branches/mamba/TDMStats/language/english/admin.php 2012-08-07 16:54:02 UTC (rev 10007) +++ XoopsModules/TDMStats/branches/mamba/TDMStats/language/english/admin.php 2012-08-07 16:56:18 UTC (rev 10008) @@ -75,9 +75,10 @@ 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"); Modified: XoopsModules/TDMStats/branches/mamba/TDMStats/language/english/main.php =================================================================== --- XoopsModules/TDMStats/branches/mamba/TDMStats/language/english/main.php 2012-08-07 16:54:02 UTC (rev 10007) +++ XoopsModules/TDMStats/branches/mamba/TDMStats/language/english/main.php 2012-08-07 16:56:18 UTC (rev 10008) @@ -122,7 +122,7 @@ 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_SO_FARE', 'visitors at the moment, your site should reach'); define ( 'AM_PAGE_VIEW', 'page views.'); // perm @@ -130,4 +130,8 @@ //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/branches/mamba/TDMStats/language/english/modinfo.php =================================================================== --- XoopsModules/TDMStats/branches/mamba/TDMStats/language/english/modinfo.php 2012-08-07 16:54:02 UTC (rev 10007) +++ XoopsModules/TDMStats/branches/mamba/TDMStats/language/english/modinfo.php 2012-08-07 16:56:18 UTC (rev 10008) @@ -58,7 +58,17 @@ 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/branches/mamba/TDMStats/language/french/admin.php =================================================================== --- XoopsModules/TDMStats/branches/mamba/TDMStats/language/french/admin.php 2012-08-07 16:54:02 UTC (rev 10007) +++ XoopsModules/TDMStats/branches/mamba/TDMStats/language/french/admin.php 2012-08-07 16:56:18 UTC (rev 10008) @@ -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/branches/mamba/TDMStats/language/french/modinfo.php =================================================================== --- XoopsModules/TDMStats/branches/mamba/TDMStats/language/french/modinfo.php 2012-08-07 16:54:02 UTC (rev 10007) +++ XoopsModules/TDMStats/branches/mamba/TDMStats/language/french/modinfo.php 2012-08-07 16:56:18 UTC (rev 10008) @@ -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/branches/mamba/TDMStats/language/persian/admin.php =================================================================== --- XoopsModules/TDMStats/branches/mamba/TDMStats/language/persian/admin.php 2012-08-07 16:54:02 UTC (rev 10007) +++ XoopsModules/TDMStats/branches/mamba/TDMStats/language/persian/admin.php 2012-08-07 16:56:18 UTC (rev 10008) @@ -78,4 +78,8 @@ 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/branches/mamba/TDMStats/language/spanish/admin.php =================================================================== --- XoopsModules/TDMStats/branches/mamba/TDMStats/language/spanish/admin.php 2012-08-07 16:54:02 UTC (rev 10007) +++ XoopsModules/TDMStats/branches/mamba/TDMStats/language/spanish/admin.php 2012-08-07 16:56:18 UTC (rev 10008) @@ -79,4 +79,8 @@ 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 Modified: XoopsModules/TDMStats/branches/mamba/TDMStats/sql/mysql.sql =================================================================== --- XoopsModules/TDMStats/branches/mamba/TDMStats/sql/mysql.sql 2012-08-07 16:54:02 UTC (rev 10007) +++ XoopsModules/TDMStats/branches/mamba/TDMStats/sql/mysql.sql 2012-08-07 16:56:18 UTC (rev 10008) @@ -342,8 +342,8 @@ # -------------------------------------------------------- create table TDMStats_usercount( id int(10) not null auto_increment, -userid varchar(255) not null); -ip varchar(255) not null); +userid varchar(255) not null, +ip varchar(255) not null, date date not null, count int(10) not null, -primary key(id)); +primary key(id)); \ No newline at end of file Modified: XoopsModules/TDMStats/branches/mamba/TDMStats/templates/tdmstats_summary.html =================================================================== --- XoopsModules/TDMStats/branches/mamba/TDMStats/templates/tdmstats_summary.html 2012-08-07 16:54:02 UTC (rev 10007) +++ XoopsModules/TDMStats/branches/mamba/TDMStats/templates/tdmstats_summary.html 2012-08-07 16:56:18 UTC (rev 10008) @@ -75,8 +75,8 @@ <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}> +<br /><{$smarty.const.AM_BAS_NBR}> <b><{$daycount}></b> +<{$smarty.const.AM_SO_FARE}> <br/><b><{$today_hits}></b> <{$smarty.const.AM_PAGE_VIEW}> </span></div></div></li> Modified: XoopsModules/TDMStats/branches/mamba/TDMStats/xoops_version.php =================================================================== --- XoopsModules/TDMStats/branches/mamba/TDMStats/xoops_version.php 2012-08-07 16:54:02 UTC (rev 10007) +++ XoopsModules/TDMStats/branches/mamba/TDMStats/xoops_version.php 2012-08-07 16:56:18 UTC (rev 10008) @@ -171,7 +171,7 @@ ); $i++; $modversion['config'][$i]['name'] = 'setlocal2'; -$modversion['config'][$i]['title'] = ''; +$modversion['config'][$i]['title'] = '_MI_ISTATS_SETLOCAL'; $modversion['config'][$i]['description'] = ''; $modversion['config'][$i]['formtype'] = 'select'; $modversion['config'][$i]['valuetype'] = 'text'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |