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: <dj...@us...> - 2012-02-09 20:43:10
|
Revision: 8926
http://xoops.svn.sourceforge.net/xoops/?rev=8926&view=rev
Author: djculex
Date: 2012-02-09 20:43:00 +0000 (Thu, 09 Feb 2012)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/js/smallworld.js
Modified: XoopsModules/smallworld/trunk/smallworld/js/smallworld.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2012-02-09 20:37:51 UTC (rev 8925)
+++ XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2012-02-09 20:43:00 UTC (rev 8926)
@@ -521,7 +521,7 @@
var uname = xoops_smallworld(this).text();
var tempArray = xoops_smallworld(this).attr("href").split("/");
var baseURL = tempArray[0];
- this.href = this.href.replace(oldurl, smallworld_url + "/modules/smallworld/userprofile.php?username="+uname);
+ this.href = this.href.replace(oldurl, smallworld_url + "userprofile.php?username="+uname);
});
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-02-09 20:37:57
|
Revision: 8925
http://xoops.svn.sourceforge.net/xoops/?rev=8925&view=rev
Author: djculex
Date: 2012-02-09 20:37:51 +0000 (Thu, 09 Feb 2012)
Log Message:
-----------
Bugfix: ../js/smallworld.js added smallworld_url (xoops_url) to submit in registration (djculex)
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt
XoopsModules/smallworld/trunk/smallworld/js/smallworld.js
XoopsModules/smallworld/trunk/smallworld/xoops_version.php
Modified: XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt 2012-02-09 20:13:23 UTC (rev 8924)
+++ XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt 2012-02-09 20:37:51 UTC (rev 8925)
@@ -2,8 +2,9 @@
Changelog v.1.11 RC
------------------------------
9. february 2012
-- Bugfix: Takeover links not using XOOPS_URL correct
-- Bugfix: Created function smallworld_getImageSize to test if allow_url_fopen = on else try cUrl else return default for image sizes
+- Bugfix: Takeover links not using XOOPS_URL correct(djculex)
+- Bugfix: Created function smallworld_getImageSize to test if allow_url_fopen = on else try cUrl else return default for image sizes(djculex)
+- Bugfix: ../js/smallworld.js added smallworld_url (xoops_url) to submit in registration (djculex)
------------------------------
Changelog v.1.10 RC
------------------------------
Modified: XoopsModules/smallworld/trunk/smallworld/js/smallworld.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2012-02-09 20:13:23 UTC (rev 8924)
+++ XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2012-02-09 20:37:51 UTC (rev 8925)
@@ -346,7 +346,7 @@
} else {
xoops_smallworld.ajax({
type: "POST",
- url: "submit.php",
+ url: smallworld_url+"submit.php",
data: dataString,
success: function(){
location.href = smallworld_url+'index.php';
Modified: XoopsModules/smallworld/trunk/smallworld/xoops_version.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/xoops_version.php 2012-02-09 20:13:23 UTC (rev 8924)
+++ XoopsModules/smallworld/trunk/smallworld/xoops_version.php 2012-02-09 20:37:51 UTC (rev 8925)
@@ -20,7 +20,7 @@
**/
$modversion['name'] = _MI_SMALLWORLD_MODULE_NAME;
-$modversion['version'] = 1.12;
+$modversion['version'] = 1.13;
$modversion['description'] = _MI_SMALLWORLD_MODULE_DESC;
$modversion['author'] = "Michael Albertsen";
$modversion['nickname'] = 'Culex';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-02-09 20:13:31
|
Revision: 8924
http://xoops.svn.sourceforge.net/xoops/?rev=8924&view=rev
Author: djculex
Date: 2012-02-09 20:13:23 +0000 (Thu, 09 Feb 2012)
Log Message:
-----------
- Bugfix: Created function smallworld_getImageSize to test if allow_url_fopen = on else try cUrl else return default for image sizes
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/admin/div_useradmin.php
XoopsModules/smallworld/trunk/smallworld/admin/main.php
XoopsModules/smallworld/trunk/smallworld/admin/useradmin.php
XoopsModules/smallworld/trunk/smallworld/class/profile.php
XoopsModules/smallworld/trunk/smallworld/comment_ajax.php
XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt
XoopsModules/smallworld/trunk/smallworld/friends.php
XoopsModules/smallworld/trunk/smallworld/index.php
XoopsModules/smallworld/trunk/smallworld/loadmore.php
XoopsModules/smallworld/trunk/smallworld/message_ajax.php
XoopsModules/smallworld/trunk/smallworld/permalink.php
XoopsModules/smallworld/trunk/smallworld/smallworldshare.php
XoopsModules/smallworld/trunk/smallworld/userprofile.php
XoopsModules/smallworld/trunk/smallworld/xoops_version.php
Modified: XoopsModules/smallworld/trunk/smallworld/admin/div_useradmin.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/admin/div_useradmin.php 2012-02-09 08:58:54 UTC (rev 8923)
+++ XoopsModules/smallworld/trunk/smallworld/admin/div_useradmin.php 2012-02-09 20:13:23 UTC (rev 8924)
@@ -36,7 +36,7 @@
$ai['username'] = $data['username'];
$ai['realname'] = $data['realname'];
$ai['userimage'] = smallworld_getAvatarLink ($data['userid'],$data['userimage']);
- $ai['avatar_size'] = getimagesize($ai['userimage']);
+ $ai['avatar_size'] = smallworld_getImageSize(80, 100, $ai['userimage']);
$ai['avatar_highwide'] = smallworld_imageResize($ai['avatar_size'][0], $ai['avatar_size'][1], 50);
$ai['ip'] = $data['ip'];
$ai['complaint'] = $data['complaint'];
@@ -56,7 +56,7 @@
$ani['username'] = $data['username'];
$ani['realname'] = $data['realname'];
$ani['userimage'] = smallworld_getAvatarLink ($data['userid'],$data['userimage']);
- $ani['avatar_size'] = getimagesize($ani['userimage']);
+ $ani['avatar_size'] = smallworld_getImageSize(80, 100, $ani['userimage']);
$ani['avatar_highwide'] = smallworld_imageResize($ani['avatar_size'][0], $ani['avatar_size'][1], 50);
$ani['ip'] = $data['ip'];
$ani['complaint'] = $data['complaint'];
Modified: XoopsModules/smallworld/trunk/smallworld/admin/main.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/admin/main.php 2012-02-09 08:58:54 UTC (rev 8923)
+++ XoopsModules/smallworld/trunk/smallworld/admin/main.php 2012-02-09 20:13:23 UTC (rev 8924)
@@ -74,7 +74,7 @@
$ai['username'] = $data['username'];
$ai['realname'] = $data['realname'];
$ai['userimage'] = smallworld_getAvatarLink ($data['userid'],$data['userimage']);
- $ai['avatar_size'] = getimagesize($ai['userimage']);
+ $ai['avatar_size'] = smallworld_getImageSize(80, 100, $ai['userimage']);
$ai['avatar_highwide'] = smallworld_imageResize($ai['avatar_size'][0], $ai['avatar_size'][1], 50);
$ai['ip'] = $data['ip'];
$ai['complaint'] = $data['complaint'];
@@ -94,7 +94,7 @@
$ani['username'] = $data['username'];
$ani['realname'] = $data['realname'];
$ani['userimage'] = smallworld_getAvatarLink ($data['userid'],$data['userimage']);
- $ani['avatar_size'] = getimagesize($ani['userimage']);
+ $ani['avatar_size'] = smallworld_getImageSize(80, 100, $ani['userimage']);
$ani['avatar_highwide'] = smallworld_imageResize($ani['avatar_size'][0], $ani['avatar_size'][1], 50);
$ani['ip'] = $data['ip'];
$ani['complaint'] = $data['complaint'];
Modified: XoopsModules/smallworld/trunk/smallworld/admin/useradmin.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/admin/useradmin.php 2012-02-09 08:58:54 UTC (rev 8923)
+++ XoopsModules/smallworld/trunk/smallworld/admin/useradmin.php 2012-02-09 20:13:23 UTC (rev 8924)
@@ -44,7 +44,7 @@
$ai['username'] = $data['username'];
$ai['realname'] = $data['realname'];
$ai['userimage'] = smallworld_getAvatarLink ($data['userid'],$data['userimage']);
- $ai['avatar_size'] = getimagesize($ai['userimage']);
+ $ai['avatar_size'] = smallworld_getImageSize(80, 100, $ai['userimage']);
$ai['avatar_highwide'] = smallworld_imageResize($ai['avatar_size'][0], $ai['avatar_size'][1], 50);
$ai['ip'] = $data['ip'];
$ai['complaint'] = $data['complaint'];
@@ -64,7 +64,7 @@
$ani['username'] = $data['username'];
$ani['realname'] = $data['realname'];
$ani['userimage'] = smallworld_getAvatarLink ($data['userid'],$data['userimage']);
- $ani['avatar_size'] = getimagesize($ani['userimage']);
+ $ani['avatar_size'] = smallworld_getImageSize(80, 100, $ani['userimage']);
$ani['avatar_highwide'] = smallworld_imageResize($ani['avatar_size'][0], $ani['avatar_size'][1], 50);
$ani['ip'] = $data['ip'];
$ani['complaint'] = $data['complaint'];
Modified: XoopsModules/smallworld/trunk/smallworld/class/profile.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/class/profile.php 2012-02-09 08:58:54 UTC (rev 8923)
+++ XoopsModules/smallworld/trunk/smallworld/class/profile.php 2012-02-09 20:13:23 UTC (rev 8924)
@@ -84,7 +84,7 @@
$hisorher = _SMALLWORLD_HISHER;
}
$avatar = $Wall->Gravatar($id);
- $avatar_size = getimagesize(smallworld_getAvatarLink($id, $avatar));
+ $avatar_size = smallworld_getImageSize(80, 100, smallworld_getAvatarLink($id, $avatar));
$avatar_highwide = smallworld_imageResize($avatar_size[0], $avatar_size[1], 100);
$user_img = "<img src='".smallworld_getAvatarLink($id, $avatar)."' id='smallworld_user_img' ".$avatar_highwide."/></img>";
Modified: XoopsModules/smallworld/trunk/smallworld/comment_ajax.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/comment_ajax.php 2012-02-09 08:58:54 UTC (rev 8923)
+++ XoopsModules/smallworld/trunk/smallworld/comment_ajax.php 2012-02-09 20:13:23 UTC (rev 8924)
@@ -59,7 +59,7 @@
$wc['myavatar_link']= $myavatarlink;
$wc['cface'] = $Wall->Gravatar($data['uid_fk']);
$wc['avatar_link'] = smallworld_getAvatarLink ($data['uid_fk'], $wc['cface']);
- $wc['avatar_size'] = getimagesize($wc['myavatar_link']);
+ $wc['avatar_size'] = smallworld_getImageSize(80, 100, $wc['myavatar_link']);
$wc['avatar_highwide'] = smallworld_imageResize($wc['avatar_size'][0], $wc['avatar_size'][1], 35);
$wc['compl_msg_lnk'] = "<a href='".XOOPS_URL."/modules/smallworld/permalink.php?ownerid=".Smallworld_getOwnerFromComment($cdata['msg_id_fk']);
$wc['compl_msg_lnk'] .= "&updid=".$cdata['msg_id_fk']."#".$cdata['com_id']."'>"._SMALLWORLD_COMP_MSG_LNK_DESC."</a>";
Modified: XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt 2012-02-09 08:58:54 UTC (rev 8923)
+++ XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt 2012-02-09 20:13:23 UTC (rev 8924)
@@ -3,7 +3,7 @@
------------------------------
9. february 2012
- Bugfix: Takeover links not using XOOPS_URL correct
-
+- Bugfix: Created function smallworld_getImageSize to test if allow_url_fopen = on else try cUrl else return default for image sizes
------------------------------
Changelog v.1.10 RC
------------------------------
Modified: XoopsModules/smallworld/trunk/smallworld/friends.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/friends.php 2012-02-09 08:58:54 UTC (rev 8923)
+++ XoopsModules/smallworld/trunk/smallworld/friends.php 2012-02-09 20:13:23 UTC (rev 8924)
@@ -118,7 +118,7 @@
$fp['friendname'] = Smallworld_getName($data['you']);
$fp['avatar'] = $Wall->Gravatar($data['you']);
$fp['avatar_link'] = smallworld_getAvatarLink ($data['you'], $fp['avatar']);
- $fp['avatar_size'] = getimagesize($fp['avatar_link']);
+ $fp['avatar_size'] = smallworld_getImageSize(80, 100, $fp['avatar_link']);
$fp['avatar_highwide'] = smallworld_imageResize($fp['avatar_size'][0], $fp['avatar_size'][1], 50);
$xoopsTpl->append('pendingfriends', $fp);
}
@@ -132,7 +132,7 @@
$ff['friendname'] = Smallworld_getName($data['you']);
$ff['avatar'] = $Wall->Gravatar($data['you']);
$ff['avatar_link'] = smallworld_getAvatarLink ($data['you'], $ff['avatar']);
- $ff['avatar_size'] = getimagesize($ff['avatar_link']);
+ $ff['avatar_size'] = smallworld_getImageSize(80, 100, $ff['avatar_link']);
$ff['avatar_highwide'] = smallworld_imageResize($ff['avatar_size'][0], $ff['avatar_size'][1], 50);
$xoopsTpl->append('verifiedfriends', $ff);
}
@@ -146,7 +146,7 @@
$fy['friendname'] = Smallworld_getName($data['you']);
$fy['avatar'] = $Wall->Gravatar($data['you']);
$fy['avatar_link'] = smallworld_getAvatarLink ($data['you'], $fy['avatar']);
- $fy['avatar_size'] = getimagesize($fy['avatar_link']);
+ $fy['avatar_size'] = smallworld_getImageSize(80, 100, $fy['avatar_link']);
$fy['avatar_highwide'] = smallworld_imageResize($fy['avatar_size'][0], $fy['avatar_size'][1], 50);
$xoopsTpl->append('followingyou', $fy);
}
@@ -160,7 +160,7 @@
$fm['friendname'] = Smallworld_getName($data['me']);
$fm['avatar'] = $Wall->Gravatar($data['me']);
$fm['avatar_link'] = smallworld_getAvatarLink ($data['me'], $fm['avatar']);
- $fm['avatar_size'] = getimagesize($fm['avatar_link']);
+ $fm['avatar_size'] = smallworld_getImageSize(80, 100, $fm['avatar_link']);
$fm['avatar_highwide'] = smallworld_imageResize($fm['avatar_size'][0], $fm['avatar_size'][1], 50);
$xoopsTpl->append('followingme', $fm);
}
Modified: XoopsModules/smallworld/trunk/smallworld/index.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/index.php 2012-02-09 08:58:54 UTC (rev 8923)
+++ XoopsModules/smallworld/trunk/smallworld/index.php 2012-02-09 20:13:23 UTC (rev 8924)
@@ -58,7 +58,7 @@
$Wall = new Wall_Updates();
$myavatar = $Wall->Gravatar($id);
$myavatarlink = smallworld_getAvatarLink($id, $myavatar);
- $myavatar_size = getimagesize($myavatarlink);
+ $myavatar_size = smallworld_getImageSize(80, 100, $myavatarlink);
$myavatar_highwide = smallworld_imageResize($myavatar_size[0], $myavatar_size[1], 35);
//Get friends invitations
@@ -81,7 +81,7 @@
$wm['priv'] = $data['priv'];
$wm['avatar'] = $Wall->Gravatar($data['uid_fk']);
$wm['avatar_link'] = smallworld_getAvatarLink ($data['uid_fk'], $wm['avatar']);
- $wm['avatar_size'] = getimagesize($wm['avatar_link']);
+ $wm['avatar_size'] = smallworld_getImageSize(80, 100, $wm['avatar_link']);
$wm['avatar_highwide'] = smallworld_imageResize($wm['avatar_size'][0], $wm['avatar_size'][1], 50);
$wm['vote_up'] = $Wall->countVotes ('msg', 'up', $data['msg_id']);
$wm['vote_down'] = $Wall->countVotes ('msg', 'down', $data['msg_id']);
@@ -105,7 +105,7 @@
$wc['uid'] = $cdata['uid_fk'];
$wc['myavatar'] = $Wall->Gravatar($id);
$wc['myavatar_link'] = $myavatarlink;
- $wc['avatar_size'] = getimagesize($wc['myavatar_link']);
+ $wc['avatar_size'] = smallworld_getImageSize(80, 100, $wc['myavatar_link']);
$wc['avatar_highwide'] = smallworld_imageResize($wc['avatar_size'][0], $wc['avatar_size'][1], 35);
$wc['cface'] = $Wall->Gravatar($cdata['uid_fk']);
$wc['avatar_link'] = smallworld_getAvatarLink ($cdata['uid_fk'], $wc['cface']);
Modified: XoopsModules/smallworld/trunk/smallworld/loadmore.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/loadmore.php 2012-02-09 08:58:54 UTC (rev 8923)
+++ XoopsModules/smallworld/trunk/smallworld/loadmore.php 2012-02-09 20:13:23 UTC (rev 8924)
@@ -69,7 +69,7 @@
$wm['priv'] = $data['priv'];
$wm['avatar'] = $Wall->Gravatar($data['uid_fk']);
$wm['avatar_link'] = smallworld_getAvatarLink ($data['uid_fk'], $wm['avatar']);
- $wm['avatar_size'] = getimagesize($wm['avatar_link']);
+ $wm['avatar_size'] = smallworld_getImageSize(80, 100, $wm['avatar_link']);
$wm['avatar_highwide'] = smallworld_imageResize($wm['avatar_size'][0], $wm['avatar_size'][1], 50);
$wm['compl_msg_lnk'] = "<a href='".XOOPS_URL."/modules/smallworld/permalink.php?ownerid=".$data['uid_fk'];
$wm['compl_msg_lnk'] .= "&updid=".$data['msg_id']."'>"._SMALLWORLD_COMP_MSG_LNK_DESC."</a>";
@@ -95,7 +95,7 @@
$wc['uid'] = $cdata['uid_fk'];
$wc['myavatar'] = $myavatar;
$wc['myavatar_link']= $myavatarlink;
- $wc['avatar_size'] = getimagesize($wc['myavatar_link']);
+ $wc['avatar_size'] = smallworld_getImageSize(80, 100, $wc['myavatar_link']);
$wc['avatar_highwide'] = smallworld_imageResize($wc['avatar_size'][0], $wc['avatar_size'][1], 35);
$wc['cface'] = $Wall->Gravatar($cdata['uid_fk']);
$wc['avatar_link'] = smallworld_getAvatarLink ($cdata['uid_fk'], $wc['cface']);
Modified: XoopsModules/smallworld/trunk/smallworld/message_ajax.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/message_ajax.php 2012-02-09 08:58:54 UTC (rev 8923)
+++ XoopsModules/smallworld/trunk/smallworld/message_ajax.php 2012-02-09 20:13:23 UTC (rev 8924)
@@ -46,7 +46,7 @@
$myavatar = $Wall->Gravatar($id);
$myavatarlink = smallworld_getAvatarLink($id, $myavatar);
- $myavatar_size = getimagesize($myavatarlink);
+ $myavatar_size = smallworld_getImageSize(80, 100, $myavatarlink);
$myavatar_highwide = smallworld_imageResize($myavatar_size[0], $myavatar_size[1], 35);
@@ -64,7 +64,7 @@
$wm['priv'] = $data['priv'];
$wm['avatar'] = $Wall->Gravatar($data['uid_fk']);
$wm['avatar_link'] = smallworld_getAvatarLink ($data['uid_fk'], $wm['avatar']);
- $wm['avatar_size'] = getimagesize($wm['avatar_link']);
+ $wm['avatar_size'] = smallworld_getImageSize(80, 100, $wm['avatar_link']);
$wm['avatar_highwide'] = smallworld_imageResize($wm['avatar_size'][0], $wm['avatar_size'][1], 50);
$wm['compl_msg_lnk'] = "<a href='".XOOPS_URL."/modules/smallworld/permalink.php?ownerid=".$data['uid_fk'];
$wm['compl_msg_lnk'] .= "&updid=".$data['msg_id']."'>"._SMALLWORLD_COMP_MSG_LNK_DESC."</a>";
@@ -90,7 +90,7 @@
$wc['uid'] = $cdata['uid_fk'];
$wc['myavatar'] = $myavatar;
$wc['myavatar_link']= $myavatarlink;
- $wc['avatar_size'] = getimagesize($wc['myavatar_link']);
+ $wc['avatar_size'] = smallworld_getImageSize(80, 100, $wc['myavatar_link']);
$wc['avatar_highwide'] = smallworld_imageResize($wc['avatar_size'][0], $wc['avatar_size'][1], 35);
$wc['cface'] = $Wall->Gravatar($cdata['uid_fk']);
$wc['avatar_link'] = smallworld_getAvatarLink ($cdata['uid_fk'], $wc['cface']);
Modified: XoopsModules/smallworld/trunk/smallworld/permalink.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/permalink.php 2012-02-09 08:58:54 UTC (rev 8923)
+++ XoopsModules/smallworld/trunk/smallworld/permalink.php 2012-02-09 20:13:23 UTC (rev 8924)
@@ -56,7 +56,7 @@
$Wall = new Wall_Updates();
$myavatar = $Wall->Gravatar($id);
$myavatarlink = smallworld_getAvatarLink($id, $myavatar);
- $myavatar_size = getimagesize($myavatarlink);
+ $myavatar_size = smallworld_getImageSize(80, 100, $myavatarlink);
$myavatar_highwide = smallworld_imageResize($myavatar_size[0], $myavatar_size[1], 35);
// Follow array here
@@ -76,7 +76,7 @@
$wm['priv'] = $data['priv'];
$wm['avatar'] = $Wall->Gravatar($data['uid_fk']);
$wm['avatar_link'] = smallworld_getAvatarLink ($data['uid_fk'], $wm['avatar']);
- $wm['avatar_size'] = getimagesize($wm['avatar_link']);
+ $wm['avatar_size'] = smallworld_getImageSize(80, 100, $wm['avatar_link']);
$wm['avatar_highwide'] = smallworld_imageResize($wm['avatar_size'][0], $wm['avatar_size'][1], 50);
$wm['vote_up'] = $Wall->countVotes ('msg', 'up', $data['msg_id']);
$wm['vote_down'] = $Wall->countVotes ('msg', 'down', $data['msg_id']);
@@ -98,7 +98,7 @@
$wc['uid'] = $cdata['uid_fk'];
$wc['myavatar'] = $Wall->Gravatar($id);
$wc['myavatar_link'] = $myavatarlink;
- $wc['avatar_size'] = getimagesize($wc['myavatar_link']);
+ $wc['avatar_size'] = smallworld_getImageSize(80, 100, $wc['myavatar_link']);
$wc['avatar_highwide'] = smallworld_imageResize($wc['avatar_size'][0], $wc['avatar_size'][1], 35);
$wc['cface'] = $Wall->Gravatar($cdata['uid_fk']);
$wc['avatar_link'] = smallworld_getAvatarLink ($cdata['uid_fk'], $wc['cface']);
Modified: XoopsModules/smallworld/trunk/smallworld/smallworldshare.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/smallworldshare.php 2012-02-09 08:58:54 UTC (rev 8923)
+++ XoopsModules/smallworld/trunk/smallworld/smallworldshare.php 2012-02-09 20:13:23 UTC (rev 8924)
@@ -54,7 +54,7 @@
} else {
$wm['avatar_link'] = smallworld_getAvatarLink ($data['uid_fk'],$wm['avatar']);
}
- $wm['avatar_size'] = getimagesize($wm['avatar_link']);
+ $wm['avatar_size'] = smallworld_getImageSize(80, 100, $wm['avatar_link']);
$wm['avatar_highwide'] = smallworld_imageResize($wm['avatar_size'][0], $wm['avatar_size'][1], 50);
$wm['usernameTitle'] = $wm['username']._SMALLWORLD_UPDATEONSITEMETA.$xoopsConfig['sitename'];
$xoopsTpl->assign('xoops_pagetitle', $wm['usernameTitle']);
@@ -74,7 +74,7 @@
$wm['priv'] = 1;
$wm['avatar'] = "";
$wm['avatar_link'] = XOOPS_URL.'/modules/smallworld/images/smallworld.png';
- $wm['avatar_size'] = getimagesize($wm['avatar_link']);
+ $wm['avatar_size'] = smallworld_getImageSize(80, 100, $wm['avatar_link']);
$wm['avatar_highwide'] = smallworld_imageResize($wm['avatar_size'][0], $wm['avatar_size'][1], 50);
$wm['usernameTitle'] = $wm['username']._SMALLWORLD_UPDATEONSITEMETA.$xoopsConfig['sitename'];
$xoopsTpl->assign('xoops_pagetitle', $wm['usernameTitle']);
Modified: XoopsModules/smallworld/trunk/smallworld/userprofile.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/userprofile.php 2012-02-09 08:58:54 UTC (rev 8923)
+++ XoopsModules/smallworld/trunk/smallworld/userprofile.php 2012-02-09 20:13:23 UTC (rev 8924)
@@ -95,12 +95,12 @@
$Wall = new Wall_Updates();
$myavatar = $Wall->Gravatar($id); //profile owners data
$myavatarlink = smallworld_getAvatarLink($id, $myavatar); //profile owners data
- $myavatar_size = getimagesize($myavatarlink);
+ $myavatar_size = smallworld_getImageSize(80, 100, $myavatarlink);
$myavatar_highwide = smallworld_imageResize($myavatar_size[0], $myavatar_size[1], 35);
$visitorAvatar = $Wall->Gravatar($yourid);
$visitorAvatarlink = smallworld_getAvatarLink($yourid, $visitorAvatar);
- $visitorAvatar_size = getimagesize($visitorAvatarlink);
+ $visitorAvatar_size = smallworld_getImageSize(80, 100, $visitorAvatarlink);
$visitorAvatar_highwide = smallworld_imageResize($visitorAvatar_size[0], $visitorAvatar_size[1], 35);
// Follow array here
@@ -119,7 +119,7 @@
$wm['priv'] = $data['priv'];
$wm['avatar'] = $Wall->Gravatar($data['uid_fk']);
$wm['avatar_link'] = smallworld_getAvatarLink ($data['uid_fk'], $wm['avatar']);
- $wm['avatar_size'] = getimagesize($wm['avatar_link']);
+ $wm['avatar_size'] = smallworld_getImageSize(80, 100, $wm['avatar_link']);
$wm['avatar_highwide'] = smallworld_imageResize($wm['avatar_size'][0], $wm['avatar_size'][1], 50);
$wm['compl_msg_lnk'] = "<a href='".XOOPS_URL."/modules/smallworld/permalink.php?ownerid=".$data['uid_fk'];
$wm['compl_msg_lnk'] .= "&updid=".$data['msg_id']."'>"._SMALLWORLD_COMP_MSG_LNK_DESC."</a>";
@@ -144,7 +144,7 @@
$wc['uid'] = $cdata['uid_fk'];
$wc['myavatar'] = $myavatar;
$wc['myavatar_link']= $myavatarlink;
- $wc['avatar_size'] = getimagesize($wc['myavatar_link']);
+ $wc['avatar_size'] = smallworld_getImageSize(80, 100, $wc['myavatar_link']);
$wc['avatar_highwide'] = smallworld_imageResize($wc['avatar_size'][0], $wc['avatar_size'][1], 35);
$wc['cface'] = $Wall->Gravatar($cdata['uid_fk']);
$wc['avatar_link'] = smallworld_getAvatarLink($cdata['uid_fk'],$wc['cface']);
Modified: XoopsModules/smallworld/trunk/smallworld/xoops_version.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/xoops_version.php 2012-02-09 08:58:54 UTC (rev 8923)
+++ XoopsModules/smallworld/trunk/smallworld/xoops_version.php 2012-02-09 20:13:23 UTC (rev 8924)
@@ -20,7 +20,7 @@
**/
$modversion['name'] = _MI_SMALLWORLD_MODULE_NAME;
-$modversion['version'] = 1.11;
+$modversion['version'] = 1.12;
$modversion['description'] = _MI_SMALLWORLD_MODULE_DESC;
$modversion['author'] = "Michael Albertsen";
$modversion['nickname'] = 'Culex';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-02-09 08:59:05
|
Revision: 8923
http://xoops.svn.sourceforge.net/xoops/?rev=8923&view=rev
Author: beckmi
Date: 2012-02-09 08:58:54 +0000 (Thu, 09 Feb 2012)
Log Message:
-----------
Removing duplicate language constants
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php
Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php 2012-02-09 05:50:13 UTC (rev 8922)
+++ XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php 2012-02-09 08:58:54 UTC (rev 8923)
@@ -62,10 +62,8 @@
define("_MI_IMAGELIB_DESC", "Select which Image library to use for creating Thumbnails. Leave AUTO for automatic choice.");
define("_MI_MAX_IMG_WIDTH", "Maximum Image Width");
define("_MI_MAX_IMG_WIDTH_DESC", "Sets the maximum allowed <strong>Width</strong> size of an uploaded image otherwise thumbnail will be used. <br >Input 0 if you do not want to create thumbnails.");
-define("_MI_MAX_IMAGE_WIDTH", "Maximum Image Width for creating thumbnail");
+define("_MI_MAX_IMAGE_WIDTH", "Maximum Image Width for thumbnail generation");
define("_MI_MAX_IMAGE_WIDTH_DESC", "Sets the maximum width of an uploaded image to create thumbnail. <br >Image with width larger than the value will not use thumbnail.");
-define("_MI_MAX_IMAGE_WIDTH","Maximum width of an image for the generation of a thumbnail");
-define("_MI_MAX_IMAGE_WIDTH_DESC", "Sets the maximum width of an uploaded image, from which a thumbnail is generated.");
define("_MI_MAX_IMAGE_HEIGHT", "Maximum Image Height for creating thumbnail");
define("_MI_MAX_IMAGE_HEIGHT_DESC", "Sets the maximum height of an uploaded image to create thumbnail. <br >Image with height larger than the value will not use thumbnail.");
define("_MI_SHOW_DIS", "Show Disclaimer On");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-02-09 05:50:20
|
Revision: 8922
http://xoops.svn.sourceforge.net/xoops/?rev=8922&view=rev
Author: djculex
Date: 2012-02-09 05:50:13 +0000 (Thu, 09 Feb 2012)
Log Message:
-----------
Bugfix: Takeover links not using XOOPS_URL correct
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt
XoopsModules/smallworld/trunk/smallworld/js/smallworld.js
XoopsModules/smallworld/trunk/smallworld/xoops_version.php
Modified: XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt 2012-02-08 23:13:48 UTC (rev 8921)
+++ XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt 2012-02-09 05:50:13 UTC (rev 8922)
@@ -1,4 +1,10 @@
------------------------------
+Changelog v.1.11 RC
+------------------------------
+9. february 2012
+- Bugfix: Takeover links not using XOOPS_URL correct
+
+------------------------------
Changelog v.1.10 RC
------------------------------
Modified: XoopsModules/smallworld/trunk/smallworld/js/smallworld.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2012-02-08 23:13:48 UTC (rev 8921)
+++ XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2012-02-09 05:50:13 UTC (rev 8922)
@@ -521,7 +521,7 @@
var uname = xoops_smallworld(this).text();
var tempArray = xoops_smallworld(this).attr("href").split("/");
var baseURL = tempArray[0];
- this.href = this.href.replace(oldurl, "/modules/smallworld/userprofile.php?username="+uname);
+ this.href = this.href.replace(oldurl, smallworld_url + "/modules/smallworld/userprofile.php?username="+uname);
});
}
Modified: XoopsModules/smallworld/trunk/smallworld/xoops_version.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/xoops_version.php 2012-02-08 23:13:48 UTC (rev 8921)
+++ XoopsModules/smallworld/trunk/smallworld/xoops_version.php 2012-02-09 05:50:13 UTC (rev 8922)
@@ -20,7 +20,7 @@
**/
$modversion['name'] = _MI_SMALLWORLD_MODULE_NAME;
-$modversion['version'] = 1.10;
+$modversion['version'] = 1.11;
$modversion['description'] = _MI_SMALLWORLD_MODULE_DESC;
$modversion['author'] = "Michael Albertsen";
$modversion['nickname'] = 'Culex';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-02-08 23:13:54
|
Revision: 8921
http://xoops.svn.sourceforge.net/xoops/?rev=8921&view=rev
Author: djculex
Date: 2012-02-08 23:13:48 +0000 (Wed, 08 Feb 2012)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/language/danish/main.php
Modified: XoopsModules/smallworld/trunk/smallworld/language/danish/main.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/danish/main.php 2012-02-08 23:12:10 UTC (rev 8920)
+++ XoopsModules/smallworld/trunk/smallworld/language/danish/main.php 2012-02-08 23:13:48 UTC (rev 8921)
@@ -334,7 +334,7 @@
/* -------------------- Venner siden --------------- */
define ("_SMALLWORLD_FRIENDPAGE", "Venner");
define ("_SMALLWORLD_PENDINGUSERS", " venter accept fra disse brugere");
-define ("_SMALLWORLD_ALREADYFRIENDS", " s venner");
+define ("_SMALLWORLD_ALREADYFRIENDS", "s venner");
define ("_SMALLWORLD_YOUFOLLOW", " følger disse brugere");
define ("_SMALLWORLD_FOLLOWINGYOU", "Disse brugere følger ");
define ("_SMALLWORLD_NOUSERS", "ingen brugere i denne kategori");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-02-08 23:12:16
|
Revision: 8920
http://xoops.svn.sourceforge.net/xoops/?rev=8920&view=rev
Author: djculex
Date: 2012-02-08 23:12:10 +0000 (Wed, 08 Feb 2012)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/language/danish/main.php
Modified: XoopsModules/smallworld/trunk/smallworld/language/danish/main.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/danish/main.php 2012-02-08 23:05:04 UTC (rev 8919)
+++ XoopsModules/smallworld/trunk/smallworld/language/danish/main.php 2012-02-08 23:12:10 UTC (rev 8920)
@@ -333,9 +333,9 @@
/* -------------------- Venner siden --------------- */
define ("_SMALLWORLD_FRIENDPAGE", "Venner");
-define ("_SMALLWORLD_PENDINGUSERS", "venter accept fra disse brugere");
-define ("_SMALLWORLD_ALREADYFRIENDS", "s venner");
-define ("_SMALLWORLD_YOUFOLLOW", "følger disse brugere");
+define ("_SMALLWORLD_PENDINGUSERS", " venter accept fra disse brugere");
+define ("_SMALLWORLD_ALREADYFRIENDS", " s venner");
+define ("_SMALLWORLD_YOUFOLLOW", " følger disse brugere");
define ("_SMALLWORLD_FOLLOWINGYOU", "Disse brugere følger ");
define ("_SMALLWORLD_NOUSERS", "ingen brugere i denne kategori");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-02-08 23:05:13
|
Revision: 8919
http://xoops.svn.sourceforge.net/xoops/?rev=8919&view=rev
Author: djculex
Date: 2012-02-08 23:05:04 +0000 (Wed, 08 Feb 2012)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/docs/credits.txt
Modified: XoopsModules/smallworld/trunk/smallworld/docs/credits.txt
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/docs/credits.txt 2012-02-08 22:56:12 UTC (rev 8918)
+++ XoopsModules/smallworld/trunk/smallworld/docs/credits.txt 2012-02-08 23:05:04 UTC (rev 8919)
@@ -4,7 +4,7 @@
Development first aid for keeping ready for blue move by Mamba
-Testing and feedback especially by Mariane & Mamba
+Testing and feedback especially by Mariane, Pavlina & Mamba
Credit also to original plugins that I have moderated to fix this project
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-02-08 22:56:18
|
Revision: 8918
http://xoops.svn.sourceforge.net/xoops/?rev=8918&view=rev
Author: djculex
Date: 2012-02-08 22:56:12 +0000 (Wed, 08 Feb 2012)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/xoops_version.php
Modified: XoopsModules/smallworld/trunk/smallworld/xoops_version.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/xoops_version.php 2012-02-08 21:57:29 UTC (rev 8917)
+++ XoopsModules/smallworld/trunk/smallworld/xoops_version.php 2012-02-08 22:56:12 UTC (rev 8918)
@@ -125,14 +125,6 @@
$modversion['config'][$i]['default'] = 5;
$i++;
-$modversion['config'][$i]['name'] = 'msgtoshow';
-$modversion['config'][$i]['title'] = '_MI_SMALLWORLD_MSGTOSHOW';
-$modversion['config'][$i]['description'] = '_MI_SMALLWORLD_MSGTOSHOW_DESC';
-$modversion['config'][$i]['formtype'] = 'textbox';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 5;
-
-$i++;
$modversion['config'][$i]['name'] = 'validationstrenght';
$modversion['config'][$i]['title'] = '_MI_SMALLWORLD_VALIDATIONSTRENGHT';
$modversion['config'][$i]['description'] = '_MI_SMALLWORLD_VALIDATIONSTRENGHT_DESC';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-02-08 21:57:36
|
Revision: 8917
http://xoops.svn.sourceforge.net/xoops/?rev=8917&view=rev
Author: djculex
Date: 2012-02-08 21:57:29 +0000 (Wed, 08 Feb 2012)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt
XoopsModules/smallworld/trunk/smallworld/docs/credits.txt
XoopsModules/smallworld/trunk/smallworld/docs/lang_diff.txt
Modified: XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt 2012-02-08 21:06:23 UTC (rev 8916)
+++ XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt 2012-02-08 21:57:29 UTC (rev 8917)
@@ -1,7 +1,108 @@
-Changelog
+------------------------------
+Changelog v.1.10 RC
+------------------------------
--------------
-v.1.00
--------------
-- Converted to XOOPS 2.5.x GUI (Mamba)
-- Original development: (Culex)
\ No newline at end of file
+8. februar 2012
+- Added links for localization in countdown and goggle maps api (djculex)
+- Danish language files (djculex)
+
+2. februar 2012
+- BUG: User website not added to form (djculex)
+- BUG: Ie adding horizontal scroll to colorbox when not needed (Yeeeeahh IE) (djculex)
+
+31. januar 2012
+- Return only year in education & job fields (djculex)
+- Adjusted css for Crome, Opera, IE and FF (djculex)
+
+30. januar 2012
+- visitor avatar resize missing in a few files (djculex)
+- function to resize avatar proportionally (djculex)
+- Adjusted some css (djculex)
+- attached colorbox to all avatars & update images (djculex)
+- Some missing Js includes (djculex)
+- some missing language defines(djculex)
+
+29. januar 2012
+- Streamlining User Admin GUI (beckmi)
+
+26. januar 2012
+- Renaming and prefixing functions (djculex)
+- show only "show more in profile" if any fields to show (djculex)
+- Show fields allowed by admin in profile (djculex)
+- Added language define if all fields are disabled (djculex)
+- Check for send email is configured to 'no' else send mail (djculex)
+- change $modversion name due to name too long for mysql thus being cut short (djculex)
+
+25. januar 2012
+- Implimenting colorbox instead of jquery dialog(); (djculex)
+- Correction in stats() function to show correct user avatar (djculex)
+- Css adjustments (djculex)
+- Re-attach validate to colorbox forms (djculex)
+
+24. januar 2012
+- Trolls stole code changes... bringing back verification php array to javascript array (djculex)
+- fixing cURL problem in adminclass.php (beckmi)
+- code clean-up (beckmi)
+
+23. januar 2012
+- Function set to transform image urls to <img> in wall posting (djculex)
+- Bugfix: return empty array for function mostactiveusers_allround istead of string (djculex)
+- Bugfix: removed redundant containers in function doCheckUpdate() (djculex)
+
+23. januar 2012
+- bugfix: wrong count array (djculex)
+- Bugfix: Friendinvite.php return array insted of string in following_or function (djculex)
+
+22. januar 2012
+- Found a nice function to retrieve remote content (djculex)
+- will attempt to use the fopen method first, then curl, then socket (djculex)
+
+------------------------------
+Changelog v.1.00 RC
+------------------------------
+
+21. januar 2012
+- Moving ModuleInfo to Index Tab (Mamba)
+
+20. januar 2012
+- Admin changes + applying statistics on index.php page thus deleting statistics.php (djculex)
+
+18. januar 2012
+- converting to ModuleAdmin (Mamba)
+- removing hard-coded links (Mamba)
+- fixing translations (Mamba)
+- Adjusting folder structure (Mamba)
+- Adjusting folder structure (Mamba)
+
+16. januar 2012
+- Admin descide fields to use assigned on edit_profile (djculex)
+- Added usefields and useverification on fields to initial load (djculex)
+- Enable user to change his profile while under inspection by admin (djculex)
+- Select multi fields for configs (djculex)
+
+15. januar 2012
+- avoid distorded resizing in picture gallery (djculex)
+
+11. januar 2012
+- rename xoops_smallworldadmin to $ to avoid jquery conflict (djculex)
+
+28. december 2011
+- Fix: visitor avatar not showing correct when commenting in userprofile.php (djculex)
+- adjusted for IE (djculex)
+- css adjustments for IE (suprice suprice) (djculex)
+- Css for IE not showing ok. ajusted a few places (djculex)
+- adjusting functions to show best best & rated users (djculex)
+- fix: searchbox css wrong position in IE (djculex)
+- Fixed oembed giving permission denied using bandcamp (djculex)
+
+27. december 2011
+- modal avatar show on image click (djculex)
+
+26. december 2011
+- Hide upload image input button on successfull upload (djculex)
+
+24. december 2011
+- Full opload of smallworld 1.0 for beta testing. (djculex)
+
+??. Marts 2011
+- Starting development on Smallworld (slowly slowly) (Culex)
\ No newline at end of file
Modified: XoopsModules/smallworld/trunk/smallworld/docs/credits.txt
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/docs/credits.txt 2012-02-08 21:06:23 UTC (rev 8916)
+++ XoopsModules/smallworld/trunk/smallworld/docs/credits.txt 2012-02-08 21:57:29 UTC (rev 8917)
@@ -1,4 +1,16 @@
Credits
===============
+Originally developed by Michael Albertsen (http://culex.dk) <cu...@cu...>
-Originally developed by Michael Albertsen (http://culex.dk) <cu...@cu...>
+Development first aid for keeping ready for blue move by Mamba
+
+Testing and feedback especially by Mariane & Mamba
+
+Credit also to original plugins that I have moderated to fix this project
+
+Srinivas Tamada for his tutorials on Php & JQuery, Andris Valums (Jquery.ajax upload plugin),
+Keith Wood (Jquery.bookmark & Jquery.countdown plugins), Jack Moore (Jquery.colorbox plugin),
+Jan Jarfalk (Jquery.elastic plugin), Sebastian Tschan (Jquery.blueImp plugin),
+Trent Foley (Jquery.galleriffic plugin), Andrew Mee (Jquery.Oembed plugin),
+Washington Botelho dos Santos (Jquery.stepy plugin), GeekTantra (jquery.validate plugin),
+Bob Hitching (jquery.geo_autocomplete)
Modified: XoopsModules/smallworld/trunk/smallworld/docs/lang_diff.txt
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/docs/lang_diff.txt 2012-02-08 21:06:23 UTC (rev 8916)
+++ XoopsModules/smallworld/trunk/smallworld/docs/lang_diff.txt 2012-02-08 21:57:29 UTC (rev 8917)
@@ -11,4 +11,8 @@
=============
1.0
=============
-Original Version
\ No newline at end of file
+Original Version
+
+=============
+1.10
+=============
\ 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: <dh...@us...> - 2012-02-08 21:06:33
|
Revision: 8916
http://xoops.svn.sourceforge.net/xoops/?rev=8916&view=rev
Author: dhcst
Date: 2012-02-08 21:06:23 +0000 (Wed, 08 Feb 2012)
Log Message:
-----------
Fix for Xoops 2.5.5
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/admin/admin_cat_manager.php
XoopsModules/newbb/branches/alfred/newbb/admin/admin_forum_manager.php
XoopsModules/newbb/branches/alfred/newbb/admin/admin_permissions.php
XoopsModules/newbb/branches/alfred/newbb/admin/index.php
XoopsModules/newbb/branches/alfred/newbb/class/permission.forum.php
XoopsModules/newbb/branches/alfred/newbb/class/permission.php
XoopsModules/newbb/branches/alfred/newbb/class/post.php
XoopsModules/newbb/branches/alfred/newbb/header.php
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_cat_manager.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_cat_manager.php 2012-02-08 20:13:16 UTC (rev 8915)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_cat_manager.php 2012-02-08 21:06:23 UTC (rev 8916)
@@ -136,7 +136,7 @@
break;
case "save":
-
+ mod_clearCacheFile("permission_category","newbb");
if ($cat_id) {
$category_obj =& $category_handler->get($cat_id);
$message = _AM_NEWBB_CATEGORYUPDATED;
@@ -157,7 +157,7 @@
}
if ($cat_id = $category_obj->getVar("cat_id") && $cat_isNew) {
$category_handler->applyPermissionTemplate($category_obj);
- }
+ }
redirect_header("admin_cat_manager.php", 2, $message);
exit();
@@ -212,7 +212,7 @@
echo "</fieldset>";
break;
}
-mod_clearFile("","xoops_newbb");
+mod_clearCacheFile("permission_category","newbb");
echo "</fieldset>";
xoops_cp_footer();
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_forum_manager.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_forum_manager.php 2012-02-08 20:13:16 UTC (rev 8915)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_forum_manager.php 2012-02-08 21:06:23 UTC (rev 8916)
@@ -66,7 +66,7 @@
$forum_handler->updateAll("cat_id", $cid, new Criteria("forum_id", "(".implode(", ", $forums).")", "IN") );
}
- mod_clearCacheFile("forum", "xoops_newbb");
+ mod_clearCacheFile("forum", "newbb");
redirect_header('./admin_forum_manager.php?op=manage', 2, _AM_NEWBB_MSG_FORUM_MOVED);
} else {
redirect_header('./admin_forum_manager.php?op=manage', 2, _AM_NEWBB_MSG_ERR_FORUM_MOVED);
@@ -120,7 +120,7 @@
//mod_clearCacheFile("forum", "newbb");
$forum_handler->synchronization($forum_dest);
unset($forum_dest);
- mod_clearCacheFile("forum", "xoops_newbb");
+ mod_clearCacheFile("forum", "newbb");
redirect_header('./admin_forum_manager.php?op=manage', 2, _AM_NEWBB_MSG_FORUM_MERGED);
} else {
@@ -172,7 +172,7 @@
$forum_obj->setVar('cat_id', $_POST['cat_id']);
if ($forum_handler->insert($forum_obj)) {
- mod_clearCacheFile("forum", "xoops_newbb");
+ mod_clearCacheFile("forum", "newbb");
if (!empty($_POST["perm_template"])) {
$groupperm_handler = xoops_getmodulehandler('permission', $xoopsModule->getVar("dirname"));
$perm_template = $groupperm_handler->getTemplate();
@@ -217,7 +217,7 @@
} else {
$forum_obj =& $forum_handler->get($_POST['forum']);
$forum_handler->delete($forum_obj);
- mod_clearCacheFile("forum", "xoops_newbb");
+ mod_clearCacheFile("forum", "newbb");
redirect_header("admin_forum_manager.php?op=manage", 1, _AM_NEWBB_FORUMREMOVED);
exit();
}
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_permissions.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_permissions.php 2012-02-08 20:13:16 UTC (rev 8915)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_permissions.php 2012-02-08 21:06:23 UTC (rev 8916)
@@ -208,12 +208,12 @@
case "template_save":
$res = $newbbperm_handler->setTemplate($_POST['perms'], $groupid = 0);
- if ($res) {
+ if ($res) {
redirect_header("admin_permissions.php?action=template", 2, _AM_NEWBB_PERM_TEMPLATE_CREATED);
} else {
redirect_header("admin_permissions.php?action=template", 2, _AM_NEWBB_PERM_TEMPLATE_ERROR);
}
- break;
+ exit();
case "apply":
$perm_template = $newbbperm_handler->getTemplate();
@@ -336,7 +336,7 @@
break;
}
-mod_clearCacheFile("","xoops_newbb");
+mod_clearCacheFile("forum","newbb");
echo "</fieldset></fieldset>";
xoops_cp_footer();
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/index.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/index.php 2012-02-08 20:13:16 UTC (rev 8915)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/index.php 2012-02-08 21:06:23 UTC (rev 8916)
@@ -356,9 +356,7 @@
$moderate_handler->clearGarbage();
}
- }
- mod_clearFile("","xoops_newbb");
- mod_clearFile("","newbb");
+ }
echo "</fieldset>";
xoops_cp_footer();
break;
Modified: XoopsModules/newbb/branches/alfred/newbb/class/permission.forum.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/permission.forum.php 2012-02-08 20:13:16 UTC (rev 8915)
+++ XoopsModules/newbb/branches/alfred/newbb/class/permission.forum.php 2012-02-08 21:06:23 UTC (rev 8916)
@@ -191,13 +191,13 @@
function getTemplate()
{
- $perms = mod_loadFile("perm_template", "xoops_newbb");
+ $perms = mod_loadFile("perm_template", "newbb");
return $perms;
}
function setTemplate($perms)
{
- return mod_createFile($perms, "perm_template", "xoops_newbb");
+ return mod_createFile($perms, "perm_template", "newbb");
}
}
Modified: XoopsModules/newbb/branches/alfred/newbb/class/permission.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/permission.php 2012-02-08 20:13:16 UTC (rev 8915)
+++ XoopsModules/newbb/branches/alfred/newbb/class/permission.php 2012-02-08 21:06:23 UTC (rev 8916)
@@ -60,21 +60,21 @@
function deleteByForum($forum_id)
{
- mod_clearCacheFile("permission_forum", "xoops_newbb");
+ mod_clearCacheFile("permission_forum", "newbb");
$handler =& $this->_loadHandler("forum");
return $handler->deleteByForum($forum_id);
}
function deleteByCategory($cat_id)
{
- mod_clearCacheFile("permission_category", "xoops_newbb");
+ mod_clearCacheFile("permission_category", "newbb");
$handler =& $this->_loadHandler("category");
return $handler->deleteByCategory($cat_id);
}
function setCategoryPermission($category, $groups = array())
{
- mod_clearCacheFile("permission_category", "xoops_newbb");
+ mod_clearCacheFile("permission_category", "newbb");
$handler =& $this->_loadHandler("category");
return $handler->setCategoryPermission($category, $groups);
}
@@ -214,7 +214,7 @@
}
if ($this->_checkRight($perm, $itemid, $groupid, $mid)) return true;
load_functions("cache");
- mod_clearCacheFile("permission", "xoops_newbb");
+ mod_clearCacheFile("permission", "newbb");
$this->addRight($perm, $itemid, $groupid, $mid);
return true;
}
@@ -254,7 +254,7 @@
function deleteRight($perm, $itemid, $groupid, $mid = null)
{
- mod_clearCacheFile("permission", "xoops_newbb");
+ mod_clearCacheFile("permission", "newbb");
if (empty($mid)) {
if (is_object($GLOBALS["xoopsModule"]) && $GLOBALS["xoopsModule"]->getVar("dirname") == "newbb") {
$mid = $GLOBALS["xoopsModule"]->getVar("mid");
@@ -285,7 +285,7 @@
function applyTemplate($forum, $mid = 0)
{
- mod_clearCacheFile("permission_forum", "xoops_newbb");
+ mod_clearCacheFile("permission_forum", "newbb");
$handler = $this->_loadHandler("forum");
return $handler->applyTemplate($forum, $mid);
}
Modified: XoopsModules/newbb/branches/alfred/newbb/class/post.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/post.php 2012-02-08 20:13:16 UTC (rev 8915)
+++ XoopsModules/newbb/branches/alfred/newbb/class/post.php 2012-02-08 21:06:23 UTC (rev 8916)
@@ -477,7 +477,7 @@
}
$thread_action['print']['image'] = newbb_displayImage('printer', _MD_PRINT);
- $thread_action['print']['link'] = "print.php?form=2&forum=". $forum_id."&topic_id=" . $topic_id;
+ $thread_action['print']['link'] = XOOPS_URL."/modules/newbb/print.php?form=2&forum=". $forum_id."&topic_id=" . $topic_id;
$thread_action['print']['name'] = _MD_PRINT;
$thread_action['print']['target'] = '_blank';
Modified: XoopsModules/newbb/branches/alfred/newbb/header.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/header.php 2012-02-08 20:13:16 UTC (rev 8915)
+++ XoopsModules/newbb/branches/alfred/newbb/header.php 2012-02-08 21:06:23 UTC (rev 8916)
@@ -13,7 +13,7 @@
defined('XOOPS_ROOT_PATH') or die('Restricted access');
if (!empty($xoopsModuleConfig['do_rewrite'])) include_once "seo_url.php";
/* for seo */
-$toseo_url = array("index.php","viewforum.php","viewtopic.php","rss.php","print.php","makepdf.php");
+$toseo_url = array("index.php","viewforum.php","viewtopic.php","rss.php");
if(((strpos(getenv('REQUEST_URI'), '.html') === false) && !empty($xoopsModuleConfig['do_rewrite']) && (!isset($_POST) || count($_POST) <= 0)))
{
if ( in_array(basename(getenv('SCRIPT_NAME')),$toseo_url) && (trim(getenv("REQUEST_URI")) != '') && trim(getenv("REQUEST_URI")) != "/".REAL_MODULE_NAME."/") {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-02-08 20:13:22
|
Revision: 8915
http://xoops.svn.sourceforge.net/xoops/?rev=8915&view=rev
Author: djculex
Date: 2012-02-08 20:13:16 +0000 (Wed, 08 Feb 2012)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/language/danish/main.php
Modified: XoopsModules/smallworld/trunk/smallworld/language/danish/main.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/danish/main.php 2012-02-08 19:17:57 UTC (rev 8914)
+++ XoopsModules/smallworld/trunk/smallworld/language/danish/main.php 2012-02-08 20:13:16 UTC (rev 8915)
@@ -134,9 +134,9 @@
define ("_SMALLWORLD_INRELATIONSHIP", "er i et forhold med");
define ("_SMALLWORLD_ISMARRIED", "er gift med");
define ("_SMALLWORLD_ISENGAGED", "er forlovet med");
-define ("_SMALLWORLD_ISCOMPLICATED", "er meget hemmeligt, når det kommer til personlige forhold med");
+define ("_SMALLWORLD_ISCOMPLICATED", "er meget hemmeligt, når det kommer til personlige forhold med ");
define ("_SMALLWORLD_OPENRELATIONSHIP", "er i et åbent forhold med");
-define ("_SMALLWORLD_ADDITIONALINFO", "yderlig info om");
+define ("_SMALLWORLD_ADDITIONALINFO", "yderlig info om ");
define ("_SMALLWORLD_HIS", "Hans");
define ("_SMALLWORLD_HER", "hendes");
define ("_SMALLWORLD_HISHER", "hans/hendes");
@@ -194,16 +194,16 @@
define ("_SMALLWORLD_EMAILADRESSES", "E-mail adresse(r)");
// Dropdown skærmnavne
-define ("_SMALLWORLD_SCREENNAME_AIM", "MSN (uname)");
-define ("_SMALLWORLD_SCREENNAME_FACEBOOK", "Facebook (uname)");
-define ("_SMALLWORLD_SCREENNAME_GOOGLE", "Google + (id)");
-define ("_SMALLWORLD_SCREENNAME_ICQ", "ICQ (ID-nummer)");
-define ("_SMALLWORLD_SCREENNAME_SKYPE", "Skype (uname)");
-define ("_SMALLWORLD_SCREENNAME_TWITTER", "Twitter (uname)");
-define ("_SMALLWORLD_SCREENNAME_MYSPACE", "MySpace (uname)");
-define ("_SMALLWORLD_SCREENNAME_XOOPS", "Xoops (UID)");
-define ("_SMALLWORLD_SCREENNAME_YAHOO", "Yahoo (yahoo id)");
-define ("_SMALLWORLD_SCREENNAME_YOUTUBE", "Youtube (uname)");
+define ("_SMALLWORLD_SCREENNAME_AIM", "MSN (uname) ");
+define ("_SMALLWORLD_SCREENNAME_FACEBOOK", "Facebook (uname) ");
+define ("_SMALLWORLD_SCREENNAME_GOOGLE", "Google + (id) ");
+define ("_SMALLWORLD_SCREENNAME_ICQ", "ICQ (ID-nummer) ");
+define ("_SMALLWORLD_SCREENNAME_SKYPE", "Skype (uname) ");
+define ("_SMALLWORLD_SCREENNAME_TWITTER", "Twitter (uname) ");
+define ("_SMALLWORLD_SCREENNAME_MYSPACE", "MySpace (uname) ");
+define ("_SMALLWORLD_SCREENNAME_XOOPS", "Xoops (UID) ");
+define ("_SMALLWORLD_SCREENNAME_YAHOO", "Yahoo (yahoo id) ");
+define ("_SMALLWORLD_SCREENNAME_YOUTUBE", "Youtube (uname) ");
define ("_SMALLWORLD_ADDMORE", "Tilføj mere");
define ("_SMALLWORLD_REMOVE", "Fjern");
@@ -276,15 +276,15 @@
define ("_SMALLWORLD_SEARCHMEMBER", "Søg efter brugernavn eller rigtige navn");
/* ---------------- Meddelelser (json, indberetninger) ------------------- */
-define ("_SMALLWORLD_FRIENDSHIPFOLLOW", "Følger");
-define ("_SMALLWORLD_FRIENDSHIPREQUESTS", "Forhold:");
-define ("_SMALLWORLD_JSON_ADDFRIEND", "Ven anmodning er blevet sendt til");
+define ("_SMALLWORLD_FRIENDSHIPFOLLOW", "Følger ");
+define ("_SMALLWORLD_FRIENDSHIPREQUESTS", "Forhold: ");
+define ("_SMALLWORLD_JSON_ADDFRIEND", "Ven anmodning er blevet sendt til ");
define ("_SMALLWORLD_JSON_CANCEL_ADDFRIEND", "Du har annulleret venneanmodning til ");
define ("_SMALLWORLD_JSON_DELETE_FRIEND_START", "Du har slettet ");
define ("_SMALLWORLD_JSON_DELETE_FRIEND_END", "som ven");
define ("_SMALLWORLD_JSON_REQUEST_PENDING", "<br> Anmodning om venskab venter accept");
-define ("_SMALLWORLD_JSON_FOLLOWINGFRIEND", "Du følger nu:");
+define ("_SMALLWORLD_JSON_FOLLOWINGFRIEND", "Du følger nu: ");
define ("_SMALLWORLD_JSON_FOLLOWINGFRIEND_DESC", "<br>Eventuelle beskeder han/hun skriver på sin væg, vil også blive vist på din væg.");
define ("_SMALLWORLD_JSON_UNFOLLOWINGFRIEND", "Du følger ikke længere : ");
define ("_SMALLWORLD_JSON_UNFOLLOWINGFRIEND_DESC", "<br> Hans/hendes wall-beskeder vil ikke længere blive vist på din væg.");
@@ -316,19 +316,19 @@
define ("_SMALLWORLD_DELUPD", "Slet update");
define ("_SMALLWORLD_COMMENTWALL", "kommenter ");
define ("_SMALLWORLD_DELETECOMMENT", "Slet kommentar");
-define ("_SMALLWORLD_SECONDSAGO", "sekunder siden");
+define ("_SMALLWORLD_SECONDSAGO", " sekunder siden");
define ("_SMALLWORLD_ONEMINUTEAGO", "et minut siden");
-define ("_SMALLWORLD_MINUTESAGO", "minutter siden");
+define ("_SMALLWORLD_MINUTESAGO", " minutter siden");
define ("_SMALLWORLD_ONEHOURAGO", "En time siden");
-define ("_SMALLWORLD_HOURSAGO", "timer siden");
+define ("_SMALLWORLD_HOURSAGO", " timer siden");
define ("_SMALLWORLD_ONEDAYAGO", "en dag siden");
-define ("_SMALLWORLD_DAYSAGO", "dage siden");
+define ("_SMALLWORLD_DAYSAGO", " dage siden");
define ("_SMALLWORLD_ONEWEEKAGO", "en uge siden");
-define ("_SMALLWORLD_WEEKSAGO", "uger siden");
+define ("_SMALLWORLD_WEEKSAGO", " uger siden");
define ("_SMALLWORLD_ONEMONTHAGO", "en måned siden");
-define ("_SMALLWORLD_MONTHSAGO", "måneder siden");
+define ("_SMALLWORLD_MONTHSAGO", " måneder siden");
define ("_SMALLWORLD_ONEYEARAGO", "et år siden");
-define ("_SMALLWORLD_YEARSAGO", "år siden");
+define ("_SMALLWORLD_YEARSAGO", " år siden");
define ("_SMALLWORLD_CLICKIMAGETHUMB", "Klik her for at se billede i original størrelse");
/* -------------------- Venner siden --------------- */
@@ -349,7 +349,7 @@
define ("_SMALLWORLD_MAIL_COMPLAINT", "klage på ");
define ("_SMALLWORLD_COMP_MSG_LNK_DESC", "Klik her for at se berørte besked");
-define ("_SMALLWORLD_MAIL_NEWFRIENDFOLLOWER", "Ny venneanmodning eller en ny bruger følger dig");
+define ("_SMALLWORLD_MAIL_NEWFRIENDFOLLOWER", "Ny venneanmodning eller en ny bruger følger dig på ");
/* ------------ Inspektion & nedtællingen ---------------- */
define ("_SMALLWORLD_INSPEC_DESC", ". Admin har taget denne konto ned for inspektion <br/> Anslået inspektiontid vil slutte om");
@@ -361,7 +361,7 @@
/* ------------ Sociale netværk bogmærker ---------------- */
define ("_SMALLWORLD_SHARELINK", "Del");
define ("_SMALLWORLD_SHAREBOX_TITLE", "Del/bookmark");
-define ("_SMALLWORLD_UPDATEONSITEMETA", "opdaterer -");
+define ("_SMALLWORLD_UPDATEONSITEMETA", "opdaterer - ");
define ("_SMALLWORLD_BOOKMARK_NOPERM_MESSAGE", "Ulovligt bogmærket. Ikke tilladt at dele! <br>Opret en profil på smallworld <br><a href='register.php'> Tilmeld dig her </a>" );
/* ------------- Statistik og ca ------------------- */
@@ -374,5 +374,5 @@
define ("_SMALLWORLD_STATS_LIKETHISMODULE", "Kan du lide dette modul?? ");
/* ----------------- Donere link -------------- */
-define ("_SMALLWORLD_DONATETEXT", "Doner til en kop kaffe her");
+define ("_SMALLWORLD_DONATETEXT", "Doner til en kop kaffe her ");
?>
\ 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: <dj...@us...> - 2012-02-08 19:18:06
|
Revision: 8914
http://xoops.svn.sourceforge.net/xoops/?rev=8914&view=rev
Author: djculex
Date: 2012-02-08 19:17:57 +0000 (Wed, 08 Feb 2012)
Log Message:
-----------
changed css in galleriffic-5.css
- from width TO max-height + max-width
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/css/galleriffic-5.css
Modified: XoopsModules/smallworld/trunk/smallworld/css/galleriffic-5.css
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/css/galleriffic-5.css 2012-02-08 19:13:36 UTC (rev 8913)
+++ XoopsModules/smallworld/trunk/smallworld/css/galleriffic-5.css 2012-02-08 19:17:57 UTC (rev 8914)
@@ -88,8 +88,8 @@
div.slideshow img {
border-style: solid;
border-width: 1px;
- width:500px;
- /*height:500px;*/
+ max-height: 500px;
+ max-width: 500px;
}
div.caption-container {
float: right;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-02-08 19:13:43
|
Revision: 8913
http://xoops.svn.sourceforge.net/xoops/?rev=8913&view=rev
Author: djculex
Date: 2012-02-08 19:13:36 +0000 (Wed, 08 Feb 2012)
Log Message:
-----------
Ups in language file
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/language/danish/main.php
Modified: XoopsModules/smallworld/trunk/smallworld/language/danish/main.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/danish/main.php 2012-02-08 19:05:17 UTC (rev 8912)
+++ XoopsModules/smallworld/trunk/smallworld/language/danish/main.php 2012-02-08 19:13:36 UTC (rev 8913)
@@ -212,11 +212,11 @@
define ("_SMALLWORLD_KINDERGARDEN", "børnehave");
define ("_SMALLWORLD_NURSERY", "vuggestue");
define ("_SMALLWORLD_ELEMSCHOOL", "grundskole");
-define ("_SMALLWORLD_GRADUATESCHOOL", "Forskerskole");
-define ("_SMALLWORLD_HIGHSCHOOL", "Afgangsskole");
-define ("_SMALLWORLD_JUNIORHIGH", "Mellemskole");
-define ("_SMALLWORLD_JUNIORCOLLEGE", "Gymnasium");
-define ("_SMALLWORLD_COLLEGE", "Gymnasium");
+define ("_SMALLWORLD_GRADUATESCHOOL", "Folkeskole");
+define ("_SMALLWORLD_HIGHSCHOOL", "Gymnasium/hf/HH/Htx");
+define ("_SMALLWORLD_JUNIORHIGH", "Gymnasium/hf/HH/Htx");
+define ("_SMALLWORLD_JUNIORCOLLEGE", "Gymnasium/hf/HH/Htx");
+define ("_SMALLWORLD_COLLEGE", "Gymnasium/hf/HH/Htx");
define ("_SMALLWORLD_TECNICAL", "teknisk skole");
define ("_SMALLWORLD_UNIVERSITY", "universitet");
define ("_SMALLWORLD_SCHOOLNAME", "Skolens navn");
@@ -358,7 +358,7 @@
define ("_SMALLWORLD_BDAY_ISIN", "Fødselsdag er om: ");
define ("_SMALLWORLD_BDAY_YEARS", "år");
-/ * ------------ Sociale netværk bogmærker ---------------- * /
+/* ------------ Sociale netværk bogmærker ---------------- */
define ("_SMALLWORLD_SHARELINK", "Del");
define ("_SMALLWORLD_SHAREBOX_TITLE", "Del/bookmark");
define ("_SMALLWORLD_UPDATEONSITEMETA", "opdaterer -");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-02-08 19:05:23
|
Revision: 8912
http://xoops.svn.sourceforge.net/xoops/?rev=8912&view=rev
Author: djculex
Date: 2012-02-08 19:05:17 +0000 (Wed, 08 Feb 2012)
Log Message:
-----------
Upped version to 1.10 RC
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/xoops_version.php
Modified: XoopsModules/smallworld/trunk/smallworld/xoops_version.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/xoops_version.php 2012-02-08 19:04:30 UTC (rev 8911)
+++ XoopsModules/smallworld/trunk/smallworld/xoops_version.php 2012-02-08 19:05:17 UTC (rev 8912)
@@ -20,7 +20,7 @@
**/
$modversion['name'] = _MI_SMALLWORLD_MODULE_NAME;
-$modversion['version'] = 1.05;
+$modversion['version'] = 1.10;
$modversion['description'] = _MI_SMALLWORLD_MODULE_DESC;
$modversion['author'] = "Michael Albertsen";
$modversion['nickname'] = 'Culex';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-02-08 19:04:36
|
Revision: 8911
http://xoops.svn.sourceforge.net/xoops/?rev=8911&view=rev
Author: djculex
Date: 2012-02-08 19:04:30 +0000 (Wed, 08 Feb 2012)
Log Message:
-----------
Added links for localization in countdown and goggle maps api
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/language/english/js/jquery.countdown.js
XoopsModules/smallworld/trunk/smallworld/language/english/js/variables.js
Modified: XoopsModules/smallworld/trunk/smallworld/language/english/js/jquery.countdown.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/english/js/jquery.countdown.js 2012-02-08 19:03:48 UTC (rev 8910)
+++ XoopsModules/smallworld/trunk/smallworld/language/english/js/jquery.countdown.js 2012-02-08 19:04:30 UTC (rev 8911)
@@ -4,6 +4,11 @@
Dual licensed under the GPL (http://dev.jquery.com/browser/trunk/jquery/GPL-LICENSE.txt) and
MIT (http://dev.jquery.com/browser/trunk/jquery/MIT-LICENSE.txt) licenses.
Please attribute the author if you use it. */
+
+ /*
+ Check here for your translation
+ http://keith-wood.name/countdown.html#l10nPkgs
+ */
(function(xoops_smallworld) {
xoops_smallworld.countdown.regional[''] = {
labels: ['Years', 'Months', 'Weeks', 'Days', 'Hours', 'Minutes', 'Seconds'],
Modified: XoopsModules/smallworld/trunk/smallworld/language/english/js/variables.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/english/js/variables.js 2012-02-08 19:03:48 UTC (rev 8910)
+++ XoopsModules/smallworld/trunk/smallworld/language/english/js/variables.js 2012-02-08 19:04:30 UTC (rev 8911)
@@ -1,4 +1,6 @@
// Various language codes to be included in header
+// See this for your parametres
+//https://spreadsheets.google.com/spreadsheet/pub?key=0Ah0xU81penP1cDlwZHdzYWkyaERNc0xrWHNvTTA1S1E&gid=1
var language = 'en';
var countryshort = 'gb';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-02-08 19:04:00
|
Revision: 8910
http://xoops.svn.sourceforge.net/xoops/?rev=8910&view=rev
Author: djculex
Date: 2012-02-08 19:03:48 +0000 (Wed, 08 Feb 2012)
Log Message:
-----------
Danish language files
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/language/danish/admin.php
XoopsModules/smallworld/trunk/smallworld/language/danish/help/help.html
XoopsModules/smallworld/trunk/smallworld/language/danish/js/jquery.countdown.js
XoopsModules/smallworld/trunk/smallworld/language/danish/js/jquery.ui.datepicker-language.js
XoopsModules/smallworld/trunk/smallworld/language/danish/js/variables.js
XoopsModules/smallworld/trunk/smallworld/language/danish/mailTpl/mail_attencionneeded.html
XoopsModules/smallworld/trunk/smallworld/language/danish/mailTpl/mail_complaint.html
XoopsModules/smallworld/trunk/smallworld/language/danish/mailTpl/mail_newcomment.html
XoopsModules/smallworld/trunk/smallworld/language/danish/mailTpl/mail_register.html
XoopsModules/smallworld/trunk/smallworld/language/danish/main.php
XoopsModules/smallworld/trunk/smallworld/language/danish/modinfo.php
Modified: XoopsModules/smallworld/trunk/smallworld/language/danish/admin.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/danish/admin.php 2012-02-08 17:27:44 UTC (rev 8909)
+++ XoopsModules/smallworld/trunk/smallworld/language/danish/admin.php 2012-02-08 19:03:48 UTC (rev 8910)
@@ -1,80 +1,80 @@
<?php
/**
* 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.
+* 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
-* @module: Smallworld
-* @Author: Michael Albertsen (http://culex.dk) <cu...@cu...>
-* @copyright: 2011 Culex
-* @Repository path: $HeadURL$
-* @Last committed: $Revision$
-* @Last changed by: $Author$
-* @Last changed date: $Date$
-* @ID: $Id$
+* @copyright: The XOOPS Project http://sourceforge.net/projects/xoops/
+* @license: http://www.fsf.org/copyleft/gpl.html GNU public license
+* @packet: Modules
+* @sub-packet: Smallworld
+* @since: Xoops 2.5.4
+* @Author: Michael Albertsen (http://culex.dk) <cu...@cu...>
+* @copyright: 2011 Culex
+* @Last committed: $Revision$
+* @Last changed by: $Author$
+* @Last changed date: $Date$
+* @ID: $Id$
**/
-// English language file for Smallworld Admin.php
+// Engelsk language fil til Smallworld admin.php
-// tab titles
- define('_AM_SMALLWORLD_ADMINMESSAGESEND','Post to all');
- define('_AM_SMALLWORLD_LOGSMAINTNANCE','Database maintenance');
+// Tab titler
-// tab one in admin section
-define('_AM_SMALLWORLD_MODULEINSTALL','Module version installed');
-define('_AM_SMALLWORLD_INSTALLDATE','Module installed on');
-define('_AM_SMALLWORLD_DATEOFFIRSTMESSAGE','Date of the oldest message');
-define('_AM_SMALLWORLD_TOTALUSERS','Total members using Smallworld');
-define('_AM_SMALLWORLD_AVERAGEMSGPERDAY','Average messages per day');
-define('_AM_SMALLWORLD_TOPCHATTERS','Most active users overall');
-define('_AM_SMALLWORLD_TOPCHATTERS_TODAY','Most active users in last 24 hours');
-define('_AM_SMALLWORLD_TOPRATEDUSERS','Higest rated users');
-define('_AM_SMALLWORLD_BOTTOMRATEDUSERS','Worst rated users');
-define('_AM_SMALLWORLD_STATISTICS_TITLE','Smallworld Statistics');
-define('_AM_SMALLWORLD_MODULEINFO','Module info');
-define('_AM_SMALLWORLD_USERSTATS','User stats');
-define('_AM_SMALLWORLD_NONEYET','No messages in database');
-define('_AM_SMALLWORLD_NO','none');
-define('_AM_SMALLWORLD_THEREARE','There are');
-define('_AM_SMALLWORLD_UPDATE_STATUS','Status of your Smallworld version:');
+// Fanebladsside en i admin sektion
+define ('_AM_SMALLWORLD_MODULEINSTALL', 'Modul version installeret');
+define ('_AM_SMALLWORLD_INSTALLDATE', 'Modul installeret den');
+define ('_AM_SMALLWORLD_DATEOFFIRSTMESSAGE', 'Dato for den ældste besked ');
+define ('_AM_SMALLWORLD_TOTALUSERS', 'Total antal brugere af Smallworld');
+define ('_AM_SMALLWORLD_AVERAGEMSGPERDAY', 'Gennemsnitlige beskeder per dag');
+define ('_AM_SMALLWORLD_TOPCHATTERS', 'Mest aktive brugernes overordnet');
+define ('_AM_SMALLWORLD_TOPCHATTERS_TODAY', 'Mest aktive brugere i de sidste 24 timer');
+define ('_AM_SMALLWORLD_TOPRATEDUSERS', 'Højeste ratede brugere');
+define ('_AM_SMALLWORLD_BOTTOMRATEDUSERS', 'Laveste ratede brugere');
+define ('_AM_SMALLWORLD_STATISTICS_TITLE', 'Smallworld Statistik');
+define ('_AM_SMALLWORLD_MODULEINFO', 'Modul info');
+define ('_AM_SMALLWORLD_USERSTATS', 'Bruger stats');
+define ('_AM_SMALLWORLD_NONEYET', 'Ingen beskeder i database');
+define ('_AM_SMALLWORLD_NO', 'ingen');
+define ('_AM_SMALLWORLD_THEREARE', 'Der er');
+define ('_AM_SMALLWORLD_UPDATE_STATUS', 'Status af din Smallworld version:');
-// tab two in admin section
+// Tab to i admin sektion
-// tab three in admin section
-define('_AM_SMALLWORLD_USERADMIN_TITLE','User administration');
-define('_AM_SMALLWORLD_USERADMININSPECT_TITLE','Users under admin inspection');
-define('_AM_SMALLWORLD_USERADMINNOINSPECT_TITLE','Normal users');
-define("_AM_SMALLWORLD_TITLE_IMAGE","User image");
-define("_AM_SMALLWORLD_TITLE_USERNAME","User name");
-define("_AM_SMALLWORLD_TITLE_REALNAME","Real name");
-define("_AM_SMALLWORLD_TITLE_IP","Ip");
-define("_AM_SMALLWORLD_TITLE_COMPLAINTS","Complaints received");
-define("_AM_SMALLWORLD_TITLE_INSPECTTIME","Inspection time");
-define("_AM_SMALLWORLD_TITLE_INSPECTADD","Add inspection time");
-define("_AM_SMALLWORLD_TITLE_DELETEUSER","Delete user account");
-define('_AM_SMALLWORLD_TITLE_INSPECTDELETE','Clear inspection time');
-define('_AM_SMALLWORLD_ADDTIMEDROPDOWN_MINUTES',' Minutes');
-define('_AM_SMALLWORLD_ADDTIMEDROPDOWN_NOCHANGE','No change');
+// Tab tre i admin sektion
+define ('_AM_SMALLWORLD_USERADMIN_TITLE', 'Brugeradministration');
+define ('_AM_SMALLWORLD_USERADMININSPECT_TITLE', 'Brugere under admin inspektion');
+define ('_AM_SMALLWORLD_USERADMINNOINSPECT_TITLE', 'Normale brugere');
+define ("_AM_SMALLWORLD_TITLE_IMAGE", "Brugerbillede");
+define ("_AM_SMALLWORLD_TITLE_USERNAME", "Brugernavn");
+define ("_AM_SMALLWORLD_TITLE_REALNAME", "Rigtige navn");
+define ("_AM_SMALLWORLD_TITLE_IP", "Ip");
+define ("_AM_SMALLWORLD_TITLE_COMPLAINTS", "Modtagne klager");
+define ("_AM_SMALLWORLD_TITLE_INSPECTTIME", "Inspektionstid");
+define ("_AM_SMALLWORLD_TITLE_INSPECTADD", "Tilføj inspektionstid");
+define ("_AM_SMALLWORLD_TITLE_DELETEUSER", "Slet bruger konto");
+define ('_AM_SMALLWORLD_TITLE_INSPECTDELETE', 'Nulstil inspektionstid');
+define ('_AM_SMALLWORLD_ADDTIMEDROPDOWN_MINUTES', 'Minutter');
+define ('_AM_SMALLWORLD_ADDTIMEDROPDOWN_NOCHANGE', 'Ingen ændring');
-// various others
-define('_AM_SMALLWORLD_UPDATE_CRITICAL_UPD','There is a critical update ready!!');
-define('_AM_SMALLWORLD_UPDATE_NORMAL_UPD','There is a newer version ready for download');
-define('_AM_SMALLWORLD_UPDATE_SERVER_ERROR','Server seems to be down or update is in progress.<br/>Try again later.');
-define('_AM_SMALLWORLD_UPDATE_FILE_DESC','Description of newest version');
-define('_AM_SMALLWORLD_UPDATE_SERVER_FILE','You can download the new version from here');
-define('_AM_SMALLWORLD_UPDATE_YOUHAVENEWESTVERSION','You have the newest version of Smallworld');
-define('_AM_SMALLWORLD_HELP','Help');
-define('_AM_SMALLWORLD_ADMIN_USERDELETEDALERT',' and associated folders, files and table rows has been deleted');
-define('_AM_SMALLWORLD_STATS_POS','#');
-define('_AM_SMALLWORLD_STATS_NAME','Name');
-define('_AM_SMALLWORLD_STATS_AMOUNT','Amount');
-define('_AM_SMALLWORLD_STATS_IMG','Icon');
+// Forskellige andre
+define ('_AM_SMALLWORLD_UPDATE_CRITICAL_UPD', 'Der er en kritisk opdatering klar!!');
+define ('_AM_SMALLWORLD_UPDATE_NORMAL_UPD', 'Der er en nyere version klar til download');
+define ('_AM_SMALLWORLD_UPDATE_SERVER_ERROR', 'Server lader til at være nede eller opdatering er igang <br/> Prøv igen senere..');
+define ('_AM_SMALLWORLD_UPDATE_FILE_DESC', 'Beskrivelse af nyeste version');
+define ('_AM_SMALLWORLD_UPDATE_SERVER_FILE', 'Du kan downloade den nye version her');
+define ('_AM_SMALLWORLD_UPDATE_YOUHAVENEWESTVERSION', 'Du har den nyeste version af Smallworld');
+define ('_AM_SMALLWORLD_HELP', 'Hjælp');
+define ('_AM_SMALLWORLD_ADMIN_USERDELETEDALERT', ' og associerede mapper, filer og tabelrækker er blevet slettet');
+define ('_AM_SMALLWORLD_STATS_POS', '#');
+define ('_AM_SMALLWORLD_STATS_NAME', 'Navn');
+define ('_AM_SMALLWORLD_STATS_AMOUNT', 'Antal');
+define ('_AM_SMALLWORLD_STATS_IMG', 'Ikon');
-define('_AM_SMALLWORLD_SP','<img style="margin: 0pt 5px 0pt 0pt; vertical-align: middle;" src="../images/sp.png" height="30px" width="30px"> <a style="position: relative; margin: 0px;vertical-align: middle;" href="javascript:void(0);" id="smallworldDonate">If you like this module and the work I put into it, you could keep me awake by buying me a coffee</a>');
-define('_AM_SMALLWORLD_FOOTER', "<div class='center smallsmall italic pad5'>Module SmallWorld is maintained by <a class='tooltip' rel='external' href='http://culex.dk/' title='Visit my Website'>Culex</a></div>");
\ No newline at end of file
+define ('_AM_SMALLWORLD_SP', '<img style="margin: 0pt 5px 0pt 0pt; vertical-align: middle;" src="../images/sp.png" height="30px" width="30px"> <a style="position: relative; margin: 0px;vertical-align: middle;" href="javascript:void(0);" id="smallworldDonate">Hvis du kan lide dette modul og det arbejde jeg lagt i det, kan du holde mig vågen ved at købe mig kaffe</a>');
+define ('_AM_SMALLWORLD_FOOTER', "<div class='center smallsmall italic pad5'>Modulet SmallWorld opretholdes af <a class='tooltip' rel='external' href='http://culex.dk/' title='Besøg min side'>Culex</a></div>");
\ No newline at end of file
Modified: XoopsModules/smallworld/trunk/smallworld/language/danish/help/help.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/danish/help/help.html 2012-02-08 17:27:44 UTC (rev 8909)
+++ XoopsModules/smallworld/trunk/smallworld/language/danish/help/help.html 2012-02-08 19:03:48 UTC (rev 8910)
@@ -1,76 +1,76 @@
<div id="help-template" class="outer">
- <h1 class="head">Help:
+ <h1 class="head">Hjælp:
<a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/smallworld/admin/index.php"
title="Back to the administration of SmallWorld"> SmallWorld
<img src="<{xoAdminIcons home.png}>"
- alt="Back to the Administration of SmallWorld"/>
+ alt="Tilbage til Smallworld Administration"/>
</a></h1>
- <h4 class="odd">Description</h4>
+ <h4 class="odd">Beskrivelse</h4>
- <p class="even">Smallworld is a Social Network system. Inspired by the Srinivas Tamada tutorials on Facebook
- scripting. The base system has been re-written, adapted, and heavily expanded for XOOPS by Culex
- The module is featuring like/dislike, bookmarking, wall system, image gallery, and is using XIM if installed.
- The admin side is featuring deleting users, banning users based on time. A countdown is shown on user side to
- when it's back.. And many more features. It is fully supported by XOOPS version 2.5.0 and higher.<br/> <br/>
- Smallworld is released under the terms of the GNU General Public License (GPL) and is free to use and modify. It
- is free to redistribute as long as you abide by the distribution terms of the GPL.</p>
+ <p class="even"> Smallworld er et socialt netværk system. Inspireret af de Srinivas Tamada tutorials om Facebook
+ scripting. Basissystemet er blevet omskrevet, tilpasset, og stærkt udvidet til XOOPS af Culex
+ Modulet byder på kan lide/kan ikke lide, bookmarking, væg system, billedgalleri, og benytter XIM hvis det er installeret.
+ På adminsiden kan man slette brugere, udelukkelse af bestemte brugere baseret på tid. En nedtælling vises på brugerens side og
+ viser tiden der er tilbage .. Og mange flere funktioner. Det er fuldt understøttet af XOOPS version, 2.5.0 og højere. <br/>
+ Smallworld er frigivet under betingelserne i GNU General Public License (GPL), og er gratis at bruge og modificere. Det
+ er gratis at omfordele, så længe du overholder distributionsbetingelserne i GPL. </p>
- <h4 class="odd">Install/uninstall</h4> <br/>
+ <h4 class="odd">Installer/afinstaller</h4> <br/>
- No special measures necessary, follow the standard installation process – extract the /smallworld folder into the
- ../modules directory. Install the
- module through Admin -> System Module -> Modules.<br/> <br/>
+ Ingen specielle forudsætninger nødvendige, følg standard installations process - udpak /smallworld til ../modules dir. Installer
+ modulet via Admin -> System Module -> Modules.<br/> <br/>
- Check to see if the downloaded Smallworld version is the latest released version.
- Turn cookie and JavaScript of your browser on.<br/> <br/>
- <b>Installing on a hosted platform</b>
+ Undersøg altid om du har den nyeste udgave af smallworld. Dette kan ses gennem smallworld/admins første tab
+ Tillad cookie og JavaScript i din browser.<br/> <br/>
+ <b>Installation på hosted server platform</b>
<ul>
- <li>Upload the unzipped folder Smallworld to your module directory.</li>
- <li>Install using XOOPS module install as any other module installation.</li>
- <li>Make the block visible for the user groups you want to see the block (admin/moderators etc etc).</li>
+ <li>Upload den udpakkede mappe Smallworld til dit module dir.</li>
+ <li>Installer som hvilket som helst andet modul.</li>
+ <li>Gør modulet tilgængeligt for webmaster, registrede brugere eller andre (admin/moderators etc etc).</li>
</ul>
- <b>Upgrading from a previous version</b>
+ <b>Opgradering fra tidliger version</b>
<ul>
- <li>Make sure you are using newest version</li>
- <li>Read the readme.txt in archieve</li>
- <li>Maybe do a backup of your tables</li>
+ <li>Undersøg om du har seneste udgave</li>
+ <li>Læs readme.txt i arkivet (hvis der er et)</li>
+ <li>Eventuelt lav en back-up af data + mysql</li>
</ul>
- Detailed instructions on installing modules are available in the
+ Detailjerede installations beskrivelser kan du se i
<a href="http://goo.gl/adT2i">XOOPS Operations Manual</a> <br/> <br/>
- <h4 class="odd">Operations</h4> <br/>
-
- Detailed instructions on configuring the access rights for user groups are available in the
+ <h4 class="odd">Opgaver</h4> <br/>
+
+ Detaljerede instruktion om konfigurering af adgangs tilladelser for bruger grupper er tilgængelige
+ i
<a href="http://goo.gl/adT2i">XOOPS Operations Manual</a><br/> <br/>
- <h4 class="odd">Problem solving</h4> <br/>
+ <h4 class="odd">Problemløsning</h4> <br/>
- <b>I get blank page, can't click username, the block is not visible.......</b><br/> <br/>
+ <b>Jeg får en hvid side, kan ikke klikke brugernavn.......</b><br/> <br/>
<ul>
- <li> Make sure your Xoops version is > 2.5.0. Older versions of Xoops don't have preloads, which are required.
+ <li> Undersøg om din Xoops version > 2.5.0. Ældre versioner anvender ikke preloads, som er nødvendige.
</li>
- <li>Turn on debug and check to see if any errors emerge.</li>
- <li>Using FireFox, right click on the screen, choose inspect element, choose console in the tabs and check to
- see if any errors
+ <li>Vælg debug i indstillingerne og se om der optræder fejl.</li>
+ <li>V.h.a FireFox, højreklik på skærmen, vælg inspect element, tryk på console i tabsene og se om
+ der optræder nogle fejl (rød skrift)
</li>
- <li>If no errors, use Firebug (Right click->inspect element->console) and see if there are any jQuery errors.
+ <li>Hvis ingen fejl, brug Firebug (Right click->inspect element->console) og se om der er jQuery fejl.
</li>
- <li>If there are no jQuery errors. Clean caches-> module update Smallworld, system modules.</li>
- <li>If the page is still blank, Go to your protector module -> settings and write smallworld in the form
+ <li>Hvis ingen jQuery fejl. Clean caches-> module update Smallworld, system modules.</li>
+ <li>Hvis stadig blank fejl, Gå til dit protector modul -> settings og skriv smallworld i formen
"Modules out of Dos / Crawler checker".
</li>
</ul>
<br/>
- <h4 class="odd">Tutorial</h4>
+ <h4 class="odd">Manual</h4>
- <p class="even">There is no tutorial available at this time</p>
+ <p class="even">Der er pt. ingen manual tilgængelig</p>
- <h4 class="odd">Ask Questions</h4>
+ <h4 class="odd">Spørgsmål</h4>
- <p class="even">If still questions or errors please post at the <a href="http://www.xoops.org/modules/newbb">Xoops support Forum</a></p>
+ <p class="even">Har du spørgsmål angående fejl kan du skrive dem her <a href="http://www.xoops.org/modules/newbb">Xoops support Forum</a></p>
</div>
\ No newline at end of file
Modified: XoopsModules/smallworld/trunk/smallworld/language/danish/js/jquery.countdown.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/danish/js/jquery.countdown.js 2012-02-08 17:27:44 UTC (rev 8909)
+++ XoopsModules/smallworld/trunk/smallworld/language/danish/js/jquery.countdown.js 2012-02-08 19:03:48 UTC (rev 8910)
@@ -1,15 +1,24 @@
-/* http://keith-wood.name/countdown.html
+/* http://keith-wood.name/countdown.html
Countdown for jQuery v1.5.10.
Written by Keith Wood (kbwood{at}iinet.com.au) January 2008.
Dual licensed under the GPL (http://dev.jquery.com/browser/trunk/jquery/GPL-LICENSE.txt) and
MIT (http://dev.jquery.com/browser/trunk/jquery/MIT-LICENSE.txt) licenses.
Please attribute the author if you use it. */
+
+ /*
+ Check here for your translation
+ http://keith-wood.name/countdown.html#l10nPkgs
+ */
+
+/* Danish initialisation for the jQuery countdown extension
+ Written by Buch (ad...@bu...). */
(function(xoops_smallworld) {
- xoops_smallworld.countdown.regional[''] = {
- labels: ['Years', 'Months', 'Weeks', 'Days', 'Hours', 'Minutes', 'Seconds'],
- labels1: ['Year', 'Month', 'Week', 'Day', 'Hour', 'Minute', 'Second'],
- compactLabels: ['y', 'm', 'w', 'd','hrs', 'min', 'sec'], // The compact texts for the counters
+ xoops_smallworld.countdown.regional['da'] = {
+ labels: ['År', 'Måneder', 'Uger', 'Dage', 'Timer', 'Minutter', 'Sekunder'],
+ labels1: ['År', 'Månad', 'Uge', 'Dag', 'Time', 'Minut', 'Sekund'],
+ compactLabels: ['Å', 'M', 'U', 'D'],
whichLabels: null,
timeSeparator: ':', isRTL: false};
- xoops_smallworld.countdown.setDefaults(xoops_smallworld.countdown.regional['']);
+ xoops_smallworld.countdown.setDefaults(xoops_smallworld.countdown.regional['da']);
})(jQuery);
+
Modified: XoopsModules/smallworld/trunk/smallworld/language/danish/js/jquery.ui.datepicker-language.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/danish/js/jquery.ui.datepicker-language.js 2012-02-08 17:27:44 UTC (rev 8909)
+++ XoopsModules/smallworld/trunk/smallworld/language/danish/js/jquery.ui.datepicker-language.js 2012-02-08 19:03:48 UTC (rev 8910)
@@ -1,23 +1,29 @@
-/* English/UK initialisation for the jQuery UI date picker plugin. */
-/* Written by Stuart. */
-jQuery(function(xoops_smallworld){
- xoops_smallworld.datepicker.regional['en-GB'] = {
- closeText: 'Done',
- prevText: 'Prev',
- nextText: 'Next',
- currentText: 'Today',
- monthNames: ['January','February','March','April','May','June',
- 'July','August','September','October','November','December'],
- monthNamesShort: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
- 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
- dayNames: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
- dayNamesShort: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
- dayNamesMin: ['Su','Mo','Tu','We','Th','Fr','Sa'],
- weekHeader: 'Wk',
- dateFormat: 'dd/mm/yy',
- firstDay: 1,
- isRTL: false,
- showMonthAfterYear: false,
- yearSuffix: ''};
- xoops_smallworld.datepicker.setDefaults(xoops_smallworld.datepicker.regional['en-GB']);
-});
+/* http://keith-wood.name/datepick.html
+ Danish localisation for jQuery Datepicker.
+ Written by Jan Christensen ( del...@gm...). */
+(function($) {
+ $.datepick.regional['da'] = {
+ monthNames: ['Januar','Februar','Marts','April','Maj','Juni',
+ 'Juli','August','September','Oktober','November','December'],
+ monthNamesShort: ['Jan','Feb','Mar','Apr','Maj','Jun',
+ 'Jul','Aug','Sep','Okt','Nov','Dec'],
+ dayNames: ['Søndag','Mandag','Tirsdag','Onsdag','Torsdag','Fredag','Lørdag'],
+ dayNamesShort: ['Søn','Man','Tir','Ons','Tor','Fre','Lør'],
+ dayNamesMin: ['Sø','Ma','Ti','On','To','Fr','Lø'],
+ dateFormat: 'dd-mm-yyyy', firstDay: 0,
+ renderer: $.datepick.defaultRenderer,
+ prevText: '<Forrige', prevStatus: 'Vis forrige måned',
+ prevJumpText: '<<', prevJumpStatus: '',
+ nextText: 'Næste>', nextStatus: 'Vis næste måned',
+ nextJumpText: '>>', nextJumpStatus: '',
+ currentText: 'Idag', currentStatus: 'Vis aktuel måned',
+ todayText: 'Idag', todayStatus: 'Vis aktuel måned',
+ clearText: 'Nulstil', clearStatus: 'Nulstil den aktuelle dato',
+ closeText: 'Luk', closeStatus: 'Luk uden ændringer',
+ yearStatus: 'Vis et andet år', monthStatus: 'Vis en anden måned',
+ weekText: 'Uge', weekStatus: 'Årets uge',
+ dayStatus: 'Vælg D, M d', defaultStatus: 'Vælg en dato',
+ isRTL: false
+ };
+ $.datepick.setDefaults($.datepick.regional['da']);
+})(jQuery);
\ No newline at end of file
Modified: XoopsModules/smallworld/trunk/smallworld/language/danish/js/variables.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/danish/js/variables.js 2012-02-08 17:27:44 UTC (rev 8909)
+++ XoopsModules/smallworld/trunk/smallworld/language/danish/js/variables.js 2012-02-08 19:03:48 UTC (rev 8910)
@@ -1,42 +1,45 @@
-// Various language codes to be included in header
+// Various language codes to be included in header
+// See this for your parametres
+//https://spreadsheets.google.com/spreadsheet/pub?key=0Ah0xU81penP1cDlwZHdzYWkyaERNc0xrWHNvTTA1S1E&gid=1
-var language = 'en';
-var countryshort = 'gb';
-var countrylong = 'england';
+var language = 'da';
+var countryshort = 'dk';
+var countrylong = 'denmark';
-var _smallworldContinueToReg = "Continue to registration";
-var _smallworldCancel = "Cancel";
+var _smallworldContinueToReg = "Fortsæt til registrering";
+var _smallworldCancel = "Afbryd";
+var _smallworldClose = "Luk";
-var SmallworldGenderError = "Please choose your gender";
-var SmallworldBirthdayError = "Please choose your birthday";
-var SmallworldEmailError = "Please fill at least one email";
+var SmallworldGenderError = "Vælg dit køn";
+var SmallworldBirthdayError = "Vælg din fødselsdag";
+var SmallworldEmailError = "Skriv venligst mindst eén email";
-var SmallworldSavedSuccesMsg = "Saved with success";
+var SmallworldSavedSuccesMsg = "Gemt";
-var SmallworldConfirmBtnFI = "Are you sure ?";
-var SmallworldConfirmBtnYes = 'Yes!';
-var SmallworldConfirmBtnNo = 'No!';
+var SmallworldConfirmBtnFI = "Er du sikker ?";
+var SmallworldConfirmBtnYes = 'Ja!';
+var SmallworldConfirmBtnNo = 'Nej!';
-var smallworldNewMessages = "You have new events +";
-var smallworldDeletedMessages = "Messages have been deleted. Count is now -";
+var smallworldNewMessages = "Du har nye +";
+var smallworldDeletedMessages = "Meddelelser slettet. Antal er nu -";
//Validation
-var SmallworldValidationBackButton = "Backward"; // back button
-var SmallworldValidationForwardButton = "Forward"; // Forward button
-var SmallworldValidationNameErrorMsg = "Please write your name"; // Real name field
-var SmallworldValidationGenderErrorMsg = "Please choose valid gender"; // Choose gender
-var SmallworldValidationIntingenderErrorMsg = "Please check at least one. Default is 'none'"; // Interested in gender
-var SmallworldValidationSearchrelatErrorMsg = "Please check at least one. Default is 'Friends'"; // Searching for
-var SmallworldValidationBirthdayErrorMsg = "Please enter a valid Date"; // Birthday
-var SmallworldValidationEmailTitleErrorMsg = "Invalid email format";// Emailtype image title
-var SmallworldValidationBirthplaceErrorMsg = "Please enter birthplace"; // Birthplace
-var SmallworldValidationAdressErrorMsg = "Please enter street adress"; // Adress
-var SmallworldValidationCityErrorMsg = "Please enter city"; // City
-var SmallworldValidationCountryErrorMsg = "Please enter country"; // country
-var SmallworldValidationWebsiteErrorMsg = "Please enter your website"; // Website
-var SmallworldSureDelete = "Sure you want to delete this update? There is NO undo!"; // Delete comments
-var SmallworldAdminSureDeleteUser = "Are you sure you want to delete user "; //Admin delete user
-var SmallworldDialogStatsTitle = "Statistics"; // Title for statistic dialog window
+var SmallworldValidationBackButton = "Tilbage"; // back button
+var SmallworldValidationForwardButton = "Frem"; // Forward button
+var SmallworldValidationNameErrorMsg = "Skriv dit navn"; // Real name field
+var SmallworldValidationGenderErrorMsg = "Vælg gyldigt køn"; // Choose gender
+var SmallworldValidationIntingenderErrorMsg = "Vælg mindst en. Default er 'ingen'"; // Interested in gender
+var SmallworldValidationSearchrelatErrorMsg = "Vælg mindst en. Default er 'Venner'"; // Searching for
+var SmallworldValidationBirthdayErrorMsg = "vælg gyldig dato"; // Birthday
+var SmallworldValidationEmailTitleErrorMsg = "Ugyldig email format";// Emailtype image title
+var SmallworldValidationBirthplaceErrorMsg = "Skriv fødselssted"; // Birthplace
+var SmallworldValidationAdressErrorMsg = "Skriv adresse"; // Adress
+var SmallworldValidationCityErrorMsg = "Skriv by"; // City
+var SmallworldValidationCountryErrorMsg = "Skriv land"; // country
+var SmallworldValidationWebsiteErrorMsg = "Anfør website"; // Website
+var SmallworldSureDelete = "Sikker på du vil slette denne besked? Der er ingen undo!"; // Delete comments
+var SmallworldAdminSureDeleteUser = "Sikker på du vil slette bruger "; //Admin delete user
+var SmallworldDialogStatsTitle = "Statistik"; // Title for statistic dialog window
// Languages for jquery confirm box
var args = {
'confirm' : false, // Ok and Cancel buttons
@@ -44,7 +47,7 @@
'input' : false, // Text input (can be true or string for default text)
'animate' : true, // Groovy animation (can true or number, default is 400)
'textOk' : 'Okay', // Ok button default text
- 'textCancel' : 'Cancel', // Cancel button default text
- 'textYes' : 'Yes!', // Yes button default text
- 'textNo' : 'No!' // No button default text
+ 'textCancel' : 'Afbryd', // Cancel button default text
+ 'textYes' : 'Ja!', // Yes button default text
+ 'textNo' : 'Nej!' // No button default text
}
Modified: XoopsModules/smallworld/trunk/smallworld/language/danish/mailTpl/mail_attencionneeded.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/danish/mailTpl/mail_attencionneeded.html 2012-02-08 17:27:44 UTC (rev 8909)
+++ XoopsModules/smallworld/trunk/smallworld/language/danish/mailTpl/mail_attencionneeded.html 2012-02-08 19:03:48 UTC (rev 8910)
@@ -23,8 +23,8 @@
<!-- Begin Wrapper -->
<div id="wrapper">
<br>
- <p class="greeting">Hello <{$toUser}>,</p>
- <p class="infotext">UPDATE on <{$date}>. Check your profile on <{$sitename}>.<br><br>To go directly to smallworld index page follow this link<br><br><{$link}></p>
+ <p class="greeting">Hejsa <{$toUser}>,</p>
+ <p class="infotext">UPDATERING den <{$date}>. Check din profil på <{$sitename}>.<br><br>For at gå direkte til smallworld indexside følg dette link<br><br><{$link}></p>
<br>
</div>
<!-- End Wrapper -->
Modified: XoopsModules/smallworld/trunk/smallworld/language/danish/mailTpl/mail_complaint.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/danish/mailTpl/mail_complaint.html 2012-02-08 17:27:44 UTC (rev 8909)
+++ XoopsModules/smallworld/trunk/smallworld/language/danish/mailTpl/mail_complaint.html 2012-02-08 19:03:48 UTC (rev 8910)
@@ -23,15 +23,15 @@
<!-- Begin Wrapper -->
<div id="wrapper">
<br>
- <p class="greeting">Hello Admin,</p>
- <p class="infotext"><{$sendername}> has found something that needs you attention at <{$sitename}></p>
+ <p class="greeting">Hej Admin,</p>
+ <p class="infotext"><{$sendername}> har set noget der kræver din opmærksomhed på <{$sitename}></p>
<div id="news">
<!-- Begin News Navigation -->
<div id="newslist">
<ul>
<!-- Begin Entry Heading 1 -->
<li>
- <span style="font-size:11px">It looks to be in a thread owned by <{$against}> and <{$sendername}> reported this at <{$time}> (servertime)</h4>
+ <span style="font-size:11px">Det lader til at være en besked ejet af <{$against}> og <{$sendername}> anførte dette <{$time}> (servertid)</h4>
<h4 class="title"><span style="font-size:11px"><{$link}></span></h4>
</li>
</ul>
Modified: XoopsModules/smallworld/trunk/smallworld/language/danish/mailTpl/mail_newcomment.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/danish/mailTpl/mail_newcomment.html 2012-02-08 17:27:44 UTC (rev 8909)
+++ XoopsModules/smallworld/trunk/smallworld/language/danish/mailTpl/mail_newcomment.html 2012-02-08 19:03:48 UTC (rev 8910)
@@ -23,22 +23,22 @@
<!-- Begin Wrapper -->
<div id="wrapper">
<br>
- <p class="greeting">Hello <{$recievename}>,</p>
- <p class="infotext"><{$sendname}> commented your wall-update on <{$sitename}></p>
+ <p class="greeting">Hey <{$recievename}>,</p>
+ <p class="infotext"><{$sendname}> har kommenteret din vægbesked på <{$sitename}></p>
<div id="news">
<!-- Begin News Navigation -->
<div id="newslist">
<ul>
<!-- Begin Entry Heading 1 -->
<li><{$to_avatarlink}>
- <h4 class="title"><{$ownernameurl}> <span style="font-size:11px">Original message is</span></h4>
+ <h4 class="title"><{$ownernameurl}> <span style="font-size:11px">Den oprindelige besked var : </span></h4>
<p><{$ownermessage}></p>
</li>
<!-- End Entry Heading 1 -->
<!-- Begin Entry Heading 2 -->
<li style="margin-left:25px;width:780px"><{$from_avatarlink}>
- <h4 class="title2"><{$sendnameurl}> <span style="font-size:11px"> replied on (<{$itemtextdate}> servertime)</span></h4>
+ <h4 class="title2"><{$sendnameurl}> <span style="font-size:11px"> svarede den (<{$itemtextdate}> servertid)</span></h4>
<p><{$itemtext}></p>
</li>
<!-- End Entry Heading 2 -->
Modified: XoopsModules/smallworld/trunk/smallworld/language/danish/mailTpl/mail_register.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/danish/mailTpl/mail_register.html 2012-02-08 17:27:44 UTC (rev 8909)
+++ XoopsModules/smallworld/trunk/smallworld/language/danish/mailTpl/mail_register.html 2012-02-08 19:03:48 UTC (rev 8910)
@@ -23,15 +23,15 @@
<!-- Begin Wrapper -->
<div id="wrapper">
<br>
- <p class="greeting">Hello Admin,</p>
- <p class="infotext"><{$registername}> registered on <{$sitename}></p>
+ <p class="greeting">Hej Admin,</p>
+ <p class="infotext"><{$registername}> har registreret sig på <{$sitename}></p>
<div id="news">
<!-- Begin News Navigation -->
<div id="newslist">
<ul>
<!-- Begin Entry Heading 1 -->
<li><{$registerlink}>
- <h4 class="title"><{$registerurl}> <span style="font-size:11px">See profile here</span></h4>
+ <h4 class="title"><{$registerurl}> <span style="font-size:11px">Se profil her</span></h4>
</li>
</ul>
</div>
Modified: XoopsModules/smallworld/trunk/smallworld/language/danish/main.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/danish/main.php 2012-02-08 17:27:44 UTC (rev 8909)
+++ XoopsModules/smallworld/trunk/smallworld/language/danish/main.php 2012-02-08 19:03:48 UTC (rev 8910)
@@ -1,368 +1,378 @@
<?php
/**
* 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.
+* 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
-* @module: Smallworld
-* @Author: Michael Albertsen (http://culex.dk) <cu...@cu...>
-* @copyright: 2011 Culex
-* @Repository path: $HeadURL$
-* @Last committed: $Revision$
-* @Last changed by: $Author$
-* @Last changed date: $Date$
-* @ID: $Id$
+* @copyright: The XOOPS Project http://sourceforge.net/projects/xoops/
+* @license: http://www.fsf.org/copyleft/gpl.html GNU public license
+* @packet: Modules
+* @sub-packet: Smallworld
+* @since: Xoops 2.5.4
+* @Author: Michael Albertsen (http://culex.dk) <cu...@cu...>
+* @copyright: 2011 Culex
+* @Last committed: $Revision$
+* @Last changed by: $Author$
+* @Last changed date: $Date$
+* @ID: $Id$
**/
/*----------------- Menu items ---------------*/
/*------------ General items -------- */
-define("_SMALLWORLD_SYSERROR","System Error!");
+define("_SMALLWORLD_SYSERROR","System Fejl!");
define("_SMALLWORLD_SYSNAME","Smallworld");
+define("_SMALLWORLD_ALL_FIELDS_DISABLED","Ingen personlige informationer tilgængelige");
/*----------- Personal info ------------------*/
-define("_SMALLWORLD_AVATAR","Current Image");
-define("_SMALLWORLD_REALNAME","Real name");
-define("_SMALLWORLD_GENDER","Gender");
-define("_SMALLWORLD_INTERESTEDIN","Interested in");
-define("_SMALLWORLD_RELATIONSHIPSTATUS","Relationship status");
+define("_SMALLWORLD_AVATAR","Nuværende billede");
+define("_SMALLWORLD_REALNAME","Rigtige navn");
+define("_SMALLWORLD_GENDER","Køn");
+define("_SMALLWORLD_INTERESTEDIN","Intereseret i..");
+define("_SMALLWORLD_RELATIONSHIPSTATUS","Forholdsstatus");
define("_SMALLWORLD_PARTNER","Partner");
-define("_SMALLWORLD_LOOKINGFOR", "Looking for");
-define("_SMALLWORLD_BIRTHPLACE", "Birthplace");
-define("_SMALLWORLD_POLITICALVIEW", "Political view");
-define("_SMALLWORLD_RELIGIOUSVIEW", "Religious Views");
+define("_SMALLWORLD_LOOKINGFOR", "Søger..");
+define("_SMALLWORLD_BIRTHPLACE", "Fødselssted");
+define("_SMALLWORLD_POLITICALVIEW", "Politisk livssyn");
+define("_SMALLWORLD_RELIGIOUSVIEW", "Religiøst livssyn");
define("_SMALLWORLD_EMAILS","Emails");
/*--------------- contact info -----------------*/
-define("_SMALLWORLD_MOBILEPHONE","Mobile phone");
-define("_SMALLWORLD_LANDPHONE","Land phone");
-define("_SMALLWORLD_ADRESS","Street Adress");
-define("_SMALLWORLD_CITY","City");
+define("_SMALLWORLD_MOBILEPHONE","Mobil");
+define("_SMALLWORLD_LANDPHONE","Teleon");
+define("_SMALLWORLD_ADRESS","Adresse");
+define("_SMALLWORLD_CITY","By");
/*-------------- interests ---------------------*/
-define("_SMALLWORLD_WEBSITE","Website");
-define("_SMALLWORLD_INTERESTS","Interests");
-define("_SMALLWORLD_FAVOURITEMUSIC","Favourite music");
-define("_SMALLWORLD_FAVOURITEMOVIES","Favourite movie");
-define("_SMALLWORLD_ABOUTME","About me");
-define("_SMALLWORLD_ADDSCHOOLS","Add school / educations");
-define("_SMALLWORLD_ADDJOBS","Add jobs");
-define("_SMALLWORLD_VARIOUSINTERESTS","Various interests");
-define("_SMALLWORLD_CONTACTINFO","Contact info");
-define("_SMALLWORLD_PERSONALINFO","Personal info");
-define("_SMALLWORLD_NOFRIENDTEXT","Only friends can see the profile/wall text");
+define("_SMALLWORLD_WEBSITE","Webside");
+define("_SMALLWORLD_INTERESTS","Interesser");
+define("_SMALLWORLD_FAVOURITEMUSIC","Favoritmusik");
+define ("_SMALLWORLD_FAVOURITEMOVIES", "Favoritfilm");
+define ("_SMALLWORLD_ABOUTME", "Om mig");
+define ("_SMALLWORLD_ADDSCHOOLS", "Tilføj skole/uddannelse");
+define ("_SMALLWORLD_ADDJOBS", "Tilføj jobs");
+define ("_SMALLWORLD_VARIOUSINTERESTS", "Forskellige interesser");
+define ("_SMALLWORLD_CONTACTINFO", "Kontakt info");
+define ("_SMALLWORLD_PERSONALINFO", "Personlig info");
+define ("_SMALLWORLD_NOFRIENDTEXT", "Kun venner kan se profilen/vægtekst");
-/* --------------- Timezone, User profile text & stats ----------------*/
-define("_SMALLWORLD_TIMEZONE","Timezone");
-define("_SMALLWORLD_OCCUPATION","Occupation");
-define("_SMALLWORLD_MEMBERSINCE","Member since");
-define("_SMALLWORLD_MESSENGER","Messenger");
-define("_SMALLWORLD_TOTALPOSTS","Total posts");
-define("_SMALLWORLD_RANK","Rank");
-define("_SMALLWORLD_RANKIMAGE","Rank image");
-define("_SMALLWORLD_TOTALUSERRATINGS","Overall rating");
-define("_SMALLWORLD_LASTLOGIN","Last login");
-define("_SMALLWORLD_SIGNATURE","Signature");
-define("_SMALLWORLD_REPLY_NOTSPECIFIYED","Not specifiyed");
-define("_SMALLWORLD_BIRTHDAY","Birthday");
-define("_SMALLWORLD_AKA","aka");
-define("_SMALLWORLD_BORN","born");
-define("_SMALLWORLD_YEARSOLD","Years old");
-define("_SMALLWORLD_IN","in");
-define("_SMALLWORLD_HE","He");
-define("_SMALLWORLD_SHE","She");
-define("_SMALLWORLD_HEORSHE","He/She");
-define("_SMALLWORLD_LIVINGIN","is currently livin in");
-define("_SMALLWORLD_ISEMPLOYEDBY","is employed by");
-define("_SMALLWORLD_ATTENDED","attended");
-define("_SMALLWORLD_AND","and");
-define("_SMALLWORLD_BIOGRAPHY","Bio");
-define("_SMALLWORLD_EXTBIOGRAPHY","More info");
-define("_SMALLWORLD_NAME","Name");
-define("_SMALLWORLD_COUNTRY","Country");
+/* --------------- Tidszone, Bruger profil tekst og statistik ---------------- */
+define ("_SMALLWORLD_TIMEZONE", "Tidszone");
+define ("_SMALLWORLD_OCCUPATION", "Beskæftigelse");
+define ("_SMALLWORLD_MEMBERSINCE", "Medlem siden");
+define ("_SMALLWORLD_MESSENGER", "Messenger");
+define ("_SMALLWORLD_TOTALPOSTS", "Totale indlæg");
+define ("_SMALLWORLD_RANK", "Rang");
+define ("_SMALLWORLD_RANKIMAGE", "Rangbillede");
+define ("_SMALLWORLD_TOTALUSERRATINGS", "Samlet rating");
+define ("_SMALLWORLD_LASTLOGIN", "Sidste login");
+define ("_SMALLWORLD_SIGNATURE", "Signatur");
+define ("_SMALLWORLD_REPLY_NOTSPECIFIYED", "Ikke specificeret");
+define ("_SMALLWORLD_BIRTHDAY", "Fødselsdag");
+define ("_SMALLWORLD_AKA", "alias");
+define ("_SMALLWORLD_BORN", "født");
+define ("_SMALLWORLD_YEARSOLD", "år");
+define ("_SMALLWORLD_IN", "i");
+define ("_SMALLWORLD_HE", "han");
+define ("_SMALLWORLD_SHE", "Hun");
+define ("_SMALLWORLD_HEORSHE", "Han/hun");
+define ("_SMALLWORLD_LIVINGIN", "i øjeblikket bosiddende i");
+define ("_SMALLWORLD_ISEMPLOYEDBY", "er ansat ved");
+define ("_SMALLWORLD_ATTENDED", "gik på");
+define ("_SMALLWORLD_AND", "og");
+define ("_SMALLWORLD_BIOGRAPHY", "Bio");
+define ("_SMALLWORLD_EXTBIOGRAPHY", "Mere info");
+define ("_SMALLWORLD_NAME", "Navn");
+define ("_SMALLWORLD_COUNTRY", "Land");
-/*------------- Friends and follow ---------------------*/
-define("_SMALLWORLD_FRIEND","Make friends");
-define("_SMALLWORLD_FOLLOWFRIEND","Follow");
-define("_SMALLWORLD_SENDMESSAGE","Send message");
-define("_SMALLWORLD_MOREINFO","More info click here");
+/* ------------- Venner og følg --------------------- */
+define ("_SMALLWORLD_FRIEND", "Gør til ven");
+define ("_SMALLWORLD_FOLLOWFRIEND", "Følg");
+define ("_SMALLWORLD_SENDMESSAGE", "Send besked");
+define ("_SMALLWORLD_MOREINFO", "Mere info klik her");
-/*--------------------- Messages and boxes -----------------------------*/
-define("_SMALLWORLD_NOTYETUSER_GREETING","Welcome");
-define("_SMALLWORLD_NOTYETUSER_BOXTEXT","In order to use this module, you'll need to fill out an extra profile-form.
- <br><br>Press ok to continue to registration or press cancel<br><br>to go back to your index page.");
-define("_SMALLWORLD_NOTYETREGISTERED_TITLE","Continue to finish setup");
-define ("_SMALLWORLD_TEXTBEFORESUBMIT","Continue to save your information to the database.<br><br>After this you are able to visit your page,<br>and other users pages.<br><br>Tank you for your time.");
-define("_SMALLWORLD_FRIENDSINVITATIONS","Friendship requests");
-define("_SMALLWORLD_DATERECIEVED","Date");
-define("_SMALLWORLD_ACCEPT","Accept");
-define("_SMALLWORLD_DENY","Deny");
-define("_SMALLWORLD_LATER","Later");
-define("_SMALLWORLD_ACTION","Action");
-define("_SMALLWORLD_UPDATEID_NOT_EXIST","The message does not exist. Going back to index");
+/* --------------------- Meddelelser og kasser ----------------------------- */
+define ("_SMALLWORLD_NOTYETUSER_GREETING", "Velkommen");
+define ("_SMALLWORLD_NOTYETUSER_BOXTEXT", "For at bruge dette modul, skal du udfylde en ekstra profil-form.
+<br>Tryk på OK for at fortsætte til registrering eller tryk annuller<br> for at gå tilbage til indekssiden ").
+define ("_SMALLWORLD_NOTYETREGISTERED_TITLE", "Fortsæt for at afslutte registrering");
+define ("_SMALLWORLD_TEXTBEFORESUBMIT", "Fortsæt for at gemme dine oplysninger til databasen.<br> Efter dette er du er i stand til at besøge din profil, andre brugeres sider.<br>Tak for din tid ").
+define ("_SMALLWORLD_FRIENDSINVITATIONS", "Venskabsanmodninger");
+define ("_SMALLWORLD_DATERECIEVED", "Dato");
+define ("_SMALLWORLD_ACCEPT", "Accepter");
+define ("_SMALLWORLD_DENY", "Afvis");
+define ("_SMALLWORLD_LATER", "senere");
+define ("_SMALLWORLD_ACTION", "Handling");
+define ("_SMALLWORLD_UPDATEID_NOT_EXIST", "Beskeden eksisterer ikke gå tilbage til oversigten.");
/* ------------- Registerform ---------------------- */
-define("_SMALLWORLD_REGRISTATION_TITLE","Smallworld register profile");
-define("_SMALLWORLD_STEP1","Step 1 of 6");
-define("_SMALLWORLD_STEP2","Step 2 of 6");
-define("_SMALLWORLD_STEP3","Step 3 of 6");
-define("_SMALLWORLD_STEP4","Step 4 of 6");
-define("_SMALLWORLD_STEP5","Step 5 of 6");
-define("_SMALLWORLD_STEP6","End");
-define ("_SMALLWORLD_BELIEFS","Persuasions");
-define("_SMALLWORLD_FAVOURITETHINGS","Favourite things");
-define("_SMALLWORLD_FAVOURITEBOOKS","Favourite books");
-define("_SMALLWORLD_FAVOURITEMOVIE","Favourite movies");
-define("_SMALLWORLD_FAVOURITETVSHOW","Favourite tvshows");
-define("_SMALLWORLD_FAVOURITEINTERESTS","Favourite interests");
-define("_SMALLWORLD_INTERESTS_DESC","Interests, personal info & contact");
-define("_SMALLWORLD_CONTACTS","Contact info");
-define("_SMALLWORLD_EMAIL","Email(s)");
-define("_SMALLWORLD_SCREENNAMES","Screenname(s)");
-define("_SMALLWORLD_PHONE","Phone");
-define("_SMALLWORLD_GSM","Mobile");
-define("_SMALLWORLD_ISSINGLE","is at present single");
-define("_SMALLWORLD_INRELATIONSHIP","is in a relationship with");
-define("_SMALLWORLD_ISMARRIED","is married to");
-define("_SMALLWORLD_ISENGAGED","is engaged to");
-define("_SMALLWORLD_ISCOMPLICATED","is very secret when it comes to personal relationship with ");
-define("_SMALLWORLD_OPENRELATIONSHIP","is in an open relationship with");
-define("_SMALLWORLD_ADDITIONALINFO","Aditional info about ");
-define("_SMALLWORLD_HIS","His");
-define("_SMALLWORLD_HER","her");
-define("_SMALLWORLD_HISHER","his/her");
-define("_SMALLWORLD_POLITICWORD","politics");
-define("_SMALLWORLD_RELIGIONWORD","religion");
-define("_SMALLWORLD_IS","is");
-define("_SMALLWORLD_ADDSOMEINFO","Add or edit info");
-define("_SMALLWORLD_CHOOSE","Choose");
-define("_SMALLWORLD_WOMAN","Woman");
-define("_SMALLWORLD_MAN","Man");
-define("_SMALLWORLD_BOTH","Both");
-define("_SMALLWORLD_NONE","None");
-define("_SMALLWORLD_MARRIED","Married");
-define("_SMALLWORLD_ENGAGED","Engaged");
-define("_SMALLWORLD_SINGLE","Single");
-define("_SMALLWORLD_RELATIONSHIP","In a relationship");
-define("_SMALLWORLD_RELATIONSHIP_OPEN","In an open relationship");
-define("_SMALLWORLD_ITSCOMP","It's complicated");
-define("_SMALLWORLD_FRIENDSHIP","Friendship");
-define("_SMALLWORLD_DATING","Dating");
-define("_SMALLWORLD_ARELATIONSHIP","A Relationship");
-define("_SMALLWORLD_HANKYPANKY","Hanky panky");
-define("_SMALLWORLD_PVLIBERAL","Extreme left");
-define("_SMALLWORLD_PLIBERAL","Liberal");
-define("_SMALLWORLD_PMODERATE","Moderate");
-define("_SMALLWORLD_PCONSERVATIVE","Conservative");
-define("_SMALLWORLD_PVCONSERVATIVE","Very conservative");
-define("_SMALLWORLD_PLIBERTARIAN","Extreme right");
-define("_SMALLWORLD_POTHER","Other");
-define("_SMALLWORLD_RCHRISTIANITY","Christianity");
-define("_SMALLWORLD_RISLAM","Islam");
-define("_SMALLWORLD_RSECULAR","Secular/Nonreligious/Agnostic/Atheist");
-define("_SMALLWORLD_RHINDUISM","Hinduism");
-define("_SMALLWORLD_RCHINESETRAD","Chinese traditional religion");
-define("_SMALLWORLD_RBUDDHISM","Buddhism");
-define("_SMALLWORLD_RPRIMALIND","primal-indigenous");
-define("_SMALLWORLD_RAFRICANTRAD","African Traditional & Diasporic");
-define("_SMALLWORLD_RSIKHISM","Sikhism");
-define("_SMALLWORLD_RJUCHE","Juche");
-define("_SMALLWORLD_RSPIRITISM","Spiritism");
-define("_SMALLWORLD_RJUDAISM","Judaism");
-define("_SMALLWORLD_RBAHAI","Baha'i");
-define("_SMALLWORLD_RJAINISM","Jainism");
-define("_SMALLWORLD_RSHINTO","Shinto");
-define("_SMALLWORLD_RCAODAI","Cao Dai");
-define("_SMALLWORLD_RZOROASRIANISM","Zoroastrianism");
-define("_SMALLWORLD_RTENRIKYO","Tenrikyo");
-define("_SMALLWORLD_RNEOPAGANISM","Neo-Paganism");
-define("_SMALLWORLD_RUNITARIANUNIVERSALISM","Unitarian-Universalism");
-define("_SMALLWORLD_RRASTA","Rastafarianism");
-define("_SMALLWORLD_RSCIENTOLOGY","Scientology");
-define("_SMALLWORLD_ANCIENTALIENTHEORIST","Ancient alien theorist");
-define("_SMALLWORLD_ROTHER","Other");
-define("_SMALLWORLD_SUBMIT","Save");
-define("_SMALLWORLD_EMAILADRESSES","E-mail adress(es)");
+define ("_SMALLWORLD_REGRISTATION_TITLE", "Smallworld register profil");
+define ("_SMALLWORLD_STEP1", "Trin 1 af 6");
+define ("_SMALLWORLD_STEP2", "Trin 2 af 6");
+define ("_SMALLWORLD_STEP3", "Trin 3 af 6");
+define ("_SMALLWORLD_STEP4", "Trin 4 af 6");
+define ("_SMALLWORLD_STEP5", "Trin 5 af 6");
+define ("_SMALLWORLD_STEP6", "Slut");
+define ("_SMALLWORLD_BELIEFS", "overbevisninger");
+define ("_SMALLWORLD_FAVOURITETHINGS", "Favourit Ting");
+define ("_SMALLWORLD_FAVOURITEBOOKS", "Favoritbøger");
+define ("_SMALLWORLD_FAVOURITEMOVIE", "Favoritfilm");
+define ("_SMALLWORLD_FAVOURITETVSHOW", "Favorit tv programmer");
+define ("_SMALLWORLD_FAVOURITEINTERESTS", "Favoritinteresser");
+define ("_SMALLWORLD_INTERESTS_DESC", "Interesser, personlig information og kontakt");
+define ("_SMALLWORLD_CONTACTS", "Kontakt info");
+define ("_SMALLWORLD_EMAIL", "E-mail(s)");
+define ("_SMALLWORLD_SCREENNAMES", "Brugernavn(e)");
+define ("_SMALLWORLD_PHONE", "telefon");
+define ("_SMALLWORLD_GSM", "Mobil");
+define ("_SMALLWORLD_ISSINGLE", "er i øjeblikket single");
+define ("_SMALLWORLD_INRELATIONSHIP", "er i et forhold med");
+define ("_SMALLWORLD_ISMARRIED", "er gift med");
+define ("_SMALLWORLD_ISENGAGED", "er forlovet med");
+define ("_SMALLWORLD_ISCOMPLICATED", "er meget hemmeligt, når det kommer til personlige forhold med");
+define ("_SMALLWORLD_OPENRELATIONSHIP", "er i et åbent forhold med");
+define ("_SMALLWORLD_ADDITIONALINFO", "yderlig info om");
+define ("_SMALLWORLD_HIS", "Hans");
+define ("_SMALLWORLD_HER", "hendes");
+define ("_SMALLWORLD_HISHER", "hans/hendes");
+define ("_SMALLWORLD_POLITICWORD", "politik");
+define ("_SMALLWORLD_RELIGIONWORD", "religion");
+define ("_SMALLWORLD_IS", "er");
+define ("_SMALLWORLD_ADDSOMEINFO", "Tilføj eller rediger oplysninger");
+define ("_SMALLWORLD_CHOOSE", "Vælg");
+define ("_SMALLWORLD_WOMAN", "Kvinde");
+define ("_SMALLWORLD_MAN", "Mand");
+define ("_SMALLWORLD_BOTH", "Begge");
+define ("_SMALLWORLD_NONE", "Ingen");
+define ("_SMALLWORLD_MARRIED", "Gift");
+define ("_SMALLWORLD_ENGAGED", "Forlovet");
+define ("_SMALLWORLD_SINGLE", "Single");
+define ("_SMALLWORLD_RELATIONSHIP", "I forhold");
+define ("_SMALLWORLD_RELATIONSHIP_OPEN", "I et åbent forhold");
+define ("_SMALLWORLD_ITSCOMP", "Det er kompliceret");
+define ("_SMALLWORLD_FRIENDSHIP", "Venskab");
+define ("_SMALLWORLD_DATING", "Dating");
+define ("_SMALLWORLD_ARELATIONSHIP", "et forhold");
+define ("_SMALLWORLD_HANKYPANKY", "Hanky Panky");
+define ("_SMALLWORLD_PVLIBERAL", "Extremt venstre");
+define ("_SMALLWORLD_PLIBERAL", "Liberal");
+define ("_SMALLWORLD_PMODERATE", "moderat");
+define ("_SMALLWORLD_PCONSERVATIVE", "konservativ");
+define ("_SMALLWORLD_PVCONSERVATIVE", "meget konservativ");
+define ("_SMALLWORLD_PLIBERTARIAN", "Extremt højre");
+define ("_SMALLWORLD_POTHER", "Andet");
+define ("_SMALLWORLD_RCHRISTIANITY", "kristendom");
+define ("_SMALLWORLD_RISLAM", "islam");
+define ("_SMALLWORLD_RSECULAR", "Verdslige/ikke-religiøse/Agnostiker/Atheist");
+define ("_SMALLWORLD_RHINDUISM", "hinduisme");
+define ("_SMALLWORLD_RCHINESETRAD", "kinesisk traditionel religion");
+define ("_SMALLWORLD_RBUDDHISM", "buddhisme");
+define ("_SMALLWORLD_RPRIMALIND", "Primal-indfødte");
+define ("_SMALLWORLD_RAFRICANTRAD", "African Traditional & Diasporic");
+define ("_SMALLWORLD_RSIKHISM", "Sikhisme");
+define ("_SMALLWORLD_RJUCHE", "Juche");
+define ("_SMALLWORLD_RSPIRITISM", "Spiritismen");
+define ("_SMALLWORLD_RJUDAISM", "Jødedom");
+define ("_SMALLWORLD_RBAHAI", "Baha'i");
+define ("_SMALLWORLD_RJAINISM", "Jainisme");
+define ("_SMALLWORLD_RSHINTO", "Shinto");
+define ("_SMALLWORLD_RCAODAI", "Cao Dai");
+define ("_SMALLWORLD_RZOROASRIANISM", "Zarathustrianisme");
+define ("_SMALLWORLD_RTENRIKYO", "Tenrikyo");
+define ("_SMALLWORLD_RNEOPAGANISM", "Neo-hedenskabet");
+define ("_SMALLWORLD_RUNITARIANUNIVERSALISM", "Unitarian-universalisme");
+define ("_SMALLWORLD_RRASTA", "Rastafarianism");
+define ("_SMALLWORLD_RSCIENTOLOGY", "Scientologi");
+define ("_SMALLWORLD_ANCIENTALIENTHEORIST", "Ancient alien teoretiker");
+define ("_SMALLWORLD_ROTHER", "Andet");
+define ("_SMALLWORLD_SUBMIT", "Gem");
+define ("_SMALLWORLD_EMAILADRESSES", "E-mail adresse(r)");
-// dropdown screen names
-define("_SMALLWORLD_SCREENNAME_AIM","MSN (uname) ");
-define("_SMALLWORLD_SCREENNAME_FACEBOOK","Facebook (uname) ");
-define("_SMALLWORLD_SCREENNAME_GOOGLE","Google+ (id) ");
-define("_SMALLWORLD_SCREENNAME_ICQ","ICQ (id number)");
-define("_SMALLWORLD_SCREENNAME_SKYPE","Skype (uname) ");
-define("_SMALLWORLD_SCREENNAME_TWITTER","Twitter (uname) ");
-define("_SMALLWORLD_SCREENNAME_MYSPACE","MySpace (uname) ");
-define("_SMALLWORLD_SCREENNAME_XOOPS","Xoops (uid) ");
-define("_SMALLWORLD_SCREENNAME_YAHOO","Yahoo (yahoo id) ");
-define("_SMALLWORLD_SCREENNAME_YOUTUBE","Youtube (uname) ");
-define("_SMALLWORLD_ADDMORE","Add more");
-define("_SMALLWORLD_REMOVE","Remove");
+// Dropdown skærmnavne
+define ("_SMALLWORLD_SCREENNAME_AIM", "MSN (uname)");
+define ("_SMALLWORLD_SCREENNAME_FACEBOOK", "Facebook (uname)");
+define ("_SMALLWORLD_SCREENNAME_GOOGLE", "Google + (id)");
+define ("_SMALLWORLD_SCREENNAME_ICQ", "ICQ (ID-nummer)");
+define ("_SMALLWORLD_SCREENNAME_SKYPE", "Skype (uname)");
+define ("_SMALLWORLD_SCREENNAME_TWITTER", "Twitter (uname)");
+define ("_SMALLWORLD_SCREENNAME_MYSPACE", "MySpace (uname)");
+define ("_SMALLWORLD_SCREENNAME_XOOPS", "Xoops (UID)");
+define ("_SMALLWORLD_SCREENNAME_YAHOO", "Yahoo (yahoo id)");
+define ("_SMALLWORLD_SCREENNAME_YOUTUBE", "Youtube (uname)");
+define ("_SMALLWORLD_ADDMORE", "Tilføj mere");
+define ("_SMALLWORLD_REMOVE", "Fjern");
-/*------------ Schools ----------*/
+/* ------------ Skoler ---------- */
-define("_SMALLWORLD_KINDERGARDEN","kindergarten");
-define("_SMALLWORLD_NURSERY","nursery");
-define("_SMALLWORLD_ELEMSCHOOL","elementary school");
-define("_SMALLWORLD_GRADUATESCHOOL","graduate school");
-define("_SMALLWORLD_HIGHSCHOOL","high school");
-define("_SMALLWORLD_JUNIORHIGH","junior high school");
-define("_SMALLWORLD_JUNIORCOLLEGE","junior college");
-define("_SMALLWORLD_COLLEGE","college");
-define("_SMALLWORLD_TECNICAL","technical school");
-define("_SMALLWORLD_UNIVERSITY","university");
-define("_SMALLWORLD_SCHOOLNAME","School name");
-define("_SMALLWORLD_SCHOOLTYPE","School type");
-define("_SMALLWORLD_START","Year started");
-define("_SMALLWORLD_STOP","Year ended");
-define("_SMALLWORLD_MUSIC","Favourite music");
-define("_SMALLWORLD_TVSHOW","Favourite tv show");
-define("_SMALLWORLD_MOVIE","favourite movie");
-define("_SMALLWORLD_BOOKS","favourite books");
-define("_SMALLWORLD_EMPLOYER","Employer");
-define("_SMALLWORLD_POSITION","Job position");
-define("_SMALLWORLD_DESCRIPTION","Job description");
-define("_SMALLWORLD_JOBSTART","Job started");
-define("_SMALLWORLD_JOBSTOP","Job ended");
-define("_SMALLWORLD_NOACCOUNT","It doesn't look like you have an account. Or your profile is missing informations.");
-define("_SMALLWORLD_REGXOOPS","Press here to register");
-define("_SMALLWORLD_REGSMALLWORLD","Press here to edit/create profile details");
-define("_SMALLWORLD_WORKFULL_TITLE","All workplaces");
-define("_SMALLWORLD_SCHOOLFULL_TITLE","All Educations");
-define("_SMALLWORLD_INTERESTS_TITLE","Interests & contact");
-define("_SMALLWORLD_MORE","..more");
+define ("_SMALLWORLD_KINDERGARDEN", "børnehave");
+define ("_SMALLWORLD_NURSERY", "vuggestue");
+define ("_SMALLWORLD_ELEMSCHOOL", "grundskole");
+define ("_SMALLWORLD_GRADUATESCHOOL", "Forskerskole");
+define ("_SMALLWORLD_HIGHSCHOOL", "Afgangsskole");
+define ("_SMALLWORLD_JUNIORHIGH", "Mellemskole");
+define ("_SMALLWORLD_JUNIORCOLLEGE", "Gymnasium");
+define ("_SMALLWORLD_COLLEGE", "Gymnasium");
+define ("_SMALLWORLD_TECNICAL", "teknisk skole");
+define ("_SMALLWORLD_UNIVERSITY", "universitet");
+define ("_SMALLWORLD_SCHOOLNAME", "Skolens navn");
+define ("_SMALLWORLD_SCHOOLTYPE", "Skole type");
+define ("_SMALLWORLD_START", "Startet år");
+define ("_SMALLWORLD_STOP", "sluttede år");
+define ("_SMALLWORLD_MUSIC", "Yndlingsmusik");
+define ("_SMALLWORLD_TVSHOW", "favorit TV program");
+define ("_SMALLWORLD_MOVIE", "favoritfilm");
+define ("_SMALLWORLD_BOOKS", "favoritbøger");
+define ("_SMALLWORLD_EMPLOYER", "arbejdsgiver");
+define ("_SMALLWORLD_POSITION", "Job position");
+define ("_SMALLWORLD_DESCRIPTION", "Jobbeskrivelse");
+define ("_SMALLWORLD_JOBSTART", "Job startet");
+define ("_SMALLWORLD_JOBSTOP", "Job afsluttet");
+define ("_SMALLWORLD_NOACCOUNT", "Det ser ikke ud som om du har en konto eller din profil mangler informationer..");
+define ("_SMALLWORLD_REGXOOPS", "Tryk her for at registrere");
+define ("_SMALLWORLD_REGSMALLWORLD", "Tryk her for at redigere/oprette profil detaljer");
+define ("_SMALLWORLD_WORKFULL_TITLE", "Alle arbejdspladser");
+define ("_SMALLWORLD_SCHOOLFULL_TITLE", "Alle Uddannelser");
+define ("_SMALLWORLD_INTERESTS_TITLE", "Interesser og kontakt");
+define ("_SMALLWORLD_MORE", ".. mere");
-/*-------------- Upload form --------------------*/
-define('_SMALLWORLD_UPLOAD_HOWTO','All images from your album is shown here, and you can use this tool to upload or delete images<br><br>Press the green upload file(s), Select your pictures and upload eighter:<br>1) One by one using the <img src="images/icon_start.PNG" style="display: inline-block;height:13px;"/> icon.<br>2) Select multible by browsing or Drag* files onto the green upload (* does currently not work in IE) and press start all<br><br>Note: If you choose other filetypes than image files the script wil break. Image size is maximum 5 MBytes<br><br>');
-define('_SMALLWORLD_UPLOADTITLE','Image title');
-define('_SMALLWORLD_UPLOADDESC','Image description');
-define('_SMALLWORLD_UPLOAD_TITLE','Upload images to your image album');
-define('_SMALLWORLD_UPLOADTEXT','Start upload');
-define('_SMALLWORLD_UPLOADFILESTEXT','Upload image(s)');
-define('_SMALLWORLD_IMGDESCRIPTION','Image description');
-define('_SMALLWORLD_IMGTITLE','Image title');
-define('_SMALLWORLD_IMAGE_EDIT_TITLE','Edit descriptions where neded at send');
-define("_SMALLWORLD_WELCOME_TITLE","Welcome");
-define("_SMALLWORLD_WELCOMETEXT",", welcome. Hope you'll enjoy your stay.");
-define("_SMALLWORLD_UPLOADEDSOMEIMAGES"," Uploaded some new pictures <br/>");
+/* -------------- Upload formular -------------------- */
+define ('_SMALLWORLD_UPLOAD_HOWTO', 'Alle billeder fra dit album er vist her, og du kan bruge dette værktøj til at uploade eller slette billeder <br>Tryk på den grønne upload fil(er), Vælg dine billeder og uploade enten: < br> 1) En efter en - brug <img src="images/icon_start.PNG" style="display: inline-block;height:13px;"/>ikon.<br> 2) Vælg flere ved gennemsyn eller Drag * filer over på den grønne upload (* virker pt. ikke i IE) og tryk på Start alle <br> Bemærk: Hvis du vælger andre filtyper end billedfiler vil scriptet afbryde. Billedstørrelsen er højst 5 MBytes <br> ');
+define ('_SMALLWORLD_UPLOADTITLE', 'Billedtitel');
+define ('_SMALLWORLD_UPLOADDESC', 'Billedbeskrivelse');
+define ('_SMALLWORLD_UPLOAD_TITLE', 'Upload billeder til dit album');
+define ('_SMALLWORLD_UPLOADTEXT', 'Start upload');
+define ('_SMALLWORLD_UPLOADFILESTEXT', 'Vælg billede(r)');
+define ('_SMALLWORLD_IMGDESCRIPTION', 'Billedebeskrivelse');
+define ('_SMALLWORLD_IMGTITLE', 'Billedetitel');
+define ('_SMALLWORLD_IMAGE_EDIT_TITLE', 'Rediger beskrivelser, efter du trykker Send');
+define ("_SMALLWORLD_WELCOME_TITLE", "Velkommen");
+define ("_SMALLWORLD_WELCOMETEXT", "., velkommen Håber du vil nyde dit ophold.");
+define ("_SMALLWORLD_UPLOADEDSOMEIMAGES", "oploadede no'en nye billeder <br/>");
+define ("_SMALLWORLD_IMAGES_START", "Start");
+define ("_SMALLWORLD_IMAGES_CANCEL", "Afbryd");
+define ("_SMALLWORLD_IMAGES_DELETE", "Slet");
+define ("_SMALLWORLD_IMAGES_STARTALL", "Start Alle");
+define ("_SMALLWORLD_IMAGES_CANCELALL", "Afbryd Alle");
+define ("_SMALLWORLD_IMAGES_DELETEALL", "Slet alle");
-/*-------------- Image gallery -------------*/
-define("_SMALLWORLD_ALBUMTITLETEXT","Close album");
-define("_SMALLWORLD_TITLEHEADER","Photo album");
-define("_SMALLWORLD_NOIMAGES"," has no images yet");
-define("_SMALLWORLD_GOTOUPLOADIMAGE"," Upload or delete images");
-define("_SMALLWORLD_EDITDESCRIPTION","Edit image description");
-define("_SMALLWORLD_NOTFRIENDNOIMAGES","You can only view friends picture albums!");
-define("_SMALLWORLD_GALLERY_DOWNLOADORIGINAL","Download Original");
-define("_SMALLWORLD_GALLEY_NEXTPAGE","Next Page");
-define("_SMALLWORLD_GALLEY_PREVIOUSPAGE","Previous page");
+/* -------------- Billedgalleri ------------- */
+define ("_SMALLWORLD_ALBUMTITLETEXT", "Luk album");
+define ("_SMALLWORLD_TITLEHEADER", "Fotoalbum");
+define ("_SMALLWORLD_NOIMAGES", "har endnu ingen billeder");
+define ("_SMALLWORLD_GOTOUPLOADIMAGE", "Opload eller slet billeder");
+define ("_SMALLWORLD_EDITDESCRIPTION", "Rediger billedbeskrivelse");
+define ("_SMALLWORLD_NOTFRIENDNOIMAGES", "Du kan kun se venners albums!");
+define ("_SMALLWORLD_GALLERY_DOWNLOADORIGINAL", "Download Original");
+define ("_SMALLWORLD_GALLEY_NEXTPAGE", "Næste side");
+define ("_SMALLWORLD_GALLEY_PREVIOUSPAGE", "Forrige side");
-/*-------------- Search ----------------*/...
[truncated message content] |
|
From: <dh...@us...> - 2012-02-08 17:27:58
|
Revision: 8909
http://xoops.svn.sourceforge.net/xoops/?rev=8909&view=rev
Author: dhcst
Date: 2012-02-08 17:27:44 +0000 (Wed, 08 Feb 2012)
Log Message:
-----------
update to newBB 4.2
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/admin/admin_cat_manager.php
XoopsModules/newbb/branches/alfred/newbb/admin/admin_forum_manager.php
XoopsModules/newbb/branches/alfred/newbb/admin/admin_header.php
XoopsModules/newbb/branches/alfred/newbb/admin/admin_permissions.php
XoopsModules/newbb/branches/alfred/newbb/admin/index.php
XoopsModules/newbb/branches/alfred/newbb/class/forum.php
XoopsModules/newbb/branches/alfred/newbb/class/permission.forum.php
XoopsModules/newbb/branches/alfred/newbb/class/permission.php
XoopsModules/newbb/branches/alfred/newbb/class/post.php
XoopsModules/newbb/branches/alfred/newbb/class/topic.renderer.php
XoopsModules/newbb/branches/alfred/newbb/class/user.php
XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt
XoopsModules/newbb/branches/alfred/newbb/header.php
XoopsModules/newbb/branches/alfred/newbb/include/functions.forum.php
XoopsModules/newbb/branches/alfred/newbb/include/functions.image.php
XoopsModules/newbb/branches/alfred/newbb/include/images.php
XoopsModules/newbb/branches/alfred/newbb/include/plugin.php
XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php
XoopsModules/newbb/branches/alfred/newbb/language/english/blocks.php
XoopsModules/newbb/branches/alfred/newbb/language/english/main.php
XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php
XoopsModules/newbb/branches/alfred/newbb/language/german/admin.php
XoopsModules/newbb/branches/alfred/newbb/language/german/blocks.php
XoopsModules/newbb/branches/alfred/newbb/language/german/main.php
XoopsModules/newbb/branches/alfred/newbb/language/german/modinfo.php
XoopsModules/newbb/branches/alfred/newbb/post.php
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_edit_post.html
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_online.html
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_poll_view.html
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_search.html
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_thread.html
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewall.html
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum.html
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewpost.html
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewtopic.html
XoopsModules/newbb/branches/alfred/newbb/templates/style.css
XoopsModules/newbb/branches/alfred/newbb/topicmanager.php
XoopsModules/newbb/branches/alfred/newbb/viewforum.php
XoopsModules/newbb/branches/alfred/newbb/viewpost.php
XoopsModules/newbb/branches/alfred/newbb/viewtopic.php
XoopsModules/newbb/branches/alfred/newbb/votepolls.php
XoopsModules/newbb/branches/alfred/newbb/xoops_version.php
Added Paths:
-----------
XoopsModules/newbb/branches/alfred/newbb/templates/images/icon/buzz.png
XoopsModules/newbb/branches/alfred/newbb/templates/images/icon/delicious.png
XoopsModules/newbb/branches/alfred/newbb/templates/images/icon/digg.png
XoopsModules/newbb/branches/alfred/newbb/templates/images/icon/facebook.png
XoopsModules/newbb/branches/alfred/newbb/templates/images/icon/friendfeed.png
XoopsModules/newbb/branches/alfred/newbb/templates/images/icon/linkedin.png
XoopsModules/newbb/branches/alfred/newbb/templates/images/icon/reddit.png
XoopsModules/newbb/branches/alfred/newbb/templates/images/icon/stumbleupon.png
XoopsModules/newbb/branches/alfred/newbb/templates/images/icon/technorati.png
XoopsModules/newbb/branches/alfred/newbb/templates/images/icon/twitter.png
XoopsModules/newbb/branches/alfred/newbb/templates/images/icon/wong.png
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_notification_select.html
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_cat_manager.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_cat_manager.php 2012-02-08 13:37:46 UTC (rev 8908)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_cat_manager.php 2012-02-08 17:27:44 UTC (rev 8909)
@@ -212,6 +212,7 @@
echo "</fieldset>";
break;
}
+mod_clearFile("","xoops_newbb");
echo "</fieldset>";
xoops_cp_footer();
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_forum_manager.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_forum_manager.php 2012-02-08 13:37:46 UTC (rev 8908)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_forum_manager.php 2012-02-08 17:27:44 UTC (rev 8909)
@@ -117,7 +117,7 @@
$forum_handler->delete($forum_obj);
- mod_clearCacheFile("forum", "xoops_newbb");
+ //mod_clearCacheFile("forum", "newbb");
$forum_handler->synchronization($forum_dest);
unset($forum_dest);
mod_clearCacheFile("forum", "xoops_newbb");
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_header.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_header.php 2012-02-08 13:37:46 UTC (rev 8908)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_header.php 2012-02-08 17:27:44 UTC (rev 8909)
@@ -35,7 +35,8 @@
include_once XOOPS_ROOT_PATH."/Frameworks/art/functions.php";
include_once XOOPS_ROOT_PATH."/Frameworks/art/functions.admin.php";
-xoops_loadLanguage('main');
+xoops_loadLanguage('main','newbb');
+xoops_loadLanguage('modinfo','newbb');
$newXoopsModuleGui = false;
if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){
include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_permissions.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_permissions.php 2012-02-08 13:37:46 UTC (rev 8908)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_permissions.php 2012-02-08 17:27:44 UTC (rev 8909)
@@ -336,6 +336,7 @@
break;
}
+mod_clearCacheFile("","xoops_newbb");
echo "</fieldset></fieldset>";
xoops_cp_footer();
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/index.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/index.php 2012-02-08 13:37:46 UTC (rev 8908)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/index.php 2012-02-08 17:27:44 UTC (rev 8909)
@@ -356,9 +356,9 @@
$moderate_handler->clearGarbage();
}
- mod_clearFile("","xoops_newbb");
}
mod_clearFile("","xoops_newbb");
+ mod_clearFile("","newbb");
echo "</fieldset>";
xoops_cp_footer();
break;
Modified: XoopsModules/newbb/branches/alfred/newbb/class/forum.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/forum.php 2012-02-08 13:37:46 UTC (rev 8908)
+++ XoopsModules/newbb/branches/alfred/newbb/class/forum.php 2012-02-08 17:27:44 UTC (rev 8909)
@@ -43,7 +43,7 @@
$this->initVar('cat_id', XOBJ_DTYPE_INT);
$this->initVar('parent_forum', XOBJ_DTYPE_INT);
$this->initVar('hot_threshold', XOBJ_DTYPE_INT, 20);
- $this->initVar('attach_maxkb', XOBJ_DTYPE_INT, 100);
+ $this->initVar('attach_maxkb', XOBJ_DTYPE_INT, 500);
$this->initVar('attach_ext', XOBJ_DTYPE_SOURCE, "zip|jpg|gif|png");
$this->initVar('forum_order', XOBJ_DTYPE_INT, 99);
$this->initVar("dohtml", XOBJ_DTYPE_INT, 1);
Modified: XoopsModules/newbb/branches/alfred/newbb/class/permission.forum.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/permission.forum.php 2012-02-08 13:37:46 UTC (rev 8908)
+++ XoopsModules/newbb/branches/alfred/newbb/class/permission.forum.php 2012-02-08 17:27:44 UTC (rev 8909)
@@ -191,13 +191,13 @@
function getTemplate()
{
- $perms = mod_loadFile("perm_template", "newbb");
+ $perms = mod_loadFile("perm_template", "xoops_newbb");
return $perms;
}
function setTemplate($perms)
{
- return mod_createFile($perms, "perm_template", "newbb");
+ return mod_createFile($perms, "perm_template", "xoops_newbb");
}
}
Modified: XoopsModules/newbb/branches/alfred/newbb/class/permission.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/permission.php 2012-02-08 13:37:46 UTC (rev 8908)
+++ XoopsModules/newbb/branches/alfred/newbb/class/permission.php 2012-02-08 17:27:44 UTC (rev 8909)
@@ -192,7 +192,8 @@
function &loadPermData($perm_name = "forum_access")
{
load_functions("cache");
- if (!$perms = mod_loadCacheFile("permission_{$perm_name}", "xoops_newbb")) {
+ if (!$perms = mod_loadCacheFile("permission_{$perm_name}", "newbb")) {
+
$perms = $this->createPermData($perm_name);
}
@@ -212,8 +213,8 @@
}
}
if ($this->_checkRight($perm, $itemid, $groupid, $mid)) return true;
- //load_functions("cache");
- //mod_clearCacheFile("permission", "xoops_newbb");
+ load_functions("cache");
+ mod_clearCacheFile("permission", "xoops_newbb");
$this->addRight($perm, $itemid, $groupid, $mid);
return true;
}
Modified: XoopsModules/newbb/branches/alfred/newbb/class/post.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/post.php 2012-02-08 13:37:46 UTC (rev 8908)
+++ XoopsModules/newbb/branches/alfred/newbb/class/post.php 2012-02-08 17:27:44 UTC (rev 8909)
@@ -177,10 +177,13 @@
$isDisplayed = true;
} else {
global $xoopsUser;
- if (($xoopsUser && $xoopsUser->uid() > 0 && $xoopsUser->isactive()) || empty($xoopsModuleConfig['show_only_user_attach']))
- $post_attachment .= '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar("dirname", "n") . '/dl_attachment.php?attachid=' . $key . '&post_id=' . $this->getVar('post_id') . '"> <img src="' . $icon_filetype . '" alt="' . $filetype . '" /> ' . $att['name_display'] . '</a> ' . _MD_FILESIZE . ': '. $file_size . '; '._MD_HITS.': ' . $att['num_download'];
- else
- $post_attachment .= _MD_NEWBB_SEENOTGUEST;
+ if (empty($xoopsModuleConfig['show_userattach'])) {
+ $post_attachment .= '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar("dirname", "n") . '/dl_attachment.php?attachid=' . $key . '&post_id=' . $this->getVar('post_id') . '"> <img src="' . $icon_filetype . '" alt="' . $filetype . '" /> ' . $att['name_display'] . '</a> ' . _MD_FILESIZE . ': '. $file_size . '; '._MD_HITS.': ' . $att['num_download'];
+ } elseif (($xoopsUser && $xoopsUser->uid() > 0 && $xoopsUser->isactive()) ) {
+ $post_attachment .= '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar("dirname", "n") . '/dl_attachment.php?attachid=' . $key . '&post_id=' . $this->getVar('post_id') . '"> <img src="' . $icon_filetype . '" alt="' . $filetype . '" /> ' . $att['name_display'] . '</a> ' . _MD_FILESIZE . ': '. $file_size . '; '._MD_HITS.': ' . $att['num_download'];
+ } else {
+ $post_attachment .= _MD_NEWBB_SEENOTGUEST;
+ }
}
$post_attachment .= '<br />';
}
@@ -468,7 +471,7 @@
if (file_exists(XOOPS_ROOT_PATH."/Frameworks/tcpdf/tcpdf.php")) {
$thread_action['pdf']['image'] = newbb_displayImage('pdf', _MD_PDF);
- $thread_action['pdf']['link'] = "makepdf.php?type=post&pageid=0";
+ $thread_action['pdf']['link'] = XOOPS_URL."/modules/newbb/makepdf.php?type=post&pageid=0";
$thread_action['pdf']['name'] = _MD_PDF;
$thread_action['pdf']['target'] = '_blank';
}
@@ -477,6 +480,62 @@
$thread_action['print']['link'] = "print.php?form=2&forum=". $forum_id."&topic_id=" . $topic_id;
$thread_action['print']['name'] = _MD_PRINT;
$thread_action['print']['target'] = '_blank';
+
+ if ( $xoopsModuleConfig['show_sociallinks']) {
+
+ $full_title = $this->getVar('subject');
+ $clean_title =preg_replace('/[^A-Za-z0-9-]+/', '+', $this->getVar('subject'));
+ $full_link = XOOPS_URL."/modules/newbb/viewtopic.php?post_id=".$post_id;
+
+ $thread_action['social_twitter']['image'] = newbb_displayImage('twitter', _MD_SHARE_TWITTER);
+ $thread_action['social_twitter']['link'] = "http://twitter.com/share?text=".$clean_title."&url=".$full_link;
+ $thread_action['social_twitter']['name'] = _MD_SHARE_TWITTER;
+ $thread_action['social_twitter']['target'] = '_blank';
+
+ $thread_action['social_facebook']['image'] = newbb_displayImage('facebook', _MD_SHARE_FACEBOOK);
+ $thread_action['social_facebook']['link'] = "http://www.facebook.com/sharer.php?u=".$full_link;
+ $thread_action['social_facebook']['name'] = _MD_SHARE_FACEBOOK;
+ $thread_action['social_facebook']['target'] = '_blank';
+
+ $thread_action['social_buzz']['image'] = newbb_displayImage('buzz', _MD_SHARE_BUZZ);
+ $thread_action['social_buzz']['link'] = "http://www.google.com/buzz/post?url=".$full_link;
+ $thread_action['social_buzz']['name'] = _MD_SHARE_BUZZ;
+ $thread_action['social_buzz']['target'] = '_blank';
+
+ $thread_action['social_linkedin']['image'] = newbb_displayImage('linkedin', _MD_SHARE_LINKEDIN);
+ $thread_action['social_linkedin']['link'] = "http://www.linkedin.com/shareArticle?mini=true&title=".$full_title."&url=".$full_link;
+ $thread_action['social_linkedin']['name'] = _MD_SHARE_LINKEDIN;
+ $thread_action['social_linkedin']['target'] = '_blank';
+
+ $thread_action['social_delicious']['image'] = newbb_displayImage('delicious', _MD_SHARE_DELICIOUS);
+ $thread_action['social_delicious']['link'] = "http://del.icio.us/post?title=".$full_title."&url=".$full_link;
+ $thread_action['social_delicious']['name'] = _MD_SHARE_DELICIOUS;
+ $thread_action['social_delicious']['target'] = '_blank';
+
+ $thread_action['social_digg']['image'] = newbb_displayImage('digg', _MD_SHARE_DIGG);
+ $thread_action['social_digg']['link'] = "http://digg.com/submit?phase=2&title=".$full_title."&url=".$full_link;
+ $thread_action['social_digg']['name'] = _MD_SHARE_DIGG;
+ $thread_action['social_digg']['target'] = '_blank';
+
+ $thread_action['social_reddit']['image'] = newbb_displayImage('reddit', _MD_SHARE_REDDIT);
+ $thread_action['social_reddit']['link'] = "http://reddit.com/submit?title=".$full_title."&url=".$full_link;
+ $thread_action['social_reddit']['name'] = _MD_SHARE_REDDIT;
+ $thread_action['social_reddit']['target'] = '_blank';
+
+ $thread_action['social_wong']['image'] = newbb_displayImage('wong', _MD_SHARE_MRWONG);
+ $thread_action['social_wong']['link'] = "http://www.mister-wong.de/index.php?action=addurl&bm_url=".$full_link;
+ $thread_action['social_wong']['name'] = _MD_SHARE_WONG;
+ $thread_action['social_wong']['target'] = '_blank';
+
+ /*
+ $thread_action['social_technorati']['image'] = newbb_displayImage('technorati', _MD_SHARE_REDDIT);
+ $thread_action['social_technorati']['link'] = "http://technorati.com/faves/?add=".$full_link;
+ $thread_action['social_technorati']['name'] = _MD_SHARE_REDDIT;
+ $thread_action['social_technorati']['target'] = '_blank';
+ */
+
+ }
+
$post = array(
'post_id' => $post_id,
'post_parent_id' => $this->getVar('pid'),
Modified: XoopsModules/newbb/branches/alfred/newbb/class/topic.renderer.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/topic.renderer.php 2012-02-08 13:37:46 UTC (rev 8908)
+++ XoopsModules/newbb/branches/alfred/newbb/class/topic.renderer.php 2012-02-08 17:27:44 UTC (rev 8909)
@@ -485,7 +485,13 @@
}
require_once XOOPS_ROOT_PATH.'/class/pagenav.php';
$nav = new XoopsPageNav($count_topic, $this->config['topics_per_page'], @$this->vars["start"], "start", implode("&", $args));
- $xoopsTpl->assign('pagenav', $nav->renderNav(4));
+ if ($this->config['pagenav_display'] == 'select')
+ $navi = $nav->renderSelect();
+ elseif ($this->config['pagenav_display'] == 'bild')
+ $navi = $nav->renderImageNav(4);
+ else
+ $navi = $nav->renderNav(4);
+ $xoopsTpl->assign('pagenav', $navi);
} else {
$xoopsTpl->assign('pagenav', '');
}
@@ -568,7 +574,7 @@
' WHERE '.implode(" AND ", $wheres).
' AND '.@implode(" AND ", @$this->query["where"]).
' ORDER BY '.implode(", ", $this->query["sort"]);
-
+
if (!$result = $this->handler->db->query($sql, $this->config['topics_per_page'], @$this->vars["start"])) {
if (is_object($xoopsTpl)) {
$xoopsTpl->assign_by_ref("topics", $ret);
Modified: XoopsModules/newbb/branches/alfred/newbb/class/user.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/user.php 2012-02-08 13:37:46 UTC (rev 8908)
+++ XoopsModules/newbb/branches/alfred/newbb/class/user.php 2012-02-08 17:27:44 UTC (rev 8909)
@@ -124,6 +124,7 @@
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)) {
@@ -133,7 +134,7 @@
$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='' /></td><td><img src='" . $rpg_images['img_right'] . "' alt='' /></td></tr></table>";
+ $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']);
Modified: XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt 2012-02-08 13:37:46 UTC (rev 8908)
+++ XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt 2012-02-08 17:27:44 UTC (rev 8909)
@@ -1,3 +1,17 @@
+newBB
+Changelog 4.2
+02/08/2012
+===========================================
+ 1 Fix Smilies are not displayed
+ 2 Fix View Avatars
+ 3 Fix Page Numbers views
+ 4 Fix Error in Cache
+ 5 New Userinfos on/off
+ 6 New Advertising in Threads
+ 7 New Visible Attachments for Guests on/of
+ 8 New Display page numbers adjusted
+
+
CBB
Changelog 4.1
11/26/2011
Modified: XoopsModules/newbb/branches/alfred/newbb/header.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/header.php 2012-02-08 13:37:46 UTC (rev 8908)
+++ XoopsModules/newbb/branches/alfred/newbb/header.php 2012-02-08 17:27:44 UTC (rev 8909)
@@ -13,15 +13,14 @@
defined('XOOPS_ROOT_PATH') or die('Restricted access');
if (!empty($xoopsModuleConfig['do_rewrite'])) include_once "seo_url.php";
/* for seo */
-$noseo_url = array("newtopic.php","list.topic.php","viewpost.php","reply.php","report.php","search.php","edit.php","moderate.php","polls.php","delete.php","index.php","makepdf.php");
-
-if(((strpos(getenv('REQUEST_URI'), '.html') === false) && !empty($xoopsModuleConfig['do_rewrite']) && (!isset($_POST) || count($_POST) <=0)))
+$toseo_url = array("index.php","viewforum.php","viewtopic.php","rss.php","print.php","makepdf.php");
+if(((strpos(getenv('REQUEST_URI'), '.html') === false) && !empty($xoopsModuleConfig['do_rewrite']) && (!isset($_POST) || count($_POST) <= 0)))
{
- if ( !in_array(basename(getenv('SCRIPT_NAME')),$noseo_url) && (trim(getenv("REQUEST_URI")) != '') && trim(getenv("REQUEST_URI")) != "/".REAL_MODULE_NAME."/") {
+ if ( in_array(basename(getenv('SCRIPT_NAME')),$toseo_url) && (trim(getenv("REQUEST_URI")) != '') && trim(getenv("REQUEST_URI")) != "/".REAL_MODULE_NAME."/") {
$s = XOOPS_URL . getenv("REQUEST_URI");
$newurl = seo_urls('<a href="'.$s.'"></a>');
$newurl = str_replace('<a href="','',$newurl);
- $newurl = str_replace('"></a>','',$newurl);
+ $newurl = str_replace('"></a>','',$newurl);
if (!headers_sent()) {
header("HTTP/1.1 301 Moved Permanently");
header("Location: $newurl");
@@ -29,6 +28,7 @@
}
}
}
+
include_once XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname")."/include/vars.php";
mod_loadFunctions("user", "newbb");
Modified: XoopsModules/newbb/branches/alfred/newbb/include/functions.forum.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/include/functions.forum.php 2012-02-08 13:37:46 UTC (rev 8908)
+++ XoopsModules/newbb/branches/alfred/newbb/include/functions.forum.php 2012-02-08 17:27:44 UTC (rev 8909)
@@ -59,7 +59,7 @@
function newbb_make_jumpbox($forum_id = 0)
{
- $box = '<form name="forum_jumpbox" method="get" action="viewforum.php" onsubmit="javascript: if (document.forum_jumpbox.forum.value < 1) {return false;}">';
+ $box = '<form name="forum_jumpbox" method="get" action="'.XOOPS_URL.'/modules/newbb/viewforum.php" onsubmit="javascript: if (document.forum_jumpbox.forum.value < 1) {return false;}">';
$box .= '<select class="select" name="forum" onchange="javascript: if (this.options[this.selectedIndex].value >0 ) { document.forms.forum_jumpbox.submit();}">';
$box .='<option value=0>-- '._MD_SELFORUM.' --</option>';
$box .= newbb_forumSelectBox($forum_id);
Modified: XoopsModules/newbb/branches/alfred/newbb/include/functions.image.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/include/functions.image.php 2012-02-08 13:37:46 UTC (rev 8908)
+++ XoopsModules/newbb/branches/alfred/newbb/include/functions.image.php 2012-02-08 17:27:44 UTC (rev 8909)
@@ -48,7 +48,7 @@
$imginfo = @getimagesize($image);
$img_info = ( count($imginfo)>0 ) ? $imginfo[0]."X".$imginfo[1].' px':"";
-
+/*
if ($xoopsModuleConfig['max_img_width'] > 0) {
if (
( $xoopsModuleConfig['max_image_width'] > 0 && $imginfo[0]> $xoopsModuleConfig['max_image_width'] )
@@ -70,7 +70,25 @@
newbb_createThumbnail($source, $xoopsModuleConfig['max_img_width']);
}
}
+*/
+ if ( $xoopsModuleConfig['max_image_width'] > 0 && $xoopsModuleConfig['max_image_height'] > 0 ) {
+ if ( $imginfo[0] > $xoopsModuleConfig['max_image_width'] || $imginfo[1] > $xoopsModuleConfig['max_image_height']) {
+ if (!file_exists($thumb_path.'/'.$source) && $imginfo[0]>$xoopsModuleConfig['max_img_width']) {
+ newbb_createThumbnail($source, $xoopsModuleConfig['max_image_width']);
+ }
+ }
+ if ($imginfo[0] > $xoopsModuleConfig['max_image_width']) {
+ $pseudo_width = $xoopsModuleConfig['max_image_width'];
+ $pseudo_height = $xoopsModuleConfig['max_image_width']*($imginfo[1]/$imginfo[0]);
+ $pseudo_size = "width='".$pseudo_width."px' height='".$pseudo_height."px'";
+ }
+ if ($xoopsModuleConfig['max_image_height']> 0 && $pseudo_height > $xoopsModuleConfig['max_image_height']) {
+ $pseudo_height = $xoopsModuleConfig['max_image_height'];
+ $pseudo_width = $xoopsModuleConfig['max_image_height'] * ($imginfo[0]/$imginfo[1]);
+ $pseudo_size = "width='".$pseudo_width."px' height='".$pseudo_height."px'";
+ }
+ }
if (file_exists($thumb)) {
$attachmentImage = '<a href="'.$image_url.'" title="'.$source.' '.$img_info.'" target="newbb_image">';
Modified: XoopsModules/newbb/branches/alfred/newbb/include/images.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/include/images.php 2012-02-08 13:37:46 UTC (rev 8908)
+++ XoopsModules/newbb/branches/alfred/newbb/include/images.php 2012-02-08 17:27:44 UTC (rev 8909)
@@ -69,6 +69,18 @@
$forumImage['printer'] =
$forumImage['new_forum'] =
+$forumImage['facebook'] =
+$forumImage['twitter'] =
+$forumImage['linkedin'] =
+$forumImage['buzz'] =
+$forumImage['stumbleupon'] =
+$forumImage['friendfeed'] =
+$forumImage['digg'] =
+$forumImage['reddit'] =
+$forumImage['delicious'] =
+$forumImage['technorati'] =
+$forumImage['wong'] =
+
"icon";
for($i = 1; $i <= 5; $i++ ) {
Modified: XoopsModules/newbb/branches/alfred/newbb/include/plugin.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/include/plugin.php 2012-02-08 13:37:46 UTC (rev 8908)
+++ XoopsModules/newbb/branches/alfred/newbb/include/plugin.php 2012-02-08 17:27:44 UTC (rev 8909)
@@ -76,10 +76,6 @@
//1 => _MD_MENU_CLICK, // for "click to expand"
//2 => _MD_MENU_HOVER // for "mouse hover to expand"
);
-
-
-// Post view mode
-$customConfig["show_only_user_attach"] = 1;
return $customConfig;
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php 2012-02-08 13:37:46 UTC (rev 8908)
+++ XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php 2012-02-08 17:27:44 UTC (rev 8909)
@@ -1,5 +1,9 @@
<?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", "Forum Configuration");
define("_AM_NEWBB_ADDAFORUM", "Add a Forum");
@@ -30,13 +34,10 @@
define("_AM_NEWBB_POSTNOTAPPROVED", "Post has NOT been approved");
define("_AM_NEWBB_POSTSAVED", "Post has been saved");
define("_AM_NEWBB_POSTNOTSAVED", "Post has NOT been saved");
-
define("_AM_NEWBB_TOPICAPPROVED", "Topic has been approved");
define("_AM_NEWBB_TOPICNOTAPPROVED", "Topic has been NOT approved");
define("_AM_NEWBB_TOPICID", "Topic ID");
define("_AM_NEWBB_ORPHAN_TOPICS_FOR_AUTH", "Unapproved topics authorization");
-
-
define('_AM_NEWBB_DEL_ONE','Delete only this message');
define('_AM_NEWBB_POSTSDELETED','Selected post deleted.');
define('_AM_NEWBB_NOAPPROVEPOST','There are presently no posts waiting approval.');
@@ -45,7 +46,6 @@
define('_AM_NEWBB_MESSAGEC','Message:');
define('_AM_NEWBB_CANCELPOST','Cancel Post');
define('_AM_NEWBB_GOTOMOD','Go to module');
-
define('_AM_NEWBB_PREFERENCES','Module preferences');
define('_AM_NEWBB_POLLMODULE','Xoops Poll Module');
define('_AM_NEWBB_POLL_OK','Ready for use');
@@ -63,14 +63,12 @@
define('_AM_NEWBB_REPORT','Reported posts');
define('_AM_NEWBB_REPORT_PENDING','Pending report');
define('_AM_NEWBB_REPORT_PROCESSED','processed report');
-
define('_AM_NEWBB_CREATETHEDIR','Create it');
define('_AM_NEWBB_SETMPERM','Set the permission');
define('_AM_NEWBB_DIRCREATED','The directory has been created');
define('_AM_NEWBB_DIRNOTCREATED','The directory can not be created');
define('_AM_NEWBB_PERMSET','The permission has been set');
define('_AM_NEWBB_PERMNOTSET','The permission can not be set');
-
define('_AM_NEWBB_DIGEST','Digest notification');
define('_AM_NEWBB_DIGEST_PAST','<font color="red">Should be sent out %d minutes ago</font>');
define('_AM_NEWBB_DIGEST_NEXT','Need to send out in %d minutes');
@@ -95,7 +93,7 @@
define("_AM_NEWBB_ALLOWPOLLS", "Allow Polls:");
define("_AM_NEWBB_ATTACHMENT_SIZE" ,"Max Size in kb`s:");
define("_AM_NEWBB_ALLOWED_EXTENSIONS", "Allowed Extensions:<span style='font-size: xx-small; font-weight: normal; display: block;'>'*' indicates no limititations.<br /> Extensions delimited by '|'</span>");
-//define("_AM_NEWBB_ALLOW_ATTACHMENTS", "Allow Attachments:");
+define("_AM_NEWBB_ALLOW_ATTACHMENTS", "Allow Attachments:");
define("_AM_NEWBB_ALLOWHTML", "Allow HTML:");
define("_AM_NEWBB_YES", "Yes");
define("_AM_NEWBB_NO", "No");
@@ -110,7 +108,6 @@
define("_AM_NEWBB_MODERATOR_ADD", "Add moderators");
// admin_cat_manager.php
-
define("_AM_NEWBB_SETCATEGORYORDER", "Set Category Position:");
define("_AM_NEWBB_ACTIVE", "Active");
define("_AM_NEWBB_INACTIVE", "Inactive");
@@ -123,8 +120,6 @@
define("_AM_NEWBB_DELCAT", "Delete Category");
define("_AM_NEWBB_WAYSYWTDTTAL", "Note: This will NOT remove the forums under the category, you must do that via the Edit Forum section.<br /><br />WARNING: Are you sure you want to delete this Category?");
-
-
//%%%%%% File Name admin_forums.php %%%%%
define("_AM_NEWBB_FORUMNAME", "Forum Name:");
define("_AM_NEWBB_FORUMDESCRIPTION", "Forum Description:");
@@ -180,9 +175,7 @@
define("_AM_NEWBB_CAN_TYPE", "Can use topic type");
define("_AM_NEWBB_CAN_HTML", "Can use HTML syntax");
define("_AM_NEWBB_CAN_SIGNATURE", "Can use signature");
-
define("_AM_NEWBB_ACTION", "Action");
-
define("_AM_NEWBB_PERM_TEMPLATE", "Set default permission template");
define("_AM_NEWBB_PERM_TEMPLATE_DESC", "Edit the following permission template so that it can be applied to a forum or a couple of forums");
define("_AM_NEWBB_PERM_FORUMS", "Select forums");
@@ -194,7 +187,6 @@
define("_AM_NEWBB_PERM_SETBYGROUP", "Set permissions directly by group");
// admin_forum_prune.php
-
define ("_AM_NEWBB_PRUNE_RESULTS_TITLE", "Prune Results");
define ("_AM_NEWBB_PRUNE_RESULTS_TOPICS", "Pruned Topics");
define ("_AM_NEWBB_PRUNE_RESULTS_POSTS", "Pruned Posts");
@@ -202,7 +194,6 @@
define ("_AM_NEWBB_PRUNE_STORE", "Store posts in this forum instead of deleting them");
define ("_AM_NEWBB_PRUNE_ARCHIVE", "Make a copy of posts into Archive");
define ("_AM_NEWBB_PRUNE_FORUMSELERROR", "You forgot to select forum(s) to prune");
-
define ("_AM_NEWBB_PRUNE_DAYS", "Remove topics without replies in:");
define ("_AM_NEWBB_PRUNE_FORUMS", "Forums to be pruned");
define ("_AM_NEWBB_PRUNE_STICKY", "Keep Sticky topics");
@@ -288,7 +279,6 @@
define("_AM_NEWBB_TYPE_EDITFORUM_DESC", "The data have not been saved yet. You must submit to save them.");
define("_AM_NEWBB_TYPE_ORDER_DESC", "To activate a type for a forum, a value greater than 0 is required for 'type_order'; In other words, a type will be inactive for a forum if 'type_order' is set to 0.");
-
// admin_synchronization.php
define("_AM_NEWBB_SYNC_TYPE_FORUM", "Forum Data");
define("_AM_NEWBB_SYNC_TYPE_TOPIC", "Topic Data");
@@ -296,9 +286,9 @@
define("_AM_NEWBB_SYNC_TYPE_USER", "User Data");
define("_AM_NEWBB_SYNC_TYPE_STATS", "Stats Info");
define("_AM_NEWBB_SYNC_TYPE_MISC", "MISC");
-
define("_AM_NEWBB_SYNC_ITEMS", "Items for each loop: ");
-
+define("_AM_NEWBB_ALLOW_SUBJECT_PREFIX", "Thread prefixes allow?");
+define("_AM_NEWBB_ALLOW_SUBJECT_PREFIX_DESC", "This allows for prefixes that are added to the topic name.");
define("_AM_NEWBB_GROUPMOD_TITLE","add moderators per group");
define("_AM_NEWBB_GROUPMOD_TITLEDESC","Allows you to enter, users of certain groups as moderators");
define("_AM_NEWBB_GROUPMOD_ALLFORUMS","all forums");
Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/blocks.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/english/blocks.php 2012-02-08 13:37:46 UTC (rev 8908)
+++ XoopsModules/newbb/branches/alfred/newbb/language/english/blocks.php 2012-02-08 17:27:44 UTC (rev 8909)
@@ -1,8 +1,8 @@
<?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);
+if(defined('NEWBB_BLOCKS_DEFINED')) return;
+else define('NEWBB_BLOCKS_DEFINED',true);
define("_MB_NEWBB_FORUM","Forum");
define("_MB_NEWBB_TOPIC","Topic");
@@ -18,7 +18,6 @@
define("_MB_NEWBB_FORUMLIST","Allowed forum list: ");
define("_MB_NEWBB_ALLTOPICS","Topics");
define("_MB_NEWBB_ALLPOSTS","Posts");
-
define("_MB_NEWBB_CRITERIA","Display criteria");
define("_MB_NEWBB_CRITERIA_TOPIC","Topics");
define("_MB_NEWBB_CRITERIA_POST","Posts");
@@ -33,11 +32,9 @@
define("_MB_NEWBB_CRITERIA_STICKYS","Most sticky topics");
define("_MB_NEWBB_TIME","Time period");
define("_MB_NEWBB_TIME_DESC","Positive for days and negative for hours");
-
define("_MB_NEWBB_TITLE","Title");
define("_MB_NEWBB_AUTHOR","Author");
define("_MB_NEWBB_COUNT","Count");
define("_MB_NEWBB_INDEXNAV","Display Navigator");
-
define("_MB_NEWBB_TITLE_LENGTH","Title/Post length");
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/main.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/english/main.php 2012-02-08 13:37:46 UTC (rev 8908)
+++ XoopsModules/newbb/branches/alfred/newbb/language/english/main.php 2012-02-08 17:27:44 UTC (rev 8909)
@@ -1,11 +1,10 @@
<?php
-// $Id: main.php,v 1.3 2005/10/19 17:20:33 phppp Exp $
-if (defined('MAIN_DEFINED')) return;
+// $Id: main.php 17 2007-11-18 14:22:36Z LupusC $
+if(defined('MAIN_DEFINED')) return;
define('MAIN_DEFINED',true);
define('_MD_ERROR','Error');
define('_MD_SELFORUM','Select a Forum');
-
define('_MD_THIS_FILE_WAS_ATTACHED_TO_THIS_POST','Attached file:');
define('_MD_ALLOWED_EXTENSIONS','Allowed extensions');
define('_MD_MAX_FILESIZE','Maxium file size');
@@ -23,7 +22,6 @@
define('_MD_ALL_TOPIC_MARKED','All topics marked');
define('_MD_BOARD_DISCLAIMER','Board Disclaimer');
-
//index.php
define('_MD_ADMINCP','Admin CP');
define('_MD_FORUM','Forum');
@@ -45,7 +43,6 @@
define('_MD_USER_LASTVISIT', 'Your last visit: %s');
define('_MD_USER_LASTPOST', 'Your last post: %s');
define('_MD_USER_NOLASTPOST', 'You have not posted yet');
-
define('_MD_USER_TOPICS', 'Your Topics: ');
define('_MD_USER_POSTS', 'Posts: ');
define('_MD_USER_DIGESTS', 'Digests: ');
@@ -58,7 +55,6 @@
define('_MD_SUBFORUMS','Subforums');
define('_MD_MAINFORUMOPT', 'Main Options');
define("_MD_PENDING_POSTS_FOR_AUTH", "Posts pending approval:");
-
define('_MD_TODAYTOPICSC','Today Topics: ');
define('_MD_TODAYPOSTSC','Today Posts: ');
define('_MD_TOTALDIGESTSC','Total Digests: ');
@@ -66,8 +62,7 @@
//page_header.php
define('_MD_MODERATEDBY','Moderated by');
define('_MD_SEARCH','Search');
-//define('_MD_SEARCHRESULTS','Search Results');
-define('_MD_FORUMINDEX','%s Forum Index');
+define('_MD_FORUMINDEX','Forum Index');
define('_MD_POSTNEW','New Topic');
define('_MD_REGTOPOST','Register To Post');
@@ -137,13 +132,11 @@
define("_MD_CANNOT_UPLOAD", "You <strong>cannot</strong> upload.<br />");
define("_MD_CAN_SIGNATURE", "You <strong>can</strong> use signature.<br />");
define("_MD_CANNOT_SIGNATURE", "You <strong>cannot</strong> use signature.<br />");
-
define("_MD_IMTOPICS", "Important Topics");
define("_MD_NOTIMTOPICS", "Forum Topics");
define('_MD_FORUMOPTION', 'Forum options');
define('_MD_VAUP','View all unreplied posts');
define('_MD_VANP','View all new posts');
-
define('_MD_UNREPLIED','unreplied topics');
define('_MD_UNREAD','unread topics');
define('_MD_ALL','all topics');
@@ -213,22 +206,14 @@
define('_MD_EXCEEDTHREADVIEW','Post count exceeds the threshold for thread mode<br />Changing to flat mode');
//forumform.inc
-
define('_MD_QUOTE','Quote');
define('_MD_VIEW_REQUIRE','View requirements');
define('_MD_REQUIRE_KARMA','Karma');
define('_MD_REQUIRE_REPLY','Reply');
define('_MD_REQUIRE_NULL','No requirement');
-
define("_MD_SELECT_FORMTYPE", "Select your desired form type");
-
define("_MD_FORM_COMPACT", "Compact");
define("_MD_FORM_DHTML", "DHTML");
-define("_MD_FORM_SPAW", "Spaw Editor");
-define("_MD_FORM_HTMLAREA", "HTMLArea");
-define("_MD_FORM_FCK", "FCK Editor");
-define("_MD_FORM_KOIVI", "Koivi Editor");
-define("_MD_FORM_TINYMCE", "TinyMCE Editor");
// ERROR messages
define('_MD_ERRORFORUM','ERROR: Forum not selected!');
@@ -250,7 +235,6 @@
define('_MD_TIMEISUP','Your have reach the timelimit for editing your post.');
define('_MD_TIMEISUPDEL','Your have reach the timelimit for deleting your post.');
-
//reply.php
define('_MD_ON','on'); //Posted on
define('_MD_USERWROTE','%s wrote:'); // %s is username
@@ -260,7 +244,6 @@
define('_MD_EDITNOTALLOWED','You\'re not allowed to edit this post!');
define('_MD_EDITEDBY','Edited by');
define('_MD_ANONNOTALLOWED','Anonymous users are not allowed to post.<br />Please register.');
-
define('_MD_THANKSSUBMIT','Thanks for your submission!');
define('_MD_REPLYPOSTED','A reply to your topic has been posted.');
define('_MD_HELLO','Hello %s,');
@@ -282,7 +265,6 @@
define('_MD_DOSMILEY','Enable Smiley');
define('_MD_DOXCODE','Enable Xoops Code');
define('_MD_DOBR','Enable line break (Suggest to turn off if HTML enabled)');
-
define('_MD_DOHTML','Enable html tags');
define('_MD_NEWPOSTNOTIFY', 'Notify me of new posts in this thread');
define('_MD_ATTACHSIG','Attach Signature');
@@ -302,7 +284,6 @@
define('_MD_RETURNFORUMINDEX','Return to the forum index');
define('_MD_ERROR_BACK','Error - Please go back and try again.');
define('_MD_GOTONEWFORUM','View the updated topic');
-
define('_MD_TOPICDELETE','The topic has been deleted.');
define('_MD_TOPICMERGE','The topic has been merged.');
define('_MD_TOPICMOVE','The topic has been moved.');
@@ -312,8 +293,6 @@
define('_MD_TOPICUNSTICKY','The topic has been unStickyed.');
define('_MD_TOPICDIGEST','The topic has been Digested.');
define('_MD_TOPICUNDIGEST','The topic has been unDigested.');
-
-
define('_MD_DELETE','Delete');
define('_MD_MOVE','Move');
define('_MD_MERGE','Merge');
@@ -323,8 +302,6 @@
define('_MD_UNSTICKY','unSticky');
define('_MD_DIGEST','Digest');
define('_MD_UNDIGEST','unDigest');
-
-
define('_MD_DESC_DELETE','Once you press the delete button at the bottom of this form the topic you have selected, and all its related posts, will be <strong>permanently</strong> removed.');
define('_MD_DESC_MOVE','Once you press the move button at the bottom of this form the topic you have selected, and its related posts, will be moved to the forum you have selected.');
define('_MD_DESC_MERGE','Once you press the merge button at the bottom of this form the topic you have selected, and its related posts, will be merged to the topic you have selected.<br /><strong>The destination topic ID must be smaller than current one</strong>.');
@@ -334,7 +311,6 @@
define('_MD_DESC_UNSTICKY','Once you press the unSticky button at the bottom of this form the topic you have selected will be unStickyed. You may Sticky it again at a later time if you like.');
define('_MD_DESC_DIGEST','Once you press the Digest button at the bottom of this form the topic you have selected will be Digested. You may unDigest it again at a later time if you like.');
define('_MD_DESC_UNDIGEST','Once you press the unDigest button at the bottom of this form the topic you have selected will be unDigested. You may Digest it again at a later time if you like.');
-
define('_MD_MERGETOPICTO','Merge Topic To:');
define('_MD_MOVETOPICTO','Move Topic To:');
define('_MD_NOFORUMINDB','No Forums in DB');
@@ -342,14 +318,10 @@
// delete.php
define('_MD_DELNOTALLOWED','Sorry, but you\'re not allowed to delete this post.');
define('_MD_AREUSUREDEL','Are you sure you want to delete this post and all its child posts?');
-
define('_MD_POSTSDELETED','Selected post and all its child posts deleted.');
-
-
define('_MD_POSTDELETED','Selected post deleted.');
define('_MD_POSTFIRSTWITHREPLYNODELETED','The start posting can not be deleted if there are already answers<br />do this, delete the whole topic.');
-
// definitions moved from global.
define('_MD_THREAD','Thread');
define('_MD_FROM','From');
@@ -358,7 +330,6 @@
define('_MD_OFFLINE','Offline');
define('_MD_FLAT', 'Flat');
-
// online.php
define('_MD_USERS_ONLINE', 'Users Online:');
define('_MD_ANONYMOUS_USERS', 'Anonymous Users');
@@ -366,21 +337,17 @@
define('_MD_BROWSING_FORUM','Users browsing forum');
define('_MD_TOTAL_ONLINE','Total %d Users Online.');
define('_MD_ADMINISTRATOR','Administrator');
-
define('_MD_NO_SUCH_FILE','File not exist!');
//define('_MD_ERROR_UPATEATTACHMENT','Error occur when updating attachment');
// ratethread.php
define("_MD_CANTVOTEOWN", "You cannot vote on the topic you submitted.<br />All votes are logged and reviewed.");
define("_MD_VOTEONCE", "Please do not vote for the same topic more than once.");
-
-
define("_MD_VOTEAPPRE", "Your vote is appreciated.");
define("_MD_THANKYOU", "Thank you for taking the time to vote here at %s"); // %s is your site name
define("_MD_VOTES", "Votes");
define("_MD_NOVOTERATE", "You did not rate this Topic");
-
// polls.php
define("_MD_POLL_DBUPDATED", "Database Updated Successfully!");
define("_MD_POLL_POLLCONF", "Polls Configuration");
@@ -406,7 +373,6 @@
define("_MD_POLL_RESTART", "Restart this poll");
define("_MD_POLL_ADDMORE", "Add more options");
define("_MD_POLL_RUSUREDEL", "Are you sure you want to delete this poll and all its comments?");
-
define("_MD_POLL_RESTARTPOLL", "Restart poll");
define("_MD_POLL_RESET", "Reset all logs for this poll?");
define("_MD_POLL_ADDPOLL", "Add Poll");
@@ -414,10 +380,8 @@
//report.php
define("_MD_REPORTED", "Thank you for reporting this post/thread! A moderator will look into your report shortly.");
-
define("_MD_REPORT_ERROR", "Error occured while sending the report.");
define("_MD_REPORT_TEXT", "Report message:");
-
define("_MD_PDF", "Create PDF from Post");
define("_MD_PDF_PAGE", "Page %s");
@@ -432,7 +396,6 @@
define("_MD_MENU_SELECT", "Selection");
define("_MD_MENU_HOVER", "Hover");
define("_MD_MENU_CLICK", "Click");
-
define("_MD_WELCOME_SUBJECT", "%s has joined the forum");
define("_MD_WELCOME_MESSAGE", "Hi, %s has joined you. Let's start ...");
define("_MD_VIEWNEWPOSTS", "View new posts");
@@ -441,21 +404,17 @@
define("_MD_NAME", "Name");
define("_MD_PASSWORD", "Password");
define("_MD_LOGIN", "Login");
-
define("_MD_APPROVE", "Approve");
define("_MD_RESTORE", "Restore");
define("_MD_SPLIT_ONE", "Split");
define("_MD_SPLIT_TREE", "Split all children");
define("_MD_SPLIT_ALL", "Split all");
-
define("_MD_TYPE_ADMIN", "Admin mode");
define("_MD_TYPE_VIEW", "View mode");
define("_MD_TYPE_PENDING", "Pending");
define("_MD_TYPE_DELETED", "Deleted");
define("_MD_TYPE_SUSPEND", "Suspension");
-
define("_MD_DBUPDATED", "Database Updated Successfully!");
-
define("_MD_SUSPEND_SUBJECT", "User %s is suspended for %d days");
define("_MD_SUSPEND_TEXT", "User %s is suspended for %d days due to:<br />[quote]%s[/quote]<br /><br />The suspension is valid till %s");
define("_MD_SUSPEND_UID", "User ID");
@@ -469,7 +428,6 @@
define("_MD_SUSPEND_MANAGEMENT", "Moderation management");
define("_MD_SUSPEND_NOACCESS", "Your ID or IP has been suspended");
define("_MD_NEWBB_TYPE", "Topic type");
-
define("_MD_NEWBB_SEENOTGUEST","<font color=\"red\"><b>Link only for registered users</b></font>");
define("_MD_NEWBB_REPORTSUBJECT","A contribution has been reported");
define("_MD_NEWBB_GOTOLASTPOST","Go to last post");
@@ -501,6 +459,21 @@
define('_NW_PAGE','Site: ');
define('_AM_NEWBB_NOTOPIC','No Posts');
define('_MD_NORSS_DATA','No data to display');
-
define('_MD_NEWBB_STATS','Statistics');
+define("_MD_POSTTIME","posted on");
+
+// 4.2
+define("_MD_ADVERTISING_BLOCK","<br />Hier könnte auch Ihre Werbung stehen!<br />Kontaktieren Sie uns dazu und wir unterbreiten Ihnen ein Angebot.");
+define("_MD_ADVERTISING_USER","Werbung");
+define('_MD_SHARE_FACEBOOK', "Facebook");
+define('_MD_SHARE_TWITTER', "Twitter");
+define('_MD_SHARE_BUZZ', "Google Buzz");
+define('_MD_SHARE_LINKEDIN', "Linkedin");
+define('_MD_SHARE_STUMBLEUPON', "Stumbleupon");
+define('_MD_SHARE_FRIENDFEED', "FriendFeed");
+define('_MD_SHARE_REDDIT', "Reddit");
+define('_MD_SHARE_DELICIOUS', "Del.icio.us");
+define('_MD_SHARE_DIGG', "Digg");
+define('_MD_SHARE_TECHNORATI', "Technorati");
+define('_MD_SHARE_MRWONG', "Mr. Wong");
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php 2012-02-08 13:37:46 UTC (rev 8908)
+++ XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php 2012-02-08 17:27:44 UTC (rev 8909)
@@ -1,7 +1,10 @@
<?php
-// $Id: modinfo.php,v 1.3 2005/10/19 17:20:33 phppp Exp $
+// $Id: modinfo.php,v 2.3 2012/02/08 16:20:00 dhcst Exp $
// Thanks Tom (http://www.wf-projects.com), for correcting the Engligh language package
+if (defined('NEWBB_MODINFO_DEFINED')) return;
+define('NEWBB_MODINO_DEFINED',true);
+
// Module Info
// The name of this module
@@ -18,7 +21,6 @@
define("_MI_NEWBB_BLOCK_TAG_CLOUD", "Tag Cloud");
define("_MI_NEWBB_BLOCK_TAG_TOP", "Top Tags");
-
// Names of admin menu items
define("_MI_NEWBB_ADMENU_INDEX", "Index");
define("_MI_NEWBB_ADMENU_CATEGORY", "Categories");
@@ -33,68 +35,56 @@
define("_MI_NEWBB_ADMENU_VOTE", "Votes");
define("_MI_NEWBB_ADMENU_TYPE", "Topic types");
define("_MI_NEWBB_ADMENU_ABOUT", "About");
+
//config options
define("_MI_DO_DEBUG", "Debug Mode");
define("_MI_DO_DEBUG_DESC", "Display error message");
define("_MI_DO_REWRITE","SEO-URL enabled");
define("_MI_DO_REWRITE_DESC","rewrites the URL, you need mod_rewrite and a. htaccess see readme.htaccess");
-
define("_MI_IMG_SET", "Image Set");
define("_MI_IMG_SET_DESC", "Select the Image Set to use");
define("_MI_THEMESET", "Theme set");
define("_MI_THEMESET_DESC", "Module-wide, select '"._NONE."' will use site-wide theme");
define("_MI_DIR_ATTACHMENT", "Attachments physical path.");
define("_MI_DIR_ATTACHMENT_DESC", "Physical path only needs to be set from your xoops root and not before, for example you may have attachments uploaded to www.yoururl.com/uploads/newbb the path entered would then be '/uploads/newbb' never include a trailing slash '/' the thumbnails path becomes '/uploads/newbb/thumbs'");
-
define("_MI_PATH_MAGICK", "Path for ImageMagick");
define("_MI_PATH_MAGICK_DESC", "Usually it is '/usr/bin/X11'. Leave it BLANK if you do not have ImageMagicK installed or for autodetecting.");
-
define("_MI_SUBFORUM_DISPLAY", "Display Mode of subforums on index page");
-
define("_MI_SUBFORUM_DISPLAY_DESC", "");
define("_MI_SUBFORUM_EXPAND", "Expand");
define("_MI_SUBFORUM_COLLAPSE", "Collpase");
define("_MI_SUBFORUM_HIDDEN", "Hidden");
-
define("_MI_POST_EXCERPT", "Post excerpt on forum page");
define("_MI_POST_EXCERPT_DESC", "Length of post excerpt by mouse over. 0 for no excerpt.");
-
define("_MI_PATH_NETPBM", "Path for Netpbm");
define("_MI_PATH_NETPBM_DESC", "Usually it is '/usr/bin'. Leave it BLANK if you do not have Netpbm installed or for autodetecting.");
-
define("_MI_IMAGELIB", "Select the Image library to use");
define("_MI_IMAGELIB_DESC", "Select which Image library to use for creating Thumbnails. Leave AUTO for automatic choice.");
-
define("_MI_MAX_IMG_WIDTH", "Maximum Image Width");
define("_MI_MAX_IMG_WIDTH_DESC", "Sets the maximum allowed <strong>Width</strong> size of an uploaded image otherwise thumbnail will be used. <br >Input 0 if you do not want to create thumbnails.");
-
define("_MI_MAX_IMAGE_WIDTH", "Maximum Image Width for creating thumbnail");
define("_MI_MAX_IMAGE_WIDTH_DESC", "Sets the maximum width of an uploaded image to create thumbnail. <br >Image with width larger than the value will not use thumbnail.");
-
+define("_MI_MAX_IMAGE_WIDTH","Maximum width of an image for the generation of a thumbnail");
+define("_MI_MAX_IMAGE_WIDTH_DESC", "Sets the maximum width of an uploaded image, from which a thumbnail is generated.");
define("_MI_MAX_IMAGE_HEIGHT", "Maximum Image Height for creating thumbnail");
define("_MI_MAX_IMAGE_HEIGHT_DESC", "Sets the maximum height of an uploaded image to create thumbnail. <br >Image with height larger than the value will not use thumbnail.");
-
define("_MI_SHOW_DIS", "Show Disclaimer On");
define("_MI_DISCLAIMER", "Disclaimer");
define("_MI_DISCLAIMER_DESC", "Enter your Disclaimer that will be shown for the above selected option.");
define("_MI_DISCLAIMER_TEXT", "The forum contains a lot of posts with a lot of usefull information. <br /><br />In order to keep the number of double-posts to a minimum, we would like to ask you to use the forum search before posting your questions here.");
define("_MI_NONE", "None");
-
define("_MI_POST", "Post");
define("_MI_REPLY", "Reply");
define("_MI_OP_BOTH", "Both");
define("_MI_WOL_ENABLE", "Enable Who's Online");
define("_MI_WOL_ENABLE_DESC", "Enable Who's Online Block shown below the Index page and the Forum pages");
-
define("_MI_NULL", "disable");
define("_MI_TEXT", "text");
define("_MI_GRAPHIC", "graphic");
define("_MI_USERLEVEL", "HP/MP/EXP Level Mode");
define("_MI_USERLEVEL_DESC", "<strong>HP</strong> is determined by your average posts per day.<br /><strong>MP</strong> is determined by your join date related to your post count.<br /><strong>EXP</strong> goes up each time you post, and when you get to 100%, you gain a level and the EXP drops to 0 again.");
-
define("_MI_RSS_ENABLE", "Enable RSS Feed");
define("_MI_RSS_ENABLE_DESC", "Enable RSS Feed, edit options below for maximum Items and Description length");
-
define("_MI_RSS_MAX_ITEMS", "RSS Max. Items");
define("_MI_RSS_MAX_DESCRIPTION", "RSS Max. Description Length");
define("_MI_RSS_UTF8", "RSS Encoding with UTF-8");
@@ -105,26 +95,19 @@
define("_MI_MEDIA_ENABLE_DESC", "Display attached Images directly in the post.");
define("_MI_USERBAR_ENABLE", "Enable Userbar");
define("_MI_USERBAR_ENABLE_DESC", "Display the expand Userbar: Profile, PM, ICQ, MSN, etc...");
-
define("_MI_GROUPBAR_ENABLE", "Enable Group bar");
define("_MI_GROUPBAR_ENABLE_DESC", "Display the Groups of the User in the Post info field.");
define("_MI_RATING_ENABLE", "Enable Rating Function");
define("_MI_RATING_ENABLE_DESC", "Allow Topic Rating");
-
define("_MI_VIEWMODE", "View Mode of the Threads");
define("_MI_VIEWMODE_DESC", "To override the General Settings of viewmode within threads, set to NONE in order to switch feature off");
-
define("_MI_COMPACT", "Compact");
-
define("_MI_MENUMODE", "Default Menu Mode");
define("_MI_MENUMODE_DESC", "'SELECT' - select options, 'HOVER' - may slow down IE, 'CLICK' - requires JAVASCRIPT");
-
define("_MI_REPORTMOD_ENABLE", "Report a Post");
define("_MI_REPORTMOD_ENABLE_DESC", "User can report posts to Moderator(s), for any reason, which enables Moderator(s) to take action");
-
define("_MI_SHOW_JUMPBOX", "Show Jumpbox");
define("_MI_JUMPBOXDESC", "If Enabled, a drop-down menu will allow users to jump to another forum from a forum or topic");
-
define("_MI_SHOW_PERMISSIONTABLE", "Show Permission Table");
define("_MI_SHOW_PERMISSIONTABLE_DESC", "Setting YES will display user's right");
define("_MI_EMAIL_DIGEST", "Email post digest");
@@ -132,89 +115,61 @@
define("_MI_NEWBB_EMAIL_NONE", "No email");
define("_MI_NEWBB_EMAIL_DAILY", "Daily");
define("_MI_NEWBB_EMAIL_WEEKLY", "Weekly");
-
define("_MI_SHOW_IP", "Show user IP");
define("_MI_SHOW_IP_DESC", "Setting YES will show users IP to moderators");
-
define("_MI_ENABLE_KARMA", "Enable karma requirement");
define("_MI_ENABLE_KARMA_DESC", "This allows user to set a karma requirement for other users reading his/her post");
-
define("_MI_KARMA_OPTIONS", "Karma options for post");
define("_MI_KARMA_OPTIONS_DESC", "Use ',' as delimer for multi-options.");
define("_MI_SINCE_OPTIONS", "'Since' options for 'viewform' and 'search'");
define("_MI_SINCE_OPTIONS_DESC", "Positive value for days and negative value for hours. Use ',' as delimer for multi-options.");
define("_MI_SINCE_DEFAULT", "'Since' default value");
define("_MI_SINCE_DEFAULT_DESC", "Default value if not specified by users. 0 - from beginning");
-
define("_MI_MODERATOR_HTML", "Allow HTML tags for moderators");
define("_MI_MODERATOR_HTML_DESC", "This option allows only moderators to use HTML in post subject");
define("_MI_USER_ANONYMOUS", "Allow registered users to post anonymously");
define("_MI_USER_ANONYMOUS_DESC", "This allows a logged in user to post anonymously");
-
define("_MI_ANONYMOUS_PRE", "Prefix for anonymous user");
define("_MI_ANONYMOUS_PRE_DESC", "This will add a prefix to the anonymous username whilst posting");
-
define("_MI_REQUIRE_REPLY", "Allow requiring reply to read a post");
define("_MI_REQUIRE_REPLY_DESC", "This feature forces readers to reply to the original posters post before being able to read the original");
-
define("_MI_EDIT_TIMELIMIT", "Time limit for edit a post");
define("_MI_EDIT_TIMELIMIT_DESC", "Set a Time limit for user editing their own post. In minutes, 0 for no limit");
-
define("_MI_DELETE_TIMELIMIT", "Time limit for deleting a Post");
define("_MI_DELETE_TIMELIMIT_DESC", "Set a Time limit for user deleting thier own post. In minutes, 0 for no limit");
-
define("_MI_POST_TIMELIMIT", "Time limit for consecutively posting");
define("_MI_POST_TIMELIMIT_DESC", "Set a Time limit for consecutively posting. In seconds, 0 for no limit");
-
define("_MI_RECORDEDIT_TIMELIMIT", "Timelimit for recording edit info");
define("_MI_RECORDEDIT_TIMELIMIT_DESC", "Set a Timelimit for waiving recording edit info. In minutes, 0 for no limit");
-
define("_MI_SHOW_REALNAME", "Show Realname");
define("_MI_SHOW_REALNAME_DESC", "Replace username with user's real name.");
-
define("_MI_CACHE_ENABLE", "Enable Cache");
define("_MI_CACHE_ENABLE_DESC", "Store some intermediate results in session to save queries");
define("_MI_QUICKREPLY_ENABLE", "Enable Quick reply");
define("_MI_QUICKREPLY_ENABLE_DESC", "This will enable the Quick reply form");
-
define("_MI_POSTSPERPAGE", "Posts per Page");
define("_MI_POSTSPERPAGE_DESC", "The maximum number of posts that will be displayed per page");
-
define("_MI_POSTSFORTHREAD", "Maximum posts for thread view mode");
define("_MI_POSTSFORTHREAD_DESC", "Flat mode will be used if post count exceeds the number");
-
define("_MI_TOPICSPERPAGE", "Topics per Page");
define("_MI_TOPICSPERPAGE_DESC", "The maximum number of topics that will be displayed per page");
-
define("_MI_IMG_TYPE", "Image Type");
define("_MI_IMG_TYPE_DESC", "Select the image type of buttons in the forum.<br />- png: for high speed server<br />- gif: for normal speed<br />- auto: gif for IE and png for other browsers");
-
define("_MI_PNGFORIE_ENABLE", "Enable PNG hack");
define("_MI_PNGFORIE_ENABLE_DESC", "The hack to allow PNG transparency attribute with IE");
-
define("_MI_FORM_OPTIONS", "Form Options");
define("_MI_FORM_OPTIONS_DESC", "Form options that users can choose when posting/editing/replying.");
-
define("_MI_FORM_COMPACT", "Compact");
define("_MI_FORM_DHTML", "DHTML");
-define("_MI_FORM_SPAW", "Spaw Editor");
-define("_MI_FORM_HTMLAREA", "HtmlArea Editor");
-define("_MI_FORM_FCK", "FCK Editor");
-define("_MI_FORM_KOIVI", "Koivi Editor");
-define("_MI_FORM_TINYMCE", "TinyMCE Editor");
-
define("_MI_MAGICK", "ImageMagick");
define("_MI_NETPBM", "Netpbm");
define("_MI_GD1", "GD1 Library");
define("_MI_GD2", "GD2 Library");
define("_MI_AUTO", "AUTO");
-
define("_MI_WELCOMEFORUM", "Forum for welcoming new user");
define("_MI_WELCOMEFORUM_DESC", "A profile post will be published when a user visits Forum module for the first time");
-
define("_MI_PERMCHECK_ONDISPLAY", "Check permission");
define("_MI_PERMCHECK_ONDISPLAY_DESC", "Check permission for edit on display page");
-
define("_MI_USERMODERATE", "Enable user moderation");
define("_MI_USERMODERATE_DESC", "");
@@ -223,43 +178,34 @@
define ('_MI_NEWBB_THREAD_NOTIFY', 'Thread');
define ('_MI_NEWBB_THREAD_NOTIFYDSC', 'Notification options that apply to the current thread.');
-
define ('_MI_NEWBB_FORUM_NOTIFY', 'Forum');
define ('_MI_NEWBB_FORUM_NOTIFYDSC', 'Notification options that apply to the current forum.');
-
define ('_MI_NEWBB_GLOBAL_NOTIFY', 'Global');
define ('_MI_NEWBB_GLOBAL_NOTIFYDSC', 'Global forum notification options.');
-
define ('_MI_NEWBB_THREAD_NEWPOST_NOTIFY', 'New Post');
define ('_MI_NEWBB_THREAD_NEWPOST_NOTIFYCAP', 'Notify me of new posts in the current thread.');
define ('_MI_NEWBB_THREAD_NEWPOST_NOTIFYDSC', 'Receive notification when a new message is posted in the current thread.');
define ('_MI_NEWBB_THREAD_NEWPOST_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} auto-notify : New post in thread');
-
define ('_MI_NEWBB_FORUM_NEWTHREAD_NOTIFY', 'New Thread');
define ('_MI_NEWBB_FORUM_NEWTHREAD_NOTIFYCAP', 'Notify me of new topics in the current forum.');
define ('_MI_NEWBB_FORUM_NEWTHREAD_NOTIFYDSC', 'Receive notification when a new thread is started in the current forum.');
define ('_MI_NEWBB_FORUM_NEWTHREAD_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} auto-notify : New thread in forum');
-
define ('_MI_NEWBB_GLOBAL_NEWFORUM_NOTIFY', 'New Forum');
define ('_MI_NEWBB_GLOBAL_NEWFORUM_NOTIFYCAP', 'Notify me when a new forum is created.');
define ('_MI_NEWBB_GLOBAL_NEWFORUM_NOTIFYDSC', 'Receive notification when a new forum is created.');
define ('_MI_NEWBB_GLOBAL_NEWFORUM_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} auto-notify : New forum');
-
define ('_MI_NEWBB_GLOBAL_NEWPOST_NOTIFY', 'New Post');
define ('_MI_NEWBB_GLOBAL_NEWPOST_NOTIFYCAP', 'Notify me of any new posts.');
define ('_MI_NEWBB_GLOBAL_NEWPOST_NOTIFYDSC', 'Receive notification when any new message is posted.');
define ('_MI_NEWBB_GLOBAL_NEWPOST_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} auto-notify : New post');
-
define ('_MI_NEWBB_FORUM_NEWPOST_NOTIFY', 'New Post');
define ('_MI_NEWBB_FORUM_NEWPOST_NOTIFYCAP', 'Notify me of any new posts in the current forum.');
define ('_MI_NEWBB_FORUM_NEWPOST_NOTIFYDSC', 'Receive notification when any new message is posted in the current forum.');
define ('_MI_NEWBB_FORUM_NEWPOST_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} auto-notify : New post in forum');
-
define ('_MI_NEWBB_GLOBAL_NEWFULLPOST_NOTIFY', 'New Post (Full Text)');
define ('_MI_NEWBB_GLOBAL_NEWFULLPOST_NOTIFYCAP', 'Notify me of any new posts (include full text in message).');
define ('_MI_NEWBB_GLOBAL_NEWFULLPOST_NOTIFYDSC', 'Receive full text notification when any new message is posted.');
define ('_MI_NEWBB_GLOBAL_NEWFULLPOST_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} auto-notify : New post (full text)');
-
define ('_MI_NEWBB_GLOBAL_DIGEST_NOTIFY', 'Digest');
define ('_MI_NEWBB_GLOBAL_DIGEST_NOTIFYCAP', 'Notify me of post digest.');
define ('_MI_NEWBB_GLOBAL_DIGEST_NOTIFYDSC', 'Receive digest notification.');
@@ -275,25 +221,39 @@
Welcome to ".(htmlspecialchars($GLOBALS["xoopsConfig"]['sitename'], ENT_QUOTES))." forum.
Feel free to register and login to start your topics.
- If you have any question concerning NewBB usage, plz visit your local support site or [url=http://www.simple-xoops.de/forum/]CBB Module Site[/url].
+ If you have any question concerning NewBB usage, plz visit your local support site or [url=http://www.simple-xoops.de/forum/]NewBB Module...
[truncated message content] |
|
From: <be...@us...> - 2012-02-08 13:37:58
|
Revision: 8908
http://xoops.svn.sourceforge.net/xoops/?rev=8908&view=rev
Author: beckmi
Date: 2012-02-08 13:37:46 +0000 (Wed, 08 Feb 2012)
Log Message:
-----------
Updating English translations
Modified Paths:
--------------
XoopsModules/extcal/branches/jjdai/extcal/language/english/admin.php
XoopsModules/extcal/branches/jjdai/extcal/language/english/blocks.php
XoopsModules/extcal/branches/jjdai/extcal/language/english/main.php
XoopsModules/extcal/branches/jjdai/extcal/language/english/modinfo.php
Modified: XoopsModules/extcal/branches/jjdai/extcal/language/english/admin.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/extcal/language/english/admin.php 2012-02-08 03:54:48 UTC (rev 8907)
+++ XoopsModules/extcal/branches/jjdai/extcal/language/english/admin.php 2012-02-08 13:37:46 UTC (rev 8908)
@@ -2,22 +2,22 @@
// @author Gregory Mage (Aka Mage)
//***************************************************************************************
define('_AM_EXTCAL_CONFIG', "Configurations");
-define('_AM_EXTCAL_EVENTS_DELETED', "Evenements supprimés avec succès.");
-define('_AM_EXTCAL_PEAR_PATH', "Library PEAR");
+define('_AM_EXTCAL_EVENTS_DELETED', "Events deleted successfully.");
+define('_AM_EXTCAL_PEAR_PATH', "PEAR Library");
define('_AM_EXTCAL_RECURRENT', "Recurrent");
define('_AM_EXTCAL_START_RULES', "Rules");
define('_AM_EXTCAL_WEIGHT', "Weight");
-define('_AM_EXTCAL_MANAGER_CATS', "Categorie manager");
+define('_AM_EXTCAL_MANAGER_CATS', "Category manager");
define('_AM_EXTCAL_CLONE_OF', "Clone the event #");
define('_AM_EXTCAL_EDIT_EVENT', "Edit even");
define('_AM_EXTCAL_ABOUT_AUTHOR', 'Author: ');
-define('_AM_EXTCAL_ABOUT_AUTHOR_INFO', 'Author Infos');
+define('_AM_EXTCAL_ABOUT_AUTHOR_INFO', 'Author Info');
define('_AM_EXTCAL_ABOUT_AUTHOR_NAME', 'Author name: ');
define('_AM_EXTCAL_ABOUT_CHANGELOG', 'Change Log');
define('_AM_EXTCAL_ABOUT_CREDITS', 'Credits: ');
define('_AM_EXTCAL_ABOUT_DESCRIPTION', 'Description: ');
define('_AM_EXTCAL_ABOUT_LICENSE', 'License: ');
-define('_AM_EXTCAL_ABOUT_MODULE_INFO', 'Module Infos');
+define('_AM_EXTCAL_ABOUT_MODULE_INFO', 'Module Info');
define('_AM_EXTCAL_ABOUT_MODULE_STATUS', 'Status: ');
define('_AM_EXTCAL_ABOUT_RELEASEDATE', 'Released: ');
define('_AM_EXTCAL_ABOUT_UPDATEDATE', 'Updated: ');
@@ -27,8 +27,8 @@
define('_AM_EXTCAL_ADMINISTRATION', 'Administration');
define('_AM_EXTCAL_APPROVED', 'Approved');
define('_AM_EXTCAL_APPROVED_EVENT', 'Approve event');
-define('_AM_EXTCAL_AUTO_APPROVE', 'Auto approve sumitted event');
-define('_AM_EXTCAL_AUTOAPPROVE_PERMISSION', 'Autoprove permission');
+define('_AM_EXTCAL_AUTO_APPROVE', 'Auto-approve submitted event');
+define('_AM_EXTCAL_AUTOAPPROVE_PERMISSION', 'Auto-approve permission');
define('_AM_EXTCAL_AUTOAPPROVE_PERMISSION_DESC', 'Select categories that each group needn\'t approve for submitted event');
define('_AM_EXTCAL_CAN_EDIT', 'Can edit');
define('_AM_EXTCAL_CAN_SUBMIT', 'Can submit');
@@ -37,18 +37,18 @@
define('_AM_EXTCAL_CAT_DELETED', 'Category successfully deleted.');
define('_AM_EXTCAL_CAT_EDITED', 'Category edited');
define('_AM_EXTCAL_CATEGORY', 'Category');
-define('_AM_EXTCAL_CHECK_UPDATE_ERROR', 'Can\'t retrive the last version of eXtCal.');
+define('_AM_EXTCAL_CHECK_UPDATE_ERROR', 'Can\'t retrieve the last version of eXtCal.');
define('_AM_EXTCAL_COLOR', 'Color');
define('_AM_EXTCAL_CONFIG_CHECK', 'Configurations');
define('_AM_EXTCAL_CONFIG_PHP', "You must have at least %s as a php version (your current version is %s)");
define('_AM_EXTCAL_CONFIG_XOOPS', "You must have at least the version %s (your current version is %s)");
-define('_AM_EXTCAL_CONFIRM_DELETE_ALL', "Supprimer tout");
+define('_AM_EXTCAL_CONFIRM_DELETE_ALL', "Delete all");
define('_AM_EXTCAL_CONFIRM_DELETE_CAT', 'Confirm to delete category');
-define('_AM_EXTCAL_CONFIRM_DELETE_EVENT', 'Confirm delete event.');
-define('_AM_EXTCAL_CONFIRM_DELETE_SELECTION', "Supprimer la sélection");
-define('_AM_EXTCAL_DELETE', "Suppression");
-define('_AM_EXTCAL_DELETE_ALL', "Supprimer tout");
-define('_AM_EXTCAL_DELETE_SELECTION', "Supprimer la sélection");
+define('_AM_EXTCAL_CONFIRM_DELETE_EVENT', 'Confirm to delete event.');
+define('_AM_EXTCAL_CONFIRM_DELETE_SELECTION', "Delete seleted");
+define('_AM_EXTCAL_DELETE', "Select to Delete");
+define('_AM_EXTCAL_DELETE_ALL', "Delete All");
+define('_AM_EXTCAL_DELETE_SELECTION', "Delete selected");
define('_AM_EXTCAL_DESCRIPTION', 'Description');
define('_AM_EXTCAL_DOWN_DONE', 'Downloading done. Click here to install files');
define('_AM_EXTCAL_EDIT_CATEGORY', 'Edit category');
@@ -56,7 +56,7 @@
define('_AM_EXTCAL_EDIT_PERMISSION', 'Edit permission');
define('_AM_EXTCAL_EDIT_PERMISSION_DESC', 'Select categories where each group is allowed to edit there own event');
define('_AM_EXTCAL_ERREUR_NO_ETABLISSEMENT', 'There is no location in the database');
-define('_AM_EXTCAL_ETABLISSEMENT', 'Etablissement');
+define('_AM_EXTCAL_ETABLISSEMENT', 'Venue');
define('_AM_EXTCAL_ETABLISSEMENT_FORM_ACTION', 'Action');
define('_AM_EXTCAL_ETABLISSEMENT_FORM_ADRESSE', 'Address');
define('_AM_EXTCAL_ETABLISSEMENT_FORM_DELETE', 'Delete Location');
@@ -64,14 +64,14 @@
define('_AM_EXTCAL_ETABLISSEMENT_FORM_NOM', 'Name');
define('_AM_EXTCAL_ETABLISSEMENT_FORM_TELEPHONE', 'Phone');
define('_AM_EXTCAL_ETABLISSEMENT_SURDEL', 'Are you sure you want to delete');
-define('_AM_EXTCAL_ETABLISSEMENTS', 'Etablissements');
+define('_AM_EXTCAL_ETABLISSEMENTS', 'Venues');
define('_AM_EXTCAL_EVENT', 'Event');
define('_AM_EXTCAL_EVENT_CREATED', 'Event created');
define('_AM_EXTCAL_EVENT_DELETED', 'Event successfully deleted.');
define('_AM_EXTCAL_EVENT_EDITED', 'Event edited');
define('_AM_EXTCAL_FORMOK', 'Save successful');
define('_AM_EXTCAL_GO_TO_MODULE', 'Go to module');
-define('_AM_EXTCAL_GOTO_EVENTS', "Return to evenements");
+define('_AM_EXTCAL_GOTO_EVENTS', "Return to events");
define('_AM_EXTCAL_GROUP_NAME', 'Group name');
define('_AM_EXTCAL_ICONE_CLONE', "Clone");
define('_AM_EXTCAL_ICONE_DELETE', "Delete");
@@ -79,7 +79,7 @@
define('_AM_EXTCAL_INDEX_APPROVED', "Events for approval: %s");
define('_AM_EXTCAL_INDEX_CATEGORIES', "Number of categories: %s");
define('_AM_EXTCAL_INDEX_EVENT', "Number of Events in DB: %s");
-define('_AM_EXTCAL_INDEX_PENDING', "Pendings events: %s");
+define('_AM_EXTCAL_INDEX_PENDING', "Pending events: %s");
define('_AM_EXTCAL_INFO_APPROVE_PENDING_EVENT', '<b>Approve</b> new event without read information.');
define('_AM_EXTCAL_INFO_DELETE', '<b>Delete</b> event.');
define('_AM_EXTCAL_INFO_DELETE_PENDING_EVENT', '<b>Delete</b> the new event.');
@@ -88,11 +88,11 @@
define('_AM_EXTCAL_INFORMATION', 'Information');
define('_AM_EXTCAL_INSTALL', 'Install files');
define('_AM_EXTCAL_INSTALL_DONE', 'Installing done. Click here to update your module');
-define('_AM_EXTCAL_LG_FILE_DONT_EXIST', 'Language file don\'t exist on repository :<br /><b>Server : </b>%s<br /><b>File : </b>%s');
-define('_AM_EXTCAL_MD_FILE_DONT_EXIST', 'Module file don\'t exist on repository :<br /><b>Server : </b>%s<br /><b>File : </b>%s');
-define('_AM_EXTCAL_MD_FILE_DONT_EXIST_SHORT', 'Module file don\'t exist');
+define('_AM_EXTCAL_LG_FILE_DONT_EXIST', 'Language files don\'t exist in repository: <br /><b>Server : </b>%s<br /><b>File : </b>%s');
+define('_AM_EXTCAL_MD_FILE_DONT_EXIST', 'Module files don\'t exist on repository :<br /><b>Server : </b>%s<br /><b>File : </b>%s');
+define('_AM_EXTCAL_MD_FILE_DONT_EXIST_SHORT', 'Module files don\'t exist');
define('_AM_EXTCAL_MODULE_ADMIN_SUMMARY', 'eXtCal Administration Summary');
-define('_AM_EXTCAL_MULTIUPLOADS_NOT_OK', "Le composant multiuploads n'est pas installé.<br /><br /><a href='http://xoops.kiolo.com/modules/mydownloads/'>Télécharger le composant multiuploads ici</a><br /><br />et installer le dans le dossier 'class/xoopsform/'");
+define('_AM_EXTCAL_MULTIUPLOADS_NOT_OK', "The multiuploads component is not installed.<br /><br /><a href='http://xoops.kiolo.com/modules/mydownloads/'>Download here the multiuploads component</a><br /><br />and install it in the folder 'class/xoopsform/'");
define('_AM_EXTCAL_NAME', 'Name');
define('_AM_EXTCAL_NOPERMSSET', 'Permission cannot be set: There are no Categories created yet! Please create a Category first.');
define('_AM_EXTCAL_PENDING', 'Pending');
@@ -101,7 +101,7 @@
define('_AM_EXTCAL_PERM_NO_CATEGORY', 'You must create category first');
define('_AM_EXTCAL_PREFERENCES', 'Preferences');
define('_AM_EXTCAL_PUBLIC_PERM_MASK', 'Public permissions mask');
-define('_AM_EXTCAL_PUBLIC_PERM_MASK_INFO', 'You can set here the default mask permission who will be apply to new category. Be carefull to don\'t give excessive permissions here because all new category will give them.');
+define('_AM_EXTCAL_PUBLIC_PERM_MASK_INFO', 'You can set here the default mask permission who will be apply to new category. Be careful to don\'t give excessive permissions here because all new category will give them.');
define('_AM_EXTCAL_REDIRECT_DELOK', 'successfully deleted');
define('_AM_EXTCAL_START_DATE', 'Start Date');
define('_AM_EXTCAL_SUBMIT_PERMISSION', 'Submit permission');
@@ -116,6 +116,6 @@
define('_AM_EXTCAL_VIEW_PERMISSION', 'View permission');
define('_AM_EXTCAL_VIEW_PERMISSION_DESC', 'Select categories that each group is allowed to view');
define('_AM_EXTCAL_NO_PENDING_EVENT', 'No pending Event');
-define('_AM_EXTCAL_ICONE', 'Icône');
+define('_AM_EXTCAL_ICONE', 'Icon');
?>
Modified: XoopsModules/extcal/branches/jjdai/extcal/language/english/blocks.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/extcal/language/english/blocks.php 2012-02-08 03:54:48 UTC (rev 8907)
+++ XoopsModules/extcal/branches/jjdai/extcal/language/english/blocks.php 2012-02-08 13:37:46 UTC (rev 8908)
@@ -20,13 +20,13 @@
define('_MB_EXTCAL_NEXT', 'Next');
define('_MB_EXTCAL_PREVIEW', 'Preview');
define('_MB_EXTCAL_PX', 'px');
-define('_MB_EXTCAL_SECONDES', 'secondes');
+define('_MB_EXTCAL_SECONDES', 'seconds');
define('_MB_EXTCAL_SS_HEIGHT', 'Slideshow height');
-define('_MB_EXTCAL_SS_NB_PHOTOS', 'Slideshow nb photos');
+define('_MB_EXTCAL_SS_NB_PHOTOS', 'Slideshow # of photos');
define('_MB_EXTCAL_SS_PAUSE_TIME', 'Slideshow pause time');
-define('_MB_EXTCAL_SS_TRANS_TIME', 'Slideshow trans time');
+define('_MB_EXTCAL_SS_TRANS_TIME', 'Slideshow transition time');
define('_MB_EXTCAL_SS_WIDTH', 'Slideshow width');
define('_MB_EXTCAL_SUBMIT_LINK_TEXT', 'Submit event');
-define('_MB_EXTCAL_TITLE_LENGTH', 'Title lenght');
+define('_MB_EXTCAL_TITLE_LENGTH', 'Title length');
?>
Modified: XoopsModules/extcal/branches/jjdai/extcal/language/english/main.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/extcal/language/english/main.php 2012-02-08 03:54:48 UTC (rev 8907)
+++ XoopsModules/extcal/branches/jjdai/extcal/language/english/main.php 2012-02-08 13:37:46 UTC (rev 8908)
@@ -33,21 +33,21 @@
define('_MD_EXTCAL_4_TU', '4th ' . _CAL_TUESDAY);
define('_MD_EXTCAL_4_WE', '4th ' . _CAL_WEDNESDAY);
define('_MD_EXTCAL_ABSENT', "Absent");
-define('_MD_EXTCAL_ACTION_COME', "S'est incrit");
-define('_MD_EXTCAL_ACTION_DELEGATION', "Donner délégation");
-define('_MD_EXTCAL_ACTION_DESINSCRIPTION', "S'est désinscript");
-define('_MD_EXTCAL_ACTION_INSCRIPTION', "S'est incrit");
-define('_MD_EXTCAL_ACTION_MESSAGE', "Informe du message suivant : ");
-define('_MD_EXTCAL_ACTION_NONE', "S'est désinscript");
-define('_MD_EXTCAL_ACTION_NOTCOME', "Sera absent");
+define('_MD_EXTCAL_ACTION_COME', "Register");
+define('_MD_EXTCAL_ACTION_DELEGATION', "Delegate");
+define('_MD_EXTCAL_ACTION_DESINSCRIPTION', "Unregister");
+define('_MD_EXTCAL_ACTION_INSCRIPTION', "Register");
+define('_MD_EXTCAL_ACTION_MESSAGE', "Message: ");
+define('_MD_EXTCAL_ACTION_NONE', "Unregister");
+define('_MD_EXTCAL_ACTION_NOTCOME', "Not coming");
define('_MD_EXTCAL_ADD_ME', 'Add Me');
define('_MD_EXTCAL_ADDRESS', 'Address');
-define('_MD_EXTCAL_ALPHA', 'Alphabetique' );
+define('_MD_EXTCAL_ALPHA', 'Alphabetically' );
define('_MD_EXTCAL_AND', 'And');
define('_MD_EXTCAL_APR', 'Apr');
define('_MD_EXTCAL_AUG', 'Aug');
define('_MD_EXTCAL_CATEGORY', 'Category');
-define('_MD_EXTCAL_CITATION', "Citation");
+define('_MD_EXTCAL_CITATION', "Quote");
define('_MD_EXTCAL_CONTACT', 'Contact');
define('_MD_EXTCAL_CONTACT_INFO', 'Contact info');
define('_MD_EXTCAL_DAILY', 'Daily');
@@ -57,9 +57,9 @@
define('_MD_EXTCAL_DEC', 'Dec');
define('_MD_EXTCAL_DEL_IMG', 'Delete the \ image');
define('_MD_EXTCAL_DESCRIPTION', 'Description');
-define('_MD_EXTCAL_DEVISE1', "Livre");
-define('_MD_EXTCAL_DEVISE2', "Livres");
-define('_MD_EXTCAL_DEVISE3', "£");
+define('_MD_EXTCAL_DEVISE1', "£");
+define('_MD_EXTCAL_DEVISE2', "US$");
+define('_MD_EXTCAL_DEVISE3', "AUS$");
define('_MD_EXTCAL_DURING', 'During');
define('_MD_EXTCAL_EDIT_EVENT', 'Edit event');
define('_MD_EXTCAL_EMAIL', 'Email');
@@ -93,19 +93,19 @@
define('_MD_EXTCAL_ETABLISSEMENT_TEL_FIXE', 'Phone number');
define('_MD_EXTCAL_ETABLISSEMENT_TEL_PORTABLE', 'Mobile Phone');
define('_MD_EXTCAL_ETABLISSEMENT_VILLE', 'City');
-define('_MD_EXTCAL_EVENT', "Evénnement");
+define('_MD_EXTCAL_EVENT', "Event");
define('_MD_EXTCAL_EVENT_CREATED', 'Event Created');
define('_MD_EXTCAL_EVENT_END', 'Have end ?');
-define('_MD_EXTCAL_EVENTS_FOUND', "%1\$s événts found" );
+define('_MD_EXTCAL_EVENTS_FOUND', "%1\$s events found" );
define('_MD_EXTCAL_EXPRESSION', 'Expression (list)');
define('_MD_EXTCAL_FEB', 'Feb');
define('_MD_EXTCAL_FILE_ATTACHEMENT', 'Attach a file');
define('_MD_EXTCAL_FORM_IMG', 'Image (%s)');
define('_MD_EXTCAL_FORMAT_DATE', "l dS of F Y h:i:s A");
define('_MD_EXTCAL_FR2', 'Fr');
-define('_MD_EXTCAL_ICONE_CLONE', "Dupliquer");
-define('_MD_EXTCAL_ICONE_DELETE', "Supprimer");
-define('_MD_EXTCAL_ICONE_EDIT', "Editer");
+define('_MD_EXTCAL_ICONE_CLONE', "Clone");
+define('_MD_EXTCAL_ICONE_DELETE', "Delete");
+define('_MD_EXTCAL_ICONE_EDIT', "Edit");
define('_MD_EXTCAL_ICONE_PRINT', "Print");
define('_MD_EXTCAL_IMG', 'Image (%s)');
define('_MD_EXTCAL_IMG_CONFIG', '%s KB max file size, %s pixels width and/or height');
@@ -119,22 +119,22 @@
define('_MD_EXTCAL_LAST_TH', 'Last ' . _CAL_THURSDAY);
define('_MD_EXTCAL_LAST_TU', 'Last ' . _CAL_TUESDAY);
define('_MD_EXTCAL_LAST_WE', 'Last ' . _CAL_WEDNESDAY);
-define('_MD_EXTCAL_LIB_COME', "Inscription");
-define('_MD_EXTCAL_LIB_NONE', "Aucun");
-define('_MD_EXTCAL_LIB_NOTCOME', "Désinscription");
-define('_MD_EXTCAL_LOCALISATION', 'Localisation');
+define('_MD_EXTCAL_LIB_COME', "Register");
+define('_MD_EXTCAL_LIB_NONE', "None");
+define('_MD_EXTCAL_LIB_NOTCOME', "Unsubscribe");
+define('_MD_EXTCAL_LOCALISATION', 'Localization');
define('_MD_EXTCAL_MAR', 'Mar');
-define('_MD_EXTCAL_MAX_MEMBER_REACHED', 'Maximum membre for this event reached');
+define('_MD_EXTCAL_MAX_MEMBER_REACHED', 'Maximum # of participants for this event reached');
define('_MD_EXTCAL_MAY', 'May');
-define('_MD_EXTCAL_MEMBERS_LIST', "Liste des membres");
+define('_MD_EXTCAL_MEMBERS_LIST', "List of participants");
define('_MD_EXTCAL_MO2', 'Mo');
define('_MD_EXTCAL_MONTH', 'month');
define('_MD_EXTCAL_MONTHLY', 'Monthly');
-define('_MD_EXTCAL_MSG_0', "%1\$s ne peut être inscrit");
-define('_MD_EXTCAL_MSG_1', "%1\$s vous informe de sa présence");
-define('_MD_EXTCAL_MSG_2', "%1\$s vous informe de l'annulation présence");
-define('_MD_EXTCAL_MSG_3', "%1\$s vous informe de son absence");
-define('_MD_EXTCAL_MSG_4', "%1\$s vous informe de l'annulation de son absence");
+define('_MD_EXTCAL_MSG_0', "%1\$s cannot be registered");
+define('_MD_EXTCAL_MSG_1', "%1\$s has registered");
+define('_MD_EXTCAL_MSG_2', "%1\$s has cancelled participation");
+define('_MD_EXTCAL_MSG_3', "%1\$s will be absent");
+define('_MD_EXTCAL_MSG_4', "%1\$s has cancelled his absence");
define('_MD_EXTCAL_NAV_AGENDA_DAY', 'Agenda day');
define('_MD_EXTCAL_NAV_AGENDA_WEEK', 'Agenda week');
define('_MD_EXTCAL_NAV_CALMONTH', 'Calendar month');
@@ -147,7 +147,7 @@
define('_MD_EXTCAL_NAV_YEAR', 'Year');
define('_MD_EXTCAL_NBMEMBER', 'Member limit');
define('_MD_EXTCAL_NBMEMBER_DESC', '0 = no limit');
-define('_MD_EXTCAL_NO_RECCUR_EVENT', 'Not reccuring event');
+define('_MD_EXTCAL_NO_RECCUR_EVENT', 'Not reoccurring event');
define('_MD_EXTCAL_NONE', 'None');
define('_MD_EXTCAL_NOV', 'Nov');
define('_MD_EXTCAL_OCT', 'Oct');
@@ -155,17 +155,17 @@
define('_MD_EXTCAL_OR', 'Or');
define('_MD_EXTCAL_OR_THE', 'or the');
define('_MD_EXTCAL_ORDER_BY', 'Order by');
-define('_MD_EXTCAL_ORDER_BY_ASC', ' Ascenant' );
-define('_MD_EXTCAL_ORDER_BY_DESC', 'Descendant' );
+define('_MD_EXTCAL_ORDER_BY_ASC', ' Ascending' );
+define('_MD_EXTCAL_ORDER_BY_DESC', 'Descending' );
define('_MD_EXTCAL_ORGANISATEUR', 'Organizer');
-define('_MD_EXTCAL_PERIODE', 'Periode');
-define('_MD_EXTCAL_POLITESSE', "Cordialement,");
+define('_MD_EXTCAL_PERIODE', 'Period');
+define('_MD_EXTCAL_POLITESSE', "Sincerely,");
define('_MD_EXTCAL_POSTED_BY', 'Posted by');
-define('_MD_EXTCAL_PRESENT', "Présent");
+define('_MD_EXTCAL_PRESENT', "Present");
define('_MD_EXTCAL_PREVIEW', 'Preview');
define('_MD_EXTCAL_PRICE', 'Price');
-define('_MD_EXTCAL_RECCUR_POLICY', 'Reccurence policy');
-define('_MD_EXTCAL_RECCUR_RULE', 'Reccuring rule');
+define('_MD_EXTCAL_RECCUR_POLICY', 'Recurrence policy');
+define('_MD_EXTCAL_RECCUR_RULE', 'Reoccurring rule');
define('_MD_EXTCAL_REMOVE_ME', 'Remove Me');
define('_MD_EXTCAL_RR_DAILY', 'Each day during %u days');
define('_MD_EXTCAL_RR_MONTHLY', 'Each month, the %s during %u month');
@@ -176,26 +176,26 @@
define('_MD_EXTCAL_SEARCH', "search" );
define('_MD_EXTCAL_SEP', 'Sep');
define('_MD_EXTCAL_SERACH_CRITERIA', 'Criteria');
-define('_MD_EXTCAL_SERACH_ORDER_BY', 'Criteres');
+define('_MD_EXTCAL_SERACH_ORDER_BY', 'Criteria');
define('_MD_EXTCAL_START', 'Start');
define('_MD_EXTCAL_START_DATE', 'Start date');
define('_MD_EXTCAL_STATUS', "Status");
-define('_MD_EXTCAL_STATUS_DELEGUE', "Délégation");
-define('_MD_EXTCAL_STATUS_DESINSCRIPTION', "Désinscription");
-define('_MD_EXTCAL_STATUS_INSCRIPTION', "Inscription");
+define('_MD_EXTCAL_STATUS_DELEGUE', "Delegation");
+define('_MD_EXTCAL_STATUS_DESINSCRIPTION', "Unsubscribe");
+define('_MD_EXTCAL_STATUS_INSCRIPTION', "Subscribe");
define('_MD_EXTCAL_STATUS_MESSAGE', "Information");
define('_MD_EXTCAL_SU2', 'Su');
-define('_MD_EXTCAL_SUBJECT_0', "Maximum de participation atteint");
-define('_MD_EXTCAL_SUBJECT_1', "Notification de présence");
-define('_MD_EXTCAL_SUBJECT_2', "Annulation de la notification de présence");
-define('_MD_EXTCAL_SUBJECT_3', "Notification d'absence");
-define('_MD_EXTCAL_SUBJECT_4', "Annulation de la notification d'absence");
-define('_MD_EXTCAL_SUBJECT_COME', "Inscription de ");
-define('_MD_EXTCAL_SUBJECT_DELEGATION', "Délégation de ");
-define('_MD_EXTCAL_SUBJECT_DESINSCRIPTION', "Désinscription de ");
-define('_MD_EXTCAL_SUBJECT_INSCRIPTION', "Inscription de ");
-define('_MD_EXTCAL_SUBJECT_MESSAGE', "Message de ");
-define('_MD_EXTCAL_SUBJECT_NONE', "Désinscription de ");
+define('_MD_EXTCAL_SUBJECT_0', "Maximum participation reached");
+define('_MD_EXTCAL_SUBJECT_1', "Notification of participation");
+define('_MD_EXTCAL_SUBJECT_2', "Cancellation of presence notification");
+define('_MD_EXTCAL_SUBJECT_3', "Notification of absence");
+define('_MD_EXTCAL_SUBJECT_4', "Cancellation of the notification of absence");
+define('_MD_EXTCAL_SUBJECT_COME', "Registration ");
+define('_MD_EXTCAL_SUBJECT_DELEGATION', "Delegation ");
+define('_MD_EXTCAL_SUBJECT_DESINSCRIPTION', "Unregister ");
+define('_MD_EXTCAL_SUBJECT_INSCRIPTION', "Registration ");
+define('_MD_EXTCAL_SUBJECT_MESSAGE', "Message ");
+define('_MD_EXTCAL_SUBJECT_NONE', "Unregistration ");
define('_MD_EXTCAL_SUBJECT_NOTCOME', "Absence de ");
define('_MD_EXTCAL_SUBMIT_EVENT', 'Submit event');
define('_MD_EXTCAL_SUBMITED_EVENT', 'Submitted event');
@@ -203,7 +203,7 @@
define('_MD_EXTCAL_TITLE', 'Title');
define('_MD_EXTCAL_TU2', 'Tu');
define('_MD_EXTCAL_URL', 'URL');
-define('_MD_EXTCAL_VALIDATE', "Valider");
+define('_MD_EXTCAL_VALIDATE', "Validation");
define('_MD_EXTCAL_WE2', 'We');
define('_MD_EXTCAL_WEEKLY', 'Weekly');
define('_MD_EXTCAL_WEEKS', 'week(s)');
@@ -225,5 +225,6 @@
define('_MD_EXTCAL_DAY_FRIDAY', 'Friday');
define('_MD_EXTCAL_DAY_SATURDAY', 'Saturday');
define('_MD_EXTCAL_DAY_SUNDAY', 'Sunday');
+define('_MD_EXTCAL_ICONE', 'Icon');
?>
Modified: XoopsModules/extcal/branches/jjdai/extcal/language/english/modinfo.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/extcal/language/english/modinfo.php 2012-02-08 03:54:48 UTC (rev 8907)
+++ XoopsModules/extcal/branches/jjdai/extcal/language/english/modinfo.php 2012-02-08 13:37:46 UTC (rev 8908)
@@ -3,9 +3,9 @@
define('_MI_EXTCAL_ABOUT', 'About');
-define('_MI_EXTCAL_AFTER', 'Dessous');
+define('_MI_EXTCAL_AFTER', 'After');//Dessous
define('_MI_EXTCAL_AGENDA_END_HOUR', "Agenda: Last hour");
-define('_MI_EXTCAL_AGENDA_END_HOUR_DESC', "The last hour to display in the Agenda. The next events are grouped on the least row.");
+define('_MI_EXTCAL_AGENDA_END_HOUR_DESC', "The last hour to display in the Agenda. The next events are grouped on the last row.");
define('_MI_EXTCAL_AGENDA_NB_DAYS_DAY', "Agenda Days: Number of days");
define('_MI_EXTCAL_AGENDA_NB_DAYS_DAY_DESC', "Number of days to display in columns. Every event is displayed with a colored square and a title.");
define('_MI_EXTCAL_AGENDA_NB_DAYS_WEEK', "Agenda week: Number of days");
@@ -15,7 +15,7 @@
define('_MI_EXTCAL_AGENDA_START_HOUR', "Agenda: Starting Hour");
define('_MI_EXTCAL_AGENDA_START_HOUR_DESC', "The first hour to display in the Agenda. The previous events are grouped on the first line '00:00'");
define('_MI_EXTCAL_ASCENDING', 'Ascending');
-define('_MI_EXTCAL_BEFORE', 'Au dessus');
+define('_MI_EXTCAL_BEFORE', 'Before');//Au dessus
define('_MI_EXTCAL_BNAME1', 'Minical');
define('_MI_EXTCAL_BNAME1_DESC', 'Mini calendar block');
define('_MI_EXTCAL_BNAME2', 'Spotlight event');
@@ -23,7 +23,7 @@
define('_MI_EXTCAL_BNAME3', 'Upcoming event');
define('_MI_EXTCAL_BNAME3_DESC', 'Display X upcoming event');
define('_MI_EXTCAL_BNAME4', "Today's events");
-define('_MI_EXTCAL_BNAME4_DESC', 'Display event occuring this day');
+define('_MI_EXTCAL_BNAME4_DESC', 'Display event occurring this day');
define('_MI_EXTCAL_BNAME5', 'New Event');
define('_MI_EXTCAL_BNAME5_DESC', 'Display X new events');
define('_MI_EXTCAL_BNAME6', 'Random events');
@@ -33,38 +33,38 @@
define('_MI_EXTCAL_CAT_NOTIFY', 'Category notification');
define('_MI_EXTCAL_CAT_NOTIFYDSC', 'Notification for a particular category');
define('_MI_EXTCAL_CATEGORY', 'Category');
-define('_MI_EXTCAL_DASHBOARD', 'extCal Dashboard');
+define('_MI_EXTCAL_DASHBOARD', 'Dashboard');
define('_MI_EXTCAL_DESC', 'XOOPS Calendar Module');
define('_MI_EXTCAL_DESCENDING', 'Descending');
define('_MI_EXTCAL_DISP_PAST_E_CAL', 'Display past event (Calendar view)');
-define('_MI_EXTCAL_DISP_PAST_E_CAL_DESC', '');
+define('_MI_EXTCAL_DISP_PAST_E_CAL_DESC', 'See the Date format on http://www.php.net/manual/en/function.date.php');
define('_MI_EXTCAL_DISP_PAST_E_LIST', 'Display past event (List view)');
define('_MI_EXTCAL_DISP_PAST_E_LIST_DESC', '');
-define('_MI_EXTCAL_EB_DATE_PATTERN', 'Event : Block date patern');
+define('_MI_EXTCAL_EB_DATE_PATTERN', 'Event: Block date pattern');
define('_MI_EXTCAL_EB_DATE_PATTERN_DESC', 'See the Date format on http://www.php.net/manual/en/function.date.php');
define('_MI_EXTCAL_EB_DATE_PATTERN_VALUE', 'j/m/Y');
-define('_MI_EXTCAL_ED_DATE_PATTERN', 'Event : Day view date patern');
+define('_MI_EXTCAL_ED_DATE_PATTERN', 'Event: Day view date pattern');
define('_MI_EXTCAL_ED_DATE_PATTERN_DESC', 'See the Date format on http://www.php.net/manual/en/function.date.php');
define('_MI_EXTCAL_ED_DATE_PATTERN_VALUE', 'j/m/Y');
-define('_MI_EXTCAL_EE_DATE_PATTERN', 'Event : Event view date patern');
+define('_MI_EXTCAL_EE_DATE_PATTERN', 'Event: Event view date pattern');
define('_MI_EXTCAL_EE_DATE_PATTERN_DESC', 'See the Date format on http://www.php.net/manual/en/function.date.php');
define('_MI_EXTCAL_EE_DATE_PATTERN_VALUE', 'l dS \of F Y h:i:s A');
-define('_MI_EXTCAL_EM_DATE_PATTERN', 'Event : Month view date patern');
+define('_MI_EXTCAL_EM_DATE_PATTERN', 'Event : Month view date pattern');
define('_MI_EXTCAL_EM_DATE_PATTERN_DESC', 'See the Date format on http://www.php.net/manual/en/function.date.php');
define('_MI_EXTCAL_EM_DATE_PATTERN_VALUE', 'j/m/Y');
-define('_MI_EXTCAL_EMAIL_MODE', 'Envoi des mails');
-define('_MI_EXTCAL_EMAIL_MODE_HTML', 'Mails au format HTML');
+define('_MI_EXTCAL_EMAIL_MODE', 'Sending email');
+define('_MI_EXTCAL_EMAIL_MODE_HTML', 'Emails as HTML');
define('_MI_EXTCAL_EMAIL_MODE_NONE', 'Pas de mails');
-define('_MI_EXTCAL_EMAIL_MODE_TEXT', 'Mails au format texte');
+define('_MI_EXTCAL_EMAIL_MODE_TEXT', 'Emails as text');
define('_MI_EXTCAL_ETABLISSEMENT', "Location");
define('_MI_EXTCAL_ETABLISSEMENTS', "Locations");
define('_MI_EXTCAL_EVENT', 'Event');
define('_MI_EXTCAL_EVENT_NOTIFY', 'Event');
define('_MI_EXTCAL_EVENT_NOTIFYDSC', 'Event notification');
-define('_MI_EXTCAL_EW_DATE_PATTERN', 'Event : Week view date patern');
+define('_MI_EXTCAL_EW_DATE_PATTERN', 'Event : Week view date pattern');
define('_MI_EXTCAL_EW_DATE_PATTERN_DESC', 'See the Date format on http://www.php.net/manual/en/function.date.php');
define('_MI_EXTCAL_EW_DATE_PATTERN_VALUE', 'j/m/Y');
-define('_MI_EXTCAL_EY_DATE_PATTERN', 'Event : Year view date patern');
+define('_MI_EXTCAL_EY_DATE_PATTERN', 'Event : Year view date pattern');
define('_MI_EXTCAL_EY_DATE_PATTERN_DESC', 'See the Date format on http://www.php.net/manual/en/function.date.php');
define('_MI_EXTCAL_EY_DATE_PATTERN_VALUE', 'j/m/Y');
define('_MI_EXTCAL_FILE_EXTENTION', 'Allowed file type');
@@ -75,8 +75,8 @@
define('_MI_EXTCAL_HTML', 'Allow HTML');
define('_MI_EXTCAL_HTML_DESC', 'Allow HTML or not for text field');
define('_MI_EXTCAL_INDEX', 'Home');
-define('_MI_EXTCAL_LIST_POS', 'Liste de s\xE9lection');
-define('_MI_EXTCAL_LIST_POS_DESC', 'Position des listes de s\xE9lection.<br>0 = au-dessus des onglets.<br>1 = sous les onglets');
+define('_MI_EXTCAL_LIST_POS', 'Selections');
+define('_MI_EXTCAL_LIST_POS_DESC', 'Position of selection lists.<br>0 = above the tabs.<br>1 = below the tabs');
define('_MI_EXTCAL_NAME', 'eXtCal');
define('_MI_EXTCAL_NAV_AGENDA_DAY', 'Day (Agenda)');
define('_MI_EXTCAL_NAV_AGENDA_WEEK', 'Week (Agenda)');
@@ -88,13 +88,13 @@
define('_MI_EXTCAL_NAV_SEARCH', 'Search');
define('_MI_EXTCAL_NAV_WEEK', 'Week (List)');
define('_MI_EXTCAL_NAV_YEAR', 'Year (List)');
-define('_MI_EXTCAL_NB_EVENTS_BY_PAGE', 'Nb events by page');
-define('_MI_EXTCAL_NB_EVENTS_BY_PAGE_DESC', 'Number of events by page in admin');
+define('_MI_EXTCAL_NB_EVENTS_BY_PAGE', 'Number of events by page');
+define('_MI_EXTCAL_NB_EVENTS_BY_PAGE_DESC', 'Number of events by page in Admin');
define('_MI_EXTCAL_NB_YEARS_AFTER', "List: Number of years after");
define('_MI_EXTCAL_NB_YEARS_AFTER_DESC', "Selected years list: Define the last year to show.");
define('_MI_EXTCAL_NB_YEARS_BEFORE', "List: Number of years before");
define('_MI_EXTCAL_NB_YEARS_BEFORE_DESC', "Selected years list: Define the first year to show.");
-define('_MI_EXTCAL_ND_DATE_PATTERN', 'Navig : Day view date patern');
+define('_MI_EXTCAL_ND_DATE_PATTERN', 'Navigation: Day view date pattern');
define('_MI_EXTCAL_ND_DATE_PATTERN_DESC', 'See the Date format on http://www.php.net/manual/en/function.date.php');
define('_MI_EXTCAL_ND_DATE_PATTERN_VALUE', 'l j F Y');
define('_MI_EXTCAL_NEW_EVENT_CAT_NOTIFY', 'New event');
@@ -109,41 +109,41 @@
define('_MI_EXTCAL_NEW_EVENT_PENDING_NOTIFYCAP', 'Notify me when a new event is posted without approve');
define('_MI_EXTCAL_NEW_EVENT_PENDING_NOTIFYDSC', 'Receive notification when a new event is submitted without approve');
define('_MI_EXTCAL_NEW_EVENT_PENDING_NOTIFYSBJ', "[{X_SITENAME}] {X_MODULE} auto-notify : New event submitted without approve");
-define('_MI_EXTCAL_NM_DATE_PATTERN', 'Navig : Month view date patern');
+define('_MI_EXTCAL_NM_DATE_PATTERN', 'Navigation: Month view date patern');
define('_MI_EXTCAL_NM_DATE_PATTERN_DESC', 'See the Date format on http://www.php.net/manual/en/function.date.php');
define('_MI_EXTCAL_NM_DATE_PATTERN_VALUE', 'F Y');
define('_MI_EXTCAL_NOTIFICATIONS', 'Notifications');
-define('_MI_EXTCAL_NW_DATE_PATTERN', 'Navig : Week view date patern');
+define('_MI_EXTCAL_NW_DATE_PATTERN', 'Navigation: Week view date patern');
define('_MI_EXTCAL_NW_DATE_PATTERN_DESC', 'See the Date format on http://www.php.net/manual/en/function.date.php');
define('_MI_EXTCAL_NW_DATE_PATTERN_VALUE', 'j F Y');
define('_MI_EXTCAL_OFFSET_MINICAL', 'Month of minical');
-define('_MI_EXTCAL_OFFSET_MINICAL_DESC', "Month to show from curent month. 0=current month,1=next month, ...");
-define('_MI_EXTCAL_PEAR_PATH', 'Librarie PEAR');
-define('_MI_EXTCAL_PEAR_PATH_DESC', "Chemin physique de la librairie (Laissez vide si vous l'ignorez)");
+define('_MI_EXTCAL_OFFSET_MINICAL_DESC', "Month to show from current month. 0=current month,1=next month, ...");
+define('_MI_EXTCAL_PEAR_PATH', 'PEAR Library');
+define('_MI_EXTCAL_PEAR_PATH_DESC', "Physical path to the library (Leave blank if you do not know)");
define('_MI_EXTCAL_PERMISSIONS', 'Permission');
define('_MI_EXTCAL_PRUNING', 'Pruning');
define('_MI_EXTCAL_RSS_CACHE_TIME', 'RSS cache time');
define('_MI_EXTCAL_RSS_CACHE_TIME_DESC', 'Cache time for RSS pages');
-define('_MI_EXTCAL_RSS_NB_EVENT', 'RSS nb event');
+define('_MI_EXTCAL_RSS_NB_EVENT', 'RSS Number event');
define('_MI_EXTCAL_RSS_NB_EVENT_DESC', 'Number of event displayed on RSS pages');
define('_MI_EXTCAL_SHOW_ID', "Show ID");
-define('_MI_EXTCAL_SHOW_ID_DESC', "Yes : show the id in infobulles and the toolstiptext<br />no : Do not show the ID");
-define('_MI_EXTCAL_SHOW_INFOBULLE', "Infobulles");
-define('_MI_EXTCAL_SHOW_INFOBULLE_DESC', "yes : In the views 'agenda-day' and 'agenda-week' display an infobulle with more informations<br />no : Display the text of the 'title' attribut");
+define('_MI_EXTCAL_SHOW_ID_DESC', "Yes: show the id in tooltips and the toolstiptext<br />No: Do not show the ID");
+define('_MI_EXTCAL_SHOW_INFOBULLE', "Tooltips");
+define('_MI_EXTCAL_SHOW_INFOBULLE_DESC', "yes : In the views 'agenda-day' and 'agenda-week' display a tooltip with more informations<br />no : Display the text of the 'title' attribut");
define('_MI_EXTCAL_SORT_ORDER', 'Event Order');
define('_MI_EXTCAL_SORT_ORDER_DESC', 'Event order on list view (Start date)');
define('_MI_EXTCAL_START_PAGE', 'Module home page');
define('_MI_EXTCAL_SUBMIT_EVENT', 'Submit Event');
-define('_MI_EXTCAL_TABS_WEIGHT', 'Ordre des onglets');
-define('_MI_EXTCAL_TABS_WEIGHT_DESC', "D\xE9fini l'ordre des onglets<br>Attention de bien respecteur noms des onglets:<br>"
+define('_MI_EXTCAL_TABS_WEIGHT', 'Order of the Tabs');
+define('_MI_EXTCAL_TABS_WEIGHT_DESC', "Set the tab order <br>Be careful to respect tab names:<br>"
. "<font color='#0000FF'>" . _EXTCAL_NAV_LIST ."</font>"
- . " <br>s\xE9parateur: retour \xE0 la ligne");
+ . " <br>Separator: new line");
define('_MI_EXTCAL_VISIBLE_TAB_DESC', "Define the visible view.");
define('_MI_EXTCAL_VISIBLE_TABS', "Visible tab");
define('_MI_EXTCAL_WEEK_START_DAY', 'Week start Day');
-define('_MI_EXTCAL_WEEK_START_DAY_DESC', 'Day to start the week on Calendar view');
+define('_MI_EXTCAL_WEEK_START_DAY_DESC', 'Day to start the week in Calendar view');
define('_MI_EXTCAL_WHOS_GOING', "Enable Who's going");
-define('_MI_EXTCAL_WHOS_GOING_DESC', "Enable or not the who's going feature");
+define('_MI_EXTCAL_WHOS_GOING_DESC', "Enable or not the Who's going feature");
define('_MI_EXTCAL_WHOSNOT_GOING', "Enable Who's not going");
define('_MI_EXTCAL_WHOSNOT_GOING_DESC', "Enable or not the who's not going feature");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-02-08 03:54:56
|
Revision: 8907
http://xoops.svn.sourceforge.net/xoops/?rev=8907&view=rev
Author: djculex
Date: 2012-02-08 03:54:48 +0000 (Wed, 08 Feb 2012)
Log Message:
-----------
another go at cleaning up a bit and documenting functions
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/class/adminclass.php
XoopsModules/smallworld/trunk/smallworld/class/db.php
XoopsModules/smallworld/trunk/smallworld/class/forms.php
XoopsModules/smallworld/trunk/smallworld/class/friends.php
XoopsModules/smallworld/trunk/smallworld/class/images.php
XoopsModules/smallworld/trunk/smallworld/class/profile.php
XoopsModules/smallworld/trunk/smallworld/class/user.php
XoopsModules/smallworld/trunk/smallworld/class/wall.php
Modified: XoopsModules/smallworld/trunk/smallworld/class/adminclass.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/class/adminclass.php 2012-02-07 23:33:30 UTC (rev 8906)
+++ XoopsModules/smallworld/trunk/smallworld/class/adminclass.php 2012-02-08 03:54:48 UTC (rev 8907)
@@ -1,375 +1,459 @@
<?php
/**
* 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.
+* 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
-* @module: Smallworld
-* @Author: Michael Albertsen (http://culex.dk) <cu...@cu...>
-* @copyright: 2011 Culex
-* @Repository path: $HeadURL$
-* @Last committed: $Revision$
-* @Last changed by: $Author$
-* @Last changed date: $Date$
-* @ID: $Id$
+* @copyright: The XOOPS Project http://sourceforge.net/projects/xoops/
+* @license: http://www.fsf.org/copyleft/gpl.html GNU public license
+* @packet: Modules
+* @sub-packet: Smallworld
+* @since: Xoops 2.5.4
+* @Author: Michael Albertsen (http://culex.dk) <cu...@cu...>
+* @copyright: 2011 Culex
+* @Last committed: $Revision$
+* @Last changed by: $Author$
+* @Last changed date: $Date$
+* @ID: $Id$
**/
-
-class SmallworldAdmin {
- // Get oldes message in Db
- function oldestMsg () {
- global $xoopsDB;
- $date = 0;
- $sql = "SELECT * FROM ".$xoopsDB->prefix('smallworld_messages')." ORDER BY created limit 1";
- $result = $xoopsDB->queryF($sql);
- $counter = $xoopsDB->getRowsNum($result);
- if ($counter >= 1) {
- while ($sqlfetch = $xoopsDB->fetchArray($result)) {
- $date = $sqlfetch['created'];
- }
- }
- return $date;
- }
-
- // Get average messages sent per day
- function AvgMsgDay ($totaldays) {
- global $xoopsDB;
- $sql = "SELECT count( * ) / ".$totaldays." AS averg FROM ".$xoopsDB->prefix('smallworld_messages')."";
- $result = $xoopsDB->queryF($sql);
- while ($sqlfetch = $xoopsDB->fetchArray($result)) {
- $avg = number_format($sqlfetch['averg'], 2, '.', ',');
- }
- return $avg;
- }
+/**
+ * package modules
+ * @sub-package smallworld
+ * @Author: Michael Albertsen (http://culex.dk) <cu...@cu...>
+ * @copyright Copyright (c) 2011 Culex www.culex.dk <cu...@cu...>
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @since: Xoops 2.5.4
+ */
+class SmallworldAdmin
+{
+ /**
+ * Get oldest message in Db
+ * @returns time
+ */
+ function oldestMsg ()
+ {
+ global $xoopsDB;
+ $date = 0;
+ $sql = "SELECT * FROM ".$xoopsDB->prefix('smallworld_messages')." ORDER BY created limit 1";
+ $result = $xoopsDB->queryF($sql);
+ $counter = $xoopsDB->getRowsNum($result);
+ if ($counter >= 1) {
+ while ($sqlfetch = $xoopsDB->fetchArray($result)) {
+ $date = $sqlfetch['created'];
+ }
+ }
+ return $date;
+ }
+
+ /**
+ * Get average messages sent per day
+ * @param intval $totaldays
+ * @returns intval
+ */
+ function AvgMsgDay ($totaldays)
+ {
+ global $xoopsDB;
+ $sql = "SELECT count( * ) / ".$totaldays." AS averg FROM ".$xoopsDB->prefix('smallworld_messages')."";
+ $result = $xoopsDB->queryF($sql);
+ while ($sqlfetch = $xoopsDB->fetchArray($result)) {
+ $avg = number_format($sqlfetch['averg'], 2, '.', ',');
+ }
+ return $avg;
+ }
+
+ /**
+ * total users using smallworld
+ * @returns intval
+ */
+ function TotalUsers ()
+ {
+ global $xoopsDB;
+ $sql = "SELECT * FROM ".$xoopsDB->prefix('smallworld_user')."";
+ $result = $xoopsDB->queryF($sql);
+ $counter = $xoopsDB->getRowsNum($result);
+ if ($counter < 1) {
+ $sum = 0;
+ } else {
+ $i = 0;
+ while ($myrow = $xoopsDB->fetchArray($result)) {
+ $user[$i]['username'] = $myrow['username'];
+ $i++;
+ }
+ $all = $this->flatten($user);
+ $sum = count(array_unique($all));
+ $unique = array_unique($all);
+ }
+ return $sum;
+ }
+
+ /**
+ * Get version of module
+ * @returns string
+ */
+ function ModuleInstallVersion ()
+ {
+ global $xoopsModule;
+ $version = round($xoopsModule->getVar('version') / 100, 2);
+ return $version;
+ }
+
+ /**
+ * Get date when Module was installed
+ * @returns time
+ */
+ function ModuleInstallDate ()
+ {
+ global $xoopsModule;
+ $date = formatTimestamp($xoopsModule->getVar('last_update'), 'm');
+ return $date;
+ }
- // total users using smallworld
- function TotalUsers () {
- global $xoopsDB;
- $sql = "SELECT * FROM ".$xoopsDB->prefix('smallworld_user')."";
- $result = $xoopsDB->queryF($sql);
- $counter = $xoopsDB->getRowsNum($result);
- if ($counter < 1) {
- $sum = 0;
- } else {
- $i = 0;
- while ( $myrow = $xoopsDB->fetchArray($result) ) {
- $user[$i]['username'] = $myrow['username'];
- $i++;
- }
- $all = $this->flatten($user);
- $sum = count(array_unique($all));
- $unique = array_unique($all);
- }
- return $sum;
- }
+ /**
+ * Count total days represented in db
+ * @returns time
+ */
+ function CountDays ()
+ {
+ global $xoopsDB, $xoopsModule;
+ $date = $this->oldestMsg();
+ $now = time();
+ $diff = ($now - $date) / (60 * 60 * 24);
+ return $diff;
+ }
+
+ /**
+ * find user with most posted messages
+ * @returns array
+ */
+ function mostactiveusers_allround()
+ {
+ global $xoopsDB, $xoopsUser;
+ $sql = "SELECT uid_fk, COUNT( * ) as cnt ";
+ $sql .= "FROM ( ";
+ $sql .= "SELECT uid_fk ";
+ $sql .= "FROM ".$xoopsDB->prefix('smallworld_messages')." ";
+ $sql .= "UNION ALL SELECT uid_fk ";
+ $sql .= "FROM ".$xoopsDB->prefix('smallworld_comments')." ";
+ $sql .= ") AS u ";
+ $sql .= "GROUP BY uid_fk ";
+ $sql .= "ORDER BY count( * ) DESC limit 20";
+ $result = $xoopsDB->queryF($sql);
+ $counter = $xoopsDB->getRowsNum($result);
- // Get version of module
- function ModuleInstallVersion () {
- global $xoopsModule;
- $version = round($xoopsModule->getVar('version') / 100, 2);
- return $version;
- }
-
- // Get date when Module was installed
- function ModuleInstallDate () {
- global $xoopsModule;
- $date = formatTimestamp($xoopsModule->getVar('last_update'),'m');
- return $date;
- }
+ if ($counter < 1) {
+ $msg = array();
+ } else {
+ $msg = array();
+ $i = 1;
+ while ($row = $xoopsDB->fetchArray($result)) {
+ $msg["counter"][$i] = $i;
+ $msg["img"][$i] = "<img style='margin:0px 5px;' src = '../images/".$i.".png'></img>";
+ if ($msg['counter'][$i] > 3) {
+ $msg["img"][$i] = '';
+ }
+ $msg["cnt"][$i] = $row["cnt"];
+ $msg["from"][$i] = $xoopsUser->getUnameFromId($row["uid_fk"]);
+ $i++;
+ }
+ }
+ return $msg;
+ }
+
+ /**
+ * find user with most posted messages in last 24 hours
+ * @returns array
+ */
+ function mostactiveusers_today()
+ {
+ global $xoopsDB, $xoopsUser;
+ $sql = "SELECT uid_fk, COUNT( * ) as cnt ";
+ $sql .= "FROM ( ";
+ $sql .= "SELECT uid_fk ";
+ $sql .= "FROM ".$xoopsDB->prefix('smallworld_messages')." ";
+ $sql .= "WHERE `created` > UNIX_TIMESTAMP(DATE_SUB( NOW( ) , INTERVAL 1 DAY )) ";
+ $sql .= "UNION ALL SELECT uid_fk ";
+ $sql .= "FROM ".$xoopsDB->prefix('smallworld_comments')." ";
+ $sql .= "WHERE `created` > UNIX_TIMESTAMP(DATE_SUB( NOW( ) , INTERVAL 1 DAY )) ";
+ $sql .= ") AS u ";
+ $sql .= "GROUP BY uid_fk ";
+ $sql .= "ORDER BY count( * ) DESC limit 20";
+
+ $result = $xoopsDB->queryF($sql);
+ $msgtoday = array();
+
+ if ($xoopsDB->getRowsNum($result) != 0) {
+ $i = 1;
+ while ($row = $xoopsDB->fetchArray($result)) {
+ $msgtoday["counter"][$i] = $i;
+ $msgtoday["img"][$i] = "<img style='margin:0px 5px;' src = '../images/".$i.".png'></img>";
+ if ($msgtoday['counter'][$i] > 3) {
+ $msgtoday["img"][$i] = '';
+ }
+ $msgtoday["cnt"][$i] = $row["cnt"];
+ $msgtoday["from"][$i] = $xoopsUser->getUnameFromId($row["uid_fk"]);
+ $i++;
+ }
+ } else {
+ $msgtoday = array();
+ }
+ return $msgtoday;
+ }
+
+ /**
+ * Find best OR worst rated users
+ * @param string $direction
+ * @returns array
+ */
+ function topratedusers($direction)
+ {
+ global $xoopsUser, $xoopsDB, $xoopsTpl;
+ $array = array();
- // Count total days represented in db
- function CountDays () {
- global $xoopsDB,$xoopsModule;
- //$date = $xoopsModule->getVar('last_update');
- $date = $this->oldestMsg();
- $now = time();
- $diff = ($now - $date) / (60*60*24);
- return $diff;
- }
- // find user with most posted messages
- function mostactiveusers_allround() {
- global $xoopsDB,$xoopsUser;
- $sql = "SELECT uid_fk, COUNT( * ) as cnt ";
- $sql .= "FROM ( ";
- $sql .= "SELECT uid_fk ";
- $sql .= "FROM ".$xoopsDB->prefix('smallworld_messages')." ";
- $sql .= "UNION ALL SELECT uid_fk ";
- $sql .= "FROM ".$xoopsDB->prefix('smallworld_comments')." ";
- $sql .= ") AS u ";
- $sql .= "GROUP BY uid_fk ";
- $sql .= "ORDER BY count( * ) DESC limit 20";
- $result = $xoopsDB->queryF($sql);
- $counter = $xoopsDB->getRowsNum($result);
-
- if ($counter < 1) {
- $msg = array();
- //$xoopsTpl->append('topuser', $msg);
- } else {
- $msg = array();
-
- $i = 1;
- while ($row = $xoopsDB->fetchArray($result)) {
- $msg["counter"][$i] = $i;
- $msg["img"][$i] = "<img style='margin:0px 5px;' src = '../images/".$i.".png'></img>";
- if ($msg['counter'][$i] > 3) { $msg["img"][$i] = '';}
- $msg["cnt"][$i] = $row["cnt"];
- $msg["from"][$i] = $xoopsUser->getUnameFromId($row["uid_fk"]);
- //$xoopsTpl->append('topuser', $msg);
- $i++;
- }
- }
- return $msg;
- }
-
- // find user with most posted messages in last 24 hours
- function mostactiveusers_today() {
- global $xoopsDB,$xoopsUser;
- $sql = "SELECT uid_fk, COUNT( * ) as cnt ";
- $sql .= "FROM ( ";
- $sql .= "SELECT uid_fk ";
- $sql .= "FROM ".$xoopsDB->prefix('smallworld_messages')." ";
- $sql .= "WHERE `created` > UNIX_TIMESTAMP(DATE_SUB( NOW( ) , INTERVAL 1 DAY )) ";
- $sql .= "UNION ALL SELECT uid_fk ";
- $sql .= "FROM ".$xoopsDB->prefix('smallworld_comments')." ";
- $sql .= "WHERE `created` > UNIX_TIMESTAMP(DATE_SUB( NOW( ) , INTERVAL 1 DAY )) ";
- $sql .= ") AS u ";
- $sql .= "GROUP BY uid_fk ";
- $sql .= "ORDER BY count( * ) DESC limit 20";
- $result = $xoopsDB->queryF($sql);
- $msgtoday = array();
- if ($xoopsDB->getRowsNum($result) != 0) {
- $i = 1;
- while ($row = $xoopsDB->fetchArray($result)) {
- $msgtoday["counter"][$i] = $i;
- $msgtoday["img"][$i] = "<img style='margin:0px 5px;' src = '../images/".$i.".png'></img>";
- if ($msgtoday['counter'][$i] > 3) { $msgtoday["img"][$i] = '';}
- $msgtoday["cnt"][$i] = $row["cnt"];
- $msgtoday["from"][$i] = $xoopsUser->getUnameFromId($row["uid_fk"]);
- $i++;
- }
- } else {
- $msgtoday = array();
- }
- return $msgtoday;
- }
-
- // Find best rated users overall
- function topratedusers($direction) {
- global $xoopsUser, $xoopsDB,$xoopsTpl;
- $array = array();
-
- if ($direction == 'up') {
- $sql = "SELECT owner, count(*) as cnt FROM ".$xoopsDB->prefix('smallworld_vote')." where up='1' GROUP by owner ORDER BY cnt DESC limit 20";
- $result = $xoopsDB->queryF($sql);
- $count = $xoopsDB->getRowsNum($result);
- $i = 1;
- if ($count >= $i) {
- while ($row = $xoopsDB->fetchArray($result)) {
- $array['counter'][$i] = $i;
- $array['img'][$i] = "<img height='10px' width='10px' style='margin:0px 5px;' src = '../images/like.png'></img>";
- if ($array['counter'][$i] > 3) { $array["img"][$i] = '';}
- $array['cnt'][$i] = $row['cnt'];
- $array['user'][$i] = $xoopsUser->getUnameFromId($row["owner"]);
- $i++;
- }
- } else {
- $array = array();
- }
- } else {
- $sql = "SELECT owner, count(*) as cnt FROM ".$xoopsDB->prefix('smallworld_vote')." where down='1' GROUP by owner ORDER BY cnt DESC limit 20";
- $result = $xoopsDB->queryF($sql);
- $count = $xoopsDB->getRowsNum($result);
- $i = 1;
- if ($count != 0) {
- while ($row = $xoopsDB->fetchArray($result)) {
- $array['counter'][$i] = $i;
- $array['img'][$i] = "<img height='10px' width='10px' style='margin:0px 5px;' src = '../images/dislike.png'></img>";
- if ($array['counter'][$i] > 3) { $array["img"][$i] = '';}
- $array['cnt'][$i] = $row['cnt'];
- $array['user'][$i] = $xoopsUser->getUnameFromId($row["owner"]);
- $i++;
- }
- } else {
- $array = array();
- }
- }
- return $array;
- }
-
- // Get all users to loop in admin for administration
- function getAllUsers ($inspect) {
- global $xoopsDB, $xoopsUser, $xoopsTpl;
- $data = array();
- if ($inspect == 'yes') {
- $sql = "SELECT * FROM ".$xoopsDB->prefix('smallworld_admin')." WHERE (inspect_start + inspect_stop) >= ".time()." ORDER BY username";
- } else {
- $sql = "SELECT * FROM ".$xoopsDB->prefix('smallworld_admin')." WHERE (inspect_start + inspect_stop) < ".time()." ORDER BY username";
- }
- $result = $xoopsDB->queryF($sql);
- $count = $xoopsDB->getRowsNum($result);
- if ($count != 0) {
- while ($row = $xoopsDB->fetchArray($result)) {
- $data[]=$row;
- }
- }
- if(!empty($data)) {
- return $data;
+ if ($direction == 'up') {
+ $sql = "SELECT owner, count(*) as cnt FROM ".$xoopsDB->prefix('smallworld_vote')
+ . " where up='1' GROUP by owner ORDER BY cnt DESC limit 20";
+ $result = $xoopsDB->queryF($sql);
+ $count = $xoopsDB->getRowsNum($result);
+ $i = 1;
+ if ($count >= $i) {
+ while ($row = $xoopsDB->fetchArray($result)) {
+ $array['counter'][$i] = $i;
+ $array['img'][$i] = "<img height='10px' width='10px' "
+ . "style='margin:0px 5px;' src = '../images/like.png'></img>";
+ if ($array['counter'][$i] > 3) {
+ $array["img"][$i] = '';
+ }
+ $array['cnt'][$i] = $row['cnt'];
+ $array['user'][$i] = $xoopsUser->getUnameFromId($row["owner"]);
+ $i++;
+ }
+ } else {
+ $array = array();
+ }
+ } else {
+ $sql = "SELECT owner, count(*) as cnt FROM ".$xoopsDB->prefix('smallworld_vote')
+ ." where down='1' GROUP by owner ORDER BY cnt DESC limit 20";
+ $result = $xoopsDB->queryF($sql);
+ $count = $xoopsDB->getRowsNum($result);
+ $i = 1;
+ if ($count != 0) {
+ while ($row = $xoopsDB->fetchArray($result)) {
+ $array['counter'][$i] = $i;
+ $array['img'][$i] = "<img height='10px' width='10px' "
+ . "style='margin:0px 5px;' src = '../images/dislike.png'></img>";
+ if ($array['counter'][$i] > 3) {
+ $array["img"][$i] = '';
+ }
+ $array['cnt'][$i] = $row['cnt'];
+ $array['user'][$i] = $xoopsUser->getUnameFromId($row["owner"]);
+ $i++;
+ }
+ } else {
+ $array = array();
+ }
}
- }
-
- // check server if update is available
- // Server currently at culex.dk
- // Variable $version = current xim version number
- // return csv file with (version, description, status, downloadUrl)
- function doCheckUpdate () {
- global $pathIcon16;
- $version = $this->ModuleInstallVersion ();
- $critical = FALSE;
- $update = FALSE;
- $rt = '';
- $url = "http://www.culex.dk/updates/smallworld_version.csv";
- $fileC = $this->fetchURL($url,array('fopen', 'curl', 'socket'));
- $read = explode(";", $fileC);
+ return $array;
+ }
+
+ /**
+ * Get all users to loop in admin for administration
+ * @param string $inspect
+ * @returns array
+ */
+ function getAllUsers ($inspect)
+ {
+ global $xoopsDB, $xoopsUser, $xoopsTpl;
+ $data = array();
+ if ($inspect == 'yes') {
+ $sql = "SELECT * FROM ".$xoopsDB->prefix('smallworld_admin')
+ . " WHERE (inspect_start + inspect_stop) >= ".time()." ORDER BY username";
+ } else {
+ $sql = "SELECT * FROM ".$xoopsDB->prefix('smallworld_admin')
+ . " WHERE (inspect_start + inspect_stop) < ".time()." ORDER BY username";
+ }
+ $result = $xoopsDB->queryF($sql);
+ $count = $xoopsDB->getRowsNum($result);
+ if ($count != 0) {
+ while ($row = $xoopsDB->fetchArray($result)) {
+ $data[] = $row;
+ }
+ }
+ if (!empty($data)) {
+ return $data;
+ }
+ }
+
+ /**
+ * check server if update is available
+ * Server currently at culex.dk
+ * Variable $version = current smallworld version number
+ * @returns array
+ */
+ function doCheckUpdate()
+ {
+ global $pathIcon16;
+ $version = $this->ModuleInstallVersion ();
+ $critical = false;
+ $update = false;
+ $rt = '';
+ $url = "http://www.culex.dk/updates/smallworld_version.csv";
+ $fileC = $this->fetchURL($url, array('fopen', 'curl', 'socket'));
+ $read = explode(";", $fileC);
- $upd_img = $pathIcon16.'/on.png';
+ $upd_img = $pathIcon16 . '/on.png';
- if ($read[0] > $version && $read[2] == "1") {
- $critical = TRUE;
+ if ($read[0] > $version && $read[2] == "1") {
+ $critical = true;
$upd_img = $pathIcon16.'/off.png';
- }
- if ($read[0] > $version && $read[2] != "1") {
- $update = TRUE;
- $upd_img = '../images/upd_normal.png';
- }
- if ($critical) {
- $rt = "<div class='smallworld_update'><img src='".$upd_img."' />"._AM_SMALLWORLD_UPDATE_CRITICAL_UPD."</div>";
- $rt .="<textarea class='xim_update_changelog'>".$read[1]."</textarea><br /><br />";
- $rt .=_AM_SMALLWORLD_UPDATE_SERVER_FILE."<br /><a href='".$read[3]."'>".$read[3]."</a>";
- } else if ($update) {
- $rt = "<div class='smallworld_update'><img src='".$upd_img."' />"._AM_SMALLWORLD_UPDATE_NORMAL_UPD."</div>";
- $rt .= "<textarea class='smallworld_update_changelog'>".$read[1]."</textarea><br /><br />";
- $rt .= _AM_SMALLWORLD_UPDATE_SERVER_FILE."<br /><a href='".$read[3]."'>".$read[3]."</a>";
- } else {
- $rt = "<div class='smallworld_update'><br/><img src='".$upd_img."' />"._AM_SMALLWORLD_UPDATE_YOUHAVENEWESTVERSION."</div>";
- }
- return $rt;
- }
-
- // Fetch content of comma separated text file
- // will attempt to use the fopen method first, then curl, then socket
- // If fail all; return nothing
- // On succes; Return string
- function fetchURL($url, $methods = array('fopen', 'curl', 'socket')) {
- /**
- * December 21st 2010, Mathew Tinsley (ti...@ti...)
- * http://tinsology.net
- *
- * To the extent possible under law, Mathew Tinsley has waived all copyright and related or
- * neighboring rights to this work. There's absolutely no warranty.
- */
- if(gettype($methods) == 'string')
- $methods = array($methods);
- elseif(!is_array($methods))
- return false;
- foreach($methods as $method)
- {
- switch($method)
- {
- case 'fopen':
+ }
+ if ($read[0] > $version && $read[2] != "1") {
+ $update = true;
+ $upd_img = '../images/upd_normal.png';
+ }
+ if ($critical) {
+ $rt = "<div class='smallworld_update'><img src='" . $upd_img . "' />";
+ $rt .= _AM_SMALLWORLD_UPDATE_CRITICAL_UPD . "</div>";
+ $rt .= "<textarea class='xim_update_changelog'>".$read[1]."</textarea><br /><br />";
+ $rt .= _AM_SMALLWORLD_UPDATE_SERVER_FILE . "<br /><a href='" . $read[3] . "'>" . $read[3] . "</a>";
+ } else if ($update) {
+ $rt = "<div class='smallworld_update'><img src='" . $upd_img . "' />";
+ $rt .= _AM_SMALLWORLD_UPDATE_NORMAL_UPD . "</div>";
+ $rt .= "<textarea class='smallworld_update_changelog'>".$read[1]."</textarea><br /><br />";
+ $rt .= _AM_SMALLWORLD_UPDATE_SERVER_FILE . "<br /><a href='" . $read[3] . "'>" . $read[3] . "</a>";
+ } else {
+ $rt = "<div class='smallworld_update'><br/><img src='".$upd_img."' />"
+ . _AM_SMALLWORLD_UPDATE_YOUHAVENEWESTVERSION . "</div>";
+ }
+ return $rt;
+ }
+
+ /**
+ * Fetch content of comma separated text file
+ * will attempt to use the fopen method first, then curl, then socket
+ * @param string $url
+ * @param array $methods
+ * @returns string
+ */
+ function fetchURL($url, $methods = array('fopen', 'curl', 'socket'))
+ {
+ /**
+ * December 21st 2010, Mathew Tinsley (ti...@ti...)
+ * http://tinsology.net
+ *
+ * To the extent possible under law, Mathew Tinsley has waived all copyright and related or
+ * neighboring rights to this work. There's absolutely no warranty.
+ */
+ if (gettype($methods) == 'string') {
+ $methods = array($methods);
+ } elseif (!is_array($methods)) {
+ return false;
+ }
+ foreach ($methods as $method) {
+ switch ($method) {
+ case 'fopen':
//uses file_get_contents in place of fopen
- //allow_url_fopen must still be enabled
- if(ini_get('allow_url_fopen'))
- {
- $contents = file_get_contents($url);
- if($contents !== false)
- return $contents;
- }
- break;
- case 'curl':
- if(function_exists('curl_init'))
- {
+ //allow_url_fopen must still be enabled
+ if (ini_get('allow_url_fopen')) {
+ $contents = file_get_contents($url);
+ if ($contents !== false) {
+ return $contents;
+ }
+ }
+ break;
+ case 'curl':
+ if (function_exists('curl_init')) {
$ch = curl_init();
- curl_setopt($ch, CURLOPT_URL, $url);
- curl_setopt($ch, CURLOPT_HEADER, 0);
+ curl_setopt($ch, CURLOPT_URL, $url);
+ curl_setopt($ch, CURLOPT_HEADER, 0);
// return the value instead of printing the response to browser
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
$result = curl_exec($ch);
curl_close($ch);
- //return curl_exec($ch);
+ //return curl_exec($ch);
return $result;
- }
- break;
- case 'socket':
- //make sure the url contains a protocol, otherwise $parts['host'] won't be set
- if(strpos($url, 'http://') !== 0 && strpos($url, 'https://') !== 0)
- $url = 'http://' . $url;
- $parts = parse_url($url);
- if($parts['scheme'] == 'https')
- {
- $target = 'ssl://' . $parts['host'];
- $port = isset($parts['port']) ? $parts['port'] : 443;
- }
- else
- {
- $target = $parts['host'];
- $port = isset($parts['port']) ? $parts['port'] : 80;
- }
- $page = isset($parts['path']) ? $parts['path'] : '';
- $page .= isset($parts['query']) ? '?' . $parts['query'] : '';
- $page .= isset($parts['fragment']) ? '#' . $parts['fragment'] : '';
- $page = ($page == '') ? '/' : $page;
- if($fp = fsockopen($target, $port, $errno, $errstr, 15))
- {
- $headers = "GET $page HTTP/1.1\r\n";
- $headers .= "Host: {$parts['host']}\r\n";
- $headers .= "Connection: Close\r\n\r\n";
- if(fwrite($fp, $headers))
- {
- $resp = '';
- //while not eof and an error does not occur when calling fgets
- while(!feof($fp) && ($curr = fgets($fp, 128)) !== false)
- $resp .= $curr;
- if(isset($curr) && $curr !== false)
- return substr(strstr($resp, "\r\n\r\n"), 3);
- }
- fclose($fp);
- }
- break;
- }
- }
- return false;
- }
-
- // flatten multidimentional arrays to one dimentional
- function flatten($array) {
- $return = array();
- while(count($array)) {
- $value = array_shift($array);
- if(is_array($value))
- foreach($value as $sub)
- $array[] = $sub;
- else
- $return[] = $value;
- }
- return $return;
- }
-
- function Smallworld_sanitize($text) {
- $text = htmlspecialchars($text, ENT_QUOTES);
- //$text = preg_replace('/([^\s]{10})(?=[^\s])/m', '$1<br />', $text);
- $myts = MyTextSanitizer::getInstance();
- $text = $myts->displayTarea($text,1,1,1,1);
- $text = str_replace("\n\r","\n",$text);
- $text = str_replace("\r\n","\n",$text);
- $text = str_replace("\n","<br />",$text);
- $text = str_replace("\"","'",$text);
+ }
+ break;
+ case 'socket':
+ //make sure the url contains a protocol, otherwise $parts['host'] won't be set
+ if (strpos($url, 'http://') !== 0 && strpos($url, 'https://') !== 0) {
+ $url = 'http://' . $url;
+ }
+ $parts = parse_url($url);
+ if ($parts['scheme'] == 'https') {
+ $target = 'ssl://' . $parts['host'];
+ $port = isset($parts['port']) ? $parts['port'] : 443;
+ } else {
+ $target = $parts['host'];
+ $port = isset($parts['port']) ? $parts['port'] : 80;
+ }
+ $page = isset($parts['path']) ? $parts['path'] : '';
+ $page .= isset($parts['query']) ? '?' . $parts['query'] : '';
+ $page .= isset($parts['fragment']) ? '#' . $parts['fragment'] : '';
+ $page = ($page == '') ? '/' : $page;
+ if ($fp = fsockopen($target, $port, $errno, $errstr, 15)) {
+ $headers = "GET $page HTTP/1.1\r\n";
+ $headers .= "Host: {$parts['host']}\r\n";
+ $headers .= "Connection: Close\r\n\r\n";
+ if (fwrite($fp, $headers)) {
+ $resp = '';
+ //while not eof and an error does not occur when calling fgets
+ while (!feof($fp) && ($curr = fgets($fp, 128)) !== false) {
+ $resp .= $curr;
+ }
+ if (isset($curr) && $curr !== false) {
+ return substr(strstr($resp, "\r\n\r\n"), 3);
+ }
+ }
+ fclose($fp);
+ }
+ break;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Smallworld_sanitize(array(array))
+ * flatten multidimentional arrays to one dimentional
+ * @param array $array
+ * @returns Array
+ */
+ function flatten($array)
+ {
+ $return = array();
+ while (count($array)) {
+ $value = array_shift($array);
+ if (is_array($value)) {
+ foreach ($value as $sub) {
+ $array[] = $sub;
+ }
+ } else {
+ $return[] = $value;
+ }
+ }
+ return $return;
+ }
+
+ /**
+ * Smallworld_sanitize($string)
+ * @param string $text
+ * @returns string
+ */
+ function Smallworld_sanitize($text)
+ {
+ $text = htmlspecialchars($text, ENT_QUOTES);
+ $myts = MyTextSanitizer::getInstance();
+ $text = $myts->displayTarea($text, 1, 1, 1, 1);
+ $text = str_replace("\n\r", "\n", $text);
+ $text = str_replace("\r\n", "\n", $text);
+ $text = str_replace("\n", "<br />", $text);
+ $text = str_replace("\"", "'", $text);
- return $text;
- }
-}
-?>
\ No newline at end of file
+ return $text;
+ }
+}
\ No newline at end of file
Modified: XoopsModules/smallworld/trunk/smallworld/class/db.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/class/db.php 2012-02-07 23:33:30 UTC (rev 8906)
+++ XoopsModules/smallworld/trunk/smallworld/class/db.php 2012-02-08 03:54:48 UTC (rev 8907)
@@ -7,452 +7,636 @@
* 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
-* @module: Smallworld
-* @Author: Michael Albertsen (http://culex.dk) <cu...@cu...>
-* @copyright: 2011 Culex
-* @Repository path: $HeadURL$
-* @Last committed: $Revision$
-* @Last changed by: $Author$
-* @Last changed date: $Date$
-* @ID: $Id$
+* @copyright: The XOOPS Project http://sourceforge.net/projects/xoops/
+* @license: http://www.fsf.org/copyleft/gpl.html GNU public license
+* @module: Smallworld
+* @Author: Michael Albertsen (http://culex.dk) <cu...@cu...>
+* @copyright: 2011 Culex
+* @Repository path: $HeadURL$
+* @Last committed: $Revision$
+* @Last changed by: $Author$
+* @Last changed date: $Date$
+* @ID: $Id$
**/
-class SmallWorldDB {
-
- function getJobsToDiv ($id) {
- global $xoopsUser, $xoopsDB;
- $msg=array();
- $new=array();
- $sql = "SELECT employer,position,jobstart,jobstop,description FROM ".$xoopsDB->prefix("smallworld_user")." WHERE userid ='".$id."'";
- $result = $xoopsDB->query($sql);
- while ($row = $xoopsDB->fetchArray($result)) {
- $employer = unserialize($row['employer']);
- $position = unserialize($row['position']);
- $jobstart = unserialize($row['jobstart']);
- $jobstop = unserialize($row['jobstop']);
- $description = unserialize($row['description']);
- }
- $start = 0;
- $end = count($employer)-1;
- while ($start<=$end) {
- $msg[$start]['employer'] = $employer[$start];
- $msg[$start]['position'] = $position[$start];
- $msg[$start]['jobstart'] = $jobstart[$start];
- $msg[$start]['jobstop'] = $jobstop[$start];
- $msg[$start]['description'] = $description[$start];
- $start++;
- }
- return $msg;
- }
+class SmallWorldDB
+{
+ /**
+ * getJobsToDiv function
+ * @param int $id
+ * @returns Array
+ */
+ function getJobsToDiv($id)
+ {
+ global $xoopsUser, $xoopsDB;
+ $msg=array();
+ $new=array();
+ $sql = "SELECT employer,position,jobstart,jobstop,description FROM "
+ . $xoopsDB->prefix("smallworld_user")." WHERE userid ='" . $id . "'";
+ $result = $xoopsDB->query($sql);
+ while ($row = $xoopsDB->fetchArray($result)) {
+ $employer = unserialize($row['employer']);
+ $position = unserialize($row['position']);
+ $jobstart = unserialize($row['jobstart']);
+ $jobstop = unserialize($row['jobstop']);
+ $description = unserialize($row['description']);
+ }
+ $start = 0;
+ $end = count($employer) - 1;
+ while ($start <= $end) {
+ $msg[$start]['employer'] = $employer[$start];
+ $msg[$start]['position'] = $position[$start];
+ $msg[$start]['jobstart'] = $jobstart[$start];
+ $msg[$start]['jobstop'] = $jobstop[$start];
+ $msg[$start]['description'] = $description[$start];
+ $start++;
+ }
+ return $msg;
+ }
-
- function getSchoolToDiv ($id) {
- global $xoopsUser, $xoopsDB,$arr7;
- $msg=array();
- $sql = "SELECT school_type,school,schoolstart,schoolstop FROM ".$xoopsDB->prefix("smallworld_user")." WHERE userid ='".$id."'";
- $result = $xoopsDB->query($sql);
- while ($row = $xoopsDB->fetchArray($result)) {
- $school_type = unserialize($row['school_type']);
- $school = unserialize($row['school']);
- $schoolstart = unserialize($row['schoolstart']);
- $schoolstop = unserialize($row['schoolstop']);
- }
- $start = 0;
- $end = count($school_type)-1;
- while ($start<=$end) {
- $msg[$start]['school_type'] = $school_type[$start];
- $msg[$start]['school'] = $arr7[$school[$start]];
- $msg[$start]['schoolstart'] = date('Y',$schoolstart[$start]);
- $msg[$start]['schoolstop'] = date('Y',$schoolstop[$start]);
- $start++;
- }
- return $msg;
- }
-
- function getScreennamesToDiv ($id) {
- global $xoopsUser, $xoopsDB,$arr06;
- $msg=array();
- $sql = "SELECT screenname_type,screenname FROM ".$xoopsDB->prefix("smallworld_user")." WHERE userid ='".$id."'";
- $result = $xoopsDB->query($sql);
- while ($row = $xoopsDB->fetchArray($result)) {
- $screenname_type = unserialize($row['screenname_type']);
- $screenname = unserialize($row['screenname']);
- }
- $start = 0;
- $end = count($screenname_type)-1;
- while ($start<=$end) {
- $msg[$start]['screenname'] = $screenname_type[$start];
- $msg[$start]['screenname_type'] = $arr06[$screenname[$start]];
- $msg[$start]['link'] = "<span class='smallworld_website'>".Smallworld_sociallinks($screenname[$start], $msg[$start]['screenname']);
- $start++;
- }
- return $msg;
- }
-
-// Do query in db
- function getVar ($id, $var) {
- global $xoopsUser, $xoopsDB;
- $sql = "SELECT ".$var." FROM ".$xoopsDB->prefix('smallworld_user')." WHERE userid = '".$id."'";
- $result = $xoopsDB->queryF($sql);
- if ($xoopsDB->getRowsNum($result) < 1) {
- return _SMALLWORLD_REPLY_NOTSPECIFIYED;
- }
- while ($row = $xoopsDB->fetchArray($result)) {
- $msg[$var] = $row[$var];
- }
- return $msg[$var];
- }
-
- function updateSingleValue ($table, $userid, $field, $value) {
- global $xoopsUser, $xoopsDB;
- $myts =& MyTextSanitizer::getInstance();
- $sql = "UPDATE ".$xoopsDB->prefix($table)." SET ".$field."='".$myts->addSlashes($value)."' WHERE userid='".intval($userid)."'";
- $result =$xoopsDB->queryF($sql);
- }
+ /**
+ * getSchoolToDiv function
+ * @param int $id
+ * @returns Array
+ */
+ function getSchoolToDiv($id)
+ {
+ global $xoopsUser, $xoopsDB,$arr7;
+ $msg=array();
+ $sql = "SELECT school_type,school,schoolstart,schoolstop FROM "
+ . $xoopsDB->prefix("smallworld_user") . " WHERE userid ='" . $id . "'";
+ $result = $xoopsDB->query($sql);
+ while ($row = $xoopsDB->fetchArray($result)) {
+ $school_type = unserialize($row['school_type']);
+ $school = unserialize($row['school']);
+ $schoolstart = unserialize($row['schoolstart']);
+ $schoolstop = unserialize($row['schoolstop']);
+ }
+ $start = 0;
+ $end = count($school_type) - 1;
+ while ($start<=$end) {
+ $msg[$start]['school_type'] = $school_type[$start];
+ $msg[$start]['school'] = $arr7[$school[$start]];
+ $msg[$start]['schoolstart'] = date('Y', $schoolstart[$start]);
+ $msg[$start]['schoolstop'] = date('Y', $schoolstop[$start]);
+ $start++;
+ }
+ return $msg;
+ }
+
+ /**
+ * getScreennamesToDiv function
+ * @param int $id
+ * @returns Array
+ */
+ function getScreennamesToDiv($id)
+ {
+ global $xoopsUser, $xoopsDB,$arr06;
+ $msg=array();
+ $sql = "SELECT screenname_type,screenname FROM "
+ . $xoopsDB->prefix("smallworld_user") . " WHERE userid ='" . $id . "'";
+ $result = $xoopsDB->query($sql);
+ while ($row = $xoopsDB->fetchArray($result)) {
+ $screenname_type = unserialize($row['screenname_type']);
+ $screenname = unserialize($row['screenname']);
+ }
+ $start = 0;
+ $end = count($screenname_type) - 1;
+ while ($start <= $end) {
+ $msg[$start]['screenname'] = $screenname_type[$start];
+ $msg[$start]['screenname_type'] = $arr06[$screenname[$start]];
+ $msg[$start]['link'] = "<span class='smallworld_website'>"
+ . Smallworld_sociallinks($screenname[$start], $msg[$start]['screenname']);
+ $start++;
+ }
+ return $msg;
+ }
+
+ /**
+ * getVar function
+ * @param int $id
+ * @param string $var
+ * @returns Array
+ */
+ function getVar($id, $var)
+ {
+ global $xoopsUser, $xoopsDB;
+ $sql = "SELECT ".$var." FROM ".$xoopsDB->prefix('smallworld_user')." WHERE userid = '".$id."'";
+ $result = $xoopsDB->queryF($sql);
+ if ($xoopsDB->getRowsNum($result) < 1) {
+ return _SMALLWORLD_REPLY_NOTSPECIFIYED;
+ }
+ while ($row = $xoopsDB->fetchArray($result)) {
+ $msg[$var] = $row[$var];
+ }
+ return $msg[$var];
+ }
+
+ /**
+ * updateSingleValue function
+ * @param string $table
+ * @param int $userid
+ * @param string $field
+ * @param int $value
+ * @return void
+ */
+ function updateSingleValue($table, $userid, $field, $value)
+ {
+ global $xoopsUser, $xoopsDB;
+ $myts =& MyTextSanitizer::getInstance();
+ $sql = "UPDATE ".$xoopsDB->prefix($table)." SET "
+ . $field . "='" . $myts->addSlashes($value) . "' WHERE userid='" . intval($userid) . "'";
+ $result =$xoopsDB->queryF($sql);
+ }
- function saveImage ($values) {
- global $xoopsUser, $xoopsDB;
- $myts =& MyTextSanitizer::getInstance();
- $sql = "INSERT INTO ".$xoopsDB->prefix('smallworld_images')." VALUES (".$values.")";
- $result =$xoopsDB->queryF($sql);
- }
-
- function DeleteImage ($userid, $imagename) {
- global $xoopsUser, $xoopsDB;
- $myts =& MyTextSanitizer::getInstance();
- $sql = "DELETE FROM ".$xoopsDB->prefix('smallworld_images')." WHERE imgname = '".stripslashes($imagename)."' AND userid='".$userid."'";
- $result =$xoopsDB->queryF($sql);
- }
-
- function handlePosts () {
- global $xoopsUser,$xoopsDB;
- $myts =& MyTextSanitizer::getInstance();
-
- $uid = $xoopsUser->getVar('uid');
- $user = new XoopsUser($uid);
- $img = new SmallWorldImages;
-
- if ($this->getVar($uid,'userimage') =='') {
- $avatar =$user->user_avatar();
- } else {
- $avatar = $this->getVar($uid, 'userimage');
- }
-
- if ($_POST['relationship'] != '2') {
- $partner = Smallworld_sanitize($_POST['partner']);
- } else {
- $partner = '';
- }
-
- $regdate = time();
- $username = $user->uname();
- $realname = Smallworld_sanitize($_POST['realname']);
- $gender = Smallworld_sanitize($_POST['gender']);
- $intingender = Smallworld_sanitize(serialize($_POST['intingender']));
- $relationship = Smallworld_sanitize($_POST['relationship']);
- $searchrelat = Smallworld_sanitize(serialize($_POST['searchrelat']));
- $birthday = Smallworld_sanitize(Smallworld_euroToUsDate($_POST['birthday']));
- $birthplace = Smallworld_sanitize($_POST['birthplace']);
- $birthplace_lat = Smallworld_sanitize($_POST['birthplace_lat']);
- $birthplace_lng = Smallworld_sanitize($_POST['birthplace_lng']);
- $birthplace_country = Smallworld_sanitize($_POST['birthplace_country']);
- $birthplace_country_img = Smallworld_sanitize($_POST['birthplace_country_img']);
- $politic = Smallworld_sanitize($_POST['politic']);
- $religion = Smallworld_sanitize($_POST['religion']);
- $emailtype = Smallworld_sanitize(serialize($_POST['emailtype']));
- $screenname_type = Smallworld_sanitize(serialize($_POST['screenname_type']));
- $screenname = Smallworld_sanitize(serialize($_POST['screenname']));
- $mobile = Smallworld_sanitize($_POST['mobile']);
- $phone = Smallworld_sanitize($_POST['phone']);
- $adress = Smallworld_sanitize($_POST['adress']);
- $present_city = Smallworld_sanitize($_POST['present_city']);
- $present_lat = Smallworld_sanitize($_POST['present_lat']);
- $present_lng = Smallworld_sanitize($_POST['present_lng']);
- $present_country = Smallworld_sanitize($_POST['present_country']);
- $present_country_img = Smallworld_sanitize($_POST['present_country_img']);
- $website = Smallworld_sanitize($_POST['website']);
- $interests = Smallworld_sanitize($_POST['interests']);
- $music = Smallworld_sanitize($_POST['music']);
- $tvshow = Smallworld_sanitize($_POST['tvshow']);
- $movie = Smallworld_sanitize($_POST['movie']);
- $books = Smallworld_sanitize($_POST['books']);
- $aboutme = Smallworld_sanitize($_POST['aboutme']);
- $school_type = Smallworld_sanitize(serialize($_POST['school_type']));
- $school = Smallworld_sanitize(serialize($_POST['school']));
- $schoolstart = Smallworld_sanitize(serialize(Smallworld_DateOfArray ($_POST['schoolstart'])));
- $schoolstop = Smallworld_sanitize(serialize(Smallworld_DateOfArray ($_POST['schoolstop'])));
- $jobemployer = Smallworld_sanitize(serialize($_POST['employer']));
- $jobposition = Smallworld_sanitize(serialize($_POST['position']));
- $jobstart = Smallworld_sanitize(serialize(Smallworld_YearOfArray ($_POST['jobstart'])));
- $jobstop = Smallworld_sanitize(serialize(Smallworld_YearOfArray ($_POST['jobstop'])));
- $jobdescription = Smallworld_sanitize(serialize($_POST['description']));
-
- $sql = '';
-
- if ($_POST['function']=='edit') {
- // Update all values in user_table
- $sql = "UPDATE ".$xoopsDB->prefix('smallworld_user')." SET ";
- $sql .= "realname = '".$realname."', username= '".$username."', userimage = '".$avatar."', gender = '".$gender."',";
- $sql .= "intingender = '".$intingender."',relationship = '".$relationship."', partner = '".$partner."', searchrelat = '".$searchrelat."',";
- $sql .= "birthday = '".$birthday."',birthplace = '".$birthplace."',birthplace_lat = '".floatval($birthplace_lat)."',";
- $sql .= "birthplace_lng = '".floatval($birthplace_lng)."',birthplace_country = '".$birthplace_country."',politic = '".$politic."',";
- $sql .= "religion = '".$religion."',emailtype = '".$emailtype."',screenname_type = '".$screenname_type."',";
- $sql .= "screenname = '".$screenname."',mobile = '".floatval($mobile)."',phone = '".floatval($phone)."',adress = '".$adress."',";
- $sql .= "present_city = '".$present_city."',present_lat = '".floatval($present_lat)."',present_lng = '".floatval($present_lng)."',";
- $sql .= "present_country = '".$present_country."',website = '".$website."',interests = '".$interests."',";
- $sql .= "music = '".$music."',tvshow = '".$tvshow."',movie = '".$movie."',";
- $sql .= "books = '".$books."',aboutme = '".$aboutme."',school_type = '".$school_type."',";
- $sql .= "school = '".$school."', schoolstart = '".$schoolstart."',schoolstop = '".$schoolstop."',";
- $sql .= "employer = '".$jobemployer."', position = '".$jobposition."',jobstart = '".$jobstart."',";
- $sql .= "jobstop = '".$jobstop."', description = '".$jobdescription."' ";
- $sql .= "WHERE userid ='".intval($uid)."'";
- $result = $xoopsDB->queryF($sql);
- if ($result == false) { die("SQL error:".$sql."");}
-
- $this->EditAdmins ($uid, $realname,$avatar);
- $img->createAlbum ($uid);
- }
-
- if ($_POST['function']=='save') {
- $sql = "INSERT INTO ".$xoopsDB->prefix('smallworld_user')." (id, userid, regdate, username, userimage, realname, gender, intingender, relationship, partner, searchrelat, birthday, birthplace, birthplace_lat, birthplace_lng, birthplace_country, politic, religion, emailtype, screenname_type, screenname, mobile, phone, adress, present_city, present_lat, present_lng, present_country, website, interests, music, tvshow, movie, books, aboutme, school_type, school, schoolstart, schoolstop, employer, position, jobstart, jobstop, description, friends, followers, admin_flag) ";
- $sql .= "VALUES ('','".intval($uid)."', '".$regdate."', '".$username."', '".$avatar."', '".$realname."', '".$gender."', '".$intingender."', '".$relationship."', '".$partner."', '".$searchrelat."','";
- $sql .= $birthday."', '".$birthplace."', '".floatval($birthplace_lat)."', '".floatval($birthplace_lng)."', '".$birthplace_country."', '".$politic."', '".$religion."','";
- $sql .= $emailtype."', '".$screenname_type."', '".$screenname."', '".floatval($mobile)."', '".floatval($phone)."', '".$adress."', '".$present_city."', '".floatval($present_lat)."','";
- $sql .= floatval($present_lng)."', '".$present_country."', '".$website."', '".$interests."', '".$music."', '".$tvshow."', '".$movie."', '".$books."', '".$aboutme."', '";
- $sql .= $school_type."', '".$school."', '".$schoolstart."', '".$schoolstop."', '".$jobemployer."', '".$jobposition."', '".$jobstart."', '".$jobstop."', '".$jobdescription."', ";
- $sql .= "'0', '0', '0')";
- $result = $xoopsDB->queryF($sql);
- if ($result == false) { die("SQL error:".$sql."");}
- $this->SetAdmins ($uid, $username,$realname,$avatar);
- $img->createAlbum ($uid);
- }
- }
-
- /*
- * Sets admin table
- * inputs are userid, realname, client_ip, default 0 for complaints, default 0 for inspect
- * return null
- */
- function SetAdmins ($userID, $username, $realname,$avatar) {
- global $xoopsDB, $xoopsUser;
- $ip = $_SERVER['REMOTE_ADDR'];
- $sql = "INSERT INTO ".$xoopsDB->prefix('smallworld_admin')." (id,userid,username, realname,userimage,ip,complaint,inspect_start, inspect_stop) VALUES ('', '".$userID."', '".$username."','".$realname."', '".$avatar."','".$ip."','0','0','0')";
- $result = $xoopsDB->queryF($sql);
- }
-
- function EditAdmins ($userID, $realname,$avatar) {
- global $xoopsDB;
- $sql = "UPDATE ".$xoopsDB->prefix('smallworld_admin')." SET realname = '".$realname."', userimage = '".$avatar."' WHERE userid = '".intval($userID)."'";
- $result = $xoopsDB->queryF($sql);
- }
-
- //Check if user has already sent complaint
- function alreadycomplaint ($msg,$by, $against){
- global $xoopsDB;
- $sql = "SELECT * FROM ".$xoopsDB->prefix("smallworld_complaints")." WHERE byuser_id = '".intval($by)."' AND owner = '".intval($against)."' AND link = '".addslashes($msg)."'";
- $result = $xoopsDB->queryF($sql);
- $i = $xoopsDB->getRowsNum($result);
- if ($i < 1) {
- $query = "INSERT INTO ".$xoopsDB->prefix('smallworld_complaints')." (complaint_id,link,byuser_id,owner)";
- $query .= " VALUES ('', '".addslashes($msg)."', '".intval($by)."', '".intval($against)."')";
- $result = $xoopsDB->queryF($query);
- } else {}
- return $i;
- }
-
- function updateComplaint ($userID) {
- global $xoopsDB;
- $sql = "UPDATE ".$xoopsDB->prefix('smallworld_admin')." SET complaint = complaint + 1 WHERE userid = '".intval($userID)."'";
- $result = $xoopsDB->queryF($sql);
- }
-
- function updateInspection ($userID, $start, $stop) {
- global $xoopsDB;
- $newstop = $time() + $stop;
- $sql = "UPDATE ".$xoopsDB->prefix('smallworld_admin')." SET inspect_start = '".$time()."', instect_stop = '".$newstop."' WHERE userid ='".intval($userID)."'";
- $result = $xoopsDB->queryF($sql);
- }
-
- function handleImageEdit (){
- global $xoopsDB;
- for ($i=0; $i < count($_POST['id']); $i++) {
- $id = intval($_POST['id'][$i]);
- $desc = $_POST['imgdesc'][$i];
-
- $sql = "UPDATE ".$xoopsDB->prefix('smallworld_images')." SET `desc` = '".addslashes($desc)."' WHERE `id`='".$id."'";
- $result = $xoopsDB->queryF($sql);
-
- }
- }
+ /**
+ * saveImage function
+ * @param int $value
+ * @return void
+ */
+ function saveImage($values)
+ {
+ global $xoopsUser, $xoopsDB;
+ $myts =& MyTextSanitizer::getInstance();
+ $sql = "INSERT INTO " . $xoopsDB->prefix('smallworld_images') . " VALUES (" . $values . ")";
+ $result =$xoopsDB->queryF($sql);
+ }
- // insert aplication for friendship into db or delete if denied
- function toogleFriendInvite ($status, $friendid, $userid) {
- global $xoopsDB;
- if ($status == 0) {
- $sql = "INSERT INTO ".$xoopsDB->prefix('smallworld_friends')." (id,me,you,status,date) VALUES ('', '".$userid."', '".$friendid."', '1', UNIX_TIMESTAMP())";
- $result = $xoopsDB->queryF($sql);
-
- }
- if ($status > 0) {
- $sql = "DELETE FROM ".$xoopsDB->prefix('smallworld_friends')." WHERE me = '".intval($friendid)."' AND you = '".intval($userid)."'";
- $sql2 = "DELETE FROM ".$xoopsDB->prefix('smallworld_friends')." WHERE me = '".intval($userid)."' AND you = '".intval($friendid)."'";
- $result = $xoopsDB->queryF($sql);
- $result2 = $xoopsDB->queryF($sql2);
- }
-
- }
-
- // Insert following to db or delete if requested
- function toogleFollow ($following, $myUid, $friend) {
- global $xoopsDB;
- if ($following == 0) {
- $sql = "INSERT INTO ".$xoopsDB->prefix('smallworld_followers')." (id,me,you,status,date) VALUES ('', '".$myUid."', '".$friend."', '1', UNIX_TIMESTAMP())";
- $result = $xoopsDB->queryF($sql);
- }
- if ($following > 0) {
- $sql = "DELETE FROM ".$xoopsDB->prefix('smallworld_followers')." WHERE you = '".intval($friend)."'";
- $sql .= " AND me = '".intval($myUid)."'";
- $result = $xoopsDB->queryF($sql);
- }
- }
-
- function SetFriendshitStat ($stat, $myUid, $friend) {
- global $xoopsDB;
- if ($stat == 1) {
- $sql = "UPDATE ".$xoopsDB->prefix('smallworld_friends')." SET status = '2' WHERE `me` = '".$friend."' AND `you` = '".$myUid."'";
- $result = $xoopsDB->queryF($sql);
- $query = "INSERT INTO ".$xoopsDB->prefix('smallworld_friends')." (id,me,you,status,date) VALUES ('', '".$myUid."', '".$friend."', '2', UNIX_TIMESTAMP())";
- $result = $xoopsDB->queryF($query);
- }
- if ($stat < 0) {
- $sql = "DELETE FROM ".$xoopsDB->prefix('smallworld_friends')." WHERE me = '".intval($friend)."' AND you = '".intval($myUid)."'";
- $sql2 = "DELETE FROM ".$xoopsDB->prefix('smallworld_friends')." WHERE you = '".intval($friend)."' AND me = '".intval($myUid)."'";
- $result = $xoopsDB->queryF($sql);
- $result2 = $xoopsDB->queryF($sql2);
- }
- }
-
- function deleteWallMsg ($id,$smallworld_msg_id) {
- global $xoopsDB;
- $query = "DELETE FROM ".$xoopsDB->prefix('smallworld_messages')." WHERE msg_id = '".$smallworld_msg_id."'";
- $result = $xoopsDB->queryF($query);
- $query2 = "DELETE FROM ".$xoopsDB->prefix('smallworld_comments')." WHERE msg_id_fk = '".$smallworld_msg_id."'";
- $result2 = $xoopsDB->queryF($query2);
- //delete votes
- $query3 = "DELETE FROM ".$xoopsDB->prefix('smallworld_vote')." WHERE msg_id = '".$smallworld_msg_id."'";
- $result3 = $xoopsDB->queryF($query3);
+ /**
+ * DeleteImage function
+ * @param int $userid
+ * @param string $imagename
+ * @return void
+ */
+ function DeleteImage($userid, $imagename)
+ {
+ global $xoopsUser, $xoopsDB;
+ $myts =& MyTextSanitizer::getInstance();
+ $sql = "DELETE FROM ".$xoopsDB->prefix('smallworld_images')
+ . " WHERE imgname = '" . stripslashes($imagename) . "' AND userid='" . $userid . "'";
+ $result =$xoopsDB->queryF($sql);
+ }
+
+ /**
+ * handlePosts function
+ * @return void
+ */
+ function handlePosts ()
+ {
+ global $xoopsUser,$xoopsDB;
+ $myts =& MyTextSanitizer::getInstance();
+ $uid = $xoopsUser->getVar('uid');
+ $user = new XoopsUser($uid);
+ $img = new SmallWorldImages;
+ if ($this->getVar($uid,'userimage') == '') {
+ $avatar =$user->user_avatar();
+ } else {
+ $avatar = $this->getVar($uid, 'userimage');
+ }
+
+ if ($_POST['relationship'] != '2') {
+ $partner = Smallworld_sanitize($_POST['partner']);
+ } else {
+ $partner = '';
+ }
+
+ $regdate = time();
+ $username = $user->uname();
+ $realname = Smallworld_sanitize($_POST['realname']);
+ $gender = Smallworld_sanitize($_POST['gender']);
+ $intingender = Smallworld_sanitize(serialize($_POST['intingender']));
+ $relationship = Smallworld_sanitize($_POST['relationship']);
+ $searchrelat = Smallworld_sanitize(serialize($_POST['searchrelat']));
+ $birthday = Smallworld_sanitize(Smallworld_euroToUsDate($_POST['birthday']));
+ $birthplace = Smallworld_sanitize($_POST['birthplace']);
+ $birthplace_lat = Smallworld_sanitize($_POST['birthplace_lat']);
+ $birthplace_lng = Smallworld_sanitize($_POST['birthplace_lng']);
+ $birthplace_country = Smallworld_sanitize($_POST['birthplace_country']);
+ $birthplace_country_img = Smallworld_sanitize($_POST['birthplace_country_img']);
+ $politic = Smallworld_sanitize($_POST['politic']);
+ $religion = Smallworld_sanitize($_POST['religion']);
+ $emailtype = Smallworld_sanitize(serialize($_POST['emailtype']));
+ $screenname_type = Smallworld_sanitize(serialize($_POST['screenname_type']));
+ $screenname = Smallworld_sanitize(serialize($_POST['screenname']));
+ $mobile = Smallworld_sanitize($_POST['mobile']);
+ $phone = Smallworld_sanitize($_POST['phone']);
+ $adress = Smallworld_sanitize($_POST['adress']);
+ $present_city = Smallworld_sanitize($_POST['present_city']);
+ $present_lat = Smallworld_sanitize($_POST['present_lat']);
+ $present_lng = Smallworld_sanitize($_POST['present_lng']);
+ $present_country = Smallworld_sanitize($_POST['present_country']);
+ $present_country_img = Smallworld_sanitize($_POST['present_country_img']);
+ $website = Smallworld_sanitize($_POST['website']);
+ $interests = Smallworld_sanitize($_POST['interests']);
+ $music = Smallworld_sanitize($_POST['music']);
+ $tvshow = Smallworld_sanitize($_POST['tvshow']);
+ $movie = Smallworld_sanitize($_POST['movie']);
+ $books = Smallworld_sanitize($_POST['books']);
+ $aboutme = Smallworld_sanitize($_POST['aboutme']);
+ $school_type = Smallworld_sanitize(serialize($_POST['school_type']));
+ $school = Smallworld_sanitize(serialize($_POST['school']));
+ $schoolstart = Smallworld_sanitize(serialize(Smallworld_DateOfArray ($_POST['schoolstart'])));
+ $schoolstop = Smallworld_sanitize(serialize(Smallworld_DateOfArray ($_POST['schoolstop'])));
+ $jobemployer = Smallworld_sanitize(serialize($_POST['employer']));
+ $jobposition = Smallworld_sanitize(serialize($_POST['position']));
+ $jobstart = Smallworld_sanitize(serialize(Smallworld_YearOfArray ($_POST['jobstart'])));
+ $jobstop = Smallworld_sanitize(serialize(Smallworld_YearOfArray ($_POST['jobstop'])));
+ $jobdescription = Smallworld_sanitize(serialize($_POST['description']));
+
+ $sql = '';
+
+ if ($_POST['function']=='edit') {
+ // Update all values in user_table
+ $sql = "UPDATE ".$xoopsDB->prefix('smallworld_user')." SET ";
+ $sql .= "realname = '".$realname."', username= '".$username."', userimage = '".$avatar."', gender = '".$gender."',";
+ $sql .= "intingender = '".$intingender."',relationship = '".$relationship."', partner = '".$partner."', searchrelat = '".$searchrelat."',";
+ $sql .= "birthday = '".$birthday."',birthplace = '".$birthplace."',birthplace_lat = '".floatval($birthplace_lat)."',";
+ $sql .= "birthplace_lng = '".floatval($birthplace_lng)."',birthplace_country = '".$birthplace_country."',politic = '".$politic."',";
+ $sql .= "religion = '".$religion."',emailtype = '".$emailtype."',screenname_type = '".$screenname_type."',";
+ $sql .= "screenname = '".$screenname."',mobile = '".floatval($mobile)."',phone = '".floatval($phone)."',adress = '".$adress."',";
+ $sql .= "present_city = '".$present_city."',present_lat = '".floatval($present_lat)."',present_lng = '".floatval($present_lng)."',";
+ $sql .= "present_country = '".$present_country."',website = '".$website."',interests = '".$interests."',";
+ $sql .= "music = '".$music."',tvshow = '".$tvshow."',movie = '".$movie."',";
+ $sql .= "books = '".$books."',aboutme = '".$aboutme."',school_type = '".$school_type."',";
+ $sql .= "school = '".$school."', schoolstart = '".$schoolstart."',schoolstop = '".$schoolstop."',";
+ $sql .= "employer = '".$jobemployer."', position = '".$jobposition."',jobstart = '".$jobstart."',";
+ $sql .= "jobstop = '".$jobstop."', description = '".$jobdescription."' ";
+ $sql .= "WHERE userid ='".intval($uid)."'";
+ $result = $xoopsDB->queryF($sql);
+ if ($result == false) { die("SQL error:".$sql."");}
+
+ $this->EditAdmins ($uid, $realname,$avatar);
+ $img->createAlbum ($uid);
+ }
+
+ if ($_POST['function']=='save') {
+ $sql = "INSERT INTO ".$xoopsDB->prefix('smallworld_user')." (id, userid, regdate, username, userimage, realname, gender, intingender, relationship, partner, searchrelat, birthday, birthplace, birthplace_lat, birthplace_lng, birthplace_country, politic, religion, emailtype, screenname_type, screenname, mobile, phone, adress, present_city, present_lat, present_lng, present_country, website, interests, music, tvshow, movie, books, aboutme, school_type, school, schoolstart, schoolstop, employer, position, jobstart, jobstop, description, friends, followers, admin_flag) ";
+ $sql .= "VALUES ('','".intval($uid)."', '".$regdate."', '".$username."', '".$avatar."', '".$realname."', '".$gender."', '".$intingender."', '".$relationship."', '".$partner."', '".$searchrelat."','";
+ $sql .= $birthday."', '".$birthplace."', '".floatval($birthplace_lat)."', '".floatval($birthplace_lng)."', '".$birthplace_country."', '".$politic."', '".$religion."','";
+ $sql .= $emailtype."', '".$screenname_type."', '".$screenname."', '".floatval($mobile)."', '".floatval($phone)."', '".$adress."', '".$present_city."', '".floatval($present_lat)."','";
+ $sql .= floatval($present_lng)."', '".$present_country."', '".$website."', '".$interests."', '".$music."', '".$tvshow."', '".$movie."', '".$books."', '".$aboutme."', '";
+ $sql .= $school_type."', '".$school."', '".$schoolstart."', '".$schoolstop."', '".$jobemployer."', '".$jobposition."', '".$jobstart."', '".$jobstop."', '".$jobdescription."', ";
+ $sql .= "'0'...
[truncated message content] |
|
From: <ren...@us...> - 2012-02-07 23:33:37
|
Revision: 8906
http://xoops.svn.sourceforge.net/xoops/?rev=8906&view=rev
Author: renetjuh
Date: 2012-02-07 23:33:30 +0000 (Tue, 07 Feb 2012)
Log Message:
-----------
Upload dutch language files for newsslider 1.2b
Added Paths:
-----------
XoopsLanguages/dutch/modules/newsslider/
XoopsLanguages/dutch/modules/newsslider/newsslider 1.2b/
XoopsLanguages/dutch/modules/newsslider/newsslider 1.2b/nederlands/
XoopsLanguages/dutch/modules/newsslider/newsslider 1.2b/nederlands/admin.php
XoopsLanguages/dutch/modules/newsslider/newsslider 1.2b/nederlands/blocks.php
XoopsLanguages/dutch/modules/newsslider/newsslider 1.2b/nederlands/index.html
XoopsLanguages/dutch/modules/newsslider/newsslider 1.2b/nederlands/modinfo.php
Property changes on: XoopsLanguages/dutch/modules/newsslider
___________________________________________________________________
Added: bugtraq:number
+ true
Property changes on: XoopsLanguages/dutch/modules/newsslider/newsslider 1.2b
___________________________________________________________________
Added: bugtraq:number
+ true
Property changes on: XoopsLanguages/dutch/modules/newsslider/newsslider 1.2b/nederlands
___________________________________________________________________
Added: bugtraq:number
+ true
Added: XoopsLanguages/dutch/modules/newsslider/newsslider 1.2b/nederlands/admin.php
===================================================================
--- XoopsLanguages/dutch/modules/newsslider/newsslider 1.2b/nederlands/admin.php (rev 0)
+++ XoopsLanguages/dutch/modules/newsslider/newsslider 1.2b/nederlands/admin.php 2012-02-07 23:33:30 UTC (rev 8906)
@@ -0,0 +1,15 @@
+<?php
+/**
+ * $Id: admin.php v 1.0 11 Jan 2012 Yerres Exp $
+ * Module: newsslider
+ * Version: 1.1
+ * Release Date: 11 Jan 2012 Yerres
+ * Author: Yerres
+ * Licence: GNU
+ */
+
+define("_AM_NWS_INTRO", "Er kunnen zoveel nieuwssliderblokken toegevoegd worden via de blokkenadministratie als dat nodig is.");
+define("_AM_NWS_TAGS", "Nieuwsslider");
+define("_AM_NWS_INDEX", "Index");
+
+?>
\ No newline at end of file
Added: XoopsLanguages/dutch/modules/newsslider/newsslider 1.2b/nederlands/blocks.php
===================================================================
--- XoopsLanguages/dutch/modules/newsslider/newsslider 1.2b/nederlands/blocks.php (rev 0)
+++ XoopsLanguages/dutch/modules/newsslider/newsslider 1.2b/nederlands/blocks.php 2012-02-07 23:33:30 UTC (rev 8906)
@@ -0,0 +1,80 @@
+<?php
+/**
+ * $Id: blocks.php v 1.0 11 Jan 2012 Yerres Exp $
+ * Module: newsslider
+ * Version: 1.1
+ * Release Date: 11 Jan 2012 Yerres
+ * Author: Yerres
+ * Licence: GNU
+ */
+define("_MB_NWS_SETTINGS", "Instellingen");
+define("_MB_NWS_SORT", "Sorteervolgorde:");
+define("_MB_NWS_QUANTITY", "Frequentie");
+define("_MB_NWS_RANDOM", "Willekeurig");
+define("_MB_NWS_ORDER", "Standaard volgorde:");
+define("_MB_NWS_TEMPLATE", "Opmaak:");
+define("_MB_NWS_DISP","Weergavemethode");
+define("_MB_NWS_SHOWDATE", "Datum tonen?");
+define("_MB_NWS_TEASER", "Toon Teaser Lengte (0 voor geen teaser) (in karakters)");
+define("_MB_NWS_CHARS","Lengte van de titel (in karakters)");
+define("_MB_NWS_READMORE","Lees meer...");
+define("_MB_NWS_NAME", "Titel");
+define("_MB_NWS_DATE", "Datum");
+define("_MB_NWS_HITS", "Klikken");
+define("_MB_NWS_TOPICS", "Nieuwsonderwerpen Topics<div style=\" font-size: smaller; align='left'\">Toegestane artikelen hier instellen.</div>");
+
+//scrolling news
+define("_MB_NWS_BSPEED", "Marquee-snelheid (groter is sneller)<div style='font-weight:normal'>Komt overeen met vertraging pausescroller</div>");
+define("_MB_NWS_BLIMIT", "Beperk blok tot xx inzendingen: ");
+define("_MB_NWS_BACKGROUNDCOLOR", "Achtergrondkleur:");
+define("_MB_NWS_DIRECTION", "Scrollrichting (Alleen Marquee) ?");
+define("_MB_NWS_UP", "Boven");
+define("_MB_NWS_DOWN", "Beneden");
+define("_MB_NWS_ALTERNATE", "Alternatieve items (Alleen Marquee) ?");
+define("_MB_NWS_SHOWDEF", "Toon teaser?");
+define("_MB_NWS_MARQUEE", "Marquee");
+define("_MB_NWS_PAUSESCROLLER", "Pause scroller");
+define("_MB_NWS_DOMTICKER", "Fading scroller");
+
+// Featured content Glider
+define("_MB_NWS_BPACE", "Snelheid (Hoger is langerzamer)");
+define("_MB_NWS_BWIDTH", "Contentomslag max. breedte:");
+define("_MB_NWS_BHEIGHT", "Contentomslag max. hoogte:");
+define("_MB_NWS_BWRAPPERWIDTH", "Max breedte van omslagtekst (breedte - 20 px):");
+define("_MB_NWS_BWRAPPERBCOLOR", "Randkleur :");
+define("_MB_NWS_AUTOROTATE", "Autorotatie?");
+define("_MB_NWS_AUTORYCYLES", "Max. aantal maal autorotaties alvorens te stoppen (0 voor oneindig):");
+define("_MB_NWS_BUTTONSNAV", "Knopnavigatie gebruiken?");
+define("_MB_NWS_BACK", "Terug");
+define("_MB_NWS_FORWARD", "Vooruit");
+define("_MB_NWS_PERSISTSTATE", "Laatste content onthouden ?");
+define("_MB_NWS_BBORDER", "Randbreedte:");
+
+// Featured content Slider
+define("_MB_NWS_SHOWAUTH", "Auteur tonen?");
+define("_MB_NWS_HTML", "HTML ggebruiken?");
+define("_MB_NWS_SMILEY", "Toon smilies als tekst?");
+define("_MB_NWS_XCODE", "Xcodes tonen ?");
+define("_MB_NWS_BR", "Scheidingslijnen ?");
+define("_MB_NWS_IMAGE", "Afbeeldingen ?");
+//S3slider
+define("_MB_NWS_SLIDESIDE", "Waar dient de slider te verschijnen?");
+define("_MB_NWS_SLIDELEFT", "links");
+define("_MB_NWS_SLIDERIGHT", "rechts");
+define("_MB_NWS_SLIDETOP", "boven");
+define("_MB_NWS_SLIDEBOTTOM", "beneden");
+// bxSlider
+define("_MB_NWS_IMGWIDTH", "Breedte van afbeelding in procenten. (in relatie met de breedte van het blok)");
+define("_MB_NWS_FLOATIMG", "Float Image");
+define("_MB_NWS_EFFECT", "Kies effect.<br/> voor Tickermode dient ook de Tickersnelheid ingesteld te worden");
+define("_MB_NWS_FADE", "Fade");
+define("_MB_NWS_VERTICAL", "Verticaal");
+define("_MB_NWS_HORIZONTAL", "Horizontaal");
+define("_MB_NWS_TICKER", "Tickermode");
+define("_MB_NWS_TICKERSPEED", "Tickersnelheid");
+define("_MB_NWS_EASING", "jQuery Easing Effect gebruiken?");
+define("_MB_NWS_TEXTALIGN", "Tekstuitlijning");
+define("_MB_NWS_JUSTIFY", "Verantwoorden");
+define("_MB_NWS_TOPICT", "Onderwerpen tonen?");
+define("_MB_NWS_CAPTIONS", "Afbeeldingstekstn tonen?");
+?>
\ No newline at end of file
Added: XoopsLanguages/dutch/modules/newsslider/newsslider 1.2b/nederlands/index.html
===================================================================
--- XoopsLanguages/dutch/modules/newsslider/newsslider 1.2b/nederlands/index.html (rev 0)
+++ XoopsLanguages/dutch/modules/newsslider/newsslider 1.2b/nederlands/index.html 2012-02-07 23:33:30 UTC (rev 8906)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsLanguages/dutch/modules/newsslider/newsslider 1.2b/nederlands/modinfo.php
===================================================================
--- XoopsLanguages/dutch/modules/newsslider/newsslider 1.2b/nederlands/modinfo.php (rev 0)
+++ XoopsLanguages/dutch/modules/newsslider/newsslider 1.2b/nederlands/modinfo.php 2012-02-07 23:33:30 UTC (rev 8906)
@@ -0,0 +1,27 @@
+<?php
+/**
+ * $Id: modinfo.php v 1.0 11 Jan 2012 Yerres Exp $
+ * Module: newsslider
+ * Version: 1.1
+ * Release Date: 11 Jan 2012 Yerres
+ * Author: Yerres
+ * Licence: GNU
+ */
+define("_MI_NWS_NAME","Newsslider");
+define("_MI_NWS_DESC","Toevoegen van een schuivend nieuwsblok");
+
+// Names of admin menu items
+define("_MI_NWS_MENU","Toevoegen/bewerken Nieuwsslider");
+define("_MI_NWS_TAGS", "Nieuwsslider");
+define('_MI_NWS_UPDATEMODULE', 'Update module templates and blocks');
+
+// Names of blocks for this module
+define("_MI_NWS_BNAME","Nieuwsslider");
+define("_MI_NWS_BDESC","Schuivend nieuws weergeven");
+
+define("_MI_NWS_BNAME1", "Scrollend nieuws");
+define("_MI_NWS_BNAME2", "Aanbevolen Content Glider");
+define("_MI_NWS_BNAME3", "Aanbevolen XOOPS Nieuws");
+define("_MI_NWS_BNAME4", "S3 Slider");
+define("_MI_NWS_BNAME5", "bxSlider");
+?>
\ 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: <dj...@us...> - 2012-02-07 21:58:05
|
Revision: 8905
http://xoops.svn.sourceforge.net/xoops/?rev=8905&view=rev
Author: djculex
Date: 2012-02-07 21:57:57 +0000 (Tue, 07 Feb 2012)
Log Message:
-----------
Reverting back...these condesed line confuses me :-S
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/admin/about.php
XoopsModules/smallworld/trunk/smallworld/admin/admin_footer.php
XoopsModules/smallworld/trunk/smallworld/admin/admin_header.php
XoopsModules/smallworld/trunk/smallworld/admin/admintool.php
XoopsModules/smallworld/trunk/smallworld/admin/div_useradmin.php
XoopsModules/smallworld/trunk/smallworld/admin/help.php
XoopsModules/smallworld/trunk/smallworld/admin/index.php
XoopsModules/smallworld/trunk/smallworld/admin/main.php
XoopsModules/smallworld/trunk/smallworld/admin/menu.php
XoopsModules/smallworld/trunk/smallworld/admin/moduleinfo.php
XoopsModules/smallworld/trunk/smallworld/admin/useradmin.php
XoopsModules/smallworld/trunk/smallworld/class/adminclass.php
XoopsModules/smallworld/trunk/smallworld/class/class_collector.php
XoopsModules/smallworld/trunk/smallworld/class/db.php
XoopsModules/smallworld/trunk/smallworld/class/forms.php
XoopsModules/smallworld/trunk/smallworld/class/friends.php
XoopsModules/smallworld/trunk/smallworld/class/images.php
XoopsModules/smallworld/trunk/smallworld/class/mail.php
XoopsModules/smallworld/trunk/smallworld/class/profile.php
XoopsModules/smallworld/trunk/smallworld/class/uploadclass.php
XoopsModules/smallworld/trunk/smallworld/class/user.php
XoopsModules/smallworld/trunk/smallworld/class/wall.php
XoopsModules/smallworld/trunk/smallworld/include/arrays.php
XoopsModules/smallworld/trunk/smallworld/include/functions.php
XoopsModules/smallworld/trunk/smallworld/include/getSelects.php
Modified: XoopsModules/smallworld/trunk/smallworld/admin/about.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/admin/about.php 2012-02-07 21:12:44 UTC (rev 8904)
+++ XoopsModules/smallworld/trunk/smallworld/admin/about.php 2012-02-07 21:57:57 UTC (rev 8905)
@@ -1,26 +1,24 @@
<?php
/**
* 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.
+* 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
-* @packet: Modules
-* @sub-packet: Smallworld
-* @since: Xoops 2.5.4
-* @Author: Michael Albertsen (http://culex.dk) <cu...@cu...>
-* @copyright: 2011 Culex
-* @Last committed: $Revision$
-* @Last changed by: $Author$
-* @Last changed date: $Date$
-* @ID: $Id$
+* @copyright: The XOOPS Project http://sourceforge.net/projects/xoops/
+* @license: http://www.fsf.org/copyleft/gpl.html GNU public license
+* @module: Smallworld
+* @Author: Michael Albertsen (http://culex.dk) <cu...@cu...>
+* @copyright: 2011 Culex
+* @Repository path: $HeadURL$
+* @Last committed: $Revision$
+* @Last changed by: $Author$
+* @Last changed date: $Date$
+* @ID: $Id$
**/
-
+
include_once dirname(__FILE__) . '/admin_header.php';
xoops_cp_header();
@@ -37,6 +35,4 @@
echo $aboutAdmin->addNavigation('about.php');
echo $aboutAdmin->renderAbout('', false);
-
-
include 'admin_footer.php';
\ No newline at end of file
Modified: XoopsModules/smallworld/trunk/smallworld/admin/admin_footer.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/admin/admin_footer.php 2012-02-07 21:12:44 UTC (rev 8904)
+++ XoopsModules/smallworld/trunk/smallworld/admin/admin_footer.php 2012-02-07 21:57:57 UTC (rev 8905)
@@ -1,36 +1,32 @@
<?php
/**
* 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.
+* 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
-* @packet: Modules
-* @sub-packet: Smallworld
-* @since: Xoops 2.5.4
-* @Author: Michael Albertsen (http://culex.dk) <cu...@cu...>
-* @copyright: 2011 Culex
-* @Last committed: $Revision$
-* @Last changed by: $Author$
-* @Last changed date: $Date$
-* @ID: $Id$
+* @copyright: The XOOPS Project http://sourceforge.net/projects/xoops/
+* @license: http://www.fsf.org/copyleft/gpl.html GNU public license
+* @module: Smallworld
+* @Author: Michael Albertsen (http://culex.dk) <cu...@cu...>
+* @copyright: 2011 Culex
+* @Repository path: $HeadURL$
+* @Last committed: $Revision$
+* @Last changed by: $Author$
+* @Last changed date: $Date$
+* @ID: $Id$
**/
echo "<div class='adminfooter'>\n"
- . " <div style='text-align: center;'>\n"
- . " <a href='http://www.xoops.org' target='_blank'>"
- . "<img src='" . $pathIconBig . "/xoopsmicrobutton.gif' "
- . "alt='XOOPS' title='XOOPS'></a>\n"
- . " </div>\n"
- . " " . _AM_SMALLWORLD_FOOTER . "\n"
- . "</div>";
+ ." <div style='text-align: center;'>\n"
+ ." <a href='http://www.xoops.org' target='_blank'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
+ ." </div>\n"
+ ." " . _AM_SMALLWORLD_FOOTER . "\n"
+ ."</div>";
-echo "<span style='margin: 27%; height: 50px; position: relative;'>"
- . _AM_SMALLWORLD_SP."</span>";
+echo "<span style='margin: 27%; height: 50px; position: relative;'>"._AM_SMALLWORLD_SP."</span>";
+
xoops_cp_footer();
\ No newline at end of file
Modified: XoopsModules/smallworld/trunk/smallworld/admin/admin_header.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/admin/admin_header.php 2012-02-07 21:12:44 UTC (rev 8904)
+++ XoopsModules/smallworld/trunk/smallworld/admin/admin_header.php 2012-02-07 21:57:57 UTC (rev 8905)
@@ -1,41 +1,38 @@
<?php
/**
* 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.
+* 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
-* @packet: Modules
-* @sub-packet: Smallworld
-* @since: Xoops 2.5.4
-* @Author: Michael Albertsen (http://culex.dk) <cu...@cu...>
-* @copyright: 2011 Culex
-* @Last committed: $Revision$
-* @Last changed by: $Author$
-* @Last changed date: $Date$
-* @ID: $Id$
+* @copyright: The XOOPS Project http://sourceforge.net/projects/xoops/
+* @license: http://www.fsf.org/copyleft/gpl.html GNU public license
+* @module: Smallworld
+* @Author: Michael Albertsen (http://culex.dk) <cu...@cu...>
+* @copyright: 2011 Culex
+* @Repository path: $HeadURL$
+* @Last committed: $Revision$
+* @Last changed by: $Author$
+* @Last changed date: $Date$
+* @ID: $Id$
**/
$path = dirname(dirname(dirname(dirname(__FILE__))));
-require_once $path . '/mainfile.php';
-require_once $path . '/include/cp_functions.php';
-require_once $path . '/kernel/module.php';
+include_once $path . '/mainfile.php';
+include_once $path . '/include/cp_functions.php';
+include_once $path . '/kernel/module.php';
require_once $path . '/include/cp_header.php';
global $xoopsModule;
$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
-$pathIconSmall = '../' . $xoopsModule->getInfo('icons16');
-$pathIconBig = '../' . $xoopsModule->getInfo('icons32');
-$modAurl = '/Frameworks/moduleclasses/moduleadmin/moduleadmin.php';
+$pathIcon16 = '../' . $xoopsModule->getInfo('icons16');
+$pathIcon32 = '../' . $xoopsModule->getInfo('icons32');
-if (file_exists($GLOBALS['xoops']->path($modAurl))) {
- require_once $GLOBALS['xoops']->path($modAurl);
+if (file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))) {
+ include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
} else {
redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false);
}
Modified: XoopsModules/smallworld/trunk/smallworld/admin/admintool.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/admin/admintool.php 2012-02-07 21:12:44 UTC (rev 8904)
+++ XoopsModules/smallworld/trunk/smallworld/admin/admintool.php 2012-02-07 21:57:57 UTC (rev 8905)
@@ -1,68 +1,55 @@
<?php
/**
* 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.
+* 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
-* @packet: Modules
-* @sub-packet: Smallworld
-* @since: Xoops 2.5.4
-* @Author: Michael Albertsen (http://culex.dk) <cu...@cu...>
-* @copyright: 2011 Culex
-* @Last committed: $Revision$
-* @Last changed by: $Author$
-* @Last changed date: $Date$
-* @ID: $Id$
+* @copyright: The XOOPS Project http://sourceforge.net/projects/xoops/
+* @license: http://www.fsf.org/copyleft/gpl.html GNU public license
+* @module: Smallworld
+* @Author: Michael Albertsen (http://culex.dk) <cu...@cu...>
+* @copyright: 2011 Culex
+* @Repository path: $HeadURL$
+* @Last committed: $Revision$
+* @Last changed by: $Author$
+* @Last changed date: $Date$
+* @ID: $Id$
**/
-require_once(XOOPS_ROOT_PATH."/modules/smallworld/include/functions.php");
-require_once(XOOPS_ROOT_PATH."/modules/smallworld/class/class_collector.php");
require_once 'admin_header.php';
-global $xoopsDB, $xoopsLogger;
-
+global $xoopsDB, $xoTheme, $xoopsLogger ;
$xoopsLogger->activated = false;
+include_once(XOOPS_ROOT_PATH."/modules/smallworld/include/functions.php");
+include_once(XOOPS_ROOT_PATH."/modules/smallworld/class/class_collector.php");
if ($_POST['type'] == 'addtime') {
- $userid = intval($_POST['userid']);
- $amount = intval($_POST['amount']);
- $test = "SELECT * FROM "
- . $xoopsDB->prefix('smallworld_admin')
- . " WHERE userid = '".$userid
- . "' AND (inspect_start+inspect_stop) > ".time()."";
- $result = $xoopsDB->queryF($test);
- if ($xoopsDB->getRowsNum($result) < 1) {
- $sql = "UPDATE ".$xoopsDB->prefix('smallworld_admin')
- . " SET inspect_start = '".time()
- . "', inspect_stop = '".$amount
- . "' WHERE userid='".$userid."'";
- $result = $xoopsDB->queryF($sql);
- } else {
- $sql = "UPDATE ".$xoopsDB->prefix('smallworld_admin')
- . " SET inspect_stop = (inspect_stop + "
- . $amount.") WHERE userid='"
- . $userid."'";
- $result = $xoopsDB->queryF($sql);
- }
-
+ $userid = intval($_POST['userid']);
+ $amount = intval($_POST['amount']);
+ $test = "SELECT * FROM ".$xoopsDB->prefix('smallworld_admin')." WHERE userid = '".$userid."' AND (inspect_start+inspect_stop) > ".time()."";
+ $result = $xoopsDB->queryF($test);
+ if ($xoopsDB->getRowsNum($result) < 1) {
+ $sql = "UPDATE ".$xoopsDB->prefix('smallworld_admin')." SET inspect_start = '".time()."', inspect_stop = '".$amount."' WHERE userid='".$userid."'";
+ $result = $xoopsDB->queryF($sql);
+ } else {
+ $sql = "UPDATE ".$xoopsDB->prefix('smallworld_admin')." SET inspect_stop = (inspect_stop + ".$amount.") WHERE userid='".$userid."'";
+ $result = $xoopsDB->queryF($sql);
+ }
+
}
if ($_POST['type'] == 'deletetime') {
- $sql = "UPDATE ".$xoopsDB->prefix('smallworld_admin')
- . " SET inspect_start = '', inspect_stop = '' WHERE userid='"
- . intval($_POST['deluserid'])."'";
- $result = $xoopsDB->queryF($sql);
+ $sql = "UPDATE ".$xoopsDB->prefix('smallworld_admin')." SET inspect_start = '', inspect_stop = '' WHERE userid='".intval($_POST['deluserid'])."'";
+ $result = $xoopsDB->queryF($sql);
}
if ($_POST['type'] == 'deleteUser') {
- $db = new SmallWorldDB;
-
- $userid = intval($_POST['deluserid']);
- $db->deleteAccount($userid);
-
-}
\ No newline at end of file
+ $db = new SmallWorldDB;
+
+ $userid = intval($_POST['deluserid']);
+ $db->deleteAccount ($userid);
+
+}
+?>
\ No newline at end of file
Modified: XoopsModules/smallworld/trunk/smallworld/admin/div_useradmin.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/admin/div_useradmin.php 2012-02-07 21:12:44 UTC (rev 8904)
+++ XoopsModules/smallworld/trunk/smallworld/admin/div_useradmin.php 2012-02-07 21:57:57 UTC (rev 8905)
@@ -1,86 +1,72 @@
<?php
/**
* 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.
+* 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
-* @packet: Modules
-* @sub-packet: Smallworld
-* @since: Xoops 2.5.4
-* @Author: Michael Albertsen (http://culex.dk) <cu...@cu...>
-* @copyright: 2011 Culex
-* @Last committed: $Revision$
-* @Last changed by: $Author$
-* @Last changed date: $Date$
-* @ID: $Id$
+* @copyright: The XOOPS Project http://sourceforge.net/projects/xoops/
+* @license: http://www.fsf.org/copyleft/gpl.html GNU public license
+* @module: Smallworld
+* @Author: Michael Albertsen (http://culex.dk) <cu...@cu...>
+* @copyright: 2011 Culex
+* @Repository path: $HeadURL$
+* @Last committed: $Revision$
+* @Last changed by: $Author$
+* @Last changed date: $Date$
+* @ID: $Id$
**/
require_once 'admin_header.php';
-require_once(XOOPS_ROOT_PATH."/modules/smallworld/include/functions.php");
-require_once(XOOPS_ROOT_PATH."/modules/smallworld/class/class_collector.php");
-global $xoopsLogger;
+global $xoopsDB, $xoTheme, $xoopsLogger ;
$xoopsLogger->activated = false;
+include_once(XOOPS_ROOT_PATH."/modules/smallworld/include/functions.php");
+include_once(XOOPS_ROOT_PATH."/modules/smallworld/class/class_collector.php");
-$tpl = new XoopsTpl();
+$Tpl = new XoopsTpl();
$admin = new SmallworldAdmin();
-$allusersInspect = $admin->getAllUsers('yes');
- if (!empty($allusersInspect)) {
- foreach ($allusersInspect as $data) {
- $ai['id'] = $data['id'];
- $ai['userid'] = $data['userid'];
- $ai['username'] = $data['username'];
- $ai['realname'] = $data['realname'];
- $ai['userimage'] = smallworld_getAvatarLink(
- $data['userid'], $data['userimage']
- );
- $ai['avatar_size'] = getimagesize($ai['userimage']);
- $ai['avatar_highwide'] = smallworld_imageResize(
- $ai['avatar_size'][0], $ai['avatar_size'][1], 50
- );
- $ai['ip'] = $data['ip'];
- $ai['complaint'] = $data['complaint'];
- $ai['inspect_start'] = $data['inspect_start'];
- $ai['inspect_stop'] = $data['inspect_stop'];
- $ai['userinspect_timetotal'] = ($data['inspect_start'] +
- $data['inspect_stop']) - time();
- $tpl->append('allusersinspect', $ai);
- }
- }
- $tpl->assign('allusersinspectcounter', count($ai));
+$allusers_inspect = $admin->getAllUsers('yes');
+ if (!empty($allusers_inspect)) {
+ foreach ($allusers_inspect as $data) {
+ $ai['id'] = $data['id'];
+ $ai['userid'] = $data['userid'];
+ $ai['username'] = $data['username'];
+ $ai['realname'] = $data['realname'];
+ $ai['userimage'] = smallworld_getAvatarLink ($data['userid'],$data['userimage']);
+ $ai['avatar_size'] = getimagesize($ai['userimage']);
+ $ai['avatar_highwide'] = smallworld_imageResize($ai['avatar_size'][0], $ai['avatar_size'][1], 50);
+ $ai['ip'] = $data['ip'];
+ $ai['complaint'] = $data['complaint'];
+ $ai['inspect_start'] = $data['inspect_start'];
+ $ai['inspect_stop'] = $data['inspect_stop'];
+ $ai['userinspect_timetotal'] = ($data['inspect_start'] + $data['inspect_stop'])-time();
+ $Tpl->append('allusersinspect', $ai);
+ }
+ }
+ $Tpl->assign('allusersinspectcounter',count($ai));
-$allusersNoinspect = $admin->getAllUsers('no');
- if (!empty($allusersNoinspect)) {
- foreach ($allusersNoinspect as $data) {
- $ani['id'] = $data['id'];
- $ani['userid'] = $data['userid'];
- $ani['username'] = $data['username'];
- $ani['realname'] = $data['realname'];
- $ani['userimage'] = smallworld_getAvatarLink(
- $data['userid'], $data['userimage']
- );
- $ani['avatar_size'] = getimagesize($ani['userimage']);
- $ani['avatar_highwide'] = smallworld_imageResize(
- $ani['avatar_size'][0], $ani['avatar_size'][1], 50
- );
- $ani['ip'] = $data['ip'];
- $ani['complaint'] = $data['complaint'];
- $ani['inspect_start'] = '';
- $ani['inspect_stop'] = '';
- $ani['userinspect_timetotal'] = '';
- $tpl->append('allusersnoinspect', $ani);
- }
- }
- $tpl->assign('allusersnoinspectcounter', count($ani));
+$allusers_noinspect = $admin->getAllUsers('no');
+ if (!empty($allusers_noinspect)) {
+ foreach ($allusers_noinspect as $data) {
+ $ani['id'] = $data['id'];
+ $ani['userid'] = $data['userid'];
+ $ani['username'] = $data['username'];
+ $ani['realname'] = $data['realname'];
+ $ani['userimage'] = smallworld_getAvatarLink ($data['userid'],$data['userimage']);
+ $ani['avatar_size'] = getimagesize($ani['userimage']);
+ $ani['avatar_highwide'] = smallworld_imageResize($ani['avatar_size'][0], $ani['avatar_size'][1], 50);
+ $ani['ip'] = $data['ip'];
+ $ani['complaint'] = $data['complaint'];
+ $ani['inspect_start'] = '';
+ $ani['inspect_stop'] = '';
+ $ani['userinspect_timetotal'] = '';
+ $Tpl->append('allusersnoinspect', $ani);
+ }
+ }
+ $Tpl->assign('allusersnoinspectcounter',count($ani));
-$tpl->display(
- XOOPS_ROOT_PATH
- . '/modules/smallworld/templates/'
- . 'smallworld_alluserstodiv.html'
-);
\ No newline at end of file
+$Tpl->display(XOOPS_ROOT_PATH .'/modules/smallworld/templates/smallworld_alluserstodiv.html');
+?>
\ No newline at end of file
Modified: XoopsModules/smallworld/trunk/smallworld/admin/help.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/admin/help.php 2012-02-07 21:12:44 UTC (rev 8904)
+++ XoopsModules/smallworld/trunk/smallworld/admin/help.php 2012-02-07 21:57:57 UTC (rev 8905)
@@ -1,121 +1,64 @@
<?php
/**
* 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.
+* 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
-* @packet: Modules
-* @sub-packet: Smallworld
-* @since: Xoops 2.5.4
-* @Author: Michael Albertsen (http://culex.dk) <cu...@cu...>
-* @copyright: 2011 Culex
-* @Last committed: $Revision$
-* @Last changed by: $Author$
-* @Last changed date: $Date$
-* @ID: $Id$
+* @copyright: The XOOPS Project http://sourceforge.net/projects/xoops/
+* @license: http://www.fsf.org/copyleft/gpl.html GNU public license
+* @module: Smallworld
+* @Author: Michael Albertsen (http://culex.dk) <cu...@cu...>
+* @copyright: 2011 Culex
+* @Repository path: $HeadURL$
+* @Last committed: $Revision$
+* @Last changed by: $Author$
+* @Last changed date: $Date$
+* @ID: $Id$
**/
require_once 'admin_header.php';
require_once '../../../include/cp_header.php';
-require_once(XOOPS_ROOT_PATH . "/modules/smallworld/include/functions.php");
-require_once(
- XOOPS_ROOT_PATH . "/modules/smallworld/class/class_collector.php"
-);
+include_once(XOOPS_ROOT_PATH."/modules/smallworld/include/functions.php");
+include_once(XOOPS_ROOT_PATH."/modules/smallworld/class/class_collector.php");
+
require_once XOOPS_ROOT_PATH . '/class/template.php';
+if (!isset($xoopsTpl)) {$xoopsTpl = new XoopsTpl();}
+$xoopsTpl->xoops_setCaching(0);
-if (!isset($xoopsTpl)) {
- $xoopsTpl = new XoopsTpl();
-}
-
-$xoopsTpl->caching = 0;
xoops_cp_header();
-global $xoTheme;
-// template assignments
-
- // help file from admin
- $xoopsTpl->assign(
- 'lang_hlp_requirements_t',
- _AM_SMALLWORLD_HELP_HEADER_REQUIREMENTS
- );
-
- $xoopsTpl->assign(
- 'lang_hlp_requirements',
- _AM_SMALLWORLD_HELP_REQUIREMENTS
- );
-
- $xoopsTpl->assign(
- 'lang_hlp_recommended_t',
- _AM_SMALLWORLD_HELP_HEADER_RECOMMENDED
- );
-
- $xoopsTpl->assign(
- 'lang_hlp_recommended',
- _AM_SMALLWORLD_HELP_RECOMMENDED
- );
-
- $xoopsTpl->assign(
- 'lang_hlp_installation_t',
- _AM_SMALLWORLD_HELP_HEADER_INSTALLATION
- );
-
- $xoopsTpl->assign(
- 'lang_hlp_firsttime',
- _AM_SMALLWORLD_HELP_FIRSTTIMEINSTALL
- );
-
- $xoopsTpl->assign(
- 'lang_hlp_hostedplatform_t',
- _AM_SMALLWORLD_HELP_HEADER_HOSTED_PLATFORM
- );
-
- $xoopsTpl->assign(
- 'lang_hlp_hostedplatform',
- _AM_SMALLWORLD_HELP_HOSTED_PLATFORM
- );
-
- $xoopsTpl->assign(
- 'lang_hlp_upgrading_t',
- _AM_SMALLWORLD_HELP_HEADER_UPGRADING
- );
-
- $xoopsTpl->assign(
- 'lang_hlp_upgrading',
- _AM_SMALLWORLD_HELP_UPGRADING
- );
-
+$admin = new SmallworldAdmin();
+$tpl = new XoopsTpl();
- $xoopsTpl->assign(
- 'lang_hlp_commen1_t',
- _AM_SMALLWORLD_HELP_HEADER_COMMENPROBLEMS1
- );
-
- $xoopsTpl->assign(
- 'lang_hlp_commen1',
- _AM_SMALLWORLD_HELP_COMMENPROBLEMS1
- );
-
- $xoopsTpl->assign(
- 'lang_hlp_contacts_t',
- _AM_SMALLWORLD_HELP_HEADER_CONTACTS
- );
-
- $xoopsTpl->assign('lang_help', _AM_SMALLWORLD_HELP);
- $xoopsTpl->assign('lang_hlp_about', _AM_SMALLWORLD_HELP_ABOUT);
- $xoopsTpl->assign('lang_hlp_preface', _AM_SMALLWORLD_HELP_PREFACE);
- $xoopsTpl->assign('lang_hlp_faq_t', _AM_SMALLWORLD_HELP_HEADER_FAQ);
- $xoopsTpl->assign('lang_hlp_otherhelp', _AM_SMALLWORLD_HELP_OTHERHELP);
-
- $xoTheme->addStyleSheet('modules/smallworld/css/SmallworldAdmin.css');
-
- $xoopsTpl->display(
- XOOPS_ROOT_PATH .'/modules/smallworld/templates/admin_help.html'
- );
-
-xoops_cp_footer();
\ No newline at end of file
+// template assignments
+ $xoopsTpl->assign('lang_help',_AM_SMALLWORLD_HELP);
+
+ // help file from admin
+ $xoopsTpl->assign('lang_hlp_about',_AM_SMALLWORLD_HELP_ABOUT);
+ $xoopsTpl->assign('lang_hlp_preface',_AM_SMALLWORLD_HELP_PREFACE);
+ $xoopsTpl->assign('lang_hlp_requirements_t',_AM_SMALLWORLD_HELP_HEADER_REQUIREMENTS);
+ $xoopsTpl->assign('lang_hlp_requirements',_AM_SMALLWORLD_HELP_REQUIREMENTS);
+ $xoopsTpl->assign('lang_hlp_recommended_t',_AM_SMALLWORLD_HELP_HEADER_RECOMMENDED);
+ $xoopsTpl->assign('lang_hlp_recommended',_AM_SMALLWORLD_HELP_RECOMMENDED);
+ $xoopsTpl->assign('lang_hlp_installation_t',_AM_SMALLWORLD_HELP_HEADER_INSTALLATION);
+ $xoopsTpl->assign('lang_hlp_firsttime',_AM_SMALLWORLD_HELP_FIRSTTIMEINSTALL);
+ $xoopsTpl->assign('lang_hlp_hostedplatform_t',_AM_SMALLWORLD_HELP_HEADER_HOSTED_PLATFORM);
+ $xoopsTpl->assign('lang_hlp_hostedplatform',_AM_SMALLWORLD_HELP_HOSTED_PLATFORM);
+ $xoopsTpl->assign('lang_hlp_upgrading_t',_AM_SMALLWORLD_HELP_HEADER_UPGRADING);
+ $xoopsTpl->assign('lang_hlp_upgrading',_AM_SMALLWORLD_HELP_UPGRADING);
+ $xoopsTpl->assign('lang_hlp_faq_t',_AM_SMALLWORLD_HELP_HEADER_FAQ);
+ $xoopsTpl->assign('lang_hlp_commen1_t',_AM_SMALLWORLD_HELP_HEADER_COMMENPROBLEMS1);
+ $xoopsTpl->assign('lang_hlp_commen1',_AM_SMALLWORLD_HELP_COMMENPROBLEMS1);
+ $xoopsTpl->assign('lang_hlp_contacts_t',_AM_SMALLWORLD_HELP_HEADER_CONTACTS);
+ $xoopsTpl->assign('lang_hlp_otherhelp',_AM_SMALLWORLD_HELP_OTHERHELP);
+
+ $xoopsTpl->display(XOOPS_ROOT_PATH .'/modules/smallworld/templates/admin_help.html');
+
+ global $xoTheme;
+ $xoTheme->addStyleSheet('modules/smallworld/css/SmallworldAdmin.css');
+
+xoops_cp_footer();
+?>
Modified: XoopsModules/smallworld/trunk/smallworld/admin/index.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/admin/index.php 2012-02-07 21:12:44 UTC (rev 8904)
+++ XoopsModules/smallworld/trunk/smallworld/admin/index.php 2012-02-07 21:57:57 UTC (rev 8905)
@@ -1,331 +1,201 @@
<?php
/**
* 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.
+* 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
-* @packet: Modules
-* @sub-packet: Smallworld
-* @since: Xoops 2.5.4
-* @Author: Michael Albertsen (http://culex.dk) <cu...@cu...>
-* @copyright: 2011 Culex
-* @Last committed: $Revision$
-* @Last changed by: $Author$
-* @Last changed date: $Date$
-* @ID: $Id$
+* @copyright: The XOOPS Project http://sourceforge.net/projects/xoops/
+* @license: http://www.fsf.org/copyleft/gpl.html GNU public license
+* @module: Smallworld
+* @Author: Michael Albertsen (http://culex.dk) <cu...@cu...>
+* @copyright: 2011 Culex
+* @Repository path: $HeadURL$
+* @Last committed: $Revision$
+* @Last changed by: $Author$
+* @Last changed date: $Date$
+* @ID: $Id$
**/
-require_once dirname(__FILE__) . '/admin_header.php';
+//require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
+include_once dirname(__FILE__) . '/admin_header.php';
+
xoops_cp_header();
-global $xoTheme;
-
-$xoTheme->addStylesheet(
- XOOPS_URL . '/modules/smallworld/css/SmallworldAdmin.css'
-);
-$xoTheme->addScript(
- XOOPS_URL . '/modules/smallworld/js/adminsmallworld.js'
-);
+global $xoTheme;
+$xoTheme->addStylesheet(XOOPS_URL . '/modules/smallworld/css/SmallworldAdmin.css');
+$xoTheme->addScript(XOOPS_URL . '/modules/smallworld/js/adminsmallworld.js');
-$indexAdmin = new ModuleAdmin();
+ $indexAdmin = new ModuleAdmin();
+
+
$admin = new SmallworldAdmin();
// Find oldest message and apply to template
$dfm = $admin->oldestMsg();
-if ($dfm == 0) {
- $dfm = _AM_SMALLWORLD_NONEYET;
+if ($dfm==0) {
+ $dfm = _AM_SMALLWORLD_NONEYET;
} else {
- $dfm = date(_SHORTDATESTRING, $admin->oldestMsg());
+ $dfm = date(_SHORTDATESTRING, $admin->oldestMsg());
}
$dateoffirstmessage = $dfm;
// Get days number
$totaldays = $admin->CountDays();
-
// get average messages per day
-$avgperday = $admin->AvgMsgDay($totaldays);
-
+$avgperday = $admin->AvgMsgDay ($totaldays);
// Smallworld version number
-$installversion = $admin->ModuleInstallVersion();
-
+$installversion = $admin->ModuleInstallVersion ();
// Smallworld install date
-$installdate = $admin->ModuleInstallDate();
-
-// check current version of Smallworld,
-// return desc,link,version if new available
-$installCheck = $admin->doCheckUpdate();
-
+$installdate = $admin->ModuleInstallDate ();
+//check current version of Smallworld, return desc,link,version if new available
+$installCheck = $admin->doCheckUpdate ();
// Count members using Smallworld
-$sumallusers = $admin->TotalUsers();
-
+$sumallusers = $admin->TotalUsers ();
// Find list of most active users (total)
$maAllround = $admin->mostactiveusers_allround();
-$maCnt = 0;
-if (!empty($maAllround)) {
- $count = count($maAllround['cnt']);
-} else {
- $count = 0;
-}
-$matCnt = 0;
-if ($count != 0) {
- $maCnt = 1;
- $ma = "<table class='smallworldadmin'><tr>";
- $ma .= "<td><b>"._AM_SMALLWORLD_STATS_POS."</b></td>"
- . "<td><b>"._AM_SMALLWORLD_STATS_IMG."</b></td>"
- . "<td><b>"._AM_SMALLWORLD_STATS_AMOUNT."</b></td>"
- . "<td><b>"._AM_SMALLWORLD_STATS_NAME."</b></td>"
- . "</tr>";
- $i = 1;
- $maAllroundCount = count($maAllround) - 1;
- while ($i < $maAllroundCount) {
- $ma .= vsprintf(
- '<tr><td>%s</td>', array($maAllround['counter'][$i])
- );
- $ma .= vsprintf(
- '<td>%s</td>', array($maAllround['img'][$i])
- );
- $ma .= vsprintf(
- '<td>%s</td>', array($maAllround['cnt'][$i])
- );
- $ma .= vsprintf(
- '<td>%s</td></tr>', array($maAllround['from'][$i])
- );
- $i++;
- }
- $ma .= "</tr></table>";
-} else {
- $maAllround = 0;
-}
-
+ $ma_cnt = 0;
+ if (!empty($maAllround)) {
+ $count = count($maAllround['cnt']);
+ } else {
+ $count=0;
+ }
+ $mat_cnt = 0;
+ if ($count != 0) {
+ $ma_cnt = 1;
+ $ma = "<table class='smallworldadmin'><tr>";
+ $ma .= "<td><b>"._AM_SMALLWORLD_STATS_POS."</b></td><td><b>"._AM_SMALLWORLD_STATS_IMG."</b></td><td><b>"._AM_SMALLWORLD_STATS_AMOUNT."</b></td><td><b>"._AM_SMALLWORLD_STATS_NAME."</b></td></tr>";
+ $i = 1;
+ while ($i < count($maAllround)-1) {
+ $ma .= vsprintf('<tr><td>%s</td>',array($maAllround['counter'][$i]));
+ $ma .= vsprintf('<td>%s</td>',array($maAllround['img'][$i]));
+ $ma .= vsprintf('<td>%s</td>',array($maAllround['cnt'][$i]));
+ $ma .= vsprintf('<td>%s</td></tr>',array($maAllround['from'][$i]));
+ $i++;
+ }
+ $ma .= "</tr></table>";
+ } else {
+ $maAllround = 0;
+ }
// Find list of most active users (24 hours)
$maToday = $admin->mostactiveusers_today();
-if (!empty($maToday)) {
- $count = count($maToday['cnt']);
-} else {
- $count = 0;
-}
-$matCnt = 0;
-if ($count != 0) {
- $matCnt = 1;
- $mat = "<table class='smallworldadmin'><tr>";
- $mat .= "<td><b>"._AM_SMALLWORLD_STATS_POS."</b></td>"
- . "<td><b>"._AM_SMALLWORLD_STATS_IMG."</b></td>"
- . "<td><b>"._AM_SMALLWORLD_STATS_AMOUNT."</b></td>"
- . "<td><b>"._AM_SMALLWORLD_STATS_NAME."</b></td></tr>";
- $i = 1;
- $matodayCount = count(array($maToday));
- while ($i <= $matodayCount) {
- $mat .= vsprintf(
- '<tr><td>%s</td>', array($maToday['counter'][$i])
- );
- $mat .= vsprintf(
- '<td>%s</td>', array($maToday['img'][$i])
- );
- $mat .= vsprintf(
- '<td>%s</td>', array($maToday['cnt'][$i])
- );
- $mat .= vsprintf(
- '<td>%s</td></tr>', array($maToday['from'][$i])
- );
- $i++;
- }
- $mat .= "</tr></table>";
-} else {
- $mat = 0;
-}
-
+ if (!empty($maToday)) {
+ $count = count($maToday['cnt']);
+ } else {
+ $count=0;
+ }
+ $mat_cnt = 0;
+ if ($count != 0) {
+ $mat_cnt = 1;
+ $mat = "<table class='smallworldadmin'><tr>";
+ $mat .= "<td><b>"._AM_SMALLWORLD_STATS_POS."</b></td><td><b>"._AM_SMALLWORLD_STATS_IMG."</b></td><td><b>"._AM_SMALLWORLD_STATS_AMOUNT."</b></td><td><b>"._AM_SMALLWORLD_STATS_NAME."</b></td></tr>";
+ $i = 1;
+ while ($i <= count(array($maToday))) {
+ $mat .= vsprintf('<tr><td>%s</td>',array($maToday['counter'][$i]));
+ $mat .= vsprintf('<td>%s</td>',array($maToday['img'][$i]));
+ $mat .= vsprintf('<td>%s</td>',array($maToday['cnt'][$i]));
+ $mat .= vsprintf('<td>%s</td></tr>',array($maToday['from'][$i]));
+ $i++;
+ }
+ $mat .= "</tr></table>";
+ } else {
+ $mat = 0;
+ }
// FInd list of best rated users overall
$topusers = $admin->topratedusers('up');
-if (!empty($topusers)) {
- $count = count($topusers['cnt']);
-} else {
- $count = 0;
-}
-$topCnt = 0;
-if ($count != 0) {
- $topCnt = 1;
- $top = "<table class='smallworldadmin'><tr>";
- $top .= "<td><b>"._AM_SMALLWORLD_STATS_POS."</b></td>"
- . "<td><b>"._AM_SMALLWORLD_STATS_IMG."</b></td>"
- . "<td><b>"._AM_SMALLWORLD_STATS_AMOUNT."</b></td>"
- . "<td><b>"._AM_SMALLWORLD_STATS_NAME."</b></td></tr>";
- $i = 1;
- while ($i <= $count) {
- $top .= vsprintf(
- '<tr><td>%s</td>', array($topusers['counter'][$i])
- );
- $top .= vsprintf(
- '<td>%s</td>', array($topusers['img'][$i])
- );
- $top .= vsprintf(
- '<td>%s</td>', array($topusers['cnt'][$i])
- );
- $top .= vsprintf(
- '<td>%s</td></tr>', array($topusers['user'][$i])
- );
- $i++;
- }
- $top .= "</tr></table>";
-} else {
- $top = 0;
-}
+ if (!empty($topusers)){
+ $count = count($topusers['cnt']);
+ } else {
+ $count = 0;
+ }
+ $top_cnt = 0;
+ if ($count != 0) {
+ $top_cnt = 1;
+ $top = "<table class='smallworldadmin'><tr>";
+ $top .= "<td><b>"._AM_SMALLWORLD_STATS_POS."</b></td><td><b>"._AM_SMALLWORLD_STATS_IMG."</b></td><td><b>"._AM_SMALLWORLD_STATS_AMOUNT."</b></td><td><b>"._AM_SMALLWORLD_STATS_NAME."</b></td></tr>";
+ $i = 1;
+ while ($i <= $count) {
+ $top .= vsprintf('<tr><td>%s</td>',array($topusers['counter'][$i]));
+ $top .= vsprintf('<td>%s</td>',array($topusers['img'][$i]));
+ $top .= vsprintf('<td>%s</td>',array($topusers['cnt'][$i]));
+ $top .= vsprintf('<td>%s</td></tr>',array($topusers['user'][$i]));
+ $i++;
+ }
+ $top .= "</tr></table>";
+ } else {
+ $top = 0;
+ }
// FInd list of worst rated users overall
$lowusers = $admin->topratedusers('down');
-$lowCnt = 0;
-if (!empty($lowusers)) {
- $count = count($lowusers['cnt']);
-} else {
- $count = 0;
-}
-if ($count != 0) {
- $lowCnt = 1;
- $low = "<table class='smallworldadmin'><tr>";
- $low .= "<td><b>"._AM_SMALLWORLD_STATS_POS."</b></td>"
- . "<td><b>"._AM_SMALLWORLD_STATS_IMG."</b></td>"
- . "<td><b>"._AM_SMALLWORLD_STATS_AMOUNT."</b></td>"
- . "<td><b>"._AM_SMALLWORLD_STATS_NAME."</b></td></tr>";
- $i = 1;
- while ($i <= $count) {
- $low .= vsprintf(
- '<tr><td>%s</td>', array($lowusers['counter'][$i])
- );
- $low .= vsprintf(
- '<td>%s</td>', array($lowusers['img'][$i])
- );
- $low .= vsprintf(
- '<td>%s</td>', array($lowusers['cnt'][$i])
- );
- $low .= vsprintf(
- '<td>%s</td></tr>', array($lowusers['user'][$i])
- );
- $i++;
- }
- $low .= "</tr></table>";
-} else {
- $low = 0;
-}
+ $low_cnt = 0;
+ if (!empty($lowusers)) {
+ $count = count($lowusers['cnt']);
+ } else {
+ $count=0;
+ }
+ if ($count != 0) {
+ $low_cnt = 1;
+ $low = "<table class='smallworldadmin'><tr>";
+ $low .= "<td><b>"._AM_SMALLWORLD_STATS_POS."</b></td><td><b>"._AM_SMALLWORLD_STATS_IMG."</b></td><td><b>"._AM_SMALLWORLD_STATS_AMOUNT."</b></td><td><b>"._AM_SMALLWORLD_STATS_NAME."</b></td></tr>";
+ $i = 1;
+ while ($i <= $count) {
+ $low .= vsprintf('<tr><td>%s</td>',array($lowusers['counter'][$i]));
+ $low .= vsprintf('<td>%s</td>',array($lowusers['img'][$i]));
+ $low .= vsprintf('<td>%s</td>',array($lowusers['cnt'][$i]));
+ $low .= vsprintf('<td>%s</td></tr>',array($lowusers['user'][$i]));
+ $i++;
+ }
+ $low .= "</tr></table>";
+ } else {
+ $low = 0;
+ }
+//-----------------------
+
// template assignments
-$xoopsTpl->assign('lang_moduleinfo', _AM_SMALLWORLD_MODULEINFO);
-$xoopsTpl->assign('lang_installversion', _AM_SMALLWORLD_MODULEINSTALL);
+ $xoopsTpl->assign('lang_moduleinfo', _AM_SMALLWORLD_MODULEINFO);
+ $xoopsTpl->assign('lang_installversion', _AM_SMALLWORLD_MODULEINSTALL);
+ $xoopsTpl->assign('lang_installversion_status', _AM_SMALLWORLD_UPDATE_STATUS);
+ $xoopsTpl->assign('lang_installdate', _AM_SMALLWORLD_INSTALLDATE);
+ //$xoopsTpl->assign('installversion', $installversion);
+ //$xoopsTpl->assign('installdate', $installdate);
+ //$xoopsTpl->assign('installversion_status',$installCheck);
+ //$xoopsTpl->display(XOOPS_ROOT_PATH .'/modules/smallworld/templates/admin_moduleinfo.html');
-$xoopsTpl->assign(
- 'lang_installversion_status',
- _AM_SMALLWORLD_UPDATE_STATUS
-);
-$xoopsTpl->assign(
- 'lang_installdate',
- _AM_SMALLWORLD_INSTALLDATE
-);
-
-// AdminModule assignments
+//-----------------------
+
$indexAdmin->addInfoBox(_AM_SMALLWORLD_MODULEINFO);
+$indexAdmin->addInfoBoxLine(_AM_SMALLWORLD_MODULEINFO, "<class='smallworldadmin'>"._AM_SMALLWORLD_MODULEINSTALL." : %s</br>",$installversion,'Green','default');
+$indexAdmin->addInfoBoxLine(_AM_SMALLWORLD_MODULEINFO, "<class='smallworldadmin'>"._AM_SMALLWORLD_INSTALLDATE.": %s",$installdate,'Green','default');
+$indexAdmin->addInfoBoxLine(_AM_SMALLWORLD_MODULEINFO, "<class='smallworldadmin'>"."%s",$installCheck,'Green','default');
+
$indexAdmin->addInfoBox(_AM_SMALLWORLD_USERSTATS);
+$indexAdmin->addInfoBoxLine( _AM_SMALLWORLD_USERSTATS, "<class='smallworldadmin'>"._AM_SMALLWORLD_DATEOFFIRSTMESSAGE." : %s</br>",$dateoffirstmessage,'Green','default');
+$indexAdmin->addInfoBoxLine( _AM_SMALLWORLD_USERSTATS, "<class='smallworldadmin'>"._AM_SMALLWORLD_TOTALUSERS." : %s</br>",$sumallusers, 'Red','default');
-$indexAdmin->addInfoBoxLine(
- _AM_SMALLWORLD_MODULEINFO,
- "<class='smallworldadmin'>"._AM_SMALLWORLD_MODULEINSTALL." : %s</br>",
- $installversion,
- 'Green',
- 'default'
-);
-
-$indexAdmin->addInfoBoxLine(
- _AM_SMALLWORLD_MODULEINFO,
- "<class='smallworldadmin'>"._AM_SMALLWORLD_INSTALLDATE.": %s",
- $installdate,
- 'Green',
- 'default'
-);
-
-$indexAdmin->addInfoBoxLine(
- _AM_SMALLWORLD_MODULEINFO,
- "<class='smallworldadmin'>"."%s",
- $installCheck,
- 'Green',
- 'default'
-);
-
-$indexAdmin->addInfoBoxLine(
- _AM_SMALLWORLD_USERSTATS,
- "<class='smallworldadmin'>"
- . _AM_SMALLWORLD_DATEOFFIRSTMESSAGE." : %s</br>",
- $dateoffirstmessage,
- 'Green',
- 'default'
-);
-
-$indexAdmin->addInfoBoxLine(
- _AM_SMALLWORLD_USERSTATS,
- "<class='smallworldadmin'>"
- . _AM_SMALLWORLD_TOTALUSERS." : %s</br>",
- $sumallusers,
- 'Red',
- 'default'
-);
-
if ($avgperday > 0) {
- $indexAdmin->addInfoBoxLine(
- _AM_SMALLWORLD_USERSTATS,
- "<class='smallworldadmin'>"
- . _AM_SMALLWORLD_AVERAGEMSGPERDAY." : %s</br>",
- $avgperday,
- 'Red',
- 'default'
- );
+ $indexAdmin->addInfoBoxLine( _AM_SMALLWORLD_USERSTATS, "<class='smallworldadmin'>"._AM_SMALLWORLD_AVERAGEMSGPERDAY." : %s</br>", $avgperday, 'Red','default');
}
-if ($matCnt != 0) {
- $indexAdmin->addInfoBoxLine(
- _AM_SMALLWORLD_USERSTATS,
- "<p class='smallworldadmin'>"
- . _AM_SMALLWORLD_TOPCHATTERS_TODAY." : %s</p>",
- $mat,
- 'Red',
- 'default'
- );
+if ($mat_cnt != 0 ) {
+ $indexAdmin->addInfoBoxLine( _AM_SMALLWORLD_USERSTATS, "<p class='smallworldadmin'>"._AM_SMALLWORLD_TOPCHATTERS_TODAY." : %s</p>", $mat, 'Red','default');
}
-if ($maCnt != 0) {
- $indexAdmin->addInfoBoxLine(
- _AM_SMALLWORLD_USERSTATS,
- "<p class='smallworldadmin'>"
- . _AM_SMALLWORLD_TOPCHATTERS." : %s</p>",
- $ma,
- 'Red',
- 'default'
- );
+if ($ma_cnt != 0 ) {
+ $indexAdmin->addInfoBoxLine( _AM_SMALLWORLD_USERSTATS, "<p class='smallworldadmin'>"._AM_SMALLWORLD_TOPCHATTERS." : %s</p>", $ma, 'Red','default');
}
-
-if ($topCnt != 0) {
- $indexAdmin->addInfoBoxLine(
- _AM_SMALLWORLD_USERSTATS,
- "<p class='smallworldadmin'>"
- . _AM_SMALLWORLD_TOPRATEDUSERS." : %s</p>",
- $top,
- 'Red',
- 'default'
- );
+if ($top_cnt != 0 ) {
+ $indexAdmin->addInfoBoxLine( _AM_SMALLWORLD_USERSTATS, "<p class='smallworldadmin'>"._AM_SMALLWORLD_TOPRATEDUSERS." : %s</p>", $top, 'Red','default');
}
-if ($lowCnt != 0) {
- $indexAdmin->addInfoBoxLine(
- _AM_SMALLWORLD_USERSTATS,
- "<p class='smallworldadmin'>"
- . _AM_SMALLWORLD_BOTTOMRATEDUSERS." : %s</p>",
- $low,
- 'Red',
- 'default'
- );
+if ($low_cnt != 0 ) {
+$indexAdmin->addInfoBoxLine( _AM_SMALLWORLD_USERSTATS, "<p class='smallworldadmin'>"._AM_SMALLWORLD_BOTTOMRATEDUSERS." : %s</p>", $low, 'Red','default');
}
-echo $indexAdmin->addNavigation('index.php');
-echo $indexAdmin->renderIndex();
-require_once "admin_footer.php";
\ No newline at end of file
+ echo $indexAdmin->addNavigation('index.php');
+ echo $indexAdmin->renderIndex();
+include "admin_footer.php";
+?>
\ No newline at end of file
Modified: XoopsModules/smallworld/trunk/smallworld/admin/main.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/admin/main.php 2012-02-07 21:12:44 UTC (rev 8904)
+++ XoopsModules/smallworld/trunk/smallworld/admin/main.php 2012-02-07 21:57:57 UTC (rev 8905)
@@ -1,61 +1,60 @@
<?php
/**
* 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.
+* 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
-* @packet: Modules
-* @sub-packet: Smallworld
-* @since: Xoops 2.5.4
-* @Author: Michael Albertsen (http://culex.dk) <cu...@cu...>
-* @copyright: 2011 Culex
-* @Last committed: $Revision$
-* @Last changed by: $Author$
-* @Last changed date: $Date$
-* @ID: $Id$
+* @copyright: The XOOPS Project http://sourceforge.net/projects/xoops/
+* @license: http://www.fsf.org/copyleft/gpl.html GNU public license
+* @module: Smallworld
+* @Author: Michael Albertsen (http://culex.dk) <cu...@cu...>
+* @copyright: 2011 Culex
+* @Repository path: $HeadURL$
+* @Last committed: $Revision$
+* @Last changed by: $Author$
+* @Last changed date: $Date$
+* @ID: $Id$
**/
require_once 'admin_header.php';
require_once '../../../include/cp_header.php';
-require_once XOOPS_ROOT_PATH . "/modules/smallworld/include/functions.php";
-require_once XOOPS_ROOT_PATH
- . "/modules/smallworld/class/class_collector.php";
+include_once(XOOPS_ROOT_PATH."/modules/smallworld/include/functions.php");
+include_once(XOOPS_ROOT_PATH."/modules/smallworld/class/class_collector.php");
+
require_once XOOPS_ROOT_PATH . '/class/template.php';
-global $xoopsConfig, $xoTheme, $xoopsModule;
+if (!isset($xoopsTpl)) {$xoopsTpl = new XoopsTpl();}
+$xoopsTpl->xoops_setCaching(0);
-if (!isset($xoopsTpl)) {
- $xoopsTpl = new XoopsTpl();
-}
-$xoopsTpl->caching = 0;
-
xoops_cp_header();
+if (isset($_POST['xim_admin_message'])) {$_POST['xim_admin_message'] = '';}
+
+$admin = new SmallworldAdmin();
+$tpl = new XoopsTpl();
+
$ai = array();
$ani = array();
// --------------- First tab in admin ---------------
// Find oldest message and apply to template
-$dateoffirstmessage = date('d-m-Y H:i:s', $admin->oldestMsg());
+$dateoffirstmessage = date('d-m-Y H:i:s',$admin->oldestMsg());
// Get days number
$totaldays = $admin->CountDays();
// get average messages per day
-$avgperday = $admin->AvgMsgDay($totaldays);
+$avgperday = $admin->AvgMsgDay ($totaldays);
// XIM version number
-$installversion = $admin->ModuleInstallVersion();
+$installversion = $admin->ModuleInstallVersion ();
// XIM install date
-$installdate = $admin->ModuleInstallDate();
+$installdate = $admin->ModuleInstallDate ();
//check current version of XIM, return desc,link,version if new available
-$installCheck = $admin->doCheckUpdate();
+$installCheck = $admin->doCheckUpdate ();
// Count members using XIM
-$sumallusers = $admin->TotalUsers();
+$sumallusers = $admin->TotalUsers ();
// Find list of most active users (total)
$admin->mostactiveusers_allround();
// Find list of most active users (24 hours)
@@ -67,196 +66,122 @@
// FInd list of worst rated users overall
$admin->topratedusers('down');
-$allusersInspect = $admin->getAllUsers('yes');
-if (!empty($allusersInspect)) {
- foreach ($allusersInspect as $data) {
- $ai['id'] = $data['id'];
- $ai['userid'] = $data['userid'];
- $ai['username'] = $data['username'];
- $ai['realname'] = $data['realname'];
- $ai['userimage'] = smallworld_getAvatarLink(
- $data['userid'], $data['userimage']
- );
- $ai['avatar_size'] = getimagesize($ai['userimage']);
- $ai['avatar_highwide'] = smallworld_imageResize(
- $ai['avatar_size'][0], $ai['avatar_size'][1], 50
- );
- $ai['ip'] = $data['ip'];
- $ai['complaint'] = $data['complaint'];
- $ai['inspect_start'] = $data['inspect_start'];
- $ai['inspect_stop'] = $data['inspect_stop'];
- $ai['userinspect_timetotal'] = ($data['inspect_start'] +
- $data['inspect_stop']) - time();
- $xoopsTpl->append('allusersinspect', $ai);
- }
-}
-$xoopsTpl->assign('allusersinspectcounter', count($ai));
+$allusers_inspect = $admin->getAllUsers('yes');
+ if (!empty($allusers_inspect)) {
+ foreach ($allusers_inspect as $data) {
+ $ai['id'] = $data['id'];
+ $ai['userid'] = $data['userid'];
+ $ai['username'] = $data['username'];
+ $ai['realname'] = $data['realname'];
+ $ai['userimage'] = smallworld_getAvatarLink ($data['userid'],$data['userimage']);
+ $ai['avatar_size'] = getimagesize($ai['userimage']);
+ $ai['avatar_highwide'] = smallworld_imageResize($ai['avatar_size'][0], $ai['avatar_size'][1], 50);
+ $ai['ip'] = $data['ip'];
+ $ai['complaint'] = $data['complaint'];
+ $ai['inspect_start'] = $data['inspect_start'];
+ $ai['inspect_stop'] = $data['inspect_stop'];
+ $ai['userinspect_timetotal'] = ($data['inspect_start'] + $data['inspect_stop'])-time();
+ $xoopsTpl->append('allusersinspect', $ai);
+ }
+ }
+ $xoopsTpl->assign('allusersinspectcounter',count($ai));
-$allusersNoinspect = $admin->getAllUsers('no');
-if (!empty($allusersNoinspect)) {
- foreach ($allusersNoinspect as $data) {
- $ani['id'] = $data['id'];
- $ani['userid'] = $data['userid'];
- $ani['username'] = $data['username'];
- $ani['realname'] = $data['realname'];
- $ani['userimage'] = smallworld_getAvatarLink(
- $data['userid'], $data['userimage']
- );
- $ani['avatar_size'] = getimagesize($ani['userimage']);
- $ani['avatar_highwide'] = smallworld_imageResize(
- $ani['avatar_size'][0], $ani['avatar_size'][1], 50
- );
- $ani['ip'] = $data['ip'];
- $ani['complaint'] = $data['complaint'];
- $ani['inspect_start'] = '';
- $ani['inspect_stop'] = '';
- $ani['userinspect_timetotal'] = '';
- $xoopsTpl->append('allusersnoinspect', $ani);
- }
-}
-$xoopsTpl->assign('allusersnoinspectcounter', count($ani));
+$allusers_noinspect = $admin->getAllUsers('no');
+ if (!empty($allusers_noinspect)) {
+ foreach ($allusers_noinspect as $data) {
+ $ani['id'] = $data['id'];
+ $ani['userid'] = $data['userid'];
+ $ani['username'] = $data['username'];
+ $ani['realname'] = $data['realname'];
+ $ani['userimage'] = smallworld_getAvatarLink ($data['userid'],$data['userimage']);
+ $ani['avatar_size'] = getimagesize($ani['userimage']);
+ $ani['avatar_highwide'] = smallworld_imageResize($ani['avatar_size'][0], $ani['avatar_size'][1], 50);
+ $ani['ip'] = $data['ip'];
+ $ani['complaint'] = $data['complaint'];
+ $ani['inspect_start'] = '';
+ $ani['inspect_stop'] = '';
+ $ani['userinspect_timetotal'] = '';
+ $xoopsTpl->append('allusersnoinspect', $ani);
+ }
+ }
+ $xoopsTpl->assign('allusersnoinspectcounter',count($ani));
// ---------------- end of tabs ---------------- //
// template assignments
-$xoopsTpl->assign('lang_statistics', _AM_SMALLWORLD_STATISTICS_TITLE);
-$xoopsTpl->assign('lang_moduleinfo', _AM_SMALLWORLD_MODULEINFO);
-$xoopsTpl->assign('lang_userstats', _AM_SMALLWORLD_USERSTATS);
-$xoopsTpl->assign('lang_installversion', _AM_SMALLWORLD_MODULEINSTALL);
-$xoopsTpl->assign('lang_installdate', _AM_SMALLWORLD_INSTALLDATE);
-$xoopsTpl->assign('lang_totalusers', _AM_SMALLWORLD_TOTALUSERS);
-$xoopsTpl->assign('lang_topchatters', _AM_SMALLWORLD_TOPCHATTERS);
-$xoopsTpl->assign('lang_toprated', _AM_SMALLWORLD_TOPRATEDUSERS);
-$xoopsTpl->assign('lang_bottomrated', _AM_SMALLWORLD_BOTTOMRATEDUSERS);
-$xoopsTpl->assign('lang_useradmin', _AM_SMALLWORLD_USERADMIN_TITLE);
-$xoopsTpl->assign('lang_help', _AM_SMALLWORLD_HELP);
-$xoopsTpl->assign('lang_prefs', _MI_SYSTEM_ADMENU6);
-$xoopsTpl->assign('lang_installversion_status', _AM_SMALLWORLD_UPDATE_STATUS);
-$xoopsTpl->assign('lang_averagemsgperday', _AM_SMALLWORLD_AVERAGEMSGPERDAY);
-$xoopsTpl->assign('lang_topchatterstoday', _AM_SMALLWORLD_TOPCHATTERS_TODAY);
-
-// help file from admin
-$xoopsTpl->assign('lang_hlp_about', _AM_SMALLWORLD_HELP_ABOUT);
-$xoopsTpl->assign('lang_hlp_preface', _AM_SMALLWORLD_HELP_PREFACE);
-$xoopsTpl->assign('lang_hlp_requirements', _AM_SMALLWORLD_HELP_REQUIREMENTS);
-$xoopsTpl->assign('lang_hlp_recommended', _AM_SMALLWORLD_HELP_RECOMMENDED);
-$xoopsTpl->assign('lang_hlp_firsttime', _AM_SMALLWORLD_HELP_FIRSTTIMEINSTALL);
-$xoopsTpl->assign('lang_hlp_upgrading', _AM_SMALLWORLD_HELP_UPGRADING);
-$xoopsTpl->assign('lang_hlp_faq_t', _AM_SMALLWORLD_HELP_HEADER_FAQ);
-$xoopsTpl->assign('lang_hlp_commen1', _AM_SMALLWORLD_HELP_COMMENPROBLEMS1);
-$xoopsTpl->assign('lang_hlp_contacts_t', _AM_SMALLWORLD_HELP_HEADER_CONTACTS);
-$xoopsTpl->assign('lang_hlp_otherhelp', _AM_SMALLWORLD_HELP_OTHERHELP);
-$xoopsTpl->assign('installversion', $installversion);
-$xoopsTpl->assign('installdate', $installdate);
-$xoopsTpl->assign('installversion_status', $installCheck);
-$xoopsTpl->assign('dateoffirstmessage', $dateoffirstmessage);
-$xoopsTpl->assign('totalusers', $sumallusers);
-$xoopsTpl->assign('averagemsgperday', $avgperday);
-
-$xoopsTpl->assign(
- 'lang_hlp_upgrading_t',
- _AM_SMALLWORLD_HELP_HEADER_UPGRADING
-);
-
-$xoopsTpl->assign(
- 'lang_dateoffirstmessage',
- _AM_SMALLWORLD_DATEOFFIRSTMESSAGE
-);
-
-$xoopsTpl->assign(
- 'lang_hlp_hostedplatform_t',
- _AM_SMALLWORLD_HELP_HEADER_HOSTED_PLATFORM
-);
-
-$xoopsTpl->assign(
- 'lang_hlp_installation_t',
- _AM_SMALLWORLD_HELP_HEADER_INSTALLATION
-);
-
-$xoopsTpl->assign(
- 'lang_hlp_requirements_t',
- _AM_SMALLWORLD_HELP_HEADER_REQUIREMENTS
-);
-
-$xoopsTpl->assign(
- 'lang_hlp_recommended_t',
- _AM_SMALLWORLD_HELP_HEADER_RECOMMENDED
-);
-
-$xoopsTpl->assign(
- 'lang_hlp_commen1_t',
- _AM_SMALLWORLD_HELP_HEADER_COMMENPROBLEMS1
-);
-
-$xoopsTpl->assign(
- 'lang_hlp_hostedplatform',
- _AM_SMALLWORLD_HELP_HOSTED_PLATFORM
-);
-
-$xoopsTpl->assign(
- 'lang_prefslink',
- "<a href='../../system/admin.php?fct=preferences&op=showmod&mod="
- . $xoopsModule->getVar('mid') . "'>"
- . _MI_SYSTEM_ADMENU6 . "</a>"
-);
-
-$xoopsTpl->display('db:smallworld_admin.html');
-
-//Check Language
-$lang = $xoopsConfig['language'];
-
-// GET various variables from language folder
-if (file_exists(
- XOOPS_ROOT_PATH
- . '/modules/smallworld/language/js/'. $lang . '/variables.js'
-)) {
- $xoTheme->addScript(
- XOOPS_URL.'/modules/smallworld/language/'.$lang.'/js/variables.js'
- );
-} else {
- $xoTheme->addScript(
- XOOPS_URL.'/modules/smallworld/language/english/js/variables.js'
- );
-}
-
-$adminscript = <<<SCRIPT
- var smallworld_url = "XOOPS_URL/modules/smallworld/";
- var $ = jQuery();
+ // tab titles
+ $xoopsTpl->assign('lang_statistics', _AM_SMALLWORLD_STATISTICS_TITLE);
+ $xoopsTpl->assign('lang_moduleinfo', _AM_SMALLWORLD_MODULEINFO);
+ $xoopsTpl->assign('lang_userstats', _AM_SMALLWORLD_USERSTATS);
+ $xoopsTpl->assign('lang_installversion', _AM_SMALLWORLD_MODULEINSTALL);
+ $xoopsTpl->assign('lang_installversion_status', _AM_SMALLWORLD_UPDATE_STATUS);
+ $xoopsTpl->assign('lang_installdate', _AM_SMALLWORLD_INSTALLDATE);
+ $xoopsTpl->assign('lang_dateoffirstmessage', _AM_SMALLWORLD_DATEOFFIRSTMESSAGE);
+ $xoopsTpl->assign('lang_totalusers', _AM_SMALLWORLD_TOTALUSERS);
+ $xoopsTpl->assign('lang_averagemsgperday', _AM_SMALLWORLD_AVERAGEMSGPERDAY);
+ $xoopsTpl->assign('lang_topchatters',_AM_SMALLWORLD_TOPCHATTERS);
+ $xoopsTpl->assign('lang_topchatterstoday',_AM_SMALLWORLD_TOPCHATTERS_TODAY);
+ $xoopsTpl->assign('lang_toprated',_AM_SMALLWORLD_TOPRATEDUSERS);
+ $xoopsTpl->assign('lang_bottomrated',_AM_SMALLWORLD_BOTTOMRATEDUSERS);
+ $xoopsTpl->assign('lang_useradmin',_AM_SMALLWORLD_USERADMIN_TITLE);
+ $xoopsTpl->assign('lang_help',_AM_SMALLWORLD_HELP);
+ $xoopsTpl->assign('lang_prefs',_MI_SYSTEM_ADMENU6);
+ $xoopsTpl->assign('lang_prefslink',"<a href='../../system/admin.php?fct=preferences&op=showmod&mod=".$xoopsModule ->getVar('mid')."'>"._MI_SYSTEM_ADMENU6."</a>");
+
+ // help file from admin
+ $xoopsTpl->assign('lang_hlp_about',_AM_SMALLWORLD_HELP_ABOUT);
+ $xoopsTpl->assign('lang_hlp_preface',_AM_SMALLWORLD_HELP_PREFACE);
+ $xoopsTpl->assign('lang_hlp_requirements_t',_AM_SMALLWORLD_HELP_HEADER_REQUIREMENTS);
+ $xoopsTpl->assign('lang_hlp_requirements',_AM_SMALLWORLD_HELP_REQUIREMENTS);
+ $xoopsTpl->assign('lang_hlp_recommended_t',_AM_SMALLWORLD_HELP_HEADER_RECOMMENDED);
+ $xoopsTpl->assign('lang_hlp_recommended',_AM_SMALLWORLD_HELP_RECOMMENDED);
+ $xoopsTpl->assign('lang_hlp_installation_t',_AM_SMALLWORLD_HELP_HEADER_INSTALLATION);
+ $xoopsTpl->assign('lang_hlp_firsttime',_AM_SMALLWORLD_HELP_FIRSTTIMEINSTALL);
+ $xoopsTpl->assign('lang_hlp_hostedplatform_t',_AM_SMALLWORLD_HELP_HEADER_HOSTED_PLATFORM);
+ $xoopsTpl->assign('lang_hlp_hostedplatform',_AM_SMALLWORLD_HELP_HOSTED_PLATFORM);
+ $xoopsTpl->assign('lang_hlp_upgrading_t',_AM_SMALLWORLD_HELP_HEADER_UPGRADING);
+ $xoopsTpl->assign('lang_hlp_upgrading',_AM_SMALLWORLD_HELP_UPGRADING);
+ $xoopsTpl->assign('lang_hlp_faq_t',_AM_SMALLWORLD_HELP_HEADER_FAQ);
+ $xoopsTpl->assign('lang_hlp_commen1_t',_AM_SMALLWORLD_HELP_HEADER_COMMENPROBLEMS1);
+ $xoopsTpl->assign('lang_hlp_commen1',_AM_SMALLWORLD_HELP_COMMENPROBLEMS1);
+ $xoopsTpl->assign('lang_hlp_contacts_t',_AM_SMALLWORLD_HELP_HEADER_CONTACTS);
+ $xoopsTpl->assign('lang_hlp_otherhelp',_AM_SMALLWORLD_HELP_OTHERHELP);
+ $xoopsTpl->assign('installversion', $installversion);
+ $xoopsTpl->assign('installdate', $installdate);
+ $xoopsTpl->assign('installversion_status',$installCheck);
+ $xoopsTpl->assign('dateoffirstmessage', $dateoffirstmessage);
+ $xoopsTpl->assign('totalusers', $sumallusers);
+ $xoopsTpl->assign('averagemsgperday', $avgperday);
+ $xoopsTpl->display('db:smallworld_admin.html');
+
+ global $xoTheme;
+ //Check Language
+ $lang = $xoopsConfig['language'];
+ // GET various variables from language folder
+ if ( file_exists(XOOPS_ROOT_PATH.'/modules/smallworld/language/js/'.$lang.'/variables.js')) {
+ $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/language/'.$lang.'/js/variables.js');
+ } else {
+ $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/language/english/js/variables.js');
+ }
+
+$adminscript= <<<SCRIPT
+ var smallworld_url="XOOPS_URL/modules/smallworld/";
+ var $ = jQuery();
SCRIPT;
-$xoTheme->addStyleSheet('modules/smallworld/css/SmallworldAdmin.css');
-$xoTheme->addScript(XOOPS_URL.'/browse.php?Frameworks/jquery/jquery.js');
-$xoTheme->addScript(
- XOOPS_URL.'/modules/smallworld/js/jquery-ui-1.8.11.custom.js'
-);
-$xoTheme->addScript('modules/smallworld/js/smallworld_tabs.js');
-$xoTheme->addScript('', '', $adminscript);
-$xoTheme->addScript(XOOPS_URL . '/modules/smallworld/js/jquery.form.js');
-$xoTheme->addScript(XOOPS_URL . '/modules/smallworld/js/jquery.countdown.js');
-
-if (file_exists(
- XOOPS_ROOT_PATH . '/modules/smallworld/language/js/'
- . $lang.'/jquery.ui.datepicker-language.js'
-)) {
- $xoTheme->addScript(
- XOOPS_URL.'/modules/smallworld/language/'
- . $lang . '/js/jquery.ui.datepicker-language.js'
- );
- $xoTheme->addScript(
- XOOPS_URL.'/modules/smallworld/language/'
- . $lang.'/js/jquery.countdown.js'
- );
-} else {
- $xoTheme->addScript(
- XOOPS_URL
- . '/m...
[truncated message content] |
|
From: <dj...@us...> - 2012-02-07 21:12:50
|
Revision: 8904
http://xoops.svn.sourceforge.net/xoops/?rev=8904&view=rev
Author: djculex
Date: 2012-02-07 21:12:44 +0000 (Tue, 07 Feb 2012)
Log Message:
-----------
New docs
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/language/english/admin.php
XoopsModules/smallworld/trunk/smallworld/language/english/main.php
XoopsModules/smallworld/trunk/smallworld/language/english/modinfo.php
Modified: XoopsModules/smallworld/trunk/smallworld/language/english/admin.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/english/admin.php 2012-02-07 21:08:59 UTC (rev 8903)
+++ XoopsModules/smallworld/trunk/smallworld/language/english/admin.php 2012-02-07 21:12:44 UTC (rev 8904)
@@ -1,22 +1,24 @@
<?php
/**
* 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.
+* 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
-* @module: Smallworld
-* @Author: Michael Albertsen (http://culex.dk) <cu...@cu...>
-* @copyright: 2011 Culex
-* @Repository path: $HeadURL$
-* @Last committed: $Revision$
-* @Last changed by: $Author$
-* @Last changed date: $Date$
-* @ID: $Id$
+* @copyright: The XOOPS Project http://sourceforge.net/projects/xoops/
+* @license: http://www.fsf.org/copyleft/gpl.html GNU public license
+* @packet: Modules
+* @sub-packet: Smallworld
+* @since: Xoops 2.5.4
+* @Author: Michael Albertsen (http://culex.dk) <cu...@cu...>
+* @copyright: 2011 Culex
+* @Last committed: $Revision$
+* @Last changed by: $Author$
+* @Last changed date: $Date$
+* @ID: $Id$
**/
Modified: XoopsModules/smallworld/trunk/smallworld/language/english/main.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/english/main.php 2012-02-07 21:08:59 UTC (rev 8903)
+++ XoopsModules/smallworld/trunk/smallworld/language/english/main.php 2012-02-07 21:12:44 UTC (rev 8904)
@@ -1,22 +1,24 @@
<?php
/**
* 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.
+* 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
-* @module: Smallworld
-* @Author: Michael Albertsen (http://culex.dk) <cu...@cu...>
-* @copyright: 2011 Culex
-* @Repository path: $HeadURL$
-* @Last committed: $Revision$
-* @Last changed by: $Author$
-* @Last changed date: $Date$
-* @ID: $Id$
+* @copyright: The XOOPS Project http://sourceforge.net/projects/xoops/
+* @license: http://www.fsf.org/copyleft/gpl.html GNU public license
+* @packet: Modules
+* @sub-packet: Smallworld
+* @since: Xoops 2.5.4
+* @Author: Michael Albertsen (http://culex.dk) <cu...@cu...>
+* @copyright: 2011 Culex
+* @Last committed: $Revision$
+* @Last changed by: $Author$
+* @Last changed date: $Date$
+* @ID: $Id$
**/
/*----------------- Menu items ---------------*/
Modified: XoopsModules/smallworld/trunk/smallworld/language/english/modinfo.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/english/modinfo.php 2012-02-07 21:08:59 UTC (rev 8903)
+++ XoopsModules/smallworld/trunk/smallworld/language/english/modinfo.php 2012-02-07 21:12:44 UTC (rev 8904)
@@ -1,22 +1,24 @@
<?php
/**
* 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.
+* 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
-* @module: Smallworld
-* @Author: Michael Albertsen (http://culex.dk) <cu...@cu...>
-* @copyright: 2011 Culex
-* @Repository path: $HeadURL$
-* @Last committed: $Revision$
-* @Last changed by: $Author$
-* @Last changed date: $Date$
-* @ID: $Id$
+* @copyright: The XOOPS Project http://sourceforge.net/projects/xoops/
+* @license: http://www.fsf.org/copyleft/gpl.html GNU public license
+* @packet: Modules
+* @sub-packet: Smallworld
+* @since: Xoops 2.5.4
+* @Author: Michael Albertsen (http://culex.dk) <cu...@cu...>
+* @copyright: 2011 Culex
+* @Last committed: $Revision$
+* @Last changed by: $Author$
+* @Last changed date: $Date$
+* @ID: $Id$
**/
define("_MI_SMALLWORLD_MODULE_NAME","Smallworld");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-02-07 21:09:07
|
Revision: 8903
http://xoops.svn.sourceforge.net/xoops/?rev=8903&view=rev
Author: djculex
Date: 2012-02-07 21:08:59 +0000 (Tue, 07 Feb 2012)
Log Message:
-----------
Standardizing and shortening lines
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/include/arrays.php
XoopsModules/smallworld/trunk/smallworld/include/functions.php
XoopsModules/smallworld/trunk/smallworld/include/getSelects.php
Modified: XoopsModules/smallworld/trunk/smallworld/include/arrays.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/include/arrays.php 2012-02-07 20:07:12 UTC (rev 8902)
+++ XoopsModules/smallworld/trunk/smallworld/include/arrays.php 2012-02-07 21:08:59 UTC (rev 8903)
@@ -1,44 +1,71 @@
<?php
/**
* 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.
+* 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
-* @module: Smallworld
-* @Author: Michael Albertsen (http://culex.dk) <cu...@cu...>
-* @copyright: 2011 Culex
-* @Repository path: $HeadURL$
-* @Last committed: $Revision$
-* @Last changed by: $Author$
-* @Last changed date: $Date$
-* @ID: $Id$
+* @copyright: The XOOPS Project http://sourceforge.net/projects/xoops/
+* @license: http://www.fsf.org/copyleft/gpl.html GNU public license
+* @packet: Modules
+* @sub-packet: Smallworld
+* @since: Xoops 2.5.4
+* @Author: Michael Albertsen (http://culex.dk) <cu...@cu...>
+* @copyright: 2011 Culex
+* @Last committed: $Revision$
+* @Last changed by: $Author$
+* @Last changed date: $Date$
+* @ID: $Id$
**/
// Array for gender
-$arr0 = array(_SMALLWORLD_CHOOSE,_SMALLWORLD_WOMAN,_SMALLWORLD_MAN);
+$arr0 = array(_SMALLWORLD_CHOOSE, _SMALLWORLD_WOMAN, _SMALLWORLD_MAN);
// Array for "interested in gender(s)"
-$arr01 = array(_SMALLWORLD_WOMAN,_SMALLWORLD_MAN,_SMALLWORLD_BOTH,_SMALLWORLD_NONE);
+$arr01 = array(_SMALLWORLD_WOMAN, _SMALLWORLD_MAN,
+ _SMALLWORLD_BOTH, _SMALLWORLD_NONE);
// Array for marital status
-$arr02 = array(_SMALLWORLD_MARRIED,_SMALLWORLD_ENGAGED,_SMALLWORLD_SINGLE,_SMALLWORLD_RELATIONSHIP,_SMALLWORLD_RELATIONSHIP_OPEN,_SMALLWORLD_ITSCOMP);
+$arr02 = array(_SMALLWORLD_MARRIED, _SMALLWORLD_ENGAGED,
+ _SMALLWORLD_SINGLE, _SMALLWORLD_RELATIONSHIP,
+ _SMALLWORLD_RELATIONSHIP_OPEN,_SMALLWORLD_ITSCOMP);
// Array for searchin for
-$arr03 = array(_SMALLWORLD_FRIENDSHIP,_SMALLWORLD_DATING,_SMALLWORLD_ARELATIONSHIP,_SMALLWORLD_HANKYPANKY);
+$arr03 = array(_SMALLWORLD_FRIENDSHIP, _SMALLWORLD_DATING,
+ _SMALLWORLD_ARELATIONSHIP, _SMALLWORLD_HANKYPANKY);
// array politics
-$arr04 = array(_SMALLWORLD_PVLIBERAL,_SMALLWORLD_PLIBERAL,_SMALLWORLD_PMODERATE,_SMALLWORLD_PCONSERVATIVE,_SMALLWORLD_PVCONSERVATIVE,_SMALLWORLD_PLIBERTARIAN,_SMALLWORLD_POTHER);
-
+$arr04 = array(_SMALLWORLD_PVLIBERAL, _SMALLWORLD_PLIBERAL,
+ _SMALLWORLD_PMODERATE, _SMALLWORLD_PCONSERVATIVE,
+ _SMALLWORLD_PVCONSERVATIVE, _SMALLWORLD_PLIBERTARIAN,
+ _SMALLWORLD_POTHER);
+
// Array religions
-$arr05 = array(_SMALLWORLD_RCHRISTIANITY,_SMALLWORLD_RISLAM,_SMALLWORLD_RSECULAR,_SMALLWORLD_RHINDUISM,_SMALLWORLD_RCHINESETRAD,_SMALLWORLD_RBUDDHISM,_SMALLWORLD_RPRIMALIND,_SMALLWORLD_RAFRICANTRAD,_SMALLWORLD_RSIKHISM,_SMALLWORLD_RJUCHE,_SMALLWORLD_RSPIRITISM,_SMALLWORLD_RJUDAISM,_SMALLWORLD_RBAHAI,_SMALLWORLD_RJAINISM,_SMALLWORLD_RSHINTO,_SMALLWORLD_RCAODAI,_SMALLWORLD_RZOROASRIANISM,_SMALLWORLD_RTENRIKYO,_SMALLWORLD_RNEOPAGANISM,_SMALLWORLD_RUNITARIANUNIVERSALISM,_SMALLWORLD_RRASTA,_SMALLWORLD_RSCIENTOLOGY,_SMALLWORLD_ANCIENTALIENTHEORIST, _SMALLWORLD_ROTHER);
+$arr05 = array(_SMALLWORLD_RCHRISTIANITY, _SMALLWORLD_RISLAM,
+ _SMALLWORLD_RSECULAR, _SMALLWORLD_RHINDUISM,
+ _SMALLWORLD_RCHINESETRAD, _SMALLWORLD_RBUDDHISM,
+ _SMALLWORLD_RPRIMALIND, _SMALLWORLD_RAFRICANTRAD,
+ _SMALLWORLD_RSIKHISM, _SMALLWORLD_RJUCHE,
+ _SMALLWORLD_RSPIRITISM, _SMALLWORLD_RJUDAISM,
+ _SMALLWORLD_RBAHAI, _SMALLWORLD_RJAINISM,
+ _SMALLWORLD_RSHINTO, _SMALLWORLD_RCAODAI,
+ _SMALLWORLD_RZOROASRIANISM, _SMALLWORLD_RTENRIKYO,
+ _SMALLWORLD_RNEOPAGANISM, _SMALLWORLD_RUNITARIANUNIVERSALISM,
+ _SMALLWORLD_RRASTA, _SMALLWORLD_RSCIENTOLOGY,
+ _SMALLWORLD_ANCIENTALIENTHEORIST, _SMALLWORLD_ROTHER);
// Array Screen names
-$arr06 = array(_SMALLWORLD_SCREENNAME_AIM, _SMALLWORLD_SCREENNAME_FACEBOOK, _SMALLWORLD_SCREENNAME_GOOGLE, _SMALLWORLD_SCREENNAME_ICQ, _SMALLWORLD_SCREENNAME_SKYPE, _SMALLWORLD_SCREENNAME_TWITTER, _SMALLWORLD_SCREENNAME_MYSPACE, _SMALLWORLD_SCREENNAME_XOOPS, _SMALLWORLD_SCREENNAME_YAHOO, _SMALLWORLD_SCREENNAME_YOUTUBE);
+$arr06 = array(_SMALLWORLD_SCREENNAME_AIM, _SMALLWORLD_SCREENNAME_FACEBOOK,
+ _SMALLWORLD_SCREENNAME_GOOGLE, _SMALLWORLD_SCREENNAME_ICQ,
+ _SMALLWORLD_SCREENNAME_SKYPE, _SMALLWORLD_SCREENNAME_TWITTER,
+ _SMALLWORLD_SCREENNAME_MYSPACE, _SMALLWORLD_SCREENNAME_XOOPS,
+ _SMALLWORLD_SCREENNAME_YAHOO, _SMALLWORLD_SCREENNAME_YOUTUBE);
-$arr7 = array(_SMALLWORLD_KINDERGARDEN,_SMALLWORLD_NURSERY,_SMALLWORLD_ELEMSCHOOL,_SMALLWORLD_GRADUATESCHOOL,_SMALLWORLD_HIGHSCHOOL,_SMALLWORLD_JUNIORHIGH,_SMALLWORLD_JUNIORCOLLEGE,_SMALLWORLD_COLLEGE,_SMALLWORLD_TECNICAL,_SMALLWORLD_UNIVERSITY);
-?>
\ No newline at end of file
+$arr7 = array(_SMALLWORLD_KINDERGARDEN, _SMALLWORLD_NURSERY,
+ _SMALLWORLD_ELEMSCHOOL, _SMALLWORLD_GRADUATESCHOOL,
+ _SMALLWORLD_HIGHSCHOOL, _SMALLWORLD_JUNIORHIGH,
+ _SMALLWORLD_JUNIORCOLLEGE, _SMALLWORLD_COLLEGE,
+ _SMALLWORLD_TECNICAL, _SMALLWORLD_UNIVERSITY);
\ No newline at end of file
Modified: XoopsModules/smallworld/trunk/smallworld/include/functions.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/include/functions.php 2012-02-07 20:07:12 UTC (rev 8902)
+++ XoopsModules/smallworld/trunk/smallworld/include/functions.php 2012-02-07 21:08:59 UTC (rev 8903)
@@ -1,351 +1,452 @@
<?php
/**
* 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.
+* 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
-* @module: Smallworld
-* @Author: Michael Albertsen (http://culex.dk) <cu...@cu...>
-* @copyright: 2011 Culex
-* @Repository path: $HeadURL$
-* @Last committed: $Revision$
-* @Last changed by: $Author$
-* @Last changed date: $Date$
-* @ID: $Id$
+* @copyright: The XOOPS Project http://sourceforge.net/projects/xoops/
+* @license: http://www.fsf.org/copyleft/gpl.html GNU public license
+* @packet: Modules
+* @sub-packet: Smallworld
+* @since: Xoops 2.5.4
+* @Author: Michael Albertsen (http://culex.dk) <cu...@cu...>
+* @copyright: 2011 Culex
+* @Last committed: $Revision$
+* @Last changed by: $Author$
+* @Last changed date: $Date$
+* @ID: $Id$
**/
/*
Get array of timestamps based on the timetype configured in preferences
*/
-function SmallworldGetTimestampsToForm () {
- $timearray = array();
- $start = 1900;
- $end = date('Y');
- for ( $i=$start; $i <= $end; $i++) {
- $key = $i;
- $timearray[$key] = $i;
- }
- ksort($timearray);
- return $timearray;
+function SmallworldGetTimestampsToForm()
+{
+ $timearray = array();
+ $start = 1900;
+ $end = date('Y');
+ for ($i=$start; $i <= $end; $i++) {
+ $key = $i;
+ $timearray[$key] = $i;
+ }
+ ksort($timearray);
+ return $timearray;
}
// Clean vars or arrays
// If array check for magicQuotes.
// Pass string to Smallworld_cleanup_string
-function Smallworld_cleanup($text) {
- if (is_array($text)) {
- foreach ($text as $key => $value) {
- $text[$key] = Smallworld_cleanup_string($value);
- }
- } else {
- $text = Smallworld_cleanup_string($text);
- }
- return $text;
+function Smallworld_cleanup($text)
+{
+ if (is_array($text)) {
+ foreach ($text as $key => $value) {
+ $text[$key] = Smallworld_cleanup_string($value);
+ }
+ } else {
+ $text = Smallworld_cleanup_string($text);
+ }
+ return $text;
}
// Sanitize string
-function Smallworld_cleanup_string($text) {
+function Smallworld_cleanup_string($text)
+{
$text = htmlspecialchars($text, ENT_QUOTES);
$myts = MyTextSanitizer::getInstance();
- $text = $myts->displayTarea($text,1,1,1,1);
- $text = str_replace("\n\r","\n",$text);
- $text = str_replace("\r\n","\n",$text);
- $text = str_replace("\n","<br />",$text);
- $text = str_replace("\"","'",$text);
+ $text = $myts->displayTarea($text, 1, 1, 1, 1);
+ $text = str_replace("\n\r", "\n", $text);
+ $text = str_replace("\r\n", "\n", $text);
+ $text = str_replace("\n", "<br />", $text);
+ $text = str_replace("\"", "'", $text);
return $text;
}
// clean Array for mysql insertion
// or send string to Smallworld_sanitize_string
-function Smallworld_sanitize ($text) {
- if (is_array($text)) {
- foreach ($text as $key => $value) {
- $text[$key] = Smallworld_sanitize_string($value);
- }
- } else {
- $text = Smallworld_sanitize_string($text);
- }
- return $text;
+function Smallworld_sanitize($text)
+{
+ if (is_array($text)) {
+ foreach ($text as $key => $value) {
+ $text[$key] = Smallworld_sanitize_string($value);
+ }
+ } else {
+ $text = Smallworld_sanitize_string($text);
+ }
+ return $text;
}
-function Smallworld_sanitize_string ($value) {
- $myts = MyTextSanitizer::getInstance();
- if(get_magic_quotes_gpc()){
- $value = $myts->stripSlashesGPC($value);
- } else {
- $value = mysql_real_escape_string($value);
- }
- return $value;
+function Smallworld_sanitize_string($value)
+{
+ $myts = MyTextSanitizer::getInstance();
+ if (get_magic_quotes_gpc()) {
+ $value = $myts->stripSlashesGPC($value);
+ } else {
+ $value = mysql_real_escape_string($value);
+ }
+ return $value;
}
-function Smallworld_DateOfArray ($array) {
- $data = array();
- foreach ($array as $k => $v) {
- $data[$k] = strtotime($v);
- }
- return $data;
+function Smallworld_DateOfArray($array)
+{
+ $data = array();
+ foreach ($array as $k => $v) {
+ $data[$k] = strtotime($v);
+ }
+ return $data;
}
-function Smallworld_YearOfArray ($array) {
- $data = array();
- foreach ($array as $k => $v) {
- $data[$k] = $v;
- }
- return $data;
+function Smallworld_YearOfArray($array)
+{
+ $data = array();
+ foreach ($array as $k => $v) {
+ $data[$k] = $v;
+ }
+ return $data;
}
-function Smallworld_CreateIndexFiles ($folderUrl) {
- $myts =& MyTextSanitizer::getInstance();
- file_put_contents($folderUrl.'index.html', "<script>history.go(-1);</script>");
+function Smallworld_CreateIndexFiles($folderUrl)
+{
+ $myts =& MyTextSanitizer::getInstance();
+ file_put_contents(
+ $folderUrl . 'index.html', "<script>history.go(-1);</script>"
+ );
}
-function smallworld_ImplodeArray ($glue = ", ", $pieces) {
+function smallworld_ImplodeArray($glue = ", ", $pieces)
+{
return implode($glue, $pieces);
}
// recursively reduces deep arrays to single-dimensional arrays
// $preserve_keys: (0=>never, 1=>strings, 2=>always)
-function Smallworld_array_flatten($array, $preserve_keys = 1, &$newArray = Array()) {
- foreach ($array as $key => $child) {
- if (is_array($child)) {
- $newArray =& Smallworld_array_flatten($child, $preserve_keys, $newArray);
- } elseif ($preserve_keys + is_string($key) > 1) {
- $newArray[$key] = $child;
- } else {
- $newArray[] = $child;
- }
+function Smallworld_array_flatten($array, $preserve_keys = 1,
+ &$newArray = Array()
+)
+{
+ foreach ($array as $key => $child) {
+ if (is_array($child)) {
+ $newArray =& Smallworld_array_flatten(
+ $child, $preserve_keys, $newArray
+ );
+ } elseif ($preserve_keys + is_string($key) > 1) {
+ $newArray[$key] = $child;
+ } else {
+ $newArray[] = $child;
+ }
}
- return $newArray;
+ return $newArray;
}
// Returns age in years
// Input birthdate
// Requires php >= 5.3
-function Smallworld_Birthday($birth, $now = NULL){
+function Smallworld_Birthday($birth, $now = NULL)
+{
$now = new DateTime($now);
$birth = new DateTime($birth);
return $birth->diff($now)->format('%r%y');
}
-function smallworld_isset_or($check) {
+function smallworld_isset_or($check)
+{
global $xoopsDB,$xoopsUser;
- $query = "SELECT * FROM ".$xoopsDB->prefix('smallworld_user')." WHERE username = '".$check."'";
- $result=$xoopsDB->queryF($query);
- while ($row=$xoopsDB->fetchArray($result)) {
- if ($row['userid'] == '') {
- return false;
- } else {
- return $row['userid'];
- }
- }
+ $query = "SELECT * FROM "
+ . $xoopsDB->prefix('smallworld_user')
+ . " WHERE username = '".$check."'";
+ $result=$xoopsDB->queryF($query);
+ while ($row=$xoopsDB->fetchArray($result)) {
+ if ($row['userid'] == '') {
+ return false;
+ } else {
+ return $row['userid'];
+ }
+ }
}
//Srinivas Tamada http://9lessons.info
//Loading Comments link with load_updates.php
-function smallworld_time_stamp($session_time) {
- global $xoopsConfig;
-
- $time_difference = time() - $session_time ;
- $seconds = $time_difference ;
- $minutes = round($time_difference / 60 );
- $hours = round($time_difference / 3600 );
- $days = round($time_difference / 86400 );
- $weeks = round($time_difference / 604800 );
- $months = round($time_difference / 2419200 );
- $years = round($time_difference / 29030400 );
+function smallworld_time_stamp($sessionTime)
+{
+ global $xoopsConfig;
+ $timeDifference = time() - $sessionTime;
+ $seconds = $timeDifference;
+ $minutes = round($timeDifference / 60);
+ $hours = round($timeDifference / 3600);
+ $days = round($timeDifference / 86400);
+ $weeks = round($timeDifference / 604800);
+ $months = round($timeDifference / 2419200);
+ $years = round($timeDifference / 29030400);
- if($seconds <= 60) {
- $t = "$seconds"._SMALLWORLD_SECONDSAGO;
- } else if($minutes <=60) {
- if($minutes==1) {
- $t = _SMALLWORLD_ONEMINUTEAGO;
- }
- else {
- $t = "$minutes"._SMALLWORLD_MINUTESAGO;
- }
- } else if($hours <=24) {
- if($hours==1) {
- $t = _SMALLWORLD_ONEHOURAGO;
- } else {
- $t = "$hours"._SMALLWORLD_HOURSAGO;
- }
- } else if($days <=7) {
- if($days==1){
- $t = _SMALLWORLD_ONEDAYAGO;
- } else {
- $t = "$days"._SMALLWORLD_DAYSAGO;
- }
- } else if($weeks <=4) {
- if($weeks==1) {
- $t = _SMALLWORLD_ONEWEEKAGO;
- } else {
- $t = "$weeks"._SMALLWORLD_WEEKSAGO;
- }
- } else if($months <=12) {
- if($months==1) {
- $t = _SMALLWORLD_ONEMONTHAGO;
- } else {
- $t = "$months"._SMALLWORLD_MONTHSAGO;
- }
- } else {
- if($years==1) {
- $t = _SMALLWORLD_ONEYEARAGO;
- } else {
- $t = "$years"._SMALLWORLD_YEARSAGO;
- }
- }
- return $t;
+ if ($seconds <= 60) {
+ $t = "$seconds"._SMALLWORLD_SECONDSAGO;
+ } elseif ($minutes <= 60) {
+ if ($minutes == 1) {
+ $t = _SMALLWORLD_ONEMINUTEAGO;
+ } else {
+ $t = "$minutes"._SMALLWORLD_MINUTESAGO;
+ }
+ } elseif ($hours <= 24) {
+ if ($hours==1) {
+ $t = _SMALLWORLD_ONEHOURAGO;
+ } else {
+ $t = "$hours"._SMALLWORLD_HOURSAGO;
+ }
+ } elseif ($days <=7) {
+ if ($days == 1) {
+ $t = _SMALLWORLD_ONEDAYAGO;
+ } else {
+ $t = "$days"._SMALLWORLD_DAYSAGO;
+ }
+ } elseif ($weeks <= 4) {
+ if ($weeks==1) {
+ $t = _SMALLWORLD_ONEWEEKAGO;
+ } else {
+ $t = "$weeks"._SMALLWORLD_WEEKSAGO;
+ }
+ } elseif ($months <= 12) {
+ if ($months==1) {
+ $t = _SMALLWORLD_ONEMONTHAGO;
+ } else {
+ $t = "$months"._SMALLWORLD_MONTHSAGO;
+ }
+ } else {
+ if ($years==1) {
+ $t = _SMALLWORLD_ONEYEARAGO;
+ } else {
+ $t = "$years"._SMALLWORLD_YEARSAGO;
+ }
+ }
+ return $t;
}
// Return only url/link
// If url is image link return <img>
-function smallworld_tolink($text){
- $ext = substr($text,-4,4);
- $ext2 = substr($text,-5,5);
- if (in_array($ext,array('.jpg','.bmp','.gif','.png')) || in_array($ext2,array('.jpeg'))){
- $text = preg_replace('/(((f|ht){1}tp:\/\/)[-a-zA-Z0-9@:%_\+.~#?&\/\/=]+)/i',
- '<img class="smallworldAttImg" src="\\1"><a class="smallworldAttImgTxt" href="\\1">'._SMALLWORLD_CLICKIMAGETHUMB.' </a><br>', $text);
- $text = preg_replace('/(((f|ht){1}tps:\/\/)[-a-zA-Z0-9@:%_\+.~#?&\/\/=]+)/i',
- '<a href="\\1">lala</a>', $text);
- $text = preg_replace('/([[:space:]()[{}])(www.[-a-zA-Z0-9@:%_\+.~#?&\/\/=]+)/i',
- '\\1<img class="smallworldAttImg" src="//\\2"><a class="smallworldAttImgTxt" href="//\\2">'._SMALLWORLD_CLICKIMAGETHUMB.'</a><br>', $text);
- } else {
- $text = html_entity_decode($text);
- $text = " ".$text;
- $text = preg_replace('/(((f|ht){1}tp:\/\/)[-a-zA-Z0-9@:%_\+.~#?&\/\/=]+)/i',
- '<a href="\\1">\\1</a>', $text);
- $text = preg_replace('/(((f|ht){1}tps:\/\/)[-a-zA-Z0-9@:%_\+.~#?&\/\/=]+)/i',
- '<a href="\\1">\\1</a>', $text);
- $text = preg_replace('/([[:space:]()[{}])(www.[-a-zA-Z0-9@:%_\+.~#?&\/\/=]+)/i',
- '\\1<a href="http://\\2">\\2</a>', $text);
- $text = preg_replace('/([_\.0-9a-z-]+@([0-9a-z][0-9a-z-]+\.)+[a-z]{2,3})/i',
- '<a href="mailto:\\1">\\1</a>', $text);
- $myts = MyTextSanitizer::getInstance();
- $text = $myts->displayTarea($text,1,1,1,1);
- }
-
- return $text;
+function smallworld_tolink($text)
+{
+ $ext = substr($text, -4, 4);
+ $ext2 = substr($text, -5, 5);
+ if (in_array($ext, array('.jpg', '.bmp', '.gif', '.png'))
+ || in_array($ext2, array('.jpeg'))
+ ) {
+ $text = preg_replace(
+ '/(((f|ht){1}tp:\/\/)[-a-zA-Z0-9@:%_\+.~#?&\/\/=]+)/i',
+ '<img class="smallworldAttImg" src="\\1">'
+ . '<a class="smallworldAttImgTxt" href="\\1">'
+ . _SMALLWORLD_CLICKIMAGETHUMB
+ . ' </a><br>', $text
+ );
+ $text = preg_replace(
+ '/(((f|ht){1}tps:\/\/)[-a-zA-Z0-9@:%_\+.~#?&\/\/=]+)/i',
+ '<a href="\\1">lala</a>', $text
+ );
+ $text = preg_replace(
+ '/([[:space:]()[{}])(www.[-a-zA-Z0-9@:%_\+.~#?&\/\/=]+)/i',
+ '\\1<img class="smallworldAttImg" src="//\\2">'
+ . '<a class="smallworldAttImgTxt" href="//\\2">'
+ . _SMALLWORLD_CLICKIMAGETHUMB
+ . '</a><br>', $text
+ );
+ } else {
+ $text = html_entity_decode($text);
+ $text = " ".$text;
+ $text = preg_replace(
+ '/(((f|ht){1}tp:\/\/)[-a-zA-Z0-9@:%_\+.~#?&\/\/=]+)/i',
+ '<a href="\\1">\\1</a>', $text
+ );
+ $text = preg_replace(
+ '/(((f|ht){1}tps:\/\/)[-a-zA-Z0-9@:%_\+.~#?&\/\/=]+)/i',
+ '<a href="\\1">\\1</a>', $text
+ );
+ $text = preg_replace(
+ '/([[:space:]()[{}])(www.[-a-zA-Z0-9@:%_\+.~#?&\/\/=]+)/i',
+ '\\1<a href="http://\\2">\\2</a>', $text
+ );
+ $text = preg_replace(
+ '/([_\.0-9a-z-]+@([0-9a-z][0-9a-z-]+\.)+[a-z]{2,3})/i',
+ '<a href="mailto:\\1">\\1</a>',
+ $text
+ );
+ $myts = MyTextSanitizer::getInstance();
+ $text = $myts->displayTarea($text, 1, 1, 1, 1);
+ }
+ return $text;
}
-function Smallworld_stripWordsKeepUrl ($text) {
- preg_replace('/(((f|ht){1}tps:\/\/)[-a-zA-Z0-9@:%_\+.~#?&\/\/=]+)/i',
- '<div class=".embed"><a href="\\1">\\1</a></div>', $text);
- return $text;
+function Smallworld_stripWordsKeepUrl($text)
+{
+ preg_replace(
+ '/(((f|ht){1}tps:\/\/)[-a-zA-Z0-9@:%_\+.~#?&\/\/=]+)/i',
+ '<div class=".embed"><a href="\\1">\\1</a></div>',
+ $text
+ );
+ return $text;
}
-function Smallworld_sociallinks ($num, $name) {
- if ($num == 0) {
- $image = '<img title="Msn" id="Smallworld_socialnetworkimg" src="'.XOOPS_URL.'/modules/smallworld/images/socialnetworkicons/msn.png"/>';
- $link = '<a title="Msn" id="Smallworld_socialnetwork" target="_blank" href="http://members.msn.com/'.$name.'">';
- }
- if ($num == 1) {
- $image = '<img title="facebook" id="Smallworld_socialnetworkimg" src="'.XOOPS_URL.'/modules/smallworld/images/socialnetworkicons/facebook.png"/>';
- $link = '<a title="facebook" id="Smallworld_socialnetwork" target="_blank" href="http://www.facebook.com/'.$name.'">';
- }
- if ($num == 2) {
- $image = '<img title="GooglePlus" id="Smallworld_socialnetworkimg" src="'.XOOPS_URL.'/modules/smallworld/images/socialnetworkicons/googleplus.png"/>';
- $link = '<a title="GooglePlus" id="Smallworld_socialnetwork" target="_blank" href="https://plus.google.com/'.$name.'">';
- }
- if ($num == 3) {
- $image = '<img title="Icq" id="Smallworld_socialnetworkimg" src="'.XOOPS_URL.'/modules/smallworld/images/socialnetworkicons/icq.png"/>';
- $link = '<a title="icq" id="Smallworld_socialnetwork" target="_blank" href="http://www.icq.com/people/'.$name.'/">';
- }
- if ($num == 4) {
- $image = '<img title="Skype" id="Smallworld_socialnetworkimg" src="'.XOOPS_URL.'/modules/smallworld/images/socialnetworkicons/skype.png"/>';
- $link = '<a title="Skype" id="Smallworld_socialnetwork" target="_blank" href="skype:'.$name.'?userinfo">';
- }
- if ($num == 5) {
- $image = '<img title="Twitter" id="Smallworld_socialnetworkimg" src="'.XOOPS_URL.'/modules/smallworld/images/socialnetworkicons/twitter.png"/>';
- $link = '<a title="Twitter" id="Smallworld_socialnetwork" target="_blank" href="http://twitter.com/#!/'.$name.'">';
- }
- if ($num == 6) {
- $image = '<img title="MySpace" id="Smallworld_socialnetworkimg" src="'.XOOPS_URL.'/modules/smallworld/images/socialnetworkicons/myspace.png"/>';
- $link = '<a title="MySpace" id="Smallworld_socialnetwork" target="_blank" href="http://www.myspace.com/'.$name.'">';
- }
- if ($num == 7) {
- $image = '<img title="Xoops" id="Smallworld_socialnetworkimg" src="'.XOOPS_URL.'/modules/smallworld/images/socialnetworkicons/xoops.png"/>';
- $link = '<a title="Xoops" id="Smallworld_socialnetwork" target="_blank" href="http://xoops.org/modules/profile/userinfo.php?uid='.$name.'">';
- }
- if ($num == 8) {
- $image = '<img title="Yahoo Messenger" id="Smallworld_socialnetworkimg" src="'.XOOPS_URL.'/modules/smallworld/images/socialnetworkicons/yahoo.png"/>';
- $link = '<a title="Yahoo Messenger" id="Smallworld_socialnetwork" target="_blank" href="ymsgr:sendim?'.$name.'">';
- }
- if ($num == 9) {
- $image = '<img title="Youtube" id="Smallworld_socialnetworkimg" src="'.XOOPS_URL.'/modules/smallworld/images/socialnetworkicons/youtube.png"/>';
- $link = '<a title="Youtube" id="Smallworld_socialnetwork" target="_blank" href="http://www.youtube.com/user/'.$name.'">';
- }
- return $image.$link;
+function Smallworld_sociallinks($num, $name)
+{
+ if ($num == 0) {
+ $image = '<img title="Msn" id="Smallworld_socialnetworkimg" src="'
+ . XOOPS_URL
+ . '/modules/smallworld/images/socialnetworkicons/msn.png"/>';
+ $link = '<a title="Msn" id="Smallworld_socialnetwork" '
+ . 'target="_blank" href="http://members.msn.com/'.$name.'">';
+ }
+
+ if ($num == 1) {
+ $image = '<img title="facebook" id="Smallworld_socialnetworkimg"'
+ . ' src="' . XOOPS_URL
+ . '/modules/smallworld/images/'
+ . 'socialnetworkicons/facebook.png"/>';
+ $link = '<a title="facebook" id="Smallworld_socialnetwork"'
+ . ' target="_blank" href="http://www.facebook.com/'.$name.'">';
+ }
+
+ if ($num == 2) {
+ $image = '<img title="GooglePlus" id="Smallworld_socialnetworkimg"'
+ . ' src="' . XOOPS_URL
+ . '/modules/smallworld/images/socialnetworkicons/'
+ . 'googleplus.png"/>';
+ $link = '<a title="GooglePlus" id="Smallworld_socialnetwork" '
+ . 'target="_blank" href="https://plus.google.com/'
+ . $name.'">';
+ }
+
+ if ($num == 3) {
+ $image = '<img title="Icq" id="Smallworld_socialnetworkimg"'
+ . ' src="' . XOOPS_URL
+ . '/modules/smallworld/images/socialnetworkicons/icq.png"/>';
+ $link = '<a title="icq" id="Smallworld_socialnetwork" '
+ . 'target="_blank" href="http://www.icq.com/people/'
+ . $name.'/">';
+ }
+ if ($num == 4) {
+ $image = '<img title="Skype" id="Smallworld_socialnetworkimg"'
+ . ' src="'.XOOPS_URL.'/modules/smallworld/images/'
+ . 'socialnetworkicons/skype.png"/>';
+ $link = '<a title="Skype" id="Smallworld_socialnetwork" '
+ . 'target="_blank" href="skype:'
+ . $name . '?userinfo">';
+ }
+ if ($num == 5) {
+ $image = '<img title="Twitter" id="Smallworld_socialnetworkimg"'
+ . ' src="'.XOOPS_URL.'/modules/smallworld/images/'
+ . 'socialnetworkicons/twitter.png"/>';
+ $link = '<a title="Twitter" id="Smallworld_socialnetwork" '
+ . 'target="_blank" href="http://twitter.com/#!/'
+ . $name.'">';
+ }
+ if ($num == 6) {
+ $image = '<img title="MySpace" id="Smallworld_socialnetworkimg"'
+ . ' src="'.XOOPS_URL.'/modules/smallworld/images/'
+ . 'socialnetworkicons/myspace.png"/>';
+ $link = '<a title="MySpace" id="Smallworld_socialnetwork" '
+ . 'target="_blank" href="http://www.myspace.com/'
+ . $name.'">';
+ }
+ if ($num == 7) {
+ $image = '<img title="Xoops" id="Smallworld_socialnetworkimg"'
+ . ' src="'.XOOPS_URL.'/modules/smallworld/images/'
+ . 'socialnetworkicons/xoops.png"/>';
+ $link = '<a title="Xoops" id="Smallworld_socialnetwork" '
+ . 'target="_blank" href="http://xoops.org/'
+ . 'modules/profile/userinfo.php?uid='.$name.'">';
+ }
+ if ($num == 8) {
+ $image = '<img title="Yahoo Messenger" '
+ . 'id="Smallworld_socialnetworkimg"'
+ . ' src="'.XOOPS_URL.'/modules/smallworld/'
+ . 'images/socialnetworkicons/yahoo.png"/>';
+ $link = '<a title="Yahoo Messenger" id="Smallworld_socialnetwork" '
+ . 'target="_blank" href="ymsgr:sendim?'.$name.'">';
+ }
+ if ($num == 9) {
+ $image = '<img title="Youtube" id="Smallworld_socialnetworkimg"'
+ . ' src="'.XOOPS_URL.'/modules/smallworld/images/'
+ . 'socialnetworkicons/youtube.png"/>';
+ $link = '<a title="Youtube" id="Smallworld_socialnetwork" '
+ . 'target="_blank" href="http://www.youtube.com/user/'
+ . $name.'">';
+ }
+ return $image.$link;
}
-function smallworld_GetModuleOption($option, $repmodule='smallworld') {
- global $xoopsModuleConfig, $xoopsModule;
- static $tbloptions= Array();
- if(is_array($tbloptions) && array_key_exists($option,$tbloptions)) {
- return $tbloptions[$option];
- }
-
- $retval = false;
- if (isset($xoopsModuleConfig) && (is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $repmodule && $xoopsModule->getVar('isactive'))) {
- if(isset($xoopsModuleConfig[$option])) {
- $retval= $xoopsModuleConfig[$option];
- }
- } else {
- $module_handler =& xoops_gethandler('module');
- $module =& $module_handler->getByDirname($repmodule);
- $config_handler =& xoops_gethandler('config');
- if ($module) {
- $moduleConfig =& $config_handler->getConfigsByCat(0, $module->getVar('mid'));
- if(isset($moduleConfig[$option])) {
- $retval= $moduleConfig[$option];
- }
- }
- }
- $tbloptions[$option]=$retval;
- return $retval;
+function smallworld_GetModuleOption($option, $repmodule = 'smallworld')
+{
+ global $xoopsModuleConfig, $xoopsModule;
+ static $tbloptions = Array();
+ if (is_array($tbloptions) && array_key_exists($option, $tbloptions)) {
+ return $tbloptions[$option];
+ }
+ $retval = false;
+ if (isset($xoopsModuleConfig) && (is_object($xoopsModule)
+ && $xoopsModule->getVar('dirname') == $repmodule
+ && $xoopsModule->getVar('isactive'))
+ ) {
+ if (isset($xoopsModuleConfig[$option])) {
+ $retval= $xoopsModuleConfig[$option];
+ }
+ } else {
+ $module_handler =& xoops_gethandler('module');
+ $module =& $module_handler->getByDirname($repmodule);
+ $config_handler =& xoops_gethandler('config');
+ if ($module) {
+ $moduleConfig =& $config_handler->getConfigsByCat(
+ 0, $module->getVar('mid')
+ );
+ if (isset($moduleConfig[$option])) {
+ $retval= $moduleConfig[$option];
+ }
+ }
+ }
+ $tbloptions[$option] = $retval;
+ return $retval;
}
-function smallworld_getAvatarLink ($userid, $image) {
- global $xoopsUser, $xoopsDB;
- $sql = "SELECT gender FROM ".$xoopsDB->prefix('smallworld_user')." WHERE userid = '".intval($userid)."'";
- $result = $xoopsDB->queryf($sql);
- while ($row = $xoopsDB->fetchArray($result)) {
- $gender = $row['gender'];
- }
- $link = XOOPS_UPLOAD_URL."/".$image;
- if ($image == 'blank.gif' or $image=='Not specifiyed' AND $gender == '1') {
- $link = XOOPS_URL."/modules/smallworld/images/ano_woman.png";
- }
- if ($image == 'blank.gif' or $image=='Not specifiyed' AND $gender == '2') {
- $link = XOOPS_URL."/modules/smallworld/images/ano_man.png";
- }
- if ($image == '' or $image=='Not specifiyed' AND $gender == '1') {
- $link = XOOPS_URL."/modules/smallworld/images/ano_woman.png";
- }
- if ($image == '' or $image=='Not specifiyed' AND $gender == '2') {
- $link = XOOPS_URL."/modules/smallworld/images/ano_man.png";
- }
- if ($image == 'blank.gif' or $image=='Not specifiyed' AND $gender == '') {
- $link = XOOPS_URL."/modules/smallworld/images/genderless.png";
- }
- if ($image == '' or $image=='Not specifiyed' AND $gender == '') {
- $link = XOOPS_URL."/modules/smallworld/images/genderless.png";
- }
- return $link;
+function smallworld_getAvatarLink($userid, $image)
+{
+ global $xoopsUser, $xoopsDB;
+ $sql = "SELECT gender FROM "
+ . $xoopsDB->prefix('smallworld_user')
+ . " WHERE userid = '" . intval($userid) . "'";
+ $result = $xoopsDB->queryf($sql);
+ while ($row = $xoopsDB->fetchArray($result)) {
+ $gender = $row['gender'];
+ }
+ $link = XOOPS_UPLOAD_URL."/".$image;
+ if ($image == 'blank.gif' or $image=='Not specifiyed' AND $gender == '1') {
+ $link = XOOPS_URL."/modules/smallworld/images/ano_woman.png";
+ }
+ if ($image == 'blank.gif' or $image=='Not specifiyed' AND $gender == '2') {
+ $link = XOOPS_URL."/modules/smallworld/images/ano_man.png";
+ }
+ if ($image == '' or $image=='Not specifiyed' AND $gender == '1') {
+ $link = XOOPS_URL."/modules/smallworld/images/ano_woman.png";
+ }
+ if ($image == '' or $image=='Not specifiyed' AND $gender == '2') {
+ $link = XOOPS_URL."/modules/smallworld/images/ano_man.png";
+ }
+ if ($image == 'blank.gif' or $image=='Not specifiyed' AND $gender == '') {
+ $link = XOOPS_URL."/modules/smallworld/images/genderless.png";
+ }
+ if ($image == '' or $image=='Not specifiyed' AND $gender == '') {
+ $link = XOOPS_URL."/modules/smallworld/images/genderless.png";
+ }
+ return $link;
}
-function smallworld_checkForXim () {
- $filename = XOOPS_ROOT_PATH."/modules/xim/chat.php";
- if (file_exists($filename)) {
- return true;
- } else {
- return false;
- }
+function smallworld_checkForXim ()
+{
+ $filename = XOOPS_ROOT_PATH."/modules/xim/chat.php";
+ if (file_exists($filename)) {
+ return true;
+ } else {
+ return false;
+ }
}
/*
@@ -353,326 +454,405 @@
* Return owner of thread (original poster)
* Return Integer
*/
-function Smallworld_getOwnerFromComment ($msg_id_fk) {
+function Smallworld_getOwnerFromComment($msgIdFk)
+{
global $xoopsDB;
- $sql = "Select uid_fk from ".$xoopsDB->prefix('smallworld_messages')." where msg_id = '".$msg_id_fk."'";
- $result = $xoopsDB->queryF($sql);
- while ($r = $xoopsDB->fetchArray($result)) {
- $owner = $r['uid_fk'];
- }
- return $owner;
+ $sql = "Select uid_fk from "
+ . $xoopsDB->prefix('smallworld_messages')
+ . " where msg_id = '".$msgIdFk."'";
+ $result = $xoopsDB->queryF($sql);
+ while ($r = $xoopsDB->fetchArray($result)) {
+ $owner = $r['uid_fk'];
+ }
+ return $owner;
}
// Get username from userID
-function Smallworld_getName($userID){
- global $xoopsUser, $xoopsDB;
- $sql = "SELECT username FROM ".$xoopsDB->prefix('smallworld_user')." WHERE userid = '".intval($userID)."'";
- $result = $xoopsDB->queryf($sql);
- while ($row = $xoopsDB->fetchArray($result)) {
- $name = $row['username'];
- }
- return $name;
+function Smallworld_getName($userID)
+{
+ global $xoopsUser, $xoopsDB;
+ $sql = "SELECT username FROM "
+ . $xoopsDB->prefix('smallworld_user')
+ . " WHERE userid = '".intval($userID)."'";
+ $result = $xoopsDB->queryf($sql);
+ while ($row = $xoopsDB->fetchArray($result)) {
+ $name = $row['username'];
+ }
+ return $name;
}
// Check if user has been taken down for inspection by admin
// Userid = user id of user to check
// return array
-function Smallworld_isInspected ($userid) {
- global $xoopsDB;
- $data = array();
- $sql = "SELECT inspect_start, inspect_stop FROM ".$xoopsDB->prefix('smallworld_admin')." WHERE userid = '".$userid."' AND (inspect_start+inspect_stop) > ".time()."";
- $result = $xoopsDB->queryF($sql);
- if ($xoopsDB->getRowsNum($result) > 0) {
- while ($row = $xoopsDB->fetchArray($result)) {
- $data['inspect'] = 'yes';
- $data['totaltime'] = ($row['inspect_start'] + $row['inspect_stop'])-time();
- }
- } else {
- $data['inspect'] = 'no';
- }
- return $data;
+function Smallworld_isInspected($userid)
+{
+ global $xoopsDB;
+ $data = array();
+ $sql = "SELECT inspect_start, inspect_stop FROM "
+ . $xoopsDB->prefix('smallworld_admin')
+ . " WHERE userid = '" . $userid
+ . "' AND (inspect_start+inspect_stop) > ".time()."";
+ $result = $xoopsDB->queryF($sql);
+ if ($xoopsDB->getRowsNum($result) > 0) {
+ while ($row = $xoopsDB->fetchArray($result)) {
+ $data['inspect'] = 'yes';
+ $data['totaltime'] = ($row['inspect_start'] +
+ $row['inspect_stop']) - time();
+ }
+ } else {
+ $data['inspect'] = 'no';
+ }
+ return $data;
}
// Auto delete all inspects from DB where time has passed
// inspect_start + inspect_stop - time() is deleted if negative intval
-function SmallworldDeleteOldInspects () {
- global $xoopsDB;
- $sql = "UPDATE ".$xoopsDB->prefix('smallworld_admin')." SET inspect_start = '', inspect_stop = '' WHERE (inspect_start+inspect_stop) <= ".time()."";
- $result = $xoopsDB->queryF($sql);
+function SmallworldDeleteOldInspects()
+{
+ global $xoopsDB;
+ $sql = "UPDATE ".$xoopsDB->prefix('smallworld_admin')
+ . " SET inspect_start = '', inspect_stop = '' "
+ . "WHERE (inspect_start+inspect_stop) <= ".time()."";
+ $result = $xoopsDB->queryF($sql);
}
// Function to get sum of users in you following array
// Used to calculate new message flash in jQuery intval fetch
-function smallworld_getCountFriendMessagesEtc () {
-global $xoopsUser, $xoopsDB;
- $user = new xoopsUser;
- $Wall = new Wall_Updates();
- $userid = $xoopsUser->getVar('uid');
- $followers = Smallworld_array_flatten($Wall->getFollowers($userid),0);
- if (smallworld_GetModuleOption('usersownpostscount', $repmodule='smallworld') == 1) {
- array_push($followers, $userid);
- }
- $ids = join(',',$followers);
- $sql = "SELECT COUNT(*) AS total "
- ." FROM ( "
- ." SELECT com_id , count( * ) as comments FROM ".$xoopsDB->prefix('smallworld_comments')." WHERE uid_fk IN ($ids) Group by com_id "
- ." UNION ALL "
- ." Select msg_id , count( * ) as messages FROM ".$xoopsDB->prefix('smallworld_messages')." WHERE uid_fk IN ($ids) group by msg_id "
- ." ) as d";
- $result = $xoopsDB->queryF($sql);
- while ($r = $xoopsDB->fetchArray($result)) {
- $total = $r['total'];
- }
- return $total;
+function smallworld_getCountFriendMessagesEtc ()
+{
+ global $xoopsUser, $xoopsDB;
+ $user = new xoopsUser;
+ $Wall = new Wall_Updates();
+ $userid = $xoopsUser->getVar('uid');
+ $followers = Smallworld_array_flatten(
+ $Wall->getFollowers($userid), 0
+ );
+
+ $chk = smallworld_GetModuleOption(
+ 'usersownpostscount', $repmodule = 'smallworld'
+ );
+ if ($chk == 1) {
+ array_push($followers, $userid);
+ }
+ $ids = join(',', $followers);
+ $sql = "SELECT COUNT(*) AS total "
+ . " FROM ( "
+ . " SELECT com_id , count( * ) as comments FROM "
+ . $xoopsDB->prefix('smallworld_comments')
+ . " WHERE uid_fk IN ($ids) Group by com_id "
+ . " UNION ALL "
+ . " Select msg_id , count( * ) as messages FROM "
+ . $xoopsDB->prefix('smallworld_messages')
+ . " WHERE uid_fk IN ($ids) group by msg_id "
+ . " ) as d";
+ $result = $xoopsDB->queryF($sql);
+ while ($r = $xoopsDB->fetchArray($result)) {
+ $total = $r['total'];
+ }
+ return $total;
}
// Function to get sum of users in you following array
// Used to calculate new message flash in jQuery intval fetch
-function smallworld_countUsersMessages ($id) {
-global $xoopsUser, $xoopsDB;
- $user = new xoopsUser;
- $Wall = new Wall_Updates();
- $sql = "SELECT COUNT(*) AS total "
- ." FROM ( "
- ." SELECT com_id , count( * ) as comments FROM ".$xoopsDB->prefix('smallworld_comments')." WHERE uid_fk = ".intval($id)." Group by com_id "
- ." UNION ALL "
- ." Select msg_id , count( * ) as messages FROM ".$xoopsDB->prefix('smallworld_messages')." WHERE uid_fk = ".intval($id)."group by msg_id "
- ." ) as d";
- $result = $xoopsDB->queryF($sql);
- while ($r = $xoopsDB->fetchArray($result)) {
- $total = $r['total'];
- }
- return $total;
+function smallworld_countUsersMessages($id)
+{
+ global $xoopsUser, $xoopsDB;
+ $user = new xoopsUser;
+ $Wall = new Wall_Updates();
+ $sql = "SELECT COUNT(*) AS total "
+ . " FROM ( "
+ . " SELECT com_id , count( * ) as comments FROM "
+ . $xoopsDB->prefix('smallworld_comments')
+ . " WHERE uid_fk = " . intval($id) . " Group by com_id "
+ . " UNION ALL "
+ . " Select msg_id , count( * ) as messages FROM "
+ . $xoopsDB->prefix('smallworld_messages')
+ . " WHERE uid_fk = " . intval($id) . "group by msg_id "
+ . " ) as d";
+ $result = $xoopsDB->queryF($sql);
+ while ($r = $xoopsDB->fetchArray($result)) {
+ $total = $r['total'];
+ }
+ return $total;
}
// Get the three newest members to array
-function smallworld_Stats_newest () {
- global $xoopsDB, $xoopsUser;
- $nu = array();
- $sql = "SELECT * FROM ".$xoopsDB->prefix('smallworld_user')." ORDER BY regdate DESC limit 3";
- $result = $xoopsDB->queryF($sql);
- if ($xoopsDB->getRowsNum($result) > 0) {
- $i = 0;
- while ($r = $xoopsDB->fetchArray($result)) {
- $nu[$i]['userid'] = $r['userid'];
- $nu[$i]['username'] = $r['username'];
- $nu[$i]['regdate'] = date('d-m-Y',$r['regdate']);
- $nu[$i]['username_link'] = "<a href = '".XOOPS_URL."/modules/smallworld/userprofile.php?username=".$r['username']."'>";
- $nu[$i]['username_link'] .= $r['username']." (".$r['realname'].") [".$nu[$i]['regdate']."] </a>";
- $nu[$i]['userimage'] = $r['userimage'];
- $nu[$i]['userimage_link'] = smallworld_getAvatarLink ($r['userid'], Smallworld_Gravatar($r['userid']));
-
- $i++;
- }
- }
- return $nu;
+function smallworld_Stats_newest ()
+{
+ global $xoopsDB, $xoopsUser;
+ $nu = array();
+ $sql = "SELECT * FROM "
+ . $xoopsDB->prefix('smallworld_user')
+ . " ORDER BY regdate DESC limit 3";
+ $result = $xoopsDB->queryF($sql);
+ if ($xoopsDB->getRowsNum($result) > 0) {
+ $i = 0;
+ while ($r = $xoopsDB->fetchArray($result)) {
+ $nu[$i]['userid'] = $r['userid'];
+ $nu[$i]['username'] = $r['username'];
+ $nu[$i]['regdate'] = date('d-m-Y', $r['regdate']);
+ $nu[$i]['username_link'] = "<a href = '"
+ . XOOPS_URL."/modules/smallworld/userprofile.php?username="
+ . $r['username']."'>"
+ . $r['username']." (".$r['realname'].") "
+ . "[".$nu[$i]['regdate']."] </a>";
+ $nu[$i]['userimage'] = $r['userimage'];
+ $nu[$i]['userimage_link'] = smallworld_getAvatarLink(
+ $r['userid'],
+ Smallworld_Gravatar($r['userid'])
+ );
+ $i++;
+ }
+ }
+ return $nu;
}
//Avatar Image
-function Smallworld_Gravatar($uid) {
- global $xoopsUser, $xoopsDB;
- $image='';
- $sql = "SELECT userimage FROM ".$xoopsDB->prefix('smallworld_user')." WHERE userid = '".$uid."'";
- $result = $xoopsDB->queryF($sql);
- while ($r = $xoopsDB->fetchArray($result)) {
- $image = $r['userimage'];
- }
- if ($image == 'Not specifiyed' || $image == '') {
- $avt = new XoopsUser($uid);
- $avatar = $avt->user_avatar();
- } else {
- $avatar = $image;
- }
- return $avatar;
+function Smallworld_Gravatar($uid)
+{
+ global $xoopsUser, $xoopsDB;
+ $image = '';
+ $sql = "SELECT userimage FROM "
+ . $xoopsDB->prefix('smallworld_user')
+ . " WHERE userid = '".$uid."'";
+ $result = $xoopsDB->queryF($sql);
+ while ($r = $xoopsDB->fetchArray($result)) {
+ $image = $r['userimage'];
+ }
+ if ($image == 'Not specifiyed' || $image == '') {
+ $avt = new XoopsUser($uid);
+ $avatar = $avt->user_avatar();
+ } else {
+ $avatar = $image;
+ }
+ return $avatar;
}
-
+
// find user with most posted messages
-function Smallworld_mostactiveusers_allround() {
- global $xoopsDB,$xoopsUser;
- $sql = "SELECT uid_fk, COUNT( * ) as cnt ";
- $sql .= "FROM ( ";
- $sql .= "SELECT uid_fk ";
- $sql .= "FROM ".$xoopsDB->prefix('smallworld_messages')." ";
- $sql .= "UNION ALL SELECT uid_fk ";
- $sql .= "FROM ".$xoopsDB->prefix('smallworld_comments')." ";
- $sql .= ") AS u ";
- $sql .= "GROUP BY uid_fk ";
- $sql .= "ORDER BY count( * ) DESC limit 3";
- $result = $xoopsDB->queryF($sql);
- $counter = $xoopsDB->getRowsNum($result);
+function Smallworld_mostactiveusers_allround()
+{
+ global $xoopsDB, $xoopsUser;
+ $sql = "SELECT uid_fk, COUNT( * ) as cnt ";
+ $sql .= "FROM ( ";
+ $sql .= "SELECT uid_fk ";
+ $sql .= "FROM ".$xoopsDB->prefix('smallworld_messages')." ";
+ $sql .= "UNION ALL SELECT uid_fk ";
+ $sql .= "FROM ".$xoopsDB->prefix('smallworld_comments')." ";
+ $sql .= ") AS u ";
+ $sql .= "GROUP BY uid_fk ";
+ $sql .= "ORDER BY count( * ) DESC limit 3";
+ $result = $xoopsDB->queryF($sql);
+ $counter = $xoopsDB->getRowsNum($result);
- if ($counter < 1) {
-
- } else {
- $msg = array();
- $counter = 1;
- while ($row = $xoopsDB->fetchArray($result)) {
- $msg[$counter]["counter"] = $counter;
- $msg[$counter]["img"] = smallworld_getAvatarLink ($row['uid_fk'], Smallworld_Gravatar($row['uid_fk']));
- $msg[$counter]["msgs"] = _SMALLWORLD_TOTALPOSTS." : ".$row["cnt"];
- $msg[$counter]["cnt"] = $row["cnt"];
- $msg[$counter]["username"] = $xoopsUser->getUnameFromId($row["uid_fk"]);
- $msg[$counter]["username_link"] = "<a href = '".XOOPS_URL."/modules/smallworld/userprofile.php?username=".$msg[$counter]["username"]."'>";
- $msg[$counter]["username_link"] .= $msg[$counter]["username"]." (".$msg[$counter]["msgs"].")</a>";
- $counter++;
- }
- }
- return $msg;
+ if ($counter < 1) {
+ } else {
+ $msg = array();
+ $counter = 1;
+ while ($row = $xoopsDB->fetchArray($result)) {
+ $msg[$counter]["counter"] = $counter;
+ $msg[$counter]["img"] = smallworld_getAvatarLink(
+ $row['uid_fk'],
+ Smallworld_Gravatar($row['uid_fk'])
+ );
+ $msg[$counter]["msgs"] = _SMALLWORLD_TOTALPOSTS." : ".$row["cnt"];
+ $msg[$counter]["cnt"] = $row["cnt"];
+ $msg[$counter]["username"] = $xoopsUser->getUnameFromId(
+ $row["uid_fk"]
+ );
+ $msg[$counter]["username_link"] = "<a href = '"
+ . XOOPS_URL."/modules/smallworld/userprofile.php?username="
+ . $msg[$counter]["username"]."'>"
+ . $msg[$counter]["username"]
+ . " (".$msg[$counter]["msgs"].")</a>";
+ $counter++;
+ }
+ }
+ return $msg;
}
// Find worst rated users overall
-function Smallworld_worstratedusers() {
- global $xoopsUser, $xoopsDB;
- $array = array();
- $counter = 1;
- $sql = "SELECT owner, (";
- $sql .= "sum( up ) - sum( down )";
- $sql .= ") AS total";
- $sql .= " FROM ".$xoopsDB->prefix('smallworld_vote')."";
- $sql .= " GROUP BY owner ORDER by total ASC LIMIT 5";
- $result = $xoopsDB->queryF($sql);
- while ($row = $xoopsDB->fetchArray($result)) {
- $array[$counter]['counter'] = $counter;
- $array[$counter]['img'] = smallworld_getAvatarLink ($row["owner"], Smallworld_Gravatar($row["owner"]));
- $array[$counter]['user'] = $xoopsUser->getUnameFromId($row["owner"]);
- $array[$counter]['rating'] = $row["total"];
- $array[$counter]['user_link'] = "<a href = '".XOOPS_URL."/modules/smallworld/userprofile.php?username=".$array[$counter]['user']."'>";
- $array[$counter]['user_link'] .= $array[$counter]['user']." (".$array[$counter]['rating'].")</a>";
- $counter++;
- }
- return $array;
+function Smallworld_worstratedusers()
+{
+ global $xoopsUser, $xoopsDB;
+ $array = array();
+ $counter = 1;
+ $sql = "SELECT owner, (";
+ $sql .= "sum( up ) - sum( down )";
+ $sql .= ") AS total";
+ $sql .= " FROM ".$xoopsDB->prefix('smallworld_vote')."";
+ $sql .= " GROUP BY owner ORDER by total ASC LIMIT 5";
+ $result = $xoopsDB->queryF($sql);
+ while ($row = $xoopsDB->fetchArray($result)) {
+ $array[$counter]['counter'] = $counter;
+ $array[$counter]['img'] = smallworld_getAvatarLink(
+ $row["owner"], Smallworld_Gravatar($row["owner"])
+ );
+ $array[$counter]['user'] = $xoopsUser->getUnameFromId(
+ $row["owner"]
+ );
+ $array[$counter]['rating'] = $row["total"];
+ $array[$counter]['user_link'] = "<a href = '"
+ . XOOPS_URL."/modules/smallworld/userprofile.php?username="
+ . $array[$counter]['user']."'>"
+ . $array[$counter]['user']
+ . " (".$array[$counter]['rating'].")</a>";
+ $counter++;
+ }
+ return $array;
}
// Find best rated users overall
-function Smallworld_topratedusers() {
+function Smallworld_topratedusers()
+{
global $xoopsUser, $xoopsDB;
$array = array();
$counter = 1;
- $sql = "SELECT owner, (";
- $sql .= "sum( up ) - sum( down )";
- $sql .= ") AS total";
- $sql .= " FROM ".$xoopsDB->prefix('smallworld_vote')."";
- $sql .= " GROUP BY owner ORDER by total DESC LIMIT 5";
- $result = $xoopsDB->queryF($sql);
- while ($row = $xoopsDB->fetchArray($result)) {
- $array[$counter]['counter'] = $counter;
- $array[$counter]['img'] = smallworld_getAvatarLink ($row["owner"], Smallworld_Gravatar($row["owner"]));
- $array[$counter]['user'] = $xoopsUser->getUnameFromId($row["owner"]);
- $array[$counter]['rating'] = $row["total"];
- $array[$counter]['user_link'] = "<a href = '".XOOPS_URL."/modules/smallworld/userprofile.php?username=".$array[$counter]['user']."'>";
- $array[$counter]['user_link'] .= $array[$counter]['user']." (".$array[$counter]['rating'].")</a>";
- $counter++;
- }
- return $array;
+ $sql = "SELECT owner, (";
+ $sql .= "sum( up ) - sum( down )";
+ $sql .= ") AS total";
+ $sql .= " FROM ".$xoopsDB->prefix('smallworld_vote')."";
+ $sql .= " GROUP BY owner ORDER by total DESC LIMIT 5";
+ $result = $xoopsDB->queryF($sql);
+ while ($row = $xoopsDB->fetchArray($result)) {
+ $array[$counter]['counter'] = $counter;
+ $array[$counter]['img'] = smallworld_getAvatarLink(
+ $row["owner"], Smallworld_Gravatar($row["owner"])
+ );
+ $array[$counter]['user'] = $xoopsUser->getUnameFromId(
+ $row["owner"]
+ );
+ $array[$counter]['rating'] = $row["total"];
+ $array[$counter]['user_link'] = "<a href = '".XOOPS_URL
+ . "/modules/smallworld/userprofile.php?username="
+ . $array[$counter]['user']."'>" . $array[$counter]['user']
+ . " (".$array[$counter]['rating'].")</a>";
+ $counter++;
+ }
+ return $array;
}
-function smallworld_nextBirthdays () {
+function smallworld_nextBirthdays()
+{
global $xoopsDB,$xoopsUser;
- $now = date('d-m');
- $res = array();
- $sql = 'SELECT userid, username, userimage, realname, birthday, CURDATE(),'
- . ' DATE_FORMAT(birthday, "%d / %m") AS daymon , '
+ $now = date('d-m');
+ $res = array();
+ $sql = 'SELECT userid, username, userimage, realname, '
+ . 'birthday, CURDATE(),'
+ . ' DATE_FORMAT(birthday, "%d / %m") AS daymon , '
. ' (YEAR(CURDATE())-YEAR(birthday))'
. ' - (RIGHT(CURDATE(),5)<RIGHT(birthday,5))'
. ' AS age_now'
- . ' FROM xoops_smallworld_user WHERE right(birthday,5) = right(CURDATE(),5)'
- . ' ORDER BY MONTH( birthday ) , DAY( birthday ) '
- . ' LIMIT 10 ';
- $result = $xoopsDB->queryF($sql);
- $counter = $xoopsDB->getRowsNum($result);
- $i = 0;
- while ($r = $xoopsDB->fetchArray($result)) {
- $res[$i]['amount'] = $counter;
- $res[$i]['userid'] = $r['userid'];
- $res[$i]['userimage'] = smallworld_getAvatarLink ($r['userid'], Smallworld_Gravatar($r["userid"]));
- $res[$i]['birthday'] = $r['daymon'];
- $res[$i]['agenow'] = $r['age_now'];
- $res[$i]['username'] = $xoopsUser->getUnameFromId($r['userid']);
- $res[$i]['username_link'] = "<a href = '".XOOPS_URL."/modules/smallworld/userprofile.php?username=".$res[$i]['username']."'>";
- $res[$i]['username_link'] .= $res[$i]['username']." (".$r['daymon'].") ".$r['age_now']." "._SMALLWORLD_BDAY_YEARS;
- $res[$i]['username_link'] .="</a>";
- $i++;
- }
- return $res;
+ . ' FROM xoops_smallworld_user WHERE right(birthday,5)'
+ . ' = right(CURDATE(),5)'
+ . ' ORDER BY MONTH( birthday ) , DAY( birthday ) '
+ . ' LIMIT 10 ';
+ $result = $xoopsDB->queryF($sql);
+ $counter = $xoopsDB->getRowsNum($result);
+ $i = 0;
+ while ($r = $xoopsDB->fetchArray($result)) {
+ $res[$i]['amount'] = $counter;
+ $res[$i]['userid'] = $r['userid'];
+ $res[$i]['userimage'] = smallworld_getAvatarLink(
+ $r['userid'], Smallworld_Gravatar($r["userid"])
+ );
+ $res[$i]['birthday'] = $r['daymon'];
+ $res[$i]['agenow'] = $r['age_now'];
+ $res[$i]['username'] = $xoopsUser->getUnameFromId($r['userid']);
+ $res[$i]['username_link'] = "<a href = '"
+ . XOOPS_URL."/modules/smallworld/userprofile.php?username="
+ . $res[$i]['username']."'>".$res[$i]['username']." ("
+ . $r['daymon'].") ".$r['age_now']." "
+ . _SMALLWORLD_BDAY_YEARS."</a>";
+ $i++;
+ }
+ return $res;
}
// Return new date format US for MySql
// Require php>5.2 using DateTime class
-function Smallworld_euroToUsDate ($stringDate) {
- $date = DateTime::createFromFormat('d-m-Y', $stringDate);
- return $date->format("Y-m-d");
+function Smallworld_euroToUsDate($stringDate)
+{
+ $date = DateTime::createFromFormat('d-m-Y', $stringDate);
+ return $date->format("Y-m-d");
}
// Return new date format EU For display
-function Smallworld_UsToEuroDate ($stringDate) {
- $date = DateTime::createFromFormat('Y-m-d', $stringDate);
- return $date->format("d-m-Y");
+function Smallworld_UsToEuroDate($stringDate)
+{
+ $date = DateTime::createFromFormat('Y-m-d', $stringDate);
+ return $date->format("d-m-Y");
}
-function smallworld_sp () {
- $sp = array();
- $sp[0]['spimage'] = "<img id = 'smallworld_img_sp' src = '".XOOPS_URL."/modules/smallworld/images/sp.png' height='30px' width='30px' />";
- return $sp;
+function smallworld_sp()
+{
+ $sp = array();
+ $sp[0]['spimage'] = "<img id = 'smallworld_img_sp' src = '"
+ . XOOPS_URL."/modules/smallworld/images/sp.png' "
+ . "height='30px' width='30px' />";
+ return $sp;
}
//Check privacy settings in permapage
-function smallworldCheckPriv ($id) {
- global $xoopsDB;
- $public = "SELECT priv FROM ".$xoopsDB->prefix('smallworld_messages')." WHERE msg_id = ".$id."";
- $result = $xoopsDB->queryF($public);
- while ($row = $xoopsDB->fetchArray($result)){
- $priv = $row['priv'];
- }
- return $priv;
+function smallworldCheckPriv($id)
+{
+ global $xoopsDB;
+ $public = "SELECT priv FROM " . $xoopsDB->prefix('smallworld_messages')
+ . " WHERE msg_id = " . $id . "";
+ $result = $xoopsDB->queryF($public);
+ while ($row = $xoopsDB->fetchArray($result)) {
+ $priv = $row['priv'];
+ }
+ return $priv;
}
// Function to calculate remaining seconds until user's birthday
// Input $d : date('Y-m-d') format
// return seconds until date at midnight, or
// return 0 if date ('Y-m-d') is equal to today
-function smallworldNextBDaySecs($d) {
- $olddate = substr($d, 4);
- $exactdate = date('Y')."".$olddate;
- $newdate = date('Y') ."".$olddate." 00:00:00";
- $nextyear = date('Y')+1 ."".$olddate." 00:00:00";
- if ($exactdate != date('Y-m-d')) {
- if($newdate > date("Y-m-d H:i:s")) {
- $start_ts = strtotime($newdate);
- $end_ts = strtotime(date("Y-m-d H:i:s"));
- $diff = $end_ts - $start_ts;
- $n = round($diff);
- $return = substr($n, 1);
- return $return;
- }
- else {
- $start_ts = strtotime($nextyear);
- $end_ts = strtotime(date("Y-m-d H:i:s"));
- $diff = $end_ts - $start_ts;
- $n = round($diff);
- $return = substr($n, 1);
- return $return;
- }
- } else {
- return 0;
- }
+function smallworldNextBDaySecs($d)
+{
+ $olddate = substr($d, 4);
+ $exactdate = date('Y')."".$olddate;
+ $newdate = date('Y') ."".$olddate." 00:00:00";
+ $nextyear = date('Y')+1 ."".$olddate." 00:00:00";
+ if ($exactdate != date('Y-m-d')) {
+ if ($newdate > date("Y-m-d H:i:s")) {
+ $startTs = strtotime($newdate);
+ $endTs = strtotime(date("Y-m-d H:i:s"));
+ $diff = $endTs - $startTs;
+ $n = round($diff);
+ $return = substr($n, 1);
+ return $return;
+ } else {
+ $startTs = strtotime($nextyear);
+ $endTs = strtotime(date("Y-m-d H:i:s"));
+ $diff = $endTs - $startTs;
+ $n = round($diff);
+ $return = substr($n, 1);
+ return $return;
+ }
+ } else {
+ return 0;
+ }
}
//Function to get value from xoopsConfig array
-function smallworldGetValfromArray ($key, $array) {
- $ar = smallworld_GetModuleOption($array, $repmodule='smallworld');
- $ret = 0;
- if (in_array($key, $ar,true)) {
- $ret = 1;
- return $ret;
- } else {
- return 0;
- }
-
+function smallworldGetValfromArray ($key, $array)
+{
+ $ar = smallworld_GetModuleOption($array, $repmodule = 'smallworld');
+ $ret = 0;
+ if (in_array($key, $ar, true)) {
+ $ret = 1;
+ return $ret;
+ } else {
+ return 0;
+ }
}
//Function to resize images proportionally
// Using imagesize($imageurl) returns $img[0], $img[1]
// Target = new max height or width in px
-function smallworld_imageResize($width, $height, $target) {
+function smallworld_imageResize($width, $height, $target)
+{
//takes the larger size of the width and height and applies the
//formula accordingly...this is so this script will work
//dynamically with any size image
@@ -686,7 +866,5 @@
$height = round($height * $percentage);
//returns the new sizes in html image tag format...this is so you
//can plug this function inside an image tag and just get the
-
return "width=\"$width\" height=\"$height\"";
}
-?>
Modified: XoopsModules/smallworld/trunk/smallworld/include/getSelects.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/include/getSelects.php 2012-02-07 20:07:12 UTC (rev 8902)
+++ XoopsModules/smallworld/trunk/smallworld/include/getSelects.php 2012-02-07 21:08:59 UTC (rev 8903)
@@ -1,39 +1,42 @@
<?php
/**
* 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.
+* 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
-* @module: Smallworld
-* @Author: Michael Albertsen (http://culex.dk) <cu...@cu...>
-* @copyright: 2011 Culex
-* @Repository path: $HeadURL$
-* @Last committed: $Revision$
-* @Last changed by: $Author$
-* @Last changed date: $Date$
-* @ID: $Id$
+* @copyright: The XOOPS Project http://sourceforge.net/projects/xoops/
+* @license: http://www.fsf.org/copyleft/gpl.html GNU public license
+* @packet: Modules
+* @sub-packet: Smallworld
+* @since: Xoops 2.5.4
+* @Author: Michael Albertsen (http://culex.dk) <cu...@cu...>
+* @copyright: 2011 Culex
+* @Last committed: $Revision$
+* @Last changed by: $Author$
+* @Last changed date: $Date$
+* @ID: $Id$
**/
include_once("../../../mainfile.php");
inclu...
[truncated message content] |
|
From: <be...@us...> - 2012-02-07 20:07:23
|
Revision: 8902
http://xoops.svn.sourceforge.net/xoops/?rev=8902&view=rev
Author: beckmi
Date: 2012-02-07 20:07:12 +0000 (Tue, 07 Feb 2012)
Log Message:
-----------
Updating images, fixing error related to missing main.php language file
Modified Paths:
--------------
XoopsModules/newsslider/trunk/newsslider/admin/admin_header.php
XoopsModules/newsslider/trunk/newsslider/admin/menu.php
XoopsModules/newsslider/trunk/newsslider/changelog.txt
XoopsModules/newsslider/trunk/newsslider/images/image1-small.jpg
XoopsModules/newsslider/trunk/newsslider/images/image1.jpg
XoopsModules/newsslider/trunk/newsslider/images/image2-small.jpg
XoopsModules/newsslider/trunk/newsslider/images/image2.jpg
XoopsModules/newsslider/trunk/newsslider/images/image3-small.jpg
XoopsModules/newsslider/trunk/newsslider/images/image3.jpg
XoopsModules/newsslider/trunk/newsslider/images/image4-small.jpg
XoopsModules/newsslider/trunk/newsslider/images/image4.jpg
XoopsModules/newsslider/trunk/newsslider/images/image5-small.jpg
XoopsModules/newsslider/trunk/newsslider/images/image5.jpg
XoopsModules/newsslider/trunk/newsslider/images/s3/image1.jpg
XoopsModules/newsslider/trunk/newsslider/images/s3/image2.jpg
XoopsModules/newsslider/trunk/newsslider/images/s3/image3.jpg
XoopsModules/newsslider/trunk/newsslider/images/s3/image4.jpg
XoopsModules/newsslider/trunk/newsslider/images/s3/image5.jpg
XoopsModules/newsslider/trunk/newsslider/images/s3/image6.jpg
XoopsModules/newsslider/trunk/newsslider/images/s3/image7.jpg
XoopsModules/newsslider/trunk/newsslider/language/english/blocks.php
XoopsModules/newsslider/trunk/newsslider/language/english/modinfo.php
XoopsModules/newsslider/trunk/newsslider/language/german/modinfo.php
XoopsModules/newsslider/trunk/newsslider/readme.txt
XoopsModules/newsslider/trunk/newsslider/xoops_version.php
Removed Paths:
-------------
XoopsModules/newsslider/trunk/newsslider/language/english/main.php
XoopsModules/newsslider/trunk/newsslider/language/german/main.php
Modified: XoopsModules/newsslider/trunk/newsslider/admin/admin_header.php
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/admin/admin_header.php 2012-02-07 19:16:35 UTC (rev 8901)
+++ XoopsModules/newsslider/trunk/newsslider/admin/admin_header.php 2012-02-07 20:07:12 UTC (rev 8902)
@@ -11,13 +11,6 @@
include '../../../include/cp_header.php';
global $xoopsModule,$xoopsConfig;
-if (file_exists(XOOPS_ROOT_PATH . '/modules/newsslider/language/' . $xoopsConfig['language'] . '/main.php')) {
- include_once XOOPS_ROOT_PATH . '/modules/newsslider/language/' . $xoopsConfig['language'] . '/main.php';
-} else {
- include_once XOOPS_ROOT_PATH . '/modules/newsslider/language/english/main.php';
-}
-
-
include_once XOOPS_ROOT_PATH."/modules/".$xoopsModule->dirname()."/admin/functions.php";
$myts =& MyTextSanitizer::getInstance();
Modified: XoopsModules/newsslider/trunk/newsslider/admin/menu.php
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/admin/menu.php 2012-02-07 19:16:35 UTC (rev 8901)
+++ XoopsModules/newsslider/trunk/newsslider/admin/menu.php 2012-02-07 20:07:12 UTC (rev 8902)
@@ -13,10 +13,10 @@
$i = 0;
if (strstr(XOOPS_VERSION, "XOOPS 2.0")){
- $adminmenu[$i]['title'] = _NWS_MENU;
+ $adminmenu[$i]['title'] = _MI_NWS_MENU;
$adminmenu[$i]['link'] = "admin/myblocksadmin.php";
} else {
- $adminmenu[$i]['title'] = _NWS_MENU;// uncomment if necessary, this can cause errors
+ $adminmenu[$i]['title'] = _MI_NWS_MENU;// uncomment if necessary, this can cause errors
$adminmenu[$i]['link'] = '../../modules/system/admin.php?fct=blocksadmin&op=list&filter=1&selgen=' . $xoopsModule->getVar('mid') . '&selmod=-2&selgrp=-1&selvis=-1';
//$adminmenu[$i]['link'] = '../../modules/system/admin.php?fct=blocksadmin&op=list';
}
Modified: XoopsModules/newsslider/trunk/newsslider/changelog.txt
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/changelog.txt 2012-02-07 19:16:35 UTC (rev 8901)
+++ XoopsModules/newsslider/trunk/newsslider/changelog.txt 2012-02-07 20:07:12 UTC (rev 8902)
@@ -1,4 +1,4 @@
-version 1.2
+version 1.2 beta rev II
===========
- Added S3slider
- Added bxSlider
Modified: XoopsModules/newsslider/trunk/newsslider/images/image1-small.jpg
===================================================================
(Binary files differ)
Modified: XoopsModules/newsslider/trunk/newsslider/images/image1.jpg
===================================================================
(Binary files differ)
Modified: XoopsModules/newsslider/trunk/newsslider/images/image2-small.jpg
===================================================================
(Binary files differ)
Modified: XoopsModules/newsslider/trunk/newsslider/images/image2.jpg
===================================================================
(Binary files differ)
Modified: XoopsModules/newsslider/trunk/newsslider/images/image3-small.jpg
===================================================================
(Binary files differ)
Modified: XoopsModules/newsslider/trunk/newsslider/images/image3.jpg
===================================================================
(Binary files differ)
Modified: XoopsModules/newsslider/trunk/newsslider/images/image4-small.jpg
===================================================================
(Binary files differ)
Modified: XoopsModules/newsslider/trunk/newsslider/images/image4.jpg
===================================================================
(Binary files differ)
Modified: XoopsModules/newsslider/trunk/newsslider/images/image5-small.jpg
===================================================================
(Binary files differ)
Modified: XoopsModules/newsslider/trunk/newsslider/images/image5.jpg
===================================================================
(Binary files differ)
Modified: XoopsModules/newsslider/trunk/newsslider/images/s3/image1.jpg
===================================================================
(Binary files differ)
Modified: XoopsModules/newsslider/trunk/newsslider/images/s3/image2.jpg
===================================================================
(Binary files differ)
Modified: XoopsModules/newsslider/trunk/newsslider/images/s3/image3.jpg
===================================================================
(Binary files differ)
Modified: XoopsModules/newsslider/trunk/newsslider/images/s3/image4.jpg
===================================================================
(Binary files differ)
Modified: XoopsModules/newsslider/trunk/newsslider/images/s3/image5.jpg
===================================================================
(Binary files differ)
Modified: XoopsModules/newsslider/trunk/newsslider/images/s3/image6.jpg
===================================================================
(Binary files differ)
Modified: XoopsModules/newsslider/trunk/newsslider/images/s3/image7.jpg
===================================================================
(Binary files differ)
Modified: XoopsModules/newsslider/trunk/newsslider/language/english/blocks.php
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/language/english/blocks.php 2012-02-07 19:16:35 UTC (rev 8901)
+++ XoopsModules/newsslider/trunk/newsslider/language/english/blocks.php 2012-02-07 20:07:12 UTC (rev 8902)
@@ -21,8 +21,7 @@
define("_MB_NWS_NAME", "Title");
define("_MB_NWS_DATE", "Date");
define("_MB_NWS_HITS", "Hits");
-//define("_MB_NWS_TOPICS", "News Topics<div style=\" font-size: smaller; align='left'\">Set here the allowed Topics.</div>");
-define("_MB_NWS_TOPICS", "News Themen <div style=\" font-size: smaller; align='left'\">Hier können die Themen gesetzt werden.</div>");
+define("_MB_NWS_TOPICS", "News Topics<div style=\" font-size: smaller; align='left'\">Set here the allowed Topics.</div>");
//scrolling news
define("_MB_NWS_BSPEED", "Marquee-Speed (larger is faster)<div style='font-weight:normal'>corresponds to delay in pausescroller</div>");
define("_MB_NWS_BLIMIT", "Limit block to xx entries: ");
Deleted: XoopsModules/newsslider/trunk/newsslider/language/english/main.php
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/language/english/main.php 2012-02-07 19:16:35 UTC (rev 8901)
+++ XoopsModules/newsslider/trunk/newsslider/language/english/main.php 2012-02-07 20:07:12 UTC (rev 8902)
@@ -1,11 +0,0 @@
-<?php
-/**
- * $Id: admin.php v 1.0 11 Jan 2012 Yerres Exp $
- * Module: newsslider
- * Version: 1.1
- * Release Date: 11 Jan 2012 Yerres
- * Author: Yerres
- * Licence: GNU
- */
-
-?>
\ No newline at end of file
Modified: XoopsModules/newsslider/trunk/newsslider/language/english/modinfo.php
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/language/english/modinfo.php 2012-02-07 19:16:35 UTC (rev 8901)
+++ XoopsModules/newsslider/trunk/newsslider/language/english/modinfo.php 2012-02-07 20:07:12 UTC (rev 8902)
@@ -7,11 +7,11 @@
* Author: Yerres
* Licence: GNU
*/
-define("_NWS_NAME","Newsslider");
-define("_NWS_DESC","Inserts a sliding News block");
+define("_MI_NWS_NAME","Newsslider");
+define("_MI_NWS_DESC","Inserts a sliding News block");
// Names of admin menu items
-define("_NWS_MENU","Add/Edit Newsslider");
+define("_MI_NWS_MENU","Add/Edit Newsslider");
define("_MI_NWS_TAGS", "Newsslider");
define('_MI_NWS_UPDATEMODULE', 'Update module templates and blocks');
Deleted: XoopsModules/newsslider/trunk/newsslider/language/german/main.php
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/language/german/main.php 2012-02-07 19:16:35 UTC (rev 8901)
+++ XoopsModules/newsslider/trunk/newsslider/language/german/main.php 2012-02-07 20:07:12 UTC (rev 8902)
@@ -1,11 +0,0 @@
-<?php
-/**
- * $Id: admin.php v 1.0 11 Jan 2012 Yerres Exp $
- * Module: newsslider
- * Version: 1.1
- * Release Date: 11 Jan 2012 Yerres
- * Author: Yerres
- * Licence: GNU
- */
-
-?>
\ No newline at end of file
Modified: XoopsModules/newsslider/trunk/newsslider/language/german/modinfo.php
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/language/german/modinfo.php 2012-02-07 19:16:35 UTC (rev 8901)
+++ XoopsModules/newsslider/trunk/newsslider/language/german/modinfo.php 2012-02-07 20:07:12 UTC (rev 8902)
@@ -8,11 +8,11 @@
* Licence: GNU
*/
-define("_NWS_NAME","Newsslider");
-define("_NWS_DESC","Newsslider für Artikel");
+define("_MI_NWS_NAME","Newsslider");
+define("_MI_NWS_DESC","Newsslider für Artikel");
// Names of admin menu items
-define("_NWS_MENU","Newsslider Ändern/hinzufügen");
+define("_MI_NWS_MENU","Newsslider Ändern/hinzufügen");
define("_MI_NWS_TAGS", "Newsslider");
define('_MI_NWS_UPDATEMODULE', 'Modul Templates und Blöcke aktualisieren');
Modified: XoopsModules/newsslider/trunk/newsslider/readme.txt
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/readme.txt 2012-02-07 19:16:35 UTC (rev 8901)
+++ XoopsModules/newsslider/trunk/newsslider/readme.txt 2012-02-07 20:07:12 UTC (rev 8902)
@@ -24,9 +24,9 @@
.S3Slider
Images are located in the directory modules/newsslider/images/s3.
Five featured Images, named from image1.jpg to image5.jpg, have following dimensions: 410 x 300px.
-.bxSlider
+.bxSlider (beta!)
Images are named in the same manner and are located in the same directory as for Featured Content Slider. They can be of any size.
-(edit:height-Attibut gelöscht wegen Inkompabilität)
+(edit:modified template because of incompability)
Credits and Thanks
@@ -37,8 +37,7 @@
S3Slider : http://www.serie3.info/s3slider/
jQuery bxSlider v3.0 : http://bxslider.com/
News Module : Herve http://xoops.org/
-Maitsco : http://www.maitsco.com/english
-jlmZone : http://www.jlmzone.com/modules/news/
+Free Font Billard : http://www.fontsner.com/font/Billard-3161.html
BETA VERSION
Modified: XoopsModules/newsslider/trunk/newsslider/xoops_version.php
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/xoops_version.php 2012-02-07 19:16:35 UTC (rev 8901)
+++ XoopsModules/newsslider/trunk/newsslider/xoops_version.php 2012-02-07 20:07:12 UTC (rev 8902)
@@ -26,9 +26,9 @@
// ------------------------------------------------------------------------ //
if( ! defined( 'XOOPS_ROOT_PATH' ) ) die( 'XOOPS root path not defined' ) ;
-$modversion['name'] = _NWS_NAME;
+$modversion['name'] = _MI_NWS_NAME;
$modversion['version'] = 1.2;
-$modversion['description'] = _NWS_DESC;
+$modversion['description'] = _MI_NWS_DESC;
$modversion['author'] = "Yerres";
$modversion['help'] = "readme.txt";
$modversion['official'] = 0;
@@ -39,7 +39,7 @@
$modversion["license_file"] = XOOPS_URL."/modules/newsslider/gpl.txt";
$modversion["release"] = "2012-01-30";
-$modversion["module_status"] = "1.2";
+$modversion["module_status"] = "beta";
// Sql
// Admin things
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
8 messages has been excluded from this view by a project administrator.
