Menu
▾
▴
xoops-svn — All SVN commits will be posted to this ML
You can subscribe to this list here.
| 2012 |
Jan
|
Feb
(214) |
Mar
(139) |
Apr
(198) |
May
(187) |
Jun
(151) |
Jul
(210) |
Aug
(169) |
Sep
(58) |
Oct
(53) |
Nov
(54) |
Dec
(301) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2013 |
Jan
(348) |
Feb
(178) |
Mar
(219) |
Apr
(154) |
May
(117) |
Jun
(194) |
Jul
(61) |
Aug
(132) |
Sep
(121) |
Oct
(110) |
Nov
(11) |
Dec
(18) |
| 2014 |
Jan
(34) |
Feb
(50) |
Mar
(82) |
Apr
(98) |
May
(39) |
Jun
(111) |
Jul
(67) |
Aug
(36) |
Sep
(33) |
Oct
(26) |
Nov
(53) |
Dec
(44) |
| 2015 |
Jan
(29) |
Feb
(47) |
Mar
(25) |
Apr
(19) |
May
(23) |
Jun
(20) |
Jul
(49) |
Aug
(7) |
Sep
(10) |
Oct
(10) |
Nov
(4) |
Dec
(25) |
| 2016 |
Jan
(8) |
Feb
(7) |
Mar
(1) |
Apr
|
May
(3) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(7) |
Dec
(5) |
| 2017 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(15) |
Jun
|
Jul
(18) |
Aug
(24) |
Sep
|
Oct
(14) |
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
(22) |
Mar
|
Apr
(11) |
May
(1) |
Jun
(17) |
Jul
(2) |
Aug
(2) |
Sep
|
Oct
(6) |
Nov
(5) |
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2025 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <be...@us...> - 2012-07-31 10:13:47
|
Revision: 9954
http://xoops.svn.sourceforge.net/xoops/?rev=9954&view=rev
Author: beckmi
Date: 2012-07-31 10:13:35 +0000 (Tue, 31 Jul 2012)
Log Message:
-----------
Updating to 3.04 (minor fixes)
Modified Paths:
--------------
XoopsModules/xlanguage/branches/mamba/xlanguage/admin/admin_footer.php
XoopsModules/xlanguage/branches/mamba/xlanguage/admin/langform.inc.php
XoopsModules/xlanguage/branches/mamba/xlanguage/admin/main.php
XoopsModules/xlanguage/branches/mamba/xlanguage/class/language.php
XoopsModules/xlanguage/branches/mamba/xlanguage/docs/changelog.txt
XoopsModules/xlanguage/branches/mamba/xlanguage/include/functions.php
XoopsModules/xlanguage/branches/mamba/xlanguage/xoops_version.php
XoopsModules/xlanguage/trunk/xlanguage/admin/admin_footer.php
XoopsModules/xlanguage/trunk/xlanguage/admin/langform.inc.php
XoopsModules/xlanguage/trunk/xlanguage/admin/main.php
XoopsModules/xlanguage/trunk/xlanguage/class/language.php
XoopsModules/xlanguage/trunk/xlanguage/docs/changelog.txt
XoopsModules/xlanguage/trunk/xlanguage/include/functions.php
XoopsModules/xlanguage/trunk/xlanguage/xoops_version.php
Modified: XoopsModules/xlanguage/branches/mamba/xlanguage/admin/admin_footer.php
===================================================================
--- XoopsModules/xlanguage/branches/mamba/xlanguage/admin/admin_footer.php 2012-07-31 09:28:57 UTC (rev 9953)
+++ XoopsModules/xlanguage/branches/mamba/xlanguage/admin/admin_footer.php 2012-07-31 10:13:35 UTC (rev 9954)
@@ -2,7 +2,7 @@
echo "<div class='adminfooter'>\n"
." <div style='text-align: center;'>\n"
- ." <a href='http://www.xoops.org' target='_blank'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
+ ." <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
." </div>\n"
." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
."</div>";
Modified: XoopsModules/xlanguage/branches/mamba/xlanguage/admin/langform.inc.php
===================================================================
--- XoopsModules/xlanguage/branches/mamba/xlanguage/admin/langform.inc.php 2012-07-31 09:28:57 UTC (rev 9953)
+++ XoopsModules/xlanguage/branches/mamba/xlanguage/admin/langform.inc.php 2012-07-31 10:13:35 UTC (rev 9954)
@@ -41,18 +41,18 @@
$sform->addElement(new XoopsFormText(_AM_XLANG_DESC, 'lang_desc', 50, 255, $lang_desc));
+//$sform->addElement(new XoopsFormText(_AM_XLANG_CODE, 'lang_code', 50, 255, $lang_code), true);
+$lang_code = new XoopsFormText(_AM_XLANG_CODE, 'lang_code', 50, 255, $lang_code);
+$lang_code->setDescription(_AM_XLANG_CODE_DESC);
+$sform->addElement($lang_code, true);
+
//$sform->addElement(new XoopsFormText(_AM_XLANG_CHARSET, 'lang_charset', 50, 255, $lang_charset), true);
$lang_charset = new XoopsFormText(_AM_XLANG_CHARSET, 'lang_charset', 50, 255, $lang_charset);
$lang_charset->setDescription(_AM_XLANG_CHARSET_DESC);
$sform->addElement($lang_charset, true);
-//$sform->addElement(new XoopsFormText(_AM_XLANG_CODE, 'lang_code', 50, 255, $lang_code), true);
-$lang_code = new XoopsFormText(_AM_XLANG_CODE, 'lang_charset', 50, 255, $lang_code);
-$lang_code->setDescription(_AM_XLANG_CODE_DESC);
-$sform->addElement($lang_code, true);
-
if(!$isBase){
$baseList =& $xlanguage_handler->getAll();
$base_list = array();
@@ -87,9 +87,8 @@
$button_tray = new XoopsFormElementTray('', '');
$button_tray->addElement(new XoopsFormHidden('op', 'save'));
-$button_tray->addElement(new XoopsFormButton('', '', _GO, 'submit'));
+$button_tray->addElement(new XoopsFormButton('', '', _SUBMIT, 'submit'));
$button_tray->addElement(new XoopsFormButton('', '', _CANCEL, 'submit'));
$sform->addElement($button_tray);
-$sform->display();
-?>
\ No newline at end of file
+$sform->display();
\ No newline at end of file
Modified: XoopsModules/xlanguage/branches/mamba/xlanguage/admin/main.php
===================================================================
--- XoopsModules/xlanguage/branches/mamba/xlanguage/admin/main.php 2012-07-31 09:28:57 UTC (rev 9953)
+++ XoopsModules/xlanguage/branches/mamba/xlanguage/admin/main.php 2012-07-31 10:13:35 UTC (rev 9954)
@@ -1,245 +1,245 @@
-<?php
-// $Id$
-// ------------------------------------------------------------------------ //
-// Xlanguage: eXtensible Language Management For Xoops //
-// Copyright (c) 2004 Xoops China Community //
-// <http://www.xoops.org.cn/> //
-// ------------------------------------------------------------------------ //
-// This program is free software; you can redistribute it and/or modify //
-// it under the terms of the GNU General Public License as published by //
-// the Free Software Foundation; either version 2 of the License, or //
-// (at your option) any later version. //
-// //
-// You may not change or alter any portion of this comment or credits //
-// of supporting developers from this source code or any supporting //
-// source code which is considered copyrighted (c) material of the //
-// original comment or credit authors. //
-// //
-// This program is distributed in the hope that it will be useful, //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
-// GNU General Public License for more details. //
-// //
-// You should have received a copy of the GNU General Public License //
-// along with this program; if not, write to the Free Software //
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
-// ------------------------------------------------------------------------ //
-// Author: D.J.(phppp) ph...@ho... //
-// URL: http://www.xoops.org.cn //
-// ------------------------------------------------------------------------- //
-include '../../../include/cp_header.php';
-include_once 'admin_header.php';
-
-include_once(XOOPS_ROOT_PATH.'/modules/xlanguage/include/vars.php');
-include_once(XOOPS_ROOT_PATH.'/modules/xlanguage/include/functions.php');
-
-$op = "";
-if ( isset( $_POST ) ){
- foreach ( $_POST as $k => $v ) {
- ${$k} = $v;
- }
-}
-if ( isset( $_GET ) ){
- foreach ( $_GET as $k => $v ) {
- ${$k} = $v;
- }
-}
-
-define("XLANG_CONFIG_LINK","<a href='main.php' target='_self'>"._AM_XLANG_CONFIG."</a>");
-
-$xlanguage_handler =& xoops_getmodulehandler('language', 'xlanguage');
-$xlanguage_handler->loadConfig();
-
-switch ( $op )
-{
- case "del":
- if (!isset($_POST['ok']) || $_POST['ok'] != 1 ){
- xoops_cp_header();
-$aboutAdmin = new ModuleAdmin();
-echo $aboutAdmin->addNavigation('main.php');
-// echo "<h4>" . XLANG_CONFIG_LINK . "</h4>";
- xoops_confirm( array( 'op' => 'del', 'type' => $_GET['type'], 'lang_id' => intval( $_GET['lang_id'] ), 'ok' => 1 ), 'main.php', _AM_XLANG_DELETE_CFM );
- }else{
- if(isset($type)&&$type=='ext') $isBase = false;
- else $isBase = true;
- $lang =& $xlanguage_handler->get($lang_id, $isBase);
- $xlanguage_handler->delete($lang);
- redirect_header("main.php",2,_AM_XLANG_DELETED);
- }
- break;
-
- case "save":
- if(isset($type)&&$type=='ext') $isBase = false;
- else $isBase = true;
- if(isset($lang_id)&&$lang_id>0){
- $lang =& $xlanguage_handler->get($lang_id, $isBase);
- }else{
- $lang =& $xlanguage_handler->create(true, $isBase);
- }
- $lang_name = preg_replace("/[^a-zA-Z0-9\_\-]/", "", $lang_name);
-
- $lang->setVar('lang_name',$lang_name);
- $lang->setVar('lang_desc',$lang_desc);
- $lang->setVar('lang_code',$lang_code);
- $lang->setVar('lang_charset',$lang_charset);
- $lang->setVar('lang_image',$lang_image);
- if(!$isBase){
- $lang->setVar('lang_base',$lang_base);
- }
- $lang->setVar('weight',$weight);
- $xlanguage_handler->insert($lang);
- redirect_header("index.php",2,_AM_XLANG_SAVED);
- break;
-
- case "edit":
- xoops_cp_header();
-$aboutAdmin = new ModuleAdmin();
-echo $aboutAdmin->addNavigation('main.php');
- // echo "<h4>" . XLANG_CONFIG_LINK . "</h4>";
- // echo "<br />";
- echo "<h4>" . _AM_XLANG_EDITLANG . "</h4>";
- if(isset($type)&&$type=='ext') $isBase = false;
- else $isBase = true;
- if(isset($lang_id)&&$lang_id>0){
- $lang =& $xlanguage_handler->get($lang_id, $isBase);
- }elseif(isset($lang_name)){
- $lang =& $xlanguage_handler->getByName($lang_name, $isBase);
- }else{
- $lang =& $xlanguage_handler->create(true, $isBase);
- }
- $lang_name = $lang->getVar('lang_name');
- $lang_desc = $lang->getVar('lang_desc');
- $lang_code = $lang->getVar('lang_code');
- $lang_charset = $lang->getVar('lang_charset');
- $lang_image = $lang->getVar('lang_image');
- $weight = $lang->getVar('weight');
- if(!$isBase){
- $lang_base = $lang->getVar('lang_base');
- }
- include "langform.inc.php";
- break;
-
- case "add":
- xoops_cp_header();
-$aboutAdmin = new ModuleAdmin();
-// echo "<h4>" . XLANG_CONFIG_LINK . "</h4>";
-// echo "<br />";
-// echo "<h4>" . _AM_XLANG_ADDLANG . "</h4>";
- if(isset($type)&&$type=='ext') {
- $isBase = false;
- echo $aboutAdmin->addNavigation('main.php?op=add&type=ext'); }
- else {
- $isBase = true;
- echo $aboutAdmin->addNavigation('main.php?op=add&type=base');
- }
- $lang_name = '';
- $lang_desc = '';
- $lang_code = '';
- $lang_charset = '';
- $lang_image = '';
- $weight = 1;
- $lang_base = '';
- include "langform.inc.php";
- break;
-
- case 'createconfig':
- xlanguage_createConfig();
- redirect_header( 'main.php', 1, _AM_XLANG_CREATED );
- exit();
- break;
-
- case "default":
- default:
- xoops_cp_header();
-$mainAdmin = new ModuleAdmin();
-echo $mainAdmin->addNavigation('main.php');
-
-
- // if (TDMDownloads_checkModuleAdmin()){
- // $mainAdmin = new ModuleAdmin();
- // echo $mainAdmin->addNavigation('downloads.php');
- $mainAdmin->addItemButton(_MI_XLANGUAGE_ADMENU1, 'main.php?op=add&type=base', 'add');
- $mainAdmin->addItemButton(_MI_XLANGUAGE_ADMENU2, 'main.php?op=add&type=ext', 'insert_table_row');
-
- echo $mainAdmin->renderButton();
-// }
-
-// echo "<h4>" . XLANG_CONFIG_LINK . "</h4>";
- languageList();
- $configfile_status = (@is_readable(XLANGUAGE_CONFIG_FILE))?_AM_XLANG_CONFIGOK:_AM_XLANG_CONFIGNOTOK;
- echo"<table width='100%' border='0' cellspacing='1' class='outer'><tr><td class=\"odd\"><br />";
-// echo " - <b><a href='index.php?op=add&type=base'>" . _AM_XLANG_ADDBASE . "</a></b><br /><br />\n";
-// echo " - <b><a href='index.php?op=add&type=ext'>" . _AM_XLANG_ADDEXT . "</a></b><br /><br />\n";
- echo "<b>".$configfile_status."</b>: ".XLANGUAGE_CONFIG_FILE." (<a href='main.php?op=createconfig' title='"._AM_XLANG_CREATECONFIG."'>" . _AM_XLANG_CREATECONFIG . "</a>)<br /><br />\n";
-// echo " - <b><a href='about.php'>" . _AM_XLANG_ABOUT . "</a></b>";
- echo"</td></tr></table>";
- break;
-}
-xoops_cp_footer();
-
-
-function languageList()
-{
- global $xlanguage_handler, $xoopsModule;
-
-global $pathIcon16;
-
- $lang_list =& $xlanguage_handler->getAllList();
- if ( is_array($lang_list)&&count( $lang_list ) > 0 ){
- echo"<table width='100%' border='0' cellspacing='1' class='outer'><tr><td class=\"odd\">";
- echo "<div style='text-align: center;'><b><h4>" . _AM_XLANG_LANGLIST . "</h4></b><br />";
- echo "<table class='outer' width='100%' border='0' cellpadding='0' cellspacing='0' ><tr class='bg2'><th align='center'>" . _AM_XLANG_DESC . "</th><th align='center'>" . _AM_XLANG_NAME . "</th><th align='center'>" . _AM_XLANG_CHARSET . "</th><th align='center'>" . _AM_XLANG_CODE . "</th><th align='center'>" . _AM_XLANG_IMAGE . "</th><th align='center'>" . _AM_XLANG_WEIGHT . "</th><th align='center'>" . _AM_XLANG_BASE . "</th><th align='center'>" . _AM_XLANG_ACTION . "</th></tr>\n";
- $class = 'even';
- foreach( array_keys($lang_list) as $lang_name ) {
- $lang =& $lang_list[$lang_name];
- $isOrphan = true;
- if(isset($lang['base'])){
- echo "<tr>\n";
- echo "<td class='$class' >" . $lang['base'] -> getVar('lang_desc') . "</td>\n";
- echo "<td class='$class' ><b>" . $lang['base'] -> getVar('lang_name') . "</b></td>\n";
- echo "<td class='$class' ><b>" . $lang['base'] -> getVar('lang_charset') . "</b></td>\n";
- echo "<td class='$class' >" . $lang['base'] -> getVar('lang_code') . "</td>\n";
- if(is_readable(XOOPS_ROOT_PATH.'/modules/xlanguage/images/'.$lang['base'] -> getVar('lang_image'))){
- $lang_image = $lang['base'] -> getVar('lang_image');
- }else{
- $lang_image = 'noflag.gif';
- }
- echo "<td class='$class' ><img src='" . XOOPS_URL.'/modules/xlanguage/images/'.$lang_image . "' alt='".$lang['base'] -> getVar('lang_desc')."' /></td>\n";
- echo "<td class='$class' >" . $lang['base'] -> getVar('weight') . "</td>\n";
- echo "<td class='$class' >Ø</td>\n";
- echo "<td class='$class' ><a href='main.php?op=edit&type=base&lang_id=" . $lang['base'] -> getVar('lang_id') . "'><img src=".$pathIcon16.'/edit.png title=' . _EDIT . "></a>\n".
- "<a href='main.php?op=del&type=base&lang_id=" . $lang['base'] -> getVar('lang_id') . "'><img src=".$pathIcon16.'/delete.png title=' . _DELETE ."></td>\n";
- echo "</tr>\n";
- $isOrphan = false;
- $class = ($class == 'odd') ? 'even' : 'odd';
- }
- if(!isset($lang['ext'])||count($lang['ext'])<1) continue;
- foreach($lang['ext'] as $ext){
- echo "<tr>\n";
- echo "<td class='$class' >" . $ext -> getVar('lang_desc') . "</td>\n";
- echo "<td class='$class' >" . $ext -> getVar('lang_name') . "</td>\n";
- echo "<td class='$class' ><b>" . $ext -> getVar('lang_charset') . "</b></td>\n";
- echo "<td class='$class' >" . $ext -> getVar('lang_code') . "</td>\n";
- if(is_readable(XOOPS_ROOT_PATH.'/modules/xlanguage/images/'.$ext -> getVar('lang_image'))){
- $lang_image = $ext -> getVar('lang_image');
- }else{
- $lang_image = 'noflag.gif';
- }
- echo "<td class='$class' ><img src='" . XOOPS_URL.'/modules/xlanguage/images/'.$lang_image . "' alt='".$ext -> getVar('lang_desc')."' /></td>\n";
- echo "<td class='$class' >" . $ext -> getVar('weight') . "</td>\n";
- $lang_base = ($isOrphan)?"<font color='red'>".$ext -> getVar('lang_base')."</font>":$ext -> getVar('lang_base');
- echo "<td class='$class' ><b>" . $lang_base . "</b></td>\n";
- echo "<td class='$class' ><a href='main.php?op=edit&type=ext&lang_id=" . $ext -> getVar('lang_id') . "'><img src=".$pathIcon16.'/edit.png title=' . _EDIT . "></a>\n".
- "<a href='main.php?op=del&type=ext&lang_id=" . $ext -> getVar('lang_id') . "'><img src=".$pathIcon16.'/delete.png title=' . _DELETE ."></td>\n";
- echo "</tr>\n";
- }
- echo "<tr><td colspan='9' ></td></tr>\n";
- $class = ($class == 'odd') ? 'even' : 'odd';
- }
-
- echo "</table></div>\n";
- echo"</td></tr></table>";
- echo "<br />";
- }
-}
-?>
+<?php
+// $Id$
+// ------------------------------------------------------------------------ //
+// Xlanguage: eXtensible Language Management For Xoops //
+// Copyright (c) 2004 Xoops China Community //
+// <http://www.xoops.org.cn/> //
+// ------------------------------------------------------------------------ //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation; either version 2 of the License, or //
+// (at your option) any later version. //
+// //
+// You may not change or alter any portion of this comment or credits //
+// of supporting developers from this source code or any supporting //
+// source code which is considered copyrighted (c) material of the //
+// original comment or credit authors. //
+// //
+// This program is distributed in the hope that it will be useful, //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
+// GNU General Public License for more details. //
+// //
+// You should have received a copy of the GNU General Public License //
+// along with this program; if not, write to the Free Software //
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
+// ------------------------------------------------------------------------ //
+// Author: D.J.(phppp) ph...@ho... //
+// URL: http://www.xoops.org.cn //
+// ------------------------------------------------------------------------- //
+include '../../../include/cp_header.php';
+include_once 'admin_header.php';
+
+include_once(XOOPS_ROOT_PATH.'/modules/xlanguage/include/vars.php');
+include_once(XOOPS_ROOT_PATH.'/modules/xlanguage/include/functions.php');
+
+$op = "";
+if ( isset( $_POST ) ){
+ foreach ( $_POST as $k => $v ) {
+ ${$k} = $v;
+ }
+}
+if ( isset( $_GET ) ){
+ foreach ( $_GET as $k => $v ) {
+ ${$k} = $v;
+ }
+}
+
+define("XLANG_CONFIG_LINK","<a href='main.php' target='_self'>"._AM_XLANG_CONFIG."</a>");
+
+$xlanguage_handler =& xoops_getmodulehandler('language', 'xlanguage');
+$xlanguage_handler->loadConfig();
+
+switch ( $op )
+{
+ case "del":
+ if (!isset($_POST['ok']) || $_POST['ok'] != 1 ){
+ xoops_cp_header();
+$aboutAdmin = new ModuleAdmin();
+echo $aboutAdmin->addNavigation('main.php');
+// echo "<h4>" . XLANG_CONFIG_LINK . "</h4>";
+ xoops_confirm( array( 'op' => 'del', 'type' => $_GET['type'], 'lang_id' => intval( $_GET['lang_id'] ), 'ok' => 1 ), 'main.php', _AM_XLANG_DELETE_CFM );
+ }else{
+ if(isset($type)&&$type=='ext') $isBase = false;
+ else $isBase = true;
+ $lang =& $xlanguage_handler->get($lang_id, $isBase);
+ $xlanguage_handler->delete($lang);
+ redirect_header("main.php",2,_AM_XLANG_DELETED);
+ }
+ break;
+
+ case "save":
+ if(isset($type)&&$type=='ext') $isBase = false;
+ else $isBase = true;
+ if(isset($lang_id)&&$lang_id>0){
+ $lang =& $xlanguage_handler->get($lang_id, $isBase);
+ }else{
+ $lang =& $xlanguage_handler->create(true, $isBase);
+ }
+ $lang_name = preg_replace("/[^a-zA-Z0-9\_\-]/", "", $lang_name);
+
+ $lang->setVar('lang_name',$lang_name);
+ $lang->setVar('lang_desc',$lang_desc);
+ $lang->setVar('lang_code',$lang_code);
+ $lang->setVar('lang_charset',$lang_charset);
+ $lang->setVar('lang_image',$lang_image);
+ if(!$isBase){
+ $lang->setVar('lang_base',$lang_base);
+ }
+ $lang->setVar('weight',$weight);
+ $xlanguage_handler->insert($lang);
+ redirect_header("main.php",2,_AM_XLANG_SAVED);
+ break;
+
+ case "edit":
+ xoops_cp_header();
+$aboutAdmin = new ModuleAdmin();
+echo $aboutAdmin->addNavigation('main.php');
+ // echo "<h4>" . XLANG_CONFIG_LINK . "</h4>";
+ // echo "<br />";
+ echo "<h4>" . _AM_XLANG_EDITLANG . "</h4>";
+ if(isset($type)&&$type=='ext') $isBase = false;
+ else $isBase = true;
+ if(isset($lang_id)&&$lang_id>0){
+ $lang =& $xlanguage_handler->get($lang_id, $isBase);
+ }elseif(isset($lang_name)){
+ $lang =& $xlanguage_handler->getByName($lang_name, $isBase);
+ }else{
+ $lang =& $xlanguage_handler->create(true, $isBase);
+ }
+ $lang_name = $lang->getVar('lang_name');
+ $lang_desc = $lang->getVar('lang_desc');
+ $lang_code = $lang->getVar('lang_code');
+ $lang_charset = $lang->getVar('lang_charset');
+ $lang_image = $lang->getVar('lang_image');
+ $weight = $lang->getVar('weight');
+ if(!$isBase){
+ $lang_base = $lang->getVar('lang_base');
+ }
+ include "langform.inc.php";
+ break;
+
+ case "add":
+ xoops_cp_header();
+$aboutAdmin = new ModuleAdmin();
+// echo "<h4>" . XLANG_CONFIG_LINK . "</h4>";
+// echo "<br />";
+// echo "<h4>" . _AM_XLANG_ADDLANG . "</h4>";
+ if(isset($type)&&$type=='ext') {
+ $isBase = false;
+ echo $aboutAdmin->addNavigation('main.php?op=add&type=ext'); }
+ else {
+ $isBase = true;
+ echo $aboutAdmin->addNavigation('main.php?op=add&type=base');
+ }
+ $lang_name = '';
+ $lang_desc = '';
+ $lang_code = '';
+ $lang_charset = '';
+ $lang_image = '';
+ $weight = 1;
+ $lang_base = '';
+ include "langform.inc.php";
+ break;
+
+ case 'createconfig':
+ xlanguage_createConfig();
+ redirect_header( 'main.php', 1, _AM_XLANG_CREATED );
+ exit();
+ break;
+
+ case "default":
+ default:
+ xoops_cp_header();
+$mainAdmin = new ModuleAdmin();
+echo $mainAdmin->addNavigation('main.php');
+
+
+ // if (TDMDownloads_checkModuleAdmin()){
+ // $mainAdmin = new ModuleAdmin();
+ // echo $mainAdmin->addNavigation('downloads.php');
+ $mainAdmin->addItemButton(_MI_XLANGUAGE_ADMENU1, 'main.php?op=add&type=base', 'add');
+ $mainAdmin->addItemButton(_MI_XLANGUAGE_ADMENU2, 'main.php?op=add&type=ext', 'insert_table_row');
+
+ echo $mainAdmin->renderButton();
+// }
+
+// echo "<h4>" . XLANG_CONFIG_LINK . "</h4>";
+ languageList();
+ $configfile_status = (@is_readable(XLANGUAGE_CONFIG_FILE))?_AM_XLANG_CONFIGOK:_AM_XLANG_CONFIGNOTOK;
+ echo"<table width='100%' border='0' cellspacing='1' class='outer'><tr><td class=\"odd\"><br />";
+// echo " - <b><a href='index.php?op=add&type=base'>" . _AM_XLANG_ADDBASE . "</a></b><br /><br />\n";
+// echo " - <b><a href='index.php?op=add&type=ext'>" . _AM_XLANG_ADDEXT . "</a></b><br /><br />\n";
+ echo "<b>".$configfile_status."</b>: ".XLANGUAGE_CONFIG_FILE." (<a href='main.php?op=createconfig' title='"._AM_XLANG_CREATECONFIG."'>" . _AM_XLANG_CREATECONFIG . "</a>)<br /><br />\n";
+// echo " - <b><a href='about.php'>" . _AM_XLANG_ABOUT . "</a></b>";
+ echo"</td></tr></table>";
+ break;
+}
+xoops_cp_footer();
+
+
+function languageList()
+{
+ global $xlanguage_handler, $xoopsModule;
+
+global $pathIcon16;
+
+ $lang_list =& $xlanguage_handler->getAllList();
+ if ( is_array($lang_list)&&count( $lang_list ) > 0 ){
+ echo"<table width='100%' border='0' cellspacing='1' class='outer'><tr><td class=\"odd\">";
+ echo "<div style='text-align: center;'><b><h4>" . _AM_XLANG_LANGLIST . "</h4></b><br />";
+ echo "<table class='outer' width='100%' border='0' cellpadding='0' cellspacing='0' ><tr class='bg2'><th align='center'>" . _AM_XLANG_DESC . "</th><th align='center'>" . _AM_XLANG_NAME . "</th><th align='center'>" . _AM_XLANG_CHARSET . "</th><th align='center'>" . _AM_XLANG_CODE . "</th><th align='center'>" . _AM_XLANG_IMAGE . "</th><th align='center'>" . _AM_XLANG_WEIGHT . "</th><th align='center'>" . _AM_XLANG_BASE . "</th><th align='center'>" . _AM_XLANG_ACTION . "</th></tr>\n";
+ $class = 'even';
+ foreach( array_keys($lang_list) as $lang_name ) {
+ $lang =& $lang_list[$lang_name];
+ $isOrphan = true;
+ if(isset($lang['base'])){
+ echo "<tr>\n";
+ echo "<td class='$class' >" . $lang['base'] -> getVar('lang_desc') . "</td>\n";
+ echo "<td class='$class' ><b>" . $lang['base'] -> getVar('lang_name') . "</b></td>\n";
+ echo "<td class='$class' ><b>" . $lang['base'] -> getVar('lang_charset') . "</b></td>\n";
+ echo "<td class='$class' >" . $lang['base'] -> getVar('lang_code') . "</td>\n";
+ if(is_readable(XOOPS_ROOT_PATH.'/modules/xlanguage/images/'.$lang['base'] -> getVar('lang_image'))){
+ $lang_image = $lang['base'] -> getVar('lang_image');
+ }else{
+ $lang_image = 'noflag.gif';
+ }
+ echo "<td class='$class' ><img src='" . XOOPS_URL.'/modules/xlanguage/images/'.$lang_image . "' alt='".$lang['base'] -> getVar('lang_desc')."' /></td>\n";
+ echo "<td class='$class' >" . $lang['base'] -> getVar('weight') . "</td>\n";
+ echo "<td class='$class' >Ø</td>\n";
+ echo "<td class='$class' ><a href='main.php?op=edit&type=base&lang_id=" . $lang['base'] -> getVar('lang_id') . "'><img src=".$pathIcon16.'/edit.png title=' . _EDIT . "></a>\n".
+ "<a href='main.php?op=del&type=base&lang_id=" . $lang['base'] -> getVar('lang_id') . "'><img src=".$pathIcon16.'/delete.png title=' . _DELETE ."></td>\n";
+ echo "</tr>\n";
+ $isOrphan = false;
+ $class = ($class == 'odd') ? 'even' : 'odd';
+ }
+ if(!isset($lang['ext'])||count($lang['ext'])<1) continue;
+ foreach($lang['ext'] as $ext){
+ echo "<tr>\n";
+ echo "<td class='$class' >" . $ext -> getVar('lang_desc') . "</td>\n";
+ echo "<td class='$class' >" . $ext -> getVar('lang_name') . "</td>\n";
+ echo "<td class='$class' ><b>" . $ext -> getVar('lang_charset') . "</b></td>\n";
+ echo "<td class='$class' >" . $ext -> getVar('lang_code') . "</td>\n";
+ if(is_readable(XOOPS_ROOT_PATH.'/modules/xlanguage/images/'.$ext -> getVar('lang_image'))){
+ $lang_image = $ext -> getVar('lang_image');
+ }else{
+ $lang_image = 'noflag.gif';
+ }
+ echo "<td class='$class' ><img src='" . XOOPS_URL.'/modules/xlanguage/images/'.$lang_image . "' alt='".$ext -> getVar('lang_desc')."' /></td>\n";
+ echo "<td class='$class' >" . $ext -> getVar('weight') . "</td>\n";
+ $lang_base = ($isOrphan)?"<font color='red'>".$ext -> getVar('lang_base')."</font>":$ext -> getVar('lang_base');
+ echo "<td class='$class' ><b>" . $lang_base . "</b></td>\n";
+ echo "<td class='$class' ><a href='main.php?op=edit&type=ext&lang_id=" . $ext -> getVar('lang_id') . "'><img src=".$pathIcon16.'/edit.png title=' . _EDIT . "></a>\n".
+ "<a href='main.php?op=del&type=ext&lang_id=" . $ext -> getVar('lang_id') . "'><img src=".$pathIcon16.'/delete.png title=' . _DELETE ."></td>\n";
+ echo "</tr>\n";
+ }
+ echo "<tr><td colspan='9' ></td></tr>\n";
+ $class = ($class == 'odd') ? 'even' : 'odd';
+ }
+
+ echo "</table></div>\n";
+ echo"</td></tr></table>";
+ echo "<br />";
+ }
+}
+?>
Modified: XoopsModules/xlanguage/branches/mamba/xlanguage/class/language.php
===================================================================
--- XoopsModules/xlanguage/branches/mamba/xlanguage/class/language.php 2012-07-31 09:28:57 UTC (rev 9953)
+++ XoopsModules/xlanguage/branches/mamba/xlanguage/class/language.php 2012-07-31 10:13:35 UTC (rev 9954)
@@ -39,12 +39,12 @@
$this -> db = & XoopsDatabaseFactory::getDatabaseConnection();
$this -> table = $this -> db -> prefix( "xlanguage_base" );
$this->initVar('lang_id', XOBJ_DTYPE_INT);
+ $this->initVar('weight', XOBJ_DTYPE_INT);
+ $this->initVar('lang_name', XOBJ_DTYPE_TXTBOX);
$this->initVar('lang_desc', XOBJ_DTYPE_TXTBOX);
- $this->initVar('lang_name', XOBJ_DTYPE_TXTBOX);
$this->initVar('lang_code', XOBJ_DTYPE_TXTBOX);
$this->initVar('lang_charset', XOBJ_DTYPE_TXTBOX);
$this->initVar('lang_image', XOBJ_DTYPE_TXTBOX);
- $this->initVar('weight', XOBJ_DTYPE_INT);
}
function prepareVars()
@@ -240,9 +240,9 @@
if ( $lang->isNew() ) {
if($lang->isBase){
- $var_array = array("lang_id", "lang_name", "lang_desc", "lang_image", "weight", "lang_code", "lang_charset");
+ $var_array = array("lang_id", "weight", "lang_name", "lang_desc", "lang_code", "lang_charset", "lang_image");
}else{
- $var_array = array("lang_id", "lang_name", "lang_desc", "lang_image", "weight", "lang_code", "lang_charset", "lang_base");
+ $var_array = array("lang_id", "weight", "lang_name", "lang_desc", "lang_image", "lang_charset", "lang_code", "lang_base");
}
$lang_id = $this->db->genId($lang->table."_lang_id_seq");
foreach($var_array as $var){
@@ -257,9 +257,9 @@
$lang->setVar('lang_id', $lang_id);
}else{
if($lang->isBase){
- $var_array = array("lang_name", "lang_desc", "lang_image", "weight", "lang_code", "lang_charset");
+ $var_array = array("weight", "lang_name", "lang_desc", "lang_code", "lang_charset", "lang_image");
}else{
- $var_array = array("lang_name", "lang_desc", "lang_image", "weight", "lang_code", "lang_charset", "lang_base");
+ $var_array = array("weight", "lang_name", "lang_desc", "lang_code", "lang_charset", "lang_base");
}
$set_array = array();
foreach($var_array as $var){
@@ -310,13 +310,13 @@
$file_content .= "\n \$".XLANGUAGE_CONFIG_VAR."['xlanguage_base'] = array(";
foreach( $baseArray as $lang ) {
$file_content .= "\n \"".$lang->getVar('lang_name')."\"=>array(";
+ $file_content .= "\n \"lang_id\"=>".$lang->getVar('lang_id').",";
+ $file_content .= "\n \"weight\"=>".$lang->getVar('weight').",";
$file_content .= "\n \"lang_name\"=>\"".$lang->getVar('lang_name')."\",";
$file_content .= "\n \"lang_desc\"=>\"".$lang->getVar('lang_desc')."\",";
- $file_content .= "\n \"lang_charset\"=>\"".$lang->getVar('lang_charset')."\",";
$file_content .= "\n \"lang_code\"=>\"".$lang->getVar('lang_code')."\",";
- $file_content .= "\n \"lang_image\"=>\"".$lang->getVar('lang_image')."\",";
- $file_content .= "\n \"lang_id\"=>".$lang->getVar('lang_id').",";
- $file_content .= "\n \"weight\"=>".$lang->getVar('weight')."";
+ $file_content .= "\n \"lang_charset\"=>\"".$lang->getVar('lang_charset')."\",";
+ $file_content .= "\n \"lang_image\"=>\"".$lang->getVar('lang_image')."\"";
$file_content .= "\n ),";
}
$file_content .= "\n );";
@@ -327,15 +327,15 @@
$file_content .= "\n \$".XLANGUAGE_CONFIG_VAR."['xlanguage_ext'] = array(";
foreach( $extArray as $lang ) {
$file_content .= "\n \"".$lang->getVar('lang_name')."\"=>array(";
+ $file_content .= "\n \"lang_id\"=>".$lang->getVar('lang_id').",";
+ $file_content .= "\n \"weight\"=>".$lang->getVar('weight').",";
$file_content .= "\n \"lang_name\"=>\"".$lang->getVar('lang_name')."\",";
$file_content .= "\n \"lang_desc\"=>\"".$lang->getVar('lang_desc')."\",";
- $file_content .= "\n \"lang_charset\"=>\"".$lang->getVar('lang_charset')."\",";
$file_content .= "\n \"lang_code\"=>\"".$lang->getVar('lang_code')."\",";
+ $file_content .= "\n \"lang_charset\"=>\"".$lang->getVar('lang_charset')."\",";
$file_content .= "\n \"lang_image\"=>\"".$lang->getVar('lang_image')."\",";
- $file_content .= "\n \"lang_base\"=>\"".$lang->getVar('lang_base')."\",";
- $file_content .= "\n \"lang_id\"=>".$lang->getVar('lang_id').",";
- $file_content .= "\n \"weight\"=>".$lang->getVar('weight')."";
- $file_content .= "\n ),";
+ $file_content .= "\n \"lang_base\"=>\"".$lang->getVar('lang_base')."";
+ $file_content .= "\n ).";
}
$file_content .= "\n );";
}
Modified: XoopsModules/xlanguage/branches/mamba/xlanguage/docs/changelog.txt
===================================================================
--- XoopsModules/xlanguage/branches/mamba/xlanguage/docs/changelog.txt 2012-07-31 09:28:57 UTC (rev 9953)
+++ XoopsModules/xlanguage/branches/mamba/xlanguage/docs/changelog.txt 2012-07-31 10:13:35 UTC (rev 9954)
@@ -1,3 +1,8 @@
+xlanguage 3.04:
+-------------------
+- updated POSIX Regex to PCRE (Mamba)
+- minor fixes (Mamba)
+
xlanguage 3.03:
-------------------
1 updated to XOOPS 2.5.x GUI using ModuleAdmin class (Mamba)
Modified: XoopsModules/xlanguage/branches/mamba/xlanguage/include/functions.php
===================================================================
--- XoopsModules/xlanguage/branches/mamba/xlanguage/include/functions.php 2012-07-31 09:28:57 UTC (rev 9953)
+++ XoopsModules/xlanguage/branches/mamba/xlanguage/include/functions.php 2012-07-31 10:13:35 UTC (rev 9954)
@@ -1,284 +1,283 @@
-<?php
-// $Id$
-// ------------------------------------------------------------------------ //
-// Xlanguage: eXtensible Language Management For Xoops //
-// Copyright (c) 2004 Xoops China Community //
-// <http://www.xoops.org.cn/> //
-// ------------------------------------------------------------------------ //
-// This program is free software; you can redistribute it and/or modify //
-// it under the terms of the GNU General Public License as published by //
-// the Free Software Foundation; either version 2 of the License, or //
-// (at your option) any later version. //
-// //
-// You may not change or alter any portion of this comment or credits //
-// of supporting developers from this source code or any supporting //
-// source code which is considered copyrighted (c) material of the //
-// original comment or credit authors. //
-// //
-// This program is distributed in the hope that it will be useful, //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
-// GNU General Public License for more details. //
-// //
-// You should have received a copy of the GNU General Public License //
-// along with this program; if not, write to the Free Software //
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
-// ------------------------------------------------------------------------ //
-// Author: D.J.(phppp) ph...@ho... //
-// URL: http://www.xoops.org.cn //
-// ------------------------------------------------------------------------- //
-
-function xlanguage_convert_encoding($value, $out_charset, $in_charset)
-{
- if (is_array($value)) {
- foreach($value as $key => $val){
- $value[$key] = xlanguage_convert_encoding($val, $out_charset, $in_charset);
- }
- }
- else {
- $value = xlanguage_convert_item($value, $out_charset, $in_charset);
- }
- return $value;
-}
-
-function xlanguage_convert_item($value, $out_charset, $in_charset)
-{
- if(strtolower($in_charset) == strtolower($out_charset)) {
- return $value;
- }
- $xconv_handler = @xoops_getmodulehandler('xconv', 'xconv', true);
- if(is_object($xconv_handler) &&
- $converted_value = @$xconv_handler->convert_encoding($value, $out_charset, $in_charset)
- ){
- return $converted_value;
- }
- if(XOOPS_USE_MULTIBYTES && function_exists('mb_convert_encoding')) {
- $converted_value = @mb_convert_encoding($value, $out_charset, $in_charset);
- }elseif(function_exists('iconv')) {
- $converted_value = @iconv($in_charset, $out_charset, $value);
- }
- $value = empty($converted_value) ? $value : $converted_value;
-
- return $value;
-}
-
-function xlanguage_createConfig()
-{
- $xlang_handler=& xoops_getmodulehandler('language', 'xlanguage');
- return $xlang_handler->createConfig();
-}
-
-function &xlanguage_loadConfig()
-{
- $xlang_handler=& xoops_getmodulehandler('language', 'xlanguage');
- $config =& $xlang_handler->loadFileConfig();
- return $config;
-}
-
-/**
- * Analyzes some PHP environment variables to find the most probable language
- * that should be used
- *
- * @param string $ string to analyze
- * @param integer $ type of the PHP environment variable which value is $str
- * @global array the list of available translations
- * @global string the retained translation keyword
- * @access private
- */
-function xlanguage_lang_detect($str = '', $envType = '')
-{
- global $available_languages;
- $lang='';
-
- if(!empty($available_languages)) {
- foreach ($available_languages AS $key => $value) {
- // $envType = 1 for the 'HTTP_ACCEPT_LANGUAGE' environment variable,
- // 2 for the 'HTTP_USER_AGENT' one
- $expr = $value[0];
- if (strpos($expr, '[-_]') === FALSE) {
- $expr = str_replace('|', '([-_][[:alpha:]]{2,3})?|', $expr);
- }
- if (($envType == 1 && eregi('^(' . $expr . ')(;q=[0-9]\\.[0-9])?$', $str))
- || ($envType == 2 && eregi('(\(|\[|;[[:space:]])(' . $expr . ')(;|\]|\))', $str))) {
- $lang = $key;
- //if($lang != 'en')
- break;
- }
- }
- }
-
- return $lang;
-}
-
-function xlanguage_detectLang()
-{
- global $available_languages,$_SERVER;
-
- if (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
- $HTTP_ACCEPT_LANGUAGE = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
- }
-
- if (!empty($_SERVER['HTTP_USER_AGENT'])) {
- $HTTP_USER_AGENT = $_SERVER['HTTP_USER_AGENT'];
- }
-
- $lang = '';
- $xoops_lang ='';
- // 1. try to findout user's language by checking its HTTP_ACCEPT_LANGUAGE
- // variable
- if (empty($lang) && !empty($HTTP_ACCEPT_LANGUAGE)) {
- $accepted = explode(',', $HTTP_ACCEPT_LANGUAGE);
- $acceptedCnt = count($accepted);
- reset($accepted);
- for ($i = 0; $i < $acceptedCnt; $i++) {
- $lang = xlanguage_lang_detect($accepted[$i], 1);
- if(strncasecmp($lang,'en',2)){
- break;
- }
- }
- }
- // 2. try to findout user's language by checking its HTTP_USER_AGENT variable
- if (empty($lang) && !empty($HTTP_USER_AGENT)) {
- $lang = xlanguage_lang_detect($HTTP_USER_AGENT, 2);
- }
- // 3. If we catch a valid language, configure it
- if (!empty($lang)) {
- $xoops_lang = $available_languages[$lang][1];
- }
- return $xoops_lang;
-}
-
-function xlanguage_encoding($output){
- global $xlanguage;
- $output = xlanguage_ml($output);
- // escape XML doc
- if(preg_match("/^\<\?[\s]?xml[\s]+version=([\"'])[^\>]+\\1[\s]+encoding=([\"'])[^\>]+\\2[\s]?\?\>/i", $output)){
- return $output;
- }
- $in_charset = $xlanguage["charset_base"];
- $out_charset = $xlanguage["charset"];
-
- return $output = xlanguage_convert_encoding($output, $out_charset, $in_charset);
-}
-
-function xlanguage_ml($s)
-{
- global $xoopsConfig;
- global $xlanguage_langs;
-
- if(!isset($xlanguage_langs)){
- $langs =& $GLOBALS["xlanguage_handler"]->getAll(true);
- foreach( array_keys($langs) as $_lang ) {
- $xlanguage_langs[$_lang] = $langs[$_lang]->getVar("lang_code");
- }
- unset($langs);
- }
- if(empty($xlanguage_langs) || count($xlanguage_langs) ==0) return $s;
-
- // escape brackets inside of <code>...</code>
- $patterns[] = '/(\<code>.*\<\/code>)/isU';
-
- // escape brackets inside of <input type="..." value="...">
- $patterns[] = '/(\<input\b(?![^\>]*\btype=([\'"]?)(submit|image|reset|button))[^\>]*\>)/isU';
-
- // escape brackets inside of <textarea></textarea>
- $patterns[] = '/(\<textarea\b[^>]*>[^\<]*\<\/textarea>)/isU';
-
- $s = preg_replace_callback( $patterns , 'xlanguage_ml_escape_bracket' , $s ) ;
-
-
- // create the pattern between language tags
- $pqhtmltags = explode( ',' , preg_quote( XLANGUAGE_TAGS_RESERVED , '/' ) ) ;
- $mid_pattern = '(?:(?!(' . implode( '|' , $pqhtmltags ) . ')).)*' ;
-
- $patterns = array();
- $replaces = array();
- /* */
- if(isset($xlanguage_langs[$xoopsConfig['language']])) {
- $lang = $xlanguage_langs[$xoopsConfig['language']];
- $patterns[] = '/(\[([^\]]*\|)?'.preg_quote($lang).'(\|[^\]]*)?\])('.$mid_pattern.')(\[\/([^\]]*\|)?'.preg_quote($lang).'(\|[^\]]*)?\])/isU';
- $replaces[] = '$4';
- }
- /* */
- foreach( array_keys($xlanguage_langs) as $_lang ) {
- if($_lang == @$xoopsConfig['language']) continue;
- $name = $xlanguage_langs[$_lang];
- $patterns[] = '/(\[([^\]]*\|)?'.preg_quote($name).'(\|[^\]]*)?\])('.$mid_pattern.')(\[\/([^\]]*\|)?'.preg_quote($name).'(\|[^\]]*)?(\]\<br[\s]?[\/]?\>|\]))/isU';
- $replaces[] = '';
- }
- if(!empty($xoopsConfig['language'])){
- $s = preg_replace( '/\[[\/]?[\|]?'.preg_quote($xoopsConfig['language']).'[\|]?\](\<br \/\>)?/i' , '' , $s ) ;
- }
- if(count($replaces)>0){
- $s = preg_replace( $patterns , $replaces , $s ) ;
- }
-
- return $s ;
-}
-
-function xlanguage_ml_escape_bracket( $matches )
-{
- global $xlanguage_langs;
- $ret = $matches[1];
- if(!empty($xlanguage_langs)) {
- $pattern = '/(\[([\/])?('.implode("|",array_map("preg_quote", array_values($xlanguage_langs))).')([\|\]]))/isU';
- $ret = preg_replace($pattern, "[\\2\\3\\4", $ret);
- }
- return $ret;
-}
-
-
-function xlanguage_select_show($options = null)
-{
- include_once XOOPS_ROOT_PATH."/modules/xlanguage/blocks/xlanguage_blocks.php";
- if(empty($options)){
- $options[0] = "images"; // display style: image, text, select
- $options[1] = " "; // delimitor
- $options[2] = 5; // items per line
- }
-
- $block = b_xlanguage_select_show($options);
- $block["tag"] = "xlanguage";
-
- $content = "";
- $i = 1;
- if(!empty($block["display"])) { //mb
- if(in_array($block["display"], array("images", "text"))){
- foreach($block["languages"] as $name => $lang){
- $content .= "<a href=\"".$block["url"].$lang["name"]."\" title=\"".$lang["desc"]."\">";
- if($block["display"] == "images"){
- $content .= "<img src=\"".$lang["image"]."\" alt=\"".$lang["desc"]."\"";
- if($block["selected"] != $lang["name"]){
- $content .= " style=\"MozOpacity: .8; opacity: .8; filter:Alpha(opacity=80);\"";
- }
- $content .= "/>";
- }else{
- $content .= $lang["desc"];
- }
- $content .= "</a>";
- if( ( $i++ % $block["number"] ) == 0){
- $content .= "<br />";
- }
- }
- }else{
- $content .= "<select name=\"".$block["tag"]."\"
- onChange=\"if(this.options[this.selectedIndex].value.length >0 ) { window.document.location=this.options[this.selectedIndex].value;}\"
- >";
- if(!empty($block["languages"])) { //mb
- foreach($block["languages"] as $name => $lang){
- $content .= "<option value=\"".$block["url"].$lang["name"]."\"";
- if($block["selected"] == $lang["name"]){
- $content .= " selected ";
- }
- $content .= "/>".$lang["desc"]."</option>";
- }
- }
- $content .= "</select>";
- }
- }
-
- define("XLANGUAGE_SWITCH_CODE", $content);
- return true;
-}
-
-?>
+<?php
+// $Id$
+// ------------------------------------------------------------------------ //
+// Xlanguage: eXtensible Language Management For Xoops //
+// Copyright (c) 2004 Xoops China Community //
+// <http://www.xoops.org.cn/> //
+// ------------------------------------------------------------------------ //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation; either version 2 of the License, or //
+// (at your option) any later version. //
+// //
+// You may not change or alter any portion of this comment or credits //
+// of supporting developers from this source code or any supporting //
+// source code which is considered copyrighted (c) material of the //
+// original comment or credit authors. //
+// //
+// This program is distributed in the hope that it will be useful, //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
+// GNU General Public License for more details. //
+// //
+// You should have received a copy of the GNU General Public License //
+// along with this program; if not, write to the Free Software //
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
+// ------------------------------------------------------------------------ //
+// Author: D.J.(phppp) ph...@ho... //
+// URL: http://www.xoops.org.cn //
+// ------------------------------------------------------------------------- //
+
+function xlanguage_convert_encoding($value, $out_charset, $in_charset)
+{
+ if (is_array($value)) {
+ foreach($value as $key => $val){
+ $value[$key] = xlanguage_convert_encoding($val, $out_charset, $in_charset);
+ }
+ }
+ else {
+ $value = xlanguage_convert_item($value, $out_charset, $in_charset);
+ }
+ return $value;
+}
+
+function xlanguage_convert_item($value, $out_charset, $in_charset)
+{
+ if(strtolower($in_charset) == strtolower($out_charset)) {
+ return $value;
+ }
+ $xconv_handler = @xoops_getmodulehandler('xconv', 'xconv', true);
+ if(is_object($xconv_handler) &&
+ $converted_value = @$xconv_handler->convert_encoding($value, $out_charset, $in_charset)
+ ){
+ return $converted_value;
+ }
+ if(XOOPS_USE_MULTIBYTES && function_exists('mb_convert_encoding')) {
+ $converted_value = @mb_convert_encoding($value, $out_charset, $in_charset);
+ }elseif(function_exists('iconv')) {
+ $converted_value = @iconv($in_charset, $out_charset, $value);
+ }
+ $value = empty($converted_value) ? $value : $converted_value;
+
+ return $value;
+}
+
+function xlanguage_createConfig()
+{
+ $xlang_handler=& xoops_getmodulehandler('language', 'xlanguage');
+ return $xlang_handler->createConfig();
+}
+
+function &xlanguage_loadConfig()
+{
+ $xlang_handler=& xoops_getmodulehandler('language', 'xlanguage');
+ $config =& $xlang_handler->loadFileConfig();
+ return $config;
+}
+
+/**
+ * Analyzes some PHP environment variables to find the most probable language
+ * that should be used
+ *
+ * @param string $ string to analyze
+ * @param integer $ type of the PHP environment variable which value is $str
+ * @global array the list of available translations
+ * @global string the retained translation keyword
+ * @access private
+ */
+function xlanguage_lang_detect($str = '', $envType = '')
+{
+ global $available_languages;
+ $lang='';
+
+ if(!empty($available_languages)) {
+ foreach ($available_languages AS $key => $value) {
+ // $envType = 1 for the 'HTTP_ACCEPT_LANGUAGE' environment variable,
+ // 2 for the 'HTTP_USER_AGENT' one
+ $expr = $value[0];
+ if (strpos($expr, '[-_]') === FALSE) {
+ $expr = str_replace('|', '([-_][[:alpha:]]{2,3})?|', $expr);
+ }
+// if (($envType == 1 && eregi('^(' . $expr . ')(;q=[0-9]\\.[0-9])?$', $str))
+// || ($envType == 2 && eregi('(\(|\[|;[[:space:]])(' . $expr . ')(;|\]|\))', $str))) {
+ if (($envType == 1 && preg_match('#^(' . $expr . ')(;q=[0-9]\\.[0-9])?$#i', $str))
+ || ($envType == 2 && preg_match('#(\(|\[|;[[:space:]])(' . $expr . ')(;|\]|\))#i', $str))) {
+ $lang = $key;
+ //if($lang != 'en')
+ break;
+ }
+ }
+ }
+ return $lang;
+}
+
+function xlanguage_detectLang()
+{
+ global $available_languages,$_SERVER;
+
+ if (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+ $HTTP_ACCEPT_LANGUAGE = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
+ }
+
+ if (!empty($_SERVER['HTTP_USER_AGENT'])) {
+ $HTTP_USER_AGENT = $_SERVER['HTTP_USER_AGENT'];
+ }
+
+ $lang = '';
+ $xoops_lang ='';
+ // 1. try to findout user's language by checking its HTTP_ACCEPT_LANGUAGE
+ // variable
+ if (empty($lang) && !empty($HTTP_ACCEPT_LANGUAGE)) {
+ $accepted = explode(',', $HTTP_ACCEPT_LANGUAGE);
+ $acceptedCnt = count($accepted);
+ reset($accepted);
+ for ($i = 0; $i < $acceptedCnt; $i++) {
+ $lang = xlanguage_lang_detect($accepted[$i], 1);
+ if(strncasecmp($lang,'en',2)){
+ break;
+ }
+ }
+ }
+ // 2. try to findout user's language by checking its HTTP_USER_AGENT variable
+ if (empty($lang) && !empty($HTTP_USER_AGENT)) {
+ $lang = xlanguage_lang_detect($HTTP_USER_AGENT, 2);
+ }
+ // 3. If we catch a valid language, configure it
+ if (!empty($lang)) {
+ $xoops_lang = $available_languages[$lang][1];
+ }
+ return $xoops_lang;
+}
+
+function xlanguage_encoding($output){
+ global $xlanguage;
+ $output = xlanguage_ml($output);
+ // escape XML doc
+ if(preg_match("/^\<\?[\s]?xml[\s]+version=([\"'])[^\>]+\\1[\s]+encoding=([\"'])[^\>]+\\2[\s]?\?\>/i", $output)){
+ return $output;
+ }
+ $in_charset = $xlanguage["charset_base"];
+ $out_charset = $xlanguage["charset"];
+
+ return $output = xlanguage_convert_encoding($output, $out_charset, $in_charset);
+}
+
+function xlanguage_ml($s)
+{
+ global $xoopsConfig;
+ global $xlanguage_langs;
+
+ if(!isset($xlanguage_langs)){
+ $langs =& $GLOBALS["xlanguage_handler"]->getAll(true);
+ foreach( array_keys($langs) as $_lang ) {
+ $xlanguage_langs[$_lang] = $langs[$_lang]->getVar("lang_code");
+ }
+ unset($langs);
+ }
+ if(empty($xlanguage_langs) || count($xlanguage_langs) ==0) return $s;
+
+ // escape brackets inside of <code>...</code>
+ $patterns[] = '/(\<code>.*\<\/code>)/isU';
+
+ // escape brackets inside of <input type="..." value="...">
+ $patterns[] = '/(\<input\b(?![^\>]*\btype=([\'"]?)(submit|image|reset|button))[^\>]*\>)/isU';
+
+ // escape brackets inside of <textarea></textarea>
+ $patterns[] = '/(\<textarea\b[^>]*>[^\<]*\<\/textarea>)/isU';
+
+ $s = preg_replace_callback( $patterns , 'xlanguage_ml_escape_bracket' , $s ) ;
+
+
+ // create the pattern between language tags
+ $pqhtmltags = explode( ',' , preg_quote( XLANGUAGE_TAGS_RESERVED , '/' ) ) ;
+ $mid_pattern = '(?:(?!(' . implode( '|' , $pqhtmltags ) . ')).)*' ;
+
+ $patterns = array();
+ $replaces = array();
+ /* */
+ if(isset($xlanguage_langs[$xoopsConfig['language']])) {
+ $lang = $xlanguage_langs[$xoopsConfig['language']];
+ $patterns[] = '/(\[([^\]]*\|)?'.preg_quote($lang).'(\|[^\]]*)?\])('.$mid_pattern.')(\[\/([^\]]*\|)?'.preg_quote($lang).'(\|[^\]]*)?\])/isU';
+ $replaces[] = '$4';
+ }
+ /* */
+ foreach( array_keys($xlanguage_langs) as $_lang ) {
+ if($_lang == @$xoopsConfig['language']) continue;
+ $name = $xlanguage_langs[$_lang];
+ $patterns[] = '/(\[([^\]]*\|)?'.preg_quote($name).'(\|[^\]]*)?\])('.$mid_pattern.')(\[\/([^\]]*\|)?'.preg_quote($name).'(\|[^\]]*)?(\]\<br[\s]?[\/]?\>|\]))/isU';
+ $replaces[] = '';
+ }
+ if(!empty($xoopsConfig['language'])){
+ $s = preg_replace( '/\[[\/]?[\|]?'.preg_quote($xoopsConfig['language']).'[\|]?\](\<br \/\>)?/i' , '' , $s ) ;
+ }
+ if(count($replaces)>0){
+ $s = preg_replace( $patterns , $replaces , $s ) ;
+ }
+
+ return $s ;
+}
+
+function xlanguage_ml_escape_bracket( $matches )
+{
+ global $xlanguage_langs;
+ $ret = $matches[1];
+ if(!empty($xlanguage_langs)) {
+ $pattern = '/(\[([\/])?('.implode("|",array_map("preg_quote", array_values($xlanguage_langs))).')([\|\]]))/isU';
+ $ret = preg_replace($pattern, "[\\2\\3\\4", $ret);
+ }
+ return $ret;
+}
+
+
+function xlanguage_select_show($options = null)
+{
+ include_once XOOPS_ROOT_PATH."/modules/xlanguage/blocks/xlanguage_blocks.php";
+ if(empty($options)){
+ $options[0] = "images"; // display style: image, text, select
+ $options[1] = " "; // delimitor
+ $options[2] = 5; // items per line
+ }
+
+ $block = b_xlanguage_select_show($options);
+ $block["tag"] = "xlanguage";
+
+ $content = "";
+ $i = 1;
+ if(!empty($block["display"])) { //mb
+ if(in_array($block["display"], array("images", "text"))){
+ foreach($block["languages"] as $name => $lang){
+ $content .= "<a href=\"".$block["url"].$lang["name"]."\" title=\"".$lang["desc"]."\">";
+ if($block["display"] == "images"){
+ $content .= "<img src=\"".$lang["image"]."\" alt=\"".$lang["desc"]."\"";
+ if($block["selected"] != $lang["name"]){
+ $content .= " style=\"MozOpacity: .8; opacity: .8; filter:Alpha(opacity=80);\"";
+ }
+ $content .= "/>";
+ }else{
+ $content .= $lang["desc"];
+ }
+ $content .= "</a>";
+ if( ( $i++ % $block["number"] ) == 0){
+ $content .= "<br />";
+ }
+ }
+ }else{
+ $content .= "<select name=\"".$block["tag"]."\"
+ onChange=\"if(this.options[this.selectedIndex].value.length >0 ) { window.document.location=this.options[this.selectedIndex].value;}\"
+ >";
+ if(!empty($block["languages"])) { //mb
+ foreach($block["languages"] as $name => $lang){
+ $content .= "<option value=\"".$block["url"].$lang["name"]."\"";
+ if($block["selected"] == $lang["name"]){
+ $content .= " selected ";
+ }
+ $content .= "/>".$lang["desc"]."</option>";
+ }
+ }
+ $content .= "</select>";
+ }
+ }
+
+ define("XLANGUAGE_SWITCH_CODE", $content);
+ return true;
+}
\ No newline at end of file
Modified: XoopsModules/xlanguage/branches/mamba/xlanguage/xoops_version.php
===================================================================
--- XoopsModules/xlanguage/branches/mamba/xlanguage/xoops_version.php 2012-07-31 09:28:57 UTC (rev 9953)
+++ XoopsModules/xlanguage/branches/mamba/xlanguage/xoops_version.php 2012-07-31 10:13:35 UTC (rev 9954)
@@ -28,10 +28,10 @@
// URL: http://xoops.org.cn //
// ------------------------------------------------------------------------- //
$modversion['name'] = _MI_XLANGUAGE_NAME;
-$modversion['version'] = 3.03;
+$modversion['version'] = 3.04;
$modversion['description'] = _MI_XLANGUAGE_DESC;
$modversion['credits'] = "Adi Chiributa - web...@ar...; wjue - http://www.wjue.org; GIJOE - http://www.peak.ne.jp";
-$modversion['author'] = "phppp(D.J.) - http://xoops.org.cn, http://xoopsforge.com";
+$modversion['author'] = "phppp(D.J.)" ;
$modversion['help'] = "page=help";
$modversion['license'] = "GNU GPL";
$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/";
@@ -44,9 +44,9 @@
//about
$modversion['release_date'] = '2012/06/19';
-$modversion["module_website_url"] = "http://www.xoops.org/";
+$modversion["module_website_url"] = "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';
@@ -88,5 +88,4 @@
$modversion['demo_site_url'] = "http://xoops.org.cn";
$modversion['demo_site_name'] = "Xoops China";
$modversion['support_site_url'] = "http://xoopsforge.com";
-$modversion['support_site_name'] = "XForge";
-?>
\ No newline at end of file
+$modversion['support_site_name'] = "XForge";
\ No newline at end of file
Modified: XoopsModules/xlanguage/trunk/xlanguage/admin/admin_footer.php
===================================================================
--- XoopsModules/xlanguage/trunk/xlanguage/admin/admin_footer.php 2012-07-31 09:28:57 UTC (rev 9953)
+++ XoopsModules/xlanguage/trunk/xlanguage/admin/admin_footer.php 2012-07-31 10:13:35 UTC (rev 9954)
@@ -2,7 +2,7 @@
echo "<div class='adminfooter'>\n"
." <div style='text-align: center;'>\n"
- ." <a href='http://www.xoops.org' target='_blank'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
+ ." <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
." </div>\n"
." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
."</div>";
Modified: XoopsModules/xlanguage/trunk/xlanguage/admin/langform.inc.php
===================================================================
--- XoopsModules/xlanguage/trunk/xlanguage/admin/langform.inc.php 2012-07-31 09:28:57 UTC (rev 9953)
+++ XoopsModules/xlanguage/trunk/xlanguage/admin/langform.inc.php 2012-07-31 10:13:35 UTC (rev 9954)
@@ -41,18 +41,18 @@
$sform->addElement(new XoopsFormText(_AM_XLANG_DESC, 'lang_desc', 50, 255, $lang_desc));
+//$sform->addElement(new XoopsFormText(_AM_XLANG_CODE, 'lang_code', 50, 255, $lang_code), true);
+$lang_code = new XoopsFormText(_AM_XLANG_CODE, 'lang_code', 50, 255, $lang_code);
+$lang_code->setDescription(_AM_XLANG_CODE_DESC);
+$sform->addElement($lang_code, true);
+
//$sform->addElement(new XoopsFormText(_AM_XLANG_CHARSET, 'lang_charset', 50, 255, $lang_charset), true);
$lang_charset = new XoopsFormText(_AM_XLANG_CHARSET, 'lang_charset', 50, 255, $lang_charset);
$lang_charset->setDescription(_AM_XLANG_CHARSET_DESC);
$sform->addElement($lang_charset, true);
-//$sform->addElement(new XoopsFormText(_AM_XLANG_CODE, 'lang_code', 50, 255, $lang_code), true);
-$lang_code = new XoopsFormText(_AM_XLANG_CODE, 'lang_charset', 50, 255, $lang_code);
-$lang_code->setDescription(_AM_XLANG_CODE_DESC);
-$sform->addElement($lang_code, true);
-
if(!$isBase){
$baseList =& $xlanguage_handler->getAll();
$base_list = array();
@@ -87,9 +87,8 @@
$button_tray = new XoopsFormElementTray('', '');
$button_tray->addElement(new XoopsFormHidden('op', 'save'));
-$button_tray->addElement(new XoopsFormButton('', '', _GO, 'submit'));
+$button_tray->addElement(new XoopsFormButton('', '', _SUBMIT, 'submit'));
$button_tray->addElement(new XoopsFormButton('', '', _CANCEL, 'submit'));
$sform->addElement($button_tray);
-$sform->display();
-?>
\ No newline at end of file
+$sform->display();
\ No newline at end of file
Modified: XoopsModules/xlanguage/trunk/xlanguage/admin/main.php
===================================================================
--- XoopsModules/xlanguage/trunk/xlanguage/admin/main.php 2012-07-31 09:28:57 UTC (rev 9953)
+++ XoopsModules/xlanguage/trunk/xlanguage/admin/main.php 2012-07-31 10:13:35 UTC (rev 9954)
@@ -1,245 +1,245 @@
-<?php
-// $Id: main.php 8586 2011-12-27 12:03:19Z beckmi $
-// ------------------------------------------------------------------------ //
-// Xlanguage: eXtensible Language Management For Xoops //
-// Copyright (c) 2004 Xoops China Community //
-// <http://www.xoops.org.cn/> //
-// ------------------------------------------------------------------------ //
-// This program is free software; you can redistribute it and/or modify //
-// it under the terms of the GNU General Public License as published by //
-// the ...
[truncated message content] |
|
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: <luc...@us...> - 2012-07-30 21:53:58
|
Revision: 9952
http://xoops.svn.sourceforge.net/xoops/?rev=9952&view=rev
Author: luciorota
Date: 2012-07-30 21:53:52 +0000 (Mon, 30 Jul 2012)
Log Message:
-----------
fixed enhanced image manager bug
update enhanced image manager templates to xoops 2.5.5 GUI
Modified Paths:
--------------
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/imagemanager/imagemanager.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/templates/ajaxfm_imagemanager.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/templates/ajaxfm_imagemanager2.html
Modified: XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/imagemanager/imagemanager.php
===================================================================
--- XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/imagemanager/imagemanager.php 2012-07-30 21:05:15 UTC (rev 9951)
+++ XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/imagemanager/imagemanager.php 2012-07-30 21:53:52 UTC (rev 9952)
@@ -171,7 +171,8 @@
$xoopsTpl->assign('show_cat', $imgcat_id);
$xoopsTpl->assign('lang_imgmanager', _IMGMANAGER);
$xoopsTpl->assign('sitename', htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES));
- $xoopsTpl->assign('target', htmlspecialchars($_GET['target'], ENT_QUOTES));
+ $xoopsTpl->assign('target', $target);
+ $xoopsTpl->assign('editor', $editor);
include_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
$form = new XoopsThemeForm('', 'image_form', 'imagemanager.php', 'post', true);
$form->setExtra('enctype="multipart/form-data"');
Modified: XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/templates/ajaxfm_imagemanager.html
===================================================================
--- XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/templates/ajaxfm_imagemanager.html 2012-07-30 21:05:15 UTC (rev 9951)
+++ XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/templates/ajaxfm_imagemanager.html 2012-07-30 21:53:52 UTC (rev 9952)
@@ -26,22 +26,8 @@
}
//-->
</script>
-<style type="text/css" media="all">
-body {margin: 0;}
-img {border: 0;}
-table {width: 100%; margin: 0;}
-a:link {color: #3a76d6; font-weight: bold; background-color: transparent;}
-a:visited {color: #9eb2d6; font-weight: bold; background-color: transparent;}
-a:hover {color: #e18a00; background-color: transparent;}
-table td {background-color: white; font-size: 12px; padding: 0; border-width: 0; vertical-align: top; font-family: Verdana, Arial, Helvetica, sans-serif;}
-table#imagenav td {vertical-align: bottom; padding: 5px;}
-table#imagemain td {border-right: 1px solid silver; border-bottom: 1px solid silver; padding: 5px; vertical-align: middle;}
-table#imagemain th {border: 0; background-color: #2F5376; color:white; font-size: 12px; padding: 5px; vertical-align: top; text-align:center; font-family: Verdana, Arial, Helvetica, sans-serif;}
-table#header td {width: 100%; background-color: #2F5376; vertical-align: middle;}
-table#header td#headerbar {border-bottom: 1px solid silver; background-color: #dddddd;}
-div#pagenav {text-align:center;}
-div#footer {text-align:right; padding: 5px;}
-</style>
+<link rel="stylesheet" type="text/css" media="screen" href="<{xoAppUrl xoops.css}>" />
+<link rel="stylesheet" type="text/css" media="screen" href="<{xoAppUrl modules/system/css/imagemanager.css}>" />
<{php}>
$language = $GLOBALS['xoopsConfig']['language'];
@@ -53,61 +39,63 @@
</head>
<body onload="window.resizeTo(<{$xsize}>, <{$ysize}>);">
-
- <form action="imagemanager.php" method="get">
- <table cellspacing="0" id="imagenav">
- <tr>
- <td>
- <select name="cat_id" onchange="location='imagemanager.php?target=<{$target}>&editor=<{$editor}>&cat_id='+this.options[this.selectedIndex].value"><{$cat_options}></select> <input type="hidden" name="target" value="<{$target}>" /><input type="submit" value="<{$lang_go}>" />
- </td>
-
+ <form action="imagemanager.php" method="get">
+ <table cellspacing="0" id="imagenav">
+ <tr>
+ <td>
+ <select name="cat_id" onchange="location='imagemanager.php?target=<{$target}>&editor=<{$editor}>&cat_id='+this.options[this.selectedIndex].value"><{$cat_options}></select> <input type="hidden" name="target" value="<{$target}>" /><input type="submit" value="<{$lang_go}>" />
+ </td>
<{if $show_cat > 0}>
- <td align="right"><a href="imagemanager.php?target=<{$target}>&editor=<{$editor}>&op=upload&imgcat_id=<{$show_cat}>" title="<{$lang_addimage}>"><{$lang_addimage}></a></td>
+ <td id="addimage" class="txtright">
+ <a href="imagemanager.php?target=<{$target}>&editor=<{$editor}>&op=upload&imgcat_id=<{$show_cat}>" title="<{$lang_addimage}>"><{$lang_addimage}></a>
+ </td>
<{/if}>
+ </tr>
+ </table>
+ </form>
+ <div id="pagenav"><{$pagenav}></div>
- </tr>
+<{if $image_total > 0}>
+
+ <table cellspacing="0" id="imagemain">
+ <tr>
+ <th><{$lang_imagename}></th>
+ <th><{$lang_image}></th>
+ <th><{$lang_imagemime}></th>
+ <th><{$lang_align}></th>
+ </tr>
+
+<{section name=i loop=$images}>
+ <tr class="txtcenter">
+ <td><input type="hidden" name="image_id[]" value="<{$images[i].id}>" /><{$images[i].nicename}></td>
+ <td><img style="max-width:200px;" src="<{$images[i].src}>" alt="" /></td>
+ <td><{$images[i].mimetype}></td>
+ <td>
+ <{if ($editor == 'bbcode')}>
+ <a href="#" title="" onclick="javascript:appendCode('<{$images[i].lxcode}>', true);"><img src="<{$xoops_url}>/images/alignleft.gif" alt="Left" /></a>
+
+ <a href="#" title="" onclick="javascript:appendCode('<{$images[i].xcode}>', true);"><img src="<{$xoops_url}>/images/aligncenter.gif" alt="Center" /></a>
+
+ <a href="#" title="" onclick="javascript:appendCode('<{$images[i].rxcode}>', true);"><img src="<{$xoops_url}>/images/alignright.gif" alt="Right" /></a>
+ <{/if}>
+ <{if ($editor == 'src')}>
+ <a href="#" title="" onclick="javascript:appendCode('<{$images[i].src}>', false);"><img src="<{$xoops_url}>/images/aligncenter.gif" alt="Center" /></a>
+ <{/if}>
+ </td>
+ </tr>
+<{/section}>
</table>
- </form>
- <{if $image_total > 0}>
+<{else}>
- <table cellspacing="0" id="imagemain">
- <tr>
- <th><{$lang_imagename}></th>
- <th><{$lang_image}></th>
- <th><{$lang_imagemime}></th>
- <th><{$lang_align}></th>
- </tr>
+ <div id="welcomenot"></div>
- <{section name=i loop=$images}>
- <tr align="center">
- <td><input type="hidden" name="image_id[]" value="<{$images[i].id}>" /><{$images[i].nicename}></td>
- <td><img src="<{$images[i].src}>" alt="" /></td>
- <td><{$images[i].mimetype}></td>
- <td>
- <{if ($editor == 'bbcode')}>
- <a href="#" title="" onclick="javascript:appendCode('<{$images[i].lxcode}>', true);"><img src="<{$xoops_url}>/images/alignleft.gif" alt="Left" /></a>
-
- <a href="#" title="" onclick="javascript:appendCode('<{$images[i].xcode}>', true);"><img src="<{$xoops_url}>/images/aligncenter.gif" alt="Center" /></a>
-
- <a href="#" title="" onclick="javascript:appendCode('<{$images[i].rxcode}>', true);"><img src="<{$xoops_url}>/images/alignright.gif" alt="Right" /></a>
- <{/if}>
- <{if ($editor == 'src')}>
- <a href="#" title="" onclick="javascript:appendCode('<{$images[i].src}>', false);"><img src="<{$xoops_url}>/images/aligncenter.gif" alt="Center" /></a>
- <{/if}>
- </td>
+<{/if}>
- </tr>
- <{/section}>
- </table>
+ <div id="pagenav"><{$pagenav}></div>
- <{/if}>
-
- <div id="pagenav"><{$pagenav}></div>
-
- <div id="footer">
- <input value="<{$lang_close}>" type="button" onclick="javascript:window.close();" />
- </div>
-
- </body>
+ <div id="footer">
+ <input value="<{$lang_close}>" type="button" onclick="javascript:window.close();" />
+ </div>
+</body>
</html>
\ No newline at end of file
Modified: XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/templates/ajaxfm_imagemanager2.html
===================================================================
--- XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/templates/ajaxfm_imagemanager2.html 2012-07-30 21:05:15 UTC (rev 9951)
+++ XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/templates/ajaxfm_imagemanager2.html 2012-07-30 21:53:52 UTC (rev 9952)
@@ -5,22 +5,8 @@
<meta http-equiv="content-language" content="<{$xoops_langcode}>" />
<title><{$xoops_sitename}> <{$lang_imgmanager}></title>
<{$image_form.javascript}>
-<style type="text/css" media="all">
-body {margin: 0;}
-img {border: 0;}
-table {width: 100%; margin: 0;}
-a:link {color: #3a76d6; font-weight: bold; background-color: transparent;}
-a:visited {color: #9eb2d6; font-weight: bold; background-color: transparent;}
-a:hover {color: #e18a00; background-color: transparent;}
-table td {background-color: white; font-size: 12px; padding: 0; border-width: 0; vertical-align: top; font-family: Verdana, Arial, Helvetica, sans-serif;}
-table#imagenav td {vertical-align: bottom; padding: 5px;}
-td.body {padding: 5px; vertical-align: middle;}
-td.caption {border: 0; background-color: #2F5376; color:white; font-size: 12px; padding: 5px; vertical-align: top; text-align:left; font-family: Verdana, Arial, Helvetica, sans-serif;}
-table#imageform {border: 1px solid silver;}
-table#header td {width: 100%; background-color: #2F5376; vertical-align: middle;}
-table#header td#headerbar {border-bottom: 1px solid silver; background-color: #dddddd;}
-div#footer {text-align:right; padding: 5px;}
-</style>
+<link rel="stylesheet" type="text/css" media="screen" href="<{xoAppUrl xoops.css}>" />
+<link rel="stylesheet" type="text/css" media="screen" href="<{xoAppUrl modules/system/css/imagemanager.css}>" />
<{php}>
$language = $GLOBALS['xoopsConfig']['language'];
@@ -33,33 +19,35 @@
<body onload="window.resizeTo(<{$xsize}>, <{$ysize}>);">
- <table cellspacing="0" id="imagenav">
+ <table cellspacing="0" id="imagenav">
<tr>
- <td align="left"><a href="imagemanager.php?target=<{$target}>&editor=<{$editor}>&cat_id=<{$show_cat}>" title="<{$lang_imgmanager}>"><{$lang_imgmanager}></a></td>
+ <td id="addimage" class="txtleft">
+ <a href="imagemanager.php?target=<{$target}>&editor=<{$editor}>&cat_id=<{$show_cat}>" title="<{$lang_imgmanager}>">
+ <{$lang_imgmanager}></a></td>
</tr>
- </table>
-
- <form name="<{$image_form.name}>" id="<{$image_form.name}>" action="<{$image_form.action}>" method="<{$image_form.method}>" <{$image_form.extra}>>
- <table id="imageform" cellspacing="0">
- <!-- start of form elements loop -->
+ </table>
+
+ <form name="<{$image_form.name}>" id="<{$image_form.name}>" action="<{$image_form.action}>" method="<{$image_form.method}>" <{$image_form.extra}>>
+ <table id="imageform" cellspacing="">
+ <!-- start of form elements loop -->
<{foreach item=element from=$image_form.elements}>
- <{if $element.hidden != true}>
- <tr valign="top">
- <td class="caption"><{$element.caption}></td>
- <td class="body"><{$element.body}></td>
- </tr>
- <{else}>
- <{$element.body}>
- <{/if}>
+ <{if $element.hidden != true}>
+ <tr valign="top">
+ <td class="caption"><{$element.caption}></td>
+ <td class="body"><{$element.body}></td>
+ </tr>
+ <{else}>
+ <{$element.body}>
+ <{/if}>
<{/foreach}>
- <!-- end of form elements loop -->
- </table>
- </form>
+ <!-- end of form elements loop -->
+ </table>
+ </form>
- <div id="footer">
- <input value="<{$lang_close}>" type="button" onclick="javascript:window.close();" />
- </div>
+ <div id="footer">
+ <input value="<{$lang_close}>" type="button" onclick="javascript:window.close();" />
+ </div>
- </body>
+</body>
</html>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <luc...@us...> - 2012-07-30 21:05:21
|
Revision: 9951
http://xoops.svn.sourceforge.net/xoops/?rev=9951&view=rev
Author: luciorota
Date: 2012-07-30 21:05:15 +0000 (Mon, 30 Jul 2012)
Log Message:
-----------
xoops 2.5.5 admin GUI
Added Paths:
-----------
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/plugins/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/english/mail_template/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <luc...@us...> - 2012-07-30 20:47:34
|
Revision: 9950
http://xoops.svn.sourceforge.net/xoops/?rev=9950&view=rev
Author: luciorota
Date: 2012-07-30 20:47:20 +0000 (Mon, 30 Jul 2012)
Log Message:
-----------
changed directories structore
Modified Paths:
--------------
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/templates/ajaxfm_gmap.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/templates/ajaxfm_video.html
Added Paths:
-----------
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/index.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/index.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/Canvas.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/Coordinate.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/Exception.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/Font/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/Font/GDF.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/Font/PS.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/Font/TTF.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/Font/index.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/Image.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/Mapper/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/Mapper/BMP.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/Mapper/GD.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/Mapper/GD2.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/Mapper/GIF.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/Mapper/JPEG.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/Mapper/PNG.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/Mapper/TGA.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/Mapper/index.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/MapperFactory.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/Operation/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/Operation/AddNoise.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/Operation/ApplyConvolution.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/Operation/ApplyFilter.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/Operation/ApplyMask.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/Operation/AsGrayscale.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/Operation/AsNegative.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/Operation/AutoCrop.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/Operation/CopyChannelsPalette.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/Operation/CopyChannelsTrueColor.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/Operation/CorrectGamma.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/Operation/Crop.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/Operation/Flip.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/Operation/GetMask.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/Operation/Merge.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/Operation/Mirror.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/Operation/Resize.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/Operation/ResizeCanvas.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/Operation/Rotate.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/Operation/RoundCorners.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/Operation/Unsharp.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/Operation/index.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/OperationFactory.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/PaletteImage.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/README
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/TrueColorImage.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/VERSION
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/WideImage.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/gpl.txt
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/index.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/lgpl.txt
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/vendor/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/vendor/de77/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/vendor/de77/BMP.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/vendor/de77/TGA.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/vendor/de77/index.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/wideimage/vendor/index.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/Frameworks/wideimage/xoops_version.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/admin/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/admin/about.old.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/admin/about.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/admin/admin_footer.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/admin/admin_functions.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/admin/admin_header.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/admin/extensions.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/admin/filemanager.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/admin/help.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/admin/index.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/admin/index.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/admin/menu.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/admin/permissions.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/_ajax_get_details_listing.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/_ajax_get_thumbnail_listing.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/_ajax_load_folders.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_create_file.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_create_folder.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_delete_file.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_download.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_editor_reset.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_file_copy.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_file_cut.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_file_paste.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_file_unzip.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_file_upload.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_file_uploadftp.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_file_zip.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_get_file_listing.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_get_folder_listing.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_image_editor.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_image_save.new.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_image_save.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_image_thumbnail.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_image_undo.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_login.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_preview.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_save_as_form.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_save_name.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_save_text.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_text_editor.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajaxfilemanager.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/change_notes.txt
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/debug.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/class.auth.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/class.file.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/class.history.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/class.image.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/class.manager.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/class.pagination.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/class.search.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/class.session.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/class.sessionaction.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/class.upload.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/config.ajaxfilemanager.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/config.base.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/config.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/config.tinymce.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/data.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/function.base.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/nocommon.xoops.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/pclzip.lib.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/index.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/ajaxfilemanager.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/ajaxfileupload.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/ajaximageeditor.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/ajaxtexteditor.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/calendar.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/contextmenu.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/edit_area.css
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/edit_area_full.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/images/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/images/close.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/images/fullscreen.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/images/go_to_line.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/images/help.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/images/highlight.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/images/load.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/images/move.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/images/newdocument.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/images/opacity.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/images/processing.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/images/redo.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/images/reset_highlight.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/images/save.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/images/save_as.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/images/search.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/images/smooth_selection.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/images/spacer.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/images/statusbar_resize.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/images/undo.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/langs/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/langs/de.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/langs/dk.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/langs/en.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/langs/fr.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/langs/hr.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/langs/it.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/langs/ja.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/langs/nl.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/langs/pl.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/langs/pt.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/langs/zh_cn.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/reg_syntax/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/reg_syntax/basic.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/reg_syntax/brainfuck.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/reg_syntax/c.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/reg_syntax/cpp.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/reg_syntax/css.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/reg_syntax/html.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/reg_syntax/js.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/reg_syntax/pas.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/reg_syntax/php.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/reg_syntax/python.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/reg_syntax/vb.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/edit_area/reg_syntax/xml.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/for_ajaxfilemanager.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/for_fckeditor.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/for_form.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/for_stand_alone.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/for_tinymce.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/for_xoops.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/interface.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/iresizable.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/iutil.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/jqModal.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/jquery.form.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/jquery.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/jquery.media.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/jquery.metadata.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/rotate.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/select.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/thickbox.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/langs/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/langs/bg.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/langs/da.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/langs/el.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/langs/en.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/langs/fi.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/langs/fr.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/langs/it.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/langs/nl.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/langs/pl.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/langs/pt_br.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/langs/ru.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/langs/zh.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/mediaplayer.swf
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/session/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/session/gc_counter.ajax.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/session/gc_log.ajax.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/css/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/css/ajaxfilemanager.css
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/css/ajaximageeditor.css
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/css/ajaxtexteditor.css
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/css/fckeditor.css
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/css/form.css
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/css/ie6.css
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/css/jqModal.css
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/css/jquery-calendar.css
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/css/login.css
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/css/stand_alone.css
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/css/thickbox.css
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/css/tinymce.css
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/New Folder/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/New Folder/folder_explore.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/action/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/action/cross.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/action/folder_add.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/action/page_add.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/action/upload.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/add.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/ajaxLoading.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/arrow_right.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/big_icon/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/big_icon/fileAcrobat.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/big_icon/fileCode.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/big_icon/fileExcel.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/big_icon/fileExe.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/big_icon/fileFlash.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/big_icon/fileMusic.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/big_icon/filePicture.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/big_icon/filePowerpoint.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/big_icon/fileRTF.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/big_icon/fileText.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/big_icon/fileUnknown.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/big_icon/fileVideo.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/big_icon/fileWord.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/big_icon/fileXml.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/big_icon/fileZip.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/big_icon/folder.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/big_icon/folderEmpty.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/button/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/button/grey_lc.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/button/grey_rc.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/button.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/close.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/copy.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/copy_flag.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/cut.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/cut_flag.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/date_picker.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/delete.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/flagYes.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/flagno.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/folder.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/folder_explore.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/go_parent.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/grey_lc.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/info.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/loadingAnimation.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/pagination/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/pagination/pagination_left.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/pagination/pagination_right.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/panel_bg.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/paste.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/player.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/refresh.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/shadow.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/small_icon/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/small_icon/fileAcrobat.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/small_icon/fileCode.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/small_icon/fileExcel.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/small_icon/fileExe.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/small_icon/fileFlash.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/small_icon/fileMusic.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/small_icon/filePicture.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/small_icon/filePowerpoint.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/small_icon/fileRTF.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/small_icon/fileText.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/small_icon/fileUnknown.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/small_icon/fileVideo.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/small_icon/fileWord.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/small_icon/fileXml.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/small_icon/fileZip.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/small_icon/folder.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/small_icon/folderEmpty.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/small_icon/folderParent.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/tickAll.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/transparentpixel.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/uncheckAll.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/unzip.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/uploadProcessing.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/default/images/zip.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/css/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/css/ajaxfilemanager.css
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/css/ajaximageeditor.css
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/css/ajaxtexteditor.css
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/css/fckeditor.css
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/css/form.css
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/css/ie6.css
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/css/jqModal.css
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/css/jquery-calendar.css
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/css/login.css
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/css/stand_alone.css
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/css/thickbox.css
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/css/tinymce.css
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/New Folder/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/New Folder/folder_explore.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/_header.jpg
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/_loadingAnimation.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/_player.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/_shadow.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/action/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/action/cross.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/action/folder_add.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/action/page_add.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/action/upload.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/action/uploadftp.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/add.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/ajaxLoading.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/arrow_right.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/big_icon/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/big_icon/fileAcrobat.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/big_icon/fileCode.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/big_icon/fileExcel.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/big_icon/fileExe.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/big_icon/fileFlash.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/big_icon/fileFlv.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/big_icon/fileHtml.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/big_icon/fileKml.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/big_icon/fileMp3.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/big_icon/fileMusic.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/big_icon/filePicture.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/big_icon/filePowerpoint.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/big_icon/fileRTF.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/big_icon/fileSwf.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/big_icon/fileText.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/big_icon/fileUnknown.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/big_icon/fileVideo.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/big_icon/fileWord.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/big_icon/fileXml.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/big_icon/fileZip.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/big_icon/folder.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/big_icon/folderEmpty.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/button/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/button/grey_lc.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/button/grey_rc.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/button.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/close.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/copy.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/copy_flag.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/cut.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/cut_flag.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/date_picker.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/delete.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/flagYes.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/flagno.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/folder.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/folder_explore.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/go_parent.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/grey_lc.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/header.jpg
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/info.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/loadingAnimation.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/pagination/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/pagination/pagination_left.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/pagination/pagination_right.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/panel_bg.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/paste.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/player.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/refresh.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/shadow.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/small_icon/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/small_icon/fileAcrobat.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/small_icon/fileCode.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/small_icon/fileExcel.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/small_icon/fileExe.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/small_icon/fileFlash.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/small_icon/fileFlv.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/small_icon/fileHtml.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/small_icon/fileKml.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/small_icon/fileMp3.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/small_icon/fileMusic.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/small_icon/filePicture.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/small_icon/filePowerpoint.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/small_icon/fileRTF.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/small_icon/fileSwf.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/small_icon/fileText.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/small_icon/fileUnknown.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/small_icon/fileVideo.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/small_icon/fileWord.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/small_icon/fileXml.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/small_icon/fileZip.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/small_icon/folder.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/small_icon/folderEmpty.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/small_icon/folderParent.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/tickAll.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/transparentpixel.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/uncheckAll.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/unzip.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/uploadProcessing.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/zip.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/xoops_ajax_image_editor.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/xoops_ajax_text_editor.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/class/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/class/formajaxfilemanager.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/class/formmultipleajaxfilemanager.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/class/formmultiplexoopsimage.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/class/formxoopsimage.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/class/formxoopsimageold.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/class/index.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/class/jquery.table.addrow.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/class/menu.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/class/sampleform.inc.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/css/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/css/index.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/css/style.css
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/docs/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/docs/changelog.txt
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/docs/credits.txt
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/docs/index.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/docs/install.txt
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/docs/lang_diff.txt
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/docs/licence.txt
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/docs/readme.txt
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/imageeditor/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/imageeditor/ImageEditor/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/imageeditor/ImageEditor/ImageEditor.css
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/imageeditor/ImageEditor/ImageEditor.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/imageeditor/ImageEditor/LICENSE.txt
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/imageeditor/ImageEditor/PageInfo.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/imageeditor/ImageEditor/README.txt
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/imageeditor/ImageEditor/active/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/imageeditor/ImageEditor/active/index.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/imageeditor/ImageEditor/edit/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/imageeditor/ImageEditor/edit/index.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/imageeditor/ImageEditor/getImage.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/imageeditor/ImageEditor/index.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/imageeditor/ImageEditor/original/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/imageeditor/ImageEditor/original/index.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/imageeditor/ImageEditor/processImage.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/imageeditor/ImageEditor/undo/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/imageeditor/ImageEditor/undo/index.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/imageeditor/class.imageeditor.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/imageeditor/functions.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/imageeditor/imageeditor.old.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/imageeditor/imageeditor.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/imageeditor/imageeditor_registry.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/imageeditor/images/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/imageeditor/images/imageeditor.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/imageeditor/index.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/imagemanager/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/imagemanager/imagemanager.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/imagemanager/images/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/imagemanager/images/imagemanager.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/imagemanager/images/index.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/imagemanager/index.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/bookmarks/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/bookmarks/index.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/button_gmap.xcf
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/button_video.xcf
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/filemanager_slogo.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/filemanager_slogo.xcf
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/icons/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/icons/16x16/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/icons/16x16/ftp.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/icons/16x16/index.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/icons/16x16/installer_box.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/icons/32x32/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/icons/32x32/database.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/icons/32x32/error.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/icons/32x32/folder_database.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/icons/32x32/folder_edit.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/icons/32x32/folder_error.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/icons/32x32/folder_image.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/icons/32x32/folder_map.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/icons/32x32/folder_put.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/icons/32x32/folder_remove.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/icons/32x32/ftp.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/icons/32x32/help.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/icons/32x32/house.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/icons/32x32/image.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/icons/32x32/image_delete.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/icons/32x32/image_edit.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/icons/32x32/index.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/icons/32x32/information.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/icons/32x32/installer_box.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/icons/32x32/lock.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/icons/32x32/lock_database.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/icons/32x32/lock_map.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/icons/32x32/map.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/icons/32x32/plugin.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/icons/32x32/prefs.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/icons/32x32/update.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/icons/index.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/index.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/menu/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/menu/bg.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/menu/index.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/menu/left_both.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/menu/right_both.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/images/xoopsmicrobutton.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/include/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/include/functions.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/include/index.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/include/install_function.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/include/uninstall_function.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/include/update_function.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/install/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/install/index.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/install/plugins/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/install/plugins/index.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/install/textsanitizer.extensions/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/install/textsanitizer.extensions/ajaxfilemanager/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/install/textsanitizer.extensions/ajaxfilemanager/ajaxfilemanager.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/install/textsanitizer.extensions/ajaxfilemanager/button_ajaxfilemanager.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/install/textsanitizer.extensions/ajaxfilemanager/index.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/install/textsanitizer.extensions/gmap/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/install/textsanitizer.extensions/gmap/button_gmap.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/install/textsanitizer.extensions/gmap/gmap.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/install/textsanitizer.extensions/gmap/index.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/install/textsanitizer.extensions/index.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/install/textsanitizer.extensions/video/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/install/textsanitizer.extensions/video/button_video.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/install/textsanitizer.extensions/video/index.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/install/textsanitizer.extensions/video/jwplayer/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/install/textsanitizer.extensions/video/jwplayer/index.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/install/textsanitizer.extensions/video/jwplayer/jwplayer.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/install/textsanitizer.extensions/video/jwplayer/player.swf
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/install/textsanitizer.extensions/video/jwplayer/swfobject.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/install/textsanitizer.extensions/video/video.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/install/tinymce.settings/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/install/tinymce.settings/index.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/install/tinymce.settings/tinymce.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/js/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/js/index.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/js/script.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/english/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/english/admin.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/english/description.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/english/extension.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/english/formajaxfilemanager.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/english/formmultipleajaxfilemanager.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/english/formmultiplexoopsimage.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/english/formxoopsimage.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/english/help/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/english/help/help.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/english/help/index.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/english/imageeditor.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/english/imagemanager.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/english/index.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/english/main.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/english/modinfo.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/french.old/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/french.old/admin.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/french.old/extension.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/french.old/formajaxfilemanager.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/french.old/formmultipleajaxfilemanager.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/french.old/formmultiplexoopsimage.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/french.old/formxoopsimage.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/french.old/help/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/french.old/help/index.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/french.old/imageeditor.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/french.old/imagemanager.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/french.old/index.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/french.old/main.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/french.old/modinfo.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/french_iso.old/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/french_iso.old/admin.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/french_iso.old/extension.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/french_iso.old/formajaxfilemanager.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/french_iso.old/formmultipleajaxfilemanager.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/french_iso.old/formmultiplexoopsimage.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/french_iso.old/formxoopsimage.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/french_iso.old/help/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/french_iso.old/help/index.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/french_iso.old/imageeditor.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/french_iso.old/imagemanager.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/french_iso.old/index.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/french_iso.old/main.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/french_iso.old/modinfo.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/index.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/italian.old/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/italian.old/admin.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/italian.old/extension.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/italian.old/formajaxfilemanager.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/italian.old/formmultipleajaxfilemanager.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/italian.old/formmultiplexoopsimage.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/italian.old/formxoopsimage.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/italian.old/help/
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/italian.old/help/index.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/italian.old/imageeditor.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/italian.old/imagemanager.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/italian.old/index.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/italian.old/main.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/italian.old/modinfo.php
XoopsModules/ajaxfilemanager/trun...
[truncated message content] |
|
From: <luc...@us...> - 2012-07-30 20:23:51
|
Revision: 9949
http://xoops.svn.sourceforge.net/xoops/?rev=9949&view=rev
Author: luciorota
Date: 2012-07-30 20:23:44 +0000 (Mon, 30 Jul 2012)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/xaddresses/trunk/xaddresses/admin/admin_header.php
XoopsModules/xaddresses/trunk/xaddresses/include/config.php
XoopsModules/xaddresses/trunk/xaddresses/xoops_version.php
Added Paths:
-----------
XoopsModules/xaddresses/trunk/xaddresses/extra/textsanitizer.extensions/
XoopsModules/xaddresses/trunk/xaddresses/extra/textsanitizer.extensions/xaddresses/
XoopsModules/xaddresses/trunk/xaddresses/extra/textsanitizer.extensions/xaddresses/index.html
XoopsModules/xaddresses/trunk/xaddresses/extra/textsanitizer.extensions/xaddresses/xaddresses.php
Removed Paths:
-------------
XoopsModules/xaddresses/trunk/xaddresses/extra/textsanitizer.extension/
Modified: XoopsModules/xaddresses/trunk/xaddresses/admin/admin_header.php
===================================================================
--- XoopsModules/xaddresses/trunk/xaddresses/admin/admin_header.php 2012-07-30 11:25:09 UTC (rev 9948)
+++ XoopsModules/xaddresses/trunk/xaddresses/admin/admin_header.php 2012-07-30 20:23:44 UTC (rev 9949)
@@ -27,32 +27,36 @@
*/
include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php';
+$dirname = basename(dirname(dirname( __FILE__ ) ));
// Include xoops admin header
include_once XOOPS_ROOT_PATH . '/include/cp_header.php';
-include_once XOOPS_ROOT_PATH . '/include/config.php';
-include_once XOOPS_ROOT_PATH . '/include/functions.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_load ('XoopsUserUtility');
+$module_handler =& xoops_gethandler('module');
+$xoopsModule = & $module_handler->getByDirname($dirname);
+$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
+$pathImageIcon = XOOPS_URL .'/'. $moduleInfo->getInfo('icons16');
+$pathImageAdmin = XOOPS_URL .'/'. $moduleInfo->getInfo('icons32');
+$pathImageModule = XOOPS_URL . '/modules/'. $GLOBALS['xoopsModule']->getVar('dirname') .'/images';
+
// Include module functions
-include_once '../include/config.php';
-include_once '../include/functions.php';
+include_once XOOPS_ROOT_PATH . "/modules/{$dirname}/include/config.php";
+include_once XOOPS_ROOT_PATH . "/modules/{$dirname}/include/functions.php";
-
+
+// Check and load moduleadmin classes
$pathDir = $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin');
$globalLanguage = $GLOBALS['xoopsConfig']['language'];
-
if ( file_exists($pathDir . '/language/' . $globalLanguage . '/main.php')){
include_once $pathDir . '/language/' . $globalLanguage . '/main.php';
} else {
include_once $pathDir . '/language/english/main.php';
}
-
if ( file_exists($pathDir . '/moduleadmin.php')){
include_once $pathDir . '/moduleadmin.php';
//return true;
@@ -63,14 +67,6 @@
//return false;
}
-$dirname = basename(dirname(dirname( __FILE__ ) ));
-$module_handler =& xoops_gethandler('module');
-$xoopsModule = & $module_handler->getByDirname($dirname);
-$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
-$pathImageIcon = XOOPS_URL .'/'. $moduleInfo->getInfo('icons16');
-$pathImageAdmin = XOOPS_URL .'/'. $moduleInfo->getInfo('icons32');
-$pathImageModule = XOOPS_URL . '/modules/'. $GLOBALS['xoopsModule']->getVar('dirname') .'/images';
-
$myts =& MyTextSanitizer::getInstance();
// Get user groups
Added: XoopsModules/xaddresses/trunk/xaddresses/extra/textsanitizer.extensions/xaddresses/index.html
===================================================================
--- XoopsModules/xaddresses/trunk/xaddresses/extra/textsanitizer.extensions/xaddresses/index.html (rev 0)
+++ XoopsModules/xaddresses/trunk/xaddresses/extra/textsanitizer.extensions/xaddresses/index.html 2012-07-30 20:23:44 UTC (rev 9949)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/xaddresses/trunk/xaddresses/extra/textsanitizer.extensions/xaddresses/xaddresses.php
===================================================================
--- XoopsModules/xaddresses/trunk/xaddresses/extra/textsanitizer.extensions/xaddresses/xaddresses.php (rev 0)
+++ XoopsModules/xaddresses/trunk/xaddresses/extra/textsanitizer.extensions/xaddresses/xaddresses.php 2012-07-30 20:23:44 UTC (rev 9949)
@@ -0,0 +1,76 @@
+<?php
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+class MytsXaddresses extends MyTextSanitizerExtension
+{
+ function encode($textarea_id)
+ {
+ $code = "<img src='" . XOOPS_URL . "/modules/xaddresses/images/map_button.gif' alt='" . _XOOPS_FORM_ALTMAP . "' onclick='xoopsCodeMap(\"{$textarea_id}\",\"" . htmlspecialchars(_XOOPS_FORM_ENTERMAP, ENT_QUOTES) . "\");' onmouseover='style.cursor=\"hand\"'/> ";
+ $code.= "<img src='" . XOOPS_URL . "/modules/xaddresses/images/map_button.gif' alt='" . _XOOPS_FORM_ALTLOC . "' onclick='xoopsCodeLoc(\"{$textarea_id}\",\"" . htmlspecialchars(_XOOPS_FORM_ENTERLOC, ENT_QUOTES) . "\");' onmouseover='style.cursor=\"hand\"'/> ";
+ $javascript = <<<EOF
+ function xoopsCodeMap(id, enterMapPhrase)
+ {
+ var selection = xoopsGetSelect(id);
+ if (selection.length > 0) {
+ var text = selection;
+ } else {
+ var text = prompt(enterMapPhrase, "");
+ }
+ var domobj = xoopsGetElementById(id);
+ if ( text.length > 0 ) {
+ var result = "[map]" + text + "[/map]";
+ xoopsInsertText(domobj, result);
+ }
+ domobj.focus();
+ }
+ function xoopsCodeLoc(id, enterLocPhrase)
+ {
+ var selection = xoopsGetSelect(id);
+ if (selection.length > 0) {
+ var text = selection;
+ } else {
+ var text = prompt(enterLocPhrase, "");
+ }
+ var domobj = xoopsGetElementById(id);
+ if ( text.length > 0 ) {
+ var result = "[loc]" + text + "[/loc]";
+ xoopsInsertText(domobj, result);
+ }
+ domobj.focus();
+ }
+EOF;
+
+ return array(
+ $code ,
+ $javascript);
+ }
+
+ function load(&$ts)
+ {
+ $ts->patterns[] = "/\[map\](.*?)\[\/map\]/es";
+ $ts->replacements[] = __CLASS__ . "::decodemap( '\\1' )";
+
+ $ts->patterns[] = "/\[mapcat\](.*?)\[\/mapcat\]/es";
+ $ts->replacements[] = __CLASS__ . "::decodemapcat( '\\1' )";
+
+
+ $ts->patterns[] = "/\[loc](.*)\[\/loc\]/sU";
+ $ts->replacements[] = 'LOCATION \\1';
+ $ts->patterns[] = "/\[location](.*)\[\/location\]/sU";
+ $ts->replacements[] = 'LOCATION \\1';
+
+ return true;
+ }
+
+ function decodemap($id)
+ {
+ $rp = "MAP {$id}";
+ return $rp;
+ }
+ function decodemapcat($id)
+ {
+ $rp = "CATEGORY {$id}";
+ return $rp;
+ }
+}
+?>
\ No newline at end of file
Modified: XoopsModules/xaddresses/trunk/xaddresses/include/config.php
===================================================================
--- XoopsModules/xaddresses/trunk/xaddresses/include/config.php 2012-07-30 11:25:09 UTC (rev 9948)
+++ XoopsModules/xaddresses/trunk/xaddresses/include/config.php 2012-07-30 20:23:44 UTC (rev 9949)
@@ -27,11 +27,11 @@
*/
if( ! defined( 'XOOPS_ROOT_PATH' ) ) exit ;
-define("XADDRESSES_PATH", XOOPS_ROOT_PATH."/modules/xaddresses");
-define("XADDRESSES_URL", XOOPS_URL."/modules/xaddresses");
+define("XADDRESSES_PATH", XOOPS_ROOT_PATH . "/modules/xaddresses");
+define("XADDRESSES_URL", XOOPS_URL . "/modules/xaddresses");
// module information
-$mod_img = XADDRESSES_URL."/images/luciorota.altervista.org/xoops_logo.png";
+$mod_img = XADDRESSES_URL . "/images/luciorota.altervista.org/xoops_logo.png";
$mod_copyright = "<a href='http://luciorota.altervista.org/xoops/' title='luciorota.altervista.org/xoops' target='_blank'>
- <img src='".$mod_img."' alt='luciorota.altervista.org/xoops' /></a>";
+ <img src='" . $mod_img . "' alt='luciorota.altervista.org/xoops' /></a>";
?>
\ No newline at end of file
Modified: XoopsModules/xaddresses/trunk/xaddresses/xoops_version.php
===================================================================
--- XoopsModules/xaddresses/trunk/xaddresses/xoops_version.php 2012-07-30 11:25:09 UTC (rev 9948)
+++ XoopsModules/xaddresses/trunk/xaddresses/xoops_version.php 2012-07-30 20:23:44 UTC (rev 9949)
@@ -16,9 +16,9 @@
$modversion['license'] = 'GNU GPL 2.0 see Licence';
$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/";
-$modversion['release_info'] = "RC";
+$modversion['release_info'] = 'in progress';
$modversion['release_file'] = XOOPS_URL . "/modules/{$dirname}/docs/RC";
-$modversion['release_date'] = "2012/07/27"; // 'Y/m/d'
+$modversion['release_date'] = "2012/07/30"; // 'Y/m/d'
$modversion['manual'] = 'Help';
$modversion['manual_file'] = XOOPS_URL . "/modules/{$dirname}/docs/help.html";
@@ -35,23 +35,28 @@
$modversion['icons32'] = "modules/{$dirname}/images/icons/32x32";
// About
-$modversion['demo_site_url'] = "IN PROGRESS";
-$modversion['demo_site_name'] = "IN PROGRESS";
-$modversion['forum_site_url'] = "IN PROGRESS";
-$modversion['forum_site_name'] = "IN PROGRESS";
-$modversion['module_website_url'] = "IN PROGRESS";
-$modversion['module_website_name'] = "IN PROGRESS";
+$modversion['demo_site_url'] = '';
+$modversion['demo_site_name'] = '';
+$modversion['forum_site_url'] = '';
+$modversion['forum_site_name'] = '';
+$modversion['module_website_url'] = '';
+$modversion['module_website_name'] = '';
//$modversion['support_site_url'] = "http://www.xoops.org";
//$modversion['support_site_name'] = "www.xoops.org";
$modversion['release'] = "release";
-$modversion['module_status'] = 'In progress'; //"Stable";
+$modversion['module_status'] = 'in progress'; //"Stable";
+
+
// Admin things
$modversion['hasAdmin'] = true;
// Admin system menu
$modversion['system_menu'] = true;
$modversion['adminindex'] = "admin/index.php";
$modversion['adminmenu'] = "admin/menu.php";
+
+
+
// Mysql file
$modversion['sqlfile']['mysql'] = "sql/mysql.sql";
// Tables created by sql file (without prefix!)
@@ -67,11 +72,15 @@
// TO DO
$modversion['tables'][7] = "xaddresses_marker";
+
+
// Scripts to run upon installation or update
$modversion['onInstall'] = 'include/install_function.php';
//$modversion['onUpdate'] = 'include/update_function.php';
$modversion['onUninstall'] = 'include/uninstall_function.php';
+
+
// Main menu
$modversion['hasMain'] = true;
if (is_object($GLOBALS['xoopsModule']) && $GLOBALS['xoopsModule']->getVar('dirname') == $modversion['dirname']) {
@@ -226,25 +235,9 @@
-// Preferences
-// MAYBE FOR FUTURE XOOPS VERSIONS
-/*
+// Preferences/Config
$i = 0;
$i++;
-$modversion['config']['category'][$i]['name'] = 'global';
-$modversion['config']['category'][$i]['title'] = _MI_XADDRESSES_GLOBAL_CONFIG;
-$modversion['config']['category'][$i]['description'] = _MI_XADDRESSES_GLOBAL_CONFIG_DESC;
-$i++;
-$modversion['config']['category'][$i]['name'] = 'category';
-$modversion['config']['category'][$i]['title'] = _MI_XADDRESSES_CATEGORY_CONFIG;
-$modversion['config']['category'][$i]['description'] = _MI_XADDRESSES_CATEGORY_CONFIG_DESC;
-$i++;
-$modversion['config']['category'][$i]['name'] = 'location';
-$modversion['config']['category'][$i]['title'] = _MI_XADDRESSES_LOCATION_CONFIG;
-$modversion['config']['category'][$i]['description'] = _MI_XADDRESSES_LOCATION_CONFIG_DESC;
-*/
-$i = 0;
-$i++;
$modversion['config'][$i]['name'] = 'google_apikey';
$modversion['config'][$i]['title'] = '_MI_XADDRESSES_GOOGLE_APIKEY';
$modversion['config'][$i]['description'] = '_MI_XADDRESSES_GOOGLE_APIKEY_DESC';
@@ -355,9 +348,6 @@
$modversion['config'][$i]['formtype'] = 'select';
$modversion['config'][$i]['valuetype'] = 'text';
$modversion['config'][$i]['default'] = 'dhtmltextarea';
-//xoops_load('xoopseditorhandler');
-//$editor_handler = XoopsEditorHandler::getInstance();
-//$modversion['config'][$i]['options'] = array_flip($editor_handler->getList());
$modversion['config'][$i]['options'] = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . '/class/xoopseditor');
$modversion['config'][$i]['category'] = 'global';
$i++;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-07-30 11:25:23
|
Revision: 9948
http://xoops.svn.sourceforge.net/xoops/?rev=9948&view=rev
Author: beckmi
Date: 2012-07-30 11:25:09 +0000 (Mon, 30 Jul 2012)
Log Message:
-----------
Adding changes by Irmtfan
Modified Paths:
--------------
XoopsModules/newbb/branches/irmtfan/newbb/class/icon.php
XoopsModules/newbb/branches/irmtfan/newbb/class/permission.php
XoopsModules/newbb/branches/irmtfan/newbb/class/post.php
XoopsModules/newbb/branches/irmtfan/newbb/class/user.php
XoopsModules/newbb/branches/irmtfan/newbb/docs/changelog.txt
XoopsModules/newbb/branches/irmtfan/newbb/include/functions.render.php
XoopsModules/newbb/branches/irmtfan/newbb/include/plugin.php
XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_thread.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/style.css
XoopsModules/newbb/branches/irmtfan/newbb/xoops_version.php
Added Paths:
-----------
XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev9883.txt
XoopsModules/newbb/branches/irmtfan/newbb/language/persian/
XoopsModules/newbb/branches/irmtfan/newbb/language/persian/admin.php
XoopsModules/newbb/branches/irmtfan/newbb/language/persian/blocks.php
XoopsModules/newbb/branches/irmtfan/newbb/language/persian/index.html
XoopsModules/newbb/branches/irmtfan/newbb/language/persian/mail_template/
XoopsModules/newbb/branches/irmtfan/newbb/language/persian/mail_template/forum_newpost_notify.tpl
XoopsModules/newbb/branches/irmtfan/newbb/language/persian/mail_template/forum_newthread_notify.tpl
XoopsModules/newbb/branches/irmtfan/newbb/language/persian/mail_template/global_digest_notify.tpl
XoopsModules/newbb/branches/irmtfan/newbb/language/persian/mail_template/global_newforum_notify.tpl
XoopsModules/newbb/branches/irmtfan/newbb/language/persian/mail_template/global_newfullpost_notify.tpl
XoopsModules/newbb/branches/irmtfan/newbb/language/persian/mail_template/global_newpost_notify.tpl
XoopsModules/newbb/branches/irmtfan/newbb/language/persian/mail_template/thread_newpost_notify.tpl
XoopsModules/newbb/branches/irmtfan/newbb/language/persian/main.php
XoopsModules/newbb/branches/irmtfan/newbb/language/persian/modinfo.php
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/index.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/new_forum.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/new_forum.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/new_subforum.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/new_subforum.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/offline.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/offline.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/online-a.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/online.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/p_bann.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/p_delete-a.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/p_delete.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/p_edit-a.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/p_edit.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/p_quote-a.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/p_quote.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/p_reply-a.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/p_reply.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/p_report-a.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/p_report.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/p_up-a.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/p_up.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/t_new-a.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/t_new.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/t_poll-a.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/t_poll.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/t_qr-a.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/t_qr.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/t_reply-a.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/t_reply.png
Added: XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev9883.txt
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev9883.txt (rev 0)
+++ XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev9883.txt 2012-07-30 11:25:09 UTC (rev 9948)
@@ -0,0 +1,16 @@
+Changelog from rev.9883
+date: 2012-07-30
+================================================
+1- bug fix: edit not record when the reason is not filled (irmtfan)
+2- bug fix: only the last edit is recorded. (irmtfan/alfred)
+in newbb/class/post.php
+3- bug fix: 'noapprove' permission incorrectly recorded in database. (irmtfan)
+in newbb/class/permission.php
+4- bug fix: load user ranks has been hardcoded. it works in old/upgraded websites but not works in new installed websites. a new getting rank introduced. (black_beard/irmtfan)
+in newbb/class/user.php, newbb/templates/newbb_thread.html
+5- minor bug fix: mysql 5.1 was incorrectly needed (irmtfan)
+in newbb/xoops_version.php
+6- hardcode: some style.css color hardcodes has been removed. (irmtfan)
+in newbb/templates/style.css
+7- feature added: text links instead of buttons. (deka98/irmtfan)
+in newbb/class/icon.php , newbb/include/functions.render.php , newbb/include/plugin.php
Modified: XoopsModules/newbb/branches/irmtfan/newbb/class/icon.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/class/icon.php 2012-07-30 11:20:19 UTC (rev 9947)
+++ XoopsModules/newbb/branches/irmtfan/newbb/class/icon.php 2012-07-30 11:25:09 UTC (rev 9948)
@@ -150,7 +150,9 @@
function assignImage($image, $alt = "", $extra = "")
{
$this->setImage($image, $alt, $extra);
- return true;
+ // START hacked by iemrfan
+ return $alt;
+ // END hacked by iemrfan
}
function assignImages($images)
Modified: XoopsModules/newbb/branches/irmtfan/newbb/class/permission.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/class/permission.php 2012-07-30 11:20:19 UTC (rev 9947)
+++ XoopsModules/newbb/branches/irmtfan/newbb/class/permission.php 2012-07-30 11:25:09 UTC (rev 9948)
@@ -90,8 +90,14 @@
$groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(XOOPS_GROUP_ANONYMOUS);
if ( !$groups ) return false;
if ( !$allowed_groups = $this->getGroups("{$type}_{$gperm_name}", $id) ) return false;
-
- return count(array_intersect($allowed_groups, $groups));
+ // START hacked by irmtfan
+ // approved=1 or 0 - $post_obj->setVar('approved', $approved);
+ if( count(array_intersect($allowed_groups, $groups)) ) {
+ return true;
+ } else {
+ return false;
+ }
+ // END hacked by irmtfan
}
function &getCategories($perm_name = "access")
Modified: XoopsModules/newbb/branches/irmtfan/newbb/class/post.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/class/post.php 2012-07-30 11:20:19 UTC (rev 9947)
+++ XoopsModules/newbb/branches/irmtfan/newbb/class/post.php 2012-07-30 11:25:09 UTC (rev 9948)
@@ -242,9 +242,14 @@
$edit_time = intval($postedit['edit_time']);
$edit_user = $myts->stripSlashesGPC($postedit['edit_user']);
$edit_msg = (!empty($postedit['edit_msg'])) ? $myts->stripSlashesGPC($postedit['edit_msg']) : '';
- if ($edit_msg != "") {
- $post_edit = _MD_EDITEDBY . " " . $edit_user . " " . _MD_ON . " " . formatTimestamp(intval($edit_time)) . " "._MD_EDITEDMSG . " " .$edit_msg."<br />";
+ // START hacked by irmtfan
+ // display/save all edit records.
+ $post_edit .= _MD_EDITEDBY . " " . $edit_user . " " . _MD_ON . " " . formatTimestamp(intval($edit_time))."<br />";
+ // if reason is not empty
+ if ($edit_msg != "") {
+ $post_edit .= _MD_EDITEDMSG . " " .$edit_msg."<br />";
}
+ // START hacked by irmtfan
}
}
return $post_edit;
Modified: XoopsModules/newbb/branches/irmtfan/newbb/class/user.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/class/user.php 2012-07-30 11:20:19 UTC (rev 9947)
+++ XoopsModules/newbb/branches/irmtfan/newbb/class/user.php 2012-07-30 11:25:09 UTC (rev 9948)
@@ -1,318 +1,298 @@
-<?php
-/**
- * CBB 4.0, or newbb, the forum module for XOOPS project
- *
- * @copyright The XOOPS Project http://xoops.sf.net
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author Taiwen Jiang (phppp or D.J.) <ph...@us...>
- * @since 4.00
- * @version $Id $
- * @package module::newbb
- */
-
-if (!defined("XOOPS_ROOT_PATH")) {
- exit();
-}
-
-defined("NEWBB_FUNCTIONS_INI") || include XOOPS_ROOT_PATH.'/modules/newbb/include/functions.ini.php';
-
-function newbb_calculateLevel($RPG, $RPGDIFF)
-{
-
- //$RPG = $user->getVar('posts');
- //$RPGDIFF = $user->getVar('user_regdate');
-
- $today = time();
- $diff = $today - $RPGDIFF;
- $exp = round($diff / 86400,0);
- if ($exp <= 0) { $exp = 1; }
- $ppd= round($RPG / $exp, 0);
- $level = pow (log10 ($RPG), 3);
- $ep = floor (100 * ($level - floor ($level)));
- $showlevel = floor ($level + 1);
- $hpmulti =round ($ppd / 6, 1);
- if ($hpmulti > 1.5) { $hpmulti = 1.5; }
- if ($hpmulti < 1) { $hpmulti = 1; }
- $maxhp = $level * 25 * $hpmulti;
- $hp= $ppd / 5;
- if ($hp >= 1) {
- $hp= $maxhp;
- } else {
- $hp= floor ($hp * $maxhp);
- }
- $hp= floor ($hp);
- $maxhp= floor ($maxhp);
- if ($maxhp <= 0) {
- $zhp = 1;
- } else {
- $zhp = $maxhp;
- }
- $hpf= floor (100 * ($hp / $zhp)) - 1;
- $maxmp= ($exp * $level) / 5;
- $mp= $RPG / 3;
- if ($mp >= $maxmp) { $mp = $maxmp; }
- $maxmp = floor ($maxmp);
- $mp = floor ($mp);
- if ($maxmp <= 0) {
- $zmp = 1;
- } else {
- $zmp = $maxmp;
- }
- $mpf= floor (100 * ($mp / $zmp)) - 1;
- if ( $hpf >= 98 ) { $hpf = $hpf - 2; }
- if ( $ep >= 98 ) { $ep = $ep - 2; }
- if ( $mpf >= 98 ) { $mpf = $mpf - 2; }
-
- $level = array();
- $level['level'] = $showlevel ;
- $level['exp'] = $ep;
- $level['exp_width'] = $ep.'%';
- $level['hp'] = $hp;
- $level['hp_max'] = $maxhp;
- $level['hp_width'] = $hpf.'%';
- $level['mp'] = $mp;
- $level['mp_max'] = $maxmp;
- $level['mp_width'] = $mpf.'%';
-
- return $level;
-}
-
-class newbbUser {
- var $user = null;
-
- function User()
- {
- }
-
- function getUserbar()
- {
- global $xoopsModuleConfig, $xoopsUser, $isadmin;
-
- $userbar = array();
- if (empty($xoopsModuleConfig['userbar_enabled'])) return $userbar;
-
- $user = $this->user;
- $userbar["profile"] = array("link" => XOOPS_URL . "/userinfo.php?uid=" . $user->getVar("uid"), "name" => _PROFILE);
-
- if (is_object($xoopsUser)) {
- $userbar["pm"] = array("link" => "javascript:void openWithSelfMain('" . XOOPS_URL . "/pmlite.php?send2=1&to_userid=" . $user->getVar("uid") . "', 'pmlite', 450, 380);", "name" => _MD_PM);
- }
- if ($user->getVar('user_viewemail') || $isadmin) {
- $userbar["email"] = array("link" => "javascript:void window.open('mailto:" . $user->getVar('email') . "', 'new');", "name" => _MD_EMAIL);
- }
- if ($url = $user->getVar('url')) {
- $userbar["url"] = array("link" => "javascript:void window.open('" . $url . "', 'new');", "name" => _MD_WWW);
- }
- if ($icq = $user->getVar('user_icq')) {
- $userbar["icq"] = array("link" => "javascript:void window.open('http://wwp.icq.com/scripts/search.dll?to=" . $icq."', 'new');", "name" => _MD_ICQ);
- }
- if ($aim = $user->getVar('user_aim')) {
- $userbar["aim"]= array("link" => "javascript:void window.open('aim:goim?screenname=" . $aim . "&message=Hi+" . $aim . "+Are+you+there?" . "', 'new');", "name" => _MD_AIM);
- }
- if ($yim = $user->getVar('user_yim')) {
- $userbar["yim"] = array("link" => "javascript:void window.open('http://edit.yahoo.com/config/send_webmesg?.target=" . $yim . "&.src=pg" . "', 'new');", "name" => _MD_YIM);
- }
- if ($msn = $user->getVar('user_msnm')) {
- $userbar["msnm"] = array("link" => "javascript:void window.open('http://members.msn.com?mem=" . $msn . "', 'new');", "name" => _MD_MSNM);
- }
-
- return $userbar;
- }
-
- function getLevel()
- {
- global $xoopsModuleConfig, $forumUrl;
-
- $level = newbb_calculateLevel($this->user->getVar("posts"), $this->user->getVar("user_regdate"));
- $info='';
- if ($xoopsModuleConfig['user_level'] == 2) {
- static $rpg_images;
- if (!isset($rpg_images)) {
- $icon_handler = newbb_getIconHandler();
- $rpg_path = $icon_handler->getPath("rpg");
- foreach (array("img_left", "img_backing", "img_right", "blue", "green", "orange") as $img) {
- $rpg_images[$img] = XOOPS_URL . '/' . $rpg_path . '/'.$img.'.gif';
- }
- }
- $table = "<table class='userlevel'><tr><td class='end'><img src='" . $rpg_images['img_left'] . "' alt='' /></td><td class='center' background='" . $rpg_images['img_backing'] . "'><img src='%s' width='%d' alt='' align='left' /></td><td><img src='" . $rpg_images['img_right'] . "' alt='' /></td></tr></table>";
-
- $info = _MD_LEVEL . " " . $level['level'] . "<br />" . _MD_HP . " " . $level['hp'] . " / " . $level['hp_max'] . "<br />".
- sprintf($table, $rpg_images["orange"], $level['hp_width']);
- $info .= _MD_MP . " " . $level['mp'] . " / " . $level['mp_max'] . "<br />".
- sprintf($table, $rpg_images["green"], $level['mp_width']);
- $info .= _MD_EXP . " " . $level['exp'] . "<br />".
- sprintf($table, $rpg_images["blue"], $level['exp_width']);
- } else {
- $info = _MD_LEVEL . " " . $level['level'] . "; ". _MD_EXP . " " . $level['exp'] . "<br />";
- $info .= _MD_HP . " " . $level['hp'] . " / " . $level['hp_max'] . "<br />";
- $info .= _MD_MP . " " . $level['mp'] . " / " . $level['mp_max'];
- }
- return $info;
- }
-
- function getInfo(&$user)
- {
- global $xoopsModuleConfig, $myts;
- static $name_anonymous;
-
- if ( !(is_object($user)) || !($user->isActive()) ) {
- if (!isset($name_anonymous)) {
- $name_anonymous = $myts->HtmlSpecialChars($GLOBALS["xoopsConfig"]['anonymous']);
- }
- return array("name" => $name_anonymous, "link" => $name_anonymous);
- }
-
- $this->user = $user;
-
- $userinfo["uid"] = $user->getVar("uid");
-
- $name = empty($xoopsModuleConfig['show_realname']) ? $user->getVar('uname') : $user->getVar('name');
- $userinfo["name"] = $name ? $name : $user->getVar('uname');
-
- $userinfo["link"] = "<a href=\"".XOOPS_URL . "/userinfo.php?uid=" . $user->getVar("uid") ."\">".$userinfo["name"]."</a>";
-
- $userinfo["avatar"] = $user->getVar('user_avatar');
-
- $userinfo["from"] = $user->getVar('user_from');
-
- mod_loadFunctions("time", "newbb");
- $userinfo["regdate"] = newbb_formatTimestamp($user->getVar('user_regdate'), 'reg');
-
- $userinfo["posts"] = $user->getVar('posts');
-
- if (!empty($xoopsModuleConfig['user_level'])) {
- $userinfo["level"] = $this->getLevel();
- }
-
- if (!empty($xoopsModuleConfig['userbar_enabled'])) {
- $userinfo["userbar"] = $this->getUserbar();
- }
-
- $userinfo["signature"] = $user->getVar('user_sig');
- return $userinfo;
- }
-}
-
-class NewbbUserHandler
-{
- var $enableGroup;
- var $enableOnline;
- var $userlist = array();
- var $users = array();
- //var $online = array();
-
- function NewbbUserHandler($enableGroup = true, $enableOnline = true)
- {
- $this->enableGroup = $enableGroup;
- $this->enableOnline = $enableOnline;
- }
-
- function loadUserInfo()
- {
- @include_once XOOPS_ROOT_PATH."/modules/".$GLOBALS["xoopsModule"]->getVar("dirname", "n")."/language/".$GLOBALS["xoopsConfig"]["language"]."/user.php";
- if (class_exists("User_language")) {
- $handler = new User_language();
- } else {
- $handler = new newbbUser();
- }
- foreach (array_keys($this->users) as $uid) {
- $this->userlist[$uid] = $handler->getInfo($this->users[$uid]);
- }
- }
-
- function loadUserOnline()
- {
- if (empty($this->users) || !$this->enableOnline) return;
- mod_loadFunctions("render", "newbb");
- $image_online = newbb_displayImage('online', _MD_ONLINE);
- $image_offline = newbb_displayImage('offline',_MD_OFFLINE);
-
- $online_handler =& xoops_getmodulehandler('online', 'newbb');
- $onlines = $online_handler->checkStatus(array_keys($this->users));
-
- foreach (array_keys($this->users) as $uid) {
- $this->userlist[$uid]["status"] = empty($onlines[$uid]) ? $image_offline : $image_online;
- }
- }
-
- function loadUserGroups()
- {
- GLOBAL $xoopsDB;
-
- if (empty($this->users) || !$this->enableGroup) return;
-
- $groups = array();
- $member_handler =& xoops_gethandler('member');
- $groups_obj = $member_handler->getGroups();
- $count = count($groups_obj);
- for ($i = 0; $i < $count; $i++) {
- $groups[$groups_obj[$i]->getVar('groupid')] = $groups_obj[$i]->getVar('name');
- }
- unset($groups_obj);
-
- $sql = 'SELECT groupid, uid FROM ' . $xoopsDB->prefix('groups_users_link') . " WHERE uid IN( " . implode(", ", array_keys($this->users)) . ")";
- $result = $xoopsDB->query($sql);
- while ($myrow = $xoopsDB->fetchArray($result)) {
- $this->userlist[$myrow['uid']]["groups"][] = $groups[$myrow['groupid']];
- }
- }
-
- function loadUserDigest()
- {
- GLOBAL $xoopsDB;
-
- if (empty($this->users)) return;
-
- $sql = 'SELECT user_digests, uid FROM ' . $xoopsDB->prefix('bb_user_stats') . " WHERE uid IN( " . implode(", ", array_keys($this->users)) . ")";
- $result = $xoopsDB->query($sql);
- while ($myrow = $xoopsDB->fetchArray($result)) {
- $this->userlist[$myrow['uid']]["digests"] = intval( $myrow['user_digests'] );
- }
- }
-
- function loadUserRank()
- {
- GLOBAL $xoopsDB;
-
- if (empty($this->users)) return;
- $myts =& MyTextSanitizer::getInstance();
-
- $sql = 'SELECT * FROM ' . $xoopsDB->prefix('ranks');
- $result = $xoopsDB->query($sql);
- while ($myrow = $xoopsDB->fetchArray($result)) {
- $ranks[$myrow['rank_id']] = $myrow;
- $ranks[$myrow['rank_id']]["rank_title"] = $myts->htmlspecialchars($ranks[$myrow['rank_id']]["rank_title"]);
- if (!empty($ranks[$myrow['rank_id']]['rank_image'])) {
- $ranks[$myrow['rank_id']]['rank_image'] = "<img src='" . XOOPS_UPLOAD_URL . "/ranks/" . htmlspecialchars($ranks[$myrow['rank_id']]['rank_image'], ENT_QUOTES) . "' alt='' />";
- }
- }
-
- foreach (array_keys($this->userlist) as $uid) {
- if ($rank = $this->users[$uid]->getVar("rank")) {
- $this->userlist[$uid]["rank"]["title"] = $ranks[$rank]["rank_title"];
- $this->userlist[$uid]["rank"]["image"] = $ranks[$rank]["rank_image"];
- continue;
- }
- foreach ($ranks as $id => $rank) {
- if ($rank["rank_min"] <= $this->userlist[$uid]["posts"] && $rank["rank_max"] >= $this->userlist[$uid]["posts"]) {
- $this->userlist[$uid]["rank"]["title"] = $rank["rank_title"];
- $this->userlist[$uid]["rank"]["image"] = $rank["rank_image"];
- break;
- }
- }
- }
- }
-
- function getUsers()
- {
- $this->loadUserInfo();
- $this->loadUserOnline();
- $this->loadUserGroups();
- $this->loadUserRank();
- $this->loadUserDigest();
-
- return $this->userlist;
- }
-}
-
+<?php
+/**
+ * CBB 4.0, or newbb, the forum module for XOOPS project
+ *
+ * @copyright The XOOPS Project http://xoops.sf.net
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Taiwen Jiang (phppp or D.J.) <ph...@us...>
+ * @since 4.00
+ * @version $Id $
+ * @package module::newbb
+ */
+
+if (!defined("XOOPS_ROOT_PATH")) {
+ exit();
+}
+
+defined("NEWBB_FUNCTIONS_INI") || include XOOPS_ROOT_PATH.'/modules/newbb/include/functions.ini.php';
+
+function newbb_calculateLevel($RPG, $RPGDIFF)
+{
+
+ //$RPG = $user->getVar('posts');
+ //$RPGDIFF = $user->getVar('user_regdate');
+
+ $today = time();
+ $diff = $today - $RPGDIFF;
+ $exp = round($diff / 86400,0);
+ if ($exp <= 0) { $exp = 1; }
+ $ppd= round($RPG / $exp, 0);
+ $level = pow (log10 ($RPG), 3);
+ $ep = floor (100 * ($level - floor ($level)));
+ $showlevel = floor ($level + 1);
+ $hpmulti =round ($ppd / 6, 1);
+ if ($hpmulti > 1.5) { $hpmulti = 1.5; }
+ if ($hpmulti < 1) { $hpmulti = 1; }
+ $maxhp = $level * 25 * $hpmulti;
+ $hp= $ppd / 5;
+ if ($hp >= 1) {
+ $hp= $maxhp;
+ } else {
+ $hp= floor ($hp * $maxhp);
+ }
+ $hp= floor ($hp);
+ $maxhp= floor ($maxhp);
+ if ($maxhp <= 0) {
+ $zhp = 1;
+ } else {
+ $zhp = $maxhp;
+ }
+ $hpf= floor (100 * ($hp / $zhp)) - 1;
+ $maxmp= ($exp * $level) / 5;
+ $mp= $RPG / 3;
+ if ($mp >= $maxmp) { $mp = $maxmp; }
+ $maxmp = floor ($maxmp);
+ $mp = floor ($mp);
+ if ($maxmp <= 0) {
+ $zmp = 1;
+ } else {
+ $zmp = $maxmp;
+ }
+ $mpf= floor (100 * ($mp / $zmp)) - 1;
+ if ( $hpf >= 98 ) { $hpf = $hpf - 2; }
+ if ( $ep >= 98 ) { $ep = $ep - 2; }
+ if ( $mpf >= 98 ) { $mpf = $mpf - 2; }
+
+ $level = array();
+ $level['level'] = $showlevel ;
+ $level['exp'] = $ep;
+ $level['exp_width'] = $ep.'%';
+ $level['hp'] = $hp;
+ $level['hp_max'] = $maxhp;
+ $level['hp_width'] = $hpf.'%';
+ $level['mp'] = $mp;
+ $level['mp_max'] = $maxmp;
+ $level['mp_width'] = $mpf.'%';
+
+ return $level;
+}
+
+class newbbUser {
+ var $user = null;
+
+ function User()
+ {
+ }
+
+ function getUserbar()
+ {
+ global $xoopsModuleConfig, $xoopsUser, $isadmin;
+
+ $userbar = array();
+ if (empty($xoopsModuleConfig['userbar_enabled'])) return $userbar;
+
+ $user = $this->user;
+ $userbar["profile"] = array("link" => XOOPS_URL . "/userinfo.php?uid=" . $user->getVar("uid"), "name" => _PROFILE);
+
+ if (is_object($xoopsUser)) {
+ $userbar["pm"] = array("link" => "javascript:void openWithSelfMain('" . XOOPS_URL . "/pmlite.php?send2=1&to_userid=" . $user->getVar("uid") . "', 'pmlite', 450, 380);", "name" => _MD_PM);
+ }
+ if ($user->getVar('user_viewemail') || $isadmin) {
+ $userbar["email"] = array("link" => "javascript:void window.open('mailto:" . $user->getVar('email') . "', 'new');", "name" => _MD_EMAIL);
+ }
+ if ($url = $user->getVar('url')) {
+ $userbar["url"] = array("link" => "javascript:void window.open('" . $url . "', 'new');", "name" => _MD_WWW);
+ }
+ if ($icq = $user->getVar('user_icq')) {
+ $userbar["icq"] = array("link" => "javascript:void window.open('http://wwp.icq.com/scripts/search.dll?to=" . $icq."', 'new');", "name" => _MD_ICQ);
+ }
+ if ($aim = $user->getVar('user_aim')) {
+ $userbar["aim"]= array("link" => "javascript:void window.open('aim:goim?screenname=" . $aim . "&message=Hi+" . $aim . "+Are+you+there?" . "', 'new');", "name" => _MD_AIM);
+ }
+ if ($yim = $user->getVar('user_yim')) {
+ $userbar["yim"] = array("link" => "javascript:void window.open('http://edit.yahoo.com/config/send_webmesg?.target=" . $yim . "&.src=pg" . "', 'new');", "name" => _MD_YIM);
+ }
+ if ($msn = $user->getVar('user_msnm')) {
+ $userbar["msnm"] = array("link" => "javascript:void window.open('http://members.msn.com?mem=" . $msn . "', 'new');", "name" => _MD_MSNM);
+ }
+
+ return $userbar;
+ }
+
+ function getLevel()
+ {
+ global $xoopsModuleConfig, $forumUrl;
+
+ $level = newbb_calculateLevel($this->user->getVar("posts"), $this->user->getVar("user_regdate"));
+ $info='';
+ if ($xoopsModuleConfig['user_level'] == 2) {
+ static $rpg_images;
+ if (!isset($rpg_images)) {
+ $icon_handler = newbb_getIconHandler();
+ $rpg_path = $icon_handler->getPath("rpg");
+ foreach (array("img_left", "img_backing", "img_right", "blue", "green", "orange") as $img) {
+ $rpg_images[$img] = XOOPS_URL . '/' . $rpg_path . '/'.$img.'.gif';
+ }
+ }
+ $table = "<table class='userlevel'><tr><td class='end'><img src='" . $rpg_images['img_left'] . "' alt='' /></td><td class='center' background='" . $rpg_images['img_backing'] . "'><img src='%s' width='%d' alt='' align='left' /></td><td><img src='" . $rpg_images['img_right'] . "' alt='' /></td></tr></table>";
+
+ $info = _MD_LEVEL . " " . $level['level'] . "<br />" . _MD_HP . " " . $level['hp'] . " / " . $level['hp_max'] . "<br />".
+ sprintf($table, $rpg_images["orange"], $level['hp_width']);
+ $info .= _MD_MP . " " . $level['mp'] . " / " . $level['mp_max'] . "<br />".
+ sprintf($table, $rpg_images["green"], $level['mp_width']);
+ $info .= _MD_EXP . " " . $level['exp'] . "<br />".
+ sprintf($table, $rpg_images["blue"], $level['exp_width']);
+ } else {
+ $info = _MD_LEVEL . " " . $level['level'] . "; ". _MD_EXP . " " . $level['exp'] . "<br />";
+ $info .= _MD_HP . " " . $level['hp'] . " / " . $level['hp_max'] . "<br />";
+ $info .= _MD_MP . " " . $level['mp'] . " / " . $level['mp_max'];
+ }
+ return $info;
+ }
+
+ function getInfo(&$user)
+ {
+ global $xoopsModuleConfig, $myts;
+ static $name_anonymous;
+
+ if ( !(is_object($user)) || !($user->isActive()) ) {
+ if (!isset($name_anonymous)) {
+ $name_anonymous = $myts->HtmlSpecialChars($GLOBALS["xoopsConfig"]['anonymous']);
+ }
+ return array("name" => $name_anonymous, "link" => $name_anonymous);
+ }
+
+ $this->user = $user;
+
+ $userinfo["uid"] = $user->getVar("uid");
+
+ $name = empty($xoopsModuleConfig['show_realname']) ? $user->getVar('uname') : $user->getVar('name');
+ $userinfo["name"] = $name ? $name : $user->getVar('uname');
+
+ $userinfo["link"] = "<a href=\"".XOOPS_URL . "/userinfo.php?uid=" . $user->getVar("uid") ."\">".$userinfo["name"]."</a>";
+
+ $userinfo["avatar"] = $user->getVar('user_avatar');
+// START hacked by irmtfan - easier rank getting
+ $userrank = $user->rank();
+ if (isset($userrank['image']) && $userrank['image']) {
+ $userinfo["rank_image"] = $userrank['image'];
+ $userinfo["rank_title"] = $userrank['title'];
+ }
+// END hacked by irmtfan - easier rank getting
+
+ $userinfo["from"] = $user->getVar('user_from');
+
+ mod_loadFunctions("time", "newbb");
+ $userinfo["regdate"] = newbb_formatTimestamp($user->getVar('user_regdate'), 'reg');
+
+ $userinfo["posts"] = $user->getVar('posts');
+
+ if (!empty($xoopsModuleConfig['user_level'])) {
+ $userinfo["level"] = $this->getLevel();
+ }
+
+ if (!empty($xoopsModuleConfig['userbar_enabled'])) {
+ $userinfo["userbar"] = $this->getUserbar();
+ }
+
+ $userinfo["signature"] = $user->getVar('user_sig');
+ return $userinfo;
+ }
+}
+
+class NewbbUserHandler
+{
+ var $enableGroup;
+ var $enableOnline;
+ var $userlist = array();
+ var $users = array();
+ //var $online = array();
+
+ function NewbbUserHandler($enableGroup = true, $enableOnline = true)
+ {
+ $this->enableGroup = $enableGroup;
+ $this->enableOnline = $enableOnline;
+ }
+
+ function loadUserInfo()
+ {
+ @include_once XOOPS_ROOT_PATH."/modules/".$GLOBALS["xoopsModule"]->getVar("dirname", "n")."/language/".$GLOBALS["xoopsConfig"]["language"]."/user.php";
+ if (class_exists("User_language")) {
+ $handler = new User_language();
+ } else {
+ $handler = new newbbUser();
+ }
+ foreach (array_keys($this->users) as $uid) {
+ $this->userlist[$uid] = $handler->getInfo($this->users[$uid]);
+ }
+ }
+
+ function loadUserOnline()
+ {
+ if (empty($this->users) || !$this->enableOnline) return;
+ mod_loadFunctions("render", "newbb");
+ $image_online = newbb_displayImage('online', _MD_ONLINE);
+ $image_offline = newbb_displayImage('offline',_MD_OFFLINE);
+
+ $online_handler =& xoops_getmodulehandler('online', 'newbb');
+ $onlines = $online_handler->checkStatus(array_keys($this->users));
+
+ foreach (array_keys($this->users) as $uid) {
+ $this->userlist[$uid]["status"] = empty($onlines[$uid]) ? $image_offline : $image_online;
+ }
+ }
+
+ function loadUserGroups()
+ {
+ GLOBAL $xoopsDB;
+
+ if (empty($this->users) || !$this->enableGroup) return;
+
+ $groups = array();
+ $member_handler =& xoops_gethandler('member');
+ $groups_obj = $member_handler->getGroups();
+ $count = count($groups_obj);
+ for ($i = 0; $i < $count; $i++) {
+ $groups[$groups_obj[$i]->getVar('groupid')] = $groups_obj[$i]->getVar('name');
+ }
+ unset($groups_obj);
+
+ $sql = 'SELECT groupid, uid FROM ' . $xoopsDB->prefix('groups_users_link') . " WHERE uid IN( " . implode(", ", array_keys($this->users)) . ")";
+ $result = $xoopsDB->query($sql);
+ while ($myrow = $xoopsDB->fetchArray($result)) {
+ $this->userlist[$myrow['uid']]["groups"][] = $groups[$myrow['groupid']];
+ }
+ }
+
+ function loadUserDigest()
+ {
+ GLOBAL $xoopsDB;
+
+ if (empty($this->users)) return;
+
+ $sql = 'SELECT user_digests, uid FROM ' . $xoopsDB->prefix('bb_user_stats') . " WHERE uid IN( " . implode(", ", array_keys($this->users)) . ")";
+ $result = $xoopsDB->query($sql);
+ while ($myrow = $xoopsDB->fetchArray($result)) {
+ $this->userlist[$myrow['uid']]["digests"] = intval( $myrow['user_digests'] );
+ }
+ }
+// START irmtfan remove function
+// function loadUserRank()
+// {
+// return true;
+// }
+// END irmtfan remove function
+
+ function getUsers()
+ {
+ $this->loadUserInfo();
+ $this->loadUserOnline();
+ $this->loadUserGroups();
+ // irmtfan removed $this->loadUserRank();
+ $this->loadUserDigest();
+
+ return $this->userlist;
+ }
+}
+
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/irmtfan/newbb/docs/changelog.txt
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/docs/changelog.txt 2012-07-30 11:20:19 UTC (rev 9947)
+++ XoopsModules/newbb/branches/irmtfan/newbb/docs/changelog.txt 2012-07-30 11:25:09 UTC (rev 9948)
@@ -20,6 +20,25 @@
16 Fix Link to Blank.gif
17 Fix Error Upload File too large
+18- bug fix: edit not displayed when the reason is not filled (irmtfan)
+19- bug fix: only the last edit is recorded. (irmtfan/alfred)
+in newbb/class/post.php
+
+20- bug fix: 'noapprove' permission incorrectly recorded in database. (irmtfan)
+in newbb/class/permission.php
+
+21- bug fix: load user ranks has been hardcoded. it works in old/upgraded websites but not works in new installed websites. a new getting rank introduced. (black_beard/irmtfan)
+in newbb/class/user.php, newbb/templates/newbb_thread.html
+
+22- minor bug fix: mysql 5.1 was incorrectly needed (irmtfan)
+in newbb/xoops_version.php
+
+23- hardcode: some style.css color hardcodes has been removed. (irmtfan)
+in newbb/templates/style.css
+
+24- feature added: text links instead of buttons. (deka87/irmtfan)
+in newbb/class/icon.php , newbb/include/functions.render.php , newbb/include/plugin.php
+
newBB
Changelog 4.2
02/08/2012
Modified: XoopsModules/newbb/branches/irmtfan/newbb/include/functions.render.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/include/functions.render.php 2012-07-30 11:20:19 UTC (rev 9947)
+++ XoopsModules/newbb/branches/irmtfan/newbb/include/functions.render.php 2012-07-30 11:25:09 UTC (rev 9948)
@@ -96,6 +96,13 @@
function newbb_displayImage($image, $alt = "", $display = true, $extra = "class='forum_icon'")
{
$icon_handler = newbb_getIconHandler();
+ // START hacked by irmtfan
+ // to show text links instead of buttons
+ global $xoopsModuleConfig;
+ if (!empty($xoopsModuleConfig['display_text_links'])){
+ $display=false;
+ }
+ // END hacked by irmtfan
if (empty($display)) {
return $icon_handler->assignImage($image, $alt, $extra);
} else {
Modified: XoopsModules/newbb/branches/irmtfan/newbb/include/plugin.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/include/plugin.php 2012-07-30 11:20:19 UTC (rev 9947)
+++ XoopsModules/newbb/branches/irmtfan/newbb/include/plugin.php 2012-07-30 11:25:09 UTC (rev 9948)
@@ -1,84 +1,87 @@
-<?php
-/**
- * CBB 4.0, or newbb, the forum module for XOOPS project
- *
- * @copyright The XOOPS Project http://xoops.sf.net
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author Taiwen Jiang (phppp or D.J.) <ph...@us...>
- * @since 4.00
- * @version $Id $
- * @package module::newbb
- */
-
-if (!defined('XOOPS_ROOT_PATH')) {
- exit();
-}
-/* some static xoopsModuleConfig */
-$customConfig = array();
-
-// specification for custom time format
-// default manner will be used if not specified
-$customConfig["formatTimestamp_custom"] = ""; // Could be set as "Y-m-d H:i"
-
-// requiring "name" field for anonymous users in edit form
-$customConfig["require_name"] = true;
-
-// display "register or login to post" for anonymous users
-$customConfig["show_reg"] = true;
-
-// perform forum/topic synchronization on module update
-$customConfig["syncOnUpdate"] = true;
-
-// time for pending/deleted topics/posts, expired one will be removed automatically, in days; 0 or no cleanup
-$customConfig["pending_expire"] = 0;
-
-// redirect to its URI of an attachment when requested
-// Set to true if your attachment would be corrupted after download with normal way
-$customConfig["download_direct"] = false;
-
-// Set allowed editors
-// Should set from module preferences?
-$customConfig["editor_allowed"] = array();
-
-// Set the default editor
-$customConfig["editor_default"] = "dhtmltextarea";
-
-// Set the default editor for quick reply
-$customConfig["editor_quick_default"] = "textarea";
-
-// default value for editor rows, coloumns
-$customConfig["editor_rows"] = 15;
-$customConfig["editor_cols"] = 40;
-
-// default value for editor width, height (string)
-$customConfig["editor_width"] = "100%";
-$customConfig["editor_height"] = "400px";
-
-// storage method for reading records: 0 - none; 1 - cookie; 2 - db
-$customConfig["read_mode"] = 2;
-
-// expire time for reading records, in days
-$customConfig["read_expire"] = 30;
-
-// maximum records per forum for one user
-$customConfig["read_items"] = 100;
-
-// Enable tag system
-$customConfig["do_tag"] = 1;
-
-// Count posts counts of subfourms
-$customConfig["count_subforum"] = 1;
-
-// Length for post title on index page: 0 for not showing post title, 255 for not truncate
-$customConfig["length_title_index"] = 40;
-
-// MENU handler
-/* You could remove anyone by commenting out in order to disable it */
-$customConfig["valid_menumodes"] = array(
- 0 => _MD_MENU_SELECT, // for selectbox
- //1 => _MD_MENU_CLICK, // for "click to expand"
- //2 => _MD_MENU_HOVER // for "mouse hover to expand"
- );
-
-return $customConfig;
+<?php
+/**
+ * CBB 4.0, or newbb, the forum module for XOOPS project
+ *
+ * @copyright The XOOPS Project http://xoops.sf.net
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Taiwen Jiang (phppp or D.J.) <ph...@us...>
+ * @since 4.00
+ * @version $Id $
+ * @package module::newbb
+ */
+
+if (!defined('XOOPS_ROOT_PATH')) {
+ exit();
+}
+/* some static xoopsModuleConfig */
+$customConfig = array();
+
+// specification for custom time format
+// default manner will be used if not specified
+$customConfig["formatTimestamp_custom"] = ""; // Could be set as "Y-m-d H:i"
+
+// requiring "name" field for anonymous users in edit form
+$customConfig["require_name"] = true;
+
+// display "register or login to post" for anonymous users
+$customConfig["show_reg"] = true;
+
+// perform forum/topic synchronization on module update
+$customConfig["syncOnUpdate"] = true;
+
+// time for pending/deleted topics/posts, expired one will be removed automatically, in days; 0 or no cleanup
+$customConfig["pending_expire"] = 0;
+
+// redirect to its URI of an attachment when requested
+// Set to true if your attachment would be corrupted after download with normal way
+$customConfig["download_direct"] = false;
+
+// Set allowed editors
+// Should set from module preferences?
+$customConfig["editor_allowed"] = array();
+
+// Set the default editor
+$customConfig["editor_default"] = "dhtmltextarea";
+
+// Set the default editor for quick reply
+$customConfig["editor_quick_default"] = "textarea";
+
+// default value for editor rows, coloumns
+$customConfig["editor_rows"] = 15;
+$customConfig["editor_cols"] = 40;
+
+// default value for editor width, height (string)
+$customConfig["editor_width"] = "100%";
+$customConfig["editor_height"] = "400px";
+
+// storage method for reading records: 0 - none; 1 - cookie; 2 - db
+$customConfig["read_mode"] = 2;
+
+// expire time for reading records, in days
+$customConfig["read_expire"] = 30;
+
+// maximum records per forum for one user
+$customConfig["read_items"] = 100;
+
+// Enable tag system
+$customConfig["do_tag"] = 1;
+
+// Count posts counts of subfourms
+$customConfig["count_subforum"] = 1;
+
+// Length for post title on index page: 0 for not showing post title, 255 for not truncate
+$customConfig["length_title_index"] = 40;
+
+// MENU handler
+/* You could remove anyone by commenting out in order to disable it */
+$customConfig["valid_menumodes"] = array(
+ 0 => _MD_MENU_SELECT, // for selectbox
+ //1 => _MD_MENU_CLICK, // for "click to expand"
+ //2 => _MD_MENU_HOVER // for "mouse hover to expand"
+ );
+// START hacked by irmtfan
+// Display text links instead of image buttons for edit, reply, .... set true or false
+$customConfig["display_text_links"] = false;
+// END hacked by irmtfan
+return $customConfig;
?>
\ No newline at end of file
Added: XoopsModules/newbb/branches/irmtfan/newbb/language/persian/admin.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/language/persian/admin.php (rev 0)
+++ XoopsModules/newbb/branches/irmtfan/newbb/language/persian/admin.php 2012-07-30 11:25:09 UTC (rev 9948)
@@ -0,0 +1,297 @@
+<?php
+// $Id: admin.php,v 1.3 2005/10/19 17:20:33 phppp Exp $
+
+if(defined('NEWBB_ADMIN_DEFINED')) return;
+else define('NEWBB_ADMIN_DEFINED',true);
+
+//%%%%%% File Name index.php %%%%%
+define("_AM_NEWBB_FORUMCONF","تنظیمات انجمن");
+define("_AM_NEWBB_ADDAFORUM","اضافه کردن یکانجمن");
+define("_AM_NEWBB_SYNCFORUM","همگام سازی انجمن");
+define("_AM_NEWBB_REORDERFORUM","مرتب سازی دوباره");
+define("_AM_NEWBB_FORUM_MANAGER","انجمنها");
+define("_AM_NEWBB_PRUNE_TITLE","هرس کردن");
+define("_AM_NEWBB_CATADMIN","شاخهها");
+define("_AM_NEWBB_GENERALSET", "تنظیمات ماژول" );
+define("_AM_NEWBB_MODULEADMIN","مدیریت ماژول:");
+define("_AM_NEWBB_HELP","کمک");
+define("_AM_NEWBB_ABOUT","درباره");
+define("_AM_NEWBB_BOARDSUMMARY","آمار Board");
+define("_AM_NEWBB_PENDING_POSTS_FOR_AUTH","تایید پستهای معلق");
+define("_AM_NEWBB_POSTID","ID پست");
+define("_AM_NEWBB_POSTDATE","تاریخ پست");
+define("_AM_NEWBB_POSTER","فرستنده");
+define("_AM_NEWBB_TOPICS","تاپیکها");
+define("_AM_NEWBB_SHORTSUMMARY","خلاصهی Board");
+define("_AM_NEWBB_TOTALPOSTS","مجموع پستها");
+define("_AM_NEWBB_TOTALTOPICS","مجموع تاپیکها");
+define("_AM_NEWBB_TOTALVIEWS","مجموع دیده شدهها");
+define("_AM_NEWBB_BLOCKS","بلاکها");
+define("_AM_NEWBB_SUBJECT","عنوان");
+define("_AM_NEWBB_APPROVE","تایید پست");
+define("_AM_NEWBB_APPROVETEXT","محتوای این پست");
+define("_AM_NEWBB_POSTAPPROVED","این پست تایید شد");
+define("_AM_NEWBB_POSTNOTAPPROVED","پست تایید نشد");
+define("_AM_NEWBB_POSTSAVED","پست ذخیره شد");
+define("_AM_NEWBB_POSTNOTSAVED","پست ذخیره نشد");
+define("_AM_NEWBB_TOPICAPPROVED","تاپیک تایید شد");
+define("_AM_NEWBB_TOPICNOTAPPROVED","تاپیکتایید نشد");
+define("_AM_NEWBB_TOPICID","ID تاپیک");
+define("_AM_NEWBB_ORPHAN_TOPICS_FOR_AUTH","تایید نکردن تاپیکهای ارسال شده");
+define('_AM_NEWBB_DEL_ONE','فقط این پیام را پاککن');
+define('_AM_NEWBB_POSTSDELETED','پیام انتخاب شده حذف شد');
+define('_AM_NEWBB_NOAPPROVEPOST','در حال حاضر هیچ پست منتظر برای تایید موجود نیست.');
+define('_AM_NEWBB_SUBJECTC','عنوان:');
+define('_AM_NEWBB_MESSAGEICON','شکلکپیام:');
+define('_AM_NEWBB_MESSAGEC','پیام:');
+define('_AM_NEWBB_CANCELPOST','لغو کردن ارسال');
+define('_AM_NEWBB_GOTOMOD','برو به ماژول');
+define('_AM_NEWBB_PREFERENCES','تنظیمات ماژول');
+define('_AM_NEWBB_POLLMODULE','ماژول Xoops poll');
+define('_AM_NEWBB_POLL_OK','آماده برای استفاده');
+define('_AM_NEWBB_GDLIB1','GD1 library:');
+define('_AM_NEWBB_GDLIB2','GD2 library:');
+define('_AM_NEWBB_AUTODETECTED','شناسایی خودکار: ');
+define('_AM_NEWBB_AVAILABLE','آمادهاست');
+define('_AM_NEWBB_NOTAVAILABLE','<font color="red">آماده نیست</font>');
+define('_AM_NEWBB_NOTWRITABLE','<font color="red">قابل دسترسی نیست</font>');
+define('_AM_NEWBB_IMAGEMAGICK','ImageMagicK');
+define('_AM_NEWBB_IMAGEMAGICK_NOTSET','تنظیمنشده');
+define('_AM_NEWBB_ATTACHPATH','مسیر برای قرار دادن ضمائم');
+define('_AM_NEWBB_THUMBPATH','مسیر برای قرار دادن تصاویر تمبری');
+//define('_AM_NEWBB_RSSPATH','مسیر برای RSS feed');
+define('_AM_NEWBB_REPORT','پیامهای گزارش داده شده');
+define('_AM_NEWBB_REPORT_PENDING','گزارشهای معلق');
+define('_AM_NEWBB_REPORT_PROCESSED','گزارشهای پردازش شده');
+define('_AM_NEWBB_CREATETHEDIR','بساز');
+define('_AM_NEWBB_SETMPERM','گذاشتن دسترسی ها');
+define('_AM_NEWBB_DIRCREATED','شاخه ساخته شد');
+define('_AM_NEWBB_DIRNOTCREATED','شاخه شاخته نشد');
+define('_AM_NEWBB_PERMSET','دسترسی تنظیم شد');
+define('_AM_NEWBB_PERMNOTSET','دسترسی تنظیم نشد');
+define('_AM_NEWBB_DIGEST','آگهای رسانی خلاصه ها');
+define('_AM_NEWBB_DIGEST_PAST','<font color="red"> %d دقیقه پیش گذاشته شده است</font>');
+define('_AM_NEWBB_DIGEST_NEXT',' %d دقیقه دیگر فرستاده می شود');
+define('_AM_NEWBB_DIGEST_ARCHIVE','خلاصه در آرشیو قرار گرفت');
+define('_AM_NEWBB_DIGEST_SENT','خلاصه در حال فرستاده شدن');
+define('_AM_NEWBB_DIGEST_FAILED','خلاصه فرستاده نشد');
+
+// admin_forum_manager.php
+define("_AM_NEWBB_NAME","نام");
+define("_AM_NEWBB_CREATEFORUM","ایجاد انجمن");
+define("_AM_NEWBB_EDIT","ویرایش");
+define("_AM_NEWBB_CLEAR","پاک کردن گزینه ها");
+define("_AM_NEWBB_DELETE","حذف");
+define("_AM_NEWBB_ADD","اضافهکردن");
+define("_AM_NEWBB_MOVE","انتقال");
+define("_AM_NEWBB_ORDER","ردیفکردن");
+define("_AM_NEWBB_TWDAFAP","این قسمت انجمن و تمام پیامهای زده شده در آن را حذف خواهد کرد.<br><br>هشدار: آیا مطمئنید که این انجمن را میخواهید پاککنید؟");
+define("_AM_NEWBB_FORUMREMOVED","انجمن پاکشد.");
+define("_AM_NEWBB_CREATENEWFORUM","ایجاد یکانجمن جدید");
+define("_AM_NEWBB_EDITTHISFORUM","ویرایش انجمن:");
+define("_AM_NEWBB_SET_FORUMORDER","تنظیم محل قرارگیری انجمن:");
+define("_AM_NEWBB_ALLOWPOLLS","اجازهدادن نظرسنجیها:");
+define("_AM_NEWBB_ATTACHMENT_SIZE" ,"حداکثر سایز ممکن بر حسب KB:");
+define("_AM_NEWBB_ALLOWED_EXTENSIONS", "پسوند های مجاز:<span style='font-size: xx-small; font-weight: normal; display: block;'>'*' یعنی بدون محدودیت. برای جدا کردن از نشان '|' استفاده کنید.</span>");
+define("_AM_NEWBB_ALLOW_ATTACHMENTS", "اجازه دادن پیوست:");
+define("_AM_NEWBB_ALLOWHTML","اجازه دادن استفاده از HTML:");
+define("_AM_NEWBB_YES","بله");
+define("_AM_NEWBB_NO","خیر");
+define("_AM_NEWBB_ALLOWSIGNATURES","اجازه دادن استفاده از امضا:");
+define("_AM_NEWBB_HOTTOPICTHRESHOLD","تعداد عنوان های مهم:");
+//define("_AM_NEWBB_POSTPERPAGE","تعداد پستها در صفحه<span style='font-size: xx-small; font-weight: normal; display: block;'>(این گزینه تعداد پستها را<br> در عنوان نشان می دهد که<br> در هر صفحه اتز عنوان وجود دارد)</span>");
+//define("_AM_NEWBB_TOPICPERFORUM","تعداد عنوان ها در انجمن<span style='font-size: xx-small; font-weight: normal; display: block;'>(این گزینه تعداد عنوان ها را در انجمن نشان می دهد<br> که در هر صفحه از انجمن<br> این تعداد عنوان وجود دارد)</span>");
+//define("_AM_NEWBB_SHOWNAME","جایگزینی نام کاربری با نام واقعی:");
+//define("_AM_NEWBB_SHOWICONSPANEL","نمایش پنل شکلکها:");
+//define("_AM_NEWBB_SHOWSMILIESPANEL","نمایش پنل Smiley ها:");
+define("_AM_NEWBB_MODERATOR_REMOVE","حذف ناظر های کنونی");
+define("_AM_NEWBB_MODERATOR_ADD","اظافه کردن ناظر");
+
+// admin_cat_manager.php
+define("_AM_NEWBB_SETCATEGORYORDER","تنظیم محل شاخه:");
+define("_AM_NEWBB_ACTIVE","فعال");
+define("_AM_NEWBB_INACTIVE","غیرفعال");
+define("_AM_NEWBB_STATE","وضعیت:");
+define("_AM_NEWBB_CATEGORYDESC","توضیحات شاخه:");
+define("_AM_NEWBB_SHOWDESC","نمایش دادن توضیحات؟");
+define("_AM_NEWBB_IMAGE","تصویر:");
+//define("_AM_NEWBB_SPONSORIMAGE","تصویر پشتیبان:");
+define("_AM_NEWBB_SPONSORLINK","لینک پشتیبان:");
+define("_AM_NEWBB_DELCAT","حذف شاخه");
+define("_AM_NEWBB_WAYSYWTDTTAL","این قسمت انجمنهای زیر شاخه را پاکنخواهد کرد.<br><br>WARNINGبرای پاککردن آن از ویرایش انجمناقدام کنید. آیا مایلید شاخهرا پاککنید؟");
+
+//%%%%%% File Name admin_forums.php %%%%%
+define("_AM_NEWBB_FORUMNAME","نام انجمن:");
+define("_AM_NEWBB_FORUMDESCRIPTION","توضیحات انجمن:");
+define("_AM_NEWBB_MODERATOR","ناظرین:");
+define("_AM_NEWBB_REMOVE","حذف");
+define("_AM_NEWBB_CATEGORY","شاخه:");
+define("_AM_NEWBB_DATABASEERROR","خطای دیتابیس");
+define("_AM_NEWBB_CATEGORYUPDATED","شاخه به روز شد.");
+define("_AM_NEWBB_EDITCATEGORY","ویرایش شاخه:");
+define("_AM_NEWBB_CATEGORYTITLE","عنوان شاخه:");
+define("_AM_NEWBB_CATEGORYCREATED","شاخه ایجاد شد");
+define("_AM_NEWBB_CREATENEWCATEGORY","ایجاد یک شاخهی جدید");
+define("_AM_NEWBB_FORUMCREATED","انجمن ایجاد شد");
+define("_AM_NEWBB_ACCESSLEVEL","سطح دسترسی کامل:");
+define("_AM_NEWBB_CATEGORY1","شاخه");
+define("_AM_NEWBB_FORUMUPDATE","تنظیمات انجمن به روز شد.");
+define("_AM_NEWBB_FORUM_ERROR","خطا: تنظیمات انجمن به روز نشد.");
+define("_AM_NEWBB_CLICKBELOWSYNC","کلیک کردن زیر باعث میشود تاپیکها و صفحههای فروم شما با مقداردهی صحیحی از دیتابیس تنظیم شوند. از این بخش هنگامی استفاده کنید که مطلع شدهاید بی نظمی در تعداد تاپیکها و صفحهات وجود دارد. ");
+define("_AM_NEWBB_SYNCHING","همزمان کردن صفه اصلی انجمن و انجمن ها (این کار ممکن است مدتی طول بکشد)");
+define("_AM_NEWBB_CATEGORYDELETED","شاخه پاک شد.");
+define("_AM_NEWBB_MOVE2CAT","بردن به شاخه:");
+define("_AM_NEWBB_MAKE_SUBFORUM_OF","ایجاد زیرانجمن:");
+define("_AM_NEWBB_MSG_FORUM_MOVED","انجمن منتقل شد.");
+define("_AM_NEWBB_MSG_ERR_FORUM_MOVED","ناتوانی در بردن انجمن.");
+define("_AM_NEWBB_SELECT","< انتخاب >");
+define("_AM_NEWBB_MOVETHISFORUM","این انجمن را منتقل کن");
+define("_AM_NEWBB_MERGE","ادغام");
+define("_AM_NEWBB_MERGETHISFORUM","این انجمن را ادغام کن");
+define("_AM_NEWBB_MERGETO_FORUM","این انجمن را ادغام کن به:");
+define("_AM_NEWBB_MSG_FORUM_MERGED","انجمن ادغام شد!");
+define("_AM_NEWBB_MSG_ERR_FORUM_MERGED","خطا در ادغام انجمن!");
+
+//%%%%%% File Name admin_forum_reorder.php %%%%%
+define("_AM_NEWBB_REORDERID","ID");
+define("_AM_NEWBB_REORDERTITLE","عنوان");
+define("_AM_NEWBB_REORDERWEIGHT","محل");
+define("_AM_NEWBB_SETFORUMORDER","تغییر محل قرار گیری انجمن در شاخه");
+define("_AM_NEWBB_BOARDREORDER","مکان انجمن تغییر داده شد");
+
+// admin_permission.php
+define("_AM_NEWBB_PERMISSIONS_TO_THIS_FORUM","دسترسی تاپیکها برای این انجمن");
+define("_AM_NEWBB_CAT_ACCESS","میتوانید به شاخه دسترسی داشته باشید");
+define("_AM_NEWBB_CAN_ACCESS","میتوانید به انجمن دسترسی داشته باشید");
+define("_AM_NEWBB_CAN_VIEW","میتوانید مطالب را بخوانید");
+define("_AM_NEWBB_CAN_POST","میتوانید عنوان جدید باز کنید");
+define("_AM_NEWBB_CAN_REPLY","میتوانید به عنوان ها پاسخ دهید");
+define("_AM_NEWBB_CAN_EDIT","میتوانید پیامها ی خودتان را ویرایش کنید");
+define("_AM_NEWBB_CAN_DELETE","میتوانید پیامها ی خودتان را حذف کنید");
+define("_AM_NEWBB_CAN_ADDPOLL","میتوانید نظر سنجی اضافه کنید");
+define("_AM_NEWBB_CAN_VOTE","میتوانید در نظر سنجی ها شرکت کنید");
+define("_AM_NEWBB_CAN_ATTACH","میتوانید فایلها را به پیام خود پیوست کنید");
+define("_AM_NEWBB_CAN_NOAPPROVE","میتوانید پیام بدون نیاز به تایید بزنید");
+define("_AM_NEWBB_CAN_TYPE", "میتوانید نوع تاپیک ها را انتخاب کنید");
+define("_AM_NEWBB_CAN_HTML", "میتوانید از HTML استفاده کنید");
+define("_AM_NEWBB_CAN_SIGNATURE", "میتوانید امضا را فعال/غیر فعال کنید");
+define("_AM_NEWBB_ACTION","عمل");
+define("_AM_NEWBB_PERM_TEMPLATE","تمپلیت دسترسی های پیشفرض");
+define("_AM_NEWBB_PERM_TEMPLATE_DESC","میتواند به یک انجمن اضافه شود");
+define("_AM_NEWBB_PERM_FORUMS","انتخاب انجمن ها");
+define("_AM_NEWBB_PERM_TEMPLATE_CREATED","تمپلیت دسترسی ها ساخته شد");
+define("_AM_NEWBB_PERM_TEMPLATE_ERROR","خطا در حین ساخته شدن تمپلیت دسترسی ها");
+define("_AM_NEWBB_PERM_TEMPLATEAPP","اعمال دسترسی های پیشفرض");
+define("_AM_NEWBB_PERM_TEMPLATE_APPLIED","دسترسی های پیشفرض در انجمن ها اعمال شد");
+define("_AM_NEWBB_PERM_ACTION","عمل های دسترسی ها");
+define("_AM_NEWBB_PERM_SETBYGROUP","اعمال دسترسی برای گروه ها به صورت مستقیم");
+
+// admin_forum_prune.php
+define ("_AM_NEWBB_PRUNE_RESULTS_TITLE","نتیجهی هرسکردن");
+define ("_AM_NEWBB_PRUNE_RESULTS_TOPICS","تاپیک های هرس شده");
+define ("_AM_NEWBB_PRUNE_RESULTS_POSTS","پستهای هرس شده");
+define ("_AM_NEWBB_PRUNE_RESULTS_FORUMS","انجمنهای هرس شده");
+define ("_AM_NEWBB_PRUNE_STORE","به جای حذف کردن آن در این انجمن قرارشان بده:");
+define ("_AM_NEWBB_PRUNE_ARCHIVE","یک کپی از پستها در آرشیو نگه دار");
+define ("_AM_NEWBB_PRUNE_FORUMSELERROR","شما فراموش کردهاید که انجمنی را برای هرس انتخاب کنید.");
+define ("_AM_NEWBB_PRUNE_DAYS","پاک کردن تاپیک بدون پاسخ در :");
+define ("_AM_NEWBB_PRUNE_FORUMS","انجمنهایی که هرس میشوند:");
+define ("_AM_NEWBB_PRUNE_STICKY","تاپیکهای مهم(Sticky) را حفظ کن.");
+define ("_AM_NEWBB_PRUNE_DIGEST","تاپیک های خلاصه را حفظ کن");
+define ("_AM_NEWBB_PRUNE_LOCK","تاپیکهای قفل را حفظ کن");
+define ("_AM_NEWBB_PRUNE_HOT","تاپیکهایی که بیشتر از این پاسخها را دارند نگه دار");
+define ("_AM_NEWBB_PRUNE_SUBMIT","تایید");
+define ("_AM_NEWBB_PRUNE_RESET","تنظیم دوباره");
+define ("_AM_NEWBB_PRUNE_YES","بله");
+define ("_AM_NEWBB_PRUNE_NO","نه");
+define ("_AM_NEWBB_PRUNE_WEEK","یک هفته");
+define ("_AM_NEWBB_PRUNE_2WEEKS","دو هفته");
+define ("_AM_NEWBB_PRUNE_MONTH","یک ماه");
+define ("_AM_NEWBB_PRUNE_2MONTH","دو ماه");
+define ("_AM_NEWBB_PRUNE_4MONTH","چهار ماه");
+define ("_AM_NEWBB_PRUNE_YEAR","یک سال");
+define ("_AM_NEWBB_PRUNE_2YEARS","دو سال");
+
+// About.php constants
+define('_AM_NEWBB_AUTHOR_INFO', "اطلاعات نویسنده:");
+define('_AM_NEWBB_AUTHOR_NAME', "نویسنده:");
+define('_AM_NEWBB_AUTHOR_WEBSITE', "وب سایت نویسنده:");
+define('_AM_NEWBB_AUTHOR_EMAIL', "پست الکترونیکی نویسنده:");
+define('_AM_NEWBB_AUTHOR_CREDITS', "اعتبارات");
+define('_AM_NEWBB_MODULE_INFO', "اطلاعات سازندگان ماژول");
+define('_AM_NEWBB_MODULE_STATUS', "وضعیت");
+define('_AM_NEWBB_MODULE_DEMO', "سایت نمایشی");
+define('_AM_NEWBB_MODULE_SUPPORT', "سایت پشتیبان رسمی");
+define('_AM_NEWBB_MODULE_BUG', "گزارش دادن یک باگ برای این ماژول");
+define('_AM_NEWBB_MODULE_FEATURE', "امکانات جدیدی برای این ماژول پیشنهاد کنید.");
+define('_AM_NEWBB_MODULE_DISCLAIMER', "توضیحات");
+define('_AM_NEWBB_AUTHOR_WORD', "سخن موسس");
+define('_AM_NEWBB_BY','توسط');
+define('_AM_NEWBB_AUTHOR_WORD_EXTRA', "
+");
+
+// admin_report.php
+define("_AM_NEWBB_REPORTADMIN","مدیریت پیام های گزارش شده");
+define("_AM_NEWBB_PROCESSEDREPORT","دیدن پاسخ ارسال شده توسط ناظر به گزارش فرستاده شده");
+define("_AM_NEWBB_PROCESSREPORT","گزارش های ارسال شده");
+define("_AM_NEWBB_REPORTTITLE","عنوان گزارش");
+define("_AM_NEWBB_REPORTEXTRA","بخش اضافی");
+define("_AM_NEWBB_REPORTPOST","پیام گزارش شده");
+define("_AM_NEWBB_REPORTTEXT","متن گزارش ارسال شده");
+define("_AM_NEWBB_REPORTMEMO","Process memo");
+
+// admin_report.php
+define("_AM_NEWBB_DIGESTADMIN","مدیریت خلاصه ها");
+define("_AM_NEWBB_DIGESTCONTENT","متن خلاصه ها");
+
+// admin_votedata.php
+define("_AM_NEWBB_VOTE_RATINGINFOMATION", "اطلاعات ارزش گذاری");
+define("_AM_NEWBB_VOTE_TOTALVOTES", "همه رای ها: ");
+define("_AM_NEWBB_VOTE_REGUSERVOTES", "رای های کاربران عضو: %s");
+define("_AM_NEWBB_VOTE_ANONUSERVOTES", "رای های کاربران مهمان: %s");
+define("_AM_NEWBB_VOTE_USER", "کاربر");
+define("_AM_NEWBB_VOTE_IP", "آدرس IP");
+define("_AM_NEWBB_VOTE_USERAVG", "متوسط ارزش گذاری کاربران");
+define("_AM_NEWBB_VOTE_TOTALRATE", "همه ارزش گذاری ها");
+define("_AM_NEWBB_VOTE_DATE", "ارسال شده ها");
+define("_AM_NEWBB_VOTE_RATING", "ارزش");
+define("_AM_NEWBB_VOTE_NOREGVOTES", "هیچ کاربر عضوی رای نداده است");
+define("_AM_NEWBB_VOTE_NOUNREGVOTES", "هیچ کاربر مهمانی رای نداده است");
+define("_AM_NEWBB_VOTEDELETED", "اطلاعات ارزش گذاری حذف شد.");
+define("_AM_NEWBB_VOTE_ID", "ID");
+define("_AM_NEWBB_VOTE_FILETITLE", "نام تاپیک");
+define("_AM_NEWBB_VOTE_DISPLAYVOTES", "اطلاعات ارزش گذاری");
+define("_AM_NEWBB_VOTE_NOVOTES", "هیچ رایی برای نشان دادن نیست");
+define("_AM_NEWBB_VOTE_DELETE", "هیچ رایی برای نشان دادن نیست");
+define("_AM_NEWBB_VOTE_DELETEDSC", "رای های انتخاب شده از دیتابیس <b>حذف شدند</b>");
+
+// admin_type_manager.php
+define("_AM_NEWBB_TYPE_ADD", "نوع ها را اضافه کنید");
+define("_AM_NEWBB_TYPE_TEMPLATE", "تمپلیت نوع");
+define("_AM_NEWBB_TYPE_TEMPLATE_APPLY", "اعمال کردن تمپلیت");
+define("_AM_NEWBB_TYPE_FORUM", "نوع برای هر انجمن");
+define("_AM_NEWBB_TYPE_NAME", "عنوان نوع");
+define("_AM_NEWBB_TYPE_COLOR", "رنگ");
+define("_AM_NEWBB_TYPE_DESCRIPTION", "شرح");
+define("_AM_NEWBB_TYPE_ORDER", "ترتیب");
+define("_AM_NEWBB_TYPE_LIST", "فهرست نوع ها");
+define("_AM_NEWBB_TODEL_TYPE", "آیا مطمان هستید که میخواهید نوع [%s] را حذف کنید؟");
+define("_AM_NEWBB_TYPE_EDITFORUM_DESC", "اطلاعات هنوز ذخیره نشده اند. باید روی دکمه ارسال بزنید تا ذخیره شوند.");
+define("_AM_NEWBB_TYPE_ORDER_DESC", "برای فعال کردن یک نوع برای یک انجمن، یک عدد بالاتر از 0 را برای ترتیب نوع 'type_order' انتخاب کنید. به عبارت دیگر اگر ترتیب نوع 'type_order' را 0 انتخاب کنید، آن نوع برای آن انجمن غیر فعال خواهد شد");
+
+// admin_synchronization.php
+define("_AM_NEWBB_SYNC_TYPE_FORUM", "داده های انجمن");
+define("_AM_NEWBB_SYNC_TYPE_TOPIC", "داده های تاپیک");
+define("_AM_NEWBB_SYNC_TYPE_POST", "داده های پست");
+define("_AM_NEWBB_SYNC_TYPE_USER", "داده های کاربر");
+define("_AM_NEWBB_SYNC_TYPE_STATS", "اطلاعات آماری");
+define("_AM_NEWBB_SYNC_TYPE_MISC", "گوناگون");
+define("_AM_NEWBB_SYNC_ITEMS", "گزینه های انتخاب برای هر حلقه: ");
+define("_AM_NEWBB_ALLOW_SUBJECT_PREFIX", "پیشوند های تاپیک هم به عنوان تاپیک اضافه شوند؟");
+define("_AM_NEWBB_ALLOW_SUBJECT_PREFIX_DESC", "اجازه میدهد که پیشوند های انتخاب شده برای تاپیک ها به عنوان تاپیک اضافه شوند.");
+define("_AM_NEWBB_GROUPMOD_TITLE","اضافه کردن ناظر برای انجمن ها بر مبنای یک گروه");
+define("_AM_NEWBB_GROUPMOD_TITLEDESC","به شما اجازه میدهد که کل اعضای یگ گروه را به عنوان ناظر به انجمن اضافه کنید.");
+define("_AM_NEWBB_GROUPMOD_ALLFORUMS","همه انجمن ها");
+define("_AM_NEWBB_GROUPMOD_ADDMOD","ناظر ها با موفقیت به انجمن ها اضافه شدند.");
+define("_AM_NEWBB_GROUPMOD_ERRMOD","یک خطا رخ داده است!");
+?>
\ No newline at end of file
Added: XoopsModules/newbb/branches/irmtfan/newbb/language/persian/blocks.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/language/persian/blocks.php (rev 0)
+++ XoopsModules/newbb/branches/irmtfan/newbb/language/persian/blocks.php 2012-07-30 11:25:09 UTC (rev 9948)
@@ -0,0 +1,40 @@
+<?php
+// $Id: blocks.php,v 1.3 2005/10/19 17:20:33 phppp Exp $
+// Blocks
+if(defined('_MB_NEWBB_DEFINED')) return;
+else define('_MB_NEWBB_DEFINED',true);
+
+define("_MB_NEWBB_FORUM","انجمن");
+define("_MB_NEWBB_TOPIC","عنوان");
+define("_MB_NEWBB_RPLS","پاسخ ها");
+define("_MB_NEWBB_VIEWS","تعداد بازدید");
+define("_MB_NEWBB_LPOST","آخرین ارسال");
+define("_MB_NEWBB_VSTFRMS"," بازدید انجمنها");
+define("_MB_NEWBB_DISPLAY","تعداد در بلاک: ");
+define("_MB_NEWBB_DISPLAYMODE","نوع نمایش: ");
+define("_MB_NEWBB_DISPLAYMODE_FULL","کامل");
+define("_MB_NEWBB_DISPLAYMODE_COMPACT","فشرده");
+define("_MB_NEWBB_DISPLAYMODE_LITE","سبک");
+define("_MB_NEWBB_FORUMLIST","لیست انجمن های مجاز برای قرار گرفتن در بلاک");
+define("_MB_NEWBB_ALLTOPICS","همه عنوان ها");
+define("_MB_NEWBB_ALLPOSTS","همه پست ها");
+define("_MB_NEWBB_CRITERIA","معیار ها برای نمایش");
+define("_MB_NEWBB_CRITERIA_TOPIC","عنوان ها");
+define("_MB_NEWBB_CRITERIA_POST","پست ها");
+define("_MB_NEWBB_CRITERIA_TIME","جدید ترین ها");
+define("_MB_NEWBB_CRITERIA_TITLE","عنوان پست");
+define("_MB_NEWBB_CRITERIA_TEXT","متن پست");
+define("_MB_NEWBB_CRITERIA_VIEWS","پر بیننده");
+define("_MB_NEWBB_CRITERIA_REPLIES","دارای بیشترین پایخ");
+define("_MB_NEWBB_CRITERIA_DIGEST","جدیدترین خلاصه ها");
+define("_MB_NEWBB_CRITERIA_STICKY","جدید ترین چسبان ها");
+define("_MB_NEWBB_CRITERIA_DIGESTS","دارای بیشترین خلاصه");
+define("_MB_NEWBB_CRITERIA_STICKYS","دارای بیشترین چسبان");
+define("_MB_NEWBB_TIME","بازه زمانی");
+define("_MB_NEWBB_TIME_DESC","عدد های مثبت برای روز ها و عدد های منفی برای ساعت ها هستند");
+define("_MB_NEWBB_TITLE","عنوان");
+define("_MB_NEWBB_AUTHOR","نویسنده");
+define("_MB_NEWBB_COUNT","تعداد");
+define("_MB_NEWBB_INDEXNAV","هدایت گر را نشان بده");
+define("_MB_NEWBB_TITLE_LENGTH","طول عنوان/پیام");
+?>
\ No newline at end of file
Added: XoopsModules/newbb/branches/irmtfan/newbb/language/persian/index.html
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/language/persian/index.html (rev 0)
+++ XoopsModules/newbb/branches/irmtfan/newbb/language/persian/index.html 2012-07-30 11:25:09 UTC (rev 9948)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/newbb/branches/irmtfan/newbb/language/persian/mail_template/forum_newpost_notify.tpl
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/language/persian/mail_template/forum_newpost_notify.tpl (rev 0)
+++ XoopsModules/newbb/branches/irmtfan/newbb/language/persian/mail_template/forum_newpost_notify.tpl 2012-07-30 11:25:09 UTC (rev 9948)
@@ -0,0 +1,20 @@
+agar matne farsi ra nemibinid baraye didane matne farsi rooye in safhe click rast konid va sepas Encoding --> Unicode (UTF-8) ra entekhab konid
+سلام {X_UNAME},
+
+يک پست جديد در انجمن"{FORUM_NAME}" زده شده است.
+
+براي ديدن متن پست لينک زير را بزنيد:
+{POST_URL}
+
+-----------
+
+شما اين پيام را دريافت کرديد زيرا شما آگهي رساني براي پست هاي جديد در اين انجمن را فعال کرده ايد
+
+اگر فکر ميکنيد اين پيام اشتباهي براي شما ارسال شده است لطفا تنظيمات آگهي رساني خود را در لينک زير تغيير دهيد
+{X_UNSUBSCRIBE_URL}
+
+-----------
+
+{X_SITENAME} ({X_SITEURL})
+مدير سايت
+{X_ADMINMAIL}
Added: XoopsModules/newbb/branches/irmtfan/newbb/language/persian/mail_template/forum_newthread_notify.tpl
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/language/persian/mail_template/forum_newthread_notify.tpl (rev 0)
+++ XoopsModules/newbb/bra...
[truncated message content] |
|
From: <be...@us...> - 2012-07-30 11:20:30
|
Revision: 9947
http://xoops.svn.sourceforge.net/xoops/?rev=9947&view=rev
Author: beckmi
Date: 2012-07-30 11:20:19 +0000 (Mon, 30 Jul 2012)
Log Message:
-----------
branching Alfred's version
Added Paths:
-----------
XoopsModules/newbb/branches/irmtfan/newbb/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-07-30 11:19:11
|
Revision: 9946
http://xoops.svn.sourceforge.net/xoops/?rev=9946&view=rev
Author: beckmi
Date: 2012-07-30 11:19:02 +0000 (Mon, 30 Jul 2012)
Log Message:
-----------
deleting files
Removed Paths:
-------------
XoopsModules/newbb/branches/irmtfan/newbb/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-07-30 11:05:04
|
Revision: 9945
http://xoops.svn.sourceforge.net/xoops/?rev=9945&view=rev
Author: beckmi
Date: 2012-07-30 11:04:51 +0000 (Mon, 30 Jul 2012)
Log Message:
-----------
Adding branch for Irmtfan
Added Paths:
-----------
XoopsModules/newbb/branches/irmtfan/
XoopsModules/newbb/branches/irmtfan/newbb/
XoopsModules/newbb/branches/irmtfan/newbb/_htaccess
XoopsModules/newbb/branches/irmtfan/newbb/action.post.php
XoopsModules/newbb/branches/irmtfan/newbb/action.topic.php
XoopsModules/newbb/branches/irmtfan/newbb/admin/
XoopsModules/newbb/branches/irmtfan/newbb/admin/about.php
XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_blocks.php
XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_cat_manager.php
XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_digest.php
XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_forum_manager.php
XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_forum_prune.php
XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_forum_reorder.php
XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_groupmod.php
XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_header.php
XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_permissions.php
XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_report.php
XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_synchronization.php
XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_type_manager.php
XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_votedata.php
XoopsModules/newbb/branches/irmtfan/newbb/admin/index.html
XoopsModules/newbb/branches/irmtfan/newbb/admin/index.php
XoopsModules/newbb/branches/irmtfan/newbb/admin/menu.php
XoopsModules/newbb/branches/irmtfan/newbb/blocks/
XoopsModules/newbb/branches/irmtfan/newbb/blocks/index.html
XoopsModules/newbb/branches/irmtfan/newbb/blocks/newbb_block.php
XoopsModules/newbb/branches/irmtfan/newbb/blocks/newbb_block_tag.php
XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev9883.txt
XoopsModules/newbb/branches/irmtfan/newbb/class/
XoopsModules/newbb/branches/irmtfan/newbb/class/category.php
XoopsModules/newbb/branches/irmtfan/newbb/class/digest.php
XoopsModules/newbb/branches/irmtfan/newbb/class/forum.php
XoopsModules/newbb/branches/irmtfan/newbb/class/icon.php
XoopsModules/newbb/branches/irmtfan/newbb/class/index.html
XoopsModules/newbb/branches/irmtfan/newbb/class/karma.php
XoopsModules/newbb/branches/irmtfan/newbb/class/moderate.php
XoopsModules/newbb/branches/irmtfan/newbb/class/newbbtree.php
XoopsModules/newbb/branches/irmtfan/newbb/class/online.php
XoopsModules/newbb/branches/irmtfan/newbb/class/permission.category.php
XoopsModules/newbb/branches/irmtfan/newbb/class/permission.forum.php
XoopsModules/newbb/branches/irmtfan/newbb/class/permission.php
XoopsModules/newbb/branches/irmtfan/newbb/class/post.php
XoopsModules/newbb/branches/irmtfan/newbb/class/rate.php
XoopsModules/newbb/branches/irmtfan/newbb/class/read.php
XoopsModules/newbb/branches/irmtfan/newbb/class/readforum.php
XoopsModules/newbb/branches/irmtfan/newbb/class/readtopic.php
XoopsModules/newbb/branches/irmtfan/newbb/class/report.php
XoopsModules/newbb/branches/irmtfan/newbb/class/stats.php
XoopsModules/newbb/branches/irmtfan/newbb/class/text.php
XoopsModules/newbb/branches/irmtfan/newbb/class/topic.php
XoopsModules/newbb/branches/irmtfan/newbb/class/topic.renderer.php
XoopsModules/newbb/branches/irmtfan/newbb/class/tree.php
XoopsModules/newbb/branches/irmtfan/newbb/class/type.php
XoopsModules/newbb/branches/irmtfan/newbb/class/uploader.php
XoopsModules/newbb/branches/irmtfan/newbb/class/user.php
XoopsModules/newbb/branches/irmtfan/newbb/class/userstats.php
XoopsModules/newbb/branches/irmtfan/newbb/class/xmlrss.php
XoopsModules/newbb/branches/irmtfan/newbb/class/xoopsformloader.php
XoopsModules/newbb/branches/irmtfan/newbb/delete.php
XoopsModules/newbb/branches/irmtfan/newbb/digest.php
XoopsModules/newbb/branches/irmtfan/newbb/dl_attachment.php
XoopsModules/newbb/branches/irmtfan/newbb/docs/
XoopsModules/newbb/branches/irmtfan/newbb/docs/changelog.txt
XoopsModules/newbb/branches/irmtfan/newbb/docs/gpl.txt
XoopsModules/newbb/branches/irmtfan/newbb/docs/index.html
XoopsModules/newbb/branches/irmtfan/newbb/edit.php
XoopsModules/newbb/branches/irmtfan/newbb/header.php
XoopsModules/newbb/branches/irmtfan/newbb/images/
XoopsModules/newbb/branches/irmtfan/newbb/images/category/
XoopsModules/newbb/branches/irmtfan/newbb/images/category/blank.gif
XoopsModules/newbb/branches/irmtfan/newbb/images/category/cbb.png
XoopsModules/newbb/branches/irmtfan/newbb/images/category/index.html
XoopsModules/newbb/branches/irmtfan/newbb/images/category/topxoops.png
XoopsModules/newbb/branches/irmtfan/newbb/images/category/xoops-cn.png
XoopsModules/newbb/branches/irmtfan/newbb/images/cbb.png
XoopsModules/newbb/branches/irmtfan/newbb/images/filetypes/
XoopsModules/newbb/branches/irmtfan/newbb/images/filetypes/ace.gif
XoopsModules/newbb/branches/irmtfan/newbb/images/filetypes/avi.gif
XoopsModules/newbb/branches/irmtfan/newbb/images/filetypes/bmp.gif
XoopsModules/newbb/branches/irmtfan/newbb/images/filetypes/doc.gif
XoopsModules/newbb/branches/irmtfan/newbb/images/filetypes/exe.gif
XoopsModules/newbb/branches/irmtfan/newbb/images/filetypes/flash.gif
XoopsModules/newbb/branches/irmtfan/newbb/images/filetypes/gif.gif
XoopsModules/newbb/branches/irmtfan/newbb/images/filetypes/html.gif
XoopsModules/newbb/branches/irmtfan/newbb/images/filetypes/jpeg.gif
XoopsModules/newbb/branches/irmtfan/newbb/images/filetypes/jpg.gif
XoopsModules/newbb/branches/irmtfan/newbb/images/filetypes/mid.gif
XoopsModules/newbb/branches/irmtfan/newbb/images/filetypes/mov.gif
XoopsModules/newbb/branches/irmtfan/newbb/images/filetypes/mp3.gif
XoopsModules/newbb/branches/irmtfan/newbb/images/filetypes/mpg.gif
XoopsModules/newbb/branches/irmtfan/newbb/images/filetypes/netscape.gif
XoopsModules/newbb/branches/irmtfan/newbb/images/filetypes/pdf.gif
XoopsModules/newbb/branches/irmtfan/newbb/images/filetypes/png.gif
XoopsModules/newbb/branches/irmtfan/newbb/images/filetypes/ppt.gif
XoopsModules/newbb/branches/irmtfan/newbb/images/filetypes/rar.gif
XoopsModules/newbb/branches/irmtfan/newbb/images/filetypes/txt.gif
XoopsModules/newbb/branches/irmtfan/newbb/images/filetypes/unknown.gif
XoopsModules/newbb/branches/irmtfan/newbb/images/filetypes/wav.gif
XoopsModules/newbb/branches/irmtfan/newbb/images/filetypes/xls.gif
XoopsModules/newbb/branches/irmtfan/newbb/images/filetypes/zip.gif
XoopsModules/newbb/branches/irmtfan/newbb/images/menu/
XoopsModules/newbb/branches/irmtfan/newbb/images/menu/about.png
XoopsModules/newbb/branches/irmtfan/newbb/images/menu/blocks.png
XoopsModules/newbb/branches/irmtfan/newbb/images/menu/cat.png
XoopsModules/newbb/branches/irmtfan/newbb/images/menu/digest.png
XoopsModules/newbb/branches/irmtfan/newbb/images/menu/forum.png
XoopsModules/newbb/branches/irmtfan/newbb/images/menu/groupmod.png
XoopsModules/newbb/branches/irmtfan/newbb/images/menu/home.png
XoopsModules/newbb/branches/irmtfan/newbb/images/menu/index.html
XoopsModules/newbb/branches/irmtfan/newbb/images/menu/order.png
XoopsModules/newbb/branches/irmtfan/newbb/images/menu/permissions.png
XoopsModules/newbb/branches/irmtfan/newbb/images/menu/prefs.png
XoopsModules/newbb/branches/irmtfan/newbb/images/menu/prune.png
XoopsModules/newbb/branches/irmtfan/newbb/images/menu/report.png
XoopsModules/newbb/branches/irmtfan/newbb/images/menu/synchronization.png
XoopsModules/newbb/branches/irmtfan/newbb/images/menu/type.png
XoopsModules/newbb/branches/irmtfan/newbb/images/menu/votedata.png
XoopsModules/newbb/branches/irmtfan/newbb/images/xoopsbb_slogo.png
XoopsModules/newbb/branches/irmtfan/newbb/include/
XoopsModules/newbb/branches/irmtfan/newbb/include/form.forum.php
XoopsModules/newbb/branches/irmtfan/newbb/include/form.post.php
XoopsModules/newbb/branches/irmtfan/newbb/include/functions.config.php
XoopsModules/newbb/branches/irmtfan/newbb/include/functions.forum.php
XoopsModules/newbb/branches/irmtfan/newbb/include/functions.image.php
XoopsModules/newbb/branches/irmtfan/newbb/include/functions.ini.php
XoopsModules/newbb/branches/irmtfan/newbb/include/functions.language.php
XoopsModules/newbb/branches/irmtfan/newbb/include/functions.php
XoopsModules/newbb/branches/irmtfan/newbb/include/functions.read.php
XoopsModules/newbb/branches/irmtfan/newbb/include/functions.recon.php
XoopsModules/newbb/branches/irmtfan/newbb/include/functions.render.php
XoopsModules/newbb/branches/irmtfan/newbb/include/functions.rpc.php
XoopsModules/newbb/branches/irmtfan/newbb/include/functions.session.php
XoopsModules/newbb/branches/irmtfan/newbb/include/functions.stats.php
XoopsModules/newbb/branches/irmtfan/newbb/include/functions.time.php
XoopsModules/newbb/branches/irmtfan/newbb/include/functions.topic.php
XoopsModules/newbb/branches/irmtfan/newbb/include/functions.user.php
XoopsModules/newbb/branches/irmtfan/newbb/include/functions.welcome.inc.php
XoopsModules/newbb/branches/irmtfan/newbb/include/functions.welcome.php
XoopsModules/newbb/branches/irmtfan/newbb/include/images.php
XoopsModules/newbb/branches/irmtfan/newbb/include/index.html
XoopsModules/newbb/branches/irmtfan/newbb/include/js/
XoopsModules/newbb/branches/irmtfan/newbb/include/js/newbb_browserdetect.js
XoopsModules/newbb/branches/irmtfan/newbb/include/js/newbb_dynMenu.js
XoopsModules/newbb/branches/irmtfan/newbb/include/js/newbb_menu_click.js
XoopsModules/newbb/branches/irmtfan/newbb/include/js/newbb_tip.js
XoopsModules/newbb/branches/irmtfan/newbb/include/js/newbb_tipstyle.js
XoopsModules/newbb/branches/irmtfan/newbb/include/js/newbb_toggle.js
XoopsModules/newbb/branches/irmtfan/newbb/include/module.php
XoopsModules/newbb/branches/irmtfan/newbb/include/module.v100.php
XoopsModules/newbb/branches/irmtfan/newbb/include/module.v220.php
XoopsModules/newbb/branches/irmtfan/newbb/include/module.v400.php
XoopsModules/newbb/branches/irmtfan/newbb/include/newbb.htc
XoopsModules/newbb/branches/irmtfan/newbb/include/notification.inc.php
XoopsModules/newbb/branches/irmtfan/newbb/include/plugin.dist.php
XoopsModules/newbb/branches/irmtfan/newbb/include/plugin.php
XoopsModules/newbb/branches/irmtfan/newbb/include/plugin.tag.php
XoopsModules/newbb/branches/irmtfan/newbb/include/pngbehavior.htc
XoopsModules/newbb/branches/irmtfan/newbb/include/search.inc.php
XoopsModules/newbb/branches/irmtfan/newbb/include/sitemap.plugin.php
XoopsModules/newbb/branches/irmtfan/newbb/include/vars.php
XoopsModules/newbb/branches/irmtfan/newbb/index.php
XoopsModules/newbb/branches/irmtfan/newbb/language/
XoopsModules/newbb/branches/irmtfan/newbb/language/english/
XoopsModules/newbb/branches/irmtfan/newbb/language/english/admin.php
XoopsModules/newbb/branches/irmtfan/newbb/language/english/blocks.php
XoopsModules/newbb/branches/irmtfan/newbb/language/english/index.html
XoopsModules/newbb/branches/irmtfan/newbb/language/english/mail_template/
XoopsModules/newbb/branches/irmtfan/newbb/language/english/mail_template/forum_newpost_notify.tpl
XoopsModules/newbb/branches/irmtfan/newbb/language/english/mail_template/forum_newthread_notify.tpl
XoopsModules/newbb/branches/irmtfan/newbb/language/english/mail_template/forum_report.tpl
XoopsModules/newbb/branches/irmtfan/newbb/language/english/mail_template/global_digest_notify.tpl
XoopsModules/newbb/branches/irmtfan/newbb/language/english/mail_template/global_newforum_notify.tpl
XoopsModules/newbb/branches/irmtfan/newbb/language/english/mail_template/global_newfullpost_notify.tpl
XoopsModules/newbb/branches/irmtfan/newbb/language/english/mail_template/global_newpost_notify.tpl
XoopsModules/newbb/branches/irmtfan/newbb/language/english/mail_template/thread_newpost_notify.tpl
XoopsModules/newbb/branches/irmtfan/newbb/language/english/main.php
XoopsModules/newbb/branches/irmtfan/newbb/language/english/modinfo.php
XoopsModules/newbb/branches/irmtfan/newbb/language/index.html
XoopsModules/newbb/branches/irmtfan/newbb/language/persian/
XoopsModules/newbb/branches/irmtfan/newbb/language/persian/admin.php
XoopsModules/newbb/branches/irmtfan/newbb/language/persian/blocks.php
XoopsModules/newbb/branches/irmtfan/newbb/language/persian/index.html
XoopsModules/newbb/branches/irmtfan/newbb/language/persian/mail_template/
XoopsModules/newbb/branches/irmtfan/newbb/language/persian/mail_template/forum_newpost_notify.tpl
XoopsModules/newbb/branches/irmtfan/newbb/language/persian/mail_template/forum_newthread_notify.tpl
XoopsModules/newbb/branches/irmtfan/newbb/language/persian/mail_template/global_digest_notify.tpl
XoopsModules/newbb/branches/irmtfan/newbb/language/persian/mail_template/global_newforum_notify.tpl
XoopsModules/newbb/branches/irmtfan/newbb/language/persian/mail_template/global_newfullpost_notify.tpl
XoopsModules/newbb/branches/irmtfan/newbb/language/persian/mail_template/global_newpost_notify.tpl
XoopsModules/newbb/branches/irmtfan/newbb/language/persian/mail_template/thread_newpost_notify.tpl
XoopsModules/newbb/branches/irmtfan/newbb/language/persian/main.php
XoopsModules/newbb/branches/irmtfan/newbb/language/persian/modinfo.php
XoopsModules/newbb/branches/irmtfan/newbb/list.tag.php
XoopsModules/newbb/branches/irmtfan/newbb/list.topic.php
XoopsModules/newbb/branches/irmtfan/newbb/makepdf.php
XoopsModules/newbb/branches/irmtfan/newbb/moderate.php
XoopsModules/newbb/branches/irmtfan/newbb/newtopic.php
XoopsModules/newbb/branches/irmtfan/newbb/notification_update.php
XoopsModules/newbb/branches/irmtfan/newbb/polls.php
XoopsModules/newbb/branches/irmtfan/newbb/post.php
XoopsModules/newbb/branches/irmtfan/newbb/print.php
XoopsModules/newbb/branches/irmtfan/newbb/ratethread.php
XoopsModules/newbb/branches/irmtfan/newbb/reply.php
XoopsModules/newbb/branches/irmtfan/newbb/report.php
XoopsModules/newbb/branches/irmtfan/newbb/rss.php
XoopsModules/newbb/branches/irmtfan/newbb/search.php
XoopsModules/newbb/branches/irmtfan/newbb/seo.php
XoopsModules/newbb/branches/irmtfan/newbb/seo_url.php
XoopsModules/newbb/branches/irmtfan/newbb/sql/
XoopsModules/newbb/branches/irmtfan/newbb/sql/index.html
XoopsModules/newbb/branches/irmtfan/newbb/sql/mysql.304.sql
XoopsModules/newbb/branches/irmtfan/newbb/sql/mysql.400.sql
XoopsModules/newbb/branches/irmtfan/newbb/sql/mysql.430.sql
XoopsModules/newbb/branches/irmtfan/newbb/sql/mysql.sql
XoopsModules/newbb/branches/irmtfan/newbb/sql/upgrade_230.sql
XoopsModules/newbb/branches/irmtfan/newbb/templates/
XoopsModules/newbb/branches/irmtfan/newbb/templates/blocks/
XoopsModules/newbb/branches/irmtfan/newbb/templates/blocks/index.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/blocks/newbb_block.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/blocks/newbb_block_author.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/blocks/newbb_block_post.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/blocks/newbb_block_text.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/blocks/newbb_block_topic.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/blocks/newbb_tag_block_cloud.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/blocks/newbb_tag_block_top.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/Thumbs.db
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/admin_delete.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/admin_edit.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/admin_merge.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/admin_move.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/anonym.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/attachment.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/blank.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/blank.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/buzz.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/delicious.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/digg.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/document.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/down.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/facebook.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/forum.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/forum_new.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/friendfeed.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/googleplus.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/index.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/lastposticon.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/linkedin.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/minus.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/more.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/new_forum.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/next.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/pdf.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/plus.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/poll.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/post.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/previous.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/printer.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/rate1.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/rate2.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/rate3.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/rate4.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/rate5.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/reddit.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/rss.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/spacer-a.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/statistik.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/stumbleupon.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/subforum.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/technorati.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/topic.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/topic_digest.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/topic_hot.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/topic_hot_new.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/topic_locked.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/topic_my.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/topic_new.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/topic_sticky.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/twitter.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/up.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/whosonline.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/icon/wong.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/index.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/english/
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/english/Thumbs.db
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/english/index.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/english/new_forum.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/english/new_subforum.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/english/offline.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/english/online.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/english/p_bann.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/english/p_delete.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/english/p_edit.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/english/p_pdf.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/english/p_quote.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/english/p_reply.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/english/p_report.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/english/t_new.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/english/t_poll.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/english/t_qr.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/english/t_reply.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/index.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/Thumbs.db
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/index.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/new_forum.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/new_forum.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/new_subforum.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/new_subforum.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/offline.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/offline.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/online-a.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/online.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/p_bann.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/p_delete-a.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/p_delete.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/p_edit-a.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/p_edit.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/p_quote-a.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/p_quote.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/p_reply-a.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/p_reply.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/p_report-a.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/p_report.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/p_up-a.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/p_up.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/t_new-a.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/t_new.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/t_poll-a.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/t_poll.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/t_qr-a.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/t_qr.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/t_reply-a.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/t_reply.png
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/mime/
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/mime/ace.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/mime/avi.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/mime/bmp.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/mime/doc.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/mime/exe.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/mime/flash.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/mime/gif.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/mime/html.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/mime/jpeg.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/mime/jpg.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/mime/mid.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/mime/mov.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/mime/mp3.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/mime/mpg.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/mime/netscape.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/mime/pdf.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/mime/png.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/mime/ppt.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/mime/rar.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/mime/txt.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/mime/unknown.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/mime/wav.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/mime/xls.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/mime/zip.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/rpg/
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/rpg/blue.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/rpg/green.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/rpg/img_backing.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/rpg/img_left.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/rpg/img_right.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/rpg/orange.gif
XoopsModules/newbb/branches/irmtfan/newbb/templates/index.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_edit_post.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_index.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_index_menu.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_notification_select.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_online.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_poll_results.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_poll_view.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_rss.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_search.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_searchresults.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_thread.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewall.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewforum.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewforum_menu.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewforum_subforum.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewpost.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewtopic.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/style.css
XoopsModules/newbb/branches/irmtfan/newbb/topicmanager.php
XoopsModules/newbb/branches/irmtfan/newbb/update_type.php
XoopsModules/newbb/branches/irmtfan/newbb/view.tag.php
XoopsModules/newbb/branches/irmtfan/newbb/viewforum.php
XoopsModules/newbb/branches/irmtfan/newbb/viewpost.php
XoopsModules/newbb/branches/irmtfan/newbb/viewtopic.php
XoopsModules/newbb/branches/irmtfan/newbb/votepolls.php
XoopsModules/newbb/branches/irmtfan/newbb/xoops_version.php
Added: XoopsModules/newbb/branches/irmtfan/newbb/_htaccess
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/_htaccess (rev 0)
+++ XoopsModules/newbb/branches/irmtfan/newbb/_htaccess 2012-07-30 11:04:51 UTC (rev 9945)
@@ -0,0 +1,3 @@
+RewriteEngine on
+RewriteRule ^([a-z]+)-([0-9]+)(/(.+))? seo.php?seoOp=$1&seoArg=$2&seoOther=$4&%{QUERY_STRING} [L]
+RewriteRule ^(.*)$ $1 [L]
Added: XoopsModules/newbb/branches/irmtfan/newbb/action.post.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/action.post.php (rev 0)
+++ XoopsModules/newbb/branches/irmtfan/newbb/action.post.php 2012-07-30 11:04:51 UTC (rev 9945)
@@ -0,0 +1,212 @@
+<?php
+/**
+ * CBB 4.0, or newbb, the forum module for XOOPS project
+ *
+ * @copyright The XOOPS Project http://xoops.sf.net
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Taiwen Jiang (phppp or D.J.) <ph...@us...>
+ * @since 4.00
+ * @version $Id $
+ * @package module::newbb
+ */
+include_once dirname(__FILE__) . "/header.php";
+
+$topic_id = isset($_POST['topic_id']) ? intval($_POST['topic_id']) : 0;
+$post_id = !empty($_GET['post_id']) ? intval($_GET['post_id']) : 0;
+$post_id = !empty($_POST['post_id']) ? $_POST['post_id'] : $post_id;
+$uid = !empty($_POST['uid']) ? $_POST['uid'] : 0;
+$op = !empty($_GET['op']) ? $_GET['op'] : (!empty($_POST['op']) ? $_POST['op']:"");
+$op = in_array($op, array("approve", "delete", "restore", "split"))? $op : "";
+$mode = !empty($_GET['mode']) ? intval($_GET['mode']) : 1;
+
+if ( empty($post_id) || empty($op)) {
+ redirect_header("javascript:history.go(-1);", 2, _MD_NORIGHTTOACCESS);
+ exit();
+}
+
+
+$post_handler =& xoops_getmodulehandler('post', 'newbb');
+$topic_handler =& xoops_getmodulehandler('topic', 'newbb');
+$forum_handler =& xoops_getmodulehandler('forum', 'newbb');
+if (empty($topic_id)) {
+ $forum_obj = null;
+} else {
+ $topic_obj =& $topic_handler->get($topic_id);
+ $forum_id = $topic_obj->getVar('forum_id');
+ $forum_obj =& $forum_handler->get($forum_id);
+}
+$isadmin = newbb_isAdmin($forum_obj);
+
+if (!$isadmin) {
+ redirect_header("index.php", 2, _MD_NORIGHTTOACCESS);
+ exit();
+}
+
+switch($op) {
+ case "restore":
+ $post_id = array_values($post_id);
+ sort($post_id);
+ $topics = array();
+ $forums = array();
+ foreach ($post_id as $post) {
+ $post_obj =& $post_handler->get($post);
+ if ($post_obj->getVar("topic_id")<1) continue;
+ $post_handler->approve($post_obj,true);
+ $topics[$post_obj->getVar("topic_id")] =1;
+ $forums[$post_obj->getVar("forum_id")] =1;
+ unset($post_obj);
+ }
+ foreach (array_keys($topics) as $topic) {
+ $topic_handler->synchronization($topic);
+ }
+ foreach (array_keys($forums) as $forum) {
+ $forum_handler->synchronization($forum);
+ }
+ break;
+ case "approve":
+ $post_id = array_values($post_id);
+ sort($post_id);
+ $topics=array();
+ $forums=array();
+ $criteria = new Criteria("post_id", "(".implode(",", $post_id).")", "IN");
+ $posts_obj =& $post_handler->getObjects($criteria, true);
+ foreach ($post_id as $post) {
+ $post_obj =& $posts_obj[$post];
+ if (!empty($topic_id) && $topic_id!=$post_obj->getVar("topic_id")) continue;
+ $post_handler->approve($post_obj);
+ $topics[$post_obj->getVar("topic_id")] = $post;
+ $forums[$post_obj->getVar("forum_id")] = 1;
+ }
+ foreach (array_keys($topics) as $topic) {
+ $topic_handler->synchronization($topic);
+ }
+ foreach (array_keys($forums) as $forum) {
+ $forum_handler->synchronization($forum);
+ }
+
+ if (empty($xoopsModuleConfig['notification_enabled'])) break;
+
+ $criteria_topic = new Criteria("topic_id", "(".implode(",", array_keys($topics)).")", "IN");
+ $topic_list =& $topic_handler->getList($criteria_topic, true);
+
+ $criteria_forum = new Criteria("forum_id", "(".implode(",", array_keys($forums)).")", "IN");
+ $forum_list =& $forum_handler->getList($criteria_forum);
+
+ include_once 'include/notification.inc.php';
+ $notification_handler =& xoops_gethandler('notification');
+ foreach ($post_id as $post) {
+ $tags = array();
+ $tags['THREAD_NAME'] = $topic_list[$posts_obj[$post]->getVar("topic_id")];
+ $tags['THREAD_URL'] = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewtopic.php?topic_id=' . $posts_obj[$post]->getVar("topic_id").'&forum=' . $posts_obj[$post]->getVar('forum_id');
+ $tags['FORUM_NAME'] = $forum_list[$posts_obj[$post]->getVar('forum_id')];
+ $tags['FORUM_URL'] = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewforum.php?forum=' . $posts_obj[$post]->getVar('forum_id');
+ $tags['POST_URL'] = $tags['THREAD_URL'].'#forumpost' . $post;
+ $notification_handler->triggerEvent('thread', $posts_obj[$post]->getVar("topic_id"), 'new_post', $tags);
+ $notification_handler->triggerEvent('forum', $posts_obj[$post]->getVar('forum_id'), 'new_post', $tags);
+ $notification_handler->triggerEvent('global', 0, 'new_post', $tags);
+ $tags['POST_CONTENT'] = $posts_obj[$post]->getVar("post_text");
+ $tags['POST_NAME'] = $posts_obj[$post]->getVar("subject");
+ $notification_handler->triggerEvent('global', 0, 'new_fullpost', $tags);
+ $notification_handler->triggerEvent('forum', $posts_obj[$post]->getVar('forum_id'), 'new_fullpost', $tags);
+ }
+ break;
+ case "delete":
+ $post_id = array_values($post_id);
+ rsort($post_id);
+ $topics=array();
+ $forums=array();
+ foreach ($post_id as $post) {
+ $post_obj =& $post_handler->get($post);
+ if (!empty($topic_id) && $topic_id != $post_obj->getVar("topic_id")) continue;
+ $topics[$post_obj->getVar("topic_id")] = 1;
+ $forums[$post_obj->getVar("forum_id")] = 1;
+ $post_handler->delete($post_obj,true);
+ unset($post_obj);
+ }
+ foreach (array_keys($topics) as $topic) {
+ $topic_handler->synchronization($topic);
+ }
+ foreach (array_keys($forums) as $forum) {
+ $forum_handler->synchronization($forum);
+ }
+ break;
+ case "split":
+ $post_obj =& $post_handler->get($post_id);
+ if (empty($post_id) || $post_obj->isTopic()) {
+ break;
+ }
+ $topic_id = $post_obj->getVar("topic_id");
+
+ $newtopic =& $topic_handler->create();
+ $newtopic->setVar("topic_title", $post_obj->getVar("subject"), true);
+ $newtopic->setVar("topic_poster", $post_obj->getVar("uid"), true);
+ $newtopic->setVar("forum_id", $post_obj->getVar("forum_id"), true);
+ $newtopic->setVar("topic_time", $post_obj->getVar("post_time"), true);
+ $newtopic->setVar("poster_name", $post_obj->getVar("poster_name"), true);
+ $newtopic->setVar("approved", 1, true);
+ $topic_handler->insert($newtopic, true);
+ $new_topic_id = $newtopic->getVar('topic_id');
+
+ $pid = $post_obj->getVar("pid");
+
+ $post_obj->setVar("topic_id", $new_topic_id, true);
+ $post_obj->setVar("pid", 0, true);
+ $post_handler->insert($post_obj);
+
+ /* split a single post */
+ if ($mode==1) {
+ $criteria = new CriteriaCompo(new Criteria("topic_id", $topic_id));
+ $criteria->add(new Criteria('pid',$post_id));
+ $post_handler->updateAll("pid", $pid, $criteria, true);
+ /* split a post and its children posts */
+ } elseif ($mode==2) {
+ include_once(XOOPS_ROOT_PATH . "/class/xoopstree.php");
+ $mytree = new XoopsTree($xoopsDB->prefix("bb_posts"), "post_id", "pid");
+ $posts = $mytree->getAllChildId($post_id);
+ if (count($posts)>0) {
+ $criteria = new Criteria('post_id', "(".implode(",", $posts).")", "IN");
+ $post_handler->updateAll("topic_id", $new_topic_id, $criteria, true);
+ }
+ /* split a post and all posts coming after */
+ } elseif ($mode==3) {
+ $criteria = new CriteriaCompo(new Criteria("topic_id", $topic_id));
+ $criteria->add(new Criteria('post_id',$post_id, ">"));
+ $post_handler->updateAll("topic_id", $new_topic_id, $criteria, true);
+
+ unset($criteria);
+ $criteria = new CriteriaCompo(new Criteria("topic_id", $new_topic_id));
+ $criteria->add(new Criteria('post_id',$post_id, ">"));
+ $post_handler->identifierName = "pid";
+ $posts = $post_handler->getList($criteria);
+
+ unset($criteria);
+ $post_update = array();
+ foreach ($posts as $postid=>$pid) {
+ if (!in_array($pid, array_keys($posts))) {
+ $post_update[] = $pid;
+ }
+ }
+ if (count($post_update)) {
+ $criteria = new Criteria('post_id', "(".implode(",", $post_update).")", "IN");
+ $post_handler->updateAll("pid", $post_id, $criteria, true);
+ }
+ }
+
+ $forum_id = $post_obj->getVar("forum_id");
+ $topic_handler->synchronization($topic_id);
+ $topic_handler->synchronization($new_topic_id);
+ $sql = sprintf("UPDATE %s SET forum_topics = forum_topics+1 WHERE forum_id = %u", $xoopsDB->prefix("bb_forums"), $forum_id);
+ $result = $xoopsDB->queryF($sql);
+
+ break;
+}
+if (!empty($topic_id)) {
+ redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?topic_id=$topic_id", 2, _MD_DBUPDATED);
+} elseif (!empty($forum_id)) {
+ redirect_header(XOOPS_URL."/modules/newbb/viewforum.php?forum=$forum_id", 2, _MD_DBUPDATED);
+} else {
+ redirect_header(XOOPS_URL."/modules/newbb/viewpost.php?uid=$uid", 2, _MD_DBUPDATED);
+}
+
+include XOOPS_ROOT_PATH.'/footer.php';
+?>
\ No newline at end of file
Added: XoopsModules/newbb/branches/irmtfan/newbb/action.topic.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/action.topic.php (rev 0)
+++ XoopsModules/newbb/branches/irmtfan/newbb/action.topic.php 2012-07-30 11:04:51 UTC (rev 9945)
@@ -0,0 +1,175 @@
+<?php
+/**
+ * CBB 4.0, or newbb, the forum module for XOOPS project
+ *
+ * @copyright The XOOPS Project http://xoops.sf.net
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Taiwen Jiang (phppp or D.J.) <ph...@us...>
+ * @since 4.00
+ * @version $Id $
+ * @package module::newbb
+ */
+include_once dirname(__FILE__) . "/header.php";
+
+$forum_id = isset($_POST['forum_id']) ? intval($_POST['forum_id']) : 0;
+$topic_id = !empty($_POST['topic_id']) ? $_POST['topic_id'] : null;
+$op = !empty($_POST['op']) ? $_POST['op']:"";
+$op = in_array($op, array("approve", "delete", "restore", "move"))? $op : "";
+
+
+if ( empty($topic_id) || empty($op)) {
+ redirect_header("javascript:history.go(-1);", 2, _MD_NORIGHTTOACCESS);
+ exit();
+}
+
+$topic_id = array_values($topic_id);
+$topic_handler =& xoops_getmodulehandler('topic', 'newbb');
+$forum_handler =& xoops_getmodulehandler('forum', 'newbb');
+
+$isadmin = newbb_isAdmin($forum_id);
+
+if (!$isadmin) {
+ redirect_header("index.php", 2, _MD_NORIGHTTOACCESS);
+ exit();
+}
+switch($op) {
+ case "restore":
+ $forums = array();
+ $topics_obj =& $topic_handler->getAll(new Criteria("topic_id", "(".implode(",", $topic_id).")", "IN"));
+ foreach (array_keys($topics_obj) as $id) {
+ $topic_obj =& $topics_obj[$id];
+ $topic_handler->approve($topic_obj);
+ $topic_handler->synchronization($topic_obj);
+ $forums[$topic_obj->getVar("forum_id")] = 1;
+ }
+ $criteria_forum = new Criteria("forum_id", "(".implode(",", array_keys($forums)).")", "IN");
+ $forums_obj =& $forum_handler->getAll($criteria_forum);
+ foreach (array_keys($forums_obj) as $id) {
+ $forum_handler->synchronization($forums_obj[$id]);
+ }
+ unset($topics_obj, $forums_obj);
+ break;
+ case "approve":
+ $forums = array();
+ $topics_obj =& $topic_handler->getAll(new Criteria("topic_id", "(".implode(",", $topic_id).")", "IN"));
+ foreach (array_keys($topics_obj) as $id) {
+ $topic_obj =& $topics_obj[$id];
+ $topic_handler->approve($topic_obj);
+ $topic_handler->synchronization($topic_obj);
+ $forums[$topic_obj->getVar("forum_id")] = 1;
+ }
+
+ $criteria_forum = new Criteria("forum_id", "(".implode(",", array_keys($forums)).")", "IN");
+ $forums_obj =& $forum_handler->getAll($criteria_forum);
+ foreach (array_keys($forums_obj) as $id) {
+ $forum_handler->synchronization($forums_obj[$id]);
+ }
+
+ if (empty($xoopsModuleConfig['notification_enabled'])) break;
+
+ include_once 'include/notification.inc.php';
+ $notification_handler =& xoops_gethandler('notification');
+ foreach (array_keys($topics_obj) as $id) {
+ $topic_obj =& $topics_obj[$id];
+ $tags = array();
+ $tags['THREAD_NAME'] = $topic_obj->getVar("topic_title");
+ $tags['THREAD_URL'] = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewtopic.php?topic_id=' . $id.'&forum=' . $topic_obj->getVar('forum_id');
+ $tags['FORUM_NAME'] = $forums_obj[$topic_obj->getVar("forum_id")]->getVar("forum_name");
+ $tags['FORUM_URL'] = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewforum.php?forum=' . $topic_obj->getVar('forum_id');
+ $notification_handler->triggerEvent('global', 0, 'new_thread', $tags);
+ $notification_handler->triggerEvent('forum', $topic_obj->getVar('forum_id'), 'new_thread', $tags);
+ $post_obj =& $topic_handler->getTopPost($id);
+ $tags['POST_URL'] = $tags['THREAD_URL'].'#forumpost' . $post_obj->getVar("post_id");
+ $notification_handler->triggerEvent('thread', $id, 'new_post', $tags);
+ $notification_handler->triggerEvent('forum', $topic_obj->getVar('forum_id'), 'new_post', $tags);
+ $notification_handler->triggerEvent('global', 0, 'new_post', $tags);
+ $tags['POST_CONTENT'] = $post_obj->getVar("post_text");
+ $tags['POST_NAME'] = $post_obj->getVar("subject");
+ $notification_handler->triggerEvent('global', 0, 'new_fullpost', $tags);
+ $notification_handler->triggerEvent('forum', $topic_obj->getVar('forum_id'), 'new_fullpost', $tags);
+ unset($post_obj);
+ }
+ unset($topics_obj, $forums_obj);
+ break;
+ case "delete":
+ $forums = array();
+ $topics_obj =& $topic_handler->getAll(new Criteria("topic_id", "(".implode(",", $topic_id).")", "IN"));
+ foreach (array_keys($topics_obj) as $id) {
+ $topic_obj =& $topics_obj[$id];
+ $topic_handler->delete($topic_obj,true);
+ $topic_handler->synchronization($topic_obj);
+ $forums[$topic_obj->getVar("forum_id")] = 1;
+ }
+
+ $criteria_forum = new Criteria("forum_id", "(".implode(",", array_keys($forums)).")", "IN");
+ $forums_obj =& $forum_handler->getAll($criteria_forum);
+ foreach (array_keys($forums_obj) as $id) {
+ $forum_handler->synchronization($forums_obj[$id]);
+ }
+ unset($topics_obj, $forums_obj);
+ break;
+ case "move":
+ if (!empty($_POST["newforum"]) && $_POST["newforum"] != $forum_id
+ && $forum_handler->getPermission($_POST["newforum"], 'post')
+ ) {
+ $criteria = new Criteria('topic_id', "(".implode(",", $topic_id).")", "IN");
+ $post_handler =& xoops_getmodulehandler('post', 'newbb');
+ $post_handler->updateAll("forum_id", intval($_POST["newforum"]), $criteria, true);
+ $topic_handler->updateAll("forum_id", intval($_POST["newforum"]), $criteria, true);
+ $forum_handler->synchronization($_POST["newforum"]);
+ $forum_handler->synchronization($forum_id);
+ } else {
+ include XOOPS_ROOT_PATH."/header.php";
+ $category_handler =& xoops_getmodulehandler('category', 'newbb');
+ $categories = $category_handler->getByPermission('access');
+ $forums = $forum_handler->getForumsByCategory(array_keys($categories), 'post', false);
+
+ $box = '<select name="newforum" size="1">';
+ if (count($categories)>0 && count($forums)>0) {
+ foreach (array_keys($forums) as $key) {
+ $box .= "<option value='-1'>[".$categories[$key]->getVar('cat_title')."]</option>";
+ foreach ($forums[$key] as $forumid=>$_forum) {
+ $box .= "<option value='".$forumid."'>-- ".$_forum['title']."</option>";
+ if ( !isset($_forum["sub"])) continue;
+ foreach (array_keys($_forum["sub"]) as $fid) {
+ $box .= "<option value='".$fid."'>---- ".$_forum["sub"][$fid]['title']."</option>";
+ }
+ }
+ }
+ } else {
+ $box .= "<option value='-1'>"._MD_NOFORUMINDB."</option>";
+ }
+ $box .="</select>";
+ unset($forums, $categories);
+
+ echo "<form action='".$_SERVER['PHP_SELF']."' method='post'>";
+ echo "<table border='0' cellpadding='1' cellspacing='0' align='center' width='95%'>";
+ echo "<tr><td class='bg2'>";
+ echo "<table border='0' cellpadding='1' cellspacing='1' width='100%'>";
+ echo '<tr><td class="bg3">'._MD_MOVETOPICTO.'</td><td class="bg1">';
+ echo $box;
+ echo '</td></tr>';
+ echo '<tr class="bg3"><td colspan="2" align="center">';
+ echo "<input type='hidden' name='op' value='move' />";
+ echo "<input type='hidden' name='forum_id' value='{$forum_id}' />";
+ foreach ($topic_id as $id) {
+ echo "<input type='hidden' name='topic_id[]' value='".$id."' />";
+ }
+ echo "<input type='submit' name='submit' value='". _SUBMIT."' />";
+ echo "</td></tr></table></td></tr></table>";
+ echo "</form>";
+ include XOOPS_ROOT_PATH.'/footer.php';
+ exit();
+ }
+ break;
+}
+$stats_handler = xoops_getmodulehandler('stats', 'newbb');
+$stats_handler->reset();
+if (empty($forum_id)) {
+ redirect_header(XOOPS_URL."/modules/newbb/list.topic.php", 2, _MD_DBUPDATED);
+} else {
+ redirect_header(XOOPS_URL."/modules/newbb/viewforum.php?forum=$forum_id", 2, _MD_DBUPDATED);
+}
+
+include XOOPS_ROOT_PATH.'/footer.php';
+?>
\ No newline at end of file
Added: XoopsModules/newbb/branches/irmtfan/newbb/admin/about.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/admin/about.php (rev 0)
+++ XoopsModules/newbb/branches/irmtfan/newbb/admin/about.php 2012-07-30 11:04:51 UTC (rev 9945)
@@ -0,0 +1,171 @@
+<?php
+// $Id: about.php,v 1.3 2005/10/19 17:20:32 phppp Exp $
+// ------------------------------------------------------------------------ //
+// XOOPS - PHP Content Management System //
+// Copyright (c) 2000 XOOPS.org //
+// <http://www.xoops.org/> //
+// ------------------------------------------------------------------------ //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation; either version 2 of the License, or //
+// (at your option) any later version. //
+// //
+// You may not change or alter any portion of this comment or credits //
+// of supporting developers from this source code or any supporting //
+// source code which is considered copyrighted (c) material of the //
+// original comment or credit authors. //
+// //
+// This program is distributed in the hope that it will be useful, //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
+// GNU General Public License for more details. //
+// //
+// You should have received a copy of the GNU General Public License //
+// along with this program; if not, write to the Free Software //
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
+// ------------------------------------------------------------------------ //
+// Author: Kazumi Ono (AKA onokazu) //
+// URL: http://www.myweb.ne.jp/, http://www.xoops.org/, http://jp.xoops.org/ //
+// Project: The XOOPS Project //
+// ------------------------------------------------------------------------- //
+
+include( "admin_header.php" );
+xoops_cp_header();
+
+if ($newXoopsModuleGui) {
+ $module_info =& $module_handler->get($xoopsModule->getVar("mid"));
+ $aboutAdmin = new ModuleAdmin();
+ echo $aboutAdmin->addNavigation('about.php');
+ echo $aboutAdmin->renderabout('PBQZ7D6LT6UBC', true);
+} else {
+
+ $module_handler =& xoops_gethandler('module');
+ $versioninfo =& $module_handler->get($xoopsModule->getVar('mid'));
+
+ //loadModuleAdminMenu(13, _AM_NEWBB_ABOUT . " " . $versioninfo->getInfo('name'));
+
+ echo "<fieldset>";
+ // Left headings...
+ echo "<img src='" . XOOPS_URL . "/modules/".$xoopsModule->dirname()."/" . $versioninfo->getInfo('image') . "' alt='' hspace='0' vspace='0' align='left' style='margin-right: 10px;' /></a>";
+ echo "<div style='margin-top: 10px; color: #33538e; margin-bottom: 4px; font-size: 18px; line-height: 18px; font-weight: bold; display: block;'>" . $versioninfo->getInfo('name') . " version " . $versioninfo->getInfo('version') . " (" . $versioninfo->getInfo('status_version') . ")</div>";
+
+ if ( $versioninfo->getInfo('author_realname') != '') {
+ $author_name = $versioninfo->getInfo('author') . " (" . $versioninfo->getInfo('author_realname') . ")";
+ } else {
+ $author_name = $versioninfo->getInfo('author');
+ }
+
+ echo "<div style = 'line-height: 16px; font-weight: bold; display: block;'>" . _AM_NEWBB_BY . " " .$author_name;
+ echo "</div>";
+ echo "<div style = 'line-height: 16px; display: block;'>" . $versioninfo->getInfo('license') . "</div><br /><br /></>\n";
+
+ // Author Information
+ echo "<table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'>";
+ echo "<tr>";
+ echo "<td colspan='2' class='bg3' align='left'><strong>" . _AM_NEWBB_AUTHOR_INFO . "</strong></td>";
+ echo "</tr>";
+
+ If ( $versioninfo->getInfo('$author_name') != '' ) {
+ echo "<tr>";
+ echo "<td class='head' width='150px' align='left'>" ._AM_NEWBB_AUTHOR_NAME . "</td>";
+ echo "<td class='even' align='left'>" . $author_name . "</td>";
+ echo "</tr>";
+ }
+ If ( $versioninfo->getInfo('author_website_url') != '' ) {
+ echo "<tr>";
+ echo "<td class='head' width='150px' align='left'>" . _AM_NEWBB_AUTHOR_WEBSITE . "</td>";
+ echo "<td class='even' align='left'><a href='" . $versioninfo->getInfo('author_website_url') . "' target='_blank'>" . $versioninfo->getInfo('author_website_name') . "</a></td>";
+ echo "</tr>";
+ }
+ If ( $versioninfo->getInfo('author_email') != '' ) {
+ echo "<tr>";
+ echo "<td class='head' width='150px' align='left'>" . _AM_NEWBB_AUTHOR_EMAIL . "</td>";
+ echo "<td class='even' align='left'><a href='mailto:" . $versioninfo->getInfo('author_email') . "'>" . $versioninfo->getInfo('author_email') . "</a></td>";
+ echo "</tr>";
+ }
+ If ( $versioninfo->getInfo('credits') != '' ) {
+ echo "<tr>";
+ echo "<td class='head' width='150px' align='left'>" . _AM_NEWBB_AUTHOR_CREDITS . "</td>";
+ echo "<td class='even' align='left'>" . $versioninfo->getInfo('credits') . "</td>";
+ echo "</tr>";
+ }
+
+ echo "</table>";
+ echo "<br />\n";
+
+ // Module Developpment information
+ echo "<table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'>";
+ echo "<tr>";
+ echo "<td colspan='2' class='bg3' align='left'><strong>" . _AM_NEWBB_MODULE_INFO . "</strong></td>";
+ echo "</tr>";
+
+ If ( $versioninfo->getInfo('status') != '' ) {
+ echo "<tr>";
+ echo "<td class='head' width='200' align='left'>" . _AM_NEWBB_MODULE_STATUS . "</td>";
+ echo "<td class='even' align='left'>" . $versioninfo->getInfo('status') . "</td>";
+ echo "</tr>";
+ }
+
+ If ( $versioninfo->getInfo('demo_site_url') != '' ) {
+ echo "<tr>";
+ echo "<td class='head' align='left'>" . _AM_NEWBB_MODULE_DEMO . "</td>";
+ echo "<td class='even' align='left'><a href='" . $versioninfo->getInfo('demo_site_url') . "' target='blank'>" . $versioninfo->getInfo('demo_site_name') . "</a></td>";
+ echo "</tr>";
+ }
+
+ If ( $versioninfo->getInfo('support_site_url') != '' ) {
+ echo "<tr>";
+ echo "<td class='head' align='left'>" . _AM_NEWBB_MODULE_SUPPORT . "</td>";
+ echo "<td class='even' align='left'><a href='" . $versioninfo->getInfo('support_site_url') . "' target='blank'>" . $versioninfo->getInfo('support_site_name') . "</a></td>";
+ echo "</tr>";
+ }
+
+ If ( $versioninfo->getInfo('submit_bug') != '' ) {
+ echo "<tr>";
+ echo "<td class='head' align='left'>" . _AM_NEWBB_MODULE_BUG . "</td>";
+ echo "<td class='even' align='left'><a href='" . $versioninfo->getInfo('submit_bug') . "' target='blank'>" . "Submit a Bug in newBB Bug Tracker" . "</a></td>";
+ echo "</tr>";
+ }
+ If ( $versioninfo->getInfo('submit_feature') != '' ) {
+ echo "<tr>";
+ echo "<td class='head' align='left'>" . _AM_NEWBB_MODULE_FEATURE . "</td>";
+ echo "<td class='even' align='left'><a href='" . $versioninfo->getInfo('submit_feature') . "' target='_blank'>" . "Request a feature in the newBB Feature Tracker" . "</a></td>";
+ echo "</tr>";
+ }
+
+ echo "</table>";
+
+ // Warning
+ If ( $versioninfo->getInfo('warning') != '' ) {
+ echo "<br />\n";
+ echo "<table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'>";
+ echo "<tr>";
+ echo "<td class='bg3' align='left'><strong>" . _AM_NEWBB_MODULE_DISCLAIMER . "</strong></td>";
+ echo "</tr>";
+
+ echo "<tr>";
+ echo "<td class='even' align='left'>" . $versioninfo->getInfo('warning') . "</td>";
+ echo "</tr>";
+ echo "</table>";
+ }
+
+ // Author's note
+ If ( $versioninfo->getInfo('author_word') != '' ) {
+ echo "<br />\n";
+ echo "<table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'>";
+ echo "<tr>";
+ echo "<td class='bg3' align='left'><strong>" . _AM_NEWBB_AUTHOR_WORD . "</strong></td>";
+ echo "</tr>";
+
+ $extra = (defined('_AM_NEWBB_AUTHOR_WORD_EXTRA'))?_AM_NEWBB_AUTHOR_WORD_EXTRA:'';
+ echo "<tr>";
+ echo "<td class='even' align='left'>" . $versioninfo->getInfo('author_word') . "</td>";
+ echo "</tr>";
+ echo "</table>";
+ }
+ echo "</fieldset>";
+}
+
+xoops_cp_footer();
+
+?>
\ No newline at end of file
Added: XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_blocks.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_blocks.php (rev 0)
+++ XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_blocks.php 2012-07-30 11:04:51 UTC (rev 9945)
@@ -0,0 +1,38 @@
+<?php
+// $Id: admin_blocks.php,v 1.1.1.1 2005/10/19 15:58:11 phppp Exp $
+// ------------------------------------------------------------------------ //
+// XOOPS - PHP Content Management System //
+// Copyright (c) 2000 XOOPS.org //
+// <http://www.xoops.org/> //
+// ------------------------------------------------------------------------ //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation; either version 2 of the License, or //
+// (at your option) any later version. //
+// //
+// You may not change or alter any portion of this comment or credits //
+// of supporting developers from this source code or any supporting //
+// source code which is considered copyrighted (c) material of the //
+// original comment or credit authors. //
+// //
+// This program is distributed in the hope that it will be useful, //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
+// GNU General Public License for more details. //
+// //
+// You should have received a copy of the GNU General Public License //
+// along with this program; if not, write to the Free Software //
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
+// ------------------------------------------------------------------------ //
+// Author: Kazumi Ono (AKA onokazu) //
+// URL: http://www.myweb.ne.jp/, http://www.xoops.org/, http://jp.xoops.org/ //
+// Project: The XOOPS Project //
+// ------------------------------------------------------------------------- //
+// ------------------------------------------------------------------------- //
+// myblocksadmin.php //
+// - XOOPS block admin for each modules - //
+// GIJOE <http://www.peak.ne.jp/> //
+// ------------------------------------------------------------------------- //
+include("admin_header.php");
+header("Location: ".XOOPS_URL."/modules/system/admin.php?fct=blocksadmin&selmod=".$xoopsModule->getVar("mid"));
+?>
\ No newline at end of file
Added: XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_cat_manager.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_cat_manager.php (rev 0)
+++ XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_cat_manager.php 2012-07-30 11:04:51 UTC (rev 9945)
@@ -0,0 +1,218 @@
+<?php
+// $Id: admin_cat_manager.php,v 1.3 2005/10/19 17:20:32 phppp Exp $
+// ------------------------------------------------------------------------ //
+// XOOPS - PHP Content Management System //
+// Copyright (c) 2000 XOOPS.org //
+// <http://www.xoops.org/> //
+// ------------------------------------------------------------------------ //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation; either version 2 of the License, or //
+// (at your option) any later version. //
+// //
+// You may not change or alter any portion of this comment or credits //
+// of supporting developers from this source code or any ...
[truncated message content] |
|
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: <ren...@us...> - 2012-07-29 12:04:20
|
Revision: 9943
http://xoops.svn.sourceforge.net/xoops/?rev=9943&view=rev
Author: renetjuh
Date: 2012-07-29 12:04:13 +0000 (Sun, 29 Jul 2012)
Log Message:
-----------
Update NL 2.5.5 language files
Modified Paths:
--------------
XoopsLanguages/dutch/core/2.5.5/htdocs/language/nederlands/global.php
XoopsLanguages/dutch/core/2.5.5/htdocs/language/nederlands/locale.php
Modified: XoopsLanguages/dutch/core/2.5.5/htdocs/language/nederlands/global.php
===================================================================
--- XoopsLanguages/dutch/core/2.5.5/htdocs/language/nederlands/global.php 2012-07-28 18:05:31 UTC (rev 9942)
+++ XoopsLanguages/dutch/core/2.5.5/htdocs/language/nederlands/global.php 2012-07-29 12:04:13 UTC (rev 9943)
@@ -179,9 +179,13 @@
define('_DAYS', ' %s dagen');
define('_WEEK', '1 week');
define('_MONTH', '1 maand');
-define('_DATESTRING', 'j-n-Y H:i:s'); // kan naar eigen voorkeur aangepast worden
-define('_MEDIUMDATESTRING', 'j-n-Y H:i'); // kan naar eigen voorkeur aangepast worden
-define('_SHORTDATESTRING', 'j-n-Y'); // kan naar eigen voorkeur aangepast worden
+//define('_DATESTRING', 'j-n-Y H:i:s'); // kan naar eigen voorkeur aangepast worden
+//define('_MEDIUMDATESTRING', 'j-n-Y H:i'); // kan naar eigen voorkeur aangepast worden
+//define('_SHORTDATESTRING', 'j-n-Y'); // kan naar eigen voorkeur aangepast worden
+define('_DATESTRING', 'd-m-Y H:i:s'); // kan naar eigen voorkeur aangepast worden
+define('_MEDIUMDATESTRING', 'd-m-Y H:i'); // kan naar eigen voorkeur aangepast worden
+define('_SHORTDATESTRING', 'd-m-Y'); // kan naar eigen voorkeur aangepast worden
+
/**
* The following characters are recognized in the format string:
* a - 'am' or 'pm'
@@ -224,7 +228,10 @@
/**
* Additions to 2.5.5
**/
-define('_DBDATESTRING', 'j-n-Y');
+//define('_DBDATESTRING', 'j-n-Y');
+//define('_DBTIMESTRING', 'H:i:s');
+//define('_DBTIMESTAMPSTRING', 'j-n-Y H:i:s');
+define('_DBDATESTRING', 'd-m-Y');
define('_DBTIMESTRING', 'H:i:s');
-define('_DBTIMESTAMPSTRING', 'j-n-Y H:i:s');
+define('_DBTIMESTAMPSTRING', 'd-m-Y H:i:s');
?>
\ No newline at end of file
Modified: XoopsLanguages/dutch/core/2.5.5/htdocs/language/nederlands/locale.php
===================================================================
--- XoopsLanguages/dutch/core/2.5.5/htdocs/language/nederlands/locale.php 2012-07-28 18:05:31 UTC (rev 9942)
+++ XoopsLanguages/dutch/core/2.5.5/htdocs/language/nederlands/locale.php 2012-07-29 12:04:13 UTC (rev 9943)
@@ -15,8 +15,8 @@
// !!IMPORTANT!! insert '\' before any char among reserved chars: "a", "A", "B", "c", "d", "D", "F", "g", "G", "h", "H", "i", "I", "j", "l", "L", "m", "M", "n", "O", "r", "s", "S", "t", "T", "U", "w", "W", "Y", "y", "z", "Z"
// insert double '\' before 't', 'r', 'n'
-define("_TODAY", "Vandaag G:i");
-define("_YESTERDAY", "Gisteren G:i");
+define("_TODAY", "\V\a\\n\d\a\a\g G:i");
+define("_YESTERDAY", "\G\i\s\\t\e\\r\e\\n G:i");
define("_MONTHDAY", "j /n G:i");
define("_YEARMONTHDAY", "j/n/Y G:i");
define("_ELAPSE", " %s geleden");
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-28 18:05:01
|
Revision: 9941
http://xoops.svn.sourceforge.net/xoops/?rev=9941&view=rev
Author: lord_venom
Date: 2012-07-28 18:04:55 +0000 (Sat, 28 Jul 2012)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css 2012-07-28 14:44:15 UTC (rev 9940)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css 2012-07-28 18:04:55 UTC (rev 9941)
@@ -24,7 +24,7 @@
/* pour regler les problemes de hauteur des categories modifier min-height*/
ul#tree_menu li {
list-style: none;
- float:left;
+ display: inline-block;
width:97%;
min-height:130px;
/*height: 130px;*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <txm...@us...> - 2012-07-28 14:44:21
|
Revision: 9940
http://xoops.svn.sourceforge.net/xoops/?rev=9940&view=rev
Author: txmodxoops
Date: 2012-07-28 14:44:15 +0000 (Sat, 28 Jul 2012)
Log Message:
-----------
Added italian language IP Log
Added Paths:
-----------
XoopsLanguages/italian/modules/iplog/
XoopsLanguages/italian/modules/iplog/language/
XoopsLanguages/italian/modules/iplog/language/italian/
XoopsLanguages/italian/modules/iplog/language/italian/admin.php
XoopsLanguages/italian/modules/iplog/language/italian/help/
XoopsLanguages/italian/modules/iplog/language/italian/help/help.html
XoopsLanguages/italian/modules/iplog/language/italian/help/index.html
XoopsLanguages/italian/modules/iplog/language/italian/index.html
XoopsLanguages/italian/modules/iplog/language/italian/mail_template/
XoopsLanguages/italian/modules/iplog/language/italian/mail_template/index.html
XoopsLanguages/italian/modules/iplog/language/italian/modinfo.php
Added: XoopsLanguages/italian/modules/iplog/language/italian/admin.php
===================================================================
--- XoopsLanguages/italian/modules/iplog/language/italian/admin.php (rev 0)
+++ XoopsLanguages/italian/modules/iplog/language/italian/admin.php 2012-07-28 14:44:15 UTC (rev 9940)
@@ -0,0 +1,71 @@
+<?php
+/*
+ * Logs Guest and users IP Addresses for a period of time and provides
+ * basic statistic of them in XOOPS Copyright (C) 2012 Simon Roberts
+ * Contact: wishcraft - si...@ch...
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * See /docs/license.pdf for full license.
+ *
+ * Shouts:- Mamba (www.xoops.org), flipse (www.nlxoops.nl)
+ * Many thanks for your additional work with version 1.01
+ *
+ * Version: 1.01 Final
+ * Published: Chronolabs
+ * Download: http://code.google.com/p/chronolabs
+ * This File: admin.php
+ * Description: Administration Admin English Langauge Constants
+ * Date: 28/07/2015 5:45PM AEST
+ * License: GNU3
+ *
+ */
+
+define("_AM_IPLOG_SECONDS", "Secondi");
+define("_AM_IPLOG_UNKNOWN", "Unknown");
+
+define("_AM_IPLOG_TH_IP_ID", "IP ID");
+define("_AM_IPLOG_TH_UNAME", "Username");
+define("_AM_IPLOG_TH_IP", "IP");
+define("_AM_IPLOG_TH_COUNTRY_CODE", "Codice paese");
+define("_AM_IPLOG_TH_NAME", "IP paese");
+define("_AM_IPLOG_TH_REGION", "IP Regione");
+define("_AM_IPLOG_TH_CONTINENT", "IP Continente");
+define("_AM_IPLOG_TH_NETWORK_ADDY", "NetBIOS");
+define("_AM_IPLOG_TH_PROXY_IP", "Proxy IP");
+define("_AM_IPLOG_TH_AGENT", "User Agent");
+define("_AM_IPLOG_TH_START", "Inizio Sessione");
+define("_AM_IPLOG_TH_END", "Fine Sessione");
+define("_AM_IPLOG_TH_ONLINE", "Tempo Online");
+define("_AM_IPLOG_TH_ACTIONS", "Azioni");
+
+define("_AM_IPLOG_LOG_H1", "Registro IP utente corrente");
+define("_AM_IPLOG_LOG_P", "Questo è il log corrente degli utenti registrati per indirizzi IP");
+
+//Dashboard
+define('_AM_IPLOG_ADMIN_COUNTS_BY_COUNTRY', 'Totale sessioni di utenti provenienti da paesi');
+define('_AM_IPLOG_ADMIN_COUNTS_BY_REGION', 'Totale utenti sessioni da regione');
+define('_AM_IPLOG_ADMIN_COUNTS_BY_CONTINENT', 'Totale utenti sessioni dal continente');
+define('_AM_IPLOG_ADMIN_SUM_BY_COUNTRY', 'Numero di minuti sul paese');
+define('_AM_IPLOG_ADMIN_SUM_BY_REGION', 'Numero di minuti sulla regione');
+define('_AM_IPLOG_ADMIN_SUM_BY_CONTINENT', 'Numero di minuti sul continente');
+define('_AM_IPLOG_ADMIN_AVG_BY_COUNTRY', 'Adverage numero di minuti sul paese');
+define('_AM_IPLOG_ADMIN_AVG_BY_REGION', 'Adverage numero di minuti sulla regione');
+define('_AM_IPLOG_ADMIN_AVG_BY_CONTINENT', 'Adverage numero di minuti sul continente');
+
+//About
+define('_AM_IPLOG_ABOUT_MAKEDONATE', 'Fai la donazione a Chronolabs co-op');
+
+define('_AM_MSG_LOG_DELETE', 'Sei sicuro di voler eliminare - %s (%s) - ID %s?');
+define('_AM_MSG_LOG_DELETED', 'IP Voce eliminato!');
+?>
Added: XoopsLanguages/italian/modules/iplog/language/italian/help/help.html
===================================================================
--- XoopsLanguages/italian/modules/iplog/language/italian/help/help.html (rev 0)
+++ XoopsLanguages/italian/modules/iplog/language/italian/help/help.html 2012-07-28 14:44:15 UTC (rev 9940)
@@ -0,0 +1,54 @@
+<!--
+-- Logs Guest and users IP Addresses for a period of time and provides
+-- basic statistic of them in XOOPS Copyright (C) 2012 Simon Roberts
+-- Contact: wishcraft - si...@ch...
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+-- See /docs/license.pdf for full license.
+--
+-- Shouts:- Mamba (www.xoops.org), flipse (www.nlxoops.nl)
+-- Many thanks for your additional work with version 1.01
+--
+-- Version: 1.01 Final
+-- Published: Chronolabs
+-- Download: http://code.google.com/p/chronolabs
+-- This File: help.html
+-- Description: Online help Root Smarty Template File
+-- Date: 28/07/2015 5:45PM AEST
+-- License: GNU3
+-->
+<div id="help-template" class="outer">
+ <h1 class="head">Aiuto:
+ <a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/iplog/admin/dashboard.php"
+ title="Torna alla Amministrazione di IP Log"> IP Log <img src="<{xoAdminIcons home.png}>"
+ alt="Torna alla Amministrazione di IP Log"/>
+ </a></h1>
+ <!-- -----Help Content ---------- -->
+
+ <h4 class="odd">Descriptione</h4>
+
+ <p class="even">
+ IP Log è un modulo per registrare gli indirizzi IP solo degli utenti, oppure gli utenti ed ospiti anonimi.<br /><br />
+ </p>
+ <h4 class="odd">Installa/disinstalla</h4>
+
+ Misure speciali necessarie, non seguire il processo di installazione standard - estrarre /htdocs nella cartella
+ XOOPS ROOT Path. Installare il modulo attraverso Admin -> System Module -> Modules. Se avete bisogno di dettagliate
+ istruzioni su come installare un modulo, si prega di consultare il <a href="http://goo.gl/adT2i">XOOPS Operations
+ Manual</a>.<br /><br />
+ Assicurarsi di installare la chiave API di IPInfoDB.com nelle preferenze altrimenti il modulo non funziona,
+ Questo avviene correttamente andando su www.ipinfodb.com registrarsi, e dopo aver confermato il tuo
+ indirizzo e-mail, ti verrà fornita la chiave API per incollarla nel suo campo nelle preferenze.</p>
+ <!-- -----Help Content ---------- -->
+</div>
\ No newline at end of file
Added: XoopsLanguages/italian/modules/iplog/language/italian/help/index.html
===================================================================
--- XoopsLanguages/italian/modules/iplog/language/italian/help/index.html (rev 0)
+++ XoopsLanguages/italian/modules/iplog/language/italian/help/index.html 2012-07-28 14:44:15 UTC (rev 9940)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsLanguages/italian/modules/iplog/language/italian/index.html
===================================================================
--- XoopsLanguages/italian/modules/iplog/language/italian/index.html (rev 0)
+++ XoopsLanguages/italian/modules/iplog/language/italian/index.html 2012-07-28 14:44:15 UTC (rev 9940)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsLanguages/italian/modules/iplog/language/italian/mail_template/index.html
===================================================================
--- XoopsLanguages/italian/modules/iplog/language/italian/mail_template/index.html (rev 0)
+++ XoopsLanguages/italian/modules/iplog/language/italian/mail_template/index.html 2012-07-28 14:44:15 UTC (rev 9940)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsLanguages/italian/modules/iplog/language/italian/modinfo.php
===================================================================
--- XoopsLanguages/italian/modules/iplog/language/italian/modinfo.php (rev 0)
+++ XoopsLanguages/italian/modules/iplog/language/italian/modinfo.php 2012-07-28 14:44:15 UTC (rev 9940)
@@ -0,0 +1,81 @@
+<?php
+/*
+ * Logs Guest and users IP Addresses for a period of time and provides
+ * basic statistic of them in XOOPS Copyright (C) 2012 Simon Roberts
+ * Contact: wishcraft - si...@ch...
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * See /docs/license.pdf for full license.
+ *
+ * Shouts:- Mamba (www.xoops.org), flipse (www.nlxoops.nl)
+ * Many thanks for your additional work with version 1.01
+ *
+ * Version: 1.01 Final
+ * Published: Chronolabs
+ * Download: http://code.google.com/p/chronolabs
+ * This File: modinfo.php
+ * Description: Module Global Language Defines & constants
+ * Date: 28/07/2015 5:45PM AEST
+ * License: GNU3
+ *
+ */
+
+define("_MI_IPLOG_NAME", "User IP Logger");
+define("_MI_IPLOG_DESC", "Modulo per la registrazione di indirizzi IP utente");
+
+//Admin links
+define("_MI_IPLOG_INDEX", "Index");
+define("_MI_IPLOG_LOG", "IP Logs");
+define("_MI_IPLOG_GRAPHS", "Grafici");
+define('_MI_IPLOG_DASHBOARD', 'Dashboard');
+define('_MI_IPLOG_ABOUT', 'Info sul modulo');
+
+//Preferences
+define('_MI_IPLOG_LOGDROPS', 'Log elimina se dopo');
+define('_MI_IPLOG_LOGDROPS_DESC', 'Questo è quanto il registro rimane sul tuo sito per dopo un record raggiunge questa et\xE0 viene eliminato!');
+define('_MI_IPLOG_LOGDROPS_24HOURS', '24 Ore');
+define('_MI_IPLOG_LOGDROPS_1WEEK', '1 Settimana');
+define('_MI_IPLOG_LOGDROPS_FORTNIGHT', 'Una quindicina di giorni');
+define('_MI_IPLOG_LOGDROPS_1MONTH', '1 Mese');
+define('_MI_IPLOG_LOGDROPS_2MONTHS', '2 Mesi');
+define('_MI_IPLOG_LOGDROPS_3MONTHS', '3 Mesi');
+define('_MI_IPLOG_LOGDROPS_4MONTHS', '4 Mesi');
+define('_MI_IPLOG_LOGDROPS_5MONTHS', '5 Mesi');
+define('_MI_IPLOG_LOGDROPS_6MONTHS', '6 Mesi');
+define('_MI_IPLOG_LOGDROPS_12MONTHS', '1 Anno');
+define('_MI_IPLOG_LOGDROPS_24MONTHS', '2 Anni');
+define('_MI_IPLOG_LOGDROPS_36MONTHS', '3 Anni');
+
+define('_MI_IPLOG_IPDB_APIKEY', 'IPDB API Key');
+define('_MI_IPLOG_IPDB_APIKEY_DESC', 'Registrati a <a href="http://ipinfodb.com/register.php">IPDB Registration</a> per ricevere una chiave API');
+define('_MI_IPLOG_USER_AGENT', 'cURL User-agent');
+define('_MI_IPLOG_USER_AGENT_DESC', 'Questo è l\'useragent utilizzato quando l\'arricciatura è istanziare');
+define('_MI_IPLOG_CURL_CONNECTION_TIMEOUT', 'cURL DNS Timeout di connessione');
+define('_MI_IPLOG_CURL_CONNECTION_TIMEOUT_DESC', 'Questo è il numero di secondi che un DNS deve rispondere con arricciatura');
+define('_MI_IPLOG_CURL_TIMEOUT', 'cURL Timeout di comunicazione');
+define('_MI_IPLOG_CURL_TIMEOUT_DESC', 'Questo è il numero di secondi che dispone di un server di rispondere prima di cURL timesout');
+define('_MI_IPLOG_CURL_SSL_VERIFY_PEER', 'cURL Convalida dei certificati SSL');
+define('_MI_IPLOG_CURL_SSL_VERIFY_PEER_DESC', 'Quando questa opzione è attivata deve avere un certificato SSL valido quando si collega con l\'arricciatura a https://');
+define('_MI_IPLOG_CURL_VERBOSE', 'cURL è dettagliato');
+define('_MI_IPLOG_CURL_VERBOSE_DESC', 'Questa è l\'opzione che è possibile attivare per fare l\'arricciatura si comporti verbosely!');
+
+// Version 1.02
+define("_MI_IPLOG_GUEST", "Anonimo");
+define('_MI_IPLOG_ANONYMOUS', 'Consenti all\'utente anonimo di essere registrati!');
+define('_MI_IPLOG_ANONYMOUS_DESC', 'L\'attivazione di questa significa che gli utenti che non sono loggati vengono anche registrati!');
+define('_MI_IPLOG_IPV4', 'IPv4');
+define('_MI_IPLOG_IPV6', 'IPv6');
+
+?>
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <txm...@us...> - 2012-07-28 13:55:51
|
Revision: 9939
http://xoops.svn.sourceforge.net/xoops/?rev=9939&view=rev
Author: txmodxoops
Date: 2012-07-28 13:55:41 +0000 (Sat, 28 Jul 2012)
Log Message:
-----------
Updated
Modified
Modified Paths:
--------------
XoopsModules/iplog/branches/timgno/modules/iplog/images/logo.png
XoopsModules/iplog/branches/timgno/modules/iplog/templates/iplog_log_list.html
Modified: XoopsModules/iplog/branches/timgno/modules/iplog/images/logo.png
===================================================================
(Binary files differ)
Modified: XoopsModules/iplog/branches/timgno/modules/iplog/templates/iplog_log_list.html
===================================================================
--- XoopsModules/iplog/branches/timgno/modules/iplog/templates/iplog_log_list.html 2012-07-28 13:30:23 UTC (rev 9938)
+++ XoopsModules/iplog/branches/timgno/modules/iplog/templates/iplog_log_list.html 2012-07-28 13:55:41 UTC (rev 9939)
@@ -1,4 +1,4 @@
-<!--
+<!--
-- Logs Guest and users IP Addresses for a period of time and provides
-- basic statistic of them in XOOPS Copyright (C) 2012 Simon Roberts
-- Contact: wishcraft - si...@ch...
@@ -35,7 +35,7 @@
</div>
<form action="<{$php_self}>" method='post'>
-<table>
+<table class="outer">
<tr class="head">
<th><{$ip_id_th}></th>
<th><{$uname_th}></th>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <txm...@us...> - 2012-07-28 13:30:29
|
Revision: 9938
http://xoops.svn.sourceforge.net/xoops/?rev=9938&view=rev
Author: txmodxoops
Date: 2012-07-28 13:30:23 +0000 (Sat, 28 Jul 2012)
Log Message:
-----------
Updated
Fixed bugs
Modified Paths:
--------------
XoopsModules/iplog/branches/timgno/modules/iplog/admin/dashboard.php
XoopsModules/iplog/branches/timgno/modules/iplog/xoops_version.php
Modified: XoopsModules/iplog/branches/timgno/modules/iplog/admin/dashboard.php
===================================================================
--- XoopsModules/iplog/branches/timgno/modules/iplog/admin/dashboard.php 2012-07-28 13:25:54 UTC (rev 9937)
+++ XoopsModules/iplog/branches/timgno/modules/iplog/admin/dashboard.php 2012-07-28 13:30:23 UTC (rev 9938)
@@ -30,10 +30,10 @@
* License: GNU3
*
*/
-
include ('header.php');
xoops_loadLanguage('admin', 'profile');
$log_handler = xoops_getmodulehandler('log', 'iplog');
+ echo $adminMenu->addNavigation('dashboard.php');
if (count($log_handler->getNumberByCountry())>1) {
$adminMenu->addInfoBox(_AM_IPLOG_ADMIN_COUNTS_BY_COUNTRY);
Modified: XoopsModules/iplog/branches/timgno/modules/iplog/xoops_version.php
===================================================================
--- XoopsModules/iplog/branches/timgno/modules/iplog/xoops_version.php 2012-07-28 13:25:54 UTC (rev 9937)
+++ XoopsModules/iplog/branches/timgno/modules/iplog/xoops_version.php 2012-07-28 13:30:23 UTC (rev 9938)
@@ -42,6 +42,11 @@
$modversion['image'] = "images/logo.png";
$modversion['dirname'] = "iplog";
$modversion['website'] = "www.xoops.org";
+$modversion['help'] = 'page=help';
+$modversion['min_php'] = '5.2';
+$modversion['min_xoops'] = '2.5';
+$modversion['min_admin'] = '1.1';
+$modversion['min_db']= array('mysql'=>'5.0.7', 'mysqli'=>'5.0.7');
$modversion['dirmoduleadmin'] = 'Frameworks/moduleclasses';
$modversion['system_icons16'] = 'Frameworks/moduleclasses/icons/16';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <txm...@us...> - 2012-07-28 13:26:05
|
Revision: 9937
http://xoops.svn.sourceforge.net/xoops/?rev=9937&view=rev
Author: txmodxoops
Date: 2012-07-28 13:25:54 +0000 (Sat, 28 Jul 2012)
Log Message:
-----------
Modified menu.php
Added dashboard.png in Frameworks/moduleclasses/icons/32
Added Paths:
-----------
XoopsModules/iplog/branches/
XoopsModules/iplog/branches/timgno/
XoopsModules/iplog/branches/timgno/Frameworks/
XoopsModules/iplog/branches/timgno/Frameworks/moduleclasses/
XoopsModules/iplog/branches/timgno/Frameworks/moduleclasses/icons/
XoopsModules/iplog/branches/timgno/Frameworks/moduleclasses/icons/32/
XoopsModules/iplog/branches/timgno/Frameworks/moduleclasses/icons/32/dashboard.png
XoopsModules/iplog/branches/timgno/modules/
XoopsModules/iplog/branches/timgno/modules/iplog/
XoopsModules/iplog/branches/timgno/modules/iplog/admin/
XoopsModules/iplog/branches/timgno/modules/iplog/admin/about.php
XoopsModules/iplog/branches/timgno/modules/iplog/admin/dashboard.php
XoopsModules/iplog/branches/timgno/modules/iplog/admin/footer.php
XoopsModules/iplog/branches/timgno/modules/iplog/admin/header.php
XoopsModules/iplog/branches/timgno/modules/iplog/admin/index.html
XoopsModules/iplog/branches/timgno/modules/iplog/admin/log.php
XoopsModules/iplog/branches/timgno/modules/iplog/admin/menu.php
XoopsModules/iplog/branches/timgno/modules/iplog/class/
XoopsModules/iplog/branches/timgno/modules/iplog/class/countries.php
XoopsModules/iplog/branches/timgno/modules/iplog/class/index.html
XoopsModules/iplog/branches/timgno/modules/iplog/class/log.php
XoopsModules/iplog/branches/timgno/modules/iplog/docs/
XoopsModules/iplog/branches/timgno/modules/iplog/docs/changelog.txt
XoopsModules/iplog/branches/timgno/modules/iplog/docs/credits.txt
XoopsModules/iplog/branches/timgno/modules/iplog/docs/index.html
XoopsModules/iplog/branches/timgno/modules/iplog/docs/install.txt
XoopsModules/iplog/branches/timgno/modules/iplog/docs/lang_diff.txt
XoopsModules/iplog/branches/timgno/modules/iplog/docs/licence.txt
XoopsModules/iplog/branches/timgno/modules/iplog/docs/license.pdf
XoopsModules/iplog/branches/timgno/modules/iplog/docs/readme.txt
XoopsModules/iplog/branches/timgno/modules/iplog/images/
XoopsModules/iplog/branches/timgno/modules/iplog/images/icons/
XoopsModules/iplog/branches/timgno/modules/iplog/images/icons/16/
XoopsModules/iplog/branches/timgno/modules/iplog/images/icons/16/index.html
XoopsModules/iplog/branches/timgno/modules/iplog/images/icons/16/iplog.log.png
XoopsModules/iplog/branches/timgno/modules/iplog/images/icons/32/
XoopsModules/iplog/branches/timgno/modules/iplog/images/icons/32/index.html
XoopsModules/iplog/branches/timgno/modules/iplog/images/icons/32/iplog.log.png
XoopsModules/iplog/branches/timgno/modules/iplog/images/icons/index.html
XoopsModules/iplog/branches/timgno/modules/iplog/images/index.html
XoopsModules/iplog/branches/timgno/modules/iplog/images/logo.png
XoopsModules/iplog/branches/timgno/modules/iplog/include/
XoopsModules/iplog/branches/timgno/modules/iplog/include/functions.php
XoopsModules/iplog/branches/timgno/modules/iplog/include/ip2locationlite.class.php
XoopsModules/iplog/branches/timgno/modules/iplog/index.html
XoopsModules/iplog/branches/timgno/modules/iplog/language/
XoopsModules/iplog/branches/timgno/modules/iplog/language/english/
XoopsModules/iplog/branches/timgno/modules/iplog/language/english/admin.php
XoopsModules/iplog/branches/timgno/modules/iplog/language/english/help/
XoopsModules/iplog/branches/timgno/modules/iplog/language/english/help/help.html
XoopsModules/iplog/branches/timgno/modules/iplog/language/english/help/index.html
XoopsModules/iplog/branches/timgno/modules/iplog/language/english/index.html
XoopsModules/iplog/branches/timgno/modules/iplog/language/english/mail_template/
XoopsModules/iplog/branches/timgno/modules/iplog/language/english/mail_template/index.html
XoopsModules/iplog/branches/timgno/modules/iplog/language/english/modinfo.php
XoopsModules/iplog/branches/timgno/modules/iplog/language/index.html
XoopsModules/iplog/branches/timgno/modules/iplog/preloads/
XoopsModules/iplog/branches/timgno/modules/iplog/preloads/index.html
XoopsModules/iplog/branches/timgno/modules/iplog/preloads/logger.php
XoopsModules/iplog/branches/timgno/modules/iplog/sql/
XoopsModules/iplog/branches/timgno/modules/iplog/sql/mysql.sql
XoopsModules/iplog/branches/timgno/modules/iplog/templates/
XoopsModules/iplog/branches/timgno/modules/iplog/templates/blocks/
XoopsModules/iplog/branches/timgno/modules/iplog/templates/blocks/index.html
XoopsModules/iplog/branches/timgno/modules/iplog/templates/index.html
XoopsModules/iplog/branches/timgno/modules/iplog/templates/iplog_log_list.html
XoopsModules/iplog/branches/timgno/modules/iplog/xoops_version.php
Added: XoopsModules/iplog/branches/timgno/Frameworks/moduleclasses/icons/32/dashboard.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/iplog/branches/timgno/Frameworks/moduleclasses/icons/32/dashboard.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/iplog/branches/timgno/modules/iplog/admin/about.php
===================================================================
--- XoopsModules/iplog/branches/timgno/modules/iplog/admin/about.php (rev 0)
+++ XoopsModules/iplog/branches/timgno/modules/iplog/admin/about.php 2012-07-28 13:25:54 UTC (rev 9937)
@@ -0,0 +1,72 @@
+<?php
+/*
+ * Logs Guest and users IP Addresses for a period of time and provides
+ * basic statistic of them in XOOPS Copyright (C) 2012 Simon Roberts
+ * Contact: wishcraft - si...@ch...
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * See /docs/license.pdf for full license.
+ *
+ * Shouts:- Mamba (www.xoops.org), flipse (www.nlxoops.nl)
+ * Many thanks for your additional work with version 1.01
+ *
+ * Version: 1.01 Final
+ * Published: Chronolabs
+ * Download: http://code.google.com/p/chronolabs
+ * This File: about.php
+ * Description: About Program Dialogue for Admin Control Panel
+ * Date: 28/07/2015 5:45PM AEST
+ * License: GNU3
+ *
+ */
+ include ('header.php');
+ xoops_loadLanguage('admin', 'iplog');
+ echo $adminMenu->addNavigation('about.php');
+
+ $paypalitemno = 'PROFILE175';
+ $about = $adminMenu->renderabout($paypalitemno, false);
+ $donationform = array( 0 => '<form name="donation" id="donation" action="http://www.chronolabs.com.au/modules/xpayment/" method="post" onsubmit="return xoopsFormValidate_donation();">',
+ 1 => '<table class="outer" cellspacing="1" width="100%"><tbody><tr><th colspan="2">'.constant('_AM_IPLOG_ABOUT_MAKEDONATE').'</th></tr><tr align="left" valign="top"><td class="head"><div class="xoops-form-element-caption-required"><span class="caption-text">Donation Amount</span><span class="caption-marker">*</span></div></td><td class="even"><select size="1" name="item[A][amount]" id="item[A][amount]" title="Donation Amount"><option value="5">5.00 AUD</option><option value="10">10.00 AUD</option><option value="20">20.00 AUD</option><option value="40">40.00 AUD</option><option value="60">60.00 AUD</option><option value="80">80.00 AUD</option><option value="90">90.00 AUD</option><option value="100">100.00 AUD</option><option value="200">200.00 AUD</option></select></td></tr><tr align="left" valign="top"><td class="head"></td><td class="even"><input class="formButton" name="submit" id="submit" value="'._SUBMIT.'" title="'._SUBMIT.'" type="submit"></td></tr></tbody></table>',
+ 2 => '<input name="op" id="op" value="createinvoice" type="hidden"><input name="plugin" id="plugin" value="donations" type="hidden"><input name="donation" id="donation" value="1" type="hidden"><input name="drawfor" id="drawfor" value="Chronolabs Co-Operative" type="hidden"><input name="drawto" id="drawto" value="%s" type="hidden"><input name="drawto_email" id="drawto_email" value="%s" type="hidden"><input name="key" id="key" value="%s" type="hidden"><input name="currency" id="currency" value="AUD" type="hidden"><input name="weight_unit" id="weight_unit" value="kgs" type="hidden"><input name="item[A][cat]" id="item[A][cat]" value="XDN%s" type="hidden"><input name="item[A][name]" id="item[A][name]" value="Donation for %s" type="hidden"><input name="item[A][quantity]" id="item[A][quantity]" value="1" type="hidden"><input name="item[A][shipping]" id="item[A][shipping]" value="0" type="hidden"><input name="item[A][handling]" id="item[A][handling]" value="0" type="hidden"><input name="item[A][weight]" id="item[A][weight]" value="0" type="hidden"><input name="item[A][tax]" id="item[A][tax]" value="0" type="hidden"><input name="return" id="return" value="http://www.chronolabs.coop/modules/donations/success.php" type="hidden"><input name="cancel" id="cancel" value="http://www.chronolabs.coop/modules/donations/success.php" type="hidden"></form>', 'D'=>'',
+ 3 => '',
+ 4 => '<!-- Start Form Validation JavaScript //-->
+<script type="text/javascript">
+<!--//
+function xoopsFormValidate_donation() { var myform = window.document.donation;
+var hasSelected = false; var selectBox = myform.item[A][amount];for (i = 0; i < selectBox.options.length; i++ ) { if (selectBox.options[i].selected == true && selectBox.options[i].value != \'\') { hasSelected = true; break; } }if (!hasSelected) { window.alert("Please enter Donation Amount"); selectBox.focus(); return false; }return true;
+}
+//--></script>
+<!-- End Form Validation JavaScript //-->');
+ $paypalform = array( 0 => '<form action="https://www.paypal.com/cgi-bin/webscr" method="post">',
+ 1 => '<input name="cmd" value="_s-xclick" type="hidden">',
+ 2 => '<input name="hosted_button_id" value="%s" type="hidden">',
+ 3 => '<img alt="" src="https://www.paypal.com/fr_FR/i/scr/pixel.gif" height="1" border="0" width="1">',
+ 4 => '<input src="https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif" name="submit" alt="PayPal - The safer, easier way to pay online!" border="0" type="image">',
+ 5 => '</form>');
+ for($key=0;$key<=4;$key++) {
+ switch ($key) {
+ case 2:
+ $donationform[$key] = sprintf($donationform[$key], $GLOBALS['xoopsConfig']['sitename'] . ' - ' . (strlen($GLOBALS['xoopsUser']->getVar('name'))>0?$GLOBALS['xoopsUser']->getVar('name'). ' ['.$GLOBALS['xoopsUser']->getVar('uname').']':$GLOBALS['xoopsUser']->getVar('uname')), $GLOBALS['xoopsUser']->getVar('email'), XOOPS_LICENSE_KEY, strtoupper($GLOBALS['iplogModule']->getVar('dirname')), strtoupper($GLOBALS['iplogModule']->getVar('dirname')). ' '.$GLOBALS['iplogModule']->getVar('name'));
+ break;
+ }
+ }
+
+ $istart = strpos($about, ($paypalform[0]), 1);
+ $iend = strpos($about, ($paypalform[5]), $istart+1)+strlen($paypalform[5])-1;
+ echo (substr($about, 0, $istart-1));
+ echo implode("\n", $donationform);
+ echo (substr($about, $iend+1, strlen($about)-$iend-1));
+
+ include(dirname(__FILE__).'/footer.php');
+?>
\ No newline at end of file
Added: XoopsModules/iplog/branches/timgno/modules/iplog/admin/dashboard.php
===================================================================
--- XoopsModules/iplog/branches/timgno/modules/iplog/admin/dashboard.php (rev 0)
+++ XoopsModules/iplog/branches/timgno/modules/iplog/admin/dashboard.php 2012-07-28 13:25:54 UTC (rev 9937)
@@ -0,0 +1,87 @@
+<?php
+/*
+ * Logs Guest and users IP Addresses for a period of time and provides
+ * basic statistic of them in XOOPS Copyright (C) 2012 Simon Roberts
+ * Contact: wishcraft - si...@ch...
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * See /docs/license.pdf for full license.
+ *
+ * Shouts:- Mamba (www.xoops.org), flipse (www.nlxoops.nl)
+ * Many thanks for your additional work with version 1.01
+ *
+ * Version: 1.01 Final
+ * Published: Chronolabs
+ * Download: http://code.google.com/p/chronolabs
+ * This File: dashboard.php
+ * Description: User admin dashboard for Admin Control Panel
+ * Date: 28/07/2015 5:45PM AEST
+ * License: GNU3
+ *
+ */
+
+ include ('header.php');
+ xoops_loadLanguage('admin', 'profile');
+ $log_handler = xoops_getmodulehandler('log', 'iplog');
+
+ if (count($log_handler->getNumberByCountry())>1) {
+ $adminMenu->addInfoBox(_AM_IPLOG_ADMIN_COUNTS_BY_COUNTRY);
+ foreach ($log_handler->getNumberByCountry() as $id => $value)
+ $adminMenu->addInfoBoxLine(_AM_IPLOG_ADMIN_COUNTS_BY_COUNTRY, "<label>".($value['node']=='-'?_AM_IPLOG_UNKNOWN:$value['node']).": %s</label>", $value['total'], 'Green');
+ }
+ if (count($log_handler->getNumberByRegion())>1) {
+ $adminMenu->addInfoBox(_AM_IPLOG_ADMIN_COUNTS_BY_REGION);
+ foreach ($log_handler->getNumberByRegion() as $id => $value)
+ $adminMenu->addInfoBoxLine(_AM_IPLOG_ADMIN_COUNTS_BY_REGION, "<label>".($value['node']=='-'?_AM_IPLOG_UNKNOWN:$value['node']).": %s</label>", $value['total'], 'Green');
+ }
+ if (count($log_handler->getNumberByContinent())>1) {
+ $adminMenu->addInfoBox(_AM_IPLOG_ADMIN_COUNTS_BY_CONTINENT);
+ foreach ($log_handler->getNumberByContinent() as $id => $value)
+ $adminMenu->addInfoBoxLine(_AM_IPLOG_ADMIN_COUNTS_BY_CONTINENT, "<label>".($value['node']=='-'?_AM_IPLOG_UNKNOWN:$value['node']).": %s</label>", $value['total'], 'Green');
+ }
+ if (count($log_handler->getTotalSecondsByCountry())>1) {
+ $adminMenu->addInfoBox(_AM_IPLOG_ADMIN_SUM_BY_COUNTRY);
+ foreach ($log_handler->getTotalSecondsByCountry() as $id => $value)
+ $adminMenu->addInfoBoxLine(_AM_IPLOG_ADMIN_SUM_BY_COUNTRY, "<label>".($value['node']=='-'?_AM_IPLOG_UNKNOWN:$value['node']).": %s</label>", $value['total'], 'Green');
+ }
+ if (count($log_handler->getTotalSecondsByRegion())>1) {
+ $adminMenu->addInfoBox(_AM_IPLOG_ADMIN_SUM_BY_REGION);
+ foreach ($log_handler->getTotalSecondsByRegion() as $id => $value)
+ $adminMenu->addInfoBoxLine(_AM_IPLOG_ADMIN_SUM_BY_REGION, "<label>".($value['node']=='-'?_AM_IPLOG_UNKNOWN:$value['node']).": %s</label>", $value['total'], 'Green');
+ }
+ if (count($log_handler->getTotalSecondsByContinent())>1) {
+ $adminMenu->addInfoBox(_AM_IPLOG_ADMIN_SUM_BY_CONTINENT);
+ foreach ($log_handler->getTotalSecondsByContinent() as $id => $value)
+ $adminMenu->addInfoBoxLine(_AM_IPLOG_ADMIN_SUM_BY_CONTINENT, "<label>".($value['node']=='-'?_AM_IPLOG_UNKNOWN:$value['node']).": %s</label>", $value['total'], 'Green');
+ }
+ if (count($log_handler->getAdverageSecondsByCountry())>1) {
+ $adminMenu->addInfoBox(_AM_IPLOG_ADMIN_AVG_BY_COUNTRY);
+ foreach ($log_handler->getAdverageSecondsByCountry() as $id => $value)
+ $adminMenu->addInfoBoxLine(_AM_IPLOG_ADMIN_AVG_BY_COUNTRY, "<label>".($value['node']=='-'?_AM_IPLOG_UNKNOWN:$value['node']).": %s</label>", $value['total'], 'Green');
+ }
+ if (count($log_handler->getAdverageSecondsByRegion())>1) {
+ $adminMenu->addInfoBox(_AM_IPLOG_ADMIN_AVG_BY_REGION);
+ foreach ($log_handler->getAdverageSecondsByRegion() as $id => $value)
+ $adminMenu->addInfoBoxLine(_AM_IPLOG_ADMIN_AVG_BY_REGION, "<label>".($value['node']=='-'?_AM_IPLOG_UNKNOWN:$value['node']).": %s</label>", $value['total'], 'Green');
+ }
+ if (count($log_handler->getAdverageSecondsByContinent())>1) {
+ $adminMenu->addInfoBox(_AM_IPLOG_ADMIN_AVG_BY_CONTINENT);
+ foreach ($log_handler->getAdverageSecondsByContinent() as $id => $value)
+ $adminMenu->addInfoBoxLine(_AM_IPLOG_ADMIN_AVG_BY_CONTINENT, "<label>".($value['node']=='-'?_AM_IPLOG_UNKNOWN:$value['node']).": %s</label>", $value['total'], 'Green');
+ }
+
+ echo $adminMenu->renderIndex();
+ include(dirname(__FILE__).'/footer.php');
+
+?>
\ No newline at end of file
Added: XoopsModules/iplog/branches/timgno/modules/iplog/admin/footer.php
===================================================================
--- XoopsModules/iplog/branches/timgno/modules/iplog/admin/footer.php (rev 0)
+++ XoopsModules/iplog/branches/timgno/modules/iplog/admin/footer.php 2012-07-28 13:25:54 UTC (rev 9937)
@@ -0,0 +1,36 @@
+<?php
+/*
+ * Logs Guest and users IP Addresses for a period of time and provides
+ * basic statistic of them in XOOPS Copyright (C) 2012 Simon Roberts
+ * Contact: wishcraft - si...@ch...
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * See /docs/license.pdf for full license.
+ *
+ * Shouts:- Mamba (www.xoops.org), flipse (www.nlxoops.nl)
+ * Many thanks for your additional work with version 1.01
+ *
+ * Version: 1.01 Final
+ * Published: Chronolabs
+ * Download: http://code.google.com/p/chronolabs
+ * This File: footer.php
+ * Description: Footer Include File for Admin Control Panel
+ * Date: 28/07/2015 5:45PM AEST
+ * License: GNU3
+ *
+ */
+echo "<div align=\"center\"><a href=\"http://www.xoops.org\" target=\"_blank\"><img src=" . XOOPS_URL ."/". $GLOBALS['iplogModule']->getInfo("system_icons32")."/xoopsmicrobutton.gif"." alt=\"XOOPS\" title=\"XOOPS\"></a></div>";
+echo "<div class='center smallsmall italic pad5'><strong>" . $GLOBALS['iplogModule']->getVar("name") . "</strong> is maintained by the <a class='tooltip' rel='external' href='http://www.xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>";
+
+xoops_cp_footer();
\ No newline at end of file
Added: XoopsModules/iplog/branches/timgno/modules/iplog/admin/header.php
===================================================================
--- XoopsModules/iplog/branches/timgno/modules/iplog/admin/header.php (rev 0)
+++ XoopsModules/iplog/branches/timgno/modules/iplog/admin/header.php 2012-07-28 13:25:54 UTC (rev 9937)
@@ -0,0 +1,102 @@
+<?php
+/*
+ * Logs Guest and users IP Addresses for a period of time and provides
+ * basic statistic of them in XOOPS Copyright (C) 2012 Simon Roberts
+ * Contact: wishcraft - si...@ch...
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * See /docs/license.pdf for full license.
+ *
+ * Shouts:- Mamba (www.xoops.org), flipse (www.nlxoops.nl)
+ * Many thanks for your additional work with version 1.01
+ *
+ * Version: 1.01 Final
+ * Published: Chronolabs
+ * Download: http://code.google.com/p/chronolabs
+ * This File: header.php
+ * Description: Header Include file for Admin Control Panel
+ * Date: 28/07/2015 5:45PM AEST
+ * License: GNU3
+ *
+ */
+
+ require_once (dirname(dirname(dirname(dirname(__FILE__)))).'/include/cp_header.php');
+
+ if (!defined('_CHARSET'))
+ define ("_CHARSET","UTF-8");
+ if (!defined('_CHARSET_ISO'))
+ define ("_CHARSET_ISO","ISO-8859-1");
+
+ $GLOBALS['myts'] = MyTextSanitizer::getInstance();
+
+ $module_handler = xoops_gethandler('module');
+ $config_handler = xoops_gethandler('config');
+ $GLOBALS['iplogModule'] = $module_handler->getByDirname('iplog');
+ $GLOBALS['iplogModuleConfig'] = $config_handler->getConfigList($GLOBALS['iplogModule']->getVar('mid'));
+
+ xoops_load('pagenav');
+ xoops_load('xoopslists');
+ xoops_load('xoopsformloader');
+
+ include_once $GLOBALS['xoops']->path('class'.DS.'xoopsmailer.php');
+ include_once $GLOBALS['xoops']->path('class'.DS.'xoopstree.php');
+
+ if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){
+ include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
+ }else{
+ echo xoops_error("Error: You don't use the Frameworks \"admin module\". Please install this Frameworks");
+ }
+
+ $GLOBALS['iplogSystemImageIcon'] = XOOPS_URL .'/'. $GLOBALS['iplogModule']->getInfo('system_icons16');
+ $GLOBALS['iplogSystemImageAdmin'] = XOOPS_URL .'/'. $GLOBALS['iplogModule']->getInfo('system_icons32');
+ $GLOBALS['iplogImageIcon'] = XOOPS_URL .'/'. $GLOBALS['iplogModule']->getInfo('icons16');
+ $GLOBALS['iplogImageAdmin'] = XOOPS_URL .'/'. $GLOBALS['iplogModule']->getInfo('icons32');
+
+ if ($GLOBALS['xoopsUser']) {
+ $moduleperm_handler =& xoops_gethandler('groupperm');
+ if (!$moduleperm_handler->checkRight('module_admin', $GLOBALS['iplogModule']->getVar( 'mid' ), $GLOBALS['xoopsUser']->getGroups())) {
+ redirect_header(XOOPS_URL, 1, _NOPERM);
+ exit();
+ }
+ } else {
+ redirect_header(XOOPS_URL . "/user.php", 1, _NOPERM);
+ exit();
+ }
+
+ require_once $GLOBALS['xoops']->path('/modules/iplog/include/functions.php');
+
+ xoops_loadLanguage('user');
+
+ if (!isset($GLOBALS['xoopsTpl']) || !is_object($GLOBALS['xoopsTpl'])) {
+ include_once(XOOPS_ROOT_PATH."/class/template.php");
+ $GLOBALS['xoopsTpl'] = new XoopsTpl();
+ }
+
+ $GLOBALS['xoopsTpl']->assign('pathSystemImageIcon', $GLOBALS['iplogSystemImageIcon']);
+ $GLOBALS['xoopsTpl']->assign('pathSystemImageAdmin', $GLOBALS['iplogSystemImageAdmin']);
+ $GLOBALS['xoopsTpl']->assign('pathImageIcon', $GLOBALS['iplogImageIcon']);
+ $GLOBALS['xoopsTpl']->assign('pathImageAdmin', $GLOBALS['iplogImageAdmin']);
+
+ $op = isset($_REQUEST['op'])?$_REQUEST['op']:"dashboard";
+ $fct = isset($_REQUEST['fct'])?$_REQUEST['fct']:"list";
+ $limit = !empty($_REQUEST['limit'])?intval($_REQUEST['limit']):30;
+ $start = !empty($_REQUEST['start'])?intval($_REQUEST['start']):0;
+ $order = !empty($_REQUEST['order'])?$_REQUEST['order']:'DESC';
+ $sort = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'start';
+ $filter = !empty($_REQUEST['filter'])?''.$_REQUEST['filter'].'':'1,1';
+ $id = !empty($_REQUEST['id'])?(is_array($_REQUEST['id'])?array_unique($_REQUEST['id']):intval($_REQUEST['id'])):0;
+
+ xoops_cp_header();
+ $adminMenu = new ModuleAdmin();
+?>
\ No newline at end of file
Added: XoopsModules/iplog/branches/timgno/modules/iplog/admin/index.html
===================================================================
--- XoopsModules/iplog/branches/timgno/modules/iplog/admin/index.html (rev 0)
+++ XoopsModules/iplog/branches/timgno/modules/iplog/admin/index.html 2012-07-28 13:25:54 UTC (rev 9937)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/iplog/branches/timgno/modules/iplog/admin/log.php
===================================================================
--- XoopsModules/iplog/branches/timgno/modules/iplog/admin/log.php (rev 0)
+++ XoopsModules/iplog/branches/timgno/modules/iplog/admin/log.php 2012-07-28 13:25:54 UTC (rev 9937)
@@ -0,0 +1,108 @@
+<?php
+/*
+ * Logs Guest and users IP Addresses for a period of time and provides
+ * basic statistic of them in XOOPS Copyright (C) 2012 Simon Roberts
+ * Contact: wishcraft - si...@ch...
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * See /docs/license.pdf for full license.
+ *
+ * Shouts:- Mamba (www.xoops.org), flipse (www.nlxoops.nl)
+ * Many thanks for your additional work with version 1.01
+ *
+ * Version: 1.01 Final
+ * Published: Chronolabs
+ * Download: http://code.google.com/p/chronolabs
+ * This File: log.php
+ * Description: Log Admin Control Panel Browser
+ * Date: 28/07/2015 5:45PM AEST
+ * License: GNU3
+ *
+ */
+include 'header.php';
+echo $adminMenu->addNavigation('log.php');
+
+$op = isset($_REQUEST['op']) ? $_REQUEST['op'] : 'log';
+$fct = isset($_REQUEST['fct']) ? $_REQUEST['fct'] : 'list';
+
+switch($op) {
+case "log":
+ switch ($fct)
+ {
+ default:
+ case "list":
+
+ include_once $GLOBALS['xoops']->path( "/class/pagenav.php" );
+
+ $log_handler =& xoops_getmodulehandler('log', 'iplog');
+
+ $criteria = new Criteria(1,1);
+ $ttl = $log_handler->getCount($criteria);
+ $sort = !empty($_REQUEST['sort'])?''.str_replace('_', '-', $_REQUEST['sort']).'':'start';
+
+ $pagenav = new XoopsPageNav($ttl, $limit, $start, 'start', 'limit='.$limit.'&sort='.$sort.'&order='.$order.'&op='.$op.'&fct='.$fct.'&filter='.$filter.'&fct='.$fct.'&filter='.$filter);
+ $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
+
+ foreach ($log_handler->getFields() as $id => $key) {
+ $GLOBALS['xoopsTpl']->assign(strtolower(str_replace('-','_',$key).'_th'), '<a href="'.$_SERVER['PHP_SELF'].'?start='.$start.'&limit='.$limit.'&sort='.str_replace('_','-',$key).'&order='.((str_replace('_','-',$key)==$sort)?($order=='DESC'?'ASC':'DESC'):$order).'&op='.$op.'&filter='.$filter.'">'.(defined('_AM_IPLOG_TH_'.strtoupper(str_replace('-','_',$key)))?constant('_AM_IPLOG_TH_'.strtoupper(str_replace('-','_',$key))):'_AM_IPLOG_TH_'.strtoupper(str_replace('-','_',$key))).'</a>');
+ }
+
+ $GLOBALS['xoopsTpl']->assign('limit', $limit);
+ $GLOBALS['xoopsTpl']->assign('start', $start);
+ $GLOBALS['xoopsTpl']->assign('order', $order);
+ $GLOBALS['xoopsTpl']->assign('sort', $sort);
+ $GLOBALS['xoopsTpl']->assign('filter', $filter);
+ $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['xoopsModuleConfig']);
+
+ $criteria->setStart($start);
+ $criteria->setLimit($limit);
+ $criteria->setSort('`'.$sort.'`');
+ $criteria->setOrder($order);
+
+ $logs = $log_handler->getObjects($criteria, true);
+ foreach($logs as $cid => $log) {
+ if (!is_object($log))
+ $log_handler->delete($cid);
+ else
+ $GLOBALS['xoopsTpl']->append('log', $log->toArray());
+ }
+ $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']);
+ $GLOBALS['xoopsTpl']->display('db:iplog_log_list.html');
+ break;
+
+
+ case "delete":
+
+ $log_handler =& xoops_getmodulehandler('log', 'iplog');
+
+ if (isset($_POST['id'])&&$id!=0) {
+ $log = $log_handler->get($id);
+ if (!$log_handler->delete($log)) {
+ redirect_header('log.php?op='.$op.'&fct=list&limit='.$limit.'&start='.$start.'&order='.$order.'&sort='.$sort.'&filter='.$filter, 10, _AM_MSG_LOG_FAILEDTODELETE);
+ exit(0);
+ } else {
+ redirect_header('log.php?op='.$op.'&fct=list&limit='.$limit.'&start='.$start.'&order='.$order.'&sort='.$sort.'&filter='.$filter, 10, _AM_MSG_LOG_DELETED);
+ exit(0);
+ }
+ } else {
+ $log = $log_handler->get($id);
+ xoops_confirm(array('id'=>$id, 'op'=>$_REQUEST['op'], 'fct'=>$_REQUEST['fct'], 'limit'=>$_REQUEST['limit'], 'start'=>$_REQUEST['start'], 'order'=>$_REQUEST['order'], 'sort'=>$_REQUEST['sort'], 'filter'=>$_REQUEST['filter']), 'log.php', sprintf(_AM_MSG_LOG_DELETE, $log->getVar('uname'), $log->getIPAddy(), $log->getVar('ip_id')));
+ }
+ break;
+ }
+ break;
+}
+
+include(dirname(__FILE__).'/footer.php');
+?>
\ No newline at end of file
Added: XoopsModules/iplog/branches/timgno/modules/iplog/admin/menu.php
===================================================================
--- XoopsModules/iplog/branches/timgno/modules/iplog/admin/menu.php (rev 0)
+++ XoopsModules/iplog/branches/timgno/modules/iplog/admin/menu.php 2012-07-28 13:25:54 UTC (rev 9937)
@@ -0,0 +1,52 @@
+<?php
+/*
+ * Logs Guest and users IP Addresses for a period of time and provides
+ * basic statistic of them in XOOPS Copyright (C) 2012 Simon Roberts
+ * Contact: wishcraft - si...@ch...
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * See /docs/license.pdf for full license.
+ *
+ * Shouts:- Mamba (www.xoops.org), flipse (www.nlxoops.nl)
+ * Many thanks for your additional work with version 1.01
+ *
+ * Version: 1.01 Final
+ * Published: Chronolabs
+ * Download: http://code.google.com/p/chronolabs
+ * This File: menu.php
+ * Description: User admin menu defines for menu variables
+ * Date: 28/07/2015 5:45PM AEST
+ * License: GNU3
+ *
+ */
+$module_handler = xoops_gethandler('module');
+$GLOBALS['iplogModule'] = $module_handler->getByDirname('iplog');
+$sys_icons32 = $GLOBALS['iplogModule']->getInfo('system_icons32');
+$icons32 = $GLOBALS['iplogModule']->getInfo('icons32');
+$adminmenu = array();
+if (is_object($GLOBALS['iplogModule'])) {
+ $adminmenu[0]['title'] = _MI_IPLOG_DASHBOARD;
+ $adminmenu[0]['icon'] = '../../'.$sys_icons32.'/dashboard.png';
+ $adminmenu[0]['image'] = '../../'.$sys_icons32.'/dashboard.png';
+ $adminmenu[0]['link'] = "admin/dashboard.php";
+ $adminmenu[1]['title'] = _MI_IPLOG_LOG;
+ $adminmenu[1]['icon'] = '../../'.$icons32.'/iplog.log.png';
+ $adminmenu[1]['image'] = '../../'.$icons32.'/iplog.log.png';
+ $adminmenu[1]['link'] = "admin/log.php";
+ $adminmenu[2]['title'] = _MI_IPLOG_ABOUT;
+ $adminmenu[2]['icon'] = '../../'.$sys_icons32.'/about.png';
+ $adminmenu[2]['image'] = '../../'.$sys_icons32.'/about.png';
+ $adminmenu[2]['link'] = "admin/about.php";
+}
+?>
\ No newline at end of file
Added: XoopsModules/iplog/branches/timgno/modules/iplog/class/countries.php
===================================================================
--- XoopsModules/iplog/branches/timgno/modules/iplog/class/countries.php (rev 0)
+++ XoopsModules/iplog/branches/timgno/modules/iplog/class/countries.php 2012-07-28 13:25:54 UTC (rev 9937)
@@ -0,0 +1,100 @@
+<?php
+/*
+ * Logs Guest and users IP Addresses for a period of time and provides
+ * basic statistic of them in XOOPS Copyright (C) 2012 Simon Roberts
+ * Contact: wishcraft - si...@ch...
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * See /docs/license.pdf for full license.
+ *
+ * Shouts:- Mamba (www.xoops.org), flipse (www.nlxoops.nl)
+ * Many thanks for your additional work with version 1.01
+ *
+ * Version: 1.01 Final
+ * Published: Chronolabs
+ * Download: http://code.google.com/p/chronolabs
+ * This File: countries.php
+ * Description: Countries Handler and Object Class for Module
+ * Date: 28/07/2015 5:45PM AEST
+ * License: GNU3
+ *
+ */
+
+defined('XOOPS_ROOT_PATH') or die("XOOPS root path not defined");
+
+/**
+ * @package kernel
+ * @copyright copyright © 2000 XOOPS.org
+ */
+class IplogCountries extends XoopsObject
+{
+ function __construct()
+ {
+ $this->initVar('country_id', XOBJ_DTYPE_INT, null, true);
+ $this->initVar('code', XOBJ_DTYPE_TXTBOX);
+ $this->initVar('name', XOBJ_DTYPE_TXTBOX);
+ $this->initVar('dialcode', XOBJ_DTYPE_TXTBOX);
+ $this->initVar('tldexists', XOBJ_DTYPE_TXTBOX);
+ $this->initVar('tld', XOBJ_DTYPE_TXTBOX);
+ $this->initVar('startgmt', XOBJ_DTYPE_DECIMAL);
+ $this->initVar('endgmt', XOBJ_DTYPE_DECIMAL);
+ $this->initVar('region', XOBJ_DTYPE_ENUM, false, false, false, false, array('Antarctica','Australasia','Caribbean','Central Africa','Central America','Central Asia','Eastern Africa','Eastern Asia','Eastern Europe','Middle East','North America','Northern Africa','Northern Asia','Northern Europe','South America','Southeastern Asia','Southeastern Europe','Southern Africa','Southern Asia','Southern Europe','Southwestern Asia','United States','Western Africa','Western Europe','Other'));
+ $this->initVar('continent', XOBJ_DTYPE_ENUM, false, false, false, false, array('Africa','Asia','Europe','North America','South America','Oceania','Other'));
+ $this->initVar('daylightsaving', XOBJ_DTYPE_ENUM, false, false, false, false, array('Yes','No'));
+ $this->initVar('start_dls_day', XOBJ_DTYPE_ENUM, false, false, false, false, array('Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday'));
+ $this->initVar('start_dls_week', XOBJ_DTYPE_ENUM, false, false, false, false, array('1st','2nd','3rd','4th'));
+ $this->initVar('start_dls_month', XOBJ_DTYPE_ENUM, false, false, false, false, array('January','Febuary','March','April','May','June','July','August','September','October','November','December'));
+ $this->initVar('start_dls_dayno', XOBJ_DTYPE_INT);
+ $this->initVar('start_dls_mode', XOBJ_DTYPE_ENUM, false, false, false, false, array('day','dayno'));
+ $this->initVar('end_dls_day', XOBJ_DTYPE_ENUM, false, false, false, false, array('Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday'));
+ $this->initVar('end_dls_week', XOBJ_DTYPE_ENUM, false, false, false, false, array('1st','2nd','3rd','4th'));
+ $this->initVar('end_dls_month', XOBJ_DTYPE_ENUM, false, false, false, false, array('January','Febuary','March','April','May','June','July','August','September','October','November','December'));
+ $this->initVar('end_dls_dayno', XOBJ_DTYPE_INT);
+ $this->initVar('end_dls_mode', XOBJ_DTYPE_ENUM, false, false, false, false, array('day','dayno'));
+
+ $this->initVar('cat_weight', XOBJ_DTYPE_INT);
+ }
+
+}
+
+/**
+ * @package kernel
+ * @copyright copyright © 2000 XOOPS.org
+ */
+class IplogCountriesHandler extends XoopsPersistableObjectHandler
+{
+ function IplogCountriesHandler(&$db)
+ {
+ $this->__construct($db);
+ }
+
+ function __construct(&$db)
+ {
+ parent::__construct($db, "iplog_countries", "IplogCountries", "country_id", 'name');
+ }
+
+ function getIDByCode($code, $as_id = true) {
+ if ($this->getCount(new Criteria('code', strtoupper($code)))) {
+ $objs = $this->getObjects(new Criteria('code', strtoupper($code)), false);
+ if (is_object($objs[0])) {
+ if ($as_id==true)
+ return $objs[0]->getVar('country_id');
+ else
+ return $objs[0];
+ }
+ }
+ return false;
+ }
+}
+?>
\ No newline at end of file
Added: XoopsModules/iplog/branches/timgno/modules/iplog/class/index.html
===================================================================
--- XoopsModules/iplog/branches/timgno/modules/iplog/class/index.html (rev 0)
+++ XoopsModules/iplog/branches/timgno/modules/iplog/class/index.html 2012-07-28 13:25:54 UTC (rev 9937)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/iplog/branches/timgno/modules/iplog/class/log.php
===================================================================
--- XoopsModules/iplog/branches/timgno/modules/iplog/class/log.php (rev 0)
+++ XoopsModules/iplog/branches/timgno/modules/iplog/class/log.php 2012-07-28 13:25:54 UTC (rev 9937)
@@ -0,0 +1,435 @@
+<?php
+/*
+ * Logs Guest and users IP Addresses for a period of time and provides
+* basic statistic of them in XOOPS Copyright (C) 2012 Simon Roberts
+* Contact: wishcraft - si...@ch...
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+* See /docs/license.pdf for full license.
+*
+* Shouts:- Mamba (www.xoops.org), flipse (www.nlxoops.nl)
+* Many thanks for your additional work with version 1.01
+*
+* Version: 1.01 Final
+* Published: Chronolabs
+* Download: http://code.google.com/p/chronolabs
+* This File: log.php
+* Description: Log Handler and Object Class for Module Instanciation
+* Date: 28/07/2015 5:45PM AEST
+* License: GNU3
+*
+*/
+if (!defined('XOOPS_ROOT_PATH')) {
+ exit();
+}
+
+require_once(dirname(dirname(__FILE__)).'/include/ip2locationlite.class.php');
+/**
+ * Class for Iplog Profiler
+ * @author Simon Roberts (si...@ch...)
+ * @copyright copyright (c) 2000-2009 XOOPS.org
+ * @package kernel
+ */
+class IplogLog extends XoopsObject
+{
+
+ function IplogLog($fid = null)
+ {
+ $this->initVar('ip_id', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('uid', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('agent', XOBJ_DTYPE_TXTBOX, null, false, 255);
+ $this->initVar('uname', XOBJ_DTYPE_TXTBOX, null, false, 32);
+ $this->initVar('ip4', XOBJ_DTYPE_TXTBOX, null, false, 255);
+ $this->initVar('ip6', XOBJ_DTYPE_TXTBOX, null, false, 65535);
+ $this->initVar('long', XOBJ_DTYPE_TXTBOX, null, false, 120);
+ $this->initVar('network-addy', XOBJ_DTYPE_TXTBOX, null, false, 255);
+ $this->initVar('country_id', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('country-code', XOBJ_DTYPE_TXTBOX, null, false, 3);
+ $this->initVar('country-name', XOBJ_DTYPE_TXTBOX, null, false, 128);
+ $this->initVar('region-name', XOBJ_DTYPE_TXTBOX, null, false, 128);
+ $this->initVar('city-name', XOBJ_DTYPE_TXTBOX, null, false, 128);
+ $this->initVar('postcode', XOBJ_DTYPE_TXTBOX, null, false, 15);
+ $this->initVar('latitude', XOBJ_DTYPE_DECIMAL, null, false);
+ $this->initVar('longitude', XOBJ_DTYPE_DECIMAL, null, false);
+ $this->initVar('time-zone', XOBJ_DTYPE_TXTBOX, null, false, 6);
+ $this->initVar('proxy-ip4', XOBJ_DTYPE_TXTBOX, null, false, 255);
+ $this->initVar('proxy-ip6', XOBJ_DTYPE_TXTBOX, null, false, 65535);
+ $this->initVar('proxy-long', XOBJ_DTYPE_TXTBOX, null, false, 65535);
+ $this->initVar('proxy-network-addy', XOBJ_DTYPE_TXTBOX, null, false, 65535);
+ $this->initVar('proxy-country_id', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('proxy-country-code', XOBJ_DTYPE_TXTBOX, null, false, 3);
+ $this->initVar('proxy-country-name', XOBJ_DTYPE_TXTBOX, null, false, 128);
+ $this->initVar('proxy-region-name', XOBJ_DTYPE_TXTBOX, null, false, 128);
+ $this->initVar('proxy-city-name', XOBJ_DTYPE_TXTBOX, null, false, 128);
+ $this->initVar('proxy-postcode', XOBJ_DTYPE_TXTBOX, null, false, 15);
+ $this->initVar('proxy-latitude', XOBJ_DTYPE_DECIMAL, null, false);
+ $this->initVar('proxy-longitude', XOBJ_DTYPE_DECIMAL, null, false);
+ $this->initVar('proxy-time-zone', XOBJ_DTYPE_TXTBOX, null, false, 6);
+ $this->initVar('session_id', XOBJ_DTYPE_TXTBOX, null, false, 128);
+ $this->initVar('start', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('end', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('online', XOBJ_DTYPE_INT, null, false);
+ }
+
+ function toArray() {
+ $ret = parent::toArray();
+ $ret['made'] = date(_DATESTRING, $this->getVar('made'));
+ if ($this->getVar('country_id')!=0) {
+ $countries_handler = xoops_getmodulehandler('countries', 'iplog');
+ $country = $countries_handler->get($this->getVar('country_id'));
+ if (is_object($country))
+ $ret['country'] = $country->toArray();
+ } else {
+ $ret['country']['code'] = '--';
+ $ret['country']['name'] = '--';
+ $ret['country']['continent'] = '--';
+ $ret['country']['region'] = '--';
+ }
+ $comment_handler = xoops_gethandler('comment');
+ $module_handler = xoops_gethandler('module');
+ $GLOBALS['moduleIplog'] = $module_handler->getByDirname('iplog');
+ $criteria = new CriteriaCompo(new Criteria('com_itemid', $this->getVar('member_id')));
+ $criteria->add(new Criteria('com_modid', $GLOBALS['moduleIplog']->getVar('mid')));
+ $comments = $comment_handler->getObjects($criteria, true);
+ if (count($comments)>0) {
+ foreach($comments as $com_id => $comment);
+ $ret['comments'][$com_id] = $comment->toArray();
+ }
+ foreach($ret as $key => $value) {
+ if (is_array($value)) {
+ foreach ($value as $keyb => $valueb) {
+ unset($value[$keyb]);
+ $value[str_replace('-', '_', $keyb)] = $valueb;
+ }
+ }
+ unset($ret[$key]);
+ $ret[str_replace('-', '_', $key)] = $value;
+ }
+ $ret['ip'] = $this->getIPAddy().' ('.$this->getIPType().')';
+ $ret['proxy_ip'] = (strlen($this->getProxyIPAddy())?$this->getProxyIPAddy():'--');
+ $ret['start'] = date(_DATESTRING,$ret['start']);
+ $ret['end'] = date(_DATESTRING,$ret['end']);
+ if ($ret['uid']==0)
+ $ret['uname'] = _MI_IPLOG_GUEST;
+ else
+ $ret['uname'] = '<a href="'.XOOPS_URL.'/userinfo.php?uid='.$ret['uid'].'">'.$ret['uname'].'</a>';
+ return $ret;
+
+ }
+
+ function setIPAddy($ip) {
+ if ($this->validateIPv4($ip))
+ $this->setVar('ip4', $ip);
+ elseif ($this->validateIPv6($ip))
+ $this->setVar('ip6', $ip);
+ elseif (strpos($ip,'.')>0&&count(explode('.', $ip))==4)
+ $this->setVar('ip4', $ip);
+ elseif (strpos($ip,':')>0&&count(explode(':', $ip))>=5)
+ $this->setVar('ip6', $ip);
+ }
+
+ function setProxyIPAddy($ip) {
+ if ($this->validateIPv4($ip))
+ $this->setVar('proxy-ip4', $ip);
+ elseif ($this->validateIPv6($ip))
+ $this->setVar('proxy-ip6', $ip);
+ }
+
+ function getIPAddy() {
+ if (strlen($this->getVar('ip4'))>0)
+ return $this->getVar('ip4');
+ elseif (strlen($this->getVar('ip6'))>0)
+ return $this->getVar('ip6');
+ return false;
+ }
+
+ function getProxyIPAddy() {
+ if (strlen($this->getVar('proxy-ip4'))>0)
+ return $this->getVar('proxy-ip4');
+ elseif (strlen($this->getVar('proxy-ip6'))>0)
+ return $this->getVar('proxy-ip6');
+ return false;
+ }
+
+ function getIPType() {
+ if (strlen($this->getVar('ip4'))>0)
+ return _MI_IPLOG_IPV4;
+ elseif (strlen($this->getVar('ip6'))>0)
+ return _MI_IPLOG_IPV6;
+ }
+
+ private function validateIPv4($ip) {
+ if(filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE) === FALSE) // returns IP is valid
+ {
+ return false;
+ } else {
+ return true;
+ }
+ }
+
+ private function validateIPv6($ip) {
+ if(filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) === FALSE) // returns IP is valid
+ {
+ return false;
+ } else {
+ return true;
+ }
+ }
+
+}
+
+
+/**
+* XOOPS Iplog Profiler handler class.
+* This class is responsible for providing data access mechanisms to the data source
+* of XOOPS user class objects.
+*
+* @author Simon Roberts <si...@ch...>
+* @package kernel
+*/
+class IplogLogHandler extends XoopsPersistableObjectHandler
+{
+ function __construct(&$db)
+ {
+ parent::__construct($db, "iplog_log", 'IplogLog', "ip_id", "session_id");
+ }
+
+ function getFields() {
+ return array('ip_id', 'uname', 'ip', 'country_code', 'name', 'region', 'contient', 'network_addy', 'agent', 'proxy_ip', 'start', 'end', 'online');
+ }
+
+ function writeLog($data) {
+ $obj = $this->create();
+ $obj->setVars($data);
+ $obj->setIPAddy($data['ip']);
+ if ($data['proxied'])
+ $obj->setProxyIPAddy($data['proxy-ip']);
+ return $this->insert($obj, true);
+ }
+
+ function insert($obj, $force = true) {
+ xoops_load('xoopscache');
+ $ping = XoopsCache::read('iplog_ip_ping_unixtimes');
+ if (!is_array($ping)==true) {
+ $ping=array($obj->getIPAddy()=>microtime(true));
+ $oldping=microtime(true);
+ } else {
+ if (time()-$ping[$obj->getIPAddy()]>$GLOBALS['xoopsConfig']['session_expire']*60) {
+ $pingnew = true;
+ } else {
+ $pingnew = false;
+ }
+ $oldping=$ping[$obj->getIPAddy()];
+ $ping[$obj->getIPAddy()]=microtime(true);
+ }
+ XoopsCache::write('iplog_ip_ping_unixtimes', $ping, 60*60*24*7*4);
+
+ if ($this->getCount(new Criteria('session_id', session_id())&&is_object($GLOBALS['xoopsUser']))&&$pingnew!=true) {
+ $criteria = new Criteria('session_id', session_id());
+ $criteria->setSort('`ip_id`');
+ $criteria->setOrder('DESC');
+ $criteria->setLimit(1);
+ $objs = $this->getObjects($criteria, false);
+ if (is_object($objs[0])) {
+ $obj = $objs[0];
+ $obj->setVar('end', $ping[$obj->getIPAddy()]);
+ $obj->setVar('online', $obj->getVar('end')-$obj->getVar('start'));
+ }
+ } elseif (!is_object($GLOBALS['xoopsUser'])&&$GLOBALS['iplogModuleConfig']['anonymous']&&$pingnew!=true) {
+ if ($obj->getIPType()==_MI_IPLOG_IPV4) {
+ $criteria = new Criteria('ip4', $obj->getIPAddy());
+ $criteria->setSort('`ip_id`');
+ $criteria->setOrder('DESC');
+ $criteria->setLimit(1);
+ $objs = $this->getObjects($criteria, false);
+ } elseif ($obj->getIPType()==_MI_IPLOG_IPV6) {
+ $criteria = new Criteria('ip6', $obj->getIPAddy());
+ $criteria->setSort('`ip_id`');
+ $criteria->setOrder('DESC');
+ $criteria->setLimit(1);
+ $objs = $this->getObjects($criteria, false);
+ }
+ if (is_object($objs[0])) {
+ $obj = $objs[0];
+ $obj->setVar('end', $ping[$obj->getIPAddy()]);
+ $obj->setVar('online', $obj->getVar('end')-$obj->getVar('start'));
+ }
+ }
+ if ($obj->isNew()) {
+
+ $obj->setVar('session_id', session_id());
+ $obj->setVar('start', $ping[$obj->getIPAddy()]);
+ $obj->setVar('end', $ping[$obj->getIPAddy()]);
+
+ if (strlen($obj->getVar('ip4'))<>0) {
+ if (strlen($obj->getVar('ip4'))<7) {
+ return false;
+ } elseif (substr($obj->getVar('ip4'), strlen($obj->getVar('ip4'))-1, 1) == '.') {
+ return false;
+ } else {
+ $count = count(explode('.', $obj->getVar('ip4')));
+ if ($count!=4)
+ return false;
+ }
+ } elseif (strlen($obj->getVar('ip6'))<>0) {
+ if (strlen($obj->getVar('ip6'))<15) {
+ return false;
+ } elseif (substr($obj->getVar('ip6'), strlen($obj->getVar('ip6'))-1, 1) == ':') {
+ return false;
+ } else {
+ $count = count(explode(':',$obj->getVar('ip6')));
+ if ($count<5)
+ return false;
+ }
+ }
+
+ if (strlen($obj->getVar('long'))==0)
+ $obj->setVar('long', @ip2long($obj->getIPAddy()));
+
+ if (strlen($obj->getVar('network-addy'))<strlen(strlen($obj->getIPAddy())))
+ $obj->setVar('network-addy', @gethostbyaddr($obj->getIPAddy()));
+
+ $ipLite = new ip2location_lite;
+ $ipLite->setKey($GLOBALS['iplogModuleConfig']['ipinfodb_key']);
+ //Get errors and locations
+ $locations = $ipLite->getCity($obj->getIPAddy());
+ $countries_handler = xoops_getmodulehandler('countries', 'iplog');
+ $obj->setVar('country_id', $countries_handler->getIDByCode(strtoupper($locations['countryCode'])));
+ $obj->setVar('country-code', strtoupper($locations['countryCode']));
+ $obj->setVar('country-name', ucfirst($locations['countryName']));
+ $obj->setVar('region-name', ucfirst($locations['regionName']));
+ $obj->setVar('city-name', ucfirst($locations['cityName']));
+ $obj->setVar('postcode', $locations['zipCode']);
+ $obj->setVar('latitude', $locations['latitude']);
+ $obj->setVar('longitude', $locations['longitude']);
+ $obj->setVar('time-zone', $locations['timeZone']);
+
+ if ($obj->getProxyIPAddy()!=false) {
+ if (strlen($obj->getVar('proxy-long'))==0)
+ $obj->setVar('proxy-long', @ip2long($obj->getProxyIPAddy()));
+
+ if (strlen($obj->getVar('proxy-network-addy'))<strlen(strlen($obj->getProxyIPAddy())))
+ $obj->setVar('proxy-network-addy', @gethostbyaddr($obj->getProxyIPAddy()));
+
+ $locations = $ipLite->getCity($obj->getProxyIPAddy());
+ $countries_handler = xoops_getmodulehandler('countries', 'iplog');
+ $obj->setVar('proxy-country_id', $countries_handler->getIDByCode(strtoupper($locations['countryCode'])));
+ $obj->setVar('proxy-country-code', strtoupper($locations['countryCode']));
+ $obj->setVar('proxy-country-name', ucfirst($locations['countryName']));
+ $obj->setVar('proxy-region-name', ucfirst($locations['regionName']));
+ $obj->setVar('proxy-city-name', ucfirst($locations['cityName']));
+ $obj->setVar('proxy-postcode', $locations['zipCode']);
+ $obj->setVar('proxy-latitude', $locations['latitude']);
+ $obj->setVar('proxy-longitude', $locations['longitude']);
+ $obj->setVar('proxy-time-zone', $locations['timeZone']);
+ }
+ }
+
+ $ret = parent::insert($obj, $force);
+ $this->deleteAll(new Criteria('end', time() - $GLOBALS['iplogModuleConfig']['logdrops'], '<='));
+ return $ret;
+
+ }
+
+ function getNumberByCountry() {
+ $sql = 'SELECT DISTINCT `country-name` as node, count(*) as total FROM `'.$this->table.'` GROUP BY `country-name`';
+ $result = $GLOBALS['xoopsDB']->queryF($sql);
+ $ret = array();
+ while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
+ $ret[] = $row;
+ }
+ return $ret;
+ }
+
+ function getNumberByRegion() {
+ $sql = 'SELECT DISTINCT `b`.`region` as node, count(*) as total FROM `'.$this->table.'` a INNER JOIN `'.$GLOBALS['xoopsDB']->prefix('iplog_countries').'` b ON a.country_id = b.country_id GROUP BY `b`.`region`';
+ $result = $GLOBALS['xoopsDB']->queryF($sql);
+ $ret = array();
+ while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
+ $ret[] = $row;
+ }
+ return $ret;
+ }
+
+ function getNumberByContinent() {
+ $sql = 'SELECT DISTINCT `b`.`continent` as node, count(*) as total FROM `'.$this->table.'` a INNER JOIN `'.$GLOBALS['xoopsDB']->prefix('iplog_countries').'` b ON a.country_id = b.country_id GROUP BY `b`.`continent`';
+ $result = $GLOBALS['xoopsDB']->queryF($sql);
+ $ret = array();
+ while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
+ $ret[] = $row;
+ }
+ return $ret;
+ }
+
+ function getTotalSecondsByCountry() {
+ $sql = 'SELECT DISTINCT `country-name` as node, sum(`online`)/60 as total FROM `'.$this->table.'` GROUP BY `country-name`';
+ $result = $GLOBALS['xoopsDB']->queryF($sql);
+ $ret = array();
+ while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
+ $ret[] = $row;
+ }
+ return $ret;
+ }
+
+ function getTotalSecondsByRegion() {
+ $sql = 'SELECT DISTINCT `b`.`region` as node, sum(`online`)/60 as total FROM `'.$this->table.'` a INNER JOIN `'.$GLOBALS['xoopsDB']->prefix('iplog_countries').'` b ON a.country_id = b.country_id GROUP BY `b`.`region`';;
+ $result = $GLOBALS['xoopsDB']->queryF($sql);
+ $ret = array();
+ while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
+ $ret[] = $row;
+ }
+ return $ret;
+ }
+
+ function getTotalSecondsByContinent() {
+ $sql = 'SELECT DISTINCT `b`.`continent` as node, sum(`online`)/60 as total FROM `'.$this->table.'` a INNER JOIN `'.$GLOBALS['xoopsDB']->prefix('iplog_countries').'` b ON a.country_id = b.country_id GROUP BY `b`.`continent`';;
+ $result = $GLOBALS['xoopsDB']->queryF($sql);
+ $ret = array();
+ while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
+ $ret[] = $row;
+ }
+ return $ret;
+ }
+
+ function getAdverageSecondsByCountry() {
+ $sql = 'SELECT DISTINCT `country-name` as node, avg(`online`)/60 as total FROM `'.$this->table.'` GROUP BY `country-name`';
+ $result = $GLOBALS['xoopsDB']->queryF($sql);
+ $ret = array();
+ while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
+ $ret[] = $row;
+ }
+ return $ret;
+ }
+
+ function getAdverageSecondsByRegion() {
+ $sql = 'SELECT DISTINCT `b`.`region` as node, avg(`online`)/60 as total FROM `'.$this->table.'` a INNER JOIN `'.$GLOBALS['xoopsDB']->prefix('iplog_countries').'` b ON a.country_id = b.country_id GROUP BY `b`.`region`';;
+ $result = $GLOBALS['xoopsDB']->queryF($sql);
+ $ret = array();
+ while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
+ $ret[] = $row;
+ }
+ return $ret;
+ }
+
+ function getAdverageSecondsByContinent() {
+ $sql = 'SELECT DISTINCT `b`.`continent` as node, avg(`online`)/60 as total FROM `'.$this->table.'` a INNER JOIN `'.$GLOBALS['xoopsDB']->prefix('iplog_countries').'` b ON a.country_id = b.country_id GROUP BY `b`.`continent`';;
+ $result = $GLOBALS['xoopsDB']->queryF($sql);
+ $ret = array();
+ while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
+ $ret[] = $row;
+ }
+ return $ret;
+ }
+}
+?>
Added: XoopsModules/iplog/branches/timgno/modules/iplog/docs/changelog.txt
===================================================================
--- XoopsModules/iplog/branches/timgno/modules/iplog/docs/changelog.txt (rev 0)
+++ XoopsModules/iplog/branches/timgno/modules/iplog/docs/changelog.txt 2012-07-28 13:25:54 UTC (rev 9937)
@@ -0,0 +1,65 @@
+================================================
+== Version 1.01 Final - 2012/07/28 19:15 AEST ==
+================================================
+Changed: /admin/about.php - GNU3 header and shouts added to header (wishcraft)
+Changed: /admin/dashboard.php - GNU3 header and shouts added to header (wishcraft)
+Changed: /admin/dashboard.php - Search for '-' in array and return Unknown constant (wishcraft)
+Changed: /admin/footer.php - GNU3 header and shouts added to header (wishcraft)
+Changed: /admin/header.php - GNU3 header and shouts added to header (wishcraft)
+Changed: /admin/log.php - GNU3 header and shouts added to header (wishcraft)
+Changed: /admin/log.php - fix delete function (flipse)
+Changed: /admin/log.php - fix delete query message to provide data output (flipse)
+Changed: /admin/log.php - rename index.php to log.php in redirections (flipse)
+Changed: /admin/menu.php - GNU3 header and shouts added to header (wishcraft)
+Changed: /admin/menu.php - Framework System Icon Path Variable Added (wishcraft)
+Changed: /class/log.php - GNU3 header and shouts added to header (wishcraft)
+Changed: /class/log.php - Rename of Field Type 'useragent' to 'agent' as Db (wishcraft)
+Changed: /class/log.php - xoops_load('cache') is deprecated [changed to standard] (wishcraft)
+Changed: /class/log.php - Add Group By to SQL for statistics on dashboard (wishcraft)
+Changed: /class/countries.php - GNU3 header and shouts added to header (wishcraft)
+Changed: /include/functions.php - GNU3 header and shouts added to header (wishcraft)
+Changed: /include/ip2locationlite.class.php - GNU3 header and shouts added to header (wishcraft)
+Changed: /language/english/help/help.html - GNU3 header and shouts added to header (wishcraft)
+Changed: /language/english/help/help.html - Content Updated to be revelent & IPInfoDB Instruction added (wishcraft)
+Changed: /language/english/admin.php - GNU3 header and shouts added to header (wishcraft)
+Changed: /language/english/admin.php - Unknown added to language for missing data (wishcraft)
+Changed: /language/english/admin.php - Rename of Constant Type 'useragent' to 'agent' as Db (wishcraft)
+Changed: /language/english/admin.php - add two missing language definitions (mamba)
+Changed: /language/english/admin.php - add three sprintf variable to Delete Query. (wishcraft)
+Changed: /language/english/modinfo.php - GNU3 header and shouts added to header (wishcraft)
+Changed: /preloads/logger.php - GNU3 header and shouts added to header (wishcraft)
+Changed: /sql/mysql.sql - GNU3 header and shouts added to header (wishcraft)
+Changed: /templates/iplog_log_list.html - GNU3 header and shouts added to header (wishcraft)
+Changed: /templates/iplog_log_list.html - replaced "delete" text with icon (mamba)
+Changed: /templates/iplog_log_list.html - Fixed display of country code from country array (wishcraft)
+Changed: /templates/iplog_log_list.html - Fixed display of continent from array (wishcraft)
+Changed: /templates/iplog_log_list.html - Fixed display of User Agent from array (wishcraft)
+Changed: /xoops_version.php - GNU3 header and shouts added to header (wishcraft)
+Changed: /xoops_version.php - Framework System Icon Path Variable Added (wishcraft)
+Changed: restructure folders (mamba)
+Moved: /Frameworks/moduleclass/icons to /images/icons - move icons back to th module (mamba)
+
+================================================
+== Version 1.01 RC - 2012/07/27 ==
+================================================
+Changed: /class/log.php - Ping time stored in Cache based on Session Expires Time (wishcraft)
+Changed: /class/log.php - IP Type detection Improved (wishcraft)
+Changed: /class/log.php - IP Type added to toArray() for IP Address (wishcraft)
+Changed: /class/log.php - Support for anonymous user added (wishcraft)
+Changed: /class/log.php - Contient renamed to Continent (wishcraft)
+Changed: /admin/dashboard.php - Contient renamed to Continent (wishcraft)
+Changed: /admin/dashboard.php - CONTIENT renamed to CONTINENT (wishcraft)
+Changed: /language/english/admin.php - C...
[truncated message content] |
|
From: <wis...@us...> - 2012-07-28 11:40:18
|
Revision: 9936
http://xoops.svn.sourceforge.net/xoops/?rev=9936&view=rev
Author: wishcraft
Date: 2012-07-28 11:40:12 +0000 (Sat, 28 Jul 2012)
Log Message:
-----------
IP Log 1.01 - Final Release - Moments after mamba Edition - see changelog.txt
Modified Paths:
--------------
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/menu.php
XoopsModules/iplog/trunk/iplog/admin/menu.php
Modified: XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/menu.php
===================================================================
--- XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/menu.php 2012-07-28 09:16:47 UTC (rev 9935)
+++ XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/menu.php 2012-07-28 11:40:12 UTC (rev 9936)
@@ -35,8 +35,8 @@
$adminmenu = array();
if (is_object($GLOBALS['iplogModule'])) {
$adminmenu[0]['title'] = _MI_IPLOG_DASHBOARD;
- $adminmenu[0]['icon'] = '../../'.$GLOBALS['iplogModule']->getInfo('system_icons32').'/about.png';
- $adminmenu[0]['image'] = '../../'.$GLOBALS['iplogModule']->getInfo('system_icons32').'/about.png';
+ $adminmenu[0]['icon'] = '../../'.$GLOBALS['iplogModule']->getInfo('system_icons32').'/home.png';
+ $adminmenu[0]['image'] = '../../'.$GLOBALS['iplogModule']->getInfo('system_icons32').'/home.png';
$adminmenu[0]['link'] = "admin/dashboard.php";
$adminmenu[1]['title'] = _MI_IPLOG_LOG;
$adminmenu[1]['icon'] = '../../'.$GLOBALS['iplogModule']->getInfo('icons32').'/iplog.log.png';
Modified: XoopsModules/iplog/trunk/iplog/admin/menu.php
===================================================================
--- XoopsModules/iplog/trunk/iplog/admin/menu.php 2012-07-28 09:16:47 UTC (rev 9935)
+++ XoopsModules/iplog/trunk/iplog/admin/menu.php 2012-07-28 11:40:12 UTC (rev 9936)
@@ -35,8 +35,8 @@
$adminmenu = array();
if (is_object($GLOBALS['iplogModule'])) {
$adminmenu[0]['title'] = _MI_IPLOG_DASHBOARD;
- $adminmenu[0]['icon'] = '../../'.$GLOBALS['iplogModule']->getInfo('system_icons32').'/about.png';
- $adminmenu[0]['image'] = '../../'.$GLOBALS['iplogModule']->getInfo('system_icons32').'/about.png';
+ $adminmenu[0]['icon'] = '../../'.$GLOBALS['iplogModule']->getInfo('system_icons32').'/home.png';
+ $adminmenu[0]['image'] = '../../'.$GLOBALS['iplogModule']->getInfo('system_icons32').'/home.png';
$adminmenu[0]['link'] = "admin/dashboard.php";
$adminmenu[1]['title'] = _MI_IPLOG_LOG;
$adminmenu[1]['icon'] = '../../'.$GLOBALS['iplogModule']->getInfo('icons32').'/iplog.log.png';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wis...@us...> - 2012-07-28 09:16:54
|
Revision: 9935
http://xoops.svn.sourceforge.net/xoops/?rev=9935&view=rev
Author: wishcraft
Date: 2012-07-28 09:16:47 +0000 (Sat, 28 Jul 2012)
Log Message:
-----------
IP Log 1.01 - Final Release - Moments after mamba Edition - see changelog.txt
Modified Paths:
--------------
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/dashboard.php
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/class/log.php
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/docs/changelog.txt
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/language/english/admin.php
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/xoops_version.php
XoopsModules/iplog/trunk/iplog/admin/dashboard.php
XoopsModules/iplog/trunk/iplog/class/log.php
XoopsModules/iplog/trunk/iplog/docs/changelog.txt
XoopsModules/iplog/trunk/iplog/language/english/admin.php
XoopsModules/iplog/trunk/iplog/xoops_version.php
Modified: XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/dashboard.php
===================================================================
--- XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/dashboard.php 2012-07-28 08:52:48 UTC (rev 9934)
+++ XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/dashboard.php 2012-07-28 09:16:47 UTC (rev 9935)
@@ -43,47 +43,47 @@
if (count($log_handler->getNumberByCountry())>1) {
$indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_COUNTS_BY_COUNTRY);
foreach ($log_handler->getNumberByCountry() as $id => $value)
- $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_COUNTS_BY_COUNTRY, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
+ $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_COUNTS_BY_COUNTRY, "<label>".($value['node']=='-'?_AM_IPLOG_UNKNOWN:$value['node']).": %s</label>", $value['total'], 'Green');
}
if (count($log_handler->getNumberByRegion())>1) {
$indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_COUNTS_BY_REGION);
foreach ($log_handler->getNumberByRegion() as $id => $value)
- $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_COUNTS_BY_REGION, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
+ $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_COUNTS_BY_REGION, "<label>".($value['node']=='-'?_AM_IPLOG_UNKNOWN:$value['node']).": %s</label>", $value['total'], 'Green');
}
if (count($log_handler->getNumberByContinent())>1) {
$indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_COUNTS_BY_CONTINENT);
foreach ($log_handler->getNumberByContinent() as $id => $value)
- $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_COUNTS_BY_CONTINENT, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
+ $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_COUNTS_BY_CONTINENT, "<label>".($value['node']=='-'?_AM_IPLOG_UNKNOWN:$value['node']).": %s</label>", $value['total'], 'Green');
}
if (count($log_handler->getTotalSecondsByCountry())>1) {
$indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_SUM_BY_COUNTRY);
foreach ($log_handler->getTotalSecondsByCountry() as $id => $value)
- $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_SUM_BY_COUNTRY, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
+ $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_SUM_BY_COUNTRY, "<label>".($value['node']=='-'?_AM_IPLOG_UNKNOWN:$value['node']).": %s</label>", $value['total'], 'Green');
}
if (count($log_handler->getTotalSecondsByRegion())>1) {
$indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_SUM_BY_REGION);
foreach ($log_handler->getTotalSecondsByRegion() as $id => $value)
- $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_SUM_BY_REGION, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
+ $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_SUM_BY_REGION, "<label>".($value['node']=='-'?_AM_IPLOG_UNKNOWN:$value['node']).": %s</label>", $value['total'], 'Green');
}
if (count($log_handler->getTotalSecondsByContinent())>1) {
$indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_SUM_BY_CONTINENT);
foreach ($log_handler->getTotalSecondsByContinent() as $id => $value)
- $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_SUM_BY_CONTINENT, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
+ $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_SUM_BY_CONTINENT, "<label>".($value['node']=='-'?_AM_IPLOG_UNKNOWN:$value['node']).": %s</label>", $value['total'], 'Green');
}
if (count($log_handler->getAdverageSecondsByCountry())>1) {
$indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_AVG_BY_COUNTRY);
foreach ($log_handler->getAdverageSecondsByCountry() as $id => $value)
- $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_AVG_BY_COUNTRY, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
+ $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_AVG_BY_COUNTRY, "<label>".($value['node']=='-'?_AM_IPLOG_UNKNOWN:$value['node']).": %s</label>", $value['total'], 'Green');
}
if (count($log_handler->getAdverageSecondsByRegion())>1) {
$indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_AVG_BY_REGION);
foreach ($log_handler->getAdverageSecondsByRegion() as $id => $value)
- $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_AVG_BY_REGION, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
+ $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_AVG_BY_REGION, "<label>".($value['node']=='-'?_AM_IPLOG_UNKNOWN:$value['node']).": %s</label>", $value['total'], 'Green');
}
if (count($log_handler->getAdverageSecondsByContinent())>1) {
$indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_AVG_BY_CONTINENT);
foreach ($log_handler->getAdverageSecondsByContinent() as $id => $value)
- $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_AVG_BY_CONTINENT, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
+ $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_AVG_BY_CONTINENT, "<label>".($value['node']=='-'?_AM_IPLOG_UNKNOWN:$value['node']).": %s</label>", $value['total'], 'Green');
}
echo $indexAdmin->renderIndex();
Modified: XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/class/log.php
===================================================================
--- XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/class/log.php 2012-07-28 08:52:48 UTC (rev 9934)
+++ XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/class/log.php 2012-07-28 09:16:47 UTC (rev 9935)
@@ -343,7 +343,7 @@
}
function getNumberByCountry() {
- $sql = 'SELECT DISTINCT `country-name` as node, count(*) as total FROM `'.$this->table.'`';
+ $sql = 'SELECT DISTINCT `country-name` as node, count(*) as total FROM `'.$this->table.'` GROUP BY `country-name`';
$result = $GLOBALS['xoopsDB']->queryF($sql);
$ret = array();
while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
@@ -353,7 +353,7 @@
}
function getNumberByRegion() {
- $sql = 'SELECT DISTINCT `b`.`region` as node, count(*) as total FROM `'.$this->table.'` a INNER JOIN `'.$GLOBALS['xoopsDB']->prefix('iplog_countries').'` b ON a.country_id = b.country_id';
+ $sql = 'SELECT DISTINCT `b`.`region` as node, count(*) as total FROM `'.$this->table.'` a INNER JOIN `'.$GLOBALS['xoopsDB']->prefix('iplog_countries').'` b ON a.country_id = b.country_id GROUP BY `b`.`region`';
$result = $GLOBALS['xoopsDB']->queryF($sql);
$ret = array();
while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
@@ -363,7 +363,7 @@
}
function getNumberByContinent() {
- $sql = 'SELECT DISTINCT `b`.`continent` as node, count(*) as total FROM `'.$this->table.'` a INNER JOIN `'.$GLOBALS['xoopsDB']->prefix('iplog_countries').'` b ON a.country_id = b.country_id';
+ $sql = 'SELECT DISTINCT `b`.`continent` as node, count(*) as total FROM `'.$this->table.'` a INNER JOIN `'.$GLOBALS['xoopsDB']->prefix('iplog_countries').'` b ON a.country_id = b.country_id GROUP BY `b`.`continent`';
$result = $GLOBALS['xoopsDB']->queryF($sql);
$ret = array();
while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
@@ -373,7 +373,7 @@
}
function getTotalSecondsByCountry() {
- $sql = 'SELECT DISTINCT `country-name` as node, sum(`online`)/60 as total FROM `'.$this->table.'`';
+ $sql = 'SELECT DISTINCT `country-name` as node, sum(`online`)/60 as total FROM `'.$this->table.'` GROUP BY `country-name`';
$result = $GLOBALS['xoopsDB']->queryF($sql);
$ret = array();
while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
@@ -383,7 +383,7 @@
}
function getTotalSecondsByRegion() {
- $sql = 'SELECT DISTINCT `b`.`region` as node, sum(`online`)/60 as total FROM `'.$this->table.'` a INNER JOIN `'.$GLOBALS['xoopsDB']->prefix('iplog_countries').'` b ON a.country_id = b.country_id';;
+ $sql = 'SELECT DISTINCT `b`.`region` as node, sum(`online`)/60 as total FROM `'.$this->table.'` a INNER JOIN `'.$GLOBALS['xoopsDB']->prefix('iplog_countries').'` b ON a.country_id = b.country_id GROUP BY `b`.`region`';;
$result = $GLOBALS['xoopsDB']->queryF($sql);
$ret = array();
while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
@@ -393,7 +393,7 @@
}
function getTotalSecondsByContinent() {
- $sql = 'SELECT DISTINCT `b`.`continent` as node, sum(`online`)/60 as total FROM `'.$this->table.'` a INNER JOIN `'.$GLOBALS['xoopsDB']->prefix('iplog_countries').'` b ON a.country_id = b.country_id';;
+ $sql = 'SELECT DISTINCT `b`.`continent` as node, sum(`online`)/60 as total FROM `'.$this->table.'` a INNER JOIN `'.$GLOBALS['xoopsDB']->prefix('iplog_countries').'` b ON a.country_id = b.country_id GROUP BY `b`.`continent`';;
$result = $GLOBALS['xoopsDB']->queryF($sql);
$ret = array();
while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
@@ -403,7 +403,7 @@
}
function getAdverageSecondsByCountry() {
- $sql = 'SELECT DISTINCT `country-name` as node, avg(`online`)/60 as total FROM `'.$this->table.'`';
+ $sql = 'SELECT DISTINCT `country-name` as node, avg(`online`)/60 as total FROM `'.$this->table.'` GROUP BY `country-name`';
$result = $GLOBALS['xoopsDB']->queryF($sql);
$ret = array();
while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
@@ -413,7 +413,7 @@
}
function getAdverageSecondsByRegion() {
- $sql = 'SELECT DISTINCT `b`.`region` as node, avg(`online`)/60 as total FROM `'.$this->table.'` a INNER JOIN `'.$GLOBALS['xoopsDB']->prefix('iplog_countries').'` b ON a.country_id = b.country_id';;
+ $sql = 'SELECT DISTINCT `b`.`region` as node, avg(`online`)/60 as total FROM `'.$this->table.'` a INNER JOIN `'.$GLOBALS['xoopsDB']->prefix('iplog_countries').'` b ON a.country_id = b.country_id GROUP BY `b`.`region`';;
$result = $GLOBALS['xoopsDB']->queryF($sql);
$ret = array();
while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
@@ -423,7 +423,7 @@
}
function getAdverageSecondsByContinent() {
- $sql = 'SELECT DISTINCT `b`.`continent` as node, avg(`online`)/60 as total FROM `'.$this->table.'` a INNER JOIN `'.$GLOBALS['xoopsDB']->prefix('iplog_countries').'` b ON a.country_id = b.country_id';;
+ $sql = 'SELECT DISTINCT `b`.`continent` as node, avg(`online`)/60 as total FROM `'.$this->table.'` a INNER JOIN `'.$GLOBALS['xoopsDB']->prefix('iplog_countries').'` b ON a.country_id = b.country_id GROUP BY `b`.`continent`';;
$result = $GLOBALS['xoopsDB']->queryF($sql);
$ret = array();
while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
Modified: XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/docs/changelog.txt
===================================================================
--- XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/docs/changelog.txt 2012-07-28 08:52:48 UTC (rev 9934)
+++ XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/docs/changelog.txt 2012-07-28 09:16:47 UTC (rev 9935)
@@ -1,8 +1,9 @@
================================================
-== Version 1.01 Final - 2012/07/28 18:40 AEST ==
+== Version 1.01 Final - 2012/07/28 19:15 AEST ==
================================================
Changed: /admin/about.php - GNU3 header and shouts added to header (wishcraft)
Changed: /admin/dashboard.php - GNU3 header and shouts added to header (wishcraft)
+Changed: /admin/dashboard.php - Search for '-' in array and return Unknown constant (wishcraft)
Changed: /admin/footer.php - GNU3 header and shouts added to header (wishcraft)
Changed: /admin/header.php - GNU3 header and shouts added to header (wishcraft)
Changed: /admin/log.php - GNU3 header and shouts added to header (wishcraft)
@@ -14,12 +15,14 @@
Changed: /class/log.php - GNU3 header and shouts added to header (wishcraft)
Changed: /class/log.php - Rename of Field Type 'useragent' to 'agent' as Db (wishcraft)
Changed: /class/log.php - xoops_load('cache') is deprecated [changed to standard] (wishcraft)
+Changed: /class/log.php - Add Group By to SQL for statistics on dashboard (wishcraft)
Changed: /class/countries.php - GNU3 header and shouts added to header (wishcraft)
Changed: /include/functions.php - GNU3 header and shouts added to header (wishcraft)
Changed: /include/ip2locationlite.class.php - GNU3 header and shouts added to header (wishcraft)
Changed: /language/english/help/help.html - GNU3 header and shouts added to header (wishcraft)
Changed: /language/english/help/help.html - Content Updated to be revelent & IPInfoDB Instruction added (wishcraft)
Changed: /language/english/admin.php - GNU3 header and shouts added to header (wishcraft)
+Changed: /language/english/admin.php - Unknown added to language for missing data (wishcraft)
Changed: /language/english/admin.php - Rename of Constant Type 'useragent' to 'agent' as Db (wishcraft)
Changed: /language/english/admin.php - add two missing language definitions (mamba)
Changed: /language/english/admin.php - add three sprintf variable to Delete Query. (wishcraft)
Modified: XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/language/english/admin.php
===================================================================
--- XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/language/english/admin.php 2012-07-28 08:52:48 UTC (rev 9934)
+++ XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/language/english/admin.php 2012-07-28 09:16:47 UTC (rev 9935)
@@ -32,6 +32,7 @@
*/
define("_AM_IPLOG_SECONDS", "Seconds");
+define("_AM_IPLOG_UNKNOWN", "Unknown");
define("_AM_IPLOG_TH_IP_ID", "IP ID");
define("_AM_IPLOG_TH_UNAME", "Username");
Modified: XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/xoops_version.php
===================================================================
--- XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/xoops_version.php 2012-07-28 08:52:48 UTC (rev 9934)
+++ XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/xoops_version.php 2012-07-28 09:16:47 UTC (rev 9935)
@@ -49,9 +49,9 @@
$modversion['icons16'] = 'modules/'.$modversion['dirname'].'/images/icons/16';
$modversion['icons32'] = 'modules/'.$modversion['dirname'].'/images/icons/32';
-$modversion['release_info'] = "Stable 2012/07/27";
+$modversion['release_info'] = "Stable 2012/07/28";
$modversion['release_file'] = XOOPS_URL."/modules/profile/docs/changelog.txt";
-$modversion['release_date'] = "2012/07/27";
+$modversion['release_date'] = "2012/07/28";
$modversion['author_realname'] = "Simon Antony Roberts";
$modversion['author_website_url'] = "http://www.chronolabs.com.au";
Modified: XoopsModules/iplog/trunk/iplog/admin/dashboard.php
===================================================================
--- XoopsModules/iplog/trunk/iplog/admin/dashboard.php 2012-07-28 08:52:48 UTC (rev 9934)
+++ XoopsModules/iplog/trunk/iplog/admin/dashboard.php 2012-07-28 09:16:47 UTC (rev 9935)
@@ -38,52 +38,52 @@
$indexAdmin = new ModuleAdmin();
$log_handler = xoops_getmodulehandler('log', 'iplog');
- $indexAdmin = new ModuleAdmin();
- if (count($log_handler->getNumberByCountry())>0) {
+ $indexAdmin = new ModuleAdmin();
+ if (count($log_handler->getNumberByCountry())>1) {
$indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_COUNTS_BY_COUNTRY);
foreach ($log_handler->getNumberByCountry() as $id => $value)
- $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_COUNTS_BY_COUNTRY, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
+ $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_COUNTS_BY_COUNTRY, "<label>".($value['node']=='-'?_AM_IPLOG_UNKNOWN:$value['node']).": %s</label>", $value['total'], 'Green');
}
- if (count($log_handler->getNumberByRegion())>0) {
+ if (count($log_handler->getNumberByRegion())>1) {
$indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_COUNTS_BY_REGION);
- foreach ($log_handler->getNumberByRegion() as $id => $value)
- $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_COUNTS_BY_REGION, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
+ foreach ($log_handler->getNumberByRegion() as $id => $value)
+ $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_COUNTS_BY_REGION, "<label>".($value['node']=='-'?_AM_IPLOG_UNKNOWN:$value['node']).": %s</label>", $value['total'], 'Green');
}
- if (count($log_handler->getNumberByContinent())>0) {
- $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_COUNTS_BY_CONTINENT);
- foreach ($log_handler->getNumberByContinent() as $id => $value)
- $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_COUNTS_BY_CONTINENT, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
+ if (count($log_handler->getNumberByContinent())>1) {
+ $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_COUNTS_BY_CONTINENT);
+ foreach ($log_handler->getNumberByContinent() as $id => $value)
+ $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_COUNTS_BY_CONTINENT, "<label>".($value['node']=='-'?_AM_IPLOG_UNKNOWN:$value['node']).": %s</label>", $value['total'], 'Green');
}
- if (count($log_handler->getTotalSecondsByCountry())>0) {
- $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_SUM_BY_COUNTRY);
- foreach ($log_handler->getTotalSecondsByCountry() as $id => $value)
- $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_SUM_BY_COUNTRY, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
+ if (count($log_handler->getTotalSecondsByCountry())>1) {
+ $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_SUM_BY_COUNTRY);
+ foreach ($log_handler->getTotalSecondsByCountry() as $id => $value)
+ $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_SUM_BY_COUNTRY, "<label>".($value['node']=='-'?_AM_IPLOG_UNKNOWN:$value['node']).": %s</label>", $value['total'], 'Green');
}
- if (count($log_handler->getTotalSecondsByRegion())>0) {
- $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_SUM_BY_REGION);
- foreach ($log_handler->getTotalSecondsByRegion() as $id => $value)
- $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_SUM_BY_REGION, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
+ if (count($log_handler->getTotalSecondsByRegion())>1) {
+ $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_SUM_BY_REGION);
+ foreach ($log_handler->getTotalSecondsByRegion() as $id => $value)
+ $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_SUM_BY_REGION, "<label>".($value['node']=='-'?_AM_IPLOG_UNKNOWN:$value['node']).": %s</label>", $value['total'], 'Green');
}
- if (count($log_handler->getTotalSecondsByContinent())>0) {
- $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_SUM_BY_CONTINENT);
- foreach ($log_handler->getTotalSecondsByContinent() as $id => $value)
- $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_SUM_BY_CONTINENT, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
+ if (count($log_handler->getTotalSecondsByContinent())>1) {
+ $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_SUM_BY_CONTINENT);
+ foreach ($log_handler->getTotalSecondsByContinent() as $id => $value)
+ $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_SUM_BY_CONTINENT, "<label>".($value['node']=='-'?_AM_IPLOG_UNKNOWN:$value['node']).": %s</label>", $value['total'], 'Green');
}
- if (count($log_handler->getAdverageSecondsByCountry())>0) {
- $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_AVG_BY_COUNTRY);
- foreach ($log_handler->getAdverageSecondsByCountry() as $id => $value)
- $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_AVG_BY_COUNTRY, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
+ if (count($log_handler->getAdverageSecondsByCountry())>1) {
+ $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_AVG_BY_COUNTRY);
+ foreach ($log_handler->getAdverageSecondsByCountry() as $id => $value)
+ $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_AVG_BY_COUNTRY, "<label>".($value['node']=='-'?_AM_IPLOG_UNKNOWN:$value['node']).": %s</label>", $value['total'], 'Green');
}
- if (count($log_handler->getAdverageSecondsByRegion())>0) {
- $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_AVG_BY_REGION);
- foreach ($log_handler->getAdverageSecondsByRegion() as $id => $value)
- $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_AVG_BY_REGION, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
+ if (count($log_handler->getAdverageSecondsByRegion())>1) {
+ $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_AVG_BY_REGION);
+ foreach ($log_handler->getAdverageSecondsByRegion() as $id => $value)
+ $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_AVG_BY_REGION, "<label>".($value['node']=='-'?_AM_IPLOG_UNKNOWN:$value['node']).": %s</label>", $value['total'], 'Green');
}
- if (count($log_handler->getAdverageSecondsByContinent())>0) {
- $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_AVG_BY_CONTINENT);
- foreach ($log_handler->getAdverageSecondsByContinent() as $id => $value)
- $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_AVG_BY_CONTINENT, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
+ if (count($log_handler->getAdverageSecondsByContinent())>1) {
+ $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_AVG_BY_CONTINENT);
+ foreach ($log_handler->getAdverageSecondsByContinent() as $id => $value)
+ $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_AVG_BY_CONTINENT, "<label>".($value['node']=='-'?_AM_IPLOG_UNKNOWN:$value['node']).": %s</label>", $value['total'], 'Green');
}
echo $indexAdmin->renderIndex();
Modified: XoopsModules/iplog/trunk/iplog/class/log.php
===================================================================
--- XoopsModules/iplog/trunk/iplog/class/log.php 2012-07-28 08:52:48 UTC (rev 9934)
+++ XoopsModules/iplog/trunk/iplog/class/log.php 2012-07-28 09:16:47 UTC (rev 9935)
@@ -343,7 +343,7 @@
}
function getNumberByCountry() {
- $sql = 'SELECT DISTINCT `country-name` as node, count(*) as total FROM `'.$this->table.'`';
+ $sql = 'SELECT DISTINCT `country-name` as node, count(*) as total FROM `'.$this->table.'` GROUP BY `country-name`';
$result = $GLOBALS['xoopsDB']->queryF($sql);
$ret = array();
while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
@@ -353,7 +353,7 @@
}
function getNumberByRegion() {
- $sql = 'SELECT DISTINCT `b`.`region` as node, count(*) as total FROM `'.$this->table.'` a INNER JOIN `'.$GLOBALS['xoopsDB']->prefix('iplog_countries').'` b ON a.country_id = b.country_id';
+ $sql = 'SELECT DISTINCT `b`.`region` as node, count(*) as total FROM `'.$this->table.'` a INNER JOIN `'.$GLOBALS['xoopsDB']->prefix('iplog_countries').'` b ON a.country_id = b.country_id GROUP BY `b`.`region`';
$result = $GLOBALS['xoopsDB']->queryF($sql);
$ret = array();
while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
@@ -363,7 +363,7 @@
}
function getNumberByContinent() {
- $sql = 'SELECT DISTINCT `b`.`continent` as node, count(*) as total FROM `'.$this->table.'` a INNER JOIN `'.$GLOBALS['xoopsDB']->prefix('iplog_countries').'` b ON a.country_id = b.country_id';
+ $sql = 'SELECT DISTINCT `b`.`continent` as node, count(*) as total FROM `'.$this->table.'` a INNER JOIN `'.$GLOBALS['xoopsDB']->prefix('iplog_countries').'` b ON a.country_id = b.country_id GROUP BY `b`.`continent`';
$result = $GLOBALS['xoopsDB']->queryF($sql);
$ret = array();
while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
@@ -373,7 +373,7 @@
}
function getTotalSecondsByCountry() {
- $sql = 'SELECT DISTINCT `country-name` as node, sum(`online`)/60 as total FROM `'.$this->table.'`';
+ $sql = 'SELECT DISTINCT `country-name` as node, sum(`online`)/60 as total FROM `'.$this->table.'` GROUP BY `country-name`';
$result = $GLOBALS['xoopsDB']->queryF($sql);
$ret = array();
while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
@@ -383,7 +383,7 @@
}
function getTotalSecondsByRegion() {
- $sql = 'SELECT DISTINCT `b`.`region` as node, sum(`online`)/60 as total FROM `'.$this->table.'` a INNER JOIN `'.$GLOBALS['xoopsDB']->prefix('iplog_countries').'` b ON a.country_id = b.country_id';;
+ $sql = 'SELECT DISTINCT `b`.`region` as node, sum(`online`)/60 as total FROM `'.$this->table.'` a INNER JOIN `'.$GLOBALS['xoopsDB']->prefix('iplog_countries').'` b ON a.country_id = b.country_id GROUP BY `b`.`region`';;
$result = $GLOBALS['xoopsDB']->queryF($sql);
$ret = array();
while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
@@ -393,7 +393,7 @@
}
function getTotalSecondsByContinent() {
- $sql = 'SELECT DISTINCT `b`.`continent` as node, sum(`online`)/60 as total FROM `'.$this->table.'` a INNER JOIN `'.$GLOBALS['xoopsDB']->prefix('iplog_countries').'` b ON a.country_id = b.country_id';;
+ $sql = 'SELECT DISTINCT `b`.`continent` as node, sum(`online`)/60 as total FROM `'.$this->table.'` a INNER JOIN `'.$GLOBALS['xoopsDB']->prefix('iplog_countries').'` b ON a.country_id = b.country_id GROUP BY `b`.`continent`';;
$result = $GLOBALS['xoopsDB']->queryF($sql);
$ret = array();
while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
@@ -403,7 +403,7 @@
}
function getAdverageSecondsByCountry() {
- $sql = 'SELECT DISTINCT `country-name` as node, avg(`online`)/60 as total FROM `'.$this->table.'`';
+ $sql = 'SELECT DISTINCT `country-name` as node, avg(`online`)/60 as total FROM `'.$this->table.'` GROUP BY `country-name`';
$result = $GLOBALS['xoopsDB']->queryF($sql);
$ret = array();
while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
@@ -413,7 +413,7 @@
}
function getAdverageSecondsByRegion() {
- $sql = 'SELECT DISTINCT `b`.`region` as node, avg(`online`)/60 as total FROM `'.$this->table.'` a INNER JOIN `'.$GLOBALS['xoopsDB']->prefix('iplog_countries').'` b ON a.country_id = b.country_id';;
+ $sql = 'SELECT DISTINCT `b`.`region` as node, avg(`online`)/60 as total FROM `'.$this->table.'` a INNER JOIN `'.$GLOBALS['xoopsDB']->prefix('iplog_countries').'` b ON a.country_id = b.country_id GROUP BY `b`.`region`';;
$result = $GLOBALS['xoopsDB']->queryF($sql);
$ret = array();
while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
@@ -423,7 +423,7 @@
}
function getAdverageSecondsByContinent() {
- $sql = 'SELECT DISTINCT `b`.`continent` as node, avg(`online`)/60 as total FROM `'.$this->table.'` a INNER JOIN `'.$GLOBALS['xoopsDB']->prefix('iplog_countries').'` b ON a.country_id = b.country_id';;
+ $sql = 'SELECT DISTINCT `b`.`continent` as node, avg(`online`)/60 as total FROM `'.$this->table.'` a INNER JOIN `'.$GLOBALS['xoopsDB']->prefix('iplog_countries').'` b ON a.country_id = b.country_id GROUP BY `b`.`continent`';;
$result = $GLOBALS['xoopsDB']->queryF($sql);
$ret = array();
while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
Modified: XoopsModules/iplog/trunk/iplog/docs/changelog.txt
===================================================================
--- XoopsModules/iplog/trunk/iplog/docs/changelog.txt 2012-07-28 08:52:48 UTC (rev 9934)
+++ XoopsModules/iplog/trunk/iplog/docs/changelog.txt 2012-07-28 09:16:47 UTC (rev 9935)
@@ -1,8 +1,9 @@
================================================
-== Version 1.01 Final - 2012/07/28 18:40 AEST ==
+== Version 1.01 Final - 2012/07/28 19:15 AEST ==
================================================
Changed: /admin/about.php - GNU3 header and shouts added to header (wishcraft)
Changed: /admin/dashboard.php - GNU3 header and shouts added to header (wishcraft)
+Changed: /admin/dashboard.php - Search for '-' in array and return Unknown constant (wishcraft)
Changed: /admin/footer.php - GNU3 header and shouts added to header (wishcraft)
Changed: /admin/header.php - GNU3 header and shouts added to header (wishcraft)
Changed: /admin/log.php - GNU3 header and shouts added to header (wishcraft)
@@ -14,12 +15,14 @@
Changed: /class/log.php - GNU3 header and shouts added to header (wishcraft)
Changed: /class/log.php - Rename of Field Type 'useragent' to 'agent' as Db (wishcraft)
Changed: /class/log.php - xoops_load('cache') is deprecated [changed to standard] (wishcraft)
+Changed: /class/log.php - Add Group By to SQL for statistics on dashboard (wishcraft)
Changed: /class/countries.php - GNU3 header and shouts added to header (wishcraft)
Changed: /include/functions.php - GNU3 header and shouts added to header (wishcraft)
Changed: /include/ip2locationlite.class.php - GNU3 header and shouts added to header (wishcraft)
Changed: /language/english/help/help.html - GNU3 header and shouts added to header (wishcraft)
Changed: /language/english/help/help.html - Content Updated to be revelent & IPInfoDB Instruction added (wishcraft)
Changed: /language/english/admin.php - GNU3 header and shouts added to header (wishcraft)
+Changed: /language/english/admin.php - Unknown added to language for missing data (wishcraft)
Changed: /language/english/admin.php - Rename of Constant Type 'useragent' to 'agent' as Db (wishcraft)
Changed: /language/english/admin.php - add two missing language definitions (mamba)
Changed: /language/english/admin.php - add three sprintf variable to Delete Query. (wishcraft)
Modified: XoopsModules/iplog/trunk/iplog/language/english/admin.php
===================================================================
--- XoopsModules/iplog/trunk/iplog/language/english/admin.php 2012-07-28 08:52:48 UTC (rev 9934)
+++ XoopsModules/iplog/trunk/iplog/language/english/admin.php 2012-07-28 09:16:47 UTC (rev 9935)
@@ -32,6 +32,7 @@
*/
define("_AM_IPLOG_SECONDS", "Seconds");
+define("_AM_IPLOG_UNKNOWN", "Unknown");
define("_AM_IPLOG_TH_IP_ID", "IP ID");
define("_AM_IPLOG_TH_UNAME", "Username");
Modified: XoopsModules/iplog/trunk/iplog/xoops_version.php
===================================================================
--- XoopsModules/iplog/trunk/iplog/xoops_version.php 2012-07-28 08:52:48 UTC (rev 9934)
+++ XoopsModules/iplog/trunk/iplog/xoops_version.php 2012-07-28 09:16:47 UTC (rev 9935)
@@ -49,9 +49,9 @@
$modversion['icons16'] = 'modules/'.$modversion['dirname'].'/images/icons/16';
$modversion['icons32'] = 'modules/'.$modversion['dirname'].'/images/icons/32';
-$modversion['release_info'] = "Stable 2012/07/27";
+$modversion['release_info'] = "Stable 2012/07/28";
$modversion['release_file'] = XOOPS_URL."/modules/profile/docs/changelog.txt";
-$modversion['release_date'] = "2012/07/27";
+$modversion['release_date'] = "2012/07/28";
$modversion['author_realname'] = "Simon Antony Roberts";
$modversion['author_website_url'] = "http://www.chronolabs.com.au";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wis...@us...> - 2012-07-28 08:52:58
|
Revision: 9934
http://xoops.svn.sourceforge.net/xoops/?rev=9934&view=rev
Author: wishcraft
Date: 2012-07-28 08:52:48 +0000 (Sat, 28 Jul 2012)
Log Message:
-----------
IP Log 1.01 - Final Release - Moments after mamba Edition - see changelog.txt
Modified Paths:
--------------
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/about.php
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/dashboard.php
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/footer.php
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/header.php
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/log.php
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/menu.php
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/class/countries.php
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/class/log.php
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/docs/changelog.txt
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/docs/credits.txt
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/include/functions.php
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/include/ip2locationlite.class.php
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/language/english/admin.php
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/language/english/help/help.html
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/language/english/modinfo.php
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/preloads/logger.php
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/sql/mysql.sql
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/templates/iplog_log_list.html
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/xoops_version.php
XoopsModules/iplog/trunk/iplog/admin/about.php
XoopsModules/iplog/trunk/iplog/admin/dashboard.php
XoopsModules/iplog/trunk/iplog/admin/footer.php
XoopsModules/iplog/trunk/iplog/admin/header.php
XoopsModules/iplog/trunk/iplog/admin/log.php
XoopsModules/iplog/trunk/iplog/admin/menu.php
XoopsModules/iplog/trunk/iplog/class/countries.php
XoopsModules/iplog/trunk/iplog/class/log.php
XoopsModules/iplog/trunk/iplog/docs/changelog.txt
XoopsModules/iplog/trunk/iplog/docs/credits.txt
XoopsModules/iplog/trunk/iplog/docs/install.txt
XoopsModules/iplog/trunk/iplog/docs/readme.txt
XoopsModules/iplog/trunk/iplog/include/functions.php
XoopsModules/iplog/trunk/iplog/include/ip2locationlite.class.php
XoopsModules/iplog/trunk/iplog/language/english/admin.php
XoopsModules/iplog/trunk/iplog/language/english/help/help.html
XoopsModules/iplog/trunk/iplog/language/english/modinfo.php
XoopsModules/iplog/trunk/iplog/preloads/logger.php
XoopsModules/iplog/trunk/iplog/sql/mysql.sql
XoopsModules/iplog/trunk/iplog/templates/iplog_log_list.html
XoopsModules/iplog/trunk/iplog/xoops_version.php
Added Paths:
-----------
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/docs/license.pdf
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/images/icons/
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/images/icons/16/
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/images/icons/16/index.html
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/images/icons/16/iplog.log.png
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/images/icons/32/
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/images/icons/32/index.html
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/images/icons/32/iplog.log.png
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/images/icons/index.html
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/images/index.html
XoopsModules/iplog/trunk/iplog/docs/license.pdf
XoopsModules/iplog/trunk/iplog/images/icons/16/index.html
XoopsModules/iplog/trunk/iplog/images/icons/32/index.html
XoopsModules/iplog/trunk/iplog/images/icons/index.html
XoopsModules/iplog/trunk/iplog/images/index.html
Removed Paths:
-------------
XoopsModules/iplog/releases/1.01/htdocs/Frameworks/
XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/docs/licence.txt
Modified: XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/about.php
===================================================================
--- XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/about.php 2012-07-28 08:28:47 UTC (rev 9933)
+++ XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/about.php 2012-07-28 08:52:48 UTC (rev 9934)
@@ -1,34 +1,35 @@
<?php
-// $Id: about.php 5204 2010-09-06 20:10:52Z mageg $
-// ------------------------------------------------------------------------ //
-// XOOPS - PHP Content Management System //
-// Copyright (c) 2000 XOOPS.org //
-// <http://www.xoops.org/> //
-// ------------------------------------------------------------------------ //
-// This program is free software; you can redistribute it and/or modify //
-// it under the terms of the GNU General Public License as published by //
-// the Free Software Foundation; either version 2 of the License, or //
-// (at your option) any later version. //
-// //
-// You may not change or alter any portion of this comment or credits //
-// of supporting developers from this source code or any supporting //
-// source code which is considered copyrighted (c) material of the //
-// original comment or credit authors. //
-// //
-// This program is distributed in the hope that it will be useful, //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
-// GNU General Public License for more details. //
-// //
-// You should have received a copy of the GNU General Public License //
-// along with this program; if not, write to the Free Software //
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
-// ------------------------------------------------------------------------ //
-// Author: XOOPS Foundation //
-// URL: http://www.xoops.org/ //
-// Project: The XOOPS Project //
-// ------------------------------------------------------------------------- //
-
+/*
+ * Logs Guest and users IP Addresses for a period of time and provides
+ * basic statistic of them in XOOPS Copyright (C) 2012 Simon Roberts
+ * Contact: wishcraft - si...@ch...
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * See /docs/license.pdf for full license.
+ *
+ * Shouts:- Mamba (www.xoops.org), flipse (www.nlxoops.nl)
+ * Many thanks for your additional work with version 1.01
+ *
+ * Version: 1.01 Final
+ * Published: Chronolabs
+ * Download: http://code.google.com/p/chronolabs
+ * This File: about.php
+ * Description: About Program Dialogue for Admin Control Panel
+ * Date: 28/07/2015 5:45PM AEST
+ * License: GNU3
+ *
+ */
include ('header.php');
xoops_loadLanguage('admin', 'iplog');
Modified: XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/dashboard.php
===================================================================
--- XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/dashboard.php 2012-07-28 08:28:47 UTC (rev 9933)
+++ XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/dashboard.php 2012-07-28 08:52:48 UTC (rev 9934)
@@ -1,33 +1,35 @@
<?php
-// $Id: directory.php 5204 2010-09-06 20:10:52Z mageg $
-// ------------------------------------------------------------------------ //
-// XOOPS - PHP Content Management System //
-// Copyright (c) 2000 XOOPS.org //
-// <http://www.xoops.org/> //
-// ------------------------------------------------------------------------ //
-// This program is free software; you can redistribute it and/or modify //
-// it under the terms of the GNU General Public License as published by //
-// the Free Software Foundation; either version 2 of the License, or //
-// (at your option) any later version. //
-// //
-// You may not change or alter any portion of this comment or credits //
-// of supporting developers from this source code or any supporting //
-// source code which is considered copyrighted (c) material of the //
-// original comment or credit authors. //
-// //
-// This program is distributed in the hope that it will be useful, //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
-// GNU General Public License for more details. //
-// //
-// You should have received a copy of the GNU General Public License //
-// along with this program; if not, write to the Free Software //
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
-// ------------------------------------------------------------------------ //
-// Author: XOOPS Foundation //
-// URL: http://www.xoops.org/ //
-// Project: The XOOPS Project //
-// ------------------------------------------------------------------------- //
+/*
+ * Logs Guest and users IP Addresses for a period of time and provides
+ * basic statistic of them in XOOPS Copyright (C) 2012 Simon Roberts
+ * Contact: wishcraft - si...@ch...
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * See /docs/license.pdf for full license.
+ *
+ * Shouts:- Mamba (www.xoops.org), flipse (www.nlxoops.nl)
+ * Many thanks for your additional work with version 1.01
+ *
+ * Version: 1.01 Final
+ * Published: Chronolabs
+ * Download: http://code.google.com/p/chronolabs
+ * This File: dashboard.php
+ * Description: User admin dashboard for Admin Control Panel
+ * Date: 28/07/2015 5:45PM AEST
+ * License: GNU3
+ *
+ */
include ('header.php');
xoops_loadLanguage('admin', 'profile');
Modified: XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/footer.php
===================================================================
--- XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/footer.php 2012-07-28 08:28:47 UTC (rev 9933)
+++ XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/footer.php 2012-07-28 08:52:48 UTC (rev 9934)
@@ -1,22 +1,36 @@
<?php
-/**
- * xSitemMap module
+/*
+ * Logs Guest and users IP Addresses for a period of time and provides
+ * basic statistic of them in XOOPS Copyright (C) 2012 Simon Roberts
+ * Contact: wishcraft - si...@ch...
*
- * 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 free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package xSitemMap
- * @since 2.5.0
- * @author XOOPS Module Team
- * @version $Id $
-**/
-echo "<div align=\"center\"><a href=\"http://www.xoops.org\" target=\"_blank\"><img src=" . XOOPS_URL ."/". $GLOBALS['iplogModule']->getInfo("icons32")."/xoopsmicrobutton.gif"." alt=\"XOOPS\" title=\"XOOPS\"></a></div>";
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * See /docs/license.pdf for full license.
+ *
+ * Shouts:- Mamba (www.xoops.org), flipse (www.nlxoops.nl)
+ * Many thanks for your additional work with version 1.01
+ *
+ * Version: 1.01 Final
+ * Published: Chronolabs
+ * Download: http://code.google.com/p/chronolabs
+ * This File: footer.php
+ * Description: Footer Include File for Admin Control Panel
+ * Date: 28/07/2015 5:45PM AEST
+ * License: GNU3
+ *
+ */
+echo "<div align=\"center\"><a href=\"http://www.xoops.org\" target=\"_blank\"><img src=" . XOOPS_URL ."/". $GLOBALS['iplogModule']->getInfo("system_icons32")."/xoopsmicrobutton.gif"." alt=\"XOOPS\" title=\"XOOPS\"></a></div>";
echo "<div class='center smallsmall italic pad5'><strong>" . $GLOBALS['iplogModule']->getVar("name") . "</strong> is maintained by the <a class='tooltip' rel='external' href='http://www.xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>";
xoops_cp_footer();
\ No newline at end of file
Modified: XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/header.php
===================================================================
--- XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/header.php 2012-07-28 08:28:47 UTC (rev 9933)
+++ XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/header.php 2012-07-28 08:52:48 UTC (rev 9934)
@@ -1,23 +1,36 @@
<?php
-/**
- * Extended User iplog
+/*
+ * Logs Guest and users IP Addresses for a period of time and provides
+ * basic statistic of them in XOOPS Copyright (C) 2012 Simon Roberts
+ * Contact: wishcraft - si...@ch...
*
- * 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 free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
- * @package iplog
- * @since 2.3.0
- * @author Taiwen Jiang <ph...@us...>
- * @version $Id: header.php 5204 2010-09-06 20:10:52Z mageg $
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * See /docs/license.pdf for full license.
+ *
+ * Shouts:- Mamba (www.xoops.org), flipse (www.nlxoops.nl)
+ * Many thanks for your additional work with version 1.01
+ *
+ * Version: 1.01 Final
+ * Published: Chronolabs
+ * Download: http://code.google.com/p/chronolabs
+ * This File: header.php
+ * Description: Header Include file for Admin Control Panel
+ * Date: 28/07/2015 5:45PM AEST
+ * License: GNU3
+ *
*/
-
require_once (dirname(dirname(dirname(dirname(__FILE__)))).'/include/cp_header.php');
if (!defined('_CHARSET'))
@@ -45,6 +58,8 @@
echo xoops_error("Error: You don't use the Frameworks \"admin module\". Please install this Frameworks");
}
+ $GLOBALS['iplogSystemImageIcon'] = XOOPS_URL .'/'. $GLOBALS['iplogModule']->getInfo('system_icons16');
+ $GLOBALS['iplogSystemImageAdmin'] = XOOPS_URL .'/'. $GLOBALS['iplogModule']->getInfo('system_icons32');
$GLOBALS['iplogImageIcon'] = XOOPS_URL .'/'. $GLOBALS['iplogModule']->getInfo('icons16');
$GLOBALS['iplogImageAdmin'] = XOOPS_URL .'/'. $GLOBALS['iplogModule']->getInfo('icons32');
@@ -68,6 +83,8 @@
$GLOBALS['xoopsTpl'] = new XoopsTpl();
}
+ $GLOBALS['xoopsTpl']->assign('pathSystemImageIcon', $GLOBALS['iplogSystemImageIcon']);
+ $GLOBALS['xoopsTpl']->assign('pathSystemImageAdmin', $GLOBALS['iplogSystemImageAdmin']);
$GLOBALS['xoopsTpl']->assign('pathImageIcon', $GLOBALS['iplogImageIcon']);
$GLOBALS['xoopsTpl']->assign('pathImageAdmin', $GLOBALS['iplogImageAdmin']);
Modified: XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/log.php
===================================================================
--- XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/log.php 2012-07-28 08:28:47 UTC (rev 9933)
+++ XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/log.php 2012-07-28 08:52:48 UTC (rev 9934)
@@ -1,33 +1,35 @@
<?php
-// $Id: category.php 5204 2010-09-06 20:10:52Z mageg $
-// ------------------------------------------------------------------------ //
-// XOOPS - PHP Content Management System //
-// Copyright (c) 2000 XOOPS.org //
-// <http://www.xoops.org/> //
-// ------------------------------------------------------------------------ //
-// This program is free software; you can redistribute it and/or modify //
-// it under the terms of the GNU General Public License as published by //
-// the Free Software Foundation; either version 2 of the License, or //
-// (at your option) any later version. //
-// //
-// You may not change or alter any portion of this comment or credits //
-// of supporting developers from this source code or any supporting //
-// source code which is considered copyrighted (c) material of the //
-// original comment or credit authors. //
-// //
-// This program is distributed in the hope that it will be useful, //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
-// GNU General Public License for more details. //
-// //
-// You should have received a copy of the GNU General Public License //
-// along with this program; if not, write to the Free Software //
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
-// ------------------------------------------------------------------------ //
-// Author: XOOPS Foundation //
-// URL: http://www.xoops.org/ //
-// Project: The XOOPS Project //
-// ------------------------------------------------------------------------- //
+/*
+ * Logs Guest and users IP Addresses for a period of time and provides
+ * basic statistic of them in XOOPS Copyright (C) 2012 Simon Roberts
+ * Contact: wishcraft - si...@ch...
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * See /docs/license.pdf for full license.
+ *
+ * Shouts:- Mamba (www.xoops.org), flipse (www.nlxoops.nl)
+ * Many thanks for your additional work with version 1.01
+ *
+ * Version: 1.01 Final
+ * Published: Chronolabs
+ * Download: http://code.google.com/p/chronolabs
+ * This File: log.php
+ * Description: Log Admin Control Panel Browser
+ * Date: 28/07/2015 5:45PM AEST
+ * License: GNU3
+ *
+ */
include 'header.php';
xoops_cp_header();
$indexAdmin = new ModuleAdmin();
@@ -50,7 +52,7 @@
$criteria = new Criteria(1,1);
$ttl = $log_handler->getCount($criteria);
- $sort = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'start';
+ $sort = !empty($_REQUEST['sort'])?''.str_replace('_', '-', $_REQUEST['sort']).'':'start';
$pagenav = new XoopsPageNav($ttl, $limit, $start, 'start', 'limit='.$limit.'&sort='.$sort.'&order='.$order.'&op='.$op.'&fct='.$fct.'&filter='.$filter.'&fct='.$fct.'&filter='.$filter);
$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
@@ -90,15 +92,15 @@
if (isset($_POST['id'])&&$id!=0) {
$log = $log_handler->get($id);
if (!$log_handler->delete($log)) {
- redirect_header('index.php?op='.$op.'&fct=list&limit='.$limit.'&start='.$start.'&order='.$order.'&sort='.$sort.'&filter='.$filter, 10, _AM_MSG_LOG_FAILEDTODELETE);
+ redirect_header('log.php?op='.$op.'&fct=list&limit='.$limit.'&start='.$start.'&order='.$order.'&sort='.$sort.'&filter='.$filter, 10, _AM_MSG_LOG_FAILEDTODELETE);
exit(0);
} else {
- redirect_header('index.php?op='.$op.'&fct=list&limit='.$limit.'&start='.$start.'&order='.$order.'&sort='.$sort.'&filter='.$filter, 10, _AM_MSG_LOG_DELETED);
+ redirect_header('log.php?op='.$op.'&fct=list&limit='.$limit.'&start='.$start.'&order='.$order.'&sort='.$sort.'&filter='.$filter, 10, _AM_MSG_LOG_DELETED);
exit(0);
}
} else {
$log = $log_handler->get($id);
- xoops_confirm(array('id'=>$id, 'op'=>$_REQUEST['op'], 'fct'=>$_REQUEST['fct'], 'limit'=>$_REQUEST['limit'], 'start'=>$_REQUEST['start'], 'order'=>$_REQUEST['order'], 'sort'=>$_REQUEST['sort'], 'filter'=>$_REQUEST['filter']), 'index.php', sprintf(_AM_MSG_LOG_DELETE, $log->getVar('name')));
+ xoops_confirm(array('id'=>$id, 'op'=>$_REQUEST['op'], 'fct'=>$_REQUEST['fct'], 'limit'=>$_REQUEST['limit'], 'start'=>$_REQUEST['start'], 'order'=>$_REQUEST['order'], 'sort'=>$_REQUEST['sort'], 'filter'=>$_REQUEST['filter']), 'log.php', sprintf(_AM_MSG_LOG_DELETE, $log->getVar('uname'), $log->getIPAddy(), $log->getVar('ip_id')));
}
break;
}
Modified: XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/menu.php
===================================================================
--- XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/menu.php 2012-07-28 08:28:47 UTC (rev 9933)
+++ XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/admin/menu.php 2012-07-28 08:52:48 UTC (rev 9934)
@@ -1,37 +1,50 @@
<?php
-/**
- * Extended User iplog
+/*
+ * Logs Guest and users IP Addresses for a period of time and provides
+ * basic statistic of them in XOOPS Copyright (C) 2012 Simon Roberts
+ * Contact: wishcraft - si...@ch...
*
- * 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 free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package iplog
- * @since 2.3.0
- * @author Jan Pedersen
- * @author Taiwen Jiang <ph...@us...>
- * @version $Id: menu.php 2021 2008-08-31 02:02:45Z phppp $
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * See /docs/license.pdf for full license.
+ *
+ * Shouts:- Mamba (www.xoops.org), flipse (www.nlxoops.nl)
+ * Many thanks for your additional work with version 1.01
+ *
+ * Version: 1.01 Final
+ * Published: Chronolabs
+ * Download: http://code.google.com/p/chronolabs
+ * This File: menu.php
+ * Description: User admin menu defines for menu variables
+ * Date: 28/07/2015 5:45PM AEST
+ * License: GNU3
+ *
*/
$module_handler = xoops_gethandler('module');
$GLOBALS['iplogModule'] = $module_handler->getByDirname('iplog');
$adminmenu = array();
if (is_object($GLOBALS['iplogModule'])) {
$adminmenu[0]['title'] = _MI_IPLOG_DASHBOARD;
- $adminmenu[0]['icon'] = '../../'.$GLOBALS['iplogModule']->getInfo('icons32').'/about.png';
- $adminmenu[0]['image'] = '../../'.$GLOBALS['iplogModule']->getInfo('icons32').'/about.png';
+ $adminmenu[0]['icon'] = '../../'.$GLOBALS['iplogModule']->getInfo('system_icons32').'/about.png';
+ $adminmenu[0]['image'] = '../../'.$GLOBALS['iplogModule']->getInfo('system_icons32').'/about.png';
$adminmenu[0]['link'] = "admin/dashboard.php";
$adminmenu[1]['title'] = _MI_IPLOG_LOG;
$adminmenu[1]['icon'] = '../../'.$GLOBALS['iplogModule']->getInfo('icons32').'/iplog.log.png';
$adminmenu[1]['image'] = '../../'.$GLOBALS['iplogModule']->getInfo('icons32').'/iplog.log.png';
$adminmenu[1]['link'] = "admin/log.php";
$adminmenu[2]['title'] = _MI_IPLOG_ABOUT;
- $adminmenu[2]['icon'] = '../../'.$GLOBALS['iplogModule']->getInfo('icons32').'/about.png';
- $adminmenu[2]['image'] = '../../'.$GLOBALS['iplogModule']->getInfo('icons32').'/about.png';
+ $adminmenu[2]['icon'] = '../../'.$GLOBALS['iplogModule']->getInfo('system_icons32').'/about.png';
+ $adminmenu[2]['image'] = '../../'.$GLOBALS['iplogModule']->getInfo('system_icons32').'/about.png';
$adminmenu[2]['link'] = "admin/about.php";
}
?>
\ No newline at end of file
Modified: XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/class/countries.php
===================================================================
--- XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/class/countries.php 2012-07-28 08:28:47 UTC (rev 9933)
+++ XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/class/countries.php 2012-07-28 08:52:48 UTC (rev 9934)
@@ -1,21 +1,34 @@
<?php
-/**
- * Extended User Iplog
+/*
+ * Logs Guest and users IP Addresses for a period of time and provides
+ * basic statistic of them in XOOPS Copyright (C) 2012 Simon Roberts
+ * Contact: wishcraft - si...@ch...
*
- * 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 free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package Iplog
- * @since 2.3.0
- * @author Jan Pedersen
- * @author Taiwen Jiang <ph...@us...>
- * @version $Id: Countries.php 4361 2010-02-09 23:36:33Z trabis $
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * See /docs/license.pdf for full license.
+ *
+ * Shouts:- Mamba (www.xoops.org), flipse (www.nlxoops.nl)
+ * Many thanks for your additional work with version 1.01
+ *
+ * Version: 1.01 Final
+ * Published: Chronolabs
+ * Download: http://code.google.com/p/chronolabs
+ * This File: countries.php
+ * Description: Countries Handler and Object Class for Module
+ * Date: 28/07/2015 5:45PM AEST
+ * License: GNU3
+ *
*/
defined('XOOPS_ROOT_PATH') or die("XOOPS root path not defined");
Modified: XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/class/log.php
===================================================================
--- XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/class/log.php 2012-07-28 08:28:47 UTC (rev 9933)
+++ XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/class/log.php 2012-07-28 08:52:48 UTC (rev 9934)
@@ -1,5 +1,35 @@
<?php
-
+/*
+ * Logs Guest and users IP Addresses for a period of time and provides
+* basic statistic of them in XOOPS Copyright (C) 2012 Simon Roberts
+* Contact: wishcraft - si...@ch...
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+* See /docs/license.pdf for full license.
+*
+* Shouts:- Mamba (www.xoops.org), flipse (www.nlxoops.nl)
+* Many thanks for your additional work with version 1.01
+*
+* Version: 1.01 Final
+* Published: Chronolabs
+* Download: http://code.google.com/p/chronolabs
+* This File: log.php
+* Description: Log Handler and Object Class for Module Instanciation
+* Date: 28/07/2015 5:45PM AEST
+* License: GNU3
+*
+*/
if (!defined('XOOPS_ROOT_PATH')) {
exit();
}
@@ -55,10 +85,17 @@
function toArray() {
$ret = parent::toArray();
$ret['made'] = date(_DATESTRING, $this->getVar('made'));
- $countries_handler = xoops_getmodulehandler('countries', 'iplog');
- $country = $countries_handler->get($this->getVar('country_id'));
- if (is_object($country))
- $ret['country'] = $country->toArray();
+ if ($this->getVar('country_id')!=0) {
+ $countries_handler = xoops_getmodulehandler('countries', 'iplog');
+ $country = $countries_handler->get($this->getVar('country_id'));
+ if (is_object($country))
+ $ret['country'] = $country->toArray();
+ } else {
+ $ret['country']['code'] = '--';
+ $ret['country']['name'] = '--';
+ $ret['country']['continent'] = '--';
+ $ret['country']['region'] = '--';
+ }
$comment_handler = xoops_gethandler('comment');
$module_handler = xoops_gethandler('module');
$GLOBALS['moduleIplog'] = $module_handler->getByDirname('iplog');
@@ -80,7 +117,7 @@
$ret[str_replace('-', '_', $key)] = $value;
}
$ret['ip'] = $this->getIPAddy().' ('.$this->getIPType().')';
- $ret['proxy_ip'] = $this->getProxyIPAddy();
+ $ret['proxy_ip'] = (strlen($this->getProxyIPAddy())?$this->getProxyIPAddy():'--');
$ret['start'] = date(_DATESTRING,$ret['start']);
$ret['end'] = date(_DATESTRING,$ret['end']);
if ($ret['uid']==0)
@@ -169,7 +206,7 @@
}
function getFields() {
- return array('ip_id', 'uname', 'ip', 'country_code', 'name', 'region', 'contient', 'network_addy', 'useragent', 'proxy_ip', 'start', 'end', 'online');
+ return array('ip_id', 'uname', 'ip', 'country_code', 'name', 'region', 'contient', 'network_addy', 'agent', 'proxy_ip', 'start', 'end', 'online');
}
function writeLog($data) {
@@ -182,7 +219,7 @@
}
function insert($obj, $force = true) {
- xoops_load('cache');
+ xoops_load('xoopscache');
$ping = XoopsCache::read('iplog_ip_ping_unixtimes');
if (!is_array($ping)==true) {
$ping=array($obj->getIPAddy()=>microtime(true));
Modified: XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/docs/changelog.txt
===================================================================
--- XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/docs/changelog.txt 2012-07-28 08:28:47 UTC (rev 9933)
+++ XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/docs/changelog.txt 2012-07-28 08:52:48 UTC (rev 9934)
@@ -0,0 +1,62 @@
+================================================
+== Version 1.01 Final - 2012/07/28 18:40 AEST ==
+================================================
+Changed: /admin/about.php - GNU3 header and shouts added to header (wishcraft)
+Changed: /admin/dashboard.php - GNU3 header and shouts added to header (wishcraft)
+Changed: /admin/footer.php - GNU3 header and shouts added to header (wishcraft)
+Changed: /admin/header.php - GNU3 header and shouts added to header (wishcraft)
+Changed: /admin/log.php - GNU3 header and shouts added to header (wishcraft)
+Changed: /admin/log.php - fix delete function (flipse)
+Changed: /admin/log.php - fix delete query message to provide data output (flipse)
+Changed: /admin/log.php - rename index.php to log.php in redirections (flipse)
+Changed: /admin/menu.php - GNU3 header and shouts added to header (wishcraft)
+Changed: /admin/menu.php - Framework System Icon Path Variable Added (wishcraft)
+Changed: /class/log.php - GNU3 header and shouts added to header (wishcraft)
+Changed: /class/log.php - Rename of Field Type 'useragent' to 'agent' as Db (wishcraft)
+Changed: /class/log.php - xoops_load('cache') is deprecated [changed to standard] (wishcraft)
+Changed: /class/countries.php - GNU3 header and shouts added to header (wishcraft)
+Changed: /include/functions.php - GNU3 header and shouts added to header (wishcraft)
+Changed: /include/ip2locationlite.class.php - GNU3 header and shouts added to header (wishcraft)
+Changed: /language/english/help/help.html - GNU3 header and shouts added to header (wishcraft)
+Changed: /language/english/help/help.html - Content Updated to be revelent & IPInfoDB Instruction added (wishcraft)
+Changed: /language/english/admin.php - GNU3 header and shouts added to header (wishcraft)
+Changed: /language/english/admin.php - Rename of Constant Type 'useragent' to 'agent' as Db (wishcraft)
+Changed: /language/english/admin.php - add two missing language definitions (mamba)
+Changed: /language/english/admin.php - add three sprintf variable to Delete Query. (wishcraft)
+Changed: /language/english/modinfo.php - GNU3 header and shouts added to header (wishcraft)
+Changed: /preloads/logger.php - GNU3 header and shouts added to header (wishcraft)
+Changed: /sql/mysql.sql - GNU3 header and shouts added to header (wishcraft)
+Changed: /templates/iplog_log_list.html - GNU3 header and shouts added to header (wishcraft)
+Changed: /templates/iplog_log_list.html - replaced "delete" text with icon (mamba)
+Changed: /templates/iplog_log_list.html - Fixed display of country code from country array (wishcraft)
+Changed: /templates/iplog_log_list.html - Fixed display of continent from array (wishcraft)
+Changed: /templates/iplog_log_list.html - Fixed display of User Agent from array (wishcraft)
+Changed: /xoops_version.php - GNU3 header and shouts added to header (wishcraft)
+Changed: /xoops_version.php - Framework System Icon Path Variable Added (wishcraft)
+Changed: restructure folders (mamba)
+Moved: /Frameworks/moduleclass/icons to /images/icons - move icons back to th module (mamba)
+
+================================================
+== Version 1.01 RC - 2012/07/27 ==
+================================================
+Changed: /class/log.php - Ping time stored in Cache based on Session Expires Time (wishcraft)
+Changed: /class/log.php - IP Type detection Improved (wishcraft)
+Changed: /class/log.php - IP Type added to toArray() for IP Address (wishcraft)
+Changed: /class/log.php - Support for anonymous user added (wishcraft)
+Changed: /class/log.php - Contient renamed to Continent (wishcraft)
+Changed: /admin/dashboard.php - Contient renamed to Continent (wishcraft)
+Changed: /admin/dashboard.php - CONTIENT renamed to CONTINENT (wishcraft)
+Changed: /language/english/admin.php - CONTIENT renamed to CONTINENT (wishcraft)
+Changed: /language/english/modinfo.php - IP Type added to language defines (wishcraft)
+Changed: /language/english/modinfo.php - Anonymous Preference Language Added (wishcraft)
+Changed: /xoops_version.php - Anonymous Preference Added to allow guest IP to be recorded (wishcraft)
+Changed: /preloader/logger.php - Anonymous Support added to checking for new object (wishcraft)
+Changed: /template/iplog_log_list.html - CONTIENT renamed to CONTINENT (wishcraft)
+
+================================================
+== Version 1.01 Beta - 2012/07/26 ==
+================================================
+Changed: /class/log.php - End added to time added on new objects (wishcraft)
+Changed: /include/ip2locationlite.class.php - Use of cURL via iplog_get_curl() function added (wishcraft)
+Changed: /template/iplog_log_list.html - Table footer cells number fixed (colspan) (wishcraft)
+
\ No newline at end of file
Modified: XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/docs/credits.txt
===================================================================
--- XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/docs/credits.txt 2012-07-28 08:28:47 UTC (rev 9933)
+++ XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/docs/credits.txt 2012-07-28 08:52:48 UTC (rev 9934)
@@ -1,4 +1,21 @@
-Read Me First
-=============
+Version 1.01 Final
+==================
-Please make sure that you download the XOOPS Icon Set, and upload it to uploads/images directory
\ No newline at end of file
+ * Simon Roberts (wishcraft) - www.chronolabs.com.au
+ * Michael Beck (mamba) - www.xoops.org
+ * Hans Jokshol (flipse) - www.nlxoops.nl
+
+Version 1.01 RC
+==================
+
+ * Simon Roberts (wishcraft) - www.chronolabs.com.au
+
+Version 1.01 Beta
+==================
+
+ * Simon Roberts (wishcraft) - www.chronolabs.com.au
+
+Version 1.01 Alpha
+==================
+
+ * Simon Roberts (wishcraft) - www.chronolabs.com.au
\ No newline at end of file
Deleted: XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/docs/licence.txt
===================================================================
--- XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/docs/licence.txt 2012-07-28 08:28:47 UTC (rev 9933)
+++ XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/docs/licence.txt 2012-07-28 08:52:48 UTC (rev 9934)
@@ -1,339 +0,0 @@
- 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 source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
Added: XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/docs/license.pdf
===================================================================
(Binary files differ)
Property changes on: XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/docs/license.pdf
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/images/icons/16/index.html
===================================================================
--- XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/images/icons/16/index.html (rev 0)
+++ XoopsModules/iplog/releases/1.01/htdocs/modules/iplog/images/icons/16...
[truncated message content] |
|
From: <be...@us...> - 2012-07-28 08:28:54
|
Revision: 9933
http://xoops.svn.sourceforge.net/xoops/?rev=9933&view=rev
Author: beckmi
Date: 2012-07-28 08:28:47 +0000 (Sat, 28 Jul 2012)
Log Message:
-----------
Fixing missing stats in Dashboard
Modified Paths:
--------------
XoopsModules/iplog/trunk/iplog/admin/dashboard.php
Modified: XoopsModules/iplog/trunk/iplog/admin/dashboard.php
===================================================================
--- XoopsModules/iplog/trunk/iplog/admin/dashboard.php 2012-07-28 06:13:16 UTC (rev 9932)
+++ XoopsModules/iplog/trunk/iplog/admin/dashboard.php 2012-07-28 08:28:47 UTC (rev 9933)
@@ -36,52 +36,52 @@
$indexAdmin = new ModuleAdmin();
$log_handler = xoops_getmodulehandler('log', 'iplog');
+ $indexAdmin = new ModuleAdmin();
- $indexAdmin = new ModuleAdmin();
- if (count($log_handler->getNumberByCountry())>1) {
+ if (count($log_handler->getNumberByCountry())>0) {
$indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_COUNTS_BY_COUNTRY);
foreach ($log_handler->getNumberByCountry() as $id => $value)
$indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_COUNTS_BY_COUNTRY, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
}
- if (count($log_handler->getNumberByRegion())>1) {
+ if (count($log_handler->getNumberByRegion())>0) {
$indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_COUNTS_BY_REGION);
- foreach ($log_handler->getNumberByRegion() as $id => $value)
+ foreach ($log_handler->getNumberByRegion() as $id => $value)
$indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_COUNTS_BY_REGION, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
}
- if (count($log_handler->getNumberByContinent())>1) {
- $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_COUNTS_BY_CONTINENT);
- foreach ($log_handler->getNumberByContinent() as $id => $value)
+ if (count($log_handler->getNumberByContinent())>0) {
+ $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_COUNTS_BY_CONTINENT);
+ foreach ($log_handler->getNumberByContinent() as $id => $value)
$indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_COUNTS_BY_CONTINENT, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
}
- if (count($log_handler->getTotalSecondsByCountry())>1) {
- $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_SUM_BY_COUNTRY);
- foreach ($log_handler->getTotalSecondsByCountry() as $id => $value)
+ if (count($log_handler->getTotalSecondsByCountry())>0) {
+ $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_SUM_BY_COUNTRY);
+ foreach ($log_handler->getTotalSecondsByCountry() as $id => $value)
$indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_SUM_BY_COUNTRY, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
}
- if (count($log_handler->getTotalSecondsByRegion())>1) {
- $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_SUM_BY_REGION);
- foreach ($log_handler->getTotalSecondsByRegion() as $id => $value)
+ if (count($log_handler->getTotalSecondsByRegion())>0) {
+ $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_SUM_BY_REGION);
+ foreach ($log_handler->getTotalSecondsByRegion() as $id => $value)
$indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_SUM_BY_REGION, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
}
- if (count($log_handler->getTotalSecondsByContinent())>1) {
- $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_SUM_BY_CONTINENT);
- foreach ($log_handler->getTotalSecondsByContinent() as $id => $value)
+ if (count($log_handler->getTotalSecondsByContinent())>0) {
+ $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_SUM_BY_CONTINENT);
+ foreach ($log_handler->getTotalSecondsByContinent() as $id => $value)
$indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_SUM_BY_CONTINENT, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
}
- if (count($log_handler->getAdverageSecondsByCountry())>1) {
- $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_AVG_BY_COUNTRY);
- foreach ($log_handler->getAdverageSecondsByCountry() as $id => $value)
+ if (count($log_handler->getAdverageSecondsByCountry())>0) {
+ $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_AVG_BY_COUNTRY);
+ foreach ($log_handler->getAdverageSecondsByCountry() as $id => $value)
$indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_AVG_BY_COUNTRY, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
}
- if (count($log_handler->getAdverageSecondsByRegion())>1) {
- $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_AVG_BY_REGION);
- foreach ($log_handler->getAdverageSecondsByRegion() as $id => $value)
+ if (count($log_handler->getAdverageSecondsByRegion())>0) {
+ $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_AVG_BY_REGION);
+ foreach ($log_handler->getAdverageSecondsByRegion() as $id => $value)
$indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_AVG_BY_REGION, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
}
- if (count($log_handler->getAdverageSecondsByContinent())>1) {
- $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_AVG_BY_CONTINENT);
- foreach ($log_handler->getAdverageSecondsByContinent() as $id => $value)
- $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_AVG_BY_CONTINENT, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
+ if (count($log_handler->getAdverageSecondsByContinent())>0) {
+ $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_AVG_BY_CONTINENT);
+ foreach ($log_handler->getAdverageSecondsByContinent() as $id => $value)
+ $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_AVG_BY_CONTINENT, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
}
echo $indexAdmin->renderIndex();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <luc...@us...> - 2012-07-28 06:13:24
|
Revision: 9932
http://xoops.svn.sourceforge.net/xoops/?rev=9932&view=rev
Author: luciorota
Date: 2012-07-28 06:13:16 +0000 (Sat, 28 Jul 2012)
Log Message:
-----------
fixed errors
added some descriptions
Modified Paths:
--------------
XoopsModules/xaddresses/trunk/xaddresses/admin/admin_header.php
XoopsModules/xaddresses/trunk/xaddresses/admin/field.php
XoopsModules/xaddresses/trunk/xaddresses/class/field.php
XoopsModules/xaddresses/trunk/xaddresses/class/formxoopsimage.php
XoopsModules/xaddresses/trunk/xaddresses/class/locationcategory.php
XoopsModules/xaddresses/trunk/xaddresses/include/forms.php
XoopsModules/xaddresses/trunk/xaddresses/language/english/admin.php
XoopsModules/xaddresses/trunk/xaddresses/language/english/modinfo.php
XoopsModules/xaddresses/trunk/xaddresses/sql/mysql.sql
XoopsModules/xaddresses/trunk/xaddresses/templates/xaddresses_admin_fieldlist.html
XoopsModules/xaddresses/trunk/xaddresses/xoops_version.php
Modified: XoopsModules/xaddresses/trunk/xaddresses/admin/admin_header.php
===================================================================
--- XoopsModules/xaddresses/trunk/xaddresses/admin/admin_header.php 2012-07-28 06:09:13 UTC (rev 9931)
+++ XoopsModules/xaddresses/trunk/xaddresses/admin/admin_header.php 2012-07-28 06:13:16 UTC (rev 9932)
@@ -27,28 +27,36 @@
*/
include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php';
-include_once XOOPS_ROOT_PATH . '/include/cp_functions.php';
+
+// Include xoops admin header
+include_once XOOPS_ROOT_PATH . '/include/cp_header.php';
+include_once XOOPS_ROOT_PATH . '/include/config.php';
+include_once XOOPS_ROOT_PATH . '/include/functions.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_load ('XoopsUserUtility');
+
+// Include module functions
include_once '../include/config.php';
include_once '../include/functions.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_load ('XoopsUserUtility');
+
$pathDir = $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin');
-$globlang = $GLOBALS['xoopsConfig']['language'];
+$globalLanguage = $GLOBALS['xoopsConfig']['language'];
-if ( file_exists($pathDir.'/language/'.$globlang.'/main.php')){
- include_once $pathDir.'/language/'.$globlang.'/main.php';
+if ( file_exists($pathDir . '/language/' . $globalLanguage . '/main.php')){
+ include_once $pathDir . '/language/' . $globalLanguage . '/main.php';
} else {
- include_once $pathDir.'/language/english/main.php';
+ include_once $pathDir . '/language/english/main.php';
}
-if ( file_exists($pathDir.'/moduleadmin.php')){
- include_once $pathDir.'/moduleadmin.php';
+if ( file_exists($pathDir . '/moduleadmin.php')){
+ include_once $pathDir . '/moduleadmin.php';
//return true;
-}else{
+} else {
xoops_cp_header();
echo xoops_error(_AM_XADDRESSES_NOFRAMEWORKS);
xoops_cp_footer();
@@ -87,7 +95,7 @@
$xoopsTpl->assign('pathImageAdmin', $pathImageAdmin);
//xoops_cp_header();
-//Load languages
+//Load module languages
xoops_loadLanguage('admin', $xoopsModule->getVar("dirname"));
xoops_loadLanguage('modinfo', $xoopsModule->getVar("dirname"));
xoops_loadLanguage('main', $xoopsModule->getVar("dirname"));
Modified: XoopsModules/xaddresses/trunk/xaddresses/admin/field.php
===================================================================
--- XoopsModules/xaddresses/trunk/xaddresses/admin/field.php 2012-07-28 06:09:13 UTC (rev 9931)
+++ XoopsModules/xaddresses/trunk/xaddresses/admin/field.php 2012-07-28 06:13:16 UTC (rev 9932)
@@ -241,22 +241,6 @@
} else {
$field->setVar('field_options', array());
}
-
- // field_extras
- $fieldTypesWithExtras = array(); // IN PROGRESS
- if (in_array($field->getVar('field_type'), $fieldTypesWithExtras)) {
- $extras = $field->getVar('field_extras');
- if (!empty($_REQUEST['addExtra'])) {
- foreach ($_REQUEST['addExtra'] as $extra) {
- if ( empty($extra['value'])) continue;
- $extras[$extra['key']] = $extra['value'];
- $redirectToEdit = true;
- }
- }
- $field->setVar('field_extras', $extras);
- } else {
- $field->setVar('field_extras', array());
- }
}
if ($field->getVar('field_edit')) {
@@ -282,16 +266,12 @@
$field->setVar('field_default', $field_default);
}
}
-
+
// field_extras
- if (isset($_REQUEST['field_extras'])) {
- $field_extras = $field->getValueForSave($_REQUEST['field_extras']);
- //Check for multiple selections
- if (is_array($field_extras)) {
- $field->setVar('field_extras', serialize($field_extras));
- } else {
- $field->setVar('field_extras', $field_extras);
- }
+ if (!empty($_REQUEST['field_extras'])) {
+ $field->setVar('field_extras', $_REQUEST['field_extras']);
+ } else {
+ $field->setVar('field_extras', array());
}
}
Modified: XoopsModules/xaddresses/trunk/xaddresses/class/field.php
===================================================================
--- XoopsModules/xaddresses/trunk/xaddresses/class/field.php 2012-07-28 06:09:13 UTC (rev 9931)
+++ XoopsModules/xaddresses/trunk/xaddresses/class/field.php 2012-07-28 06:13:16 UTC (rev 9932)
@@ -40,7 +40,7 @@
* Tricky solution
*/
function setVar($key, $value, $not_gpc = false)
- {
+ {error_log(print_r($value),true);
if ($key == 'field_options' && is_array($value)) {
foreach (array_keys($value) as $idx) {
$value[$idx] = base64_encode($value[$idx]);
@@ -69,6 +69,8 @@
**/
function getEditElement($location)
{
+ include_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
+
$value = $location->getVar($this->getVar('field_name'), 'e');
if (is_null($value)) {
$value = $this->getVar('field_default');
@@ -86,7 +88,16 @@
$options[$optkey] = $optval;
}
}
- include_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
+ $extras = $this->getVar('field_extras');
+ if (is_array($extras)) {
+ //asort($extras);
+ foreach (array_keys($extras) as $key) {
+ $extval = defined($extras[$key]) ? constant($extras[$key]) : $extras[$key];
+ $extkey = defined($key) ? constant($key) : $key;
+ unset($extras[$key]);
+ $extras[$extkey] = $extval;
+ }
+ }
switch ($this->getVar('field_type')) {
default:
case "autotext":
@@ -97,10 +108,12 @@
$element = new XoopsFormText($caption, $name, $this->getVar('field_length'), $this->getVar('field_maxlength'), $value);
break;
case "textarea":
- $element = new XoopsFormTextArea($caption, $name, $value, 4, 30);
+ //$element = new XoopsFormTextArea($caption, $name, $value, 4, 30);
+ $element = new XoopsFormTextArea($caption, $name, $value, $extras['rows'], $extras['cols']);
break;
case "dhtml":
- $element = new XoopsFormDhtmlTextArea($caption, $name, $value, 10, 30);
+ //$element = new XoopsFormDhtmlTextArea($caption, $name, $value, 10, 30);
+ $element = new XoopsFormDhtmlTextArea($caption, $name, $value, $extras['rows'], $extras['cols']);
break;
case "select":
$element = new XoopsFormSelect($caption, $name, $value);
@@ -157,9 +170,8 @@
$element->setExtra("style='width: 280px;'");
break;
case "rank":
+ include_once $GLOBALS['xoops']->path('class/xoopslists.php');
$element = new XoopsFormSelect($caption, $name, $value);
-
- include_once $GLOBALS['xoops']->path('class/xoopslists.php');
$ranks = XoopsLists::getUserRankList();
$element->addOption(0, "--------------");
$element->addOptionArray($ranks);
@@ -428,96 +440,96 @@
/**
* save an location field in the database
*
- * @param object $obj reference to the object
+ * @param object $field reference to the object
* @param bool $force whether to force the query execution despite security settings
* @param bool $checkObject check if the object is dirty and clean the attributes
* @return bool FALSE if failed, TRUE if already present and unchanged or successful
*/
- function insert(&$obj, $force = false)
+ function insert(&$field, $force = false)
{
$locationHandler =& xoops_getmodulehandler('location', 'xaddresses');
- $obj->setVar('field_name', str_replace(' ', '_', $obj->getVar('field_name')));
- $obj->cleanVars();
+ $field->setVar('field_name', str_replace(' ', '_', $field->getVar('field_name')));
+ $field->cleanVars();
$defaultstring = "";
- switch ($obj->getVar('field_type')) {
+ switch ($field->getVar('field_type')) {
case "datetime":
case "date":
- $obj->setVar('field_valuetype', XOBJ_DTYPE_INT);
- $obj->setVar('field_maxlength', 10);
+ $field->setVar('field_valuetype', XOBJ_DTYPE_INT);
+ $field->setVar('field_maxlength', 10);
break;
case "longdate":
- $obj->setVar('field_valuetype', XOBJ_DTYPE_MTIME);
+ $field->setVar('field_valuetype', XOBJ_DTYPE_MTIME);
break;
case "yesno":
- $obj->setVar('field_valuetype', XOBJ_DTYPE_INT);
- $obj->setVar('field_maxlength', 1);
+ $field->setVar('field_valuetype', XOBJ_DTYPE_INT);
+ $field->setVar('field_maxlength', 1);
break;
case "textbox":
- if ($obj->getVar('field_valuetype') != XOBJ_DTYPE_INT) {
- $obj->setVar('field_valuetype', XOBJ_DTYPE_TXTBOX);
+ if ($field->getVar('field_valuetype') != XOBJ_DTYPE_INT) {
+ $field->setVar('field_valuetype', XOBJ_DTYPE_TXTBOX);
}
break;
case "autotext":
- if ($obj->getVar('field_valuetype') != XOBJ_DTYPE_INT) {
- $obj->setVar('field_valuetype', XOBJ_DTYPE_TXTAREA);
+ if ($field->getVar('field_valuetype') != XOBJ_DTYPE_INT) {
+ $field->setVar('field_valuetype', XOBJ_DTYPE_TXTAREA);
}
break;
case "group_multi":
case "select_multi":
case "checkbox":
- $obj->setVar('field_valuetype', XOBJ_DTYPE_ARRAY);
+ $field->setVar('field_valuetype', XOBJ_DTYPE_ARRAY);
break;
case "language":
case "timezone":
case "theme":
- $obj->setVar('field_valuetype', XOBJ_DTYPE_TXTBOX);
+ $field->setVar('field_valuetype', XOBJ_DTYPE_TXTBOX);
break;
case "image":
- $obj->setVar('field_valuetype', XOBJ_DTYPE_TXTBOX);
+ $field->setVar('field_valuetype', XOBJ_DTYPE_TXTBOX);
break;
case "file":
- $obj->setVar('field_valuetype', XOBJ_DTYPE_TXTBOX);
+ $field->setVar('field_valuetype', XOBJ_DTYPE_TXTBOX);
break;
// IN_PROGRESS
case "multipleimage":
- $obj->setVar('field_valuetype', XOBJ_DTYPE_ARRAY);
+ $field->setVar('field_valuetype', XOBJ_DTYPE_ARRAY);
break;
case "multiplefile":
- $obj->setVar('field_valuetype', XOBJ_DTYPE_ARRAY);
+ $field->setVar('field_valuetype', XOBJ_DTYPE_ARRAY);
break;
// IN_PROGRESS
case "dhtml":
case "textarea":
- $obj->setVar('field_valuetype', XOBJ_DTYPE_TXTAREA);
+ $field->setVar('field_valuetype', XOBJ_DTYPE_TXTAREA);
break;
case "kmlmap":
- $obj->setVar('field_valuetype', XOBJ_DTYPE_TXTAREA);
+ $field->setVar('field_valuetype', XOBJ_DTYPE_TXTAREA);
break;
}
- if ($obj->getVar('field_valuetype') == "") {
- $obj->setVar('field_valuetype', XOBJ_DTYPE_TXTBOX);
+ if ($field->getVar('field_valuetype') == "") {
+ $field->setVar('field_valuetype', XOBJ_DTYPE_TXTBOX);
}
- if (!in_array($obj->getVar('field_name'), $this->getLocationVars())) {
- if ($obj->isNew()) {
+ if (!in_array($field->getVar('field_name'), $this->getLocationVars())) {
+ if ($field->isNew()) {
//add column to table
$changetype = "ADD";
} else {
//update column information
- $changetype = "CHANGE `" . $obj->getVar('field_name', 'n') . "`";
+ $changetype = "CHANGE `" . $field->getVar('field_name', 'n') . "`";
}
- $maxlengthstring = $obj->getVar('field_maxlength') > 0 ? "(" . $obj->getVar('field_maxlength') . ")" : "";
- $lengthstring = $obj->getVar('field_length') > 0 ? "(" . $obj->getVar('field_length') . ")" : "";
+ $maxlengthstring = $field->getVar('field_maxlength') > 0 ? "(" . $field->getVar('field_maxlength') . ")" : "";
+ $lengthstring = $field->getVar('field_length') > 0 ? "(" . $field->getVar('field_length') . ")" : "";
$notnullstring = " NOT NULL";
//set type
- switch ($obj->getVar('field_valuetype')) {
+ switch ($field->getVar('field_valuetype')) {
default:
case XOBJ_DTYPE_ARRAY:
case XOBJ_DTYPE_UNICODE_ARRAY:
$type = "mediumtext";
$maxlengthstring = "";
- $obj->setVar('field_maxlength', null);
+ $field->setVar('field_maxlength', null);
break;
case XOBJ_DTYPE_UNICODE_EMAIL:
case XOBJ_DTYPE_UNICODE_TXTBOX:
@@ -530,37 +542,37 @@
if (!$lengthstring) {
//so set it to max if length is not set - or should it fail?
$lengthstring = "(40)";
- $obj->setVar('field_length', 40);
+ $field->setVar('field_length', 40);
}
// varchars must have a maxlength
if (!$maxlengthstring) {
//so set it to max if maxlength is not set - or should it fail?
$maxlengthstring = "(255)";
- $obj->setVar('field_maxlength', 255);
+ $field->setVar('field_maxlength', 255);
}
- //if ( $obj->getVar('field_default') ) {
- $defaultstring = " DEFAULT " . $this->db->quote($obj->cleanVars['field_default']);
+ //if ( $field->getVar('field_default') ) {
+ $defaultstring = " DEFAULT " . $this->db->quote($field->cleanVars['field_default']);
//}
break;
case XOBJ_DTYPE_INT:
$type = "int";
- if ($obj->getVar('field_default') || $obj->getVar('field_default') !== '') {
- $defaultstring = " DEFAULT '" . intval($obj->cleanVars['field_default']) . "'";
- $obj->setVar('field_default', intval($obj->cleanVars['field_default']));
+ if ($field->getVar('field_default') || $field->getVar('field_default') !== '') {
+ $defaultstring = " DEFAULT '" . intval($field->cleanVars['field_default']) . "'";
+ $field->setVar('field_default', intval($field->cleanVars['field_default']));
}
break;
case XOBJ_DTYPE_DECIMAL:
$type = "decimal(14,6)";
- if ($obj->getVar('field_default') || $obj->getVar('field_default') !== '') {
- $defaultstring = " DEFAULT '" . doubleval($obj->cleanVars['field_default']) . "'";
- $obj->setVar('field_default', doubleval($obj->cleanVars['field_default']));
+ if ($field->getVar('field_default') || $field->getVar('field_default') !== '') {
+ $defaultstring = " DEFAULT '" . doubleval($field->cleanVars['field_default']) . "'";
+ $field->setVar('field_default', doubleval($field->cleanVars['field_default']));
}
break;
case XOBJ_DTYPE_FLOAT:
$type = "float(15,9)";
- if ($obj->getVar('field_default') || $obj->getVar('field_default') !== '') {
- $defaultstring = " DEFAULT '" . floatval($obj->cleanVars['field_default']) . "'";
- $obj->setVar('field_default', floatval($obj->cleanVars['field_default']));
+ if ($field->getVar('field_default') || $field->getVar('field_default') !== '') {
+ $defaultstring = " DEFAULT '" . floatval($field->cleanVars['field_default']) . "'";
+ $field->setVar('field_default', floatval($field->cleanVars['field_default']));
}
break;
case XOBJ_DTYPE_OTHER:
@@ -568,19 +580,19 @@
case XOBJ_DTYPE_TXTAREA:
$type = "text";
$maxlengthstring = "";
- $obj->setVar('field_maxlength', null);
+ $field->setVar('field_maxlength', null);
$notnullstring = "";
break;
case XOBJ_DTYPE_MTIME:
$type = "date";
$maxlengthstring = "";
- $obj->setVar('field_maxlength', null);
+ $field->setVar('field_maxlength', null);
break;
}
$sql = "ALTER TABLE `" . $locationHandler->table . "`";
$sql.= " " . $changetype;
- $sql.= " " . "`" . $obj->cleanVars['field_name'] . "`";
+ $sql.= " " . "`" . $field->cleanVars['field_name'] . "`";
$sql.= " " . $type . $maxlengthstring . $notnullstring . $defaultstring;
if (!$this->db->query($sql)) {
return false;
@@ -588,41 +600,41 @@
}
//change this to also update the cached field information storage
- $obj->setDirty();
- if (!parent::insert($obj, $force)) {
+ $field->setDirty();
+ if (!parent::insert($field, $force)) {
return false;
}
- return $obj->getVar('field_id');
+ return $field->getVar('field_id');
}
/**
* delete a location field from the database
*
- * @param object $obj reference to the object to delete
+ * @param object $field reference to the object to delete
* @param bool $force
* @return bool FALSE if failed.
**/
- function delete(&$obj, $force = false)
+ function delete(&$field, $force = false)
{
$locationHandler =& xoops_getmodulehandler('location', 'xaddresses');
// remove column from table
$sql = "ALTER TABLE " . $locationHandler->table;
- $sql.= " DROP `" . $obj->getVar('field_name', 'n') . "`";
+ $sql.= " DROP `" . $field->getVar('field_name', 'n') . "`";
if ($this->db->query($sql)) {
//change this to update the cached field information storage
- if (!parent::delete($obj, $force)) {
+ if (!parent::delete($field, $force)) {
return false;
}
- if ($obj->getVar('field_show') || $obj->getVar('field_edit')) {
+ if ($field->getVar('field_show') || $field->getVar('field_edit')) {
$moduleHandler =& xoops_gethandler('module');
$module = $moduleHandler->getByDirname('xaddresses');
if (is_object($module)) {
// Remove group permissions
$groupPermHandler =& xoops_gethandler('groupperm');
$criteria = new CriteriaCompo(new Criteria('gperm_modid', $module->getVar('mid')));
- $criteria->add(new Criteria('gperm_itemid', $obj->getVar('field_id')));
+ $criteria->add(new Criteria('gperm_itemid', $field->getVar('field_id')));
return $groupPermHandler->deleteAll($criteria);
}
}
Modified: XoopsModules/xaddresses/trunk/xaddresses/class/formxoopsimage.php
===================================================================
--- XoopsModules/xaddresses/trunk/xaddresses/class/formxoopsimage.php 2012-07-28 06:09:13 UTC (rev 9931)
+++ XoopsModules/xaddresses/trunk/xaddresses/class/formxoopsimage.php 2012-07-28 06:13:16 UTC (rev 9932)
@@ -107,7 +107,7 @@
{
$html = "<div>";
$html.= "<input type='text' name='" . $this->getName() . "' title='" . $this->getTitle() . "' size='" . $this->getSize() ."' maxlength='" . $this->getMaxlength() ."' value='" . $this->getValue() . "' />";
- $html.= "<img src='" . XOOPS_URL . "/images/image.gif' alt='" . _FORMXOOPSIMAGE_IMAGEMANAGER . "' title='" . _FORMXOOPSIMAGE_IMAGEMANAGER . "' onclick='randomId = Math.random().toString(); this.parentNode.firstChild.id = \"input_\" + randomId; openWithSelfMain("" . XOOPS_URL . "/modules/ajaxfilemanager/imagemanager/imagemanager.php?target=input_" + randomId + "&editor=src","imagemanager",800,600);' onmouseover='style.cursor=\"hand\"'/>";
+ $html.= "<img src='" . XOOPS_URL . "/images/image.gif' alt='" . _FORMXOOPSIMAGE_IMAGEMANAGER . "' title='" . _FORMXOOPSIMAGE_IMAGEMANAGER . "' onclick='randomId = Math.random().toString(); this.parentNode.firstChild.id = \"input_\" + randomId; openWithSelfMain("" . XOOPS_URL . "/imagemanager.php?target=input_" + randomId + "&editor=src","imagemanager",800,600);' onmouseover='style.cursor=\"hand\"'/>";
$html.= sprintf($this->getPreviewformat(), $this->getSrc());
$html.= "</div>";
return $html;
Modified: XoopsModules/xaddresses/trunk/xaddresses/class/locationcategory.php
===================================================================
--- XoopsModules/xaddresses/trunk/xaddresses/class/locationcategory.php 2012-07-28 06:09:13 UTC (rev 9931)
+++ XoopsModules/xaddresses/trunk/xaddresses/class/locationcategory.php 2012-07-28 06:13:16 UTC (rev 9932)
@@ -2,7 +2,6 @@
defined('XOOPS_ROOT_PATH') or die("XOOPS root path not defined");
xoops_load('formxoopsimage', 'xaddresses'); // load custom form class
-
class XaddressesLocationcategory extends XoopsObject
{
function __construct()
@@ -11,9 +10,9 @@
$this->initVar('cat_pid', XOBJ_DTYPE_INT, null, false);
$this->initVar('cat_title', XOBJ_DTYPE_TXTBOX);
$this->initVar('cat_description', XOBJ_DTYPE_TXTAREA);
- $this->initVar('cat_dohtml', XOBJ_DTYPE_INT, 1, false); // For html form
+ $this->initVar('cat_dohtml', XOBJ_DTYPE_INT, true, false); // For html form
$this->initVar('cat_imgurl',XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar('cat_weight', XOBJ_DTYPE_INT);
+ $this->initVar('cat_weight', XOBJ_DTYPE_INT, 0);
$this->initVar('cat_map_type', XOBJ_DTYPE_TXTBOX);
}
@@ -32,7 +31,7 @@
*/
function getForm($action = false, &$form = null)
{
- global $xoopsModuleConfig;
+ global $xoopsDB, $xoopsModule, $xoopsModuleConfig, $xoopsUser;
if ($action === false) {
$action = $_SERVER['REQUEST_URI'];
}
@@ -48,42 +47,46 @@
$form->setExtra('enctype="multipart/form-data"');
+ // Category title
$form->addElement(new XoopsFormText(_AM_XADDRESSES_CAT_TITLE, 'cat_title', 35, 255, $this->getVar('cat_title')), true);
+
+ // Hidden fields
if (!$this->isNew()) {
//Load groups
$form->addElement(new XoopsFormHidden('cat_id', $this->getVar('cat_id')));
$form->addElement(new XoopsFormHidden('cat_modified', true));
}
- // Description
- $editor_configs = array();
- $editor_configs['name'] = 'cat_description';
- $editor_configs['value'] = $this->getVar('cat_description', 'e');
- $editor_configs['rows'] = 20;
- $editor_configs['cols'] = 160;
- $editor_configs['width'] = '100%';
- $editor_configs['height'] = '400px';
- $editor_configs['editor'] = $xoopsModuleConfig['editor'];
+ // Category description
+ $editor_configs = array();
+ $editor_configs['name'] = 'cat_description';
+ $editor_configs['value'] = $this->getVar('cat_description', 'e');
+ $editor_configs['rows'] = 20;
+ $editor_configs['cols'] = 160;
+ $editor_configs['width'] = '100%';
+ $editor_configs['height'] = '400px';
+ $editor_configs['editor'] = $GLOBALS['xoopsModuleConfig']['text_editor'];
$form->addElement( new XoopsFormEditor(_AM_XADDRESSES_CAT_DESCRIPTION, 'cat_description', $editor_configs), false);
- //$form->addElement(new XoopsFormTextArea(_AM_XADDRESSES_DESCRIPTION, 'cat_description', $this->getVar('cat_description', 'e')));
- // Image
+ // Category image
$form->addElement(new FormXoopsImage (_AM_XADDRESSES_CAT_IMG, 'cat_imgurl', 40, 255, $this->getVar('cat_imgurl'))); // custom form class
// Parent category
- $xaddressescat_Handler =& xoops_getModuleHandler('locationcategory', 'xaddresses');
- $criteria = new CriteriaCompo();
- $criteria->setSort('cat_weight ASC, cat_title');
- $criteria->setOrder('ASC');
- $xaddressescat_arr = $xaddressescat_Handler->getall($criteria);
- $mytree = new XoopsObjectTree($xaddressescat_arr, 'cat_id', 'cat_pid');
- $form->addElement(new XoopsFormLabel(_AM_XADDRESSES_CAT_PARENT, $mytree->makeSelBox('cat_pid', 'cat_title','--',$this->getVar('cat_pid'), true)));
+ $xaddressescat_Handler =& xoops_getModuleHandler('locationcategory', 'xaddresses');
+ $criteria = new CriteriaCompo();
+ $criteria->setSort('cat_weight ASC, cat_title');
+ $criteria->setOrder('ASC');
+ $xaddressescat_arr = $xaddressescat_Handler->getall($criteria);
+ $mytree = new XoopsObjectTree($xaddressescat_arr, 'cat_id', 'cat_pid');
+ $categoryCategortSelect = new XoopsFormLabel(_AM_XADDRESSES_CAT_PARENT, $mytree->makeSelBox('cat_pid', 'cat_title','--',$this->getVar('cat_pid'), true));
+ $categoryCategortSelect->setDescription(_AM_XADDRESSES_CAT_PARENT_DESC);
+ $form->addElement($categoryCategortSelect);
- // Weight
+ // Category weight
$form->addElement(new XoopsFormText(_AM_XADDRESSES_CAT_WEIGHT, 'cat_weight', 35, 35, $this->getVar('cat_weight', 'e')), true);
// Map Setting
- $form->addElement(new XoopsFormLabel (_AM_XADDRESSES_CAT_MAP_SETTING, _AM_XADDRESSES_CAT_MAP_SETTING, ''));
+ $form->addElement(new XoopsFormLabel (_AM_XADDRESSES_CAT_MAP_SETTING, '<b>' . _AM_XADDRESSES_CAT_MAP_SETTING . '</b>', ''));
// Maptype
$select_map_type = new XoopsFormSelect (_AM_XADDRESSES_CAT_MAP_TYPE, 'cat_map_type', $this->getVar('cat_map_type'), 1, false);
$select_map_type->addOption('ROADMAP', 'ROADMAP');
@@ -93,8 +96,8 @@
$select_map_type->setDescription(_AM_XADDRESSES_CAT_MAP_TYPE_DESC);
$form->addElement($select_map_type);
- // Permissions
- $form->addElement(new XoopsFormLabel (_AM_XADDRESSES_CAT_PERMISSIONS, _AM_XADDRESSES_CAT_PERMISSIONS, ''));
+ // Category permissions
+ $form->addElement(new XoopsFormLabel (_AM_XADDRESSES_CAT_PERMISSIONS, '<b>' . _AM_XADDRESSES_CAT_PERMISSIONS . '</b>', ''));
$memberHandler = & xoops_gethandler('member');
$groupPermHandler =& xoops_gethandler('groupperm');
Modified: XoopsModules/xaddresses/trunk/xaddresses/include/forms.php
===================================================================
--- XoopsModules/xaddresses/trunk/xaddresses/include/forms.php 2012-07-28 06:09:13 UTC (rev 9931)
+++ XoopsModules/xaddresses/trunk/xaddresses/include/forms.php 2012-07-28 06:13:16 UTC (rev 9932)
@@ -154,15 +154,14 @@
break;
}
//field_notnull
- //$fiedlnotnullradio = new XoopsFormRadioYN(_AM_XADDRESSES_FIELD_NOTNULL, 'field_notnull', $field->getVar('field_notnull', 'e'));
- //$fiedlnotnullradio->setDescription(_AM_XADDRESSES_FIELD_NOTNULL_DESC);
- //$form->addElement($fiedlnotnullradio);
+ //$fieldNotNullRadio = new XoopsFormRadioYN(_AM_XADDRESSES_FIELD_NOTNULL, 'field_notnull', $field->getVar('field_notnull', 'e'));
+ //$fieldNotNullRadio->setDescription(_AM_XADDRESSES_FIELD_NOTNULL_DESC);
+ //$form->addElement($fieldNotNullRadio);
//field_options
- $fieldTypesWithOptions = array('select', 'select-multi', 'radio', 'checkbox');
+ $fieldTypesWithOptions = array('select', 'select_multi', 'radio', 'checkbox');
if (in_array($field->getVar('field_type'), $fieldTypesWithOptions)) {
$options = $field->getVar('field_options');
-// print_r($options);
if (count($options) > 0) {
$remove_options = new XoopsFormCheckBox(_AM_XADDRESSES_FIELD_REMOVEOPTIONS, 'removeOptions');
$remove_options->columns = 3;
@@ -184,42 +183,55 @@
$option_text .= "</table>";
$form->addElement(new XoopsFormLabel(_AM_XADDRESSES_FIELD_ADDOPTION, $option_text) );
}
-/* IN_PROGRESS
+ }
+ //field_default & field_maxlength
+ if ($field->getVar('field_edit')) {
//field_extras
- $fieldTypeswithextras = array('image');
+ $fieldTypeswithextras = array('textarea', 'dhtml');
if (in_array($field->getVar('field_type'), $fieldTypeswithextras)) {
$extras = $field->getVar('field_extras');
- if (count($extras) > 0) {
- $remove_extras = new XoopsFormCheckBox(_AM_XADDRESSES_REMOVEEXTRAS, 'removeExtras');
- $remove_extras->columns = 3;
- asort($extras);
- foreach (array_keys($extras) as $key) {
- $extras[$key] .= "[{$key}]";
- }
- $remove_options->addOptionArray($extras);
- $form->addElement($remove_extras);
- }
- $extra_text = "<table cellspacing='1'><tr><td width='20%'>" . _AM_XADDRESSES_KEY . "</td><td>" . _AM_XADDRESSES_VALUE . "</td></tr>";
- for ($i = 0; $i < 3; $i++) {
- $extra_text .= "<tr>";
- $extra_text .= "<td><input type='text' name='addExtra[{$i}][key]' id='addExtra[{$i}][key]' size='15' /></td>";
- $extra_text .= "<td><input type='text' name='addExtra[{$i}][value]' id='addExtra[{$i}][value]' size='35' /></td>";
- $extra_text .= "</tr>";
- $extra_text .= "<tr height='3px'><td colspan='2'> </td></tr>";
- }
- $extra_text .= "</table>";
- $form->addElement(new XoopsFormLabel(_AM_XADDRESSES_ADDEXTRA, $extra_text) );
}
-*/
- }
- //field_default & field_maxlength
- if ($field->getVar('field_edit')) {
+
switch ($field->getVar('field_type')) {
case "textbox":
+ $fieldLengthText = new XoopsFormText(_AM_XADDRESSES_FIELD_LENGTH, 'field_length', 4, 4, $field->getVar('field_length', 'e'));
+ $fieldLengthText->setDescription(_AM_XADDRESSES_FIELD_LENGTH_DESC);
+ $form->addElement($fieldLengthText);
+ $fieldMaxLengthText = new XoopsFormText(_AM_XADDRESSES_FIELD_MAXLENGTH, 'field_maxlength', 4, 4, $field->getVar('field_maxlength', 'e'));
+ $fieldMaxLengthText->setDescription(_AM_XADDRESSES_FIELD_MAXLENGTH_DESC);
+ $form->addElement($fieldMaxLengthText);
+ $fieldDefaultTextarea = new XoopsFormTextArea(_AM_XADDRESSES_FIELD_DEFAULT, 'field_default', $field->getVar('field_default', 'e'));
+ $fieldDefaultTextarea->setDescription(_AM_XADDRESSES_FIELD_DEFAULT_DESC);
+ $form->addElement($fieldDefaultTextarea);
+ break;
case "textarea":
+ if (empty($extras['rows'])) {$extras['rows'] = 4;} // default rows value
+ if (empty($extras['cols'])) {$extras['cols'] = 30;} // default cols value
+ $fieldTextareaRowsText = new XoopsFormText(_AM_XADDRESSES_FIELD_TEXTAREAROWS, 'field_extras[rows]', 4, 4, $extras['rows']);
+ $fieldTextareaRowsText->setDescription(_AM_XADDRESSES_FIELD_TEXTAREAROWS_DESC);
+ $form->addElement($fieldTextareaRowsText);
+ $fieldTextareaColsText = new XoopsFormText(_AM_XADDRESSES_FIELD_TEXTAREACOLS, 'field_extras[cols]', 4, 4, $extras['cols']);
+ $fieldTextareaColsText->setDescription(_AM_XADDRESSES_FIELD_TEXTAREACOLS_DESC);
+ $form->addElement($fieldTextareaColsText);
+ $fieldDefaultTextarea = new XoopsFormTextArea(_AM_XADDRESSES_FIELD_DEFAULT, 'field_default', $field->getVar('field_default', 'e'));
+ $fieldDefaultTextarea->setDescription(_AM_XADDRESSES_FIELD_DEFAULT_DESC);
+ $form->addElement($fieldDefaultTextarea);
+ break;
case "dhtml":
+ if (empty($extras['rows'])) {$extras['rows'] = 4;} // default rows value
+ if (empty($extras['cols'])) {$extras['cols'] = 30;} // default cols value
+ $fieldTextareaRowsText = new XoopsFormText(_AM_XADDRESSES_FIELD_TEXTAREAROWS, 'field_extras[rows]', 4, 4, $extras['rows']);
+ $fieldTextareaRowsText->setDescription(_AM_XADDRESSES_FIELD_TEXTAREAROWS_DESC);
+ $form->addElement($fieldTextareaRowsText);
+ $fieldTextareaColsText = new XoopsFormText(_AM_XADDRESSES_FIELD_TEXTAREACOLS, 'field_extras[cols]', 4, 4, $extras['cols']);
+ $fieldTextareaColsText->setDescription(_AM_XADDRESSES_FIELD_TEXTAREACOLS_DESC);
+ $form->addElement($fieldTextareaColsText);
+ $fieldDefaultTextarea = new XoopsFormDhtmlTextArea(_AM_XADDRESSES_FIELD_DEFAULT, 'field_default', $field->getVar('field_default', 'e'));
+ $fieldDefaultTextarea->setDescription(_AM_XADDRESSES_FIELD_DEFAULT_DESC);
+ $form->addElement($fieldDefaultTextarea);
+ break;
case "kmlmap":
- $fieldLengthText = new XoopsFormText(_AM_XADDRESSES_FIELD_LENGTH, 'field_length', 35, 35, $field->getVar('field_length', 'e'));
+ $fieldLengthText = new XoopsFormText(_AM_XADDRESSES_FIELD_LENGTH, 'field_length', 3, 3, $field->getVar('field_length', 'e'));
$fieldLengthText->setDescription(_AM_XADDRESSES_FIELD_LENGTH_DESC);
$form->addElement($fieldLengthText);
$fieldMaxLengthText = new XoopsFormText(_AM_XADDRESSES_FIELD_MAXLENGTH, 'field_maxlength', 35, 35, $field->getVar('field_maxlength', 'e'));
@@ -336,6 +348,7 @@
$form->addElement($fieldRequiredRadio);
}
+
// Permissions
@@ -368,6 +381,7 @@
$searchableTypes = array(
'textbox',
'textarea',
+ 'dhtml',
'select',
'radio',
'yesno',
Modified: XoopsModules/xaddresses/trunk/xaddresses/language/english/admin.php
===================================================================
--- XoopsModules/xaddresses/trunk/xaddresses/language/english/admin.php 2012-07-28 06:09:13 UTC (rev 9931)
+++ XoopsModules/xaddresses/trunk/xaddresses/language/english/admin.php 2012-07-28 06:13:16 UTC (rev 9932)
@@ -166,8 +166,10 @@
define("_AM_XADDRESSES_CAT_ID","Id");
define("_AM_XADDRESSES_CAT_TITLE","Title");
define("_AM_XADDRESSES_CAT_DESCRIPTION","Description");
+define("_AM_XADDRESSES_CAT_DESCRIPTION_DESC","Leave empty if category is a main category");
define("_AM_XADDRESSES_CAT_IMG","Category image");
define("_AM_XADDRESSES_CAT_PARENT","In the category");
+define("_AM_XADDRESSES_CAT_PARENT_DESC","Leave empty if category is a main category");
define("_AM_XADDRESSES_CAT_WEIGHT","Weight");
define("_AM_XADDRESSES_CAT_MAP_SETTING","GoogleMaps settings");
@@ -255,8 +257,14 @@
//define("_AM_XADDRESSES_FIELD_ADDEXTRA", "Maximum Length");
//define("_AM_XADDRESSES_FIELD_ADDEXTRA_DESC", "// IN PROGRESS");
+
define("_AM_XADDRESSES_FIELD_LENGTH", "Field Length In Form");
define("_AM_XADDRESSES_FIELD_LENGTH_DESC", "// IN PROGRESS");
+define("_AM_XADDRESSES_FIELD_TEXTAREAROWS", "Field rows attribute");
+define("_AM_XADDRESSES_FIELD_TEXTAREAROWS_DESC", "Specifies the visible number of lines in a text area");
+define("_AM_XADDRESSES_FIELD_TEXTAREACOLS", "Field cols attribute");
+define("_AM_XADDRESSES_FIELD_TEXTAREACOLS_DESC", "Specifies the visible width of a text area");
+
define("_AM_XADDRESSES_FIELD_MAXLENGTH", "Maximum Field Length");
define("_AM_XADDRESSES_FIELD_MAXLENGTH_DESC", "// IN PROGRESS");
define("_AM_XADDRESSES_FIELD_DEFAULT", "Default");
Modified: XoopsModules/xaddresses/trunk/xaddresses/language/english/modinfo.php
===================================================================
--- XoopsModules/xaddresses/trunk/xaddresses/language/english/modinfo.php 2012-07-28 06:09:13 UTC (rev 9931)
+++ XoopsModules/xaddresses/trunk/xaddresses/language/english/modinfo.php 2012-07-28 06:13:16 UTC (rev 9932)
@@ -78,8 +78,8 @@
define('_MI_XADDRESSES_AUTOAPPROVE',"Auto approve new addresses without admin intervention ?");
define('_MI_XADDRESSES_AUTOAPPROVE_DESC', '');
- define("_MI_XADDRESSES_FORM_OPTIONS","Editor");
- define("_MI_XADDRESSES_FORM_OPTIONS_DESC","");
+define("_MI_XADDRESSES_FORM_OPTIONS","[Editor] Choose an editor for categories description");
+define("_MI_XADDRESSES_FORM_OPTIONS_DESC","<ul><li><b>dhtmltextarea:</b> default Xoops editor</li><li><b>textarea:</b> standard html textarea</li><li><b>tinymce:</b> enhanced WYSIWYG editor</li><li>...</li></ul>");
define('_MI_XADDRESSES_TOPORDER','How to display items on the index page?');
define('_MI_XADDRESSES_TOPORDER1','Date (DESC)');
define('_MI_XADDRESSES_TOPORDER2','Date (ASC)');
Modified: XoopsModules/xaddresses/trunk/xaddresses/sql/mysql.sql
===================================================================
--- XoopsModules/xaddresses/trunk/xaddresses/sql/mysql.sql 2012-07-28 06:09:13 UTC (rev 9931)
+++ XoopsModules/xaddresses/trunk/xaddresses/sql/mysql.sql 2012-07-28 06:13:16 UTC (rev 9932)
@@ -65,7 +65,7 @@
`field_show` tinyint(1) unsigned NOT NULL default '0',
`field_config` tinyint(1) unsigned NOT NULL default '0',
`field_options` text,
- `field_extras` text,
+ `field_extras` text,
PRIMARY KEY (`field_id`),
UNIQUE KEY `field_name` (`field_name`)
) ENGINE=MyISAM;
Modified: XoopsModules/xaddresses/trunk/xaddresses/templates/xaddresses_admin_fieldlist.html
===================================================================
--- XoopsModules/xaddresses/trunk/xaddresses/templates/xaddresses_admin_fieldlist.html 2012-07-28 06:09:13 UTC (rev 9931)
+++ XoopsModules/xaddresses/trunk/xaddresses/templates/xaddresses_admin_fieldlist.html 2012-07-28 06:13:16 UTC (rev 9932)
@@ -16,7 +16,7 @@
<td><{$field.field_title}></td>
<td><{$field.field_description}></td>
<td><{$field.field_type}></td>
- <td>pippo
+ <td>
<select name="category[<{$field.field_id}>]">
<{html_options options=$categories selected=$field.cat_id}>
</select>
Modified: XoopsModules/xaddresses/trunk/xaddresses/xoops_version.php
===================================================================
--- XoopsModules/xaddresses/trunk/xaddresses/xoops_version.php 2012-07-28 06:09:13 UTC (rev 9931)
+++ XoopsModules/xaddresses/trunk/xaddresses/xoops_version.php 2012-07-28 06:13:16 UTC (rev 9932)
@@ -1,13 +1,13 @@
<?php
if (!defined('XOOPS_ROOT_PATH')){ exit(); }
$dirname = basename( dirname( __FILE__ ) ) ;
-
+include_once XOOPS_ROOT_PATH . "/modules/{$dirname}/include/functions.php";
xoops_load('XoopsLists');
$modversion['name'] = _MI_XADDRESSES_NAME;
$modversion['version'] = '1.0';
$modversion['description'] = _MI_XADDRESSES_DESC;
-$modversion['author'] = "Rota Lucio";
+$modversion['author'] = 'Rota Lucio';
$modversion['author_mail'] = 'luc...@gm...';
$modversion['author_website_url'] = 'http://luciorota.altervista.org';
$modversion['author_website_name'] = 'http://luciorota.altervista.org';
@@ -17,11 +17,11 @@
$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/";
$modversion['release_info'] = "RC";
-$modversion['release_file'] = XOOPS_URL."/modules/{$dirname}/docs/RC";
-$modversion['release_date'] = "2012/07/25"; // 'Y/m/d'
+$modversion['release_file'] = XOOPS_URL . "/modules/{$dirname}/docs/RC";
+$modversion['release_date'] = "2012/07/27"; // 'Y/m/d'
$modversion['manual'] = 'Help';
-$modversion['manual_file'] = XOOPS_URL."/modules/{$dirname}/docs/help.html";
+$modversion['manual_file'] = XOOPS_URL . "/modules/{$dirname}/docs/help.html";
$modversion['min_php'] = '5.2';
$modversion['min_xoops'] = '2.4.5'; // 'XOOPS 2.5';
$modversion['min_admin']= '1.1';
@@ -34,7 +34,7 @@
$modversion['icons16'] = "modules/{$dirname}/images/icons/16x16";
$modversion['icons32'] = "modules/{$dirname}/images/icons/32x32";
-//About
+// About
$modversion['demo_site_url'] = "IN PROGRESS";
$modversion['demo_site_name'] = "IN PROGRESS";
$modversion['forum_site_url'] = "IN PROGRESS";
@@ -54,15 +54,13 @@
$modversion['adminmenu'] = "admin/menu.php";
// Mysql file
$modversion['sqlfile']['mysql'] = "sql/mysql.sql";
-// Mysql file
-$modversion['sqlfile']['mysql'] = "sql/mysql.sql";
// Tables created by sql file (without prefix!)
$modversion['tables'][0] = "xaddresses_locationcategory";
$modversion['tables'][1] = "xaddresses_location";
$modversion['tables'][2] = "xaddresses_fieldcategory";
$modversion['tables'][3] = "xaddresses_field";
-// IN PROGRESS
+
$modversion['tables'][4] = "xaddresses_broken";
$modversion['tables'][5] = "xaddresses_modify";
$modversion['tables'][6] = "xaddresses_votedata";
@@ -80,12 +78,10 @@
$i = 0;
$isAdmin = false;
if (!empty($GLOBALS['xoopsUser'])) {
- //$modversion['sub'][0]['name'] = _MI_XADDRESSES_TODO;
- //$modversion['sub'][0]['url'] = "public-useralbum.php?id=".$GLOBALS['xoopsUser']->uid();
- // Check if xoopsUser is a module administrator
+ // check if xoopsUser is a module administrator
$isAdmin = ($GLOBALS['xoopsUser']->isAdmin($GLOBALS['xoopsModule']->getVar('mid')));
}
- // Add the Submit new item button (if user has right submit permissions)
+ // add the Submit new item button (if user has right submit permissions)
if ($isAdmin || (isset($GLOBALS['xoopsModuleConfig']['allowsubmit']) &&
$GLOBALS['xoopsModuleConfig']['allowsubmit'] == true &&
(is_object($GLOBALS['xoopsUser']) ||
@@ -100,7 +96,7 @@
$i++;
$modversion['sub'][$i]['name'] = _MI_XADDRESSES_SEARCH;
$modversion['sub'][$i]['url'] = "locationsearch.php";
- // Add the Module Administration button (if user has right permissions)
+ // add the Module Administration button (if user has right permissions)
if ($isAdmin) {
$i++;
$modversion['sub'][$i]['name'] = _MI_XADDRESSES_ADMIN;
@@ -108,7 +104,9 @@
}
}
-// Pour les blocs
+
+
+// Blocks
$modversion['blocks'][1]['file'] = "xaddresses_top.php";
$modversion['blocks'][1]['name'] = _MI_XADDRESSES_BNAME1;
$modversion['blocks'][1]['description'] = _MI_XADDRESSES_BNAMEDSC1;
@@ -155,7 +153,7 @@
$modversion['comments']['itemName'] = 'loc_id';
$modversion['comments']['pageName'] = 'locationview.php';
$modversion['comments']['extraParams'] = array('loc_cat_id');
-// Comment callback functions
+// comment callback functions
$modversion['comments']['callbackFile'] = 'include/comment_functions.php';
$modversion['comments']['callback']['approve'] = 'xaddresses_com_approve';
$modversion['comments']['callback']['update'] = 'xaddresses_com_update';
@@ -192,7 +190,7 @@
$modversion['templates'][$i]['file'] = 'xaddresses_locationsearchresults.html';
$modversion['templates'][$i]['description'] = '';
-// Admin Templates
+// admin templates
$i++;
$modversion['templates'][$i]['file'] = 'xaddresses_admin_locationcategorylist.html';
$modversion['templates'][$i]['description'] = '';
@@ -201,15 +199,15 @@
$modversion['templates'][$i]['file'] = 'xaddresses_admin_locationlist.html';
$modversion['templates'][$i]['description'] = '';
//$modversion['templates'][$i]['type'] = 'admin';
- $i++;
- $modversion['templates'][$i]['file'] = 'xaddresses_admin_locationbrokenlist.html';
- $modversion['templates'][$i]['description'] = '';
- //$modversion['templates'][$i]['type'] = 'admin';
- $i++;
- $modversion['templates'][$i]['file'] = 'xaddresses_admin_locationmodifylist.html';
- $modversion['templates'][$i]['description'] = '';
- //$modversion['templates'][$i]['type'] = 'admin';
$i++;
+$modversion['templates'][$i]['file'] = 'xaddresses_admin_locationbrokenlist.html';
+$modversion['templates'][$i]['description'] = '';
+//$modversion['templates'][$i]['type'] = 'admin';
+$i++;
+$modversion['templates'][$i]['file'] = 'xaddresses_admin_locationmodifylist.html';
+$modversion['templates'][$i]['description'] = '';
+//$modversion['templates'][$i]['type'] = 'admin';
+$i++;
$modversion['templates'][$i]['file'] = 'xaddresses_admin_fieldcategorylist.html';
$modversion['templates'][$i]['description'] = '';
//$modversion['templates'][$i]['type'] = 'admin';
@@ -218,7 +216,7 @@
$modversion['templates'][$i]['description'] = '';
//$modversion['templates'][$i]['type'] = 'admin';
-// Image Manager Templates
+// image manager templates
$i++;
$modversion['templates'][$i]['file'] = 'xaddresses_imagemanager.html';
$modversion['templates'][$i]['description'] = '';
@@ -229,7 +227,7 @@
// Preferences
-// FOR FUTURE XOOPS VERSIONS
+// MAYBE FOR FUTURE XOOPS VERSIONS
/*
$i = 0;
$i++;
@@ -245,16 +243,15 @@
$modversion['config']['category'][$i]['title'] = _MI_XADDRESSES_LOCATION_CONFIG;
$modversion['config']['category'][$i]['description'] = _MI_XADDRESSES_LOCATION_CONFIG_DESC;
*/
-
$i = 0;
$i++;
- $modversion['config'][$i]['name'] = 'google_apikey';
- $modversion['config'][$i]['title'] = '_MI_XADDRESSES_GOOGLE_APIKEY';
- $modversion['config'][$i]['description'] = '_MI_XADDRESSES_GOOGLE_APIKEY_DESC';
- $modversion['config'][$i]['formtype'] = 'textbox';
- $modversion['config'][$i]['valuetype'] = 'text';
- $modversion['config'][$i]['default'] = '';
- $modversion["config"][$i]["category"] = "global";
+$modversion['config'][$i]['name'] = 'google_apikey';
+$modversion['config'][$i]['title'] = '_MI_XADDRESSES_GOOGLE_APIKEY';
+$modversion['config'][$i]['description'] = '_MI_XADDRESSES_GOOGLE_APIKEY_DESC';
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = '';
+$modversion["config"][$i]["category"] = "global";
$i++;
$modversion['config'][$i]['name'] = 'popular';
$modversion['config'][$i]['title'] = '_MI_XADDRESSES_POPULAR';
@@ -302,7 +299,7 @@
$modversion['config'][$i]['formtype'] = 'textbox';
$modversion['config'][$i]['valuetype'] = 'int';
$modversion['config'][$i]['default'] = 5;
-$modversion["config"][$i]["category"] = "global";
+$modversion['config'][$i]['category'] = 'global';
$i++;
$modversion['config'][$i]['name'] = 'index_list_titlelenght';
$modversion['config'][$i]['title'] = '_MI_XADDRESSES_LIST_TITLELENGHT';
@@ -310,7 +307,7 @@
$modversion['config'][$i]['formtype'] = 'textbox';
$modversion['config'][$i]['valuetype'] = 'int';
$modversion['config'][$i]['default'] = 20;
-$modversion["config"][$i]["category"] = "global";
+$modversion['config'][$i]['category'] = 'global';
$i++;
$modversion['config'][$i]['name'] = 'show_home_in_breadcrumb';
$modversion['config'][$i]['title'] = '_MI_XADDRESSES_SHOWHOMEINBREADCRUMB';
@@ -318,7 +315,7 @@
$modversion['config'][$i]['formtype'] = 'yesno';
$modversion['config'][$i]['valuetype'] = 'int';
$modversion['config'][$i]['default'] = 1; // true/yes
-$modversion["config"][$i]["category"] = "global";
+$modversion['config'][$i]['category'] = 'global';
$i++;
$modversion['config'][$i]['name'] = 'usetellafriend';
$modversion['config'][$i]['title'] = '_MI_XADDRESSES_USETELLAFRIEND';
@@ -326,7 +323,7 @@
$modversion['config'][$i]['formtype'] = 'yesno';
$modversion['config'][$i]['valuetype'] = 'int';
$modversion['config'][$i]['default'] = 0; // false/no
-$modversion["config"][$i]["category"] = "global";
+$modversion['config'][$i]['category'] = 'global';
$i++;
$modversion['config'][$i]['name'] = 'usetag';
$modversion['config'][$i]['title'] = '_MI_XADDRESSES_USETAG';
@@ -334,7 +331,7 @@
$modversion['config'][$i]['formtype'] = 'yesno';
$modversion['config'][$i]['valuetype'] = 'int';
$modversion['config'][$i]['default'] = 0; // false/no
-$modversion["config"][$i]["category"] = "global";
+$modversion['config'][$i]['category'] = 'global';
$i++;
$modversion['config'][$i]['name'] = 'useajaxfilemanager';
$modversion['config'][$i]['title'] = '_MI_XADDRESSES_USEAJAXFILEMANAGER';
@@ -342,7 +339,7 @@
$modversion['config'][$i]['formtype'] = 'yesno';
$modversion['config'][$i]['valuetype'] = 'int';
$modversion['config'][$i]['default'] = 0; // false/no
-$modversion["config"][$i]["category"] = "global";
+$modversion['config'][$i]['category'] = 'global';
$i++;
$modversion['config'][$i]['name'] = 'autoapprove';
$modversion['config'][$i]['title'] = '_MI_XADDRESSES_AUTOAPPROVE';
@@ -352,14 +349,17 @@
$modversion['config'][$i]['default'] = 0;
$modversion["config"][$i]["category"] = "global";
$i++;
-$modversion["config"][$i]["name"] = "editor";
-$modversion["config"][$i]["title"] = "_MI_XADDRESSES_FORM_OPTIONS";
-$modversion["config"][$i]["description"] = "_MI_XADDRESSES_FORM_OPTIONS_DESC";
-$modversion["config"][$i]["formtype"] = "select";
-$modversion["config"][$i]["valuetype"] = "text";
-$modversion["config"][$i]["default"] = "dhtmltextarea";
-$modversion["config"][$i]["options"] = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . "/class/xoopseditor");
-$modversion["config"][$i]["category"] = "global";
+$modversion['config'][$i]['name'] = 'text_editor';
+$modversion['config'][$i]['title'] = '_MI_XADDRESSES_FORM_OPTIONS';
+$modversion['config'][$i]['description'] = '_MI_XADDRESSES_FORM_OPTIONS_DESC';
+$modversion['config'][$i]['formtype'] = 'select';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = 'dhtmltextarea';
+//xoops_load('xoopseditorhandler');
+//$editor_handler = XoopsEditorHandler::getInstance();
+//$modversion['config'][$i]['options'] = array_flip($editor_handler->getList());
+$modversion['config'][$i]['options'] = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . '/class/xoopseditor');
+$modversion['config'][$i]['category'] = 'global';
$i++;
$modversion['config'][$i]['name'] = 'toporder';
$modversion['config'][$i]['title'] = '_MI_XADDRESSES_TOPORDER';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <luc...@us...> - 2012-07-28 06:09:20
|
Revision: 9931
http://xoops.svn.sourceforge.net/xoops/?rev=9931&view=rev
Author: luciorota
Date: 2012-07-28 06:09:13 +0000 (Sat, 28 Jul 2012)
Log Message:
-----------
delete unused files
Removed Paths:
-------------
XoopsModules/xaddresses/trunk/xaddresses/blocks/tdmdownloads_top.php
Deleted: XoopsModules/xaddresses/trunk/xaddresses/blocks/tdmdownloads_top.php
===================================================================
--- XoopsModules/xaddresses/trunk/xaddresses/blocks/tdmdownloads_top.php 2012-07-27 17:37:45 UTC (rev 9930)
+++ XoopsModules/xaddresses/trunk/xaddresses/blocks/tdmdownloads_top.php 2012-07-28 06:09:13 UTC (rev 9931)
@@ -1,76 +0,0 @@
-<?php
-function b_xaddresses_top_show($options) {
- require_once XOOPS_ROOT_PATH."/modules/xaddresses/include/functions.php";
- //appel de la class
- $addresses_Handler =& xoops_getModuleHandler('xaddresses_addresses', 'xaddresses');
- $block = array();
- $type_block = $options[0];
- $nb_entree = $options[1];
- $lenght_title = $options[2];
- array_shift($options);
- array_shift($options);
- array_shift($options);
- $categories = tdmdownloads_MygetItemIds();
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('cid', '(' . implode(',', $categories) . ')','IN'));
- if (!(count($options) == 1 && $options[0] == 0)) {
- $criteria->add(new Criteria('cid', '(' . implode(',', $options) . ')','IN'));
- }
- $criteria->add(new Criteria('status', 0, '!='));
- switch ($type_block)
- { // pour le bloc: dernier fichier
- case "date":
- $criteria->setSort('date');
- $criteria->setOrder('DESC');
- break;
- // pour le bloc: plus t\xE9l\xE9charg\xE9
- case "hits":
- $criteria->setSort('hits');
- $criteria->setOrder('DESC');
- break;
- // pour le bloc: mieux not\xE9
- case "rating":
- $criteria->setSort('rating');
- $criteria->setOrder('DESC');
- break;
- // pour le bloc: al\xE9atoire
- case "random":
- $criteria->setSort('RAND()');
- break;
- }
- $criteria->setLimit($nb_entree);
- $addresses_arr = $addresses_Handler->getall($criteria);
- foreach (array_keys($addresses_arr) as $i) {
- $block[$i]['loc_id'] = $addresses_arr[$i]->getVar('loc_id');
- $block[$i]['title'] = strlen($addresses_arr[$i]->getVar('title')) > $lenght_title ? substr($addresses_arr[$i]->getVar('title'),0,($lenght_title))."..." : $addresses_arr[$i]->getVar('title');
- $block[$i]['hits'] = $addresses_arr[$i]->getVar("hits");
- $block[$i]['rating'] = number_format($addresses_arr[$i]->getVar("rating"),1);
- $block[$i]['date'] = formatTimeStamp($addresses_arr[$i]->getVar("date"),"s");
- }
- return $block;
-}
-
-function b_xaddresses_top_edit($options) {
- //appel de la class
- $addressescat_Handler =& xoops_getModuleHandler('xaddresses_cat', 'xaddresses');
- $criteria = new CriteriaCompo();
- $criteria = new CriteriaCompo();
- $criteria->setSort('weight ASC, title');
- $criteria->setOrder('ASC');
- $addressescat_arr = $addressescat_Handler->getall($criteria);
- $form = _MB_XADDRESSES_DISP . " \n";
- $form .= "<input type=\"hidden\" name=\"options[0]\" value=\"" . $options[0] . "\" />";
- $form .= "<input name=\"options[1]\" size=\"5\" maxlength=\"255\" value=\"" . $options[1] . "\" type=\"text\" /> " . _MB_XADDRESSES_FILES . "<br />";
- $form .= _MB_XADDRESSES_CHARS . " : <input name=\"options[2]\" size=\"5\" maxlength=\"255\" value=\"" . $options[2] . "\" type=\"text\" /><br /><br />";
- array_shift($options);
- array_shift($options);
- array_shift($options);
- $form .= _MB_XADDRESSES_CATTODISPLAY . "<br /><select name=\"options[]\" multiple=\"multiple\" size=\"5\">";
- $form .= "<option value=\"0\" " . (array_search(0, $options) === false ? '' : 'selected="selected"') . ">" . _MB_XADDRESSES_ALLCAT . "</option>";
- foreach (array_keys($addressescat_arr) as $i) {
- $form .= "<option value=\"" . $addressescat_arr[$i]->getVar('cid') . "\" " . (array_search($addressescat_arr[$i]->getVar('cid'), $options) === false ? '' : 'selected="selected"') . ">".$addressescat_arr[$i]->getVar('title')."</option>";
- }
- $form .= "</select>";
- return $form;
-}
-?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-07-27 17:37:55
|
Revision: 9930
http://xoops.svn.sourceforge.net/xoops/?rev=9930&view=rev
Author: beckmi
Date: 2012-07-27 17:37:45 +0000 (Fri, 27 Jul 2012)
Log Message:
-----------
- restructure folders
- move icons back to th module
- fix delete function
- add two missing language definitions
Added Paths:
-----------
XoopsModules/iplog/trunk/iplog/
XoopsModules/iplog/trunk/iplog/admin/
XoopsModules/iplog/trunk/iplog/admin/about.php
XoopsModules/iplog/trunk/iplog/admin/dashboard.php
XoopsModules/iplog/trunk/iplog/admin/footer.php
XoopsModules/iplog/trunk/iplog/admin/header.php
XoopsModules/iplog/trunk/iplog/admin/index.html
XoopsModules/iplog/trunk/iplog/admin/log.php
XoopsModules/iplog/trunk/iplog/admin/menu.php
XoopsModules/iplog/trunk/iplog/class/
XoopsModules/iplog/trunk/iplog/class/countries.php
XoopsModules/iplog/trunk/iplog/class/index.html
XoopsModules/iplog/trunk/iplog/class/log.php
XoopsModules/iplog/trunk/iplog/docs/
XoopsModules/iplog/trunk/iplog/docs/changelog.txt
XoopsModules/iplog/trunk/iplog/docs/credits.txt
XoopsModules/iplog/trunk/iplog/docs/index.html
XoopsModules/iplog/trunk/iplog/docs/install.txt
XoopsModules/iplog/trunk/iplog/docs/lang_diff.txt
XoopsModules/iplog/trunk/iplog/docs/licence.txt
XoopsModules/iplog/trunk/iplog/docs/readme.txt
XoopsModules/iplog/trunk/iplog/images/
XoopsModules/iplog/trunk/iplog/images/icons/
XoopsModules/iplog/trunk/iplog/images/icons/16/
XoopsModules/iplog/trunk/iplog/images/icons/16/iplog.log.png
XoopsModules/iplog/trunk/iplog/images/icons/32/
XoopsModules/iplog/trunk/iplog/images/icons/32/iplog.log.png
XoopsModules/iplog/trunk/iplog/images/logo.png
XoopsModules/iplog/trunk/iplog/include/
XoopsModules/iplog/trunk/iplog/include/functions.php
XoopsModules/iplog/trunk/iplog/include/ip2locationlite.class.php
XoopsModules/iplog/trunk/iplog/index.html
XoopsModules/iplog/trunk/iplog/language/
XoopsModules/iplog/trunk/iplog/language/english/
XoopsModules/iplog/trunk/iplog/language/english/admin.php
XoopsModules/iplog/trunk/iplog/language/english/help/
XoopsModules/iplog/trunk/iplog/language/english/help/help.html
XoopsModules/iplog/trunk/iplog/language/english/help/index.html
XoopsModules/iplog/trunk/iplog/language/english/index.html
XoopsModules/iplog/trunk/iplog/language/english/mail_template/
XoopsModules/iplog/trunk/iplog/language/english/mail_template/index.html
XoopsModules/iplog/trunk/iplog/language/english/modinfo.php
XoopsModules/iplog/trunk/iplog/language/index.html
XoopsModules/iplog/trunk/iplog/preloads/
XoopsModules/iplog/trunk/iplog/preloads/index.html
XoopsModules/iplog/trunk/iplog/preloads/logger.php
XoopsModules/iplog/trunk/iplog/sql/
XoopsModules/iplog/trunk/iplog/sql/mysql.sql
XoopsModules/iplog/trunk/iplog/templates/
XoopsModules/iplog/trunk/iplog/templates/blocks/
XoopsModules/iplog/trunk/iplog/templates/blocks/index.html
XoopsModules/iplog/trunk/iplog/templates/index.html
XoopsModules/iplog/trunk/iplog/templates/iplog_log_list.html
XoopsModules/iplog/trunk/iplog/xoops_version.php
Removed Paths:
-------------
XoopsModules/iplog/trunk/htdocs/
Added: XoopsModules/iplog/trunk/iplog/admin/about.php
===================================================================
--- XoopsModules/iplog/trunk/iplog/admin/about.php (rev 0)
+++ XoopsModules/iplog/trunk/iplog/admin/about.php 2012-07-27 17:37:45 UTC (rev 9930)
@@ -0,0 +1,76 @@
+<?php
+// $Id: about.php 5204 2010-09-06 20:10:52Z mageg $
+// ------------------------------------------------------------------------ //
+// XOOPS - PHP Content Management System //
+// Copyright (c) 2000 XOOPS.org //
+// <http://www.xoops.org/> //
+// ------------------------------------------------------------------------ //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation; either version 2 of the License, or //
+// (at your option) any later version. //
+// //
+// You may not change or alter any portion of this comment or credits //
+// of supporting developers from this source code or any supporting //
+// source code which is considered copyrighted (c) material of the //
+// original comment or credit authors. //
+// //
+// This program is distributed in the hope that it will be useful, //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
+// GNU General Public License for more details. //
+// //
+// You should have received a copy of the GNU General Public License //
+// along with this program; if not, write to the Free Software //
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
+// ------------------------------------------------------------------------ //
+// Author: XOOPS Foundation //
+// URL: http://www.xoops.org/ //
+// Project: The XOOPS Project //
+// ------------------------------------------------------------------------- //
+
+ include ('header.php');
+ xoops_loadLanguage('admin', 'iplog');
+
+ xoops_cp_header();
+ $indexAdmin = new ModuleAdmin();
+ echo $indexAdmin->addNavigation('about.php');
+
+ $aboutAdmin = new ModuleAdmin();
+ $paypalitemno='PROFILE175';
+ $aboutAdmin = new ModuleAdmin();
+ $about = $aboutAdmin->renderabout($paypalitemno, false);
+ $donationform = array( 0 => '<form name="donation" id="donation" action="http://www.chronolabs.com.au/modules/xpayment/" method="post" onsubmit="return xoopsFormValidate_donation();">',
+ 1 => '<table class="outer" cellspacing="1" width="100%"><tbody><tr><th colspan="2">'.constant('_AM_IPLOG_ABOUT_MAKEDONATE').'</th></tr><tr align="left" valign="top"><td class="head"><div class="xoops-form-element-caption-required"><span class="caption-text">Donation Amount</span><span class="caption-marker">*</span></div></td><td class="even"><select size="1" name="item[A][amount]" id="item[A][amount]" title="Donation Amount"><option value="5">5.00 AUD</option><option value="10">10.00 AUD</option><option value="20">20.00 AUD</option><option value="40">40.00 AUD</option><option value="60">60.00 AUD</option><option value="80">80.00 AUD</option><option value="90">90.00 AUD</option><option value="100">100.00 AUD</option><option value="200">200.00 AUD</option></select></td></tr><tr align="left" valign="top"><td class="head"></td><td class="even"><input class="formButton" name="submit" id="submit" value="'._SUBMIT.'" title="'._SUBMIT.'" type="submit"></td></tr></tbody></table>',
+ 2 => '<input name="op" id="op" value="createinvoice" type="hidden"><input name="plugin" id="plugin" value="donations" type="hidden"><input name="donation" id="donation" value="1" type="hidden"><input name="drawfor" id="drawfor" value="Chronolabs Co-Operative" type="hidden"><input name="drawto" id="drawto" value="%s" type="hidden"><input name="drawto_email" id="drawto_email" value="%s" type="hidden"><input name="key" id="key" value="%s" type="hidden"><input name="currency" id="currency" value="AUD" type="hidden"><input name="weight_unit" id="weight_unit" value="kgs" type="hidden"><input name="item[A][cat]" id="item[A][cat]" value="XDN%s" type="hidden"><input name="item[A][name]" id="item[A][name]" value="Donation for %s" type="hidden"><input name="item[A][quantity]" id="item[A][quantity]" value="1" type="hidden"><input name="item[A][shipping]" id="item[A][shipping]" value="0" type="hidden"><input name="item[A][handling]" id="item[A][handling]" value="0" type="hidden"><input name="item[A][weight]" id="item[A][weight]" value="0" type="hidden"><input name="item[A][tax]" id="item[A][tax]" value="0" type="hidden"><input name="return" id="return" value="http://www.chronolabs.coop/modules/donations/success.php" type="hidden"><input name="cancel" id="cancel" value="http://www.chronolabs.coop/modules/donations/success.php" type="hidden"></form>', 'D'=>'',
+ 3 => '',
+ 4 => '<!-- Start Form Validation JavaScript //-->
+<script type="text/javascript">
+<!--//
+function xoopsFormValidate_donation() { var myform = window.document.donation;
+var hasSelected = false; var selectBox = myform.item[A][amount];for (i = 0; i < selectBox.options.length; i++ ) { if (selectBox.options[i].selected == true && selectBox.options[i].value != \'\') { hasSelected = true; break; } }if (!hasSelected) { window.alert("Please enter Donation Amount"); selectBox.focus(); return false; }return true;
+}
+//--></script>
+<!-- End Form Validation JavaScript //-->');
+ $paypalform = array( 0 => '<form action="https://www.paypal.com/cgi-bin/webscr" method="post">',
+ 1 => '<input name="cmd" value="_s-xclick" type="hidden">',
+ 2 => '<input name="hosted_button_id" value="%s" type="hidden">',
+ 3 => '<img alt="" src="https://www.paypal.com/fr_FR/i/scr/pixel.gif" height="1" border="0" width="1">',
+ 4 => '<input src="https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif" name="submit" alt="PayPal - The safer, easier way to pay online!" border="0" type="image">',
+ 5 => '</form>');
+ for($key=0;$key<=4;$key++) {
+ switch ($key) {
+ case 2:
+ $donationform[$key] = sprintf($donationform[$key], $GLOBALS['xoopsConfig']['sitename'] . ' - ' . (strlen($GLOBALS['xoopsUser']->getVar('name'))>0?$GLOBALS['xoopsUser']->getVar('name'). ' ['.$GLOBALS['xoopsUser']->getVar('uname').']':$GLOBALS['xoopsUser']->getVar('uname')), $GLOBALS['xoopsUser']->getVar('email'), XOOPS_LICENSE_KEY, strtoupper($GLOBALS['iplogModule']->getVar('dirname')), strtoupper($GLOBALS['iplogModule']->getVar('dirname')). ' '.$GLOBALS['iplogModule']->getVar('name'));
+ break;
+ }
+ }
+
+ $istart = strpos($about, ($paypalform[0]), 1);
+ $iend = strpos($about, ($paypalform[5]), $istart+1)+strlen($paypalform[5])-1;
+ echo (substr($about, 0, $istart-1));
+ echo implode("\n", $donationform);
+ echo (substr($about, $iend+1, strlen($about)-$iend-1));
+
+ include(dirname(__FILE__).'/footer.php');
+?>
\ No newline at end of file
Added: XoopsModules/iplog/trunk/iplog/admin/dashboard.php
===================================================================
--- XoopsModules/iplog/trunk/iplog/admin/dashboard.php (rev 0)
+++ XoopsModules/iplog/trunk/iplog/admin/dashboard.php 2012-07-27 17:37:45 UTC (rev 9930)
@@ -0,0 +1,90 @@
+<?php
+// $Id: directory.php 5204 2010-09-06 20:10:52Z mageg $
+// ------------------------------------------------------------------------ //
+// XOOPS - PHP Content Management System //
+// Copyright (c) 2000 XOOPS.org //
+// <http://www.xoops.org/> //
+// ------------------------------------------------------------------------ //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation; either version 2 of the License, or //
+// (at your option) any later version. //
+// //
+// You may not change or alter any portion of this comment or credits //
+// of supporting developers from this source code or any supporting //
+// source code which is considered copyrighted (c) material of the //
+// original comment or credit authors. //
+// //
+// This program is distributed in the hope that it will be useful, //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
+// GNU General Public License for more details. //
+// //
+// You should have received a copy of the GNU General Public License //
+// along with this program; if not, write to the Free Software //
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
+// ------------------------------------------------------------------------ //
+// Author: XOOPS Foundation //
+// URL: http://www.xoops.org/ //
+// Project: The XOOPS Project //
+// ------------------------------------------------------------------------- //
+
+ include ('header.php');
+ xoops_loadLanguage('admin', 'profile');
+
+ xoops_cp_header();
+
+ $indexAdmin = new ModuleAdmin();
+ $log_handler = xoops_getmodulehandler('log', 'iplog');
+
+ $indexAdmin = new ModuleAdmin();
+ if (count($log_handler->getNumberByCountry())>1) {
+ $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_COUNTS_BY_COUNTRY);
+ foreach ($log_handler->getNumberByCountry() as $id => $value)
+ $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_COUNTS_BY_COUNTRY, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
+ }
+ if (count($log_handler->getNumberByRegion())>1) {
+ $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_COUNTS_BY_REGION);
+ foreach ($log_handler->getNumberByRegion() as $id => $value)
+ $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_COUNTS_BY_REGION, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
+ }
+ if (count($log_handler->getNumberByContinent())>1) {
+ $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_COUNTS_BY_CONTINENT);
+ foreach ($log_handler->getNumberByContinent() as $id => $value)
+ $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_COUNTS_BY_CONTINENT, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
+ }
+ if (count($log_handler->getTotalSecondsByCountry())>1) {
+ $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_SUM_BY_COUNTRY);
+ foreach ($log_handler->getTotalSecondsByCountry() as $id => $value)
+ $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_SUM_BY_COUNTRY, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
+ }
+ if (count($log_handler->getTotalSecondsByRegion())>1) {
+ $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_SUM_BY_REGION);
+ foreach ($log_handler->getTotalSecondsByRegion() as $id => $value)
+ $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_SUM_BY_REGION, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
+ }
+ if (count($log_handler->getTotalSecondsByContinent())>1) {
+ $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_SUM_BY_CONTINENT);
+ foreach ($log_handler->getTotalSecondsByContinent() as $id => $value)
+ $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_SUM_BY_CONTINENT, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
+ }
+ if (count($log_handler->getAdverageSecondsByCountry())>1) {
+ $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_AVG_BY_COUNTRY);
+ foreach ($log_handler->getAdverageSecondsByCountry() as $id => $value)
+ $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_AVG_BY_COUNTRY, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
+ }
+ if (count($log_handler->getAdverageSecondsByRegion())>1) {
+ $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_AVG_BY_REGION);
+ foreach ($log_handler->getAdverageSecondsByRegion() as $id => $value)
+ $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_AVG_BY_REGION, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
+ }
+ if (count($log_handler->getAdverageSecondsByContinent())>1) {
+ $indexAdmin->addInfoBox(_AM_IPLOG_ADMIN_AVG_BY_CONTINENT);
+ foreach ($log_handler->getAdverageSecondsByContinent() as $id => $value)
+ $indexAdmin->addInfoBoxLine(_AM_IPLOG_ADMIN_AVG_BY_CONTINENT, "<label>".$value['node'].": %s</label>", $value['total'], 'Green');
+ }
+
+ echo $indexAdmin->renderIndex();
+ include(dirname(__FILE__).'/footer.php');
+
+?>
\ No newline at end of file
Added: XoopsModules/iplog/trunk/iplog/admin/footer.php
===================================================================
--- XoopsModules/iplog/trunk/iplog/admin/footer.php (rev 0)
+++ XoopsModules/iplog/trunk/iplog/admin/footer.php 2012-07-27 17:37:45 UTC (rev 9930)
@@ -0,0 +1,22 @@
+<?php
+/**
+ * xSitemMap module
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package xSitemMap
+ * @since 2.5.0
+ * @author XOOPS Module Team
+ * @version $Id $
+**/
+echo "<div align=\"center\"><a href=\"http://www.xoops.org\" target=\"_blank\"><img src=" . XOOPS_URL ."/". $GLOBALS['iplogModule']->getInfo("icons32")."/xoopsmicrobutton.gif"." alt=\"XOOPS\" title=\"XOOPS\"></a></div>";
+echo "<div class='center smallsmall italic pad5'><strong>" . $GLOBALS['iplogModule']->getVar("name") . "</strong> is maintained by the <a class='tooltip' rel='external' href='http://www.xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>";
+
+xoops_cp_footer();
\ No newline at end of file
Added: XoopsModules/iplog/trunk/iplog/admin/header.php
===================================================================
--- XoopsModules/iplog/trunk/iplog/admin/header.php (rev 0)
+++ XoopsModules/iplog/trunk/iplog/admin/header.php 2012-07-27 17:37:45 UTC (rev 9930)
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Extended User iplog
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package iplog
+ * @since 2.3.0
+ * @author Taiwen Jiang <ph...@us...>
+ * @version $Id: header.php 5204 2010-09-06 20:10:52Z mageg $
+ */
+
+
+ require_once (dirname(dirname(dirname(dirname(__FILE__)))).'/include/cp_header.php');
+
+ if (!defined('_CHARSET'))
+ define ("_CHARSET","UTF-8");
+ if (!defined('_CHARSET_ISO'))
+ define ("_CHARSET_ISO","ISO-8859-1");
+
+ $GLOBALS['myts'] = MyTextSanitizer::getInstance();
+
+ $module_handler = xoops_gethandler('module');
+ $config_handler = xoops_gethandler('config');
+ $GLOBALS['iplogModule'] = $module_handler->getByDirname('iplog');
+ $GLOBALS['iplogModuleConfig'] = $config_handler->getConfigList($GLOBALS['iplogModule']->getVar('mid'));
+
+ xoops_load('pagenav');
+ xoops_load('xoopslists');
+ xoops_load('xoopsformloader');
+
+ include_once $GLOBALS['xoops']->path('class'.DS.'xoopsmailer.php');
+ include_once $GLOBALS['xoops']->path('class'.DS.'xoopstree.php');
+
+ if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){
+ include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
+ }else{
+ echo xoops_error("Error: You don't use the Frameworks \"admin module\". Please install this Frameworks");
+ }
+
+ $GLOBALS['iplogImageIcon'] = XOOPS_URL .'/'. $GLOBALS['iplogModule']->getInfo('icons16');
+ $GLOBALS['iplogImageAdmin'] = XOOPS_URL .'/'. $GLOBALS['iplogModule']->getInfo('icons32');
+
+ if ($GLOBALS['xoopsUser']) {
+ $moduleperm_handler =& xoops_gethandler('groupperm');
+ if (!$moduleperm_handler->checkRight('module_admin', $GLOBALS['iplogModule']->getVar( 'mid' ), $GLOBALS['xoopsUser']->getGroups())) {
+ redirect_header(XOOPS_URL, 1, _NOPERM);
+ exit();
+ }
+ } else {
+ redirect_header(XOOPS_URL . "/user.php", 1, _NOPERM);
+ exit();
+ }
+
+ require_once $GLOBALS['xoops']->path('/modules/iplog/include/functions.php');
+
+ xoops_loadLanguage('user');
+
+ if (!isset($GLOBALS['xoopsTpl']) || !is_object($GLOBALS['xoopsTpl'])) {
+ include_once(XOOPS_ROOT_PATH."/class/template.php");
+ $GLOBALS['xoopsTpl'] = new XoopsTpl();
+ }
+
+ $GLOBALS['xoopsTpl']->assign('pathImageIcon', $GLOBALS['iplogImageIcon']);
+ $GLOBALS['xoopsTpl']->assign('pathImageAdmin', $GLOBALS['iplogImageAdmin']);
+
+ $op = isset($_REQUEST['op'])?$_REQUEST['op']:"dashboard";
+ $fct = isset($_REQUEST['fct'])?$_REQUEST['fct']:"list";
+ $limit = !empty($_REQUEST['limit'])?intval($_REQUEST['limit']):30;
+ $start = !empty($_REQUEST['start'])?intval($_REQUEST['start']):0;
+ $order = !empty($_REQUEST['order'])?$_REQUEST['order']:'DESC';
+ $sort = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'start';
+ $filter = !empty($_REQUEST['filter'])?''.$_REQUEST['filter'].'':'1,1';
+ $id = !empty($_REQUEST['id'])?(is_array($_REQUEST['id'])?array_unique($_REQUEST['id']):intval($_REQUEST['id'])):0;
+
+
+?>
\ No newline at end of file
Added: XoopsModules/iplog/trunk/iplog/admin/index.html
===================================================================
--- XoopsModules/iplog/trunk/iplog/admin/index.html (rev 0)
+++ XoopsModules/iplog/trunk/iplog/admin/index.html 2012-07-27 17:37:45 UTC (rev 9930)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/iplog/trunk/iplog/admin/log.php
===================================================================
--- XoopsModules/iplog/trunk/iplog/admin/log.php (rev 0)
+++ XoopsModules/iplog/trunk/iplog/admin/log.php 2012-07-27 17:37:45 UTC (rev 9930)
@@ -0,0 +1,109 @@
+<?php
+// $Id: category.php 5204 2010-09-06 20:10:52Z mageg $
+// ------------------------------------------------------------------------ //
+// XOOPS - PHP Content Management System //
+// Copyright (c) 2000 XOOPS.org //
+// <http://www.xoops.org/> //
+// ------------------------------------------------------------------------ //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation; either version 2 of the License, or //
+// (at your option) any later version. //
+// //
+// You may not change or alter any portion of this comment or credits //
+// of supporting developers from this source code or any supporting //
+// source code which is considered copyrighted (c) material of the //
+// original comment or credit authors. //
+// //
+// This program is distributed in the hope that it will be useful, //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
+// GNU General Public License for more details. //
+// //
+// You should have received a copy of the GNU General Public License //
+// along with this program; if not, write to the Free Software //
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
+// ------------------------------------------------------------------------ //
+// Author: XOOPS Foundation //
+// URL: http://www.xoops.org/ //
+// Project: The XOOPS Project //
+// ------------------------------------------------------------------------- //
+include 'header.php';
+xoops_cp_header();
+$indexAdmin = new ModuleAdmin();
+
+echo $indexAdmin->addNavigation('log.php');
+
+$op = isset($_REQUEST['op']) ? $_REQUEST['op'] : 'log';
+$fct = isset($_REQUEST['fct']) ? $_REQUEST['fct'] : 'list';
+
+switch($op) {
+case "log":
+ switch ($fct)
+ {
+ default:
+ case "list":
+
+ include_once $GLOBALS['xoops']->path( "/class/pagenav.php" );
+
+ $log_handler =& xoops_getmodulehandler('log', 'iplog');
+
+ $criteria = new Criteria(1,1);
+ $ttl = $log_handler->getCount($criteria);
+ $sort = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'start';
+
+ $pagenav = new XoopsPageNav($ttl, $limit, $start, 'start', 'limit='.$limit.'&sort='.$sort.'&order='.$order.'&op='.$op.'&fct='.$fct.'&filter='.$filter.'&fct='.$fct.'&filter='.$filter);
+ $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
+
+ foreach ($log_handler->getFields() as $id => $key) {
+ $GLOBALS['xoopsTpl']->assign(strtolower(str_replace('-','_',$key).'_th'), '<a href="'.$_SERVER['PHP_SELF'].'?start='.$start.'&limit='.$limit.'&sort='.str_replace('_','-',$key).'&order='.((str_replace('_','-',$key)==$sort)?($order=='DESC'?'ASC':'DESC'):$order).'&op='.$op.'&filter='.$filter.'">'.(defined('_AM_IPLOG_TH_'.strtoupper(str_replace('-','_',$key)))?constant('_AM_IPLOG_TH_'.strtoupper(str_replace('-','_',$key))):'_AM_IPLOG_TH_'.strtoupper(str_replace('-','_',$key))).'</a>');
+ }
+
+ $GLOBALS['xoopsTpl']->assign('limit', $limit);
+ $GLOBALS['xoopsTpl']->assign('start', $start);
+ $GLOBALS['xoopsTpl']->assign('order', $order);
+ $GLOBALS['xoopsTpl']->assign('sort', $sort);
+ $GLOBALS['xoopsTpl']->assign('filter', $filter);
+ $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['xoopsModuleConfig']);
+
+ $criteria->setStart($start);
+ $criteria->setLimit($limit);
+ $criteria->setSort('`'.$sort.'`');
+ $criteria->setOrder($order);
+
+ $logs = $log_handler->getObjects($criteria, true);
+ foreach($logs as $cid => $log) {
+ if (!is_object($log))
+ $log_handler->delete($cid);
+ else
+ $GLOBALS['xoopsTpl']->append('log', $log->toArray());
+ }
+ $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']);
+ $GLOBALS['xoopsTpl']->display('db:iplog_log_list.html');
+ break;
+
+
+ case "delete":
+
+ $log_handler =& xoops_getmodulehandler('log', 'iplog');
+
+ if (isset($_POST['id'])&&$id!=0) {
+ $log = $log_handler->get($id);
+ if (!$log_handler->delete($log)) {
+ redirect_header('dashboard.php?op='.$op.'&fct=list&limit='.$limit.'&start='.$start.'&order='.$order.'&sort='.$sort.'&filter='.$filter, 10, _AM_MSG_LOG_FAILEDTODELETE);
+ exit(0);
+ } else {
+ redirect_header('dashboard.php?op='.$op.'&fct=list&limit='.$limit.'&start='.$start.'&order='.$order.'&sort='.$sort.'&filter='.$filter, 10, _AM_MSG_LOG_DELETED);
+ exit(0);
+ }
+ } else {
+ $log = $log_handler->get($id);
+ xoops_confirm(array('id'=>$id, 'op'=>$_REQUEST['op'], 'fct'=>$_REQUEST['fct'], 'limit'=>$_REQUEST['limit'], 'start'=>$_REQUEST['start'], 'order'=>$_REQUEST['order'], 'sort'=>$_REQUEST['sort'], 'filter'=>$_REQUEST['filter']), 'log.php', sprintf(_AM_MSG_LOG_DELETE, $log->getVar('name')));
+ }
+ break;
+ }
+ break;
+}
+
+include(dirname(__FILE__).'/footer.php');
+?>
\ No newline at end of file
Added: XoopsModules/iplog/trunk/iplog/admin/menu.php
===================================================================
--- XoopsModules/iplog/trunk/iplog/admin/menu.php (rev 0)
+++ XoopsModules/iplog/trunk/iplog/admin/menu.php 2012-07-27 17:37:45 UTC (rev 9930)
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Extended User iplog
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package iplog
+ * @since 2.3.0
+ * @author Jan Pedersen
+ * @author Taiwen Jiang <ph...@us...>
+ * @version $Id: menu.php 2021 2008-08-31 02:02:45Z phppp $
+ */
+$module_handler = xoops_gethandler('module');
+$GLOBALS['iplogModule'] = $module_handler->getByDirname('iplog');
+$adminmenu = array();
+if (is_object($GLOBALS['iplogModule'])) {
+ $adminmenu[0]['title'] = _MI_IPLOG_DASHBOARD;
+ $adminmenu[0]['icon'] = '../../'.$GLOBALS['iplogModule']->getInfo('icons32').'/home.png';
+ $adminmenu[0]['image'] = '../../'.$GLOBALS['iplogModule']->getInfo('icons32').'/home.png';
+ $adminmenu[0]['link'] = "admin/dashboard.php";
+ $adminmenu[1]['title'] = _MI_IPLOG_LOG;
+ $adminmenu[1]['icon'] = 'images/icons/32/iplog.log.png';
+ $adminmenu[1]['image'] = 'images/icons/32/iplog.log.png';
+ $adminmenu[1]['link'] = "admin/log.php";
+ $adminmenu[2]['title'] = _MI_IPLOG_ABOUT;
+ $adminmenu[2]['icon'] = '../../'.$GLOBALS['iplogModule']->getInfo('icons32').'/about.png';
+ $adminmenu[2]['image'] = '../../'.$GLOBALS['iplogModule']->getInfo('icons32').'/about.png';
+ $adminmenu[2]['link'] = "admin/about.php";
+}
+?>
\ No newline at end of file
Added: XoopsModules/iplog/trunk/iplog/class/countries.php
===================================================================
--- XoopsModules/iplog/trunk/iplog/class/countries.php (rev 0)
+++ XoopsModules/iplog/trunk/iplog/class/countries.php 2012-07-27 17:37:45 UTC (rev 9930)
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Extended User Iplog
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package Iplog
+ * @since 2.3.0
+ * @author Jan Pedersen
+ * @author Taiwen Jiang <ph...@us...>
+ * @version $Id: Countries.php 4361 2010-02-09 23:36:33Z trabis $
+ */
+
+defined('XOOPS_ROOT_PATH') or die("XOOPS root path not defined");
+
+/**
+ * @package kernel
+ * @copyright copyright © 2000 XOOPS.org
+ */
+class IplogCountries extends XoopsObject
+{
+ function __construct()
+ {
+ $this->initVar('country_id', XOBJ_DTYPE_INT, null, true);
+ $this->initVar('code', XOBJ_DTYPE_TXTBOX);
+ $this->initVar('name', XOBJ_DTYPE_TXTBOX);
+ $this->initVar('dialcode', XOBJ_DTYPE_TXTBOX);
+ $this->initVar('tldexists', XOBJ_DTYPE_TXTBOX);
+ $this->initVar('tld', XOBJ_DTYPE_TXTBOX);
+ $this->initVar('startgmt', XOBJ_DTYPE_DECIMAL);
+ $this->initVar('endgmt', XOBJ_DTYPE_DECIMAL);
+ $this->initVar('region', XOBJ_DTYPE_ENUM, false, false, false, false, array('Antarctica','Australasia','Caribbean','Central Africa','Central America','Central Asia','Eastern Africa','Eastern Asia','Eastern Europe','Middle East','North America','Northern Africa','Northern Asia','Northern Europe','South America','Southeastern Asia','Southeastern Europe','Southern Africa','Southern Asia','Southern Europe','Southwestern Asia','United States','Western Africa','Western Europe','Other'));
+ $this->initVar('continent', XOBJ_DTYPE_ENUM, false, false, false, false, array('Africa','Asia','Europe','North America','South America','Oceania','Other'));
+ $this->initVar('daylightsaving', XOBJ_DTYPE_ENUM, false, false, false, false, array('Yes','No'));
+ $this->initVar('start_dls_day', XOBJ_DTYPE_ENUM, false, false, false, false, array('Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday'));
+ $this->initVar('start_dls_week', XOBJ_DTYPE_ENUM, false, false, false, false, array('1st','2nd','3rd','4th'));
+ $this->initVar('start_dls_month', XOBJ_DTYPE_ENUM, false, false, false, false, array('January','Febuary','March','April','May','June','July','August','September','October','November','December'));
+ $this->initVar('start_dls_dayno', XOBJ_DTYPE_INT);
+ $this->initVar('start_dls_mode', XOBJ_DTYPE_ENUM, false, false, false, false, array('day','dayno'));
+ $this->initVar('end_dls_day', XOBJ_DTYPE_ENUM, false, false, false, false, array('Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday'));
+ $this->initVar('end_dls_week', XOBJ_DTYPE_ENUM, false, false, false, false, array('1st','2nd','3rd','4th'));
+ $this->initVar('end_dls_month', XOBJ_DTYPE_ENUM, false, false, false, false, array('January','Febuary','March','April','May','June','July','August','September','October','November','December'));
+ $this->initVar('end_dls_dayno', XOBJ_DTYPE_INT);
+ $this->initVar('end_dls_mode', XOBJ_DTYPE_ENUM, false, false, false, false, array('day','dayno'));
+
+ $this->initVar('cat_weight', XOBJ_DTYPE_INT);
+ }
+
+}
+
+/**
+ * @package kernel
+ * @copyright copyright © 2000 XOOPS.org
+ */
+class IplogCountriesHandler extends XoopsPersistableObjectHandler
+{
+ function IplogCountriesHandler(&$db)
+ {
+ $this->__construct($db);
+ }
+
+ function __construct(&$db)
+ {
+ parent::__construct($db, "iplog_countries", "IplogCountries", "country_id", 'name');
+ }
+
+ function getIDByCode($code, $as_id = true) {
+ if ($this->getCount(new Criteria('code', strtoupper($code)))) {
+ $objs = $this->getObjects(new Criteria('code', strtoupper($code)), false);
+ if (is_object($objs[0])) {
+ if ($as_id==true)
+ return $objs[0]->getVar('country_id');
+ else
+ return $objs[0];
+ }
+ }
+ return false;
+ }
+}
+?>
\ No newline at end of file
Added: XoopsModules/iplog/trunk/iplog/class/index.html
===================================================================
--- XoopsModules/iplog/trunk/iplog/class/index.html (rev 0)
+++ XoopsModules/iplog/trunk/iplog/class/index.html 2012-07-27 17:37:45 UTC (rev 9930)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/iplog/trunk/iplog/class/log.php
===================================================================
--- XoopsModules/iplog/trunk/iplog/class/log.php (rev 0)
+++ XoopsModules/iplog/trunk/iplog/class/log.php 2012-07-27 17:37:45 UTC (rev 9930)
@@ -0,0 +1,398 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) {
+ exit();
+}
+
+require_once(dirname(dirname(__FILE__)).'/include/ip2locationlite.class.php');
+/**
+ * Class for Iplog Profiler
+ * @author Simon Roberts (si...@ch...)
+ * @copyright copyright (c) 2000-2009 XOOPS.org
+ * @package kernel
+ */
+class IplogLog extends XoopsObject
+{
+
+ function IplogLog($fid = null)
+ {
+ $this->initVar('ip_id', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('uid', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('agent', XOBJ_DTYPE_TXTBOX, null, false, 255);
+ $this->initVar('uname', XOBJ_DTYPE_TXTBOX, null, false, 32);
+ $this->initVar('ip4', XOBJ_DTYPE_TXTBOX, null, false, 255);
+ $this->initVar('ip6', XOBJ_DTYPE_TXTBOX, null, false, 65535);
+ $this->initVar('long', XOBJ_DTYPE_TXTBOX, null, false, 120);
+ $this->initVar('network-addy', XOBJ_DTYPE_TXTBOX, null, false, 255);
+ $this->initVar('country_id', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('country-code', XOBJ_DTYPE_TXTBOX, null, false, 3);
+ $this->initVar('country-name', XOBJ_DTYPE_TXTBOX, null, false, 128);
+ $this->initVar('region-name', XOBJ_DTYPE_TXTBOX, null, false, 128);
+ $this->initVar('city-name', XOBJ_DTYPE_TXTBOX, null, false, 128);
+ $this->initVar('postcode', XOBJ_DTYPE_TXTBOX, null, false, 15);
+ $this->initVar('latitude', XOBJ_DTYPE_DECIMAL, null, false);
+ $this->initVar('longitude', XOBJ_DTYPE_DECIMAL, null, false);
+ $this->initVar('time-zone', XOBJ_DTYPE_TXTBOX, null, false, 6);
+ $this->initVar('proxy-ip4', XOBJ_DTYPE_TXTBOX, null, false, 255);
+ $this->initVar('proxy-ip6', XOBJ_DTYPE_TXTBOX, null, false, 65535);
+ $this->initVar('proxy-long', XOBJ_DTYPE_TXTBOX, null, false, 65535);
+ $this->initVar('proxy-network-addy', XOBJ_DTYPE_TXTBOX, null, false, 65535);
+ $this->initVar('proxy-country_id', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('proxy-country-code', XOBJ_DTYPE_TXTBOX, null, false, 3);
+ $this->initVar('proxy-country-name', XOBJ_DTYPE_TXTBOX, null, false, 128);
+ $this->initVar('proxy-region-name', XOBJ_DTYPE_TXTBOX, null, false, 128);
+ $this->initVar('proxy-city-name', XOBJ_DTYPE_TXTBOX, null, false, 128);
+ $this->initVar('proxy-postcode', XOBJ_DTYPE_TXTBOX, null, false, 15);
+ $this->initVar('proxy-latitude', XOBJ_DTYPE_DECIMAL, null, false);
+ $this->initVar('proxy-longitude', XOBJ_DTYPE_DECIMAL, null, false);
+ $this->initVar('proxy-time-zone', XOBJ_DTYPE_TXTBOX, null, false, 6);
+ $this->initVar('session_id', XOBJ_DTYPE_TXTBOX, null, false, 128);
+ $this->initVar('start', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('end', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('online', XOBJ_DTYPE_INT, null, false);
+ }
+
+ function toArray() {
+ $ret = parent::toArray();
+ $ret['made'] = date(_DATESTRING, $this->getVar('made'));
+ $countries_handler = xoops_getmodulehandler('countries', 'iplog');
+ $country = $countries_handler->get($this->getVar('country_id'));
+ if (is_object($country))
+ $ret['country'] = $country->toArray();
+ $comment_handler = xoops_gethandler('comment');
+ $module_handler = xoops_gethandler('module');
+ $GLOBALS['moduleIplog'] = $module_handler->getByDirname('iplog');
+ $criteria = new CriteriaCompo(new Criteria('com_itemid', $this->getVar('member_id')));
+ $criteria->add(new Criteria('com_modid', $GLOBALS['moduleIplog']->getVar('mid')));
+ $comments = $comment_handler->getObjects($criteria, true);
+ if (count($comments)>0) {
+ foreach($comments as $com_id => $comment);
+ $ret['comments'][$com_id] = $comment->toArray();
+ }
+ foreach($ret as $key => $value) {
+ if (is_array($value)) {
+ foreach ($value as $keyb => $valueb) {
+ unset($value[$keyb]);
+ $value[str_replace('-', '_', $keyb)] = $valueb;
+ }
+ }
+ unset($ret[$key]);
+ $ret[str_replace('-', '_', $key)] = $value;
+ }
+ $ret['ip'] = $this->getIPAddy().' ('.$this->getIPType().')';
+ $ret['proxy_ip'] = $this->getProxyIPAddy();
+ $ret['start'] = date(_DATESTRING,$ret['start']);
+ $ret['end'] = date(_DATESTRING,$ret['end']);
+ if ($ret['uid']==0)
+ $ret['uname'] = _MI_IPLOG_GUEST;
+ else
+ $ret['uname'] = '<a href="'.XOOPS_URL.'/userinfo.php?uid='.$ret['uid'].'">'.$ret['uname'].'</a>';
+ return $ret;
+
+ }
+
+ function setIPAddy($ip) {
+ if ($this->validateIPv4($ip))
+ $this->setVar('ip4', $ip);
+ elseif ($this->validateIPv6($ip))
+ $this->setVar('ip6', $ip);
+ elseif (strpos($ip,'.')>0&&count(explode('.', $ip))==4)
+ $this->setVar('ip4', $ip);
+ elseif (strpos($ip,':')>0&&count(explode(':', $ip))>=5)
+ $this->setVar('ip6', $ip);
+ }
+
+ function setProxyIPAddy($ip) {
+ if ($this->validateIPv4($ip))
+ $this->setVar('proxy-ip4', $ip);
+ elseif ($this->validateIPv6($ip))
+ $this->setVar('proxy-ip6', $ip);
+ }
+
+ function getIPAddy() {
+ if (strlen($this->getVar('ip4'))>0)
+ return $this->getVar('ip4');
+ elseif (strlen($this->getVar('ip6'))>0)
+ return $this->getVar('ip6');
+ return false;
+ }
+
+ function getProxyIPAddy() {
+ if (strlen($this->getVar('proxy-ip4'))>0)
+ return $this->getVar('proxy-ip4');
+ elseif (strlen($this->getVar('proxy-ip6'))>0)
+ return $this->getVar('proxy-ip6');
+ return false;
+ }
+
+ function getIPType() {
+ if (strlen($this->getVar('ip4'))>0)
+ return _MI_IPLOG_IPV4;
+ elseif (strlen($this->getVar('ip6'))>0)
+ return _MI_IPLOG_IPV6;
+ }
+
+ private function validateIPv4($ip) {
+ if(filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE) === FALSE) // returns IP is valid
+ {
+ return false;
+ } else {
+ return true;
+ }
+ }
+
+ private function validateIPv6($ip) {
+ if(filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) === FALSE) // returns IP is valid
+ {
+ return false;
+ } else {
+ return true;
+ }
+ }
+
+}
+
+
+/**
+* XOOPS Iplog Profiler handler class.
+* This class is responsible for providing data access mechanisms to the data source
+* of XOOPS user class objects.
+*
+* @author Simon Roberts <si...@ch...>
+* @package kernel
+*/
+class IplogLogHandler extends XoopsPersistableObjectHandler
+{
+ function __construct(&$db)
+ {
+ parent::__construct($db, "iplog_log", 'IplogLog', "ip_id", "session_id");
+ }
+
+ function getFields() {
+ return array('ip_id', 'uname', 'ip', 'country_code', 'name', 'region', 'contient', 'network_addy', 'useragent', 'proxy_ip', 'start', 'end', 'online');
+ }
+
+ function writeLog($data) {
+ $obj = $this->create();
+ $obj->setVars($data);
+ $obj->setIPAddy($data['ip']);
+ if ($data['proxied'])
+ $obj->setProxyIPAddy($data['proxy-ip']);
+ return $this->insert($obj, true);
+ }
+
+ function insert($obj, $force = true) {
+ xoops_load('xoopscache');
+ $ping = XoopsCache::read('iplog_ip_ping_unixtimes');
+ if (!is_array($ping)==true) {
+ $ping=array($obj->getIPAddy()=>microtime(true));
+ $oldping=microtime(true);
+ } else {
+ if (time()-$ping[$obj->getIPAddy()]>$GLOBALS['xoopsConfig']['session_expire']*60) {
+ $pingnew = true;
+ } else {
+ $pingnew = false;
+ }
+ $oldping=$ping[$obj->getIPAddy()];
+ $ping[$obj->getIPAddy()]=microtime(true);
+ }
+ XoopsCache::write('iplog_ip_ping_unixtimes', $ping, 60*60*24*7*4);
+
+ if ($this->getCount(new Criteria('session_id', session_id())&&is_object($GLOBALS['xoopsUser']))&&$pingnew!=true) {
+ $criteria = new Criteria('session_id', session_id());
+ $criteria->setSort('`ip_id`');
+ $criteria->setOrder('DESC');
+ $criteria->setLimit(1);
+ $objs = $this->getObjects($criteria, false);
+ if (is_object($objs[0])) {
+ $obj = $objs[0];
+ $obj->setVar('end', $ping[$obj->getIPAddy()]);
+ $obj->setVar('online', $obj->getVar('end')-$obj->getVar('start'));
+ }
+ } elseif (!is_object($GLOBALS['xoopsUser'])&&$GLOBALS['iplogModuleConfig']['anonymous']&&$pingnew!=true) {
+ if ($obj->getIPType()==_MI_IPLOG_IPV4) {
+ $criteria = new Criteria('ip4', $obj->getIPAddy());
+ $criteria->setSort('`ip_id`');
+ $criteria->setOrder('DESC');
+ $criteria->setLimit(1);
+ $objs = $this->getObjects($criteria, false);
+ } elseif ($obj->getIPType()==_MI_IPLOG_IPV6) {
+ $criteria = new Criteria('ip6', $obj->getIPAddy());
+ $criteria->setSort('`ip_id`');
+ $criteria->setOrder('DESC');
+ $criteria->setLimit(1);
+ $objs = $this->getObjects($criteria, false);
+ }
+ if (is_object($objs[0])) {
+ $obj = $objs[0];
+ $obj->setVar('end', $ping[$obj->getIPAddy()]);
+ $obj->setVar('online', $obj->getVar('end')-$obj->getVar('start'));
+ }
+ }
+ if ($obj->isNew()) {
+
+ $obj->setVar('session_id', session_id());
+ $obj->setVar('start', $ping[$obj->getIPAddy()]);
+ $obj->setVar('end', $ping[$obj->getIPAddy()]);
+
+ if (strlen($obj->getVar('ip4'))<>0) {
+ if (strlen($obj->getVar('ip4'))<7) {
+ return false;
+ } elseif (substr($obj->getVar('ip4'), strlen($obj->getVar('ip4'))-1, 1) == '.') {
+ return false;
+ } else {
+ $count = count(explode('.', $obj->getVar('ip4')));
+ if ($count!=4)
+ return false;
+ }
+ } elseif (strlen($obj->getVar('ip6'))<>0) {
+ if (strlen($obj->getVar('ip6'))<15) {
+ return false;
+ } elseif (substr($obj->getVar('ip6'), strlen($obj->getVar('ip6'))-1, 1) == ':') {
+ return false;
+ } else {
+ $count = count(explode(':',$obj->getVar('ip6')));
+ if ($count<5)
+ return false;
+ }
+ }
+
+ if (strlen($obj->getVar('long'))==0)
+ $obj->setVar('long', @ip2long($obj->getIPAddy()));
+
+ if (strlen($obj->getVar('network-addy'))<strlen(strlen($obj->getIPAddy())))
+ $obj->setVar('network-addy', @gethostbyaddr($obj->getIPAddy()));
+
+ $ipLite = new ip2location_lite;
+ $ipLite->setKey($GLOBALS['iplogModuleConfig']['ipinfodb_key']);
+ //Get errors and locations
+ $locations = $ipLite->getCity($obj->getIPAddy());
+ $countries_handler = xoops_getmodulehandler('countries', 'iplog');
+ $obj->setVar('country_id', $countries_handler->getIDByCode(strtoupper($locations['countryCode'])));
+ $obj->setVar('country-code', strtoupper($locations['countryCode']));
+ $obj->setVar('country-name', ucfirst($locations['countryName']));
+ $obj->setVar('region-name', ucfirst($locations['regionName']));
+ $obj->setVar('city-name', ucfirst($locations['cityName']));
+ $obj->setVar('postcode', $locations['zipCode']);
+ $obj->setVar('latitude', $locations['latitude']);
+ $obj->setVar('longitude', $locations['longitude']);
+ $obj->setVar('time-zone', $locations['timeZone']);
+
+ if ($obj->getProxyIPAddy()!=false) {
+ if (strlen($obj->getVar('proxy-long'))==0)
+ $obj->setVar('proxy-long', @ip2long($obj->getProxyIPAddy()));
+
+ if (strlen($obj->getVar('proxy-network-addy'))<strlen(strlen($obj->getProxyIPAddy())))
+ $obj->setVar('proxy-network-addy', @gethostbyaddr($obj->getProxyIPAddy()));
+
+ $locations = $ipLite->getCity($obj->getProxyIPAddy());
+ $countries_handler = xoops_getmodulehandler('countries', 'iplog');
+ $obj->setVar('proxy-country_id', $countries_handler->getIDByCode(strtoupper($locations['countryCode'])));
+ $obj->setVar('proxy-country-code', strtoupper($locations['countryCode']));
+ $obj->setVar('proxy-country-name', ucfirst($locations['countryName']));
+ $obj->setVar('proxy-region-name', ucfirst($locations['regionName']));
+ $obj->setVar('proxy-city-name', ucfirst($locations['cityName']));
+ $obj->setVar('proxy-postcode', $locations['zipCode']);
+ $obj->setVar('proxy-latitude', $locations['latitude']);
+ $obj->setVar('proxy-longitude', $locations['longitude']);
+ $obj->setVar('proxy-time-zone', $locations['timeZone']);
+ }
+ }
+
+ $ret = parent::insert($obj, $force);
+ $this->deleteAll(new Criteria('end', time() - $GLOBALS['iplogModuleConfig']['logdrops'], '<='));
+ return $ret;
+
+ }
+
+ function getNumberByCountry() {
+ $sql = 'SELECT DISTINCT `country-name` as node, count(*) as total FROM `'.$this->table.'`';
+ $result = $GLOBALS['xoopsDB']->queryF($sql);
+ $ret = array();
+ while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
+ $ret[] = $row;
+ }
+ return $ret;
+ }
+
+ function getNumberByRegion() {
+ $sql = 'SELECT DISTINCT `b`.`region` as node, count(*) as total FROM `'.$this->table.'` a INNER JOIN `'.$GLOBALS['xoopsDB']->prefix('iplog_countries').'` b ON a.country_id = b.country_id';
+ $result = $GLOBALS['xoopsDB']->queryF($sql);
+ $ret = array();
+ while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
+ $ret[] = $row;
+ }
+ return $ret;
+ }
+
+ function getNumberByContinent() {
+ $sql = 'SELECT DISTINCT `b`.`continent` as node, count(*) as total FROM `'.$this->table.'` a INNER JOIN `'.$GLOBALS['xoopsDB']->prefix('iplog_countries').'` b ON a.country_id = b.country_id';
+ $result = $GLOBALS['xoopsDB']->queryF($sql);
+ $ret = array();
+ while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
+ $ret[] = $row;
+ }
+ return $ret;
+ }
+
+ function getTotalSecondsByCountry() {
+ $sql = 'SELECT DISTINCT `country-name` as node, sum(`online`)/60 as total FROM `'.$this->table.'`';
+ $result = $GLOBALS['xoopsDB']->queryF($sql);
+ $ret = array();
+ while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
+ $ret[] = $row;
+ }
+ return $ret;
+ }
+
+ function getTotalSecondsByRegion() {
+ $sql = 'SELECT DISTINCT `b`.`region` as node, sum(`online`)/60 as total FROM `'.$this->table.'` a INNER JOIN `'.$GLOBALS['xoopsDB']->prefix('iplog_countries').'` b ON a.country_id = b.country_id';;
+ $result = $GLOBALS['xoopsDB']->queryF($sql);
+ $ret = array();
+ while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
+ $ret[] = $row;
+ }
+ return $ret;
+ }
+
+ function getTotalSecondsByContinent() {
+ $sql = 'SELECT DISTINCT `b`.`continent` as node, sum(`online`)/60 as total FROM `'.$this->table.'` a INNER JOIN `'.$GLOBALS['xoopsDB']->prefix('iplog_countries').'` b ON a.country_id = b.country_id';;
+ $result = $GLOBALS['xoopsDB']->queryF($sql);
+ $ret = array();
+ while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
+ $ret[] = $row;
+ }
+ return $ret;
+ }
+
+ function getAdverageSecondsByCountry() {
+ $sql = 'SELECT DISTINCT `country-name` as node, avg(`online`)/60 as total FROM `'.$this->table.'`';
+ $result = $GLOBALS['xoopsDB']->queryF($sql);
+ $ret = array();
+ while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
+ $ret[] = $row;
+ }
+ return $ret;
+ }
+
+ function getAdverageSecondsByRegion() {
+ $sql = 'SELECT DISTINCT `b`.`region` as node, avg(`online`)/60 as total FROM `'.$this->table.'` a INNER JOIN `'.$GLOBALS['xoopsDB']->prefix('iplog_countries').'` b ON a.country_id = b.country_id';;
+ $result = $GLOBALS['xoopsDB']->queryF($sql);
+ $ret = array();
+ while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
+ $ret[] = $row;
+ }
+ return $ret;
+ }
+
+ function getAdverageSecondsByContinent() {
+ $sql = 'SELECT DISTINCT `b`.`continent` as node, avg(`online`)/60 as total FROM `'.$this->table.'` a INNER JOIN `'.$GLOBALS['xoopsDB']->prefix('iplog_countries').'` b ON a.country_id = b.country_id';;
+ $result = $GLOBALS['xoopsDB']->queryF($sql);
+ $ret = array();
+ while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
+ $ret[] = $row;
+ }
+ return $ret;
+ }
+}
+?>
Added: XoopsModules/iplog/trunk/iplog/docs/changelog.txt
===================================================================
--- XoopsModules/iplog/trunk/iplog/docs/changelog.txt (rev 0)
+++ XoopsModules/iplog/trunk/iplog/docs/changelog.txt 2012-07-27 17:37:45 UTC (rev 9930)
@@ -0,0 +1,5 @@
+===================
+1.01 2012-07-27
+===================
+
+Original Release
\ No newline at end of file
Added: XoopsModules/iplog/trunk/iplog/docs/credits.txt
===================================================================
--- XoopsModules/iplog/trunk/iplog/docs/credits.txt (rev 0)
+++ XoopsModules/iplog/trunk/iplog/docs/credits.txt 2012-07-27 17:37:45 UTC (rev 9930)
@@ -0,0 +1,2 @@
+Credits:
+=================
\ No newline at end of file
Added: XoopsModules/iplog/trunk/iplog/docs/index.html
===================================================================
--- XoopsModules/iplog/trunk/iplog/docs/index.html (rev 0)
+++ XoopsModules/iplog/trunk/iplog/docs/index.html 2012-07-27 17:37:45 UTC (rev 9930)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/iplog/trunk/iplog/docs/install.txt
===================================================================
--- XoopsModules/iplog/trunk/iplog/docs/install.txt (rev 0)
+++ XoopsModules/iplog/trunk/iplog/docs/install.txt 2012-07-27 17:37:45 UTC (rev 9930)
@@ -0,0 +1,8 @@
+Read Me First
+=============
+
+Please make sure that you download the module from chronolabs to get the latest version, and upload it to your XOOPS Root
+directory from all the content inside the zips htdocs folder.
+
+Install the module as per the system module and then adjust preferences to suit, remember to set your Invoice Broker, Collection
+Officer and other groups accordingly in the groups, this will be created as per your installation.
\ No newline at end of file
Added: XoopsModules/iplog/trunk/iplog/docs/lang_diff.txt
===================================================================
--- XoopsModules/iplog/trunk/iplog/docs/lang_diff.txt (rev 0)
+++ XoopsModules/iplog/trunk/iplog/docs/lang_diff.txt 2012-07-27 17:37:45 UTC (rev 9930)
@@ -0,0 +1,4 @@
+Read Me First
+=============
+
+Please make sure that you download the XOOPS Icon Set, and upload it to uploads/images directory
\ No newline at end of file
Added: XoopsModules/iplog/trunk/iplog/docs/licence.txt
===================================================================
--- XoopsModules/iplog/trunk/iplog/docs/licence.txt (rev 0)
+++ XoopsModules/iplog/trunk/iplog/docs/licence.txt 2012-07-27 17:37:45 UTC (rev 9930)
@@ -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 i...
[truncated message content] |
8 messages has been excluded from this view by a project administrator.
![luciorota.altervista.org/xoops_logo.png";](http://luciorota.altervista.org/xoops_logo.png";){kind=link}
![https://www.paypal.com/fr_FR/i/scr/pixel.gif"](https://www.paypal.com/fr_FR/i/scr/pixel.gif"){kind=link}
![https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif"](https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif"){kind=link}