Menu
▾
▴
xoops-svn
|
From: <dj...@us...> - 2012-05-01 17:40:22
|
Revision: 9421
http://xoops.svn.sourceforge.net/xoops/?rev=9421&view=rev
Author: djculex
Date: 2012-05-01 17:40:16 +0000 (Tue, 01 May 2012)
Log Message:
-----------
Bugfix: Problems with wrong username in image uploads->wall Updates
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/include/functions.php
XoopsModules/smallworld/trunk/smallworld/index.php
XoopsModules/smallworld/trunk/smallworld/loadmore.php
XoopsModules/smallworld/trunk/smallworld/message_ajax.php
XoopsModules/smallworld/trunk/smallworld/userprofile.php
Modified: XoopsModules/smallworld/trunk/smallworld/include/functions.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/include/functions.php 2012-05-01 17:36:52 UTC (rev 9420)
+++ XoopsModules/smallworld/trunk/smallworld/include/functions.php 2012-05-01 17:40:16 UTC (rev 9421)
@@ -227,16 +227,18 @@
// Return only url/link
// If url is image link return <img>
-function smallworld_tolink($text)
+function smallworld_tolink($text, $uid)
{
global $xoopsUser;
$ext = substr($text,-4,4);
$ext2 = substr($text,-5,5);
+ $usr = new $xoopsUser($uid);
+
$userID = $xoopsUser->getVar('uid');
$user = new XoopsUser($userID);
$username = $user->getVar('uname');
- $gallery = XOOPS_URL."/modules/smallworld/galleryshow.php?username=".$username;
+ $gallery = XOOPS_URL."/modules/smallworld/galleryshow.php?username=".$usr->getVar('uname');
if (in_array($ext,array('.jpg','.bmp','.gif','.png')) || in_array($ext2,array('.jpeg'))){
if (strpos($text, 'UPLIMAGE') !== false ) {
@@ -244,7 +246,7 @@
$text = preg_replace('/(((f|ht){1}tp:\/\/)[-a-zA-Z0-9@:%_\+.~#?&\/\/=]+)/i',
'<span class="smallworldUplImgTxt"><br/><img class="smallworldAttImg" src="\\1"><br><br><a id="smallworldUplImgLnk" href="'
. $gallery . '" target="_SELF">'
- . $username . _SMALLWORLD_UPLOADEDSOMEIMAGES
+ . $usr->getVar('uname') . _SMALLWORLD_UPLOADEDSOMEIMAGES
. '</a><br></span>', $text
);
$text = preg_replace('/(((f|ht){1}tps:\/\/)[-a-zA-Z0-9@:%_\+.~#?&\/\/=]+)/i',
Modified: XoopsModules/smallworld/trunk/smallworld/index.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/index.php 2012-05-01 17:36:52 UTC (rev 9420)
+++ XoopsModules/smallworld/trunk/smallworld/index.php 2012-05-01 17:40:16 UTC (rev 9421)
@@ -73,7 +73,7 @@
foreach ($updatesarray as $data) {
$wm['msg_id'] = $data['msg_id'];
$wm['orimessage'] = str_replace(array("\r", "\n"), '',Smallworld_stripWordsKeepUrl($data['message']));
- $wm['message'] = smallworld_tolink(htmlspecialchars_decode($data['message']));
+ $wm['message'] = smallworld_tolink(htmlspecialchars_decode($data['message']), $data['uid_fk']);
$wm['message'] = str_replace(array('<','>'),array('<','>'), $wm['message']);
$wm['created'] = smallworld_time_stamp($data['created']);
$wm['username'] = $data['username'];
Modified: XoopsModules/smallworld/trunk/smallworld/loadmore.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/loadmore.php 2012-05-01 17:36:52 UTC (rev 9420)
+++ XoopsModules/smallworld/trunk/smallworld/loadmore.php 2012-05-01 17:40:16 UTC (rev 9421)
@@ -64,7 +64,7 @@
foreach ($updatesarray as $data) {
$wm['msg_id'] = $data['msg_id'];
$wm['orimessage'] = str_replace(array("\r", "\n"), '',$data['message']);
- $wm['message'] = smallworld_tolink(htmlentities($data['message']));
+ $wm['message'] = smallworld_tolink(htmlentities($data['message']), $data['uid_fk']);
$wm['created'] = smallworld_time_stamp($data['created']);
$wm['username'] = $data['username'];
$wm['uid_fk'] = $data['uid_fk'];
Modified: XoopsModules/smallworld/trunk/smallworld/message_ajax.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/message_ajax.php 2012-05-01 17:36:52 UTC (rev 9420)
+++ XoopsModules/smallworld/trunk/smallworld/message_ajax.php 2012-05-01 17:40:16 UTC (rev 9421)
@@ -57,7 +57,7 @@
foreach ($insdata as $data) {
$wm['msg_id'] = $data['msg_id'];
$wm['orimessage'] = str_replace(array("\r", "\n"), '',$data['message']);
- $wm['message'] = smallworld_tolink(htmlspecialchars_decode($data['message']));
+ $wm['message'] = smallworld_tolink(htmlspecialchars_decode($data['message']), $data['uid_fk']);
$wm['created'] = smallworld_time_stamp($data['created']);
$wm['username'] = $data['username'];
$wm['uid_fk'] = $data['uid_fk'];
Modified: XoopsModules/smallworld/trunk/smallworld/userprofile.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/userprofile.php 2012-05-01 17:36:52 UTC (rev 9420)
+++ XoopsModules/smallworld/trunk/smallworld/userprofile.php 2012-05-01 17:40:16 UTC (rev 9421)
@@ -112,7 +112,7 @@
foreach ($updatesarray as $data) {
$wm['msg_id'] = $data['msg_id'];
$wm['orimessage'] = str_replace(array("\r", "\n"), '',$data['message']);
- $wm['message'] = smallworld_tolink(htmlspecialchars_decode($data['message']));
+ $wm['message'] = smallworld_tolink(htmlspecialchars_decode($data['message']), $data['uid_fk']);
$wm['created'] = smallworld_time_stamp($data['created']);
$wm['username'] = $data['username'];
$wm['uid_fk'] = $data['uid_fk'];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-05-02 12:46:01
|
Revision: 9424
http://xoops.svn.sourceforge.net/xoops/?rev=9424&view=rev
Author: djculex
Date: 2012-05-02 12:45:54 +0000 (Wed, 02 May 2012)
Log Message:
-----------
Bugfix: More utf-8 special entities not displayed correct
Modified Paths:
--------------
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
Modified: XoopsModules/smallworld/trunk/smallworld/loadmore.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/loadmore.php 2012-05-01 23:12:18 UTC (rev 9423)
+++ XoopsModules/smallworld/trunk/smallworld/loadmore.php 2012-05-02 12:45:54 UTC (rev 9424)
@@ -64,7 +64,7 @@
foreach ($updatesarray as $data) {
$wm['msg_id'] = $data['msg_id'];
$wm['orimessage'] = str_replace(array("\r", "\n"), '',$data['message']);
- $wm['message'] = smallworld_tolink(htmlentities($data['message']), $data['uid_fk']);
+ $wm['message'] = smallworld_tolink(htmlspecialchars_decode($data['message']));
$wm['created'] = smallworld_time_stamp($data['created']);
$wm['username'] = $data['username'];
$wm['uid_fk'] = $data['uid_fk'];
@@ -91,7 +91,7 @@
foreach($wm['commentsarray'] as $cdata) {
$wc['msg_id_fk'] = $cdata['msg_id_fk'];
$wc['com_id'] = $cdata['com_id'];
- $wc['comment'] = smallworld_tolink(htmlentities($cdata['comment'] ));
+ $wc['comment'] = smallworld_tolink(htmlspecialchars_decode($cdata['comment'] ));
$wc['time'] = smallworld_time_stamp($cdata['created']);
$wc['username'] = $cdata['username'];
$wc['uid'] = $cdata['uid_fk'];
Modified: XoopsModules/smallworld/trunk/smallworld/message_ajax.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/message_ajax.php 2012-05-01 23:12:18 UTC (rev 9423)
+++ XoopsModules/smallworld/trunk/smallworld/message_ajax.php 2012-05-02 12:45:54 UTC (rev 9424)
@@ -57,7 +57,7 @@
foreach ($insdata as $data) {
$wm['msg_id'] = $data['msg_id'];
$wm['orimessage'] = str_replace(array("\r", "\n"), '',$data['message']);
- $wm['message'] = smallworld_tolink(htmlspecialchars_decode($data['message']), $data['uid_fk']);
+ $wm['message'] = smallworld_tolink(htmlspecialchars_decode($data['message']));
$wm['created'] = smallworld_time_stamp($data['created']);
$wm['username'] = $data['username'];
$wm['uid_fk'] = $data['uid_fk'];
Modified: XoopsModules/smallworld/trunk/smallworld/permalink.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/permalink.php 2012-05-01 23:12:18 UTC (rev 9423)
+++ XoopsModules/smallworld/trunk/smallworld/permalink.php 2012-05-02 12:45:54 UTC (rev 9424)
@@ -69,7 +69,7 @@
foreach ($updatesarray as $data) {
$wm['msg_id'] = $data['msg_id'];
$wm['orimessage'] = str_replace(array("\r", "\n"), '',Smallworld_stripWordsKeepUrl($data['message']));
- $wm['message'] = smallworld_tolink(htmlentities($data['message']));
+ $wm['message'] = smallworld_tolink(htmlspecialchars_decode($data['message']));
$wm['created'] = smallworld_time_stamp($data['created']);
$wm['username'] = $data['username'];
$wm['uid_fk'] = $data['uid_fk'];
@@ -92,7 +92,7 @@
foreach($wm['commentsarray'] as $cdata) {
$wc['msg_id_fk'] = $cdata['msg_id_fk'];
$wc['com_id'] = $cdata['com_id'];
- $wc['comment'] = smallworld_tolink(htmlentities($cdata['comment'] ));
+ $wc['comment'] = smallworld_tolink(htmlspecialchars_decode($cdata['comment'] ));
$wc['time'] = smallworld_time_stamp($cdata['created']);
$wc['username'] = $cdata['username'];
$wc['uid'] = $cdata['uid_fk'];
Modified: XoopsModules/smallworld/trunk/smallworld/smallworldshare.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/smallworldshare.php 2012-05-01 23:12:18 UTC (rev 9423)
+++ XoopsModules/smallworld/trunk/smallworld/smallworldshare.php 2012-05-02 12:45:54 UTC (rev 9424)
@@ -44,7 +44,7 @@
$wm['msg_id'] = $data['msg_id'];
$wm['orimessage'] = str_replace(array("\r", "\n"), '',Smallworld_stripWordsKeepUrl($data['message']));
$wm['message'] = str_replace(array('<','>'),array('<','>'),$data['message']);
- $wm['message'] = Smallworld_cleanup($wm['message']);
+ $wm['message'] = Smallworld_cleanup(htmlspecialchars_decode($data['message']), $data['uid_fk']);
$wm['created'] = smallworld_time_stamp($data['created']);
$wm['username'] = $data['username'];
$wm['uid_fk'] = $data['uid_fk'];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-05-02 15:28:30
|
Revision: 9425
http://xoops.svn.sourceforge.net/xoops/?rev=9425&view=rev
Author: djculex
Date: 2012-05-02 15:28:19 +0000 (Wed, 02 May 2012)
Log Message:
-----------
Bugfix: utf-8 chars
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/comment_ajax.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/userprofile.php
Modified: XoopsModules/smallworld/trunk/smallworld/comment_ajax.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/comment_ajax.php 2012-05-02 12:45:54 UTC (rev 9424)
+++ XoopsModules/smallworld/trunk/smallworld/comment_ajax.php 2012-05-02 15:28:19 UTC (rev 9425)
@@ -51,7 +51,7 @@
if($data) {
$wc['msg_id_fk'] = $data['msg_id_fk'];
$wc['com_id'] = $data['com_id'];
- $wc['comment'] = smallworld_tolink(htmlspecialchars_decode($data['comment'] ));
+ $wc['comment'] = smallworld_tolink(htmlspecialchars_decode($data['comment']), $data['uid']);
$wc['time'] = smallworld_time_stamp($data['created']);
$wc['username'] = $data['username'];
$wc['uid'] = $data['uid_fk'];
Modified: XoopsModules/smallworld/trunk/smallworld/index.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/index.php 2012-05-02 12:45:54 UTC (rev 9424)
+++ XoopsModules/smallworld/trunk/smallworld/index.php 2012-05-02 15:28:19 UTC (rev 9425)
@@ -99,7 +99,7 @@
foreach($wm['commentsarray'] as $cdata) {
$wc['msg_id_fk'] = $cdata['msg_id_fk'];
$wc['com_id'] = $cdata['com_id'];
- $wc['comment'] = smallworld_tolink(htmlspecialchars_decode($cdata['comment'] ));
+ $wc['comment'] = smallworld_tolink(htmlspecialchars_decode($cdata['comment']),$cdata['uid_fk']);
$wc['time'] = smallworld_time_stamp($cdata['created']);
$wc['username'] = $cdata['username'];
$wc['uid'] = $cdata['uid_fk'];
Modified: XoopsModules/smallworld/trunk/smallworld/loadmore.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/loadmore.php 2012-05-02 12:45:54 UTC (rev 9424)
+++ XoopsModules/smallworld/trunk/smallworld/loadmore.php 2012-05-02 15:28:19 UTC (rev 9425)
@@ -64,7 +64,7 @@
foreach ($updatesarray as $data) {
$wm['msg_id'] = $data['msg_id'];
$wm['orimessage'] = str_replace(array("\r", "\n"), '',$data['message']);
- $wm['message'] = smallworld_tolink(htmlspecialchars_decode($data['message']));
+ $wm['message'] = smallworld_tolink(htmlspecialchars_decode($data['message']), $data['uid_fk']);
$wm['created'] = smallworld_time_stamp($data['created']);
$wm['username'] = $data['username'];
$wm['uid_fk'] = $data['uid_fk'];
@@ -91,7 +91,7 @@
foreach($wm['commentsarray'] as $cdata) {
$wc['msg_id_fk'] = $cdata['msg_id_fk'];
$wc['com_id'] = $cdata['com_id'];
- $wc['comment'] = smallworld_tolink(htmlspecialchars_decode($cdata['comment'] ));
+ $wc['comment'] = smallworld_tolink(htmlspecialchars_decode($cdata['comment']),$cdata['uid_fk']);
$wc['time'] = smallworld_time_stamp($cdata['created']);
$wc['username'] = $cdata['username'];
$wc['uid'] = $cdata['uid_fk'];
Modified: XoopsModules/smallworld/trunk/smallworld/message_ajax.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/message_ajax.php 2012-05-02 12:45:54 UTC (rev 9424)
+++ XoopsModules/smallworld/trunk/smallworld/message_ajax.php 2012-05-02 15:28:19 UTC (rev 9425)
@@ -57,7 +57,7 @@
foreach ($insdata as $data) {
$wm['msg_id'] = $data['msg_id'];
$wm['orimessage'] = str_replace(array("\r", "\n"), '',$data['message']);
- $wm['message'] = smallworld_tolink(htmlspecialchars_decode($data['message']));
+ $wm['message'] = smallworld_tolink(htmlspecialchars_decode($data['message']), $data['uid_fk']);
$wm['created'] = smallworld_time_stamp($data['created']);
$wm['username'] = $data['username'];
$wm['uid_fk'] = $data['uid_fk'];
@@ -84,7 +84,7 @@
foreach($wm['commentsarray'] as $cdata) {
$wc['msg_id_fk'] = $cdata['msg_id_fk'];
$wc['com_id'] = $cdata['com_id'];
- $wc['comment'] = smallworld_tolink(htmlspecialchars_decode($cdata['comment'] ));
+ $wc['comment'] = smallworld_tolink(htmlspecialchars_decode($cdata['comment']), $cdata['uid_fk']);
$wc['time'] = smallworld_time_stamp($cdata['created']);
$wc['username'] = $cdata['username'];
$wc['uid'] = $cdata['uid_fk'];
Modified: XoopsModules/smallworld/trunk/smallworld/permalink.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/permalink.php 2012-05-02 12:45:54 UTC (rev 9424)
+++ XoopsModules/smallworld/trunk/smallworld/permalink.php 2012-05-02 15:28:19 UTC (rev 9425)
@@ -69,7 +69,7 @@
foreach ($updatesarray as $data) {
$wm['msg_id'] = $data['msg_id'];
$wm['orimessage'] = str_replace(array("\r", "\n"), '',Smallworld_stripWordsKeepUrl($data['message']));
- $wm['message'] = smallworld_tolink(htmlspecialchars_decode($data['message']));
+ $wm['message'] = smallworld_tolink(htmlspecialchars_decode($data['message']), $data['uid_fk']);
$wm['created'] = smallworld_time_stamp($data['created']);
$wm['username'] = $data['username'];
$wm['uid_fk'] = $data['uid_fk'];
@@ -92,7 +92,7 @@
foreach($wm['commentsarray'] as $cdata) {
$wc['msg_id_fk'] = $cdata['msg_id_fk'];
$wc['com_id'] = $cdata['com_id'];
- $wc['comment'] = smallworld_tolink(htmlspecialchars_decode($cdata['comment'] ));
+ $wc['comment'] = smallworld_tolink(htmlspecialchars_decode($cdata['comment']), $cdata['uid_fk']);
$wc['time'] = smallworld_time_stamp($cdata['created']);
$wc['username'] = $cdata['username'];
$wc['uid'] = $cdata['uid_fk'];
Modified: XoopsModules/smallworld/trunk/smallworld/userprofile.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/userprofile.php 2012-05-02 12:45:54 UTC (rev 9424)
+++ XoopsModules/smallworld/trunk/smallworld/userprofile.php 2012-05-02 15:28:19 UTC (rev 9425)
@@ -138,7 +138,7 @@
foreach($wm['commentsarray'] as $cdata) {
$wc['msg_id_fk'] = $cdata['msg_id_fk'];
$wc['com_id'] = $cdata['com_id'];
- $wc['comment'] = smallworld_tolink(htmlspecialchars_decode($cdata['comment'] ));
+ $wc['comment'] = smallworld_tolink(htmlspecialchars_decode($cdata['comment']), $cdata['uid_fk']);
$wc['time'] = smallworld_time_stamp($cdata['created']);
$wc['username'] = $cdata['username'];
$wc['uid'] = $cdata['uid_fk'];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-05-03 20:25:28
|
Revision: 9433
http://xoops.svn.sourceforge.net/xoops/?rev=9433&view=rev
Author: djculex
Date: 2012-05-03 17:42:04 +0000 (Thu, 03 May 2012)
Log Message:
-----------
- Bugfix: Corrected image styling (Thx Yuri)
- Bugfix: removed extra divs & closing correctly span (thx Yuri)
- Bugfix: Checking for null values in jquery.oembed.js
- Bugfix: Breaking jquery without adding jquery.coundown.js to core.php
- Bugfix: Correcting how smallworld_getAvatarLink handles non-image values
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/class/adminclass.php
XoopsModules/smallworld/trunk/smallworld/class/profile.php
XoopsModules/smallworld/trunk/smallworld/include/functions.php
XoopsModules/smallworld/trunk/smallworld/js/jquery.oembed.js
XoopsModules/smallworld/trunk/smallworld/preloads/core.php
XoopsModules/smallworld/trunk/smallworld/search.php
XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_template.html
XoopsModules/smallworld/trunk/smallworld/xoops_version.php
Modified: XoopsModules/smallworld/trunk/smallworld/class/adminclass.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/class/adminclass.php 2012-05-03 15:02:09 UTC (rev 9432)
+++ XoopsModules/smallworld/trunk/smallworld/class/adminclass.php 2012-05-03 17:42:04 UTC (rev 9433)
@@ -152,7 +152,7 @@
$i = 1;
while ($row = $xoopsDB->fetchArray($result)) {
$msg["counter"][$i] = $i;
- $msg["img"][$i] = "<img style='margin:0px 5px;' src = '../images/".$i.".png'></img>";
+ $msg["img"][$i] = "<img style='margin:0px 5px;' src = '../images/".$i.".png'/>";
if ($msg['counter'][$i] > 3) {
$msg["img"][$i] = '';
}
@@ -190,7 +190,7 @@
$i = 1;
while ($row = $xoopsDB->fetchArray($result)) {
$msgtoday["counter"][$i] = $i;
- $msgtoday["img"][$i] = "<img style='margin:0px 5px;' src = '../images/".$i.".png'></img>";
+ $msgtoday["img"][$i] = "<img style='margin:0px 5px;' src = '../images/".$i.".png'/>";
if ($msgtoday['counter'][$i] > 3) {
$msgtoday["img"][$i] = '';
}
@@ -224,7 +224,7 @@
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>";
+ . "style='margin:0px 5px;' src = '../images/like.png'/>";
if ($array['counter'][$i] > 3) {
$array["img"][$i] = '';
}
@@ -245,7 +245,7 @@
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>";
+ . "style='margin:0px 5px;' src = '../images/dislike.png'/>";
if ($array['counter'][$i] > 3) {
$array["img"][$i] = '';
}
Modified: XoopsModules/smallworld/trunk/smallworld/class/profile.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/class/profile.php 2012-05-03 15:02:09 UTC (rev 9432)
+++ XoopsModules/smallworld/trunk/smallworld/class/profile.php 2012-05-03 17:42:04 UTC (rev 9433)
@@ -66,12 +66,12 @@
$rank = $user->rank();
$rank_title = $rank['title'];
if (isset($rank['image'])) {
- $rank_image = "<img align='center' src='".XOOPS_UPLOAD_URL."/".$rank['image']."'></img>";
+ $rank_image = "<img align='center' src='".XOOPS_UPLOAD_URL."/".$rank['image']."'/>";
} else {
$rank_image = '';
}
- $commentsrating = "<img src='".XOOPS_URL."/modules/smallworld/images/like.png' height='10px'width='10px'"."/></img> ".$usersratedplus;
- $commentsrating .= " <img src='".XOOPS_URL."/modules/smallworld/images/dislike.png' height='10px'width='10px'"."/></img> ".$usersratedminus;
+ $commentsrating = "<img src='".XOOPS_URL."/modules/smallworld/images/like.png' height='10px' width='10px'"."/></img> ".$usersratedplus;
+ $commentsrating .= " <img src='".XOOPS_URL."/modules/smallworld/images/dislike.png' height='10px' width='10px'"."/></img> ".$usersratedminus;
$lastlogin = $user->getVar('last_login');
$gender = $r['gender'];
@@ -90,7 +90,7 @@
$avatar = $Wall->Gravatar($id);
$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>";
+ $user_img = "<img src='".smallworld_getAvatarLink($id, $avatar)."' id='smallworld_user_img' ".$avatar_highwide."/>";
$currentcity = $r['present_city'];
$currlng = $r['present_lng'];
Modified: XoopsModules/smallworld/trunk/smallworld/include/functions.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/include/functions.php 2012-05-03 15:02:09 UTC (rev 9432)
+++ XoopsModules/smallworld/trunk/smallworld/include/functions.php 2012-05-03 17:42:04 UTC (rev 9433)
@@ -367,33 +367,51 @@
return $retval;
}
+/**
+ * Check image extension and users gender. If image is legal image extension return avatar,
+ else return default gender based image
+ * @param int $userid
+ * @param string $image
+ * @returns string
+ */
function smallworld_getAvatarLink($userid, $image)
{
- global $xoopsUser, $xoopsDB;
+ global $xoopsUser, $xoopsDB;
+ $ext = pathinfo(strtolower($image), PATHINFO_EXTENSION);
$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";
- }
+ if (!in_array($ext,array('jpg','bmp','gif','png','jpeg')) || $image == '' || $image == "blank.gif"){
+ if ($ext == '' || $gender == '1') {
+ $link = XOOPS_URL."/modules/smallworld/images/ano_woman.png";
+ }
+
+ if ($ext == '' AND $gender == '1') {
+ $link = XOOPS_URL."/modules/smallworld/images/ano_woman.png";
+ }
+
+ if ($ext == '' AND $gender == '2') {
+ $link = XOOPS_URL."/modules/smallworld/images/ano_man.png";
+ }
+ if ($ext == '' AND $gender == '1') {
+ $link = XOOPS_URL."/modules/smallworld/images/ano_woman.png";
+ }
+ if ($ext == '' AND $gender == '2') {
+ $link = XOOPS_URL."/modules/smallworld/images/ano_man.png";
+ }
+
+ if ($ext == '' AND $gender == '') {
+ $link = XOOPS_URL."/modules/smallworld/images/genderless.png";
+ }
+
+ if ($ext == '' AND $gender == '') {
+ $link = XOOPS_URL."/modules/smallworld/images/genderless.png";
+ }
+ }
return $link;
}
Modified: XoopsModules/smallworld/trunk/smallworld/js/jquery.oembed.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/js/jquery.oembed.js 2012-05-03 15:02:09 UTC (rev 9432)
+++ XoopsModules/smallworld/trunk/smallworld/js/jquery.oembed.js 2012-05-03 17:42:04 UTC (rev 9433)
@@ -130,7 +130,7 @@
return false;
}
var result;
- if(embedProvider.yql.xpath && embedProvider.yql.xpath=='//meta'){
+ if(embedProvider.yql.xpath && embedProvider.yql.xpath=='//meta' && data.query.results){
var meta={};
for(var i=0, l=data.query.results.meta.length; i<l; i++){
var name = data.query.results.meta[i].name||data.query.results.meta[i].property||null;
@@ -621,6 +621,7 @@
new xoops_smallworld.fn.oembed.OEmbedProvider("opengraph", "rich", [".*"], null,
{yql:{xpath:"//meta", from:'html'
, datareturn:function(results){
+ if(results == null)return false;
if(!results['og:title'] && results['title'] &&results['description'])results['og:title']=results['title'];
if(!results['og:title'] && !results['title'])return false;
var code = xoops_smallworld('<p/>');
Modified: XoopsModules/smallworld/trunk/smallworld/preloads/core.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/preloads/core.php 2012-05-03 15:02:09 UTC (rev 9432)
+++ XoopsModules/smallworld/trunk/smallworld/preloads/core.php 2012-05-03 17:42:04 UTC (rev 9433)
@@ -114,6 +114,9 @@
$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.countdown.js');
$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.innerfade.js');
*/
+
+ $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.countdown.js');
+
if ( file_exists(XOOPS_ROOT_PATH.'/modules/smallworld/language/'.$xoopsConfig['language'].'/js/jquery.ui.datepicker-language.js')) {
$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/language/'.$xoopsConfig['language'].'/js/jquery.ui.datepicker-language.js');
$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/language/'.$xoopsConfig['language'].'/js/jquery.countdown.js');
Modified: XoopsModules/smallworld/trunk/smallworld/search.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/search.php 2012-05-03 15:02:09 UTC (rev 9432)
+++ XoopsModules/smallworld/trunk/smallworld/search.php 2012-05-03 17:42:04 UTC (rev 9433)
@@ -41,13 +41,13 @@
$image = '<img src="'.XOOPS_URL.'/uploads/'.$row['userimage'].'" '.$imageHw.'/>';
} else {
if ($row['gender'] == 1) {
- $image = "<img src='".XOOPS_URL."/modules/smallworld/images/ano_woman.png'"." height='30px' width='30px'/></img>";
+ $image = "<img src='".XOOPS_URL."/modules/smallworld/images/ano_woman.png'"." height='30px' width='30px'/>";
}
if ($row['gender'] == 2) {
- $image = "<img src='".XOOPS_URL."/modules/smallworld/images/ano_man.png'"." height='30px' width='30px'/></img>";
+ $image = "<img src='".XOOPS_URL."/modules/smallworld/images/ano_man.png'"." height='30px' width='30px'/>";
}
if ($row['gender'] == 0) {
- $image = "<img src='".XOOPS_URL."/modules/smallworld/images/genderless.png'"." height='30px' width='30px'/></img>";
+ $image = "<img src='".XOOPS_URL."/modules/smallworld/images/genderless.png'"." height='30px' width='30px'/>";
}
}
Modified: XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_template.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_template.html 2012-05-03 15:02:09 UTC (rev 9432)
+++ XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_template.html 2012-05-03 17:42:04 UTC (rev 9433)
@@ -24,7 +24,7 @@
<{if $username == $myusername OR $isadminuser == 'YES'}>
<div class="UploadNewAvatar" id="<{$ownerofpage}>" style="display:none">
<div id="smallworld_avatarupload" >
- <span>Upload File<span>
+ <span>Upload File</span>
</div>
<span id="smallworld_avatarstatus" ></span>
<ul id="smallworld_avatarfiles" ></ul>
@@ -645,5 +645,4 @@
<{/foreach}>
</table>
<div id="smallworldStatsDiv" title="<{$smarty.const._SMALLWORLD_STATS}>" style="display:none;"></div>
- <div id="smallworld_recentactivitiesDiv" title="<{$smarty.const._SMALLWORLD_STATS}>" style="display:none;"></div>
- </div>
\ No newline at end of file
+ <div id="smallworld_recentactivitiesDiv" title="<{$smarty.const._SMALLWORLD_STATS}>" style="display:none;"></div>
\ No newline at end of file
Modified: XoopsModules/smallworld/trunk/smallworld/xoops_version.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/xoops_version.php 2012-05-03 15:02:09 UTC (rev 9432)
+++ XoopsModules/smallworld/trunk/smallworld/xoops_version.php 2012-05-03 17:42:04 UTC (rev 9433)
@@ -24,7 +24,7 @@
$modversion['description'] = _MI_SMALLWORLD_MODULE_DESC;
$modversion['author'] = "Michael Albertsen";
$modversion['nickname'] = 'Culex';
-$modversion['credits'] = "Mariane, Mrsculex, Mamba, Rune";
+$modversion['credits'] = "Mariane, Mrsculex, Mamba, Rune, Zyth";
$modversion['module_website_name'] = 'www.culex.dk';
$modversion['module_website_url'] = 'http://www.culex.dk';
$modversion['license'] = 'GNU GPL';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-05-05 02:42:13
|
Revision: 9435
http://xoops.svn.sourceforge.net/xoops/?rev=9435&view=rev
Author: djculex
Date: 2012-05-05 02:42:04 +0000 (Sat, 05 May 2012)
Log Message:
-----------
- Bugfix: Added a complete event handler to register.php + disable input submit in case of error
- Bugfix: Submit register and edit profile is not Json
- Bugfix: Some html malformed functions
- NEW added russian language (Thanks Yura)
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/class/profile.php
XoopsModules/smallworld/trunk/smallworld/class/user.php
XoopsModules/smallworld/trunk/smallworld/js/smallworld.js
XoopsModules/smallworld/trunk/smallworld/register.php
Added Paths:
-----------
XoopsModules/smallworld/trunk/smallworld/language/russian/
XoopsModules/smallworld/trunk/smallworld/language/russian/admin.php
XoopsModules/smallworld/trunk/smallworld/language/russian/help/
XoopsModules/smallworld/trunk/smallworld/language/russian/help/help.html
XoopsModules/smallworld/trunk/smallworld/language/russian/help/index.html
XoopsModules/smallworld/trunk/smallworld/language/russian/index.html
XoopsModules/smallworld/trunk/smallworld/language/russian/js/
XoopsModules/smallworld/trunk/smallworld/language/russian/js/index.html
XoopsModules/smallworld/trunk/smallworld/language/russian/js/jquery.countdown.js
XoopsModules/smallworld/trunk/smallworld/language/russian/js/jquery.ui.datepicker-language.js
XoopsModules/smallworld/trunk/smallworld/language/russian/js/variables.js
XoopsModules/smallworld/trunk/smallworld/language/russian/mailTpl/
XoopsModules/smallworld/trunk/smallworld/language/russian/mailTpl/index.html
XoopsModules/smallworld/trunk/smallworld/language/russian/mailTpl/mail_attencionneeded.html
XoopsModules/smallworld/trunk/smallworld/language/russian/mailTpl/mail_complaint.html
XoopsModules/smallworld/trunk/smallworld/language/russian/mailTpl/mail_newcomment.html
XoopsModules/smallworld/trunk/smallworld/language/russian/mailTpl/mail_register.html
XoopsModules/smallworld/trunk/smallworld/language/russian/main.php
XoopsModules/smallworld/trunk/smallworld/language/russian/modinfo.php
Modified: XoopsModules/smallworld/trunk/smallworld/class/profile.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/class/profile.php 2012-05-04 17:09:44 UTC (rev 9434)
+++ XoopsModules/smallworld/trunk/smallworld/class/profile.php 2012-05-05 02:42:04 UTC (rev 9435)
@@ -70,8 +70,8 @@
} else {
$rank_image = '';
}
- $commentsrating = "<img src='".XOOPS_URL."/modules/smallworld/images/like.png' height='10px' width='10px'"."/></img> ".$usersratedplus;
- $commentsrating .= " <img src='".XOOPS_URL."/modules/smallworld/images/dislike.png' height='10px' width='10px'"."/></img> ".$usersratedminus;
+ $commentsrating = "<img src='".XOOPS_URL."/modules/smallworld/images/like.png' height='10px' width='10px'"."/> ".$usersratedplus;
+ $commentsrating .= " <img src='".XOOPS_URL."/modules/smallworld/images/dislike.png' height='10px' width='10px'"."/> ".$usersratedminus;
$lastlogin = $user->getVar('last_login');
$gender = $r['gender'];
Modified: XoopsModules/smallworld/trunk/smallworld/class/user.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/class/user.php 2012-05-04 17:09:44 UTC (rev 9434)
+++ XoopsModules/smallworld/trunk/smallworld/class/user.php 2012-05-05 02:42:04 UTC (rev 9435)
@@ -169,7 +169,7 @@
while ($row = $xoopsDB->fetchArray($result) AND $start <= count($row)) {
$msg[$start]['friendname'] = $this->getName($row['me']);
$msg[$start]['img'] = $Wall->Gravatar($row['me']);
- $msg[$start]['friendimage'] = "<img src='".XOOPS_UPLOAD_URL."/".$msg[$start]['img']."' height='40px'></img>";
+ $msg[$start]['friendimage'] = "<img src='".XOOPS_UPLOAD_URL."/".$msg[$start]['img']."' height='40px'/>";
$msg[$start]['frienddate'] = date('d-m-Y',$row['date']);
$msg[$start]['accept'] = '<a id="smallworldrequestlink" href = "javascript:AcceptDenyFriend(1,'.$row['me'].','.$row['you'].','.$start.');">'._SMALLWORLD_ACCEPT.'</a>';
$msg[$start]['deny'] = '<a id="smallworldrequestlink" href = "javascript:AcceptDenyFriend(-1,'.$row['me'].','.$row['you'].','.$start.');">'._SMALLWORLD_DENY.'</a>';
Modified: XoopsModules/smallworld/trunk/smallworld/js/smallworld.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2012-05-04 17:09:44 UTC (rev 9434)
+++ XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2012-05-05 02:42:04 UTC (rev 9435)
@@ -403,15 +403,19 @@
var dataString = xoops_smallworld("#smallworld_profileform").serialize();
if (dataString == '') {
} else {
+ xoops_smallworld('.smallworld_finish').attr('disabled',true);
xoops_smallworld.ajax({
type: "POST",
- dataType: 'json',
+ //dataType: 'json',
cache: false,
url: smallworld_url+"submit.php",
data: dataString,
success: function(){
- location.href = smallworld_url+'index.php';
- }
+ alert(SmallworldSavedSuccesMsg);
+ },
+ complete: function() {
+ location.href = smallworld_url+'index.php';
+ }
});
}
});
Added: XoopsModules/smallworld/trunk/smallworld/language/russian/admin.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/russian/admin.php (rev 0)
+++ XoopsModules/smallworld/trunk/smallworld/language/russian/admin.php 2012-05-05 02:42:04 UTC (rev 9435)
@@ -0,0 +1,82 @@
+<?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.
+* 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: 8904 $
+* @Last changed by: $Author: djculex $
+* @Last changed date: $Date: 2012-02-07 22:12:44 +0100 (ti, 07 feb 2012) $
+* @ID: $Id: admin.php 8904 2012-02-07 21:12:44Z djculex $
+**/
+
+
+// English language file for Smallworld Admin.php
+
+// tab titles
+ define('_AM_SMALLWORLD_ADMINMESSAGESEND','Сообщение для всех');
+ define('_AM_SMALLWORLD_LOGSMAINTNANCE','Сопровождение базы данных');
+
+// tab one in admin section
+define('_AM_SMALLWORLD_MODULEINSTALL','Модуль установленной версии');
+define('_AM_SMALLWORLD_INSTALLDATE','Модуль установлен: ');
+define('_AM_SMALLWORLD_DATEOFFIRSTMESSAGE','Дата старого сообщения');
+define('_AM_SMALLWORLD_TOTALUSERS','Всего пользователей, использующих Smallworld');
+define('_AM_SMALLWORLD_AVERAGEMSGPERDAY','Среднее количество сообщений в день');
+define('_AM_SMALLWORLD_TOPCHATTERS','Наиболее активные пользователи');
+define('_AM_SMALLWORLD_TOPCHATTERS_TODAY','Наиболее активные пользователи за последние 24 часа');
+define('_AM_SMALLWORLD_TOPRATEDUSERS','Пользователи с высоким рейтингом');
+define('_AM_SMALLWORLD_BOTTOMRATEDUSERS','Пользователи с низким рейтингом');
+define('_AM_SMALLWORLD_STATISTICS_TITLE','Smallworld статистика');
+define('_AM_SMALLWORLD_MODULEINFO','Информация о модуле');
+define('_AM_SMALLWORLD_USERSTATS','Статистика по пользователям');
+define('_AM_SMALLWORLD_NONEYET','Нет сообщений в базе данных');
+define('_AM_SMALLWORLD_NO','нет');
+define('_AM_SMALLWORLD_THEREARE','Тут');
+define('_AM_SMALLWORLD_UPDATE_STATUS','Стстус версии Smallworld:');
+
+// tab two in admin section
+
+// tab three in admin section
+define('_AM_SMALLWORLD_USERADMIN_TITLE','Управление пользователями');
+define('_AM_SMALLWORLD_USERADMININSPECT_TITLE','Пользователи под проверкой администратора');
+define('_AM_SMALLWORLD_USERADMINNOINSPECT_TITLE','Обычные пользователи');
+define("_AM_SMALLWORLD_TITLE_IMAGE","Пользовательское изображение");
+define("_AM_SMALLWORLD_TITLE_USERNAME","Имя пользователя");
+define("_AM_SMALLWORLD_TITLE_REALNAME","Настоящее имя");
+define("_AM_SMALLWORLD_TITLE_IP","IP");
+define("_AM_SMALLWORLD_TITLE_COMPLAINTS","Жалоб принято");
+define("_AM_SMALLWORLD_TITLE_INSPECTTIME","Время проверки");
+define("_AM_SMALLWORLD_TITLE_INSPECTADD","Добавить время проверки");
+define("_AM_SMALLWORLD_TITLE_DELETEUSER","Удалить аккаунт пользователя");
+define('_AM_SMALLWORLD_TITLE_INSPECTDELETE','Очистить время проверки');
+define('_AM_SMALLWORLD_ADDTIMEDROPDOWN_MINUTES',' Минут');
+define('_AM_SMALLWORLD_ADDTIMEDROPDOWN_NOCHANGE','Нет изменений');
+
+// various others
+define('_AM_SMALLWORLD_UPDATE_CRITICAL_UPD',' Есть критическое обновление!!');
+define('_AM_SMALLWORLD_UPDATE_NORMAL_UPD',' Новая версия доступна для скачивания');
+define('_AM_SMALLWORLD_UPDATE_SERVER_ERROR','Сервер выключени или идет обновление.<br/>Попробуйте позже.');
+define('_AM_SMALLWORLD_UPDATE_FILE_DESC','Описание новой версии');
+define('_AM_SMALLWORLD_UPDATE_SERVER_FILE','Вы можете скачать новую версию здесь');
+define('_AM_SMALLWORLD_UPDATE_YOUHAVENEWESTVERSION',' У вас новая версия Smallworld');
+define('_AM_SMALLWORLD_HELP','Help');
+define('_AM_SMALLWORLD_ADMIN_USERDELETEDALERT',' соотвествующие файлы, каталоги и строки таблицы будут удалены');
+define('_AM_SMALLWORLD_STATS_POS','#');
+define('_AM_SMALLWORLD_STATS_NAME','Имя');
+define('_AM_SMALLWORLD_STATS_AMOUNT','Всего');
+define('_AM_SMALLWORLD_STATS_IMG','Иконка');
+
+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">Если вам нравится этот модуль и работа, которую я вложил в него, вы можете поддержать меня, купив мне чашку кофе.</a>');
+define('_AM_SMALLWORLD_FOOTER', "<div class='center smallsmall italic pad5'>Модуль SmallWorld поддерживается <a class='tooltip' rel='external' href='http://culex.dk/' title='Посетите мой сайт'>Culex</a></div>");
\ No newline at end of file
Added: XoopsModules/smallworld/trunk/smallworld/language/russian/help/help.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/russian/help/help.html (rev 0)
+++ XoopsModules/smallworld/trunk/smallworld/language/russian/help/help.html 2012-05-05 02:42:04 UTC (rev 9435)
@@ -0,0 +1,76 @@
+<div id="help-template" class="outer">
+ <h1 class="head">Help:
+ <a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/smallworld/admin/index.php"
+ title="Вернуться к администрированию SmallWorld"> SmallWorld
+ <img src="<{xoAdminIcons home.png}>"
+ alt="Вернуться к администрированию SmallWorld"/>
+ </a></h1>
+
+ <h4 class="odd">Описание</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>
+
+ <h4 class="odd">Установить/деинсталлировать</h4> <br/>
+
+ Стандартный процесс установки - извлечь в
+ ../modules каталог. Установить
+ модуль через Администрирование -> Системный модуль -> Модули.<br/> <br/>
+
+ Убедитесь, что версия загруженного Smallworld является последней версией.
+ Включите cookie и JavaScript в вашем браузере.<br/> <br/>
+ <b>Installing on a hosted 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>
+ </ul>
+
+ <b>Upgrading from a previous 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>
+ </ul>
+ Detailed instructions on installing modules are available in the
+ <a href="http://goo.gl/adT2i">XOOPS Operations Manual</a> <br/> <br/>
+
+
+ <h4 class="odd">Операции (english)</h4> <br/>
+
+ Detailed instructions on configuring the access rights for user groups are available in the
+ <a href="http://goo.gl/adT2i">XOOPS Operations Manual</a><br/> <br/>
+
+ <h4 class="odd">Решение проблем (english)</h4> <br/>
+
+ <b>I get blank page, can't click username, the block is not visible.......</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>
+ <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>
+ <li>If no errors, use Firebug (Right click->inspect element->console) and see if there are any jQuery errors.
+ </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
+ "Modules out of Dos / Crawler checker".
+ </li>
+ </ul>
+ <br/>
+
+ <h4 class="odd">Руководство</h4>
+
+ <p class="even">Пока не доступно</p>
+
+ <h4 class="odd">Задать вопрос</h4>
+
+ <p class="even">Если у вас есть вопросы, или сообщения об ошибках, задавайте их <a href="http://www.xoops.org/modules/newbb">Форуме Xoops.</a></p>
+
+</div>
\ No newline at end of file
Added: XoopsModules/smallworld/trunk/smallworld/language/russian/help/index.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/russian/help/index.html (rev 0)
+++ XoopsModules/smallworld/trunk/smallworld/language/russian/help/index.html 2012-05-05 02:42:04 UTC (rev 9435)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/smallworld/trunk/smallworld/language/russian/index.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/russian/index.html (rev 0)
+++ XoopsModules/smallworld/trunk/smallworld/language/russian/index.html 2012-05-05 02:42:04 UTC (rev 9435)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/smallworld/trunk/smallworld/language/russian/js/index.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/russian/js/index.html (rev 0)
+++ XoopsModules/smallworld/trunk/smallworld/language/russian/js/index.html 2012-05-05 02:42:04 UTC (rev 9435)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/smallworld/trunk/smallworld/language/russian/js/jquery.countdown.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/russian/js/jquery.countdown.js (rev 0)
+++ XoopsModules/smallworld/trunk/smallworld/language/russian/js/jquery.countdown.js 2012-05-05 02:42:04 UTC (rev 9435)
@@ -0,0 +1,20 @@
+/* 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
+ */
+(function(xoops_smallworld) {
+ xoops_smallworld.countdown.regional['ru'] = {
+ labels: ['Лет', 'Месяцев', 'Недель', 'Дней', 'Часов', 'Минут', 'Секунд'],
+ labels1: ['Год', 'Месяц', 'Неделя', 'День', 'Час', 'Минута', 'Секунда'],
+ compactLabels: ['г', 'м', 'н', 'д','час', 'мин', 'сек'], // The compact texts for the counters
+ whichLabels: null,
+ timeSeparator: ':', isRTL: false};
+ xoops_smallworld.countdown.setDefaults(xoops_smallworld.countdown.regional['ru']);
+})(jQuery);
Added: XoopsModules/smallworld/trunk/smallworld/language/russian/js/jquery.ui.datepicker-language.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/russian/js/jquery.ui.datepicker-language.js (rev 0)
+++ XoopsModules/smallworld/trunk/smallworld/language/russian/js/jquery.ui.datepicker-language.js 2012-05-05 02:42:04 UTC (rev 9435)
@@ -0,0 +1,23 @@
+/* English/UK initialisation for the jQuery UI date picker plugin. */
+/* Written by Stuart. */
+jQuery(function(xoops_smallworld){
+ xoops_smallworld.datepicker.regional['ru-RU'] = {
+ closeText: 'Закрыть',
+ prevText: 'Пред',
+ nextText: 'След',
+ currentText: 'Сегодня',
+ monthNames: ['Январь','Февраль','Март','Апрель','Май','Июнь',
+ 'Июль','Август','Сентябрь','Октябрь','Ноябрь','Декабрь'],
+ monthNamesShort: ['Янв', 'Фев', 'Мар', 'Апр', 'Май', 'Июн',
+ 'Июл', 'Авг', 'Сен', 'Окт', 'Ноя', 'Дек'],
+ dayNames: ['Воскресение', 'Понедельник', 'Вторник', 'Среда', 'Четверг', 'Пятница', 'Суббота'],
+ dayNamesShort: ['Вск', 'Пон', 'Втр', 'Срд', 'Чтв', 'Птн', 'Сбт'],
+ dayNamesMin: ['Su','Mo','Tu','We','Th','Fr','Sa'],
+ weekHeader: 'Нед',
+ dateFormat: 'дд/мм/гг',
+ firstDay: 1,
+ isRTL: false,
+ showMonthAfterYear: false,
+ yearSuffix: ''};
+ xoops_smallworld.datepicker.setDefaults(xoops_smallworld.datepicker.regional['ru-RU']);
+});
Added: XoopsModules/smallworld/trunk/smallworld/language/russian/js/variables.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/russian/js/variables.js (rev 0)
+++ XoopsModules/smallworld/trunk/smallworld/language/russian/js/variables.js 2012-05-05 02:42:04 UTC (rev 9435)
@@ -0,0 +1,56 @@
+// 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 = 'ru';
+var countryshort = 'ru';
+var countrylong = 'russia';
+
+var _smallworldContinueToReg = "Продолжить регистрацию";
+var _smallworldCancel = "Отменить";
+var _smallworldClose = "закрыть";
+
+var _smallworldCommentsMoreMore = "..Показать больше";
+var _smallworldCommentsMoreLess = "..Показать меньше";
+
+var SmallworldGenderError = "Пожалуйста, введите ваш пол";
+var SmallworldBirthdayError = "Пожалуйста, выберите ваш д/р";
+var SmallworldEmailError = "Пожалуйста, введите не менее одного адреса электронной почты";
+
+var SmallworldSavedSuccesMsg = "Сохранено успешно";
+
+var SmallworldConfirmBtnFI = "Вы уверены ?";
+var SmallworldConfirmBtnYes = 'Да!';
+var SmallworldConfirmBtnNo = 'Нет!';
+
+var smallworldNewMessages = "У вас новые события +";
+var smallworldDeletedMessages = "Сообщения были удалены. Счетчик -";
+
+//Validation
+var SmallworldValidationBackButton = "Назад"; // back button
+var SmallworldValidationForwardButton = "Вперед"; // Forward button
+var SmallworldValidationNameErrorMsg = "Пожалуйста, впишите свое имя"; // Real name field
+var SmallworldValidationGenderErrorMsg = "Пожалуйста, выберите нужный пол"; // Choose gender
+var SmallworldValidationIntingenderErrorMsg = "Пожалуйста, выберите не менее одного значения. По-умолчанию 'нет'"; // Interested in gender
+var SmallworldValidationSearchrelatErrorMsg = "Пожалуйста, выберите не менее одного значения. По-умолчанию 'Друзья'"; // Searching for
+var SmallworldValidationBirthdayErrorMsg = "Пожалуйста, выберите корректную дату"; // Birthday
+var SmallworldValidationEmailTitleErrorMsg = "Неправильный формат email";// Emailtype image title
+var SmallworldValidationBirthplaceErrorMsg = "Пожалуйста, введите место рождения"; // Birthplace
+var SmallworldValidationAdressErrorMsg = "Пожалуйста, введите адрес"; // Adress
+var SmallworldValidationCityErrorMsg = "Пожалуйста, введите город"; // City
+var SmallworldValidationCountryErrorMsg = "Пожалуйста, введите страну"; // country
+var SmallworldValidationWebsiteErrorMsg = "Пожалуйста, введите веб-сайт"; // Website
+var SmallworldSureDelete = "Вы уверены, что хотите удалить это обновление? Операция необратима!"; // Delete comments
+var SmallworldAdminSureDeleteUser = "Вы уверены, что хотите удалить пользователя "; //Admin delete user
+var SmallworldDialogStatsTitle = "Статистика"; // Title for statistic dialog window
+// Languages for jquery confirm box
+var args = {
+ 'confirm' : false, // Ok and Cancel buttons
+ 'verify' : true, // Yes and No buttons
+ 'input' : false, // Text input (can be true or string for default text)
+ 'animate' : true, // Groovy animation (can true or number, default is 400)
+ 'textOk' : 'ОК', // Ok button default text
+ 'textCancel' : 'Отмена', // Cancel button default text
+ 'textYes' : 'Да!', // Yes button default text
+ 'textNo' : 'Нет!' // No button default text
+ }
Added: XoopsModules/smallworld/trunk/smallworld/language/russian/mailTpl/index.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/russian/mailTpl/index.html (rev 0)
+++ XoopsModules/smallworld/trunk/smallworld/language/russian/mailTpl/index.html 2012-05-05 02:42:04 UTC (rev 9435)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/smallworld/trunk/smallworld/language/russian/mailTpl/mail_attencionneeded.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/russian/mailTpl/mail_attencionneeded.html (rev 0)
+++ XoopsModules/smallworld/trunk/smallworld/language/russian/mailTpl/mail_attencionneeded.html 2012-05-05 02:42:04 UTC (rev 9435)
@@ -0,0 +1,32 @@
+<html>
+<head>
+<style type="text/css">
+ ol, ul {list-style:none}
+ a {text-decoration: none;color: #1f1f1f;}
+ a:hover {text-decoration: none; color: #5d8ba6;}
+ h4 {font-family: 'Puritan20Normal';font-weight: normal;color: #1f1f1f;margin-bottom: 10px;font-size: 17px;}
+ img.left {top: 0px;float:left;display: block;margin:0;padding:0;margin-right:20px;}
+ #wrapper {width: 960px;margin: 100px auto 0;padding-top: 0;line-height: 20px;background-color:#33FFFF;border-style: groove;border-color:aqua;border-width:medium;}
+ #newslist ul li {width: 850px;px;background: none;margin: 2px 0 18px 2px;background-color: #FFF;-webkit-box-shadow: 0px 1px 2px 0px #b7b7b7;-moz-box-shadow: 0px 1px 2px 0px #b7b7b7;box-shadow: 0px 1px 2px 0px #b7b7b7;padding: 15px;display: block;overflow: hidden;}
+
+ #newslist p {margin: 0;}
+ #newslist h4 {margin-bottom: 8px;line-height: 1;}
+ #newslist h4 span {font-style: italic;font-family: Georgia, "Times New Roman", Times, serif;font-size: 12px;color: #565656;padding-left: 5px;}
+ #news h2 {float: left;margin-top: 10px;}
+ .greeting {margin:0px 0px 0px 25px;}
+ .infotext {margin:10px 0px 0px 25px;}
+ .title2 {margin-bottom: 12px;margin-top: 2px;}
+ .title {margin-bottom: 12px;margin-top: 4px;}
+ </style>
+</head>
+<body>
+<!-- Begin Wrapper -->
+ <div id="wrapper">
+ <br>
+ <p class="greeting">Привет <{$toUser}>,</p>
+ <p class="infotext">ОБНОВЛЕНО: <{$date}>. Проверьте ваш профиль на <{$sitename}>.<br><br>Чтобы перейти на smallworld главную страницу используйте этот линк <br><br><{$link}></p>
+ <br>
+ </div>
+<!-- End Wrapper -->
+</body>
+</html>
\ No newline at end of file
Added: XoopsModules/smallworld/trunk/smallworld/language/russian/mailTpl/mail_complaint.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/russian/mailTpl/mail_complaint.html (rev 0)
+++ XoopsModules/smallworld/trunk/smallworld/language/russian/mailTpl/mail_complaint.html 2012-05-05 02:42:04 UTC (rev 9435)
@@ -0,0 +1,45 @@
+<html>
+<head>
+<style type="text/css">
+ ol, ul {list-style:none}
+ a {text-decoration: none;color: #1f1f1f;}
+ a:hover {text-decoration: none; color: #5d8ba6;}
+ h4 {font-family: 'Puritan20Normal';font-weight: normal;color: #1f1f1f;margin-bottom: 10px;font-size: 17px;}
+ img.left {top: 0px;float:left;display: block;margin:0;padding:0;margin-right:20px;}
+ #wrapper {width: 960px;margin: 100px auto 0;padding-top: 0;line-height: 20px;background-color:#33FFFF;border-style: groove;border-color:aqua;border-width:medium;}
+ #newslist ul li {width: 850px;px;background: none;margin: 2px 0 18px 2px;background-color: #FFF;-webkit-box-shadow: 0px 1px 2px 0px #b7b7b7;-moz-box-shadow: 0px 1px 2px 0px #b7b7b7;box-shadow: 0px 1px 2px 0px #b7b7b7;padding: 15px;display: block;overflow: hidden;}
+
+ #newslist p {margin: 0;}
+ #newslist h4 {margin-bottom: 8px;line-height: 1;}
+ #newslist h4 span {font-style: italic;font-family: Georgia, "Times New Roman", Times, serif;font-size: 12px;color: #565656;padding-left: 5px;}
+ #news h2 {float: left;margin-top: 10px;}
+ .greeting {margin:0px 0px 0px 25px;}
+ .infotext {margin:10px 0px 0px 25px;}
+ .title2 {margin-bottom: 12px;margin-top: 2px;}
+ .title {margin-bottom: 12px;margin-top: 4px;}
+ </style>
+</head>
+<body>
+<!-- Begin Wrapper -->
+ <div id="wrapper">
+ <br>
+ <p class="greeting">Привет Админ,</p>
+ <p class="infotext"><{$sendername}> нашел что-то, требующее вашего внимания <{$sitename}></p>
+ <div id="news">
+ <!-- Begin News Navigation -->
+ <div id="newslist">
+ <ul>
+ <!-- Begin Entry Heading 1 -->
+ <li>
+ <span style="font-size:11px">Это находится в треде <{$against}> и <{$sendername}> сообщил об этом в <{$time}> (servertime)</h4>
+ <h4 class="title"><span style="font-size:11px"><{$link}></span></h4>
+ </li>
+ </ul>
+ </div>
+ </div>
+ <!-- End News Navigation -->
+ <br>
+ </div>
+<!-- End Wrapper -->
+</body>
+</html>
\ No newline at end of file
Added: XoopsModules/smallworld/trunk/smallworld/language/russian/mailTpl/mail_newcomment.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/russian/mailTpl/mail_newcomment.html (rev 0)
+++ XoopsModules/smallworld/trunk/smallworld/language/russian/mailTpl/mail_newcomment.html 2012-05-05 02:42:04 UTC (rev 9435)
@@ -0,0 +1,56 @@
+<html>
+<head>
+<style type="text/css">
+ ol, ul {list-style:none}
+ a {text-decoration: none;color: #1f1f1f;}
+ a:hover {text-decoration: none; color: #5d8ba6;}
+ h4 {font-family: 'Puritan20Normal';font-weight: normal;color: #1f1f1f;margin-bottom: 10px;font-size: 17px;}
+ img.left {top: 0px;float:left;display: block;margin:0;padding:0;margin-right:20px;}
+ #wrapper {width: 960px;margin: 100px auto 0;padding-top: 0;line-height: 20px;background-color:#33FFFF;border-style: groove;border-color:aqua;border-width:medium;}
+ #newslist ul li {width: 850px;px;background: none;margin: 2px 0 18px 2px;background-color: #FFF;-webkit-box-shadow: 0px 1px 2px 0px #b7b7b7;-moz-box-shadow: 0px 1px 2px 0px #b7b7b7;box-shadow: 0px 1px 2px 0px #b7b7b7;padding: 15px;display: block;overflow: hidden;}
+
+ #newslist p {margin: 0;}
+ #newslist h4 {margin-bottom: 8px;line-height: 1;}
+ #newslist h4 span {font-style: italic;font-family: Georgia, "Times New Roman", Times, serif;font-size: 12px;color: #565656;padding-left: 5px;}
+ #news h2 {float: left;margin-top: 10px;}
+ .greeting {margin:0px 0px 0px 25px;}
+ .infotext {margin:10px 0px 0px 25px;}
+ .title2 {margin-bottom: 12px;margin-top: 2px;}
+ .title {margin-bottom: 12px;margin-top: 4px;}
+</style>
+</head>
+<body>
+<!-- Begin Wrapper -->
+ <div id="wrapper">
+ <br>
+ <p class="greeting">Привет <{$recievename}>,</p>
+ <p class="infotext"><{$sendname}> прокомментировал в ленте <{$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">Исходное сообщение </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"> ответил (<{$itemtextdate}> servertime)</span></h4>
+ <p><{$itemtext}></p>
+ </li>
+ <!-- End Entry Heading 2 -->
+ </ul>
+ </div>
+ </div>
+ <!-- End News Navigation -->
+ <br>
+ <p align="center"><{$replylink}></p>
+ <br/>
+ </div>
+
+<!-- End Wrapper -->
+</body>
+</html>
\ No newline at end of file
Added: XoopsModules/smallworld/trunk/smallworld/language/russian/mailTpl/mail_register.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/russian/mailTpl/mail_register.html (rev 0)
+++ XoopsModules/smallworld/trunk/smallworld/language/russian/mailTpl/mail_register.html 2012-05-05 02:42:04 UTC (rev 9435)
@@ -0,0 +1,44 @@
+<html>
+<head>
+<style type="text/css">
+ ol, ul {list-style:none}
+ a {text-decoration: none;color: #1f1f1f;}
+ a:hover {text-decoration: none; color: #5d8ba6;}
+ h4 {font-family: 'Puritan20Normal';font-weight: normal;color: #1f1f1f;margin-bottom: 10px;font-size: 17px;}
+ img.left {top: 0px;float:left;display: block;margin:0;padding:0;margin-right:20px;}
+ #wrapper {width: 960px;margin: 100px auto 0;padding-top: 0;line-height: 20px;background-color:#33FFFF;border-style: groove;border-color:aqua;border-width:medium;}
+ #newslist ul li {width: 850px;px;background: none;margin: 2px 0 18px 2px;background-color: #FFF;-webkit-box-shadow: 0px 1px 2px 0px #b7b7b7;-moz-box-shadow: 0px 1px 2px 0px #b7b7b7;box-shadow: 0px 1px 2px 0px #b7b7b7;padding: 15px;display: block;overflow: hidden;}
+
+ #newslist p {margin: 0;}
+ #newslist h4 {margin-bottom: 8px;line-height: 1;}
+ #newslist h4 span {font-style: italic;font-family: Georgia, "Times New Roman", Times, serif;font-size: 12px;color: #565656;padding-left: 5px;}
+ #news h2 {float: left;margin-top: 10px;}
+ .greeting {margin:0px 0px 0px 25px;}
+ .infotext {margin:10px 0px 0px 25px;}
+ .title2 {margin-bottom: 12px;margin-top: 2px;}
+ .title {margin-bottom: 12px;margin-top: 4px;}
+ </style>
+</head>
+<body>
+<!-- Begin Wrapper -->
+ <div id="wrapper">
+ <br>
+ <p class="greeting">Привет Админ,</p>
+ <p class="infotext"><{$registername}> зарегистрировался на <{$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">Посмотреть профайл можно тут </span></h4>
+ </li>
+ </ul>
+ </div>
+ </div>
+ <!-- End News Navigation -->
+ <br>
+ </div>
+<!-- End Wrapper -->
+</body>
+</html>
\ No newline at end of file
Added: XoopsModules/smallworld/trunk/smallworld/language/russian/main.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/russian/main.php (rev 0)
+++ XoopsModules/smallworld/trunk/smallworld/language/russian/main.php 2012-05-05 02:42:04 UTC (rev 9435)
@@ -0,0 +1,377 @@
+<?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.
+* 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: 9032 $
+* @Last changed by: $Author: djculex $
+* @Last changed date: $Date: 2012-02-20 06:15:13 +0100 (ma, 20 feb 2012) $
+* @ID: $Id: main.php 9032 2012-02-20 05:15:13Z djculex $
+**/
+
+/*----------------- Menu items ---------------*/
+
+/*------------ General items -------- */
+define("_SMALLWORLD_SYSERROR","Системная ошибка!");
+define("_SMALLWORLD_SYSNAME","Smallworld");
+define("_SMALLWORLD_ALL_FIELDS_DISABLED","Не предоставлена личная информация");
+
+/*----------- Personal info ------------------*/
+define("_SMALLWORLD_AVATAR","Текущее изображение");
+define("_SMALLWORLD_REALNAME","Настоящее имя");
+define("_SMALLWORLD_GENDER","Пол");
+define("_SMALLWORLD_INTERESTEDIN","Интересы");
+define("_SMALLWORLD_RELATIONSHIPSTATUS","Семейное положение");
+define("_SMALLWORLD_PARTNER","Партнер");
+define("_SMALLWORLD_LOOKINGFOR", "Ищу..");
+define("_SMALLWORLD_BIRTHPLACE", "Место рождения");
+define("_SMALLWORLD_POLITICALVIEW", "Политический взгляд");
+define("_SMALLWORLD_RELIGIOUSVIEW", "Религиозные взгляды");
+define("_SMALLWORLD_EMAILS","Адреса электронной почты");
+
+/*--------------- contact info -----------------*/
+define("_SMALLWORLD_MOBILEPHONE","Мобильный");
+define("_SMALLWORLD_LANDPHONE","Телефон");
+define("_SMALLWORLD_ADRESS","Адрес");
+define("_SMALLWORLD_CITY","Город");
+
+/*-------------- interests ---------------------*/
+define("_SMALLWORLD_WEBSITE","Адрес сайта");
+define("_SMALLWORLD_INTERESTS","Интересы");
+define("_SMALLWORLD_FAVOURITEMUSIC","Любимая музыка");
+define("_SMALLWORLD_FAVOURITEMOVIES","Любимое кино");
+define("_SMALLWORLD_ABOUTME","Обо мне");
+define("_SMALLWORLD_ADDSCHOOLS","Добавить школы / образование");
+define("_SMALLWORLD_ADDJOBS","Добавить работу");
+define("_SMALLWORLD_VARIOUSINTERESTS","Различные интересы");
+define("_SMALLWORLD_CONTACTINFO","Контактная информация");
+define("_SMALLWORLD_PERSONALINFO","Персональные данные");
+define("_SMALLWORLD_NOFRIENDTEXT","Только друзья могут посмотреть профиль / текст ленты");
+
+/* --------------- Timezone, User profile text & stats ----------------*/
+define("_SMALLWORLD_TIMEZONE","Временная зона");
+define("_SMALLWORLD_OCCUPATION","Местоположение");
+define("_SMALLWORLD_MEMBERSINCE","Член с");
+define("_SMALLWORLD_MESSENGER","Программа обмена сообщениями");
+define("_SMALLWORLD_TOTALPOSTS","Всего сообщений");
+define("_SMALLWORLD_RANK","Ранг");
+define("_SMALLWORLD_RANKIMAGE","Изображение ранга");
+define("_SMALLWORLD_TOTALUSERRATINGS","Общий рейтинг");
+define("_SMALLWORLD_LASTLOGIN","Дата последнего посещения");
+define("_SMALLWORLD_SIGNATURE","Подпись");
+define("_SMALLWORLD_REPLY_NOTSPECIFIYED","Не указано");
+define("_SMALLWORLD_BIRTHDAY","Дата рождения");
+define("_SMALLWORLD_AKA","aka");
+define("_SMALLWORLD_BORN","родился");
+define("_SMALLWORLD_YEARSOLD","лет");
+define("_SMALLWORLD_IN","в");
+define("_SMALLWORLD_HE","Он");
+define("_SMALLWORLD_SHE","Она");
+define("_SMALLWORLD_HEORSHE","Он/Она");
+define("_SMALLWORLD_LIVINGIN","в настоящее время живет в");
+define("_SMALLWORLD_ISEMPLOYEDBY","работает на");
+define("_SMALLWORLD_ATTENDED","учился в");
+define("_SMALLWORLD_AND","и");
+define("_SMALLWORLD_BIOGRAPHY","Биография");
+define("_SMALLWORLD_EXTBIOGRAPHY","Больше информации");
+define("_SMALLWORLD_NAME","Имя");
+define("_SMALLWORLD_COUNTRY","Страна");
+
+/*------------- Friends and follow ---------------------*/
+define("_SMALLWORLD_FRIEND","Добавить в друзья");
+define("_SMALLWORLD_FOLLOWFRIEND","Следовать");
+define("_SMALLWORLD_SENDMESSAGE","Послать сообщение");
+define("_SMALLWORLD_MOREINFO","Для информации нажмите здесь");
+
+/*--------------------- Messages and boxes -----------------------------*/
+define("_SMALLWORLD_NOTYETUSER_GREETING","Добро пожаловать");
+define("_SMALLWORLD_NOTYETUSER_BOXTEXT","Для того, чтобы использовать этот модуль, вы должны будете заполнить профиль дополнительной информацией.
+ <br><br>Нажмите ОК для продолжения регистрации или нажмите Отмена<br><br>чтобы вернуться в начало страницы.");
+define("_SMALLWORLD_NOTYETREGISTERED_TITLE","Продолжить для завершения установки");
+define ("_SMALLWORLD_TEXTBEFORESUBMIT","Продолжить, чтобы сохранить информацию в базе данных. <br><br> После этого вы можете посетить свою страницу, <br> и страницы других пользователей <br><br> Спасибо за ваше время.");
+define("_SMALLWORLD_FRIENDSINVITATIONS","Запросы на добавление в друзья");
+define("_SMALLWORLD_DATERECIEVED","Дата");
+define("_SMALLWORLD_ACCEPT","Принять");
+define("_SMALLWORLD_DENY","Запретить");
+define("_SMALLWORLD_LATER","Позже");
+define("_SMALLWORLD_ACTION","Действие");
+define("_SMALLWORLD_UPDATEID_NOT_EXIST","Сообщение не существует. Возврат.");
+
+/* ------------- Registerform ---------------------- */
+
+define("_SMALLWORLD_REGRISTATION_TITLE","Профиль Smallworld");
+define("_SMALLWORLD_STEP1","Шаг 1 из 6");
+define("_SMALLWORLD_STEP2","Шаг 2 из 6");
+define("_SMALLWORLD_STEP3","Шаг 3 из 6");
+define("_SMALLWORLD_STEP4","Шаг 4 из 6");
+define("_SMALLWORLD_STEP5","Шаг 5 из 6");
+define("_SMALLWORLD_STEP6","Конец");
+define ("_SMALLWORLD_BELIEFS","Договоренности");
+define("_SMALLWORLD_FAVOURITETHINGS","Любимые вещи");
+define("_SMALLWORLD_FAVOURITEBOOKS","Любимые книги");
+define("_SMALLWORLD_FAVOURITEMOVIE","Любимые фильмы");
+define("_SMALLWORLD_FAVOURITETVSHOW","Любимые ТВ-передачи");
+define("_SMALLWORLD_FAVOURITEINTERESTS","Интересы");
+define("_SMALLWORLD_INTERESTS_DESC","Интересы, личные данные и контакты");
+define("_SMALLWORLD_CONTACTS","Контактная информация");
+define("_SMALLWORLD_EMAIL","Email(ы)");
+define("_SMALLWORLD_SCREENNAMES","Имена(ы)");
+define("_SMALLWORLD_PHONE","Телефон");
+define("_SMALLWORLD_GSM","Мобильный");
+define("_SMALLWORLD_ISSINGLE","В настоящее время один");
+define("_SMALLWORLD_INRELATIONSHIP","в связи с");
+define("_SMALLWORLD_ISMARRIED","");
+define("_SMALLWORLD_ISENGAGED","с");
+define("_SMALLWORLD_ISCOMPLICATED","скрывает, когда дело доходит до личных отношений с");
+define("_SMALLWORLD_OPENRELATIONSHIP","открыт для отношений с");
+define("_SMALLWORLD_ADDITIONALINFO","ДОПОЛНИТЕЛЬНАЯ информация о");
+define("_SMALLWORLD_HIS","Его");
+define("_SMALLWORLD_HER","ее");
+define("_SMALLWORLD_HISHER","его/ее");
+define("_SMALLWORLD_POLITICWORD","политика");
+define("_SMALLWORLD_RELIGIONWORD","религия");
+define("_SMALLWORLD_IS","есть");
+define("_SMALLWORLD_ADDSOMEINFO","Добавить или редактировать");
+define("_SMALLWORLD_CHOOSE","Выбрать");
+define("_SMALLWORLD_WOMAN","Женщина");
+define("_SMALLWORLD_MAN","Мужчина");
+define("_SMALLWORLD_BOTH","Оба");
+define("_SMALLWORLD_NONE","Нет");
+define("_SMALLWORLD_MARRIED","Женат");
+define("_SMALLWORLD_ENGAGED","Занят");
+define("_SMALLWORLD_SINGLE","Один");
+define("_SMALLWORLD_RELATIONSHIP","В отношениях");
+define("_SMALLWORLD_RELATIONSHIP_OPEN","В открытых отношениях");
+define("_SMALLWORLD_ITSCOMP","Сложно");
+define("_SMALLWORLD_FRIENDSHIP","Дружба");
+define("_SMALLWORLD_DATING","Свидания");
+define("_SMALLWORLD_ARELATIONSHIP","Отношения");
+define("_SMALLWORLD_HANKYPANKY","Шуры-муры");
+define("_SMALLWORLD_PVLIBERAL","Крайне левый");
+define("_SMALLWORLD_PLIBERAL","Либеральный");
+define("_SMALLWORLD_PMODERATE","Умеренный");
+define("_SMALLWORLD_PCONSERVATIVE","Консервативный");
+define("_SMALLWORLD_PVCONSERVATIVE","Очень консервативный");
+define("_SMALLWORLD_PLIBERTARIAN","Крайне правый");
+define("_SMALLWORLD_POTHER","другое");
+define("_SMALLWORLD_RCHRISTIANITY","Христианство");
+define("_SMALLWORLD_RISLAM","Ислам");
+define("_SMALLWORLD_RSECULAR","Светский / Нерелигиозный / Агностик / Атеист");
+define("_SMALLWORLD_RHINDUISM","Индуизм");
+define("_SMALLWORLD_RCHINESETRAD","Китайская традиционная религия");
+define("_SMALLWORLD_RBUDDHISM","Буддизм");
+define("_SMALLWORLD_RPRIMALIND","Прямая и коренная");
+define("_SMALLWORLD_RAFRICANTRAD","Традиционные африканские диаспоры");
+define("_SMALLWORLD_RSIKHISM","Сикхизм");
+define("_SMALLWORLD_RJUCHE","Чучхе");
+define("_SMALLWORLD_RSPIRITISM","Спиритизм");
+define("_SMALLWORLD_RJUDAISM","Иудаизм");
+define("_SMALLWORLD_RBAHAI","Бахаи");
+define("_SMALLWORLD_RJAINISM","Джайнизм");
+define("_SMALLWORLD_RSHINTO","Синто");
+define("_SMALLWORLD_RCAODAI","Као Дай");
+define("_SMALLWORLD_RZOROASRIANISM","Зороастризм");
+define("_SMALLWORLD_RTENRIKYO","Tenrikyo");
+define("_SMALLWORLD_RNEOPAGANISM","Нео-язычества");
+define("_SMALLWORLD_RUNITARIANUNIVERSALISM","Унитарная-Универсализм");
+define("_SMALLWORLD_RRASTA","Растафари");
+define("_SMALLWORLD_RSCIENTOLOGY","Саентология");
+define("_SMALLWORLD_ANCIENTALIENTHEORIST","Древние чужеродные, теоретик");
+define("_SMALLWORLD_ROTHER","Другое");
+define("_SMALLWORLD_SUBMIT","Сохранить");
+define("_SMALLWORLD_EMAILADRESSES","E-mail адрес(а)");
+
+// 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","Добавить еще");
+define("_SMALLWORLD_REMOVE","Удалить");
+
+/*------------ Schools ----------*/
+
+define("_SMALLWORLD_KINDERGARDEN","детский сад");
+define("_SMALLWORLD_NURSERY","питомник");
+define("_SMALLWORLD_ELEMSCHOOL","начальная школа");
+define("_SMALLWORLD_GRADUATESCHOOL","аспирантура");
+define("_SMALLWORLD_HIGHSCHOOL","средняя школа");
+define("_SMALLWORLD_JUNIORHIGH","джунгли");
+define("_SMALLWORLD_JUNIORCOLLEGE","волчья стая");
+define("_SMALLWORLD_COLLEGE","колледж");
+define("_SMALLWORLD_TECNICAL","техникум");
+define("_SMALLWORLD_UNIVERSITY","университет");
+define("_SMALLWORLD_SCHOOLNAME","имя школы");
+define("_SMALLWORLD_SCHOOLTYPE","тип школы");
+define("_SMALLWORLD_START","Год начала");
+define("_SMALLWORLD_STOP","Год завершения");
+define("_SMALLWORLD_MUSIC","Любимая музыка");
+define("_SMALLWORLD_TVSHOW","Любимые ТВ-шоу");
+define("_SMALLWORLD_MOVIE","Любимое кино");
+define("_SMALLWORLD_BOOKS","Любимые книги");
+define("_SMALLWORLD_EMPLOYER","Работодатель");
+define("_SMALLWORLD_POSITION","Описание позиции");
+define("_SMALLWORLD_DESCRIPTION","Описание работы");
+define("_SMALLWORLD_JOBSTART","Начал");
+define("_SMALLWORLD_JOBSTOP","Закончил");
+define("_SMALLWORLD_NOACCOUNT","У вас нет аккаунта. Или в вашем профиле не хватает информации.");
+define("_SMALLWORLD_REGXOOPS","Нажмите здесь, чтобы зарегистрироваться");
+define("_SMALLWORLD_REGSMALLWORLD","Нажмите здесь, чтобы изменить / создать профиль");
+define("_SMALLWORLD_WORKFULL_TITLE","Все места работы");
+define("_SMALLWORLD_SCHOOLFULL_TITLE","Все образовательные учереждения");
+define("_SMALLWORLD_INTERESTS_TITLE","Интересы и контакты");
+define("_SMALLWORLD_MORE","..больше");
+
+/*-------------- Upload form --------------------*/
+define('_SMALLWORLD_UPLOAD_HOWTO','Все картинки вашего альбома показаны здесь, и вы можете использовать это средство для загрузки.<br><br>Нажмите на зеленую, чтобы загрузить файл(ы), выберите ваши картинки и загрузите с помощью:<br>1) Один за одним, используя <img src="images/icon_start.png" style="display: inline-block;height:13px;"/> иконку.<br>2) Выберите несколько или Перетащите* файлы на зеленую область загрузки (* в настоящий момент не работает в IE) и нажмите Начать все<br><br>Примечание: Если вы выберите тип файла, отличный от картинок, скрипт завершит работу. Размер картинки - 5 мегабайт максимум.<br><br>');
+define('_SMALLWORLD_UPLOADTITLE','Заголовок картинки');
+define('_SMALLWORLD_UPLOADDESC','Описание картинки');
+define('_SMALLWORLD_UPLOAD_TITLE','Загрузить картинки в ваш альбом');
+define('_SMALLWORLD_UPLOADTEXT','Начать загрузку');
+define('_SMALLWORLD_UPLOADFILESTEXT','Выбрать картинку(и)');
+define('_SMALLWORLD_IMGDESCRIPTION','Описание');
+define('_SMALLWORLD_IMGTITLE','Заголовок фото');
+define('_SMALLWORLD_IMAGE_EDIT_TITLE','Отредактируйте описание, где необходимо.');
+define("_SMALLWORLD_WELCOME_TITLE","Добро пожаловать");
+define("_SMALLWORLD_WELCOMETEXT",", приветствую. Надеюсь, вам тут будет приятно остаться.");
+define("_SMALLWORLD_UPLOADEDSOMEIMAGES"," загрузил несколько фото <br/> Нажмите на картинку, чтобы посмотреть в оригинальном размере, или этот линк<br/>чтобы открыть галлерею.");
+define("_SMALLWORLD_IMAGES_START","Запустить");
+define("_SMALLWORLD_IMAGES_CANCEL","Отменить");
+define("_SMALLWORLD_IMAGES_DELETE","Удалить");
+define("_SMALLWORLD_IMAGES_STARTALL","Показать все");
+define("_SMALLWORLD_IMAGES_CANCELALL","Отменить все");
+define("_SMALLWORLD_IMAGES_DELETEALL","Удалить все");
+
+/*-------------- Image gallery -------------*/
+define("_SMALLWORLD_ALBUMTITLETEXT","Закрыть альбом");
+define("_SMALLWORLD_TITLEHEADER","Фото альбом");
+define("_SMALLWORLD_NOIMAGES"," еще нет фото");
+define("_SMALLWORLD_GOTOUPLOADIMAGE"," Загрузить или удалить фото");
+define("_SMALLWORLD_EDITDESCRIPTION","Редактировать описание");
+define("_SMALLWORLD_NOTFRIENDNOIMAGES","Вы можете просматривать альбомы друзей только !");
+define("_SMALLWORLD_GALLERY_DOWNLOADORIGINAL","Скачать оригинал");
+define("_SMALLWORLD_GALLEY_NEXTPAGE","Следущее");
+define("_SMALLWORLD_GALLEY_PREVIOUSPAGE","Предыдущее");
+
+
+/*-------------- Search ----------------*/
+define("_SMALLWORLD_SEARCHMEMBER","Поиск по имени пользователя или реальному имени");
+
+/*---------------- Messages (jSon, alerts) -------------------*/
+define("_SMALLWORLD_FRIENDSHIPFOLLOW","Следует ");
+define("_SMALLWORLD_FRIENDSHIPREQUESTS","Отношение: ");
+define("_SMALLWORLD_JSON_ADDFRIEND","Запрос был послан ");
+define("_SMALLWORLD_JSON_CANCEL_ADDFRIEND","Вы отменили запрос ");
+define("_SMALLWORLD_JSON_DELETE_FRIEND_START","Вы удалили ");
+define("_SMALLWORLD_JSON_DELETE_FRIEND_END"," как друг");
+define("_SMALLWORLD_JSON_REQUEST_PENDING","<br><br>Запрос в друзья ждет решения");
+
+define ("_SMALLWORLD_JSON_FOLLOWINGFRIEND","Вы сейчас следуете за: ");
+define ("_SMALLWORLD_JSON_FOLLOWINGFRIEND_DESC","<br><br>Любые сообщения, он / она напишет в своей ленте появится и в вашей ленте.");
+define ("_SMALLWORLD_JSON_UNFOLLOWINGFRIEND","Вы больше не следуете: ");
+define ("_SMALLWORLD_JSON_UNFOLLOWINGFRIEND_DESC","<br><br>Его / ее сообщения больше не будут появляться в вашей ленте.");
+
+define("_SMALLWORLD_JSON_ADDFR_TEXT","Добавить как друга");
+define("_SMALLWORLD_JSON_CANCELFR_TEXT","Отменить запрос на добавление в друзья");
+define("_SMALLWORLD_JSON_REMOVEFR_TEXT","Удалить друга");
+
+define("_SMALLWORLD_JSON_FLYES_TEXT","Следовать");
+define("_SMALLWORLD_JSON_FLNO_TEXT","Отказаться от следования");
+
+define("_SMALLWORLD_JS_ALREADYVOTED","Вы уже голосовали!");
+define("_SMALLWORLD_JS_COMPLAINTSENT","Ваша жалоба была направлена Модератору");
+define("_SMALLWORLD_JS_COMPLAINT_ALREADY_SENT","Вы уже подали жалобу на это сообщение!");
+
+/*----------- Indexpage menu --------------*/
+define("_SMALLWORLD_HOME","В начало");
+define("_SMALLWORLD_PROFILEINDEX","Профиль");
+define("_SMALLWORLD_FRIENDSPAGE","Друзья");
+define("_SMALLWORLD_GALLERY","Фотки");
+define("_SMALLWORLD_CHANGEAVATAR","Сменить аватар");
+define("_SMALLWORLD_EDITPROFILE","Профиль");
+define("_SMALLWORLD_STATS","Статистика");
+define("_SMALLWORLD_INFO","О..");
+define("_SMALLWORLD_XIMUSER","IM к ");
+/*----------- Wall -----------------------*/
+define("_SMALLWORLD_WHATSUP","Что стряслось");
+define("_SMALLWORLD_DELUPD","Удалить обновление");
+define("_SMALLWORLD_COMMENTWALL","Комментарий ");
+define("_SMALLWORLD_DELETECOMMENT","Удалить комментарий");
+define("_SMALLWORLD_SECONDSAGO"," секунд назад");
+define("_SMALLWORLD_ONEMINUTEAGO","1 минуту назад");
+define("_SMALLWORLD_MINUTESAGO"," минут назад");
+define("_SMALLWORLD_ONEHOURAGO","1 час назад");
+define("_SMALLWORLD_HOURSAGO"," часов назад");
+define("_SMALLWORLD_ONEDAYAGO","1 день назад");
+define("_SMALLWORLD_DAYSAGO"," дней назад");
+define("_SMALLWORLD_ONEWEEKAGO","1 неделю назад");
+define("_SMALLWORLD_WEEKSAGO"," недели назад");
+define("_SMALLWORLD_ONEMONTHAGO","1 месяц назад");
+define("_SMALLWORLD_MONTHSAGO"," месяцев назад");
+define("_SMALLWORLD_ONEYEARAGO","1 год назад");
+define("_SMALLWORLD_YEARSAGO"," лет спустя");
+define("_SMALLWORLD_CLICKIMAGETHUMB","<br/><br/>Нажмите здесь для просмотра в оригинальном размере");
+
+/*-------------------- Friends page ---------------*/
+define("_SMALLWORLD_FRIENDPAGE","Друзья");
+define("_SMALLWORLD_PENDINGUSERS"," ожидаются запросы от следующих пользователей");
+define("_SMALLWORLD_ALREADYFRIENDS"," друзья");
+define("_SMALLWORLD_YOUFOLLOW"," следует за этими пользователями");
+define("_SMALLWORLD_FOLLOWINGYOU","Эти пользователели следуют за ");
+define("_SMALLWORLD_NOUSERS","Нет пользователей в этой категории");
+
+/*--------------- mail texts ----------------------*/
+define("_SMALLWORLD_MAIL_REGISTERSUBJECT","Новый зарегистрированный пользователь тут ");
+define("_SMALLWORLD_MAIL_COMPLAINTSUBJECT","Жалоба поступила тут ");
+define("_SMALLWORLD_MAIL_NEWAVATARSUBJECT","Новый аватар загружен тут ");
+define("_SMALLWORLD_MAIL_NEWCOMMENT","Новый коммент на ваше сообщение здесь ");
+define("_SMALLWORLD_SEEANDREPLYHERE","Посмотреть и ответить на коммент тут");
+define("_SMALLWORLD_GOTOSMALLWORLDHERE","Перейти на smallworld заглавную страницу, тут ");
+
+define("_SMALLWORLD_MAIL_COMPLAINT","Жалоба на предупреждение");
+define("_SMALLWORLD_COMP_MSG_LNK_DESC","Нажмите здесь, чтобы посмотреть затронутое сообщение");
+define("_SMALLWORLD_MAIL_NEWFRIENDFOLLOWER", "Новый запрос в друзья или новый пользователь следует за вами");
+
+/* ------------ Inspection & countdown ---------------- */
+define("_SMALLWORLD_INSPEC_DESC","Администратор закрыл этот аккаунт для проверки.<br/><br/>Ожидаемое время инспекции закончиться в");
+define("_SMALLWORLD_INSPEC_DESC2","Попробуйте еще раз в другое время.");
+define("_SMALLWORLD_BDAY_TODAY","Сегодня");
+define("_SMALLWORLD_BDAY_ISIN","День рождения: ");
+define("_SMALLWORLD_BDAY_YEARS","лет");
+
+/* ------------ Social networks bookmarks ---------------- */
+define("_SMALLWORLD_SHARELINK","Переслать");
+define("_SMALLWORLD_SHAREBOX_TITLE","Переслать / сохранить");
+define("_SMALLWORLD_UPDATEONSITEMETA"," обновлено - ");
+define("_SMALLWORLD_BOOKMARK_NOPERM_MESSAGE","Неправильная закладка. Нет разрешения для пересылки!<br><br>Пожалуйста, создайте профиль на smallworld<br><br><a href='register.php'>Регистрация здесь</a>");
+
+/* ------------- Statistics and about ------------------- */
+define("_SMALLWORLD_STATS_NEWESTUSERS","Новые пользователи");
+define("_SMALLWORLD_STATS_MOSTACTUSERS","Наиболее активные пользователи");
+define("_SMALLWORLD_STATS_BESTRATEDUSERS","Лучшие пользователи");
+define("_SMALLWORLD_STATS_WORSTRATEDUSERS","Худшие по рейтингу пользователи");
+define("_SMALLWORLD_STATS_NOBDAYSTODAY","Сегодня д/р нет");
+define("_SMALLWORLD_STATS_BDAYSTODAY","Сегодня отмечают день рождения");
+define("_SMALLWORLD_STATS_LIKETHISMODULE","Как вам этот модуль?");
+
+/* ----------------- donate link -------------- */
+define("_SMALLWORLD_DONATETEXT"," Пожертвования на кофе здесь ");
+?>
Added: XoopsModules/smallworld/trunk/smallworld/language/russian/modinfo.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/russian/modinfo.php (rev 0)
+++ XoopsModules/smallworld/trunk/smallworld/language/russian/modinfo.php 2012-05-05 02:42:04 UTC (rev 9435)
@@ -0,0 +1,93 @@
+<?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.
+* 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: 8904 $
+* @Last changed by: $Author: djculex $
+* @Last changed date: $Date: 2012-02-07 22:12:44 +0100 (ti, 07 feb 2012) $
+* @ID: $Id: modinfo.php 8904 2012-02-07 21:12:44Z djculex $
+**/
+
+define("_MI_SMALLWORLD_MODULE_NAME","Smallworld");
+define ("_MI_SMALLWORLD_MODULE_DESC","Модуль социальных сетей. Со стеной и профилями.");
+define('_MI_SMALLWORLD_ADMENU','Администрирование');
+define('_MI_SMALLWORLDMENU_INDEX','Главная');
+define('_MI_SMALLWORLDMENU_STATS','Статистика');
+define('_MI_SMALLWORLDMENU_USERADMIN','Управление пользователями');
+define('_MI_SMALLWORLDMENU_HELP','Помощь');
+define('_MI_SMALLWORLDMENU_ABOUT','О модуле');
+
+/* -------- Configs ---------- */
+
+// Map apis
+define("_MI_SMALLWORLD_USEGOOGLE","Использование Google Maps Geolocation API");
+define("_MI_SMALLWORLD_USEGOOGLE_DESC","По умолчанию база данных GeoNames. Выберите Да, чтобы использовать Google Maps.");
+
+// Messages per page
+define("_MI_SMALLWORLD_MSGTOSHOW","Количество сообщений");
+define("_MI_SMALLWORLD_MSGTOSHOW_DESC","Сколько сообщений (обновлениий) показать с самого начала в профиле и индексной странице.");
+
+// Use validation
+define("_MI_SMALLWORLD_VALIDATIONSTRENGHT","Проверка шагов");
+define("_MI_SMALLWORLD_VALIDATIONSTRENGHT_DESC","Использовать проверку полей при регистрации и редактировании профиля. :<br><br>Опции: :<br><br> Нет: Нет проверки <br> Да: * Наиболее важные поля * должны быть проверены");
+
+// Smallworld take-over user name links ?
+define ("_MI_SMALLWORLD_TAKEOVERLINKS","Преобразование имени пользователя ");
+define ("_MI_SMALLWORLD_TAKEOVERLINKS_DESC","Smallworld будет использовать небольшой JavaScript, чтобы изменить ссылки на USERPROFILE <br> взамен на userinfo.php<br><br> По умолчанию - нет.");
+
+define ("_MI_SMALLWORLD_USERSOWNMSGCOUNTS","Собственные сообщения пользователей подлежат проверке?");
+define ("_MI_SMALLWORLD_USERSOWNMSGCOUNTS_DESC","Каждые 10 секунд сообщения ваших последователей подсчитываются и результат будет показан, <br> если не 0. Если вы выберите Да, то показываются сообщение когда вы удаляете или добавляете собственное.");
+
+define ("_MI_SMALLWORLD_BOOKMARSAVATARS","Использование логотипа Smallworld в закладках");
+define ("_MI_SMALLWORLD_BOOKMARKSAVATARS_DESC","Когда сообщения являются публичными, и вы хотите поделиться ими в социальных сетях. Вы можете здесь описать как использовать логотип <br> Smallworld - как общее изображение или «нет» = размещение пользовательского аватара. <br><br> По умолчанию <br> 'да' = Smallworld логотип.");
+
+define ("_MI_SMALLWORLD_USEMAILNOTIFICATION","Использование почтовых уведомлений");
+define ("_MI_SMALLWORLD_USEMAILNOTIFICATION_DESC","Когда новый пользователь регистрируется, будет отправляться письмо администратору, или когда комментарий будет добавлен в сообщение, где пользователь учавствует в переписке, в почту высылается сообщение пользователю. По умолчанию <br> <br> 'да'");
+
+// Select fields & Mandetory fields
+define ('_MI_SMALLWORLD_VIEWFIELDS','Использование полей при регистрации и в профиле');
+define ('_MI_SMALLWORLD_VIEWFIELDS_DESC','Выберите поля для использования в регистрационной форме и в профиле. Control <br> + мышь для множественного выбора ');
+define ('_MI_SMALLWORLD_VERIFYFIELDS','Производить проверку по полям при регистрации');
+define ('_MI_SMALLWORLD_VERIFYFIELDS_DESC','Выберите (*) обязательные поля регистрационной формы. Control <br> + мышь для множественного выбора');
+
+define ('_MI_SMALLWORLD_REALNAME','Настоящее имя');
+define ('_MI_SMALLWORLD_GENDER','Пол');
+define ('_MI_SMALLWORLD_INTERESTEDIN','Заинтересован в ');
+define ('_MI_SMALLWORLD_RELATIONSHIPSTATUS','статус отношений');
+define ('_MI_SMALLWORLD_PARTNER','Партнер');
+define ('_MI_SMALLWORLD_LOOKINGFOR','Ищу');
+define ('_MI_SMALLWORLD_BIRTHDAY','День рождения');
+define ('_MI_SMALLWORLD_BIRTHPLACE','Место рождения');
+define ('_MI_SMALLWORLD_POLITICALVIEWS','Политика');
+define ('_MI_SMALLWORLD_RELIGIOUSVIEWS','Религия');
+define ('_MI_SMALLWORLD_EMAILS','Адреса электронной почты');
+define ('_MI_SMALLWORLD_SCREENNAMES','другие имена');
+define ('_MI_SMALLWORLD_MOBILE','мобильный');
+define ('_MI_SMALLWORLD_LANDPHONE','телефон');
+define ('_MI_SMALLWORLD_STREETADRESS','адрес проживания');
+define ('_MI_SMALLWORLD_PRESENTCITY','текущий город проживания');
+define ('_MI_SMALLWORLD_COUNTRY','страна');
+define ('_MI_SMALLWORLD_WEBSITE','веб-сайт');
+define ('_MI_SMALLWORLD_INTERESTS','Интересы');
+define ('_MI_SMALLWORLD_FAVOURITEMUSIC','Любимая музыка');
+define ('_MI_SMALLWORLD_FAVOURITETVSHOWS','Любимые ТВ-шоу');
+define ('_MI_SMALLWORLD_FAVOURITEMOVIES','Любимые фильмы');
+define ('_MI_SMALLWORLD_FAVOURITEBOOKS','Любимые книги');
+define ('_MI_SMALLWORLD_ABOUTME','Обо мне');
+define ('_MI_SMALLWORLD_EDUCATION','Оброзование');
+define ('_MI_SMALLWORLD_EMPLOYMENT','Работа');
+
+?>
\ No newline at end of file
Modified: XoopsModules/smallworld/trunk/smallworld/register.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/register.php 2012-05-04 17:09:44 UTC (rev 9434)
+++ XoopsModules/smallworld/trunk/smallworld/register.php 2012-05-05 02:42:04 UTC (rev 9435)
@@ -31,14 +31,13 @@
$id = $xoopsUser->getVar('uid');
$check = new SmallWorldUser;
$profile = $check->CheckIfProfile($id);
-
+
// Check if inspected userid -> redirect to userprofile and show admin countdown
- /*
+
$inspect = Smallworld_isInspected ($id);
if ($inspect['inspect'] == 'yes') {
redirect_header("userprofile.php?username=".$xoopsUser->getVar('uname'), 1);
}
- */
if ($profile >= 1) {
// Create basic user in db & redirect to editProfile.php
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
...
[truncated message content] |
|
From: <dj...@us...> - 2012-05-07 09:27:05
|
Revision: 9446
http://xoops.svn.sourceforge.net/xoops/?rev=9446&view=rev
Author: djculex
Date: 2012-05-07 09:26:51 +0000 (Mon, 07 May 2012)
Log Message:
-----------
- Bugfix: Typos & Missing defines (Thanks Cesag)
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/class/db.php
XoopsModules/smallworld/trunk/smallworld/language/danish/admin.php
XoopsModules/smallworld/trunk/smallworld/language/danish/main.php
XoopsModules/smallworld/trunk/smallworld/language/english/admin.php
XoopsModules/smallworld/trunk/smallworld/language/english/main.php
XoopsModules/smallworld/trunk/smallworld/language/english/modinfo.php
XoopsModules/smallworld/trunk/smallworld/language/russian/main.php
XoopsModules/smallworld/trunk/smallworld/xoops_version.php
Added Paths:
-----------
XoopsModules/smallworld/trunk/smallworld/language/french/
XoopsModules/smallworld/trunk/smallworld/language/french/admin.php
XoopsModules/smallworld/trunk/smallworld/language/french/help/
XoopsModules/smallworld/trunk/smallworld/language/french/help/help.html
XoopsModules/smallworld/trunk/smallworld/language/french/help/index.html
XoopsModules/smallworld/trunk/smallworld/language/french/index.html
XoopsModules/smallworld/trunk/smallworld/language/french/js/
XoopsModules/smallworld/trunk/smallworld/language/french/js/index.html
XoopsModules/smallworld/trunk/smallworld/language/french/js/jquery.countdown.js
XoopsModules/smallworld/trunk/smallworld/language/french/js/jquery.ui.datepicker-language.js
XoopsModules/smallworld/trunk/smallworld/language/french/js/variables.js
XoopsModules/smallworld/trunk/smallworld/language/french/mailTpl/
XoopsModules/smallworld/trunk/smallworld/language/french/mailTpl/index.html
XoopsModules/smallworld/trunk/smallworld/language/french/mailTpl/mail_attencionneeded.html
XoopsModules/smallworld/trunk/smallworld/language/french/mailTpl/mail_complaint.html
XoopsModules/smallworld/trunk/smallworld/language/french/mailTpl/mail_newcomment.html
XoopsModules/smallworld/trunk/smallworld/language/french/mailTpl/mail_register.html
XoopsModules/smallworld/trunk/smallworld/language/french/main.php
XoopsModules/smallworld/trunk/smallworld/language/french/modinfo.php
XoopsModules/smallworld/trunk/smallworld/language/french_iso/
XoopsModules/smallworld/trunk/smallworld/language/french_iso/admin.php
XoopsModules/smallworld/trunk/smallworld/language/french_iso/help/
XoopsModules/smallworld/trunk/smallworld/language/french_iso/help/help.html
XoopsModules/smallworld/trunk/smallworld/language/french_iso/help/index.html
XoopsModules/smallworld/trunk/smallworld/language/french_iso/index.html
XoopsModules/smallworld/trunk/smallworld/language/french_iso/js/
XoopsModules/smallworld/trunk/smallworld/language/french_iso/js/index.html
XoopsModules/smallworld/trunk/smallworld/language/french_iso/js/jquery.countdown.js
XoopsModules/smallworld/trunk/smallworld/language/french_iso/js/jquery.ui.datepicker-language.js
XoopsModules/smallworld/trunk/smallworld/language/french_iso/js/variables.js
XoopsModules/smallworld/trunk/smallworld/language/french_iso/mailTpl/
XoopsModules/smallworld/trunk/smallworld/language/french_iso/mailTpl/index.html
XoopsModules/smallworld/trunk/smallworld/language/french_iso/mailTpl/mail_attencionneeded.html
XoopsModules/smallworld/trunk/smallworld/language/french_iso/mailTpl/mail_complaint.html
XoopsModules/smallworld/trunk/smallworld/language/french_iso/mailTpl/mail_newcomment.html
XoopsModules/smallworld/trunk/smallworld/language/french_iso/mailTpl/mail_register.html
XoopsModules/smallworld/trunk/smallworld/language/french_iso/main.php
XoopsModules/smallworld/trunk/smallworld/language/french_iso/modinfo.php
Modified: XoopsModules/smallworld/trunk/smallworld/class/db.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/class/db.php 2012-05-07 04:57:03 UTC (rev 9445)
+++ XoopsModules/smallworld/trunk/smallworld/class/db.php 2012-05-07 09:26:51 UTC (rev 9446)
@@ -124,7 +124,7 @@
$sql = "SELECT ".$var." FROM ".$xoopsDB->prefix('smallworld_user')." WHERE userid = '".$id."'";
$result = $xoopsDB->queryF($sql);
if ($xoopsDB->getRowsNum($result) < 1) {
- return _SMALLWORLD_REPLY_NOTSPECIFIYED;
+ return _SMALLWORLD_REPLY_NOTSPECIFIED;
}
while ($row = $xoopsDB->fetchArray($result)) {
$msg[$var] = $row[$var];
Modified: XoopsModules/smallworld/trunk/smallworld/language/danish/admin.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/danish/admin.php 2012-05-07 04:57:03 UTC (rev 9445)
+++ XoopsModules/smallworld/trunk/smallworld/language/danish/admin.php 2012-05-07 09:26:51 UTC (rev 9446)
@@ -25,6 +25,8 @@
// Engelsk language fil til Smallworld admin.php
// Tab titler
+ define('_AM_SMALLWORLD_ADMINMESSAGESEND','Send til alle');
+ define('_AM_SMALLWORLD_LOGSMAINTNANCE','Database vedligeholdelse');
// Fanebladsside en i admin sektion
define ('_AM_SMALLWORLD_MODULEINSTALL', 'Modul version installeret');
Modified: XoopsModules/smallworld/trunk/smallworld/language/danish/main.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/danish/main.php 2012-05-07 04:57:03 UTC (rev 9445)
+++ XoopsModules/smallworld/trunk/smallworld/language/danish/main.php 2012-05-07 09:26:51 UTC (rev 9446)
@@ -73,7 +73,7 @@
define ("_SMALLWORLD_TOTALUSERRATINGS", "Samlet rating");
define ("_SMALLWORLD_LASTLOGIN", "Sidste login");
define ("_SMALLWORLD_SIGNATURE", "Signatur");
-define ("_SMALLWORLD_REPLY_NOTSPECIFIYED", "Ikke specificeret");
+define ("_SMALLWORLD_REPLY_NOTSPECIFIED", "Ikke specificeret");
define ("_SMALLWORLD_BIRTHDAY", "Fødselsdag");
define ("_SMALLWORLD_AKA", "alias");
define ("_SMALLWORLD_BORN", "født");
Modified: XoopsModules/smallworld/trunk/smallworld/language/english/admin.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/english/admin.php 2012-05-07 04:57:03 UTC (rev 9445)
+++ XoopsModules/smallworld/trunk/smallworld/language/english/admin.php 2012-05-07 09:26:51 UTC (rev 9446)
@@ -36,7 +36,7 @@
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_TOPRATEDUSERS','Highest rated users');
define('_AM_SMALLWORLD_BOTTOMRATEDUSERS','Worst rated users');
define('_AM_SMALLWORLD_STATISTICS_TITLE','Smallworld Statistics');
define('_AM_SMALLWORLD_MODULEINFO','Module info');
Modified: XoopsModules/smallworld/trunk/smallworld/language/english/main.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/english/main.php 2012-05-07 04:57:03 UTC (rev 9445)
+++ XoopsModules/smallworld/trunk/smallworld/language/english/main.php 2012-05-07 09:26:51 UTC (rev 9446)
@@ -73,7 +73,7 @@
define("_SMALLWORLD_TOTALUSERRATINGS","Overall rating");
define("_SMALLWORLD_LASTLOGIN","Last login");
define("_SMALLWORLD_SIGNATURE","Signature");
-define("_SMALLWORLD_REPLY_NOTSPECIFIYED","Not specifiyed");
+define("_SMALLWORLD_REPLY_NOTSPECIFIED","Not specifiyed");
define("_SMALLWORLD_BIRTHDAY","Birthday");
define("_SMALLWORLD_AKA","aka");
define("_SMALLWORLD_BORN","born");
@@ -244,7 +244,7 @@
define("_SMALLWORLD_MORE","..more");
/*-------------- 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_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 either:<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>');
define('_SMALLWORLD_UPLOADTITLE','Image title');
define('_SMALLWORLD_UPLOADDESC','Image description');
define('_SMALLWORLD_UPLOAD_TITLE','Upload images to your image album');
@@ -252,7 +252,7 @@
define('_SMALLWORLD_UPLOADFILESTEXT','Select 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_IMAGE_EDIT_TITLE','Edit descriptions where needed and send');
define("_SMALLWORLD_WELCOME_TITLE","Welcome");
define("_SMALLWORLD_WELCOMETEXT",", welcome. Hope you'll enjoy your stay.");
define("_SMALLWORLD_UPLOADEDSOMEIMAGES"," uploaded some new pictures <br/> Press image to see full size or this link<br/>to open gallery");
@@ -343,7 +343,7 @@
/*--------------- mail texts ----------------------*/
define("_SMALLWORLD_MAIL_REGISTERSUBJECT","New registered user at ");
-define("_SMALLWORLD_MAIL_COMPLAINTSUBJECT","Complaint agains user at ");
+define("_SMALLWORLD_MAIL_COMPLAINTSUBJECT","Complaint against user at ");
define("_SMALLWORLD_MAIL_NEWAVATARSUBJECT","New avatar upload at ");
define("_SMALLWORLD_MAIL_NEWCOMMENT","New comment to you message at ");
define("_SMALLWORLD_SEEANDREPLYHERE","See & reply to the comment here");
Modified: XoopsModules/smallworld/trunk/smallworld/language/english/modinfo.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/english/modinfo.php 2012-05-07 04:57:03 UTC (rev 9445)
+++ XoopsModules/smallworld/trunk/smallworld/language/english/modinfo.php 2012-05-07 09:26:51 UTC (rev 9446)
@@ -46,13 +46,13 @@
// Smallworld take-over user name links ?
define ("_MI_SMALLWORLD_TAKEOVERLINKS","Convert username links to smallworld");
-define ("_MI_SMALLWORLD_TAKEOVERLINKS_DESC","Smallworld will use a small javascript to change links on load to point to userprofile<br>insted of userinfo.php<br><br>Default is 'no'");
+define ("_MI_SMALLWORLD_TAKEOVERLINKS_DESC","Smallworld will use a small javascript to change links on load to point to userprofile<br>instead of userinfo.php<br><br>Default is 'no'");
define ("_MI_SMALLWORLD_USERSOWNMSGCOUNTS","Users own posts count in check ? ");
-define ("_MI_SMALLWORLD_USERSOWNMSGCOUNTS_DESC","Every 10 seconds the posts of your followers are counted and a refresh button will show, <br>if result is not 0. If you choose yes to this, this button will olso react when you post/delete posts.");
+define ("_MI_SMALLWORLD_USERSOWNMSGCOUNTS_DESC","Every 10 seconds the posts of your followers are counted and a refresh button will show, <br>if result is not 0. If you choose yes to this, this button will also react when you post/delete posts.");
define ("_MI_SMALLWORLD_BOOKMARSAVATARS","Use Smallworld Logo when bookmarking ? ");
-define ("_MI_SMALLWORLD_BOOKMARKSAVATARS_DESC","When posts are public and you want to share on social networks. You can here descide weather to use<br>smallworld logo as shared image or 'no' = the posting users avatar.<br><br>Default is 'yes' = smallworld logo.");
+define ("_MI_SMALLWORLD_BOOKMARKSAVATARS_DESC","When posts are public and you want to share on social networks. You can here decide whether to use<br>smallworld logo as shared image or 'no' = the posting users avatar.<br><br>Default is 'yes' = smallworld logo.");
define ("_MI_SMALLWORLD_USEMAILNOTIFICATION","Use mail notifications ? ");
define ("_MI_SMALLWORLD_USEMAILNOTIFICATION_DESC","When new user register a mail is sent to admin, or when a comment is added to a post where user is part a mail is sent to user.<br><br>Default is 'yes'");
Added: XoopsModules/smallworld/trunk/smallworld/language/french/admin.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/french/admin.php (rev 0)
+++ XoopsModules/smallworld/trunk/smallworld/language/french/admin.php 2012-05-07 09:26:51 UTC (rev 9446)
@@ -0,0 +1,82 @@
+<?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.
+* 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$
+**/
+
+
+// Traduit par Cesag (frxoops.org) le 5 Mai 2012 pour le module smallworld, fichier admin.php
+
+// Titre des onglets
+ define('_AM_SMALLWORLD_ADMINMESSAGESEND','Message à tous');
+ define('_AM_SMALLWORLD_LOGSMAINTNANCE','Maintenance de la base de données');
+
+// Premier onglet dans la section administration
+define('_AM_SMALLWORLD_MODULEINSTALL','Version du module installé');
+define('_AM_SMALLWORLD_INSTALLDATE','Module installé le');
+define('_AM_SMALLWORLD_DATEOFFIRSTMESSAGE','Date du plus ancien message');
+define('_AM_SMALLWORLD_TOTALUSERS','Nombre total d\'utilisateurs');
+define('_AM_SMALLWORLD_AVERAGEMSGPERDAY','Moyenne des messages par jour');
+define('_AM_SMALLWORLD_TOPCHATTERS','Utilisateurs les plus actifs');
+define('_AM_SMALLWORLD_TOPCHATTERS_TODAY','Utilisateurs les plus actifs depuis 24 heures');
+define('_AM_SMALLWORLD_TOPRATEDUSERS','Utilisateurs les mieux notés');
+define('_AM_SMALLWORLD_BOTTOMRATEDUSERS','Utilisateurs qui ont le moins de cote');
+define('_AM_SMALLWORLD_STATISTICS_TITLE','Statistiques du module');
+define('_AM_SMALLWORLD_MODULEINFO','Informations du module');
+define('_AM_SMALLWORLD_USERSTATS','Statistiques des utilisateurs');
+define('_AM_SMALLWORLD_NONEYET','Pas de messages dans la base de données');
+define('_AM_SMALLWORLD_NO','rien');
+define('_AM_SMALLWORLD_THEREARE','Il y a ou il n\'y a');
+define('_AM_SMALLWORLD_UPDATE_STATUS','Statut de votre version de module :');
+
+// Deuxième onglet dans la section administration
+
+// Troisième onglet dans la section administration
+define('_AM_SMALLWORLD_USERADMIN_TITLE','Administration des utilisateurs');
+define('_AM_SMALLWORLD_USERADMININSPECT_TITLE','Utilisateurs sous contrôle d\'administration');
+define('_AM_SMALLWORLD_USERADMINNOINSPECT_TITLE','Utilisateurs normaux');
+define("_AM_SMALLWORLD_TITLE_IMAGE","Photo de l'utilisateur");
+define("_AM_SMALLWORLD_TITLE_USERNAME","Nom d'utilisateur");
+define("_AM_SMALLWORLD_TITLE_REALNAME","Nom de famille");
+define("_AM_SMALLWORLD_TITLE_IP","Ip");
+define("_AM_SMALLWORLD_TITLE_COMPLAINTS","Plaintes reçues");
+define("_AM_SMALLWORLD_TITLE_INSPECTTIME","Temps de contrôle");
+define("_AM_SMALLWORLD_TITLE_INSPECTADD","Ajouter un temps de contrôle");
+define("_AM_SMALLWORLD_TITLE_DELETEUSER","Supprimer le compte de l\'utilisateur");
+define('_AM_SMALLWORLD_TITLE_INSPECTDELETE','Annuler le temps de contrôle');
+define('_AM_SMALLWORLD_ADDTIMEDROPDOWN_MINUTES',' Minutes');
+define('_AM_SMALLWORLD_ADDTIMEDROPDOWN_NOCHANGE','Pas de changement');
+
+// Divers, autres
+define('_AM_SMALLWORLD_UPDATE_CRITICAL_UPD',' Une mise à jour critique est disponible !');
+define('_AM_SMALLWORLD_UPDATE_NORMAL_UPD',' Il y a une version plus récente, disponible en téléchargement');
+define('_AM_SMALLWORLD_UPDATE_SERVER_ERROR','Le serveur est en panne ou en cours de mise à jour, <br/> veuillez retenter plus tard.');
+define('_AM_SMALLWORLD_UPDATE_FILE_DESC','Description de la nouvelle version');
+define('_AM_SMALLWORLD_UPDATE_SERVER_FILE','Vous pouvez télécharger la nouvelle version d\'ici');
+define('_AM_SMALLWORLD_UPDATE_YOUHAVENEWESTVERSION',' Vous avez déjà la version la plus récente');
+define('_AM_SMALLWORLD_HELP','Aide');
+define('_AM_SMALLWORLD_ADMIN_USERDELETEDALERT','les dossiers associés, les fichiers et les lignes de tables ont été supprimés');
+define('_AM_SMALLWORLD_STATS_POS','#');
+define('_AM_SMALLWORLD_STATS_NAME','Nom');
+define('_AM_SMALLWORLD_STATS_AMOUNT','Nombre');
+define('_AM_SMALLWORLD_STATS_IMG','Icône');
+
+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">Si vous aimez ce module et le travail effectué, vous pouvez me garder éveillé en m\'offrant un café</a>');
+define('_AM_SMALLWORLD_FOOTER', "<div class='center smallsmall italic pad5'>Le module SmallWorld est suivi par <a class='tooltip' rel='external' href='http://culex.dk/' title='Visitez mon site internet'>Culex</a></div>");
\ No newline at end of file
Added: XoopsModules/smallworld/trunk/smallworld/language/french/help/help.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/french/help/help.html (rev 0)
+++ XoopsModules/smallworld/trunk/smallworld/language/french/help/help.html 2012-05-07 09:26:51 UTC (rev 9446)
@@ -0,0 +1,75 @@
+<div id="help-template" class="outer">
+ <h1 class="head">Aide :
+ <a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/smallworld/admin/index.php"
+ title="Retour à l'administration de SmallWorld"> SmallWorld
+ <img src="<{xoAdminIcons home.png}>"
+ alt="Retour à l'administration de SmallWorld"/>
+ </a></h1>
+
+ <h4 class="odd">Description</h4>
+
+ <p class="even">Smallworld est un système de Réseau Social. Inspiré par les didacticiels de Srinivas Tamada sur Facebook
+ script. Le système de base a été réécrit, adapté et développé en grande partie par Culex pour Xoops.
+ Le module est doté de votes "j'aime"/"je n'aime pas", signets, système de murs, gallerie d'images et utilise Xim (module de discussion) si il est installé.
+ L'administration propose la suppression des utilisateurs, l'interdiction d'utilisateurs pendant un temps. Un compte à rebours est affiché côté utilisateur pour préciser quand il peut à nouveau utiliser son compte.
+ Il y a beaucoup d'autres options. Le module est entièrement compatible pour la version XOOPS 2.5.0 et supérieur.<br/> <br/>
+ Smallworld est distribué sous les termes de la licence publique générale de GNU (GPL) et est libre d'être utilisé et modifié. Il
+ est libre de redistribution tant que vous respectez les termes de la distribution GPL.</p>
+
+ <h4 class="odd">Installation/Désinstallation</h4> <br/>
+
+ Aucune mesure spéciale n'est nécessaire, suivez la procédure d'installation standard - extraire le dossier smallworld dans le
+ répertoire .../modules. Installez le module dans la partie administration -> Modules.<br/> <br/>
+
+ Vérifiez si la version téléchargée de Smallworld est la dernière version réalisée.
+ Activez les cookies et le JavaScript de votre navigateur.<br/> <br/>
+ <b>Installation chez un hébergeur</b>
+ <ul>
+ <li>Téléchargez le dossier dézippé Smallworld vers votre répertoire de module.</li>
+ <li>Installation à l'aide de l'installation de module XOOPS comme toute autre installation de module.</li>
+ <li>Rendez le block visible pour les groupes d'utilisateurs que vous souhaitez (administrateurs/modérateurs etc...).</li>
+ </ul>
+
+ <b>Mise à niveau depuis une version précédente</b>
+ <ul>
+ <li>Assurez-vous que vous utilisez la version la plus récente</li>
+ <li>Lisez le fichier "readme.txt" dans le dossier "docs"</li>
+ <li>Faire éventuellement une sauvegarde de vos tables</li>
+ </ul>
+ Des instructions détaillées sur l'installation de modules sont disponibles dans le
+ <a href="http://goo.gl/adT2i">Manuel des opérations de XOOPS</a> <br/> <br/>
+
+
+ <h4 class="odd">Opérations</h4> <br/>
+
+ Des instructions détaillées sur la configuration des droits d'accès pour les groupes d'utilisateurs sont disponibles dans le
+ <a href="http://goo.gl/adT2i">Manuel des opérations de XOOPS</a><br/> <br/>
+
+ <h4 class="odd">Résolution de problèmes</h4> <br/>
+
+ <b>J'obtiens une page blanche, je ne peux pas cliquer sur le nom d'utilisateur, le bloc n'est pas visible...</b><br/> <br/>
+ <ul>
+ <li>Assurez-vous que votre version de Xoops est supérieure à 2.5.0. Les anciennes versions de Xoops n'ont pas les prérequis nécessaires.
+ </li>
+ <li>Activez le débogage (mode debug) et regardez si des erreurs s'affichent.</li>
+ <li>À l'aide de FireFox, cliquez avec le bouton droit sur l'écran, choisissez "inspecter l'élément", choisissez la console dans les onglets et vérifiez
+ s'il y a des erreurs.
+ </li>
+ <li>Si il n'y a pas d'erreurs, utilisez Firebug (cliquez droit -> inspecter l'élément -> console) et regardez si il y a des erreurs jQuery.
+ </li>
+ <li>S'il n'y a aucune erreur jQuery, videz le cache -> mettez à jour le module Smallworld dans la partie administration des modules.</li>
+ <li>Si la page est encore blanche, allez au module Protector -> Préférences et écrivez smallworld dans le champ
+ "Modules à exclure du contrôle DoS (F5)/Crawler".
+ </li>
+ </ul>
+ <br/>
+
+ <h4 class="odd">Tutoriel</h4>
+
+ <p class="even">Il n'y a aucun tutoriel disponible pour le moment</p>
+
+ <h4 class="odd">Questions</h4>
+
+ <p class="even">Si vous rencontrez encore des erreurs ou avez des questions, veuillez les publier sur le <a href="http://www.frxoops.org/modules/newbb">Forum de support Xoops</a></p>
+<!-- Traduction Cesag (frxoops.org) le 5 Mai 2012 -->
+</div>
\ No newline at end of file
Added: XoopsModules/smallworld/trunk/smallworld/language/french/help/index.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/french/help/index.html (rev 0)
+++ XoopsModules/smallworld/trunk/smallworld/language/french/help/index.html 2012-05-07 09:26:51 UTC (rev 9446)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/smallworld/trunk/smallworld/language/french/index.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/french/index.html (rev 0)
+++ XoopsModules/smallworld/trunk/smallworld/language/french/index.html 2012-05-07 09:26:51 UTC (rev 9446)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/smallworld/trunk/smallworld/language/french/js/index.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/french/js/index.html (rev 0)
+++ XoopsModules/smallworld/trunk/smallworld/language/french/js/index.html 2012-05-07 09:26:51 UTC (rev 9446)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/smallworld/trunk/smallworld/language/french/js/jquery.countdown.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/french/js/jquery.countdown.js (rev 0)
+++ XoopsModules/smallworld/trunk/smallworld/language/french/js/jquery.countdown.js 2012-05-07 09:26:51 UTC (rev 9446)
@@ -0,0 +1,23 @@
+/* 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
+ */
+
+/* Traduction française de l'extension jQuery "countdown"
+ par Cesag (frxoops.org) le 5 Mai 2012. */
+(function(xoops_smallworld) {
+ xoops_smallworld.countdown.regional['fr'] = {
+ labels: ['Années', 'Mois', 'Semaines', 'Jours', 'Heures', 'Minutes', 'Secondes'],
+ labels1: ['Année', 'Mois', 'Semaine', 'Jour', 'Heure', 'Minute', 'Seconde'],
+ compactLabels: ['a', 'm', 's', 'j'], // Textes compacts pour les compteurs
+ whichLabels: null,
+ timeSeparator: ':', isRTL: false};
+ xoops_smallworld.countdown.setDefaults(xoops_smallworld.countdown.regional['fr']);
+})(jQuery);
Added: XoopsModules/smallworld/trunk/smallworld/language/french/js/jquery.ui.datepicker-language.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/french/js/jquery.ui.datepicker-language.js (rev 0)
+++ XoopsModules/smallworld/trunk/smallworld/language/french/js/jquery.ui.datepicker-language.js 2012-05-07 09:26:51 UTC (rev 9446)
@@ -0,0 +1,24 @@
+/* Localisation française pour l'extension de l'interface utilisateur jQuery "datepicker" (sélectionneur de dates).
+ Ecrit par Stuart et adapté par Culex <cu...@cu...>. Traduit par Cesag (frxoops.org) le 5 Mai 2012 */
+jQuery(function(xoops_smallworld){
+ xoops_smallworld.datepicker.regional['fr-FR'] = {
+ closeText: 'Fermer', closeStatus: 'Fermer sans modifications',
+ prevText: '<Précédent', prevStatus: 'Voir le mois dernier',
+ prevJumpText: '<<', prevJumpStatus: '',
+ nextText: '<Suivant',
+ currentText: 'Aujourd\'hui', currentStatus: 'Afficher le mois en cours',
+ monthNames: ['Janvier','Février','Mars','Avril','Mai','Juin',
+ 'Juillet','Août','Septembre','Octobre','Novembre','Décembre'],
+ monthNamesShort: ['Jan','Fév','Mar','Avr','Mai','Juin',
+ 'Jui','Aoû','Sep','Oct','Nov','Déc'],
+ dayNames: ['Dimanche','Lundi','Mardi','Mercredi','Jeudi','Vendredi','Samedi'],
+ dayNamesShort: ['Dim','Lun','Mar','Mer','Jeu','Ven','Sam'],
+ dayNamesMin: ['Di','Lu','Ma','Me','Je','Ve','Sa'],
+ weekHeader: 'Se',
+ dateFormat: 'dd-mm-yyyy',
+ firstDay: 0,
+ isRTL: false,
+ showMonthAfterYear: false,
+ yearSuffix: ''};
+ xoops_smallworld.datepicker.setDefaults(xoops_smallworld.datepicker.regional['fr-FR']);
+});
Added: XoopsModules/smallworld/trunk/smallworld/language/french/js/variables.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/french/js/variables.js (rev 0)
+++ XoopsModules/smallworld/trunk/smallworld/language/french/js/variables.js 2012-05-07 09:26:51 UTC (rev 9446)
@@ -0,0 +1,56 @@
+/* Divers codes de langue à inclure dans l'entête
+Voir ceci pour vos paramètres : https://spreadsheets.google.com/spreadsheet/pub?key=0Ah0xU81penP1cDlwZHdzYWkyaERNc0xrWHNvTTA1S1E&gid=1
+Traduit par Cesag (frxoops.org) le 5 Mai 2012 */
+
+var language = 'fr';
+var countryshort = 'fr';
+var countrylong = 'france';
+
+var _smallworldContinueToReg = "S'enregistrer";
+var _smallworldCancel = "Annuler";
+var _smallworldClose = "Fermer";
+
+var _smallworldCommentsMoreMore = "..Afficher";
+var _smallworldCommentsMoreLess = "..Cacher";
+
+var SmallworldGenderError = "Sélectionnez votre sexe";
+var SmallworldBirthdayError = "Renseignez votre date anniversaire";
+var SmallworldEmailError = "Renseignez votre adresse électronique";
+
+var SmallworldSavedSuccesMsg = "Enregistré avec succès";
+
+var SmallworldConfirmBtnFI = "Êtes-vous sûr ?";
+var SmallworldConfirmBtnYes = 'Oui !';
+var SmallworldConfirmBtnNo = 'Non !';
+
+var smallworldNewMessages = "Vous avez de nouveaux messages +";
+var smallworldDeletedMessages = "Les messages ont été supprimés. Le compteur est maintenant -";
+
+//Validation
+var SmallworldValidationBackButton = "Retour"; // Bouton de retour
+var SmallworldValidationForwardButton = "Suivant"; // Bouton suivant
+var SmallworldValidationNameErrorMsg = "Veuillez écrire votre nom de famille"; // Champ du nom réel
+var SmallworldValidationGenderErrorMsg = "Sélectionnez un sexe valide"; // Choix du sexe
+var SmallworldValidationIntingenderErrorMsg = "Veuillez en cocher au moins un. La valeur par défaut est « aucun »"; // Orientation sexuelle
+var SmallworldValidationSearchrelatErrorMsg = "Veuillez en cocher au moins un. La valeur par défaut est « amis »"; // Relations recherchées
+var SmallworldValidationBirthdayErrorMsg = "Veuillez entrer une date valide"; // Anniversaire
+var SmallworldValidationEmailTitleErrorMsg = "Mauvais format d'adresse électronique";// Format d'adresse électronique
+var SmallworldValidationBirthplaceErrorMsg = "Entrez votre date de naissance"; // Date de naissance obligatoire
+var SmallworldValidationAdressErrorMsg = "Entrez le nom de la rue"; // Adresse
+var SmallworldValidationCityErrorMsg = "Renseignez la ville"; // Ville
+var SmallworldValidationCountryErrorMsg = "Renseignez votre pays"; // Pays
+var SmallworldValidationWebsiteErrorMsg = "Entrez votre site internet"; // Site internet
+var SmallworldSureDelete = "Êtes-vous sûr de vouloir supprimer cette mise à jour ? Il n'y aura pas de retour possible !"; // Supprimer les commentaires
+var SmallworldAdminSureDeleteUser = "Confirmer la suppression de cet utilisateur "; //Suppression des utilisateurs dans l'administration
+var SmallworldDialogStatsTitle = "Statistiques"; // Titre de la fenêtre de dialogue des statistiques
+// Partie confirmation selon les langues, pour jquery
+var args = {
+ 'confirm' : false, // Bouttons "ok" et "annuler"
+ 'verify' : true, // Bouttons "oui" et "non"
+ 'input' : false, // Saisie de texte ("true" ou chaîne de texte par défaut)
+ 'animate' : true, // Annimation habituelle ("true" ou un nombre, 400 par défaut)
+ 'textOk' : 'Ok', // Boutton "Ok", texte par défaut
+ 'textCancel' : 'Annuler', // Boutton "Annuler", texte par défaut
+ 'textYes' : 'Oui !', // Boutton "Oui !", texte par défaut
+ 'textNo' : 'Non !' // Boutton "Non !", texte par défaut
+ }
Added: XoopsModules/smallworld/trunk/smallworld/language/french/mailTpl/index.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/french/mailTpl/index.html (rev 0)
+++ XoopsModules/smallworld/trunk/smallworld/language/french/mailTpl/index.html 2012-05-07 09:26:51 UTC (rev 9446)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/smallworld/trunk/smallworld/language/french/mailTpl/mail_attencionneeded.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/french/mailTpl/mail_attencionneeded.html (rev 0)
+++ XoopsModules/smallworld/trunk/smallworld/language/french/mailTpl/mail_attencionneeded.html 2012-05-07 09:26:51 UTC (rev 9446)
@@ -0,0 +1,33 @@
+<html>
+<head>
+<style type="text/css">
+ ol, ul {list-style:none}
+ a {text-decoration: none;color: #1f1f1f;}
+ a:hover {text-decoration: none; color: #5d8ba6;}
+ h4 {font-family: 'Puritan20Normal';font-weight: normal;color: #1f1f1f;margin-bottom: 10px;font-size: 17px;}
+ img.left {top: 0px;float:left;display: block;margin:0;padding:0;margin-right:20px;}
+ #wrapper {width: 960px;margin: 100px auto 0;padding-top: 0;line-height: 20px;background-color:#33FFFF;border-style: groove;border-color:aqua;border-width:medium;}
+ #newslist ul li {width: 850px;px;background: none;margin: 2px 0 18px 2px;background-color: #FFF;-webkit-box-shadow: 0px 1px 2px 0px #b7b7b7;-moz-box-shadow: 0px 1px 2px 0px #b7b7b7;box-shadow: 0px 1px 2px 0px #b7b7b7;padding: 15px;display: block;overflow: hidden;}
+
+ #newslist p {margin: 0;}
+ #newslist h4 {margin-bottom: 8px;line-height: 1;}
+ #newslist h4 span {font-style: italic;font-family: Georgia, "Times New Roman", Times, serif;font-size: 12px;color: #565656;padding-left: 5px;}
+ #news h2 {float: left;margin-top: 10px;}
+ .greeting {margin:0px 0px 0px 25px;}
+ .infotext {margin:10px 0px 0px 25px;}
+ .title2 {margin-bottom: 12px;margin-top: 2px;}
+ .title {margin-bottom: 12px;margin-top: 4px;}
+ </style>
+</head>
+<body>
+<!-- Début du format conteneur (wrapper en anglais) -->
+ <div id="wrapper">
+ <br>
+ <p class="greeting">Bonjour <{$toUser}>,</p>
+ <p class="infotext">Mise à jour le <{$date}>. Vérifiez votre profil : <{$sitename}>.<br><br>Cliquez sur ce lien pour aller directement à la page d'accueil de smallworld<br><br><{$link}></p>
+ <br>
+ </div>
+<!-- Fin du format conteneur -->
+<!-- Traduction Cesag (frxoops.org) le 5 Mai 2012 -->
+</body>
+</html>
\ No newline at end of file
Added: XoopsModules/smallworld/trunk/smallworld/language/french/mailTpl/mail_complaint.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/french/mailTpl/mail_complaint.html (rev 0)
+++ XoopsModules/smallworld/trunk/smallworld/language/french/mailTpl/mail_complaint.html 2012-05-07 09:26:51 UTC (rev 9446)
@@ -0,0 +1,47 @@
+<html>
+<head>
+<style type="text/css">
+ ol, ul {list-style:none}
+ a {text-decoration: none;color: #1f1f1f;}
+ a:hover {text-decoration: none; color: #5d8ba6;}
+ h4 {font-family: 'Puritan20Normal';font-weight: normal;color: #1f1f1f;margin-bottom: 10px;font-size: 17px;}
+ img.left {top: 0px;float:left;display: block;margin:0;padding:0;margin-right:20px;}
+ #wrapper {width: 960px;margin: 100px auto 0;padding-top: 0;line-height: 20px;background-color:#33FFFF;border-style: groove;border-color:aqua;border-width:medium;}
+ #newslist ul li {width: 850px;px;background: none;margin: 2px 0 18px 2px;background-color: #FFF;-webkit-box-shadow: 0px 1px 2px 0px #b7b7b7;-moz-box-shadow: 0px 1px 2px 0px #b7b7b7;box-shadow: 0px 1px 2px 0px #b7b7b7;padding: 15px;display: block;overflow: hidden;}
+
+ #newslist p {margin: 0;}
+ #newslist h4 {margin-bottom: 8px;line-height: 1;}
+ #newslist h4 span {font-style: italic;font-family: Georgia, "Times New Roman", Times, serif;font-size: 12px;color: #565656;padding-left: 5px;}
+ #news h2 {float: left;margin-top: 10px;}
+ .greeting {margin:0px 0px 0px 25px;}
+ .infotext {margin:10px 0px 0px 25px;}
+ .title2 {margin-bottom: 12px;margin-top: 2px;}
+ .title {margin-bottom: 12px;margin-top: 4px;}
+ </style>
+</head>
+<body>
+<!-- Début du format conteneur (Wrapper en anglais) -->
+ <div id="wrapper">
+ <br>
+ <p class="greeting">Bonjour Administrateur,</p>
+ <p class="infotext"><{$sendername}> a trouvé quelque chose qui requiert votre attention sur <{$sitename}></p>
+ <div id="news">
+ <!-- Début de la navigation des nouvelles (news en anglais) -->
+ <div id="newslist">
+ <ul>
+ <!-- Début de l'entête N°1 -->
+ <li>
+ <span style="font-size:11px">Il semble que c'est un message écrit par <{$against}> et <{$sendername}> l'a signalé à <{$time}> (heure du serveur)</h4>
+ <h4 class="title"><span style="font-size:11px"><{$link}></span></h4>
+ </li>
+ <!-- Fin de l'entête N°1 -->
+ </ul>
+ </div>
+ </div>
+ <!-- Fin de la navigation des nouvelles -->
+ <br>
+ </div>
+<!-- Fin du format conteneur -->
+<!-- Traduction Cesag (frxoops.org) le 5 Mai 2012 -->
+</body>
+</html>
\ No newline at end of file
Added: XoopsModules/smallworld/trunk/smallworld/language/french/mailTpl/mail_newcomment.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/french/mailTpl/mail_newcomment.html (rev 0)
+++ XoopsModules/smallworld/trunk/smallworld/language/french/mailTpl/mail_newcomment.html 2012-05-07 09:26:51 UTC (rev 9446)
@@ -0,0 +1,56 @@
+<html>
+<head>
+<style type="text/css">
+ ol, ul {list-style:none}
+ a {text-decoration: none;color: #1f1f1f;}
+ a:hover {text-decoration: none; color: #5d8ba6;}
+ h4 {font-family: 'Puritan20Normal';font-weight: normal;color: #1f1f1f;margin-bottom: 10px;font-size: 17px;}
+ img.left {top: 0px;float:left;display: block;margin:0;padding:0;margin-right:20px;}
+ #wrapper {width: 960px;margin: 100px auto 0;padding-top: 0;line-height: 20px;background-color:#33FFFF;border-style: groove;border-color:aqua;border-width:medium;}
+ #newslist ul li {width: 850px;px;background: none;margin: 2px 0 18px 2px;background-color: #FFF;-webkit-box-shadow: 0px 1px 2px 0px #b7b7b7;-moz-box-shadow: 0px 1px 2px 0px #b7b7b7;box-shadow: 0px 1px 2px 0px #b7b7b7;padding: 15px;display: block;overflow: hidden;}
+
+ #newslist p {margin: 0;}
+ #newslist h4 {margin-bottom: 8px;line-height: 1;}
+ #newslist h4 span {font-style: italic;font-family: Georgia, "Times New Roman", Times, serif;font-size: 12px;color: #565656;padding-left: 5px;}
+ #news h2 {float: left;margin-top: 10px;}
+ .greeting {margin:0px 0px 0px 25px;}
+ .infotext {margin:10px 0px 0px 25px;}
+ .title2 {margin-bottom: 12px;margin-top: 2px;}
+ .title {margin-bottom: 12px;margin-top: 4px;}
+</style>
+</head>
+<body>
+<!-- Début du format conteneur (Wrapper en anglais) -->
+ <div id="wrapper">
+ <br>
+ <p class="greeting">Bonjour <{$recievename}>,</p>
+ <p class="infotext"><{$sendname}> a écrit un commentaire sur votre mur. Vous pouvez le voir sur <{$sitename}></p>
+ <div id="news">
+ <!-- Début de la navigation des nouvelles (news en anglais) -->
+ <div id="newslist">
+ <ul>
+ <!-- Début de l'entête N°1 -->
+ <li><{$to_avatarlink}>
+ <h4 class="title"><{$ownernameurl}> <span style="font-size:11px">Message initial:</span></h4>
+ <p><{$ownermessage}></p>
+ </li>
+ <!-- Fin de l'entête N°1 -->
+
+ <!-- Début de l'entête N°2 -->
+ <li style="margin-left:25px;width:780px"><{$from_avatarlink}>
+ <h4 class="title2"><{$sendnameurl}> <span style="font-size:11px"> a répondu le (<{$itemtextdate}> date du serveur)</span></h4>
+ <p><{$itemtext}></p>
+ </li>
+ <!-- Fin de l'entête N°2 -->
+ </ul>
+ </div>
+ </div>
+ <!-- Fin de la navigation des nouvelles -->
+ <br>
+ <p align="center"><{$replylink}></p>
+ <br/>
+ </div>
+<!-- Fin du format conteneur -->
+<!-- Traduction Cesag (frxoops.org) le 5 Mai 2012 -->
+</body>
+</html>
\ No newline at end of file
Added: XoopsModules/smallworld/trunk/smallworld/language/french/mailTpl/mail_register.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/french/mailTpl/mail_register.html (rev 0)
+++ XoopsModules/smallworld/trunk/smallworld/language/french/mailTpl/mail_register.html 2012-05-07 09:26:51 UTC (rev 9446)
@@ -0,0 +1,46 @@
+<html>
+<head>
+<style type="text/css">
+ ol, ul {list-style:none}
+ a {text-decoration: none;color: #1f1f1f;}
+ a:hover {text-decoration: none; color: #5d8ba6;}
+ h4 {font-family: 'Puritan20Normal';font-weight: normal;color: #1f1f1f;margin-bottom: 10px;font-size: 17px;}
+ img.left {top: 0px;float:left;display: block;margin:0;padding:0;margin-right:20px;}
+ #wrapper {width: 960px;margin: 100px auto 0;padding-top: 0;line-height: 20px;background-color:#33FFFF;border-style: groove;border-color:aqua;border-width:medium;}
+ #newslist ul li {width: 850px;px;background: none;margin: 2px 0 18px 2px;background-color: #FFF;-webkit-box-shadow: 0px 1px 2px 0px #b7b7b7;-moz-box-shadow: 0px 1px 2px 0px #b7b7b7;box-shadow: 0px 1px 2px 0px #b7b7b7;padding: 15px;display: block;overflow: hidden;}
+
+ #newslist p {margin: 0;}
+ #newslist h4 {margin-bottom: 8px;line-height: 1;}
+ #newslist h4 span {font-style: italic;font-family: Georgia, "Times New Roman", Times, serif;font-size: 12px;color: #565656;padding-left: 5px;}
+ #news h2 {float: left;margin-top: 10px;}
+ .greeting {margin:0px 0px 0px 25px;}
+ .infotext {margin:10px 0px 0px 25px;}
+ .title2 {margin-bottom: 12px;margin-top: 2px;}
+ .title {margin-bottom: 12px;margin-top: 4px;}
+ </style>
+</head>
+<body>
+<!-- Début du format conteneur (Wrapper en anglais) -->
+ <div id="wrapper">
+ <br>
+ <p class="greeting">Bonjour Administrateur,</p>
+ <p class="infotext"><{$registername}> s'est inscrit sur <{$sitename}></p>
+ <div id="news">
+ <!-- Début de la navigation des nouvelles (news en anglais) -->
+ <div id="newslist">
+ <ul>
+ <!-- Début de l'entête N°1 -->
+ <li><{$registerlink}>
+ <h4 class="title"><{$registerurl}> <span style="font-size:11px">Voir le profil ici</span></h4>
+ </li>
+ <!-- Fin de l'entête N°1 -->
+ </ul>
+ </div>
+ </div>
+ <!-- Fin de la navigation des nouvelles -->
+ <br>
+ </div>
+<!-- Fin du format conteneur -->
+<!-- Traduction Cesag (frxoops.org) le 5 Mai 2012 -->
+</body>
+</html>
\ No newline at end of file
Added: XoopsModules/smallworld/trunk/smallworld/language/french/main.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/french/main.php (rev 0)
+++ XoopsModules/smallworld/trunk/smallworld/language/french/main.php 2012-05-07 09:26:51 UTC (rev 9446)
@@ -0,0 +1,381 @@
+<?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.
+* 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$
+**/
+
+/*----------------- Menu items ---------------*/
+
+/*------------ General items -------- */
+define("_SMALLWORLD_SYSERROR","Erreur système !");
+define("_SMALLWORLD_SYSNAME","Smallworld");
+define("_SMALLWORLD_ALL_FIELDS_DISABLED","Aucune information disponible");
+define("_SMALLWORLD_RECENTACTIVITY","Activités récentes");
+define("_SMALLWORLD_MESSAGEHISTORIC", "Derniers messages");
+
+/*----------- Personal info ------------------*/
+define("_SMALLWORLD_AVATAR","Image actuelle");
+define("_SMALLWORLD_REALNAME","Nom de famille");
+define("_SMALLWORLD_GENDER","Sexe");
+define("_SMALLWORLD_INTERESTEDIN","Intéressé par");
+define("_SMALLWORLD_RELATIONSHIPSTATUS","Statut de relation");
+define("_SMALLWORLD_PARTNER","Partenaire");
+define("_SMALLWORLD_LOOKINGFOR", "A la recherche de");
+define("_SMALLWORLD_BIRTHPLACE", "Lieu de naissance");
+define("_SMALLWORLD_POLITICALVIEW", "Opinion politique");
+define("_SMALLWORLD_RELIGIOUSVIEW", "Religion");
+define("_SMALLWORLD_EMAILS","Adresse électronique");
+
+/*--------------- contact info -----------------*/
+define("_SMALLWORLD_MOBILEPHONE","Téléphone mobile");
+define("_SMALLWORLD_LANDPHONE","Téléphone fixe");
+define("_SMALLWORLD_ADRESS","Adresse");
+define("_SMALLWORLD_CITY","Ville");
+
+/*-------------- interests ---------------------*/
+define("_SMALLWORLD_WEBSITE","Site internet");
+define("_SMALLWORLD_INTERESTS","Intérêts");
+define("_SMALLWORLD_FAVOURITEMUSIC","Musiques favorites");
+define("_SMALLWORLD_FAVOURITEMOVIES","Films préférés");
+define("_SMALLWORLD_ABOUTME","À propos de moi");
+define("_SMALLWORLD_ADDSCHOOLS","Écoles / Éducation");
+define("_SMALLWORLD_ADDJOBS","Emploi");
+define("_SMALLWORLD_VARIOUSINTERESTS","Autres centres d'intérêt");
+define("_SMALLWORLD_CONTACTINFO","Informations de contact");
+define("_SMALLWORLD_PERSONALINFO","Informations personnelles");
+define("_SMALLWORLD_NOFRIENDTEXT","Seuls les amis peuvent voir votre profil et votre mur");
+
+/* --------------- Timezone, User profile text & stats ----------------*/
+define("_SMALLWORLD_TIMEZONE","Fuseau horaire");
+define("_SMALLWORLD_OCCUPATION","Occupation");
+define("_SMALLWORLD_MEMBERSINCE","Membre depuis");
+define("_SMALLWORLD_MESSENGER","Msn");
+define("_SMALLWORLD_TOTALPOSTS","Total des messages");
+define("_SMALLWORLD_RANK","Rang");
+define("_SMALLWORLD_RANKIMAGE","Image de rang");
+define("_SMALLWORLD_TOTALUSERRATINGS","Cote globale");
+define("_SMALLWORLD_LASTLOGIN","Dernière connexion");
+define("_SMALLWORLD_SIGNATURE","Signature");
+define("_SMALLWORLD_REPLY_NOTSPECIFIED","Non spécifié");
+define("_SMALLWORLD_BIRTHDAY","Anniversaire");
+define("_SMALLWORLD_AKA","alias");
+define("_SMALLWORLD_BORN","né(e) le");
+define("_SMALLWORLD_YEARSOLD","ans");
+define("_SMALLWORLD_IN","à");
+define("_SMALLWORLD_HE","Il");
+define("_SMALLWORLD_SHE","Elle");
+define("_SMALLWORLD_HEORSHE","Il ou elle");
+define("_SMALLWORLD_LIVINGIN","réside à");
+define("_SMALLWORLD_ISEMPLOYEDBY","est employé(e) par");
+define("_SMALLWORLD_ATTENDED","a étudié à");
+define("_SMALLWORLD_AND","et");
+define("_SMALLWORLD_BIOGRAPHY","Biographie");
+define("_SMALLWORLD_EXTBIOGRAPHY","Plus d'informations");
+define("_SMALLWORLD_NAME","Nom");
+define("_SMALLWORLD_COUNTRY","Pays");
+
+/*------------- Friends and follow ---------------------*/
+define("_SMALLWORLD_FRIEND","Se faire des amis");
+define("_SMALLWORLD_FOLLOWFRIEND","Suivre");
+define("_SMALLWORLD_SENDMESSAGE","Envoyer un message");
+define("_SMALLWORLD_MOREINFO","Pour plus d'informations, cliquez ici");
+
+/*--------------------- Messages and boxes -----------------------------*/
+define("_SMALLWORLD_NOTYETUSER_GREETING","Bienvenue");
+define("_SMALLWORLD_NOTYETUSER_BOXTEXT","Afin d'utiliser ce module, vous devez remplir un formulaire de profil supplémentaire.
+ <br><br>Cliquez sur S'enregister pour continuer l'enregistrement ou cliquez sur Annuler<br>pour revenir à la page d'accueil.");
+define("_SMALLWORLD_NOTYETREGISTERED_TITLE","Continuez pour terminer l'enregistrement");
+define ("_SMALLWORLD_TEXTBEFORESUBMIT","Continuez en cliquant sur Enregistrer pour enregistrer vos informations dans la base de données.<br><br>Après cela, vous serez en mesure de visiter votre page, <br>et les pages des autres utilisateurs.<br><br>En vous remerçiant d'avoir pris le temps de remplir ce formulaire.");
+define("_SMALLWORLD_FRIENDSINVITATIONS","Ajouter en ami");
+define("_SMALLWORLD_DATERECIEVED","Date");
+define("_SMALLWORLD_ACCEPT","Accepter");
+define("_SMALLWORLD_DENY","Refuser");
+define("_SMALLWORLD_LATER","Reporter à plus tard");
+define("_SMALLWORLD_ACTION","Action");
+define("_SMALLWORLD_UPDATEID_NOT_EXIST","Le message n'existe pas. Retourner à l'accueil");
+define("_SMALLWORLD_NOUSER_ERROR","Aucun utilisateur trouvé. Retour à la page d'accueil");
+
+/* ------------- Registerform ---------------------- */
+
+define("_SMALLWORLD_REGRISTATION_TITLE","Enregistrement du profil");
+define("_SMALLWORLD_STEP1","Étape 1 sur 6");
+define("_SMALLWORLD_STEP2","Étape 2 sur 6");
+define("_SMALLWORLD_STEP3","Étape 3 sur 6");
+define("_SMALLWORLD_STEP4","Étape 4 sur 6");
+define("_SMALLWORLD_STEP5","Étape 5 sur 6");
+define("_SMALLWORLD_STEP6","Fin");
+define ("_SMALLWORLD_BELIEFS","Croyances");
+define("_SMALLWORLD_FAVOURITETHINGS","Choses que je préfère");
+define("_SMALLWORLD_FAVOURITEBOOKS","Livres préférés");
+define("_SMALLWORLD_FAVOURITEMOVIE","Films préférés");
+define("_SMALLWORLD_FAVOURITETVSHOW","Séries télévisées préférées");
+define("_SMALLWORLD_FAVOURITEINTERESTS","Centres d'intérêts");
+define("_SMALLWORLD_INTERESTS_DESC","Loisirs et renseignements personnels");
+define("_SMALLWORLD_CONTACTS","Informations de contact");
+define("_SMALLWORLD_EMAIL","Messagerie(s) électronique(s)");
+define("_SMALLWORLD_SCREENNAMES","Pseudonyme(s)");
+define("_SMALLWORLD_PHONE","Téléphone fixe");
+define("_SMALLWORLD_GSM","Téléphone portable");
+define("_SMALLWORLD_ISSINGLE","est célibataire pour le moment");
+define("_SMALLWORLD_INRELATIONSHIP","a une relation avec");
+define("_SMALLWORLD_ISMARRIED","est marié à");
+define("_SMALLWORLD_ISENGAGED","est fiancé à");
+define("_SMALLWORLD_ISCOMPLICATED","a une relation compliquée avec");
+define("_SMALLWORLD_OPENRELATIONSHIP","est en concubinage avec");
+define("_SMALLWORLD_ADDITIONALINFO","En savoir plus sur");
+define("_SMALLWORLD_HIS","son");
+define("_SMALLWORLD_HER","sa");
+define("_SMALLWORLD_HISHER","son ou sa");
+define("_SMALLWORLD_POLITICWORD","Politique");
+define("_SMALLWORLD_RELIGIONWORD","Religion");
+define("_SMALLWORLD_IS","est");
+define("_SMALLWORLD_ADDSOMEINFO","Ajouter ou modifier des informations");
+define("_SMALLWORLD_CHOOSE","Choisir");
+define("_SMALLWORLD_WOMAN","Femme");
+define("_SMALLWORLD_MAN","Homme");
+define("_SMALLWORLD_BOTH","Les deux");
+define("_SMALLWORLD_NONE","Aucun");
+define("_SMALLWORLD_MARRIED","Marié");
+define("_SMALLWORLD_ENGAGED","Fiancé");
+define("_SMALLWORLD_SINGLE","Célibataire");
+define("_SMALLWORLD_RELATIONSHIP","Dans une relation");
+define("_SMALLWORLD_RELATIONSHIP_OPEN","En concubinage");
+define("_SMALLWORLD_ITSCOMP","C'est compliqué");
+define("_SMALLWORLD_FRIENDSHIP","Amitiés");
+define("_SMALLWORLD_DATING","Rencontres");
+define("_SMALLWORLD_ARELATIONSHIP","Connaissances");
+define("_SMALLWORLD_HANKYPANKY","Relations intimes");
+define("_SMALLWORLD_PVLIBERAL","Extrême gauche");
+define("_SMALLWORLD_PLIBERAL","Libéral");
+define("_SMALLWORLD_PMODERATE","Modéré");
+define("_SMALLWORLD_PCONSERVATIVE","Conservateur");
+define("_SMALLWORLD_PVCONSERVATIVE","Très conservateur");
+define("_SMALLWORLD_PLIBERTARIAN","Extrême droite");
+define("_SMALLWORLD_POTHER","Autres");
+define("_SMALLWORLD_RCHRISTIANITY","Christianisme");
+define("_SMALLWORLD_RISLAM","Islamisme");
+define("_SMALLWORLD_RSECULAR","Laïque/Non religieux/agnostique et athée");
+define("_SMALLWORLD_RHINDUISM","Hindouisme");
+define("_SMALLWORLD_RCHINESETRAD","Religion traditionnelle chinoise");
+define("_SMALLWORLD_RBUDDHISM","Bouddhisme");
+define("_SMALLWORLD_RPRIMALIND","Primitif");
+define("_SMALLWORLD_RAFRICANTRAD","Africaine traditionnelle et diaspora");
+define("_SMALLWORLD_RSIKHISM","Sikhisme (religion moniste en Inde)");
+define("_SMALLWORLD_RJUCHE","Juche (idéologie Coréenne)");
+define("_SMALLWORLD_RSPIRITISM","Spiritisme");
+define("_SMALLWORLD_RJUDAISM","Judaïsme");
+define("_SMALLWORLD_RBAHAI","Bahaïsme");
+define("_SMALLWORLD_RJAINISM","Jaïnisme");
+define("_SMALLWORLD_RSHINTO","Shintoïsme");
+define("_SMALLWORLD_RCAODAI","Caodaïsme");
+define("_SMALLWORLD_RZOROASRIANISM","Zoroastrisme");
+define("_SMALLWORLD_RTENRIKYO","Tenrikyō");
+define("_SMALLWORLD_RNEOPAGANISM","Néopaganisme");
+define("_SMALLWORLD_RUNITARIANUNIVERSALISM","Universalisme unitarien");
+define("_SMALLWORLD_RRASTA","Mouvement rastafari");
+define("_SMALLWORLD_RSCIENTOLOGY","Scientologie");
+define("_SMALLWORLD_ANCIENTALIENTHEORIST","Ancienne Théorie Alien");
+define("_SMALLWORLD_ROTHER","Autres");
+define("_SMALLWORLD_SUBMIT","Enregistrer");
+define("_SMALLWORLD_EMAILADRESSES","Adresse(s) éléctronique(s)");
+
+// dropdown screen names
+define ("_SMALLWORLD_SCREENNAME_AIM", "MSN");
+define ("_SMALLWORLD_SCREENNAME_FACEBOOK", "Facebook");
+define ("_SMALLWORLD_SCREENNAME_GOOGLE", "Google +");
+define ("_SMALLWORLD_SCREENNAME_ICQ", "ICQ");
+define ("_SMALLWORLD_SCREENNAME_SKYPE", "Skype");
+define ("_SMALLWORLD_SCREENNAME_TWITTER", "Twitter");
+define ("_SMALLWORLD_SCREENNAME_MYSPACE", "MySpace");
+define ("_SMALLWORLD_SCREENNAME_XOOPS", "Xoops (UID) ");
+define ("_SMALLWORLD_SCREENNAME_YAHOO", "Yahoo");
+define ("_SMALLWORLD_SCREENNAME_YOUTUBE", "Youtube");
+define("_SMALLWORLD_ADDMORE","Ajouter");
+define("_SMALLWORLD_REMOVE","Supprimer");
+
+/*------------ Schools ----------*/
+
+define("_SMALLWORLD_KINDERGARDEN","Maternelle");
+define("_SMALLWORLD_NURSERY","Crèche");
+define("_SMALLWORLD_ELEMSCHOOL","École élémentaire");
+define("_SMALLWORLD_GRADUATESCHOOL","École primaire");
+define("_SMALLWORLD_HIGHSCHOOL","École secondaire");
+define("_SMALLWORLD_JUNIORHIGH","École privée");
+define("_SMALLWORLD_JUNIORCOLLEGE","Collège");
+define("_SMALLWORLD_COLLEGE","Lycée");
+define("_SMALLWORLD_TECNICAL","Enseignement technique");
+define("_SMALLWORLD_UNIVERSITY","Université");
+define("_SMALLWORLD_SCHOOLNAME","Nom de l'école");
+define("_SMALLWORLD_SCHOOLTYPE","Type d'école");
+define("_SMALLWORLD_START","Date d'entrée");
+define("_SMALLWORLD_STOP","Date de sortie");
+define("_SMALLWORLD_MUSIC","Musique préférée");
+define("_SMALLWORLD_TVSHOW","Série Télévisée préférée");
+define("_SMALLWORLD_MOVIE","Film préféré");
+define("_SMALLWORLD_BOOKS","Livres préférés");
+define("_SMALLWORLD_EMPLOYER","Employeur");
+define("_SMALLWORLD_POSITION","Poste de travail");
+define("_SMALLWORLD_DESCRIPTION","Description de l'emploi");
+define("_SMALLWORLD_JOBSTART","Entrée dans l'entreprise");
+define("_SMALLWORLD_JOBSTOP","Sortie de l'entreprise");
+define("_SMALLWORLD_NOACCOUNT","Il semblerait que vous n'ayez pas de compte, ou il manque encore des informations à votre profil.");
+define("_SMALLWORLD_REGXOOPS","Cliquez ici pour vous inscrire");
+define("_SMALLWORLD_REGSMALLWORLD","Cliquez ici pour modifier ou ajouter des détails à votre profil");
+define("_SMALLWORLD_WORKFULL_TITLE","Tous les lieux de travail");
+define("_SMALLWORLD_SCHOOLFULL_TITLE","Tous les établissements scolaires");
+define("_SMALLWORLD_INTERESTS_TITLE","Intérêts et contact");
+define("_SMALLWORLD_MORE"," .. tous les détails");
+
+/*-------------- Upload form --------------------*/
+define('_SMALLWORLD_UPLOAD_HOWTO','Toutes les images de votre album sont affichées ici. Vous pouvez utiliser cet outil pour télécharger ou supprimer des images<br><br>Cliquez sur les fichiers de téléchargement vert, Sélectionnez vos images à télécharger : <br> 1) Une par une à l\'aide des - src="images/icon_start.PNG" style="display: inline-block;height:13px;"/>icônes.<br> 2)Sélectionnez-en plusieurs en parcourant ou * en faisant glisser les fichiers sur le téléchargement vert (* ne fonctionne pas sous IE) et cliquez sur Démarrer <br> Remarque :. Si vous choisissez d\'autres types de fichiers autres que des fichiers d\'image, le script échouera. La taille de l\'image peut aller jusqu\'à 5 Mo <br> ');
+define('_SMALLWORLD_UPLOADTITLE','Titre de l\'image');
+define('_SMALLWORLD_UPLOADDESC','Description de l\'image');
+define('_SMALLWORLD_UPLOAD_TITLE','Télécharger les images vers votre album d\'images');
+define('_SMALLWORLD_UPLOADTEXT','Démarrer le téléchargement');
+define('_SMALLWORLD_UPLOADFILESTEXT','Sélectionnez une ou plusieurs images');
+define('_SMALLWORLD_IMGDESCRIPTION','Description de l\'image');
+define('_SMALLWORLD_IMGTITLE','Titre de l\'image');
+define('_SMALLWORLD_IMAGE_EDIT_TITLE','Modifier la description');
+define("_SMALLWORLD_WELCOME_TITLE","Bienvenue");
+define("_SMALLWORLD_WELCOMETEXT",", Bienvenue. Je vous souhaite de passer un bon moment.");
+define("_SMALLWORLD_UPLOADEDSOMEIMAGES"," envoi de nouvelles images <br/> Cliquez sur l'image pour voir sa taille réelles ou sur ce lien<br/>pour ouvrir la Gallerie.");
+define("_SMALLWORLD_IMAGES_START","Envoyer");
+define("_SMALLWORLD_IMAGES_CANCEL","Annuler");
+define("_SMALLWORLD_IMAGES_DELETE","Supprimer");
+define("_SMALLWORLD_IMAGES_STARTALL","Tout envoyer");
+define("_SMALLWORLD_IMAGES_CANCELALL","Tout annuler");
+define("_SMALLWORLD_IMAGES_DELETEALL","Tout supprimer");
+
+/*-------------- Image gallery -------------*/
+define("_SMALLWORLD_ALBUMTITLETEXT","Fermer l'album");
+define("_SMALLWORLD_TITLEHEADER","Album photo");
+define("_SMALLWORLD_NOIMAGES"," ne contient pas encore d'images");
+define("_SMALLWORLD_GOTOUPLOADIMAGE"," Envoyer ou supprimer des images");
+define("_SMALLWORLD_EDITDESCRIPTION","Modifier la description de l'image");
+define("_SMALLWORLD_NOTFRIENDNOIMAGES","Vous pouvez seulement afficher les albums photo des amis !");
+define("_SMALLWORLD_GALLERY_DOWNLOADORIGINAL","Télécharger l'original");
+define("_SMALLWORLD_GALLEY_NEXTPAGE","Page suivante");
+define("_SMALLWORLD_GALLEY_PREVIOUSPAGE","Page précédente");
+
+
+/*-------------- Search ----------------*/
+define("_SMALLWORLD_SEARCHMEMBER","Recherche de noms");
+
+/*---------------- Messages (jSon, alerts) -------------------*/
+define("_SMALLWORLD_FRIENDSHIPFOLLOW","Suivre");
+define("_SMALLWORLD_FRIENDSHIPREQUESTS","Prendre contact avec : ");
+define("_SMALLWORLD_JSON_ADDFRIEND","Votre demande d'ami a été envoyé à ");
+define("_SMALLWORLD_JSON_CANCEL_ADDFRIEND","Vous avez annulé demande d'ami pour ");
+define("_SMALLWORLD_JSON_DELETE_FRIEND_START","Suppression faite ");
+define("_SMALLWORLD_JSON_DELETE_FRIEND_END"," de cette personne en tant qu'ami.");
+define("_SMALLWORLD_JSON_REQUEST_PENDING","<br><br>Demande d'amitié en attente d'approbation.");
+
+define ("_SMALLWORLD_JSON_FOLLOWINGFRIEND","Suivi activé concernant : ");
+define ("_SMALLWORLD_JSON_FOLLOWINGFRIEND_DESC","<br><br>Tous les messages qu'il ou elle écrit dans son mur apparaîtront également sur le vôtre.");
+define ("_SMALLWORLD_JSON_UNFOLLOWINGFRIEND","Vous ne suivez plus : ");
+define ("_SMALLWORLD_JSON_UNFOLLOWINGFRIEND_DESC","<br><br>Les messages de son mur n'apparaîtront plus dans le vôtre.");
+
+define("_SMALLWORLD_JSON_ADDFR_TEXT","Ajouter en ami");
+define("_SMALLWORLD_JSON_CANCELFR_TEXT","Annuler la demande d'ami");
+define("_SMALLWORLD_JSON_REMOVEFR_TEXT","Supprimer l'ami");
+
+define("_SMALLWORLD_JSON_FLYES_TEXT","Suivre");
+define("_SMALLWORLD_JSON_FLNO_TEXT","Ne plus suivre");
+
+define("_SMALLWORLD_JS_ALREADYVOTED","Vous avez déjà voté !");
+define("_SMALLWORLD_JS_COMPLAINTSENT","Votre plainte a été envoyée au modérateur. Le fil de discussion sera examiné au plus vite.");
+define("_SMALLWORLD_JS_COMPLAINT_ALREADY_SENT","Vous avez déjà envoyé une plainte à ce sujet !");
+
+/*----------- Indexpage menu --------------*/
+define("_SMALLWORLD_HOME","Accueil");
+define("_SMALLWORLD_PROFILEINDEX","Profil");
+define("_SMALLWORLD_FRIENDSPAGE","Amis");
+define("_SMALLWORLD_GALLERY","Photos");
+define("_SMALLWORLD_CHANGEAVATAR","Changer d'avatar");
+define("_SMALLWORLD_EDITPROFILE","Modifier le profil");
+define("_SMALLWORLD_STATS","Statistiques");
+define("_SMALLWORLD_INFO","À propos..");
+define("_SMALLWORLD_XIMUSER","Message instantané à ");
+/*----------- Wall -----------------------*/
+define("_SMALLWORLD_WHATSUP","Quoi de neuf ?");
+define("_SMALLWORLD_DELUPD","Supprimer la mise à jour");
+define("_SMALLWORLD_COMMENTWALL","Commenter");
+define("_SMALLWORLD_DELETECOMMENT","Supprimer le commentaire");
+define("_SMALLWORLD_SECONDSAGO"," il y a quelques secondes");
+define("_SMALLWORLD_ONEMINUTEAGO","il y a une minute");
+define("_SMALLWORLD_MINUTESAGO"," il y a quelques minutes");
+define("_SMALLWORLD_ONEHOURAGO","il y a une heure");
+define("_SMALLWORLD_HOURSAGO"," il y a quelques heures");
+define("_SMALLWORLD_ONEDAYAGO","il y a un jour");
+define("_SMALLWORLD_DAYSAGO"," il y a quelques jours");
+define("_SMALLWORLD_ONEWEEKAGO","il y a une semaine");
+define("_SMALLWORLD_WEEKSAGO...
[truncated message content] |
|
From: <dj...@us...> - 2012-05-08 16:52:58
|
Revision: 9463
http://xoops.svn.sourceforge.net/xoops/?rev=9463&view=rev
Author: djculex
Date: 2012-05-08 16:52:51 +0000 (Tue, 08 May 2012)
Log Message:
-----------
- Bugfix: Replaced hardcoded lang. defines
- Bugfix: Fixed image popups opening correct image
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/js/gallery_mod.js
XoopsModules/smallworld/trunk/smallworld/js/smallworld.js
XoopsModules/smallworld/trunk/smallworld/language/danish/js/variables.js
XoopsModules/smallworld/trunk/smallworld/language/danish/main.php
XoopsModules/smallworld/trunk/smallworld/language/english/js/variables.js
XoopsModules/smallworld/trunk/smallworld/language/english/main.php
XoopsModules/smallworld/trunk/smallworld/language/russian/js/variables.js
XoopsModules/smallworld/trunk/smallworld/language/russian/main.php
XoopsModules/smallworld/trunk/smallworld/templates/getlastmsg.html
XoopsModules/smallworld/trunk/smallworld/templates/getmore.html
XoopsModules/smallworld/trunk/smallworld/templates/smallworld_index.html
XoopsModules/smallworld/trunk/smallworld/templates/smallworld_permalink.html
XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_template.html
Modified: XoopsModules/smallworld/trunk/smallworld/js/gallery_mod.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/js/gallery_mod.js 2012-05-08 16:27:12 UTC (rev 9462)
+++ XoopsModules/smallworld/trunk/smallworld/js/gallery_mod.js 2012-05-08 16:52:51 UTC (rev 9463)
@@ -25,12 +25,12 @@
loadingContainerSel: '#loading',
renderSSControls: true,
renderNavControls: true,
- playLinkText: 'Play Slideshow',
- pauseLinkText: 'Pause Slideshow',
- prevLinkText: '‹ Previous Photo',
- nextLinkText: 'Next Photo ›',
- nextPageLinkText: 'Next ›',
- prevPageLinkText: '‹ Prev',
+ playLinkText: SmallworldPhotoPlaySlideshow,
+ pauseLinkText: SmallworldPhotoPauseSlideshow,
+ prevLinkText: SmallworldPhotoPrevPhoto,
+ nextLinkText: SmallworldPhotoNextPhoto,
+ nextPageLinkText: SmallworldPhotoNextLink,
+ prevPageLinkText: SmallworldPhotoPrevLink,
enableHistory: true,
autoStart: false,
syncTransitions: true,
Modified: XoopsModules/smallworld/trunk/smallworld/js/smallworld.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2012-05-08 16:27:12 UTC (rev 9462)
+++ XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2012-05-08 16:52:51 UTC (rev 9463)
@@ -963,7 +963,7 @@
height:"70%",
inline:true,
onCleanup:function() {
- xoops_smallworld('#lookingglassuseravatar').hide();
+ xoops_smallworld('#lookingglassuseravatar').remove();
},
onClosed:function() {
xoops_smallworld("#lookingglassuseravatar").remove();
Modified: XoopsModules/smallworld/trunk/smallworld/language/danish/js/variables.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/danish/js/variables.js 2012-05-08 16:27:12 UTC (rev 9462)
+++ XoopsModules/smallworld/trunk/smallworld/language/danish/js/variables.js 2012-05-08 16:52:51 UTC (rev 9463)
@@ -54,3 +54,12 @@
'textYes' : 'Ja!', // Yes button default text
'textNo' : 'Nej!' // No button default text
}
+
+
+// Variables for photo gallery
+var SmallworldPhotoPlaySlideshow = 'Afspil Slideshow';
+var SmallworldPhotoPauseSlideshow = 'Pause Slideshow';
+var SmallworldPhotoPrevPhoto = '‹ Foregående billede';
+var SmallworldPhotoNextPhoto = 'Næste billede ›';
+var SmallworldPhotoNextLink = 'Næste ›';
+var SmallworldPhotoPrevLink = '‹ Tilbage';
Modified: XoopsModules/smallworld/trunk/smallworld/language/danish/main.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/danish/main.php 2012-05-08 16:27:12 UTC (rev 9462)
+++ XoopsModules/smallworld/trunk/smallworld/language/danish/main.php 2012-05-08 16:52:51 UTC (rev 9463)
@@ -255,7 +255,7 @@
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_UPLOADEDSOMEIMAGES", " oploadede no'en nye billeder <br/>");
define ("_SMALLWORLD_IMAGES_START", "Start");
define ("_SMALLWORLD_IMAGES_CANCEL", "Afbryd");
define ("_SMALLWORLD_IMAGES_DELETE", "Slet");
@@ -333,6 +333,11 @@
define ("_SMALLWORLD_ONEYEARAGO", "et år siden");
define ("_SMALLWORLD_YEARSAGO", " år siden");
define ("_SMALLWORLD_CLICKIMAGETHUMB", "Klik her for at se billede i original størrelse");
+define("_SMALLWORLD_PRIVATEUPDATE","Privat");
+define("_SMALLWORLD_PUBLICUPDATE","Alle");
+define("_SMALLWORLD_UPDATEBUTTONTEXT"," Opdater ");
+define("_SMALLWORLD_COMMENTBUTTONTEXT"," Kommentér ");
+define("_SMALLWORLD_MOREBUTTONLINK","Mere");
/* -------------------- Venner siden --------------- */
define ("_SMALLWORLD_FRIENDPAGE", "Venner");
Modified: XoopsModules/smallworld/trunk/smallworld/language/english/js/variables.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/english/js/variables.js 2012-05-08 16:27:12 UTC (rev 9462)
+++ XoopsModules/smallworld/trunk/smallworld/language/english/js/variables.js 2012-05-08 16:52:51 UTC (rev 9463)
@@ -54,3 +54,11 @@
'textYes' : 'Yes!', // Yes button default text
'textNo' : 'No!' // No button default text
}
+
+// Variables for photo gallery
+var SmallworldPhotoPlaySlideshow = 'Play Slideshow';
+var SmallworldPhotoPauseSlideshow = 'Pause Slideshow';
+var SmallworldPhotoPrevPhoto = '‹ Previous Photo';
+var SmallworldPhotoNextPhoto = 'Next Photo ›';
+var SmallworldPhotoNextLink = 'Next ›';
+var SmallworldPhotoPrevLink = '‹ Prev';
Modified: XoopsModules/smallworld/trunk/smallworld/language/english/main.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/english/main.php 2012-05-08 16:27:12 UTC (rev 9462)
+++ XoopsModules/smallworld/trunk/smallworld/language/english/main.php 2012-05-08 16:52:51 UTC (rev 9463)
@@ -332,6 +332,11 @@
define("_SMALLWORLD_ONEYEARAGO","one year ago");
define("_SMALLWORLD_YEARSAGO"," years ago");
define("_SMALLWORLD_CLICKIMAGETHUMB","<br/><br/>Click here to see original size image");
+define("_SMALLWORLD_PRIVATEUPDATE","Private");
+define("_SMALLWORLD_PUBLICUPDATE","Public");
+define("_SMALLWORLD_UPDATEBUTTONTEXT"," Update ");
+define("_SMALLWORLD_COMMENTBUTTONTEXT"," Comment ");
+define("_SMALLWORLD_MOREBUTTONLINK","More");
/*-------------------- Friends page ---------------*/
define("_SMALLWORLD_FRIENDPAGE","Friends");
Modified: XoopsModules/smallworld/trunk/smallworld/language/russian/js/variables.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/russian/js/variables.js 2012-05-08 16:27:12 UTC (rev 9462)
+++ XoopsModules/smallworld/trunk/smallworld/language/russian/js/variables.js 2012-05-08 16:52:51 UTC (rev 9463)
@@ -54,3 +54,11 @@
'textYes' : 'Да!', // Yes button default text
'textNo' : 'Нет!' // No button default text
}
+
+// Variables for photo gallery
+var SmallworldPhotoPlaySlideshow = 'Начать слайд-шоу';
+var SmallworldPhotoPauseSlideshow = 'Остановить слайд-шоу';
+var SmallworldPhotoPrevPhoto = '‹ Предыдущее фото';
+var SmallworldPhotoNextPhoto = 'Следующее фото ›';
+var SmallworldPhotoNextLink = 'Вперёд ›';
+var SmallworldPhotoPrevLink = '‹ Назад';
Modified: XoopsModules/smallworld/trunk/smallworld/language/russian/main.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/russian/main.php 2012-05-08 16:27:12 UTC (rev 9462)
+++ XoopsModules/smallworld/trunk/smallworld/language/russian/main.php 2012-05-08 16:52:51 UTC (rev 9463)
@@ -333,6 +333,11 @@
define("_SMALLWORLD_ONEYEARAGO","1 год назад");
define("_SMALLWORLD_YEARSAGO"," лет спустя");
define("_SMALLWORLD_CLICKIMAGETHUMB","<br/><br/>Нажмите здесь для просмотра в оригинальном размере");
+define("_SMALLWORLD_PRIVATEUPDATE","Private");
+define("_SMALLWORLD_PUBLICUPDATE","Public");
+define("_SMALLWORLD_UPDATEBUTTONTEXT"," Update ");
+define("_SMALLWORLD_COMMENTBUTTONTEXT"," Comment ");
+define("_SMALLWORLD_MOREBUTTONLINK","More");
/*-------------------- Friends page ---------------*/
define("_SMALLWORLD_FRIENDPAGE","Друзья");
Modified: XoopsModules/smallworld/trunk/smallworld/templates/getlastmsg.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/templates/getlastmsg.html 2012-05-08 16:27:12 UTC (rev 9462)
+++ XoopsModules/smallworld/trunk/smallworld/templates/getlastmsg.html 2012-05-08 16:52:51 UTC (rev 9463)
@@ -31,7 +31,7 @@
<{if $post.priv == 0}>
<span id="smallworld_share">
- <a href="javascript:;">public</a>
+ <a href="javascript:;"><{$smarty.const._SMALLWORLD_PUBLICUPDATE}></a>
</span>
<{/if}>
@@ -49,7 +49,7 @@
</a>
<{if $post.priv == 0}>
<span id="smallworld_share">
- <a href="javascript:;">public</a>
+ <a href="javascript:;"><{$smarty.const._SMALLWORLD_PUBLICUPDATE}></a>
</span>
<{/if}>
</div>
@@ -113,7 +113,7 @@
<form method="post" action="">
<textarea name="smallworld_comment" class="smallworld_comment" maxlength="200" id="smallworld_ctextarea<{$post.msg_id}>"></textarea>
<br />
- <input type="submit" value=" Comment " id="<{$post.msg_id}>" class="smallworld_comment_button"/>
+ <input type="submit" value="<{$smarty.const._SMALLWORLD_COMMENTBUTTONTEXT}>" id="<{$post.msg_id}>" class="smallworld_comment_button"/>
</form>
</div>
</div>
Modified: XoopsModules/smallworld/trunk/smallworld/templates/getmore.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/templates/getmore.html 2012-05-08 16:27:12 UTC (rev 9462)
+++ XoopsModules/smallworld/trunk/smallworld/templates/getmore.html 2012-05-08 16:52:51 UTC (rev 9463)
@@ -101,7 +101,7 @@
<form method="post" action="">
<textarea name="smallworld_comment" class="smallworld_comment" maxlength="200" id="smallworld_ctextarea<{$post.msg_id}>"></textarea>
<br />
- <input type="submit" value=" Comment " id="<{$post.msg_id}>" class="smallworld_comment_button"/>
+ <input type="submit" value="<{$smarty.const._SMALLWORLD_COMMENTBUTTONTEXT}>" id="<{$post.msg_id}>" class="smallworld_comment_button"/>
</form>
</div>
</div> <!-- smallworld_commentupdate -->
@@ -112,7 +112,7 @@
<div id = "smallworld_moremsg_ajax" style="display:none">
<img src="images/loader.gif"/>
</div>
-<a href="javascript:void(0)" class="smallworld_msg_counter" rel="<{$pagename}>" id="<{$post.msg_id}>">MORE</a>
+<a href="javascript:void(0)" class="smallworld_msg_counter" rel="<{$pagename}>" id="<{$post.msg_id}>"><{$smarty.const._SMALLWORLD_MOREBUTTONLINK}></a>
<br><br>
<script type="text/javascript">
xoops_smallworld(document).ready(function(){
Modified: XoopsModules/smallworld/trunk/smallworld/templates/smallworld_index.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/templates/smallworld_index.html 2012-05-08 16:27:12 UTC (rev 9462)
+++ XoopsModules/smallworld/trunk/smallworld/templates/smallworld_index.html 2012-05-08 16:52:51 UTC (rev 9463)
@@ -69,14 +69,14 @@
<textarea cols="50" rows="1" rel="<{$ownerofpage}>" name="smallworld_update" id="smallworld_update" maxlength="200" ></textarea>
<br>
<div id = "smallworld_updatePrivacyCheck">
- <label for="updatePriv">Public</label>
+ <label for="updatePriv"><{$smarty.const._SMALLWORLD_PRIVATEUPDATE}></label>
<input type="radio" name="updatePublic" id="updatePublic" value="0"/>
- <label for="updatePriv">Private</label>
+ <label for="updatePriv"><{$smarty.const._SMALLWORLD_PUBLICUPDATE}></label>
<input type="radio" name="updatePublic" id="updatePublic" value="1"/>
</div>
<br><br>
- <input type="submit" value=" Update " id="smallworld_update_button" class="smallworld_update_button"/>
+ <input type="submit" value="<{$smarty.const._SMALLWORLD_UPDATEBUTTONTEXT}>" id="smallworld_update_button" class="smallworld_update_button"/>
</form>
</div>
<hr/>
@@ -186,7 +186,7 @@
<form method="post" action="">
<textarea name="smallworld_comment" class="smallworld_comment" maxlength="200" id="smallworld_ctextarea<{$post.msg_id}>"></textarea>
<br />
- <input type="submit" value=" Comment " id="<{$post.msg_id}>" class="smallworld_comment_button"/>
+ <input type="submit" value="<{$smarty.const._SMALLWORLD_COMMENTBUTTONTEXT}>" id="<{$post.msg_id}>" class="smallworld_comment_button"/>
</form>
</div>
</div>
Modified: XoopsModules/smallworld/trunk/smallworld/templates/smallworld_permalink.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/templates/smallworld_permalink.html 2012-05-08 16:27:12 UTC (rev 9462)
+++ XoopsModules/smallworld/trunk/smallworld/templates/smallworld_permalink.html 2012-05-08 16:52:51 UTC (rev 9463)
@@ -115,7 +115,7 @@
<form method="post" action="">
<textarea name="smallworld_comment" class="smallworld_comment" maxlength="200" id="smallworld_ctextarea<{$post.msg_id}>"></textarea>
<br />
- <input type="submit" value=" Comment " id="<{$post.msg_id}>" class="smallworld_comment_button"/>
+ <input type="submit" value="<{$smarty.const._SMALLWORLD_COMMENTBUTTONTEXT}>" id="<{$post.msg_id}>" class="smallworld_comment_button"/>
</form>
</div>
</div>
Modified: XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_template.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_template.html 2012-05-08 16:27:12 UTC (rev 9462)
+++ XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_template.html 2012-05-08 16:52:51 UTC (rev 9463)
@@ -273,7 +273,7 @@
<form method="post" action="">
<textarea name="smallworld_comment" class="smallworld_comment" maxlength="200" id="smallworld_ctextarea<{$post.msg_id}>"></textarea>
<br />
- <input type="submit" value=" Comment " id="<{$post.msg_id}>" class="smallworld_comment_button"/>
+ <input type="submit" value="<{$smarty.const._SMALLWORLD_COMMENTBUTTONTEXT}>" id="<{$post.msg_id}>" class="smallworld_comment_button"/>
</form>
</div>
</div>
@@ -285,7 +285,7 @@
<div id = "smallworld_moremsg_ajax" style="display:none">
<img src="images/loader.gif"/>
</div>
- <a style="display:none" href="javascript:void(0)" class="smallworld_msg_counter" rel="profile" rel2 = "<{$ownerofpage}>" id="<{$post.msg_id}>">MORE</a>
+ <a style="display:none" href="javascript:void(0)" class="smallworld_msg_counter" rel="profile" rel2 = "<{$ownerofpage}>" id="<{$post.msg_id}>"><{$smarty.const._SMALLWORLD_MOREBUTTONLINK}></a>
</div>
</div>
<{/if}>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-05-09 16:17:10
|
Revision: 9470
http://xoops.svn.sourceforge.net/xoops/?rev=9470&view=rev
Author: djculex
Date: 2012-05-09 16:17:03 +0000 (Wed, 09 May 2012)
Log Message:
-----------
- Bugfix: Mail sending image without prefix in comments
- Bugfix: closing correctly some spans
- Bugfix: Display graphics with ajax avatar upload
- Bugfix: Replace hardcoded english strings with lang. defs
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/class/mail.php
XoopsModules/smallworld/trunk/smallworld/js/jquery.avatar_helper.js
XoopsModules/smallworld/trunk/smallworld/language/danish/main.php
XoopsModules/smallworld/trunk/smallworld/language/english/main.php
XoopsModules/smallworld/trunk/smallworld/language/russian/main.php
XoopsModules/smallworld/trunk/smallworld/templates/smallworld_friends_template.html
XoopsModules/smallworld/trunk/smallworld/templates/smallworld_index.html
XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_template.html
Modified: XoopsModules/smallworld/trunk/smallworld/class/mail.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/class/mail.php 2012-05-09 11:10:30 UTC (rev 9469)
+++ XoopsModules/smallworld/trunk/smallworld/class/mail.php 2012-05-09 16:17:03 UTC (rev 9470)
@@ -104,7 +104,13 @@
$subject = _SMALLWORLD_MAIL_NEWCOMMENT.$xoopsConfig['sitename'];
$ownermessage = stripslashes($this->getOwnerUpdateFromMsgID($data['msg_id_fk']));
-
+ if(preg_match('/UPLIMAGE/',$ownermessage)) {
+ $ownmsg = str_replace("UPLIMAGE ", "", $ownermessage);
+ $ownermessage = "<img width='300px' src='".$ownmsg."' style='margin: 5px 0px;' />";
+ }
+
+
+
$owner = Smallworld_getOwnerFromComment ($data['msg_id_fk']);
$OwnerUser = new xoopsUser($owner);
$Owner_avatar = $wall->Gravatar($owner);
Modified: XoopsModules/smallworld/trunk/smallworld/js/jquery.avatar_helper.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/js/jquery.avatar_helper.js 2012-05-09 11:10:30 UTC (rev 9469)
+++ XoopsModules/smallworld/trunk/smallworld/js/jquery.avatar_helper.js 2012-05-09 16:17:03 UTC (rev 9470)
@@ -8,10 +8,11 @@
onSubmit: function(file, ext){
if (! (ext && /^(jpg|png|jpeg|gif)$/.test(ext))){
// extension is not allowed
- status.text('Only JPG, PNG or GIF files are allowed');
+ status.text('!!!!!!');
return false;
}
- status.text('Uploading...');
+ //status.text('............');
+ status.html('<img src="images/ajaxloader.gif" height="16" width="16">');
},
onComplete: function(file, response){
//On completion clear the status
Modified: XoopsModules/smallworld/trunk/smallworld/language/danish/main.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/danish/main.php 2012-05-09 11:10:30 UTC (rev 9469)
+++ XoopsModules/smallworld/trunk/smallworld/language/danish/main.php 2012-05-09 16:17:03 UTC (rev 9470)
@@ -29,6 +29,7 @@
define("_SMALLWORLD_ALL_FIELDS_DISABLED","Ingen personlige informationer tilgængelige");
define("_SMALLWORLD_RECENTACTIVITY","Seneste aktiviteter");
define("_SMALLWORLD_MESSAGEHISTORIC", "Seneste beskeder");
+define("_SMALLWORLD_UPLOADFILEBUTTONTEXT","Opload fil");
/*----------- Personal info ------------------*/
define("_SMALLWORLD_AVATAR","Nuværende billede");
Modified: XoopsModules/smallworld/trunk/smallworld/language/english/main.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/english/main.php 2012-05-09 11:10:30 UTC (rev 9469)
+++ XoopsModules/smallworld/trunk/smallworld/language/english/main.php 2012-05-09 16:17:03 UTC (rev 9470)
@@ -29,6 +29,7 @@
define("_SMALLWORLD_ALL_FIELDS_DISABLED","No personal info available");
define("_SMALLWORLD_RECENTACTIVITY","Recent activities");
define("_SMALLWORLD_MESSAGEHISTORIC", "Latest posts");
+define("_SMALLWORLD_UPLOADFILEBUTTONTEXT","Upload file");
/*----------- Personal info ------------------*/
define("_SMALLWORLD_AVATAR","Current Image");
Modified: XoopsModules/smallworld/trunk/smallworld/language/russian/main.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/russian/main.php 2012-05-09 11:10:30 UTC (rev 9469)
+++ XoopsModules/smallworld/trunk/smallworld/language/russian/main.php 2012-05-09 16:17:03 UTC (rev 9470)
@@ -29,6 +29,7 @@
define("_SMALLWORLD_ALL_FIELDS_DISABLED","Не предоставлена личная информация");
define("_SMALLWORLD_RECENTACTIVITY","Активность");
define("_SMALLWORLD_MESSAGEHISTORIC", "Сообщения");
+define("_SMALLWORLD_UPLOADFILEBUTTONTEXT","Загрузить Файл");
/*----------- Personal info ------------------*/
Modified: XoopsModules/smallworld/trunk/smallworld/templates/smallworld_friends_template.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/templates/smallworld_friends_template.html 2012-05-09 11:10:30 UTC (rev 9469)
+++ XoopsModules/smallworld/trunk/smallworld/templates/smallworld_friends_template.html 2012-05-09 16:17:03 UTC (rev 9470)
@@ -24,7 +24,7 @@
<{if $username == $myusername}>
<div class="UploadNewAvatar" id="<{$ownerofpage}>" style="display:none">
<div id="smallworld_avatarupload" >
- <span>Upload File<span>
+ <span><{$smarty.const._SMALLWORLD_UPLOADFILEBUTTONTEXT}></span>
</div>
<span id="smallworld_avatarstatus" ></span>
<ul id="smallworld_avatarfiles" ></ul>
Modified: XoopsModules/smallworld/trunk/smallworld/templates/smallworld_index.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/templates/smallworld_index.html 2012-05-09 11:10:30 UTC (rev 9469)
+++ XoopsModules/smallworld/trunk/smallworld/templates/smallworld_index.html 2012-05-09 16:17:03 UTC (rev 9470)
@@ -12,7 +12,7 @@
<{$avatar}>
<div class="UploadNewAvatar" id="<{$ownerofpage}>" style="display:none">
<div id="smallworld_avatarupload" >
- <span>Upload File<span>
+ <span><{$smarty.const._SMALLWORLD_UPLOADFILEBUTTONTEXT}></span>
</div>
<span id="smallworld_avatarstatus" ></span>
<ul id="smallworld_avatarfiles" ></ul>
Modified: XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_template.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_template.html 2012-05-09 11:10:30 UTC (rev 9469)
+++ XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_template.html 2012-05-09 16:17:03 UTC (rev 9470)
@@ -24,7 +24,7 @@
<{if $username == $myusername OR $isadminuser == 'YES'}>
<div class="UploadNewAvatar" id="<{$ownerofpage}>" style="display:none">
<div id="smallworld_avatarupload" >
- <span>Upload File</span>
+ <span><{$smarty.const._SMALLWORLD_UPLOADFILEBUTTONTEXT}></span>
</div>
<span id="smallworld_avatarstatus" ></span>
<ul id="smallworld_avatarfiles" ></ul>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-05-11 09:46:24
|
Revision: 9481
http://xoops.svn.sourceforge.net/xoops/?rev=9481&view=rev
Author: djculex
Date: 2012-05-11 09:46:14 +0000 (Fri, 11 May 2012)
Log Message:
-----------
- Change: Added updated french translations (Cesag)
- Change: First day of week fix from 0 to 1 (Cesag)
- Bugfix: Missing vars in jquery.ui.datepicker localization (cesag)
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/js/jquery-ui-1.8.11.custom.js
XoopsModules/smallworld/trunk/smallworld/language/danish/js/jquery.ui.datepicker-language.js
XoopsModules/smallworld/trunk/smallworld/language/english/js/jquery.ui.datepicker-language.js
XoopsModules/smallworld/trunk/smallworld/language/french/js/jquery.ui.datepicker-language.js
XoopsModules/smallworld/trunk/smallworld/language/french/js/variables.js
XoopsModules/smallworld/trunk/smallworld/language/french/mailTpl/mail_attencionneeded.html
XoopsModules/smallworld/trunk/smallworld/language/french/mailTpl/mail_complaint.html
XoopsModules/smallworld/trunk/smallworld/language/french/mailTpl/mail_newcomment.html
XoopsModules/smallworld/trunk/smallworld/language/french/mailTpl/mail_register.html
XoopsModules/smallworld/trunk/smallworld/language/french/main.php
XoopsModules/smallworld/trunk/smallworld/language/french_iso/js/jquery.ui.datepicker-language.js
XoopsModules/smallworld/trunk/smallworld/language/french_iso/js/variables.js
XoopsModules/smallworld/trunk/smallworld/language/french_iso/mailTpl/mail_attencionneeded.html
XoopsModules/smallworld/trunk/smallworld/language/french_iso/mailTpl/mail_complaint.html
XoopsModules/smallworld/trunk/smallworld/language/french_iso/mailTpl/mail_newcomment.html
XoopsModules/smallworld/trunk/smallworld/language/french_iso/mailTpl/mail_register.html
XoopsModules/smallworld/trunk/smallworld/language/french_iso/main.php
Modified: XoopsModules/smallworld/trunk/smallworld/js/jquery-ui-1.8.11.custom.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/js/jquery-ui-1.8.11.custom.js 2012-05-11 06:49:24 UTC (rev 9480)
+++ XoopsModules/smallworld/trunk/smallworld/js/jquery-ui-1.8.11.custom.js 2012-05-11 09:46:14 UTC (rev 9481)
@@ -8172,7 +8172,7 @@
dayNamesMin: ['Su','Mo','Tu','We','Th','Fr','Sa'], // Column headings for days starting at Sunday
weekHeader: 'Wk', // Column header for week of the year
dateFormat: 'mm/dd/yy', // See format options on parseDate
- firstDay: 0, // The first day of the week, Sun = 0, Mon = 1, ...
+ firstDay: 1, // The first day of the week, Sun = 0, Mon = 1, ...
isRTL: false, // True if right-to-left language, false if left-to-right
showMonthAfterYear: false, // True if the year select precedes month, false for month then year
yearSuffix: '' // Additional text to append to the year in the month headers
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-05-11 06:49:24 UTC (rev 9480)
+++ XoopsModules/smallworld/trunk/smallworld/language/danish/js/jquery.ui.datepicker-language.js 2012-05-11 09:46:14 UTC (rev 9481)
@@ -16,7 +16,7 @@
dayNamesMin: ['Sø','Ma','Ti','On','To','Fr','Lø'],
weekHeader: 'Ug',
dateFormat: 'dd-mm-yyyy',
- firstDay: 0,
+ firstDay: 1,
isRTL: false,
showMonthAfterYear: false,
yearSuffix: ''};
Modified: XoopsModules/smallworld/trunk/smallworld/language/english/js/jquery.ui.datepicker-language.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/english/js/jquery.ui.datepicker-language.js 2012-05-11 06:49:24 UTC (rev 9480)
+++ XoopsModules/smallworld/trunk/smallworld/language/english/js/jquery.ui.datepicker-language.js 2012-05-11 09:46:14 UTC (rev 9481)
@@ -2,9 +2,10 @@
/* Written by Stuart. */
jQuery(function(xoops_smallworld){
xoops_smallworld.datepicker.regional['en-GB'] = {
- closeText: 'Done',
- prevText: 'Prev',
- nextText: 'Next',
+ closeText: 'Done', closeStatus: 'Close without changes',
+ prevText: 'Prev', prevStatus: 'Show previous month',
+ prevJumpText: '<<', prevJumpStatus: '',
+ nextText: 'Next', currentStatus: 'Show actual month',
currentText: 'Today',
monthNames: ['January','February','March','April','May','June',
'July','August','September','October','November','December'],
@@ -20,4 +21,4 @@
showMonthAfterYear: false,
yearSuffix: ''};
xoops_smallworld.datepicker.setDefaults(xoops_smallworld.datepicker.regional['en-GB']);
-});
+});
\ No newline at end of file
Modified: XoopsModules/smallworld/trunk/smallworld/language/french/js/jquery.ui.datepicker-language.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/french/js/jquery.ui.datepicker-language.js 2012-05-11 06:49:24 UTC (rev 9480)
+++ XoopsModules/smallworld/trunk/smallworld/language/french/js/jquery.ui.datepicker-language.js 2012-05-11 09:46:14 UTC (rev 9481)
@@ -16,7 +16,7 @@
dayNamesMin: ['Di','Lu','Ma','Me','Je','Ve','Sa'],
weekHeader: 'Se',
dateFormat: 'dd-mm-yyyy',
- firstDay: 0,
+ firstDay: 1,
isRTL: false,
showMonthAfterYear: false,
yearSuffix: ''};
Modified: XoopsModules/smallworld/trunk/smallworld/language/french/js/variables.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/french/js/variables.js 2012-05-11 06:49:24 UTC (rev 9480)
+++ XoopsModules/smallworld/trunk/smallworld/language/french/js/variables.js 2012-05-11 09:46:14 UTC (rev 9481)
@@ -54,3 +54,10 @@
'textYes' : 'Oui !', // Boutton "Oui !", texte par défaut
'textNo' : 'Non !' // Boutton "Non !", texte par défaut
}
+// Variables pour la Galerie de photos
+var SmallworldPhotoPlaySlideshow = 'Lancer le Diaporama';
+var SmallworldPhotoPauseSlideshow = 'Pause';
+var SmallworldPhotoPrevPhoto = '‹ Photos précédentes';
+var SmallworldPhotoNextPhoto = 'Photos suivantes ›';
+var SmallworldPhotoNextLink = 'Suivant ›';
+var SmallworldPhotoPrevLink = '‹ Précédent';
Modified: XoopsModules/smallworld/trunk/smallworld/language/french/mailTpl/mail_attencionneeded.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/french/mailTpl/mail_attencionneeded.html 2012-05-11 06:49:24 UTC (rev 9480)
+++ XoopsModules/smallworld/trunk/smallworld/language/french/mailTpl/mail_attencionneeded.html 2012-05-11 09:46:14 UTC (rev 9481)
@@ -24,7 +24,7 @@
<div id="wrapper">
<br>
<p class="greeting">Bonjour <{$toUser}>,</p>
- <p class="infotext">Mise à jour le <{$date}>. Vérifiez votre profil : <{$sitename}>.<br><br>Cliquez sur ce lien pour aller directement à la page d'accueil de smallworld<br><br><{$link}></p>
+ <p class="infotext">Mise à jour le <{$date}>. Vérifiez votre profil sur <{$sitename}>.<br><br>Cliquez sur le lien ci-dessous pour aller directement à la page d'accueil : <br><br><{$link}></p>
<br>
</div>
<!-- Fin du format conteneur -->
Modified: XoopsModules/smallworld/trunk/smallworld/language/french/mailTpl/mail_complaint.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/french/mailTpl/mail_complaint.html 2012-05-11 06:49:24 UTC (rev 9480)
+++ XoopsModules/smallworld/trunk/smallworld/language/french/mailTpl/mail_complaint.html 2012-05-11 09:46:14 UTC (rev 9481)
@@ -31,7 +31,7 @@
<ul>
<!-- Début de l'entête N°1 -->
<li>
- <span style="font-size:11px">Il semble que c'est un message écrit par <{$against}> et <{$sendername}> l'a signalé à <{$time}> (heure du serveur)</h4>
+ <span style="font-size:11px">Il semble que c'est un message écrit par <{$against}> et <{$sendername}> l'a signalé à <{$time}> (temps du serveur)</h4>
<h4 class="title"><span style="font-size:11px"><{$link}></span></h4>
</li>
<!-- Fin de l'entête N°1 -->
Modified: XoopsModules/smallworld/trunk/smallworld/language/french/mailTpl/mail_newcomment.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/french/mailTpl/mail_newcomment.html 2012-05-11 06:49:24 UTC (rev 9480)
+++ XoopsModules/smallworld/trunk/smallworld/language/french/mailTpl/mail_newcomment.html 2012-05-11 09:46:14 UTC (rev 9481)
@@ -38,7 +38,7 @@
<!-- Début de l'entête N°2 -->
<li style="margin-left:25px;width:780px"><{$from_avatarlink}>
- <h4 class="title2"><{$sendnameurl}> <span style="font-size:11px"> a répondu le (<{$itemtextdate}> date du serveur)</span></h4>
+ <h4 class="title2"><{$sendnameurl}> <span style="font-size:11px"> a répondu le (<{$itemtextdate}> temps du serveur)</span></h4>
<p><{$itemtext}></p>
</li>
<!-- Fin de l'entête N°2 -->
Modified: XoopsModules/smallworld/trunk/smallworld/language/french/mailTpl/mail_register.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/french/mailTpl/mail_register.html 2012-05-11 06:49:24 UTC (rev 9480)
+++ XoopsModules/smallworld/trunk/smallworld/language/french/mailTpl/mail_register.html 2012-05-11 09:46:14 UTC (rev 9481)
@@ -31,7 +31,7 @@
<ul>
<!-- Début de l'entête N°1 -->
<li><{$registerlink}>
- <h4 class="title"><{$registerurl}> <span style="font-size:11px">Voir le profil ici</span></h4>
+ <h4 class="title"><{$registerurl}> <span style="font-size:11px">Cliquez sur le pseudonyme pour voir son profil</span></h4>
</li>
<!-- Fin de l'entête N°1 -->
</ul>
Modified: XoopsModules/smallworld/trunk/smallworld/language/french/main.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/french/main.php 2012-05-11 06:49:24 UTC (rev 9480)
+++ XoopsModules/smallworld/trunk/smallworld/language/french/main.php 2012-05-11 09:46:14 UTC (rev 9481)
@@ -29,6 +29,7 @@
define("_SMALLWORLD_ALL_FIELDS_DISABLED","Aucune information disponible");
define("_SMALLWORLD_RECENTACTIVITY","Activités récentes");
define("_SMALLWORLD_MESSAGEHISTORIC", "Derniers messages");
+define("_SMALLWORLD_UPLOADFILEBUTTONTEXT","Envoyer");
/*----------- Personal info ------------------*/
define("_SMALLWORLD_AVATAR","Image actuelle");
@@ -102,7 +103,7 @@
define("_SMALLWORLD_NOTYETUSER_BOXTEXT","Afin d'utiliser ce module, vous devez remplir un formulaire de profil supplémentaire.
<br><br>Cliquez sur S'enregister pour continuer l'enregistrement ou cliquez sur Annuler<br>pour revenir à la page d'accueil.");
define("_SMALLWORLD_NOTYETREGISTERED_TITLE","Continuez pour terminer l'enregistrement");
-define ("_SMALLWORLD_TEXTBEFORESUBMIT","Continuez en cliquant sur Enregistrer pour enregistrer vos informations dans la base de données.<br><br>Après cela, vous serez en mesure de visiter votre page, <br>et les pages des autres utilisateurs.<br><br>En vous remerçiant d'avoir pris le temps de remplir ce formulaire.");
+define ("_SMALLWORLD_TEXTBEFORESUBMIT","Continuez en cliquant sur Enregistrer pour enregistrer vos informations dans la base de données.<br><br>Après cela, vous serez en mesure de visiter votre page, <br>et les pages des autres utilisateurs.<br><br>En vous remerciant d'avoir pris le temps de remplir ce formulaire.");
define("_SMALLWORLD_FRIENDSINVITATIONS","Ajouter en ami");
define("_SMALLWORLD_DATERECIEVED","Date");
define("_SMALLWORLD_ACCEPT","Accepter");
@@ -186,7 +187,7 @@
define("_SMALLWORLD_RSHINTO","Shintoïsme");
define("_SMALLWORLD_RCAODAI","Caodaïsme");
define("_SMALLWORLD_RZOROASRIANISM","Zoroastrisme");
-define("_SMALLWORLD_RTENRIKYO","Tenrikyō");
+define("_SMALLWORLD_RTENRIKYO","Tenrikyo");
define("_SMALLWORLD_RNEOPAGANISM","Néopaganisme");
define("_SMALLWORLD_RUNITARIANUNIVERSALISM","Universalisme unitarien");
define("_SMALLWORLD_RRASTA","Mouvement rastafari");
@@ -255,7 +256,7 @@
define('_SMALLWORLD_IMAGE_EDIT_TITLE','Modifier la description');
define("_SMALLWORLD_WELCOME_TITLE","Bienvenue");
define("_SMALLWORLD_WELCOMETEXT",", Bienvenue. Je vous souhaite de passer un bon moment.");
-define("_SMALLWORLD_UPLOADEDSOMEIMAGES"," envoi de nouvelles images <br/> Cliquez sur l'image pour voir sa taille réelles ou sur ce lien<br/>pour ouvrir la Gallerie.");
+define("_SMALLWORLD_UPLOADEDSOMEIMAGES"," a envoyé de nouvelles images <br/> Cliquez sur l'image pour voir sa taille réelle ou sur ce lien<br/>pour ouvrir la Gallerie.");
define("_SMALLWORLD_IMAGES_START","Envoyer");
define("_SMALLWORLD_IMAGES_CANCEL","Annuler");
define("_SMALLWORLD_IMAGES_DELETE","Supprimer");
@@ -332,6 +333,11 @@
define("_SMALLWORLD_ONEYEARAGO","il y a un an");
define("_SMALLWORLD_YEARSAGO"," il y a quelques années");
define("_SMALLWORLD_CLICKIMAGETHUMB","<br/><br/>Cliquez ici pour voir la taille de l'image originale.");
+define("_SMALLWORLD_PRIVATEUPDATE","Privé");
+define("_SMALLWORLD_PUBLICUPDATE","Public");
+define("_SMALLWORLD_UPDATEBUTTONTEXT"," Envoi ");
+define("_SMALLWORLD_COMMENTBUTTONTEXT"," Commentaire ");
+define("_SMALLWORLD_MOREBUTTONLINK","Plus");
/*-------------------- Friends page ---------------*/
define("_SMALLWORLD_FRIENDPAGE","Amis");
@@ -346,11 +352,11 @@
define("_SMALLWORLD_MAIL_COMPLAINTSUBJECT","Plainte contre l'utilisateur à ");
define("_SMALLWORLD_MAIL_NEWAVATARSUBJECT","Nouvel avatar à ");
define("_SMALLWORLD_MAIL_NEWCOMMENT","Nouveau commentaire à votre message à ");
-define("_SMALLWORLD_SEEANDREPLYHERE","Visionner le commentaire et y répondre ici");
+define("_SMALLWORLD_SEEANDREPLYHERE","Voir le commentaire et y répondre ici");
define("_SMALLWORLD_GOTOSMALLWORLDHERE","Aller à la page d'accueil ici");
define("_SMALLWORLD_MAIL_COMPLAINT","Signalement de plainte à ");
-define("_SMALLWORLD_COMP_MSG_LNK_DESC","Cliquez ici pour voir le message signalé");
+define("_SMALLWORLD_COMP_MSG_LNK_DESC","Cliquez ici pour voir le message en cause");
define("_SMALLWORLD_MAIL_NEWFRIENDFOLLOWER", "Nouvelle demande d'ami ou nouvel utilisateur qui vous suit à ");
/* ------------ Inspection & countdown ---------------- */
Modified: XoopsModules/smallworld/trunk/smallworld/language/french_iso/js/jquery.ui.datepicker-language.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/french_iso/js/jquery.ui.datepicker-language.js 2012-05-11 06:49:24 UTC (rev 9480)
+++ XoopsModules/smallworld/trunk/smallworld/language/french_iso/js/jquery.ui.datepicker-language.js 2012-05-11 09:46:14 UTC (rev 9481)
@@ -16,7 +16,7 @@
dayNamesMin: ['Di','Lu','Ma','Me','Je','Ve','Sa'],
weekHeader: 'Se',
dateFormat: 'dd-mm-yyyy',
- firstDay: 0,
+ firstDay: 1,
isRTL: false,
showMonthAfterYear: false,
yearSuffix: ''};
Modified: XoopsModules/smallworld/trunk/smallworld/language/french_iso/js/variables.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/french_iso/js/variables.js 2012-05-11 06:49:24 UTC (rev 9480)
+++ XoopsModules/smallworld/trunk/smallworld/language/french_iso/js/variables.js 2012-05-11 09:46:14 UTC (rev 9481)
@@ -54,3 +54,10 @@
'textYes' : 'Oui !', // Boutton "Oui !", texte par d\xE9faut
'textNo' : 'Non !' // Boutton "Non !", texte par d\xE9faut
}
+// Variables pour la Galerie de photos
+var SmallworldPhotoPlaySlideshow = 'Lancer le Diaporama';
+var SmallworldPhotoPauseSlideshow = 'Pause';
+var SmallworldPhotoPrevPhoto = '‹ Photos pr\xE9c\xE9dentes';
+var SmallworldPhotoNextPhoto = 'Photos suivantes ›';
+var SmallworldPhotoNextLink = 'Suivant ›';
+var SmallworldPhotoPrevLink = '‹ Pr\xE9c\xE9dent';
Modified: XoopsModules/smallworld/trunk/smallworld/language/french_iso/mailTpl/mail_attencionneeded.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/french_iso/mailTpl/mail_attencionneeded.html 2012-05-11 06:49:24 UTC (rev 9480)
+++ XoopsModules/smallworld/trunk/smallworld/language/french_iso/mailTpl/mail_attencionneeded.html 2012-05-11 09:46:14 UTC (rev 9481)
@@ -24,7 +24,7 @@
<div id="wrapper">
<br>
<p class="greeting">Bonjour <{$toUser}>,</p>
- <p class="infotext">Mise \xE0 jour le <{$date}>. V\xE9rifiez votre profil : <{$sitename}>.<br><br>Cliquez sur ce lien pour aller directement \xE0 la page d'accueil de smallworld<br><br><{$link}></p>
+ <p class="infotext">Mise \xE0 jour le <{$date}>. V\xE9rifiez votre profil sur <{$sitename}>.<br><br>Cliquez sur le lien ci-dessous pour aller directement \xE0 la page d'accueil : <br><br><{$link}></p>
<br>
</div>
<!-- Fin du format conteneur -->
Modified: XoopsModules/smallworld/trunk/smallworld/language/french_iso/mailTpl/mail_complaint.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/french_iso/mailTpl/mail_complaint.html 2012-05-11 06:49:24 UTC (rev 9480)
+++ XoopsModules/smallworld/trunk/smallworld/language/french_iso/mailTpl/mail_complaint.html 2012-05-11 09:46:14 UTC (rev 9481)
@@ -31,7 +31,7 @@
<ul>
<!-- D\xE9but de l'ent\xEAte N\xB01 -->
<li>
- <span style="font-size:11px">Il semble que c'est un message \xE9crit par <{$against}> et <{$sendername}> l'a signal\xE9 \xE0 <{$time}> (heure du serveur)</h4>
+ <span style="font-size:11px">Il semble que c'est un message \xE9crit par <{$against}> et <{$sendername}> l'a signal\xE9 \xE0 <{$time}> (temps du serveur)</h4>
<h4 class="title"><span style="font-size:11px"><{$link}></span></h4>
</li>
<!-- Fin de l'ent\xEAte N\xB01 -->
Modified: XoopsModules/smallworld/trunk/smallworld/language/french_iso/mailTpl/mail_newcomment.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/french_iso/mailTpl/mail_newcomment.html 2012-05-11 06:49:24 UTC (rev 9480)
+++ XoopsModules/smallworld/trunk/smallworld/language/french_iso/mailTpl/mail_newcomment.html 2012-05-11 09:46:14 UTC (rev 9481)
@@ -38,7 +38,7 @@
<!-- D\xE9but de l'ent\xEAte N\xB02 -->
<li style="margin-left:25px;width:780px"><{$from_avatarlink}>
- <h4 class="title2"><{$sendnameurl}> <span style="font-size:11px"> a r\xE9pondu le (<{$itemtextdate}> date du serveur)</span></h4>
+ <h4 class="title2"><{$sendnameurl}> <span style="font-size:11px"> a r\xE9pondu le (<{$itemtextdate}> temps du serveur)</span></h4>
<p><{$itemtext}></p>
</li>
<!-- Fin de l'ent\xEAte N\xB02 -->
Modified: XoopsModules/smallworld/trunk/smallworld/language/french_iso/mailTpl/mail_register.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/french_iso/mailTpl/mail_register.html 2012-05-11 06:49:24 UTC (rev 9480)
+++ XoopsModules/smallworld/trunk/smallworld/language/french_iso/mailTpl/mail_register.html 2012-05-11 09:46:14 UTC (rev 9481)
@@ -31,7 +31,7 @@
<ul>
<!-- D\xE9but de l'ent\xEAte N\xB01 -->
<li><{$registerlink}>
- <h4 class="title"><{$registerurl}> <span style="font-size:11px">Voir le profil ici</span></h4>
+ <h4 class="title"><{$registerurl}> <span style="font-size:11px">Cliquez sur le pseudonyme pour voir son profil</span></h4>
</li>
<!-- Fin de l'ent\xEAte N\xB01 -->
</ul>
Modified: XoopsModules/smallworld/trunk/smallworld/language/french_iso/main.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/french_iso/main.php 2012-05-11 06:49:24 UTC (rev 9480)
+++ XoopsModules/smallworld/trunk/smallworld/language/french_iso/main.php 2012-05-11 09:46:14 UTC (rev 9481)
@@ -29,6 +29,7 @@
define("_SMALLWORLD_ALL_FIELDS_DISABLED","Aucune information disponible");
define("_SMALLWORLD_RECENTACTIVITY","Activit\xE9s r\xE9centes");
define("_SMALLWORLD_MESSAGEHISTORIC", "Derniers messages");
+define("_SMALLWORLD_UPLOADFILEBUTTONTEXT","Envoyer");
/*----------- Personal info ------------------*/
define("_SMALLWORLD_AVATAR","Image actuelle");
@@ -102,7 +103,7 @@
define("_SMALLWORLD_NOTYETUSER_BOXTEXT","Afin d'utiliser ce module, vous devez remplir un formulaire de profil suppl\xE9mentaire.
<br><br>Cliquez sur S'enregister pour continuer l'enregistrement ou cliquez sur Annuler<br>pour revenir \xE0 la page d'accueil.");
define("_SMALLWORLD_NOTYETREGISTERED_TITLE","Continuez pour terminer l'enregistrement");
-define ("_SMALLWORLD_TEXTBEFORESUBMIT","Continuez en cliquant sur Enregistrer pour enregistrer vos informations dans la base de donn\xE9es.<br><br>Apr\xE8s cela, vous serez en mesure de visiter votre page, <br>et les pages des autres utilisateurs.<br><br>En vous remer\xE7iant d'avoir pris le temps de remplir ce formulaire.");
+define ("_SMALLWORLD_TEXTBEFORESUBMIT","Continuez en cliquant sur Enregistrer pour enregistrer vos informations dans la base de donn\xE9es.<br><br>Apr\xE8s cela, vous serez en mesure de visiter votre page, <br>et les pages des autres utilisateurs.<br><br>En vous remerciant d'avoir pris le temps de remplir ce formulaire.");
define("_SMALLWORLD_FRIENDSINVITATIONS","Ajouter en ami");
define("_SMALLWORLD_DATERECIEVED","Date");
define("_SMALLWORLD_ACCEPT","Accepter");
@@ -255,7 +256,7 @@
define('_SMALLWORLD_IMAGE_EDIT_TITLE','Modifier la description');
define("_SMALLWORLD_WELCOME_TITLE","Bienvenue");
define("_SMALLWORLD_WELCOMETEXT",", Bienvenue. Je vous souhaite de passer un bon moment.");
-define("_SMALLWORLD_UPLOADEDSOMEIMAGES"," envoi de nouvelles images <br/> Cliquez sur l'image pour voir sa taille r\xE9elles ou sur ce lien<br/>pour ouvrir la Gallerie.");
+define("_SMALLWORLD_UPLOADEDSOMEIMAGES"," a envoy\xE9 de nouvelles images <br/> Cliquez sur l'image pour voir sa taille r\xE9elle ou sur ce lien<br/>pour ouvrir la Gallerie.");
define("_SMALLWORLD_IMAGES_START","Envoyer");
define("_SMALLWORLD_IMAGES_CANCEL","Annuler");
define("_SMALLWORLD_IMAGES_DELETE","Supprimer");
@@ -332,6 +333,11 @@
define("_SMALLWORLD_ONEYEARAGO","il y a un an");
define("_SMALLWORLD_YEARSAGO"," il y a quelques ann\xE9es");
define("_SMALLWORLD_CLICKIMAGETHUMB","<br/><br/>Cliquez ici pour voir la taille de l'image originale.");
+define("_SMALLWORLD_PRIVATEUPDATE","Priv\xE9");
+define("_SMALLWORLD_PUBLICUPDATE","Public");
+define("_SMALLWORLD_UPDATEBUTTONTEXT"," Envoi ");
+define("_SMALLWORLD_COMMENTBUTTONTEXT"," Commentaire ");
+define("_SMALLWORLD_MOREBUTTONLINK","Plus");
/*-------------------- Friends page ---------------*/
define("_SMALLWORLD_FRIENDPAGE","Amis");
@@ -346,11 +352,11 @@
define("_SMALLWORLD_MAIL_COMPLAINTSUBJECT","Plainte contre l'utilisateur \xE0 ");
define("_SMALLWORLD_MAIL_NEWAVATARSUBJECT","Nouvel avatar \xE0 ");
define("_SMALLWORLD_MAIL_NEWCOMMENT","Nouveau commentaire \xE0 votre message \xE0 ");
-define("_SMALLWORLD_SEEANDREPLYHERE","Visionner le commentaire et y r\xE9pondre ici");
+define("_SMALLWORLD_SEEANDREPLYHERE","Voir le commentaire et y r\xE9pondre ici");
define("_SMALLWORLD_GOTOSMALLWORLDHERE","Aller \xE0 la page d'accueil ici");
define("_SMALLWORLD_MAIL_COMPLAINT","Signalement de plainte \xE0 ");
-define("_SMALLWORLD_COMP_MSG_LNK_DESC","Cliquez ici pour voir le message signal\xE9");
+define("_SMALLWORLD_COMP_MSG_LNK_DESC","Cliquez ici pour voir le message en cause");
define("_SMALLWORLD_MAIL_NEWFRIENDFOLLOWER", "Nouvelle demande d'ami ou nouvel utilisateur qui vous suit \xE0 ");
/* ------------ Inspection & countdown ---------------- */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-05-11 10:02:33
|
Revision: 9482
http://xoops.svn.sourceforge.net/xoops/?rev=9482&view=rev
Author: djculex
Date: 2012-05-11 10:02:24 +0000 (Fri, 11 May 2012)
Log Message:
-----------
- Bugfix: Converting CR to <br> in comments / updates (Cesag)
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/comment_ajax.php
XoopsModules/smallworld/trunk/smallworld/index.php
XoopsModules/smallworld/trunk/smallworld/loadmore.php
XoopsModules/smallworld/trunk/smallworld/message_ajax.php
XoopsModules/smallworld/trunk/smallworld/userprofile.php
Modified: XoopsModules/smallworld/trunk/smallworld/comment_ajax.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/comment_ajax.php 2012-05-11 09:46:14 UTC (rev 9481)
+++ XoopsModules/smallworld/trunk/smallworld/comment_ajax.php 2012-05-11 10:02:24 UTC (rev 9482)
@@ -51,7 +51,7 @@
if($data) {
$wc['msg_id_fk'] = $data['msg_id_fk'];
$wc['com_id'] = $data['com_id'];
- $wc['comment'] = smallworld_tolink(htmlspecialchars_decode($data['comment']), $data['uid']);
+ $wc['comment'] = nl2br(smallworld_tolink(htmlspecialchars_decode($data['comment']), $data['uid']));
$wc['time'] = smallworld_time_stamp($data['created']);
$wc['username'] = $data['username'];
$wc['uid'] = $data['uid_fk'];
Modified: XoopsModules/smallworld/trunk/smallworld/index.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/index.php 2012-05-11 09:46:14 UTC (rev 9481)
+++ XoopsModules/smallworld/trunk/smallworld/index.php 2012-05-11 10:02:24 UTC (rev 9482)
@@ -73,7 +73,7 @@
foreach ($updatesarray as $data) {
$wm['msg_id'] = $data['msg_id'];
$wm['orimessage'] = str_replace(array("\r", "\n"), '',Smallworld_stripWordsKeepUrl($data['message']));
- $wm['message'] = smallworld_tolink(htmlspecialchars_decode($data['message']), $data['uid_fk']);
+ $wm['message'] = nl2br(smallworld_tolink(htmlspecialchars_decode($data['message']), $data['uid_fk']));
$wm['message'] = str_replace(array('<','>'),array('<','>'), $wm['message']);
$wm['created'] = smallworld_time_stamp($data['created']);
$wm['username'] = $data['username'];
@@ -99,7 +99,7 @@
foreach($wm['commentsarray'] as $cdata) {
$wc['msg_id_fk'] = $cdata['msg_id_fk'];
$wc['com_id'] = $cdata['com_id'];
- $wc['comment'] = smallworld_tolink(htmlspecialchars_decode($cdata['comment']),$cdata['uid_fk']);
+ $wc['comment'] = nl2br(smallworld_tolink(htmlspecialchars_decode($cdata['comment']),$cdata['uid_fk']));
$wc['time'] = smallworld_time_stamp($cdata['created']);
$wc['username'] = $cdata['username'];
$wc['uid'] = $cdata['uid_fk'];
Modified: XoopsModules/smallworld/trunk/smallworld/loadmore.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/loadmore.php 2012-05-11 09:46:14 UTC (rev 9481)
+++ XoopsModules/smallworld/trunk/smallworld/loadmore.php 2012-05-11 10:02:24 UTC (rev 9482)
@@ -64,7 +64,7 @@
foreach ($updatesarray as $data) {
$wm['msg_id'] = $data['msg_id'];
$wm['orimessage'] = str_replace(array("\r", "\n"), '',$data['message']);
- $wm['message'] = smallworld_tolink(htmlspecialchars_decode($data['message']), $data['uid_fk']);
+ $wm['message'] = nl2br(smallworld_tolink(htmlspecialchars_decode($data['message']), $data['uid_fk']));
$wm['created'] = smallworld_time_stamp($data['created']);
$wm['username'] = $data['username'];
$wm['uid_fk'] = $data['uid_fk'];
@@ -91,7 +91,7 @@
foreach($wm['commentsarray'] as $cdata) {
$wc['msg_id_fk'] = $cdata['msg_id_fk'];
$wc['com_id'] = $cdata['com_id'];
- $wc['comment'] = smallworld_tolink(htmlspecialchars_decode($cdata['comment']),$cdata['uid_fk']);
+ $wc['comment'] = nl2br(smallworld_tolink(htmlspecialchars_decode($cdata['comment']),$cdata['uid_fk']));
$wc['time'] = smallworld_time_stamp($cdata['created']);
$wc['username'] = $cdata['username'];
$wc['uid'] = $cdata['uid_fk'];
Modified: XoopsModules/smallworld/trunk/smallworld/message_ajax.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/message_ajax.php 2012-05-11 09:46:14 UTC (rev 9481)
+++ XoopsModules/smallworld/trunk/smallworld/message_ajax.php 2012-05-11 10:02:24 UTC (rev 9482)
@@ -57,7 +57,7 @@
foreach ($insdata as $data) {
$wm['msg_id'] = $data['msg_id'];
$wm['orimessage'] = str_replace(array("\r", "\n"), '',$data['message']);
- $wm['message'] = smallworld_tolink(htmlspecialchars_decode($data['message']), $data['uid_fk']);
+ $wm['message'] = nl2br(smallworld_tolink(htmlspecialchars_decode($data['message']), $data['uid_fk']));
$wm['created'] = smallworld_time_stamp($data['created']);
$wm['username'] = $data['username'];
$wm['uid_fk'] = $data['uid_fk'];
@@ -84,7 +84,7 @@
foreach($wm['commentsarray'] as $cdata) {
$wc['msg_id_fk'] = $cdata['msg_id_fk'];
$wc['com_id'] = $cdata['com_id'];
- $wc['comment'] = smallworld_tolink(htmlspecialchars_decode($cdata['comment']), $cdata['uid_fk']);
+ $wc['comment'] = nl2br(smallworld_tolink(htmlspecialchars_decode($cdata['comment']), $cdata['uid_fk']));
$wc['time'] = smallworld_time_stamp($cdata['created']);
$wc['username'] = $cdata['username'];
$wc['uid'] = $cdata['uid_fk'];
Modified: XoopsModules/smallworld/trunk/smallworld/userprofile.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/userprofile.php 2012-05-11 09:46:14 UTC (rev 9481)
+++ XoopsModules/smallworld/trunk/smallworld/userprofile.php 2012-05-11 10:02:24 UTC (rev 9482)
@@ -112,7 +112,7 @@
foreach ($updatesarray as $data) {
$wm['msg_id'] = $data['msg_id'];
$wm['orimessage'] = str_replace(array("\r", "\n"), '',$data['message']);
- $wm['message'] = smallworld_tolink(htmlspecialchars_decode($data['message']), $data['uid_fk']);
+ $wm['message'] = nl2br(smallworld_tolink(htmlspecialchars_decode($data['message']), $data['uid_fk']));
$wm['created'] = smallworld_time_stamp($data['created']);
$wm['username'] = $data['username'];
$wm['uid_fk'] = $data['uid_fk'];
@@ -138,7 +138,7 @@
foreach($wm['commentsarray'] as $cdata) {
$wc['msg_id_fk'] = $cdata['msg_id_fk'];
$wc['com_id'] = $cdata['com_id'];
- $wc['comment'] = smallworld_tolink(htmlspecialchars_decode($cdata['comment']), $cdata['uid_fk']);
+ $wc['comment'] = nl2br(smallworld_tolink(htmlspecialchars_decode($cdata['comment']), $cdata['uid_fk']));
$wc['time'] = smallworld_time_stamp($cdata['created']);
$wc['username'] = $cdata['username'];
$wc['uid'] = $cdata['uid_fk'];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-05-13 16:15:29
|
Revision: 9502
http://xoops.svn.sourceforge.net/xoops/?rev=9502&view=rev
Author: djculex
Date: 2012-05-13 16:15:22 +0000 (Sun, 13 May 2012)
Log Message:
-----------
- Bugfix: !!! Private updates showing in search results !! (thanks Yuri)
- Bugfix: Private and Public messages not filtered correctly
- Bugfix: Removed redundant span from message ajax file
- Bugfix: Filtering search results to include only friendly messages or public
- Change: Set 1 (monday) as default starting day in jquery.ui.js
- Change: enlarged innerWidth and height in edit_image desc js file
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/class/wall.php
XoopsModules/smallworld/trunk/smallworld/include/functions.php
XoopsModules/smallworld/trunk/smallworld/include/search.inc.php
XoopsModules/smallworld/trunk/smallworld/js/smallworld.js
XoopsModules/smallworld/trunk/smallworld/permalink.php
XoopsModules/smallworld/trunk/smallworld/search.php
XoopsModules/smallworld/trunk/smallworld/smallworldshare.php
XoopsModules/smallworld/trunk/smallworld/templates/getlastmsg.html
XoopsModules/smallworld/trunk/smallworld/templates/smallworld_index.html
Modified: XoopsModules/smallworld/trunk/smallworld/class/wall.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/class/wall.php 2012-05-13 09:13:24 UTC (rev 9501)
+++ XoopsModules/smallworld/trunk/smallworld/class/wall.php 2012-05-13 16:15:22 UTC (rev 9502)
@@ -157,7 +157,10 @@
{
global $xoopsUser, $xoopsDB;
$update=Smallworld_sanitize(htmlentities($update, ENT_QUOTES,"UTF-8"));
- $time=time();
+ $time=time();
+ if (!isset($priv)) {
+ $priv = 0;
+ }
$query = "SELECT msg_id,message FROM ".$xoopsDB->prefix('smallworld_messages')
. " WHERE uid_fk='".$uid."' order by msg_id desc limit 1";
$result = $xoopsDB->queryF($query);
@@ -337,9 +340,9 @@
global $xoopsUser, $xoopsDB, $moduleConfig;
$query = "SELECT M.msg_id, M.uid_fk, M.message, M.created, M.priv, U.username FROM "
. $xoopsDB->prefix('smallworld_messages')." M, ".$xoopsDB->prefix('smallworld_user')
- . " U WHERE M.uid_fk=U.userid and M.uid_fk='".$ownerID."' and M.priv = 0";
+ . " U WHERE M.uid_fk=U.userid and M.uid_fk='".$ownerID."'";
$query .= " AND M.msg_id = '".$updid."'";
- $query .= " order by created DESC LIMIT 1";
+ $query .= " order by M.created DESC LIMIT 1";
$result=$xoopsDB->queryF($query);
$count = $xoopsDB->getRowsNum($result);
if ($count < 1) {
Modified: XoopsModules/smallworld/trunk/smallworld/include/functions.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/include/functions.php 2012-05-13 09:13:24 UTC (rev 9501)
+++ XoopsModules/smallworld/trunk/smallworld/include/functions.php 2012-05-13 16:15:22 UTC (rev 9502)
@@ -880,198 +880,6 @@
}
}
- /**
- * @Set css and js includes in pages based on $p = page
- * @param string $p
- * @returns void
- */
- function smallworld_includeHeader($p='')
- {
- global $xoTheme,$xoopsUser,$xoopsConfig;
- if ($xoopsUser) {
- $module_handler =& xoops_gethandler('module');
- $module = $module_handler->getByDirname('smallworld');
- $config_handler =& xoops_gethandler('config');
- if ($module) {
- $moduleConfig =& $config_handler->getConfigsByCat(0, $module->getVar('mid'));
- }
- //Check Language
- $lang = $xoopsConfig['language'];
- // check geolocation style
- if(isset($moduleConfig['geolocate'])) {
- $geolocate = $moduleConfig['geolocate'];
- }
- $xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/base/jquery.ui.all.css');
- $xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/smallworld.css');
-
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery-1.7.1.min.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery-ui-1.8.11.custom.js');
-
- $xoops_url= XOOPS_URL;
- $myid = $xoopsUser->getVar('uid');
- // GET various variables from language folder
- if (file_exists(XOOPS_ROOT_PATH.'/modules/smallworld/language/'.$lang.'/js/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');
- }
-
- // Check if USER is smallworld-registered user
- $chkUser = new SmallWorldUser;
- $ChkProf = $chkUser->CheckIfProfile($myid);
-
- // Check if there are requests pending
- $count_invit = count($chkUser->getRequests($myid));
-
- // Get module config for validation and place in javascript
- $validate = $moduleConfig['validationstrenght'];
-
- // Check to see if smallworld should use username links to point to default xoops or smallworld
- $takeoverlinks = $moduleConfig['takeoveruserlinks'];
- $fieldstoshow = array_flip(smallworld_GetModuleOption('smallworldusethesefields', $repmodule='smallworld'));
- $useverification = smallworld_GetModuleOption('smallworldmandatoryfields', $repmodule='smallworld');
- $smallworldUV = implode(',', $useverification);
-
- // Get users messages count based on users followerArray
- $getUserMsgNum = smallworld_getCountFriendMessagesEtc ();
-
-
- // Set javascript vars but only if not already defined.
- // Check prevents multible loads
- $script = "if (myID === undefined) {"."\n";
- $script .= "var smallworld_url = '" . $xoops_url . "/modules/smallworld/" . "';\n";
- $script .= "var smallworld_uploaddir = '" . $xoops_url . "/uploads/avatars/" . "';\n";
- $script .= "var xoops_smallworld = jQuery.noConflict();\n";
- $script .= "var myID = " . $myid . ";\n";
- $script .= "var userHasProfile = " . $ChkProf . ";\n";
- $script .= "var smallworldTakeOverLinks = " . $takeoverlinks . ";\n";
- $script .= "var geoL = " . $geolocate . ";\n";
- $script .= "var geocomplete = '';\n";
- $script .= "var smallworldVerString = '" . $smallworldUV . "';\n";
- $script .= "var smallworlduseverification = new Array();\n";
- $script .= "smallworlduseverification = smallworldVerString.split(',');\n";
- $script .= "var hasmessages = " . $count_invit . ";\n";
- $script .= "var smallworldvalidationstrenght = " . $validate . ";\n";
- $script .= "var smallworld_getFriendsMsgComCount = " . $getUserMsgNum . ";\n";
- $script .= "var $ = jQuery();\n";
- $script .= "} else {"."\n";
- $script .= "\n";
- $script .= "}"."\n";
- $xoTheme->addScript('','',$script);
-
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/smallworld.js');
-
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.countdown.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.innerfade.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.colorbox.js');
-
-
- if ($p == 'register' || $p == 'editprofile' || $p == '') {
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.validate.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.validation.functions.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.stepy.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.elastic.source.js');
- // Include geolocate styling
- if ($geolocate != 1) {
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/geoname.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/geoname_now.js');
- } else {
- $xoTheme->addScript("http://maps.google.com/maps/api/js?sensor=false&language="._LANGCODE);
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/ui.geo_autocomplete.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/ui.geo_autocomplete_now.js');
- }
- if (file_exists(XOOPS_ROOT_PATH.'/modules/smallworld/language/'
- . $lang . '/js/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
- . '/modules/smallworld/language/english/js/jquery.ui.datepicker-language.js'
- );
- $xoTheme->addScript(XOOPS_URL
- . '/modules/smallworld/language/english/js/jquery.countdown.js'
- );
- }
- }
- if ($p == 'index' || $p == '') {
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.oembed.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.countdown.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/wall.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/ajaxupload.3.5.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.avatar_helper.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.bookmark.js');
- $xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/oembed.css');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.elastic.source.js');
- // Include geolocate styling
- if ($geolocate != 1) {
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/geoname.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/geoname_now.js');
- } else {
- $xoTheme->addScript("http://maps.google.com/maps/api/js?sensor=false&language="._LANGCODE);
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/ui.geo_autocomplete.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/ui.geo_autocomplete_now.js');
- }
-
- }
- if ($p == 'gallery' || $p == '') {
- $xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/galleriffic-5.css');
- $xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/basic.css');
- $xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/black.css');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.galleriffic.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.history.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.opacityrollover.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/gallery_mod.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.elastic.source.js');
- }
-
- if ($p == 'imageupload' || $p == '') {
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.fileupload-uix.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.fileupload-ui.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.fileupload.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/upload_application.js');
- $xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/jquery.fileupload-ui.css');
- }
-
- if ($p == 'userprofile' || $p == 'friends' || $p == '') {
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/apprise-1.5.full.js');
- $xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/jquery.fileupload-ui.css');
- $xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/oembed.css');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.oembed.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/wall.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/ajaxupload.3.5.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.avatar_helper.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.bookmark.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.elastic.source.js');
- // Include geolocate styling
- if ($geolocate != 1) {
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/geoname.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/geoname_now.js');
- } else {
- $xoTheme->addScript("http://maps.google.com/maps/api/js?sensor=false&language="._LANGCODE);
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/ui.geo_autocomplete.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/ui.geo_autocomplete_now.js');
- }
-
- }
-
- if ($p == 'perma' || $p == 'share' || $p == '') {
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.oembed.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/wall.js');
- $xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/oembed.css');
- $xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/smallworld.css');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.innerfade.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.bookmark.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.elastic.source.js');
- }
-
- }//end if user
-}
-
/**
* @Get url of smallworld
* @returns string
Modified: XoopsModules/smallworld/trunk/smallworld/include/search.inc.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/include/search.inc.php 2012-05-13 09:13:24 UTC (rev 9501)
+++ XoopsModules/smallworld/trunk/smallworld/include/search.inc.php 2012-05-13 16:15:22 UTC (rev 9502)
@@ -25,6 +25,12 @@
{
global $xoopsDB, $xoopsConfig, $myts, $xoopsUser;
+ if (file_exists(XOOPS_ROOT_PATH.'/modules/smallworld/language/'.$xoopsConfig['language'].'/main.php')) {
+ require_once (XOOPS_ROOT_PATH.'/modules/smallworld/language/'.$xoopsConfig['language'].'/main.php');
+ } else {
+ require_once (XOOPS_ROOT_PATH.'/modules/smallworld/language/english/main.php');
+ }
+
$module_handler =& xoops_gethandler('module');
$module =& $module_handler->getByDirname('smallworld');
$modid= $module->getVar('mid');
@@ -34,12 +40,28 @@
$gperm_handler =& xoops_gethandler('groupperm');
if (is_object($xoopsUser)) {
$groups = $xoopsUser->getGroups();
+ $id = $xoopsUser->getVar('uid');
+ $Wall = new Wall_Updates();
+ $followers = Smallworld_array_flatten($Wall->getFollowers($id),0);
} else {
+ $id = 0;
$groups = XOOPS_GROUP_ANONYMOUS;
+ $followers = array();
}
- $sql = "SELECT M.msg_id, M.uid_fk, M.message, M.created, M.priv, U.username FROM "
- . $xoopsDB->prefix('smallworld_messages')." M, ".$xoopsDB->prefix('smallworld_user')
- . " U WHERE M.uid_fk=U.userid and M.priv = 0";
+
+ if ($id > 0 && $id != '') {
+
+ $sql = "SELECT M.msg_id, M.uid_fk, M.message, M.created, M.priv, U.username FROM "
+ . $xoopsDB->prefix('smallworld_messages')." M, ".$xoopsDB->prefix('smallworld_user')
+ . " U WHERE M.uid_fk=U.userid";
+ } else {
+ $sql = "SELECT M.msg_id, M.uid_fk, M.message, M.created, M.priv, U.username FROM "
+ . $xoopsDB->prefix('smallworld_messages')." M, ".$xoopsDB->prefix('smallworld_user')
+ . " U WHERE M.uid_fk=U.userid";
+ }
+
+
+
if ( $userid != 0 ) {
$sql .= " AND M.uid_fk = ".$userid." ";
}
@@ -56,11 +78,22 @@
$ret = array();
$i = 0;
while($myrow = $xoopsDB->fetchArray($result)){
+ if (in_array($myrow['uid_fk'], $followers) || $myrow['uid_fk'] == $id) {
$ret[$i]['image'] = "images/smallworld_icn.png";
- $ret[$i]['link'] = "permalink.php?ownerid=".$myrow['uid_fk']."&updid=".$myrow['msg_id'];
- $ret[$i]['title'] = smallworld_shortenText($myrow['message'], 60);
+ $ret[$i]['link'] = "permalink.php?ownerid=".$myrow['uid_fk']."&updid=".$myrow['msg_id'];
+ if(preg_match('/UPLIMAGE/',$myrow['message'])) {
+ $ownmsg = str_replace("UPLIMAGE ", "", $myrow['message']);
+ $ret[$i]['title'] = $ownmsg;
+ $ret[$i]['title'] = Smallworld_getName($myrow['uid_fk'])." -> "._SMALLWORLD_GALLERY;
+ $ret[$i]['title'] = str_replace(array('<','>'),array('<','>'), $ret[$i]['title']);
+ } else {
+ $ret[$i]['title'] = smallworld_shortenText($myrow['message'], 60);
+ }
$ret[$i]['time'] = $myrow['created'];
$ret[$i]['uid'] = $myrow['uid_fk'];
+ } else {
+ $i = $i-1;
+ }
$i++;
}
return $ret;
Modified: XoopsModules/smallworld/trunk/smallworld/js/smallworld.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2012-05-13 09:13:24 UTC (rev 9501)
+++ XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2012-05-13 16:15:22 UTC (rev 9502)
@@ -113,8 +113,8 @@
if (xoops_smallworld('#smallworld_edit_imageform').length) { // implies *not* zero
xoops_smallworld('#smallworld_edit_imageform').show();
xoops_smallworld.fn.colorbox({
- width:"800",
- height:"70%",
+ innerWidth:"1000px",
+ height:"100%",
inline:true,
onCleanup:function() {
xoops_smallworld('#smallworld_edit_imageform').hide();
Modified: XoopsModules/smallworld/trunk/smallworld/permalink.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/permalink.php 2012-05-13 09:13:24 UTC (rev 9501)
+++ XoopsModules/smallworld/trunk/smallworld/permalink.php 2012-05-13 16:15:22 UTC (rev 9502)
@@ -66,49 +66,52 @@
//Srinivas Tamada http://9lessons.info
//Loading Comments link with load_updates.php
- foreach ($updatesarray as $data) {
- $wm['msg_id'] = $data['msg_id'];
- $wm['orimessage'] = str_replace(array("\r", "\n"), '',Smallworld_stripWordsKeepUrl($data['message']));
- $wm['message'] = smallworld_tolink(htmlspecialchars_decode($data['message']), $data['uid_fk']);
- $wm['created'] = smallworld_time_stamp($data['created']);
- $wm['username'] = $data['username'];
- $wm['uid_fk'] = $data['uid_fk'];
- $wm['priv'] = $data['priv'];
- $wm['avatar'] = $Wall->Gravatar($data['uid_fk']);
- $wm['avatar_link'] = smallworld_getAvatarLink ($data['uid_fk'], $wm['avatar']);
- $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']);
- $wm['sharelinkurl'] = XOOPS_URL."/modules/smallworld/smallworldshare.php?ownerid=".$data['uid_fk'];
- $wm['sharelinkurl'] .= "&updid=".$data['msg_id']."";
- $wm['usernameTitle'] = $wm['username']._SMALLWORLD_UPDATEONSITEMETA.$xoopsConfig['sitename'];
- $wm['sharelink'] = $Wall->GetSharing ($wm['msg_id'],$wm['priv']);
- $wm['sharediv'] = $Wall->GetSharingDiv ($wm['msg_id'],$wm['priv'], $wm['sharelinkurl'],$wm['orimessage'],$wm['usernameTitle']);
- $wm['commentsarray'] = $Wall->Comments($data['msg_id']);
- $xoopsTpl->append('walldata', $wm);
-
- if (!empty($wm['commentsarray'])){
- foreach($wm['commentsarray'] as $cdata) {
- $wc['msg_id_fk'] = $cdata['msg_id_fk'];
- $wc['com_id'] = $cdata['com_id'];
- $wc['comment'] = smallworld_tolink(htmlspecialchars_decode($cdata['comment']), $cdata['uid_fk']);
- $wc['time'] = smallworld_time_stamp($cdata['created']);
- $wc['username'] = $cdata['username'];
- $wc['uid'] = $cdata['uid_fk'];
- $wc['myavatar'] = $Wall->Gravatar($id);
- $wc['myavatar_link'] = $myavatarlink;
- $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']);
- $wc['vote_up'] = $Wall->countVotesCom ('com', 'up', $cdata['msg_id_fk'],$cdata['com_id']);
- $wc['vote_down'] = $Wall->countVotesCom ('com', 'down', $cdata['msg_id_fk'],$cdata['com_id']);
- $xoopsTpl->append('comm', $wc);
- }
- }
- }
-
+ if (!empty($updatesarray)) {
+ foreach ($updatesarray as $data) {
+ if (in_array($data['uid_fk'], $followers) || $id == $ownerID || $xoopsUser->isAdmin($xoopsModule->getVar('mid'))) {
+ $wm['msg_id'] = $data['msg_id'];
+ $wm['orimessage'] = str_replace(array("\r", "\n"), '',Smallworld_stripWordsKeepUrl($data['message']));
+ $wm['message'] = smallworld_tolink(htmlspecialchars_decode($data['message']), $data['uid_fk']);
+ $wm['created'] = smallworld_time_stamp($data['created']);
+ $wm['username'] = $data['username'];
+ $wm['uid_fk'] = $data['uid_fk'];
+ $wm['priv'] = $data['priv'];
+ $wm['avatar'] = $Wall->Gravatar($data['uid_fk']);
+ $wm['avatar_link'] = smallworld_getAvatarLink ($data['uid_fk'], $wm['avatar']);
+ $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']);
+ $wm['sharelinkurl'] = XOOPS_URL."/modules/smallworld/smallworldshare.php?ownerid=".$data['uid_fk'];
+ $wm['sharelinkurl'] .= "&updid=".$data['msg_id']."";
+ $wm['usernameTitle'] = $wm['username']._SMALLWORLD_UPDATEONSITEMETA.$xoopsConfig['sitename'];
+ $wm['sharelink'] = $Wall->GetSharing ($wm['msg_id'],$wm['priv']);
+ $wm['sharediv'] = $Wall->GetSharingDiv ($wm['msg_id'],$wm['priv'], $wm['sharelinkurl'],$wm['orimessage'],$wm['usernameTitle']);
+ $wm['commentsarray'] = $Wall->Comments($data['msg_id']);
+ $xoopsTpl->append('walldata', $wm);
+
+ if (!empty($wm['commentsarray'])){
+ foreach($wm['commentsarray'] as $cdata) {
+ $wc['msg_id_fk'] = $cdata['msg_id_fk'];
+ $wc['com_id'] = $cdata['com_id'];
+ $wc['comment'] = smallworld_tolink(htmlspecialchars_decode($cdata['comment']), $cdata['uid_fk']);
+ $wc['time'] = smallworld_time_stamp($cdata['created']);
+ $wc['username'] = $cdata['username'];
+ $wc['uid'] = $cdata['uid_fk'];
+ $wc['myavatar'] = $Wall->Gravatar($id);
+ $wc['myavatar_link'] = $myavatarlink;
+ $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']);
+ $wc['vote_up'] = $Wall->countVotesCom ('com', 'up', $cdata['msg_id_fk'],$cdata['com_id']);
+ $wc['vote_down'] = $Wall->countVotesCom ('com', 'down', $cdata['msg_id_fk'],$cdata['com_id']);
+ $xoopsTpl->append('comm', $wc);
+ }
+ }
+ }
+ }
+ }
$xoopsTpl->assign('menu_home',$menu_home);
$xoopsTpl->assign('menu_profile',$menu_profile);
$xoopsTpl->assign('menu_friends',$menu_friends);
@@ -129,6 +132,8 @@
$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.innerfade.js');
$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.elastic.source.js');
$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.bookmark.js');
+ } else {
+ redirect_header(XOOPS_URL . "/user.php", 1, _NOPERM);
}
} else {
redirect_header(XOOPS_URL . "/user.php", 1, _NOPERM);
Modified: XoopsModules/smallworld/trunk/smallworld/search.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/search.php 2012-05-13 09:13:24 UTC (rev 9501)
+++ XoopsModules/smallworld/trunk/smallworld/search.php 2012-05-13 16:15:22 UTC (rev 9502)
@@ -34,7 +34,7 @@
while ($row=$xoopsDB->fetchArray($result)) {
$user = new xoopsUser($row['userid']);
- if ($row['userimage'] != 'Not specifiyed') {
+ if ($row['userimage'] != 'Not specified') {
$imageLink = XOOPS_URL.'/uploads/'.trim($row['userimage']);
$imageSize = smallworld_getImageSize(30, 30, $imageLink);
$imageHw = smallworld_imageResize($imageSize[0], $imageSize[1], 30);
Modified: XoopsModules/smallworld/trunk/smallworld/smallworldshare.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/smallworldshare.php 2012-05-13 09:13:24 UTC (rev 9501)
+++ XoopsModules/smallworld/trunk/smallworld/smallworldshare.php 2012-05-13 16:15:22 UTC (rev 9502)
@@ -34,7 +34,7 @@
}
$perm = smallworldCheckPriv ($updID);
- if ($perm != 1) {
+ if ($perm != 0) {
// Things to do with wall
$Wall = new Wall_Updates();
$updatesarray=$Wall->UpdatesSharelink($updID,$ownerID);
Modified: XoopsModules/smallworld/trunk/smallworld/templates/getlastmsg.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/templates/getlastmsg.html 2012-05-13 09:13:24 UTC (rev 9501)
+++ XoopsModules/smallworld/trunk/smallworld/templates/getlastmsg.html 2012-05-13 16:15:22 UTC (rev 9502)
@@ -28,12 +28,7 @@
<span id ="smallworld_votenum"><{$post.vote_down}></span>
<img class="smallworld_voteimg" src = "images/dislike.png" />
-
- <{if $post.priv == 0}>
- <span id="smallworld_share">
- <a href="javascript:;"><{$smarty.const._SMALLWORLD_PUBLICUPDATE}></a>
- </span>
- <{/if}>
+
</div>
<{else}>
Modified: XoopsModules/smallworld/trunk/smallworld/templates/smallworld_index.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/templates/smallworld_index.html 2012-05-13 09:13:24 UTC (rev 9501)
+++ XoopsModules/smallworld/trunk/smallworld/templates/smallworld_index.html 2012-05-13 16:15:22 UTC (rev 9502)
@@ -70,9 +70,9 @@
<br>
<div id = "smallworld_updatePrivacyCheck">
<label for="updatePriv"><{$smarty.const._SMALLWORLD_PRIVATEUPDATE}></label>
+ <input type="radio" name="updatePublic" id="updatePublic" value="1"/>
+ <label for="updatePriv"><{$smarty.const._SMALLWORLD_PUBLICUPDATE}></label>
<input type="radio" name="updatePublic" id="updatePublic" value="0"/>
- <label for="updatePriv"><{$smarty.const._SMALLWORLD_PUBLICUPDATE}></label>
- <input type="radio" name="updatePublic" id="updatePublic" value="1"/>
</div>
<br><br>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-05-17 14:02:30
|
Revision: 9541
http://xoops.svn.sourceforge.net/xoops/?rev=9541&view=rev
Author: djculex
Date: 2012-05-17 14:02:21 +0000 (Thu, 17 May 2012)
Log Message:
-----------
- change: Added height & innerHeight to show gallery
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/css/galleriffic-5.css
XoopsModules/smallworld/trunk/smallworld/js/smallworld.js
Modified: XoopsModules/smallworld/trunk/smallworld/css/galleriffic-5.css
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/css/galleriffic-5.css 2012-05-17 13:24:09 UTC (rev 9540)
+++ XoopsModules/smallworld/trunk/smallworld/css/galleriffic-5.css 2012-05-17 14:02:21 UTC (rev 9541)
@@ -95,6 +95,7 @@
float: right;
position: relative;
margin-top: 30px;
+ max-height: 450px;
}
span.image-caption {
display: block;
Modified: XoopsModules/smallworld/trunk/smallworld/js/smallworld.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2012-05-17 13:24:09 UTC (rev 9540)
+++ XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2012-05-17 14:02:21 UTC (rev 9541)
@@ -155,6 +155,7 @@
xoops_smallworld('div#page').show();
xoops_smallworld.fn.colorbox({
innerWidth:"1000px",
+ innerHeight:"90%",
inline:true,
onCleanup:function() {
xoops_smallworld('div#page').hide();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2013-03-12 14:40:12
|
Revision: 10226
http://xoops.svn.sourceforge.net/xoops/?rev=10226&view=rev
Author: djculex
Date: 2013-03-12 14:40:01 +0000 (Tue, 12 Mar 2013)
Log Message:
-----------
Bugfix: Making new jquery work with existing code
Bugfix: Show correct user stats in admin/index.php
Bugfix: Display correct size of undefined avatar in comments
Change: Allow display of public posts for all users
Change: Correcting code style, removing comments etc etc
NEW: Added upgraded image upload
NEW: Added upgraded mail class
Language additions: js/variables.js, modinfo.php
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/admin/index.php
XoopsModules/smallworld/trunk/smallworld/class/mail.php
XoopsModules/smallworld/trunk/smallworld/class/wall.php
XoopsModules/smallworld/trunk/smallworld/comment_ajax.php
XoopsModules/smallworld/trunk/smallworld/editprofile.php
XoopsModules/smallworld/trunk/smallworld/img_upload.php
XoopsModules/smallworld/trunk/smallworld/imgupload.php
XoopsModules/smallworld/trunk/smallworld/include/functions.php
XoopsModules/smallworld/trunk/smallworld/index.php
XoopsModules/smallworld/trunk/smallworld/js/smallworld.js
XoopsModules/smallworld/trunk/smallworld/js/wall.js
XoopsModules/smallworld/trunk/smallworld/language/danish/js/variables.js
XoopsModules/smallworld/trunk/smallworld/language/danish/modinfo.php
XoopsModules/smallworld/trunk/smallworld/language/english/js/variables.js
XoopsModules/smallworld/trunk/smallworld/language/english/modinfo.php
XoopsModules/smallworld/trunk/smallworld/language/french/js/variables.js
XoopsModules/smallworld/trunk/smallworld/language/french/modinfo.php
XoopsModules/smallworld/trunk/smallworld/language/french_iso/js/variables.js
XoopsModules/smallworld/trunk/smallworld/language/french_iso/modinfo.php
XoopsModules/smallworld/trunk/smallworld/language/russian/js/variables.js
XoopsModules/smallworld/trunk/smallworld/language/russian/modinfo.php
XoopsModules/smallworld/trunk/smallworld/loadmore.php
XoopsModules/smallworld/trunk/smallworld/message_ajax.php
XoopsModules/smallworld/trunk/smallworld/preloads/core.php
XoopsModules/smallworld/trunk/smallworld/smallworldshare.php
XoopsModules/smallworld/trunk/smallworld/templates/getlastmsg.html
XoopsModules/smallworld/trunk/smallworld/templates/getmore.html
XoopsModules/smallworld/trunk/smallworld/templates/smallworld_index.html
XoopsModules/smallworld/trunk/smallworld/xoops_version.php
Modified: XoopsModules/smallworld/trunk/smallworld/admin/index.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/admin/index.php 2013-03-08 21:03:20 UTC (rev 10225)
+++ XoopsModules/smallworld/trunk/smallworld/admin/index.php 2013-03-12 14:40:01 UTC (rev 10226)
@@ -69,7 +69,7 @@
$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)) {
+ while ($i <= count($maAllround['cnt'])) {
$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]));
Modified: XoopsModules/smallworld/trunk/smallworld/class/mail.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/class/mail.php 2013-03-08 21:03:20 UTC (rev 10225)
+++ XoopsModules/smallworld/trunk/smallworld/class/mail.php 2013-03-12 14:40:01 UTC (rev 10226)
@@ -109,8 +109,6 @@
$ownermessage = "<img width='300px' src='".$ownmsg."' style='margin: 5px 0px;' />";
}
-
-
$owner = Smallworld_getOwnerFromComment ($data['msg_id_fk']);
$OwnerUser = new xoopsUser($owner);
$Owner_avatar = $wall->Gravatar($owner);
Modified: XoopsModules/smallworld/trunk/smallworld/class/wall.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/class/wall.php 2013-03-08 21:03:20 UTC (rev 10225)
+++ XoopsModules/smallworld/trunk/smallworld/class/wall.php 2013-03-12 14:40:01 UTC (rev 10226)
@@ -25,16 +25,28 @@
class Wall_Updates
{
- /**
- * @Get array of updates
- * @param int $last
- * @param int $uid
- * @param array $followes
- * @return array
- */
+ private function getAdminModerators()
+ {
+ global $xoopsDB, $xoopsUser;
+ $sql = "SELECT userid
+ FROM ".$xoopsDB->prefix('smallworld_user')." su
+ left JOIN ".$xoopsDB->prefix('groups_users_link')." xu ON su.userid = xu.uid
+ WHERE xu.uid in (1)";
+ $result = $xoopsDB->queryF($sql);
+ while ($row = $xoopsDB->fetchArray($result)) {
+ $data[]=$row;
+ }
+ return $data;
+ }
+
public function Updates($last,$uid, $followers) {
global $xoopsUser, $xoopsDB, $moduleConfig;
$hm = smallworld_GetModuleOption('msgtoshow');
+ $set = smallworld_checkPrivateOrPublic ();
+ $pub = smallworld_GetModuleOption('smallworldshowPoPubPage', $repmodule='smallworld');
+ $nfollow = array_unique(array_merge($pub, $followers));
+ $followers = Smallworld_array_flatten($nfollow,0);
+
$i=0;
if ($last == 0) {
$query = "SELECT M.msg_id, M.uid_fk, M.priv, M.message, M.created, U.username FROM ".$xoopsDB->prefix('smallworld_messages')
@@ -48,6 +60,7 @@
. $xoopsDB->prefix('smallworld_messages')." M, ".$xoopsDB->prefix('smallworld_user')
. " U WHERE M.uid_fk=U.userid and M.uid_fk='".$uid."'";
}
+
if (is_array($followers)){
foreach ($followers as $k => $v) {
if ($last>0) {
@@ -69,10 +82,10 @@
} elseif ($last == 'a') {
$query .= " OR M.uid_fk=U.userid and M.uid_fk= '".$followers."'";
}
- }
-
+ }
+
if ($last>0) {
- $query .= " order by created DESC LIMIT ".$hm;
+ $query .= " order by created DESC LIMIT ".$hm;
} elseif ($last == 'a') {
$query .= " order by M.msg_id DESC LIMIT ".$hm;
} else {
@@ -80,7 +93,7 @@
}
$result=$xoopsDB->queryF($query);
$count = $xoopsDB->getRowsNum($result);
- if ($count < 1) {
+ if ($count == 0) {
return false;
} else {
while ($row = $xoopsDB->fetchArray($result)) {
Modified: XoopsModules/smallworld/trunk/smallworld/comment_ajax.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/comment_ajax.php 2013-03-08 21:03:20 UTC (rev 10225)
+++ XoopsModules/smallworld/trunk/smallworld/comment_ajax.php 2013-03-12 14:40:01 UTC (rev 10226)
@@ -37,7 +37,7 @@
if ( $xoopsUser->isAdmin($xoopsModule->getVar('mid'))) {
$tpl->assign('isadminuser', 'YES');
}
- //$followers = $Wall->getFollowers($id);
+
$followers = Smallworld_array_flatten($Wall->getFollowers($id),0);
$myavatar = $Wall->Gravatar($id);
Modified: XoopsModules/smallworld/trunk/smallworld/editprofile.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/editprofile.php 2013-03-08 21:03:20 UTC (rev 10225)
+++ XoopsModules/smallworld/trunk/smallworld/editprofile.php 2013-03-12 14:40:01 UTC (rev 10226)
@@ -32,12 +32,11 @@
$profile = $check->CheckIfProfile($id);
// Check if inspected userid -> redirect to userprofile and show admin countdown
- /*
- $inspect = Smallworld_isInspected ($id);
- if ($inspect['inspect'] == 'yes') {
- redirect_header("userprofile.php?username=".$xoopsUser->getVar('uname'), 1);
- }
- */
+ $inspect = Smallworld_isInspected ($id);
+ if ($inspect['inspect'] == 'yes') {
+ redirect_header("userprofile.php?username=".$xoopsUser->getVar('uname'), 1);
+ }
+
if ($profile > 0) {
$xoopsTpl->assign('check',1);
$item = new SmallWorldForm;
Modified: XoopsModules/smallworld/trunk/smallworld/img_upload.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/img_upload.php 2013-03-08 21:03:20 UTC (rev 10225)
+++ XoopsModules/smallworld/trunk/smallworld/img_upload.php 2013-03-12 14:40:01 UTC (rev 10226)
@@ -27,39 +27,27 @@
if ($xoopsUser) {
global $xoTheme;
-$xoopsLogger->activated = false;
- //$xoTheme->addScript("http://code.jquery.com/jquery-migrate-1.0.0.js");
-$xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/uploader/bootstrap.min.css');
-$xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/uploader/style.css');
-$xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/uploader/bootstrap-responsive.min.css');
-$xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/uploader/bootstrap-image-gallery.min.css');
-//$xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/uploader/jquery.fileupload-ui.css');
-//$xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/uploader/jquery.fileupload-ui-noscript.css');
+ $xoopsLogger->activated = false;
+ $xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/uploader/bootstrap.min.css');
+ $xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/uploader/style.css');
+ $xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/uploader/bootstrap-responsive.min.css');
+ $xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/uploader/bootstrap-image-gallery.min.css');
-
-
-//$xoTheme->addScript("http://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js");
-$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/vendor/jquery.ui.widget.js');
-$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/uploader/tmpl.js');
-$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/uploader/load-image.js');
-$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/uploader/canvas-to-blob.js');
-$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/uploader/bootstrap.js');
-$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/uploader/bootstrap-image-gallery.js');
-$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.iframe-transport.js');
-$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.fileupload.js');
-$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.fileupload-fp.js');
-$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.fileupload-ui.js');
-$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/main.js');
-
- /* $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.fileupload-uix.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.fileupload-ui.js');
+ $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/vendor/jquery.ui.widget.js');
+ $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/uploader/tmpl.js');
+ $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/uploader/load-image.js');
+ $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/uploader/canvas-to-blob.js');
+ $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/uploader/bootstrap.js');
+ $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/uploader/bootstrap-image-gallery.js');
+ $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.iframe-transport.js');
$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.fileupload.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/upload_application.js');
- $xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/jquery.fileupload-ui.css');
- */
+ $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.fileupload-fp.js');
+ $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.fileupload-ui.js');
+ $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/main.js');
$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.colorbox.js');
$xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/colorbox.css');
- $id = $xoopsUser->getVar('uid');
+
+ $id = $xoopsUser->getVar('uid');
$check = new SmallWorldUser;
$profile = $check->CheckIfProfile($id);
if ($profile > 0) {
@@ -71,7 +59,6 @@
// ------------ IMAGE UPLOADER ------------ //
// Image upload form
$upload = $item->uploadform ($id);
- //$xoopsTpl->append('uploadform',$upload);
} else {
redirect_header("register.php", 1);
}
Modified: XoopsModules/smallworld/trunk/smallworld/imgupload.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/imgupload.php 2013-03-08 21:03:20 UTC (rev 10225)
+++ XoopsModules/smallworld/trunk/smallworld/imgupload.php 2013-03-12 14:40:01 UTC (rev 10226)
@@ -23,28 +23,6 @@
$img = new smallWorldImages;
$userID = $xoopsUser->getVar('uid');
$user = new XoopsUser($userID);
- /* $options = array(
- 'upload_dir' => XOOPS_ROOT_PATH.'/uploads/albums_smallworld/'.$userID."/",
- 'upload_url' => XOOPS_URL.'/uploads/albums_smallworld/'.$userID."/",
- 'thumbnails_dir' => XOOPS_ROOT_PATH.'/uploads/albums_smallworld'.'/'.$userID.'/thumbnails/',
- 'thumbnails_url' => XOOPS_URL.'/uploads/albums_smallworld'.'/'.$userID.'/thumbnails/'
- );
- */
- $upload_handler = new UploadHandler();
-
- /*switch ($_SERVER['REQUEST_METHOD']) {
- case 'HEAD':
- case 'GET':
- $upload_handler->get();
- break;
- case 'POST':
- $upload_handler->post();
- break;
- case 'DELETE':
- $upload_handler->delete();
- break;
- default:
- header('HTTP/1.0 405 Method Not Allowed');
- }*/
+ $upload_handler = new UploadHandler();
}
?>
\ No newline at end of file
Modified: XoopsModules/smallworld/trunk/smallworld/include/functions.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/include/functions.php 2013-03-08 21:03:20 UTC (rev 10225)
+++ XoopsModules/smallworld/trunk/smallworld/include/functions.php 2013-03-12 14:40:01 UTC (rev 10226)
@@ -232,7 +232,7 @@
global $xoopsUser;
$ext = substr($text,-4,4);
$ext2 = substr($text,-5,5);
-
+ $xoopsUser = new XoopsUser($uid);
$usr = new $xoopsUser($uid);
$userID = $xoopsUser->getVar('uid');
@@ -380,8 +380,13 @@
$ext = pathinfo(strtolower($image), PATHINFO_EXTENSION);
$sql = "SELECT gender FROM ".$xoopsDB->prefix('smallworld_user')." WHERE userid = '".intval($userid)."'";
$result = $xoopsDB->queryf($sql);
- while ($row = $xoopsDB->fetchArray($result)) {
- $gender = $row['gender'];
+ $counter = $xoopsDB->getRowsNum($result);
+ if ($counter == 0) {
+ $gender = '';
+ } else {
+ while ($row = $xoopsDB->fetchArray($result)) {
+ $gender = $row['gender'];
+ }
}
$link = XOOPS_UPLOAD_URL."/".$image;
@@ -814,6 +819,7 @@
if ($bn != 'blank.gif'
|| $bn != 'blank.png'
|| $bn != 'blank.jpg'
+ || $bn != 'image_missing.png'
)
{
if (ini_get('allow_url_fopen')) {
@@ -940,3 +946,146 @@
}
}
}
+
+ /**
+ * @Check if smallworld is for private or public access
+ * return value for config
+ */
+ function smallworld_checkPrivateOrPublic ()
+ {
+ global $xoopsUser;
+ $opt = array();
+ $set = smallworld_GetModuleOption('smallworldprivorpub', $repmodule='smallworld');
+ if ($set != 0) {
+ $opt['access'] = 1;
+ } else {
+ $opt['access'] = 0;
+ }
+ if ($xoopsUser) {
+ $id = $xoopsUser->getVar('uid');
+ $user = new XoopsUser($id);
+ $check = new SmallWorldUser;
+ $profile = $check->checkIfProfile($id);
+ $opt['xoopsuser'] = 1;
+ if ($profile != 0) {
+ $opt['smallworlduser'] = 1;
+ } else {
+ $opt['smallworlduser'] = 0;
+ }
+ } else {
+ $opt['xoopsuser'] = 0;
+ $opt['smallworlduser'] = 0;
+ }
+ return $opt;
+ }
+
+ /**
+ * @return array of groups
+ * return array
+ *
+ */
+ function smallworld_xv_getGroupd ()
+ {
+ $db =& XoopsDatabaseFactory::getDatabaseConnection();
+ $myts =& MyTextSanitizer::getInstance();
+ $sql = "SELECT userid, username FROM ".$db->prefix('smallworld_user')." ORDER BY username";
+ $result = $db->queryF($sql);
+ $data = array();
+ while ($r = $db->fetchArray($result)) {
+ $data[$r['userid']] = $r['username'];
+ }
+ return $data;
+ }
+
+ /**
+ * Set javascript vars to theme using various values
+ * Return void
+ */
+ function smallworld_SetCoreScript () {
+ global $xoopsUser, $xoopsConfig, $xoTheme;
+
+ $module_handler =& xoops_gethandler('module');
+ $module = $module_handler->getByDirname('smallworld');
+ $config_handler =& xoops_gethandler('config');
+ if ($module) {
+ $moduleConfig =& $config_handler->getConfigsByCat(0, $module->getVar('mid'));
+ }
+
+ // check geolocation style
+ if(isset($moduleConfig['geolocate'])) {
+ $geolocate = $moduleConfig['geolocate'];
+ }
+
+ // IF logged in define xoops / smallworld user id
+ $myid = ($xoopsUser) ? $xoopsUser->getVar('uid'):0;
+
+ // Check if option is et to allow public reading
+ $pub = smallworld_checkPrivateOrPublic();
+ $access = $pub['access'];
+
+ // GET various variables from language folder
+ if (file_exists(XOOPS_ROOT_PATH.'/modules/smallworld/language/'.$xoopsConfig['language'].'/js/variables.js')) {
+ $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/language/'.$xoopsConfig['language'].'/js/variables.js');
+ } else {
+ $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/language/english/js/variables.js');
+ }
+
+ // Check if USER is smallworld-registered user
+ $chkUser = new SmallWorldUser;
+ $ChkProf = ($xoopsUser) ? $chkUser->CheckIfProfile($myid):0;
+
+ // Check if there are requests pending
+ $count_invit = ($xoopsUser) ? count($chkUser->getRequests($myid)):0;
+
+ // Get module config for validation and place in javascript
+ $validate = $moduleConfig['validationstrenght'];
+
+ // Check to see if smallworld should use username links to point to default xoops or smallworld
+ $takeoverlinks = $moduleConfig['takeoveruserlinks'];
+ $fieldstoshow = array_flip(smallworld_GetModuleOption('smallworldusethesefields', $repmodule='smallworld'));
+ $useverification = smallworld_GetModuleOption('smallworldmandatoryfields', $repmodule='smallworld');
+ $smallworldUV = implode(',', $useverification);
+
+ // Get users messages count based on users followerArray
+ $getUserMsgNum = ($xoopsUser) ? smallworld_getCountFriendMessagesEtc():0;
+
+ // Check if request url is with www or without
+ $urltest = smallworld_getHostRequest();
+ $xoops_url = XOOPS_URL;
+ if (!strstr($urltest, 'www.')) {
+ $xoops_url = str_replace( 'www.', '', $xoops_url );
+ }
+
+ // Set javascript vars but only if not already defined.
+ // Check prevents multible loads
+ $script = "if (myID === undefined) {"."\n";
+ $script .= "var smallworld_url = '" . $xoops_url . "/modules/smallworld/" . "';\n";
+ $script .= "var smallworld_uploaddir = '" . $xoops_url . "/uploads/avatars/" . "';\n";
+ $script .= "var xoops_smallworld = jQuery.noConflict();\n";
+ $script .= "var myID = " . $myid . ";\n";
+ $script .= "var userHasProfile = " . $ChkProf . ";\n";
+ $script .= "var smallworldTakeOverLinks = " . $takeoverlinks . ";\n";
+ $script .= "var geoL = " . $geolocate . ";\n";
+ $script .= "var geocomplete = '';\n";
+ $script .= "var smallworldVerString = '" . $smallworldUV . "';\n";
+ $script .= "var smallworlduseverification = new Array();\n";
+ $script .= "smallworlduseverification = smallworldVerString.split(',');\n";
+ $script .= "var hasmessages = " . $count_invit . ";\n";
+ $script .= "var smallworldvalidationstrenght = " . $validate . ";\n";
+ $script .= "var smallworld_getFriendsMsgComCount = " . $getUserMsgNum . ";\n";
+ $script .= "var $ = jQuery();\n";
+ $script .= "} else {"."\n";
+ $script .= "\n";
+ $script .= "}"."\n";
+ $xoTheme->addScript('','',$script);
+
+ // Include geolocate styling
+ if ($geolocate != 1) {
+ $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/geoname.js');
+ $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/geoname_now.js');
+ } else {
+ $xoTheme->addScript("http://maps.google.com/maps/api/js?sensor=false&language="._LANGCODE);
+ $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/ui.geo_autocomplete.js');
+ $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/ui.geo_autocomplete_now.js');
+ }
+ }
Modified: XoopsModules/smallworld/trunk/smallworld/index.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/index.php 2013-03-08 21:03:20 UTC (rev 10225)
+++ XoopsModules/smallworld/trunk/smallworld/index.php 2013-03-12 14:40:01 UTC (rev 10226)
@@ -20,14 +20,24 @@
**/
include_once("../../mainfile.php");
-$xoopsOption['template_main'] = 'smallworld_index.html';
-include_once(XOOPS_ROOT_PATH."/header.php");
include_once(XOOPS_ROOT_PATH."/modules/smallworld/include/functions.php");
include_once(XOOPS_ROOT_PATH."/modules/smallworld/class/class_collector.php");
-global $xoopsUser, $xoTheme,$xoopsConfig;
-
- if ($xoopsUser) {
- $id = $xoopsUser->getVar('uid');
+include_once(XOOPS_ROOT_PATH."/modules/smallworld/class/publicWall.php");
+global $xoopsUser, $xoTheme,$xoopsConfig,$xoopsLogger;
+ $xoopsLogger->activated = true;
+/* error_reporting(E_ALL); */
+
+$set = smallworld_checkPrivateOrPublic ();
+if ($xoopsUser) {
+ $xoopsOption['template_main'] = 'smallworld_index.html';
+} elseif (!$xoopsUser || $set['access'] == 1) {
+ $xoopsOption['template_main'] = 'smallworld_publicindex.html';
+} else {
+ redirect_header(XOOPS_URL . "/user.php", 5, _NOPERM);
+}
+include_once(XOOPS_ROOT_PATH."/header.php");
+ if ($set['access'] == 1) {
+ $id = ($xoopsUser) ? $xoopsUser->getVar('uid'):0;
$user = new XoopsUser($id);
// Check if inspected userid -> redirect to userprofile and show admin countdown
@@ -37,13 +47,17 @@
}
$xoopsTpl->assign('ownerofpage', $id);
- if ( $xoopsUser->isAdmin($xoopsModule->getVar('mid'))) {
- $xoopsTpl->assign('isadminuser', 'YES');
- }
+ if ($xoopsUser) {
+ if ( $xoopsUser->isAdmin($xoopsModule->getVar('mid'))) {
+ $xoopsTpl->assign('isadminuser', 'YES');
+ }
+ } else {
+ $xoopsTpl->assign('isadminuser', 'NO');
+ }
$username = $user->getVar('uname');
$check = new SmallWorldUser;
- $profile = $check->checkIfProfile($id);
+ $profile = ($xoopsUser) ? $check->checkIfProfile($id) : 0;
if ($profile > 0) {
$xuser = new SmallWorldProfile;
@@ -52,21 +66,26 @@
$menu_profile = "<a href='".XOOPS_URL."/modules/smallworld/userprofile.php?username=".$username."'><img id='menuimg' src='".XOOPS_URL."/modules/smallworld/images/user_silhouette.png'>"._SMALLWORLD_PROFILEINDEX."</a>";
$menu_gallery = "<a href='".XOOPS_URL."/modules/smallworld/galleryshow.php?username=".$username."'><img id='menuimg' src='".XOOPS_URL."/modules/smallworld/images/picture.png'>"._SMALLWORLD_GALLERY."</a>";
$menu_friends = "<a href='".XOOPS_URL."/modules/smallworld/friends.php?username=".$username."'><img id='menuimg' src='".XOOPS_URL."/modules/smallworld/images/group.png'>"._SMALLWORLD_FRIENDSPAGE."</a>";
+ }
-
// Things to do with wall
- $Wall = new Wall_Updates();
+ $Wall = ($xoopsUser) ? new Wall_Updates() : new Public_Wall_Updates;
+ if (!$xoopsUser && $set['access'] == 1) {
+ $pub = smallworld_GetModuleOption('smallworldshowPoPubPage', $repmodule='smallworld');
+ $updatesarray = $Wall->updates(0, $pub);
+ } else {
+ // Follow array here
+ $followers = Smallworld_array_flatten($Wall->getFollowers($id),0);
+ $updatesarray=$Wall->Updates(0,$id, $followers);
+ }
$myavatar = $Wall->Gravatar($id);
$myavatarlink = smallworld_getAvatarLink($id, $myavatar);
$myavatar_size = smallworld_getImageSize(80, 100, $myavatarlink);
$myavatar_highwide = smallworld_imageResize($myavatar_size[0], $myavatar_size[1], 35);
//Get friends invitations
- $getInvitations = $check->getRequests ($id);
+ $getInvitations = ($xoopsUser) ? $check->getRequests ($id) : 0;
- // Follow array here
- $followers = Smallworld_array_flatten($Wall->getFollowers($id),0);
- $updatesarray=$Wall->Updates(0,$id, $followers);
//Srinivas Tamada http://9lessons.info
//Loading Comments link with load_updates.php
if (!empty($updatesarray)) {
@@ -118,11 +137,13 @@
}
}
}
-
- $xoopsTpl->assign('menu_home',$menu_home);
- $xoopsTpl->assign('menu_profile',$menu_profile);
- $xoopsTpl->assign('menu_friends',$menu_friends);
- $xoopsTpl->assign('menu_gallery',$menu_gallery);
+
+ if ($profile > 0) {
+ $xoopsTpl->assign('menu_home',$menu_home);
+ $xoopsTpl->assign('menu_profile',$menu_profile);
+ $xoopsTpl->assign('menu_friends',$menu_friends);
+ $xoopsTpl->assign('menu_gallery',$menu_gallery);
+ }
$xoopsTpl->assign('myusername',$username);
$xoopsTpl->assign('pagename','index');
$xoopsTpl->assign('check',1);
@@ -130,12 +151,10 @@
$xoopsTpl->assign('myavatarlink',$myavatarlink);
$xoopsTpl->assign('myavatar_highwide',$myavatar_highwide);
$xoopsTpl->assign('friendinvitations',$getInvitations);
+ $xoopsTpl->assign('access',$set['access']);
- } elseif ($profile == 0) {
- //$xoopsTpl->assign('check',0);
- $check->chkUser ();
-
- }
+ // }
+
$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.oembed.js');
$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.elastic.source.js');
$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/wall.js');
@@ -145,8 +164,9 @@
$xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/oembed.css');
$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.colorbox.js');
$xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/smallworld.css');
- } else {
- redirect_header(XOOPS_URL . "/user.php", 1, _NOPERM);
- }
+ } elseif ($set['access'] == 0) {
+ redirect_header(XOOPS_URL . "/user.php", 1, _NOPERM);
+ }
+
include(XOOPS_ROOT_PATH."/footer.php");
?>
\ No newline at end of file
Modified: XoopsModules/smallworld/trunk/smallworld/js/smallworld.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2013-03-08 21:03:20 UTC (rev 10225)
+++ XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2013-03-12 14:40:01 UTC (rev 10226)
@@ -21,6 +21,10 @@
// GET pop for statistics
xoops_smallworld('#smallworld_statistics_lnk').on('click',function(e) {
+ if (userHasProfile == 0) {
+ alert (SmallworldDialogNotUser);
+ return false;
+ }
e.preventDefault();
if (xoops_smallworld('#smallworld_statistics_lnk').length) { // implies *not* zero
xoops_smallworld('#smallworldStatsDiv').show();
@@ -42,6 +46,10 @@
// GET pop for recentactivities
xoops_smallworld('#smallworld_recentactivities').on('click',function(e) {
+ if (userHasProfile == 0) {
+ alert (SmallworldDialogNotUser);
+ return false;
+ }
e.preventDefault();
var uname = xoops_smallworld(this).attr('rel');
if (xoops_smallworld('#smallworld_recentactivities').length) { // implies *not* zero
@@ -618,7 +626,7 @@
// Sharing bookmarks defines
xoops_smallworld(function () {
- xoops_smallworld('.share').on('click',function(e) {
+ xoops_smallworld('body').on('click', '.share', function(e) {
e.preventDefault();
var id = xoops_smallworld(this).attr('id');
var ref = xoops_smallworld('span[name="' + id + '"]').attr('rel');
@@ -637,7 +645,7 @@
// Donation
xoops_smallworld(function () {
- xoops_smallworld('#smallworldDonate').on('click',function() {
+ xoops_smallworld('body').on('click', '#smallworldDonate', function() {
window.open('https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=WKFZBRBGMYKCA&lc=DK"&item_name=Culex%2edk&item_number=culex¤cy_code=DKK&bn=PP%2dDonationsBF%3asp%2epng%3aNonHosted', 'blank',
'width=600, height=400, menubar=no, toolbar=no, scrollbars=yes');
});
@@ -834,7 +842,42 @@
}
});
}
+// Set function to react on "more" button
+function SmallworldGetMoreMsg () {
+ xoops_smallworld('.smallworld_msg_counter:last').show();
+ xoops_smallworld('.smallworld_msg_counter').on('click', function(e) {
+ e.preventDefault();
+ xoops_smallworld('#smallworld_moremsg_ajax').show();
+ var lastmsg = xoops_smallworld(this).attr("id");
+ var page = xoops_smallworld(this).attr("rel");
+ var userid = xoops_smallworld(this).attr('rel2');
+ if(lastmsg == '' || lastmsg == undefined) {
+ xoops_smallworld('#smallworld_moremsg_ajax').remove();
+ xoops_smallworld('.smallworld_msg_counter:last').remove();
+ }
+ if(lastmsg) {
+ xoops_smallworld.ajax({
+ type: "POST",
+ url: "loadmore.php",
+ data: "last=" + lastmsg + "&page=" + page + "&userid="+userid,
+ success: function(html){
+ xoops_smallworld("#smallworld_content").append(html);
+ xoops_smallworld('#smallworld_moremsg_ajax:first').remove();
+ xoops_smallworld(".smallworld_msg_counter:first").remove();
+ if(xoops_smallworld.trim(html) == ""){
+ xoops_smallworld(".smallworld_msg_counter").remove();
+ xoops_smallworld('#smallworld_moremsg_ajax').remove();
+ }
+ }
+ });
+ }
+ else {
+
+ }
+ smallworldCheckNumDivs();
+ });
+}
// function to Accept / deny friendships
function AcceptDenyFriend(stat,friendID,myuid,targetID) {
xoops_smallworld.ajax({
Modified: XoopsModules/smallworld/trunk/smallworld/js/wall.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/js/wall.js 2013-03-08 21:03:20 UTC (rev 10225)
+++ XoopsModules/smallworld/trunk/smallworld/js/wall.js 2013-03-12 14:40:01 UTC (rev 10226)
@@ -10,7 +10,7 @@
var dataString = "update=" + updateval + "&priv=" + privatestat;
if(updateval=='') {
alert("Please Enter Some Text");
- } else {
+ } else {
xoops_smallworld("#smallworld_flash").show();
xoops_smallworld("#smallworld_flash").fadeIn(400).html('Loading Update...');
xoops_smallworld.ajax({
@@ -25,13 +25,18 @@
xoops_smallworld("#smallworld_update").focus();
xoops_smallworld("#smallworld_stexpand").oembed(updateval);
smallworldCheckNumDivs();
- }
+ },
+ statusCode: {
+ 403: function() {
+ alert (SmallworldDialogNotUser);
+ }
+ }
});
}
});
//commment Submint
- xoops_smallworld('.smallworld_comment_button').on("click",function(e) {
+ xoops_smallworld('body').on("click", '.smallworld_comment_button', function(e) {
e.preventDefault();
var ID = xoops_smallworld(this).attr("id");
var comment= xoops_smallworld("#smallworld_ctextarea"+ID).val();
@@ -39,30 +44,39 @@
if(comment=='') {
alert("Please Enter Comment Text");
- } else {
+ } else {
xoops_smallworld.ajax({
type: "POST",
url: "comment_ajax.php",
data: dataString,
cache: false,
success: function(html){
- xoops_smallworld("#smallworld_commentload"+ID).append(html);
- xoops_smallworld("#smallworld_ctextarea"+ID).val('');
- xoops_smallworld("#smallworld_ctextarea"+ID).focus();
- }
+ xoops_smallworld("#smallworld_commentload"+ID).append(html);
+ xoops_smallworld("#smallworld_ctextarea"+ID).val('');
+ xoops_smallworld("#smallworld_ctextarea"+ID).focus();
+ },
+ statusCode: {
+ 403: function() {
+ alert (SmallworldDialogNotUser);
+ }
+ }
});
}
});
// commentopen
- xoops_smallworld('.smallworld_commentopen').on("click",function(e) {
+ xoops_smallworld('body').on("click", '.smallworld_commentopen', function(e) {
e.preventDefault();
- var ID = xoops_smallworld(this).attr("id");
+ if (userHasProfile == 0) {
+ alert (SmallworldDialogNotUser);
+ return false;
+ }
+ var ID = xoops_smallworld(this).attr("id");
xoops_smallworld("#smallworld_commentbox"+ID).slideToggle('slow');
});
// delete comment
- xoops_smallworld('.smallworld_stcommentdelete').on("click",function(e) {
+ xoops_smallworld('body').on("click", '.smallworld_stcommentdelete', function(e) {
e.preventDefault();
var ID = xoops_smallworld(this).attr("id");
var msgowner = xoops_smallworld(this).attr("rel");
@@ -76,12 +90,17 @@
cache: false,
success: function(html){
xoops_smallworld("#smallworld_stcommentbody"+ID).slideUp();
- }
+ },
+ statusCode: {
+ 403: function() {
+ alert (SmallworldDialogNotUser);
+ }
+ }
});
}
});
// delete update
- xoops_smallworld('.smallworld_stdelete').on("click",function(e) {
+ xoops_smallworld('body').on("click", '.smallworld_stdelete', function(e) {
e.preventDefault();
var ID = xoops_smallworld(this).attr("id");
var msgowner = xoops_smallworld(this).attr("rel");
@@ -102,46 +121,19 @@
});
xoops_smallworld(document).ready(function() {
- xoops_smallworld('.smallworld_msg_counter:last').show();
- xoops_smallworld('.smallworld_msg_counter').on('click', function(e) {
- e.preventDefault();
- xoops_smallworld('#smallworld_moremsg_ajax').show();
- var lastmsg = xoops_smallworld(this).attr("id");
- var page = xoops_smallworld(this).attr("rel");
- var userid = xoops_smallworld(this).attr('rel2');
- if(lastmsg == '') {
- xoops_smallworld('#smallworld_moremsg_ajax').hide();
- xoops_smallworld('.smallworld_msg_counter:last').hide();
- }
- if(lastmsg) {
- xoops_smallworld.ajax({
- type: "POST",
- url: "loadmore.php",
- data: "last=" + lastmsg + "&page=" + page + "&userid="+userid,
- success: function(html){
- xoops_smallworld("#smallworld_content").append(html);
- xoops_smallworld('#smallworld_moremsg_ajax:first').remove();
- xoops_smallworld(".smallworld_msg_counter:first").remove();
- if(xoops_smallworld.trim(html) === ""){
- xoops_smallworld(".smallworld_msg_counter").remove();
- xoops_smallworld('#smallworld_moremsg_ajax').remove();
- }
- }
- });
- }
- else {
-
- }
- smallworldCheckNumDivs();
- });
+ SmallworldGetMoreMsg ();
});
// Voting system
// Calls up.php or down.php
xoops_smallworld(document).ready(function() {
- xoops_smallworld(".smallworld_stcomment_vote").on('click',
+ xoops_smallworld("body").on('click', '.smallworld_stcomment_vote',
function(e) {
e.preventDefault();
+ if (userHasProfile == 0) {
+ alert (SmallworldDialogNotUser);
+ return false;
+ }
var id = xoops_smallworld(this).attr("id");
var name = xoops_smallworld(this).attr("name");
var type = xoops_smallworld(this).attr("type");
@@ -184,10 +176,14 @@
});
xoops_smallworld(document).ready(function() {
- xoops_smallworld(".smallworld_comment_complaint").on('click',
+ xoops_smallworld("body").on('click', '.smallworld_comment_complaint',
function(e) {
e.preventDefault();
- var id = xoops_smallworld(this).attr("id");
+ if (userHasProfile == 0) {
+ alert (SmallworldDialogNotUser);
+ return false;
+ }
+ var id = xoops_smallworld(this).attr("id");
var name = xoops_smallworld(this).attr("name");
var against_user = xoops_smallworld(this).attr("a_user");
var against_userid = xoops_smallworld(this).attr("auserid");
Modified: XoopsModules/smallworld/trunk/smallworld/language/danish/js/variables.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/danish/js/variables.js 2013-03-08 21:03:20 UTC (rev 10225)
+++ XoopsModules/smallworld/trunk/smallworld/language/danish/js/variables.js 2013-03-12 14:40:01 UTC (rev 10226)
@@ -63,3 +63,6 @@
var SmallworldPhotoNextPhoto = 'Næste billede ›';
var SmallworldPhotoNextLink = 'Næste ›';
var SmallworldPhotoPrevLink = '‹ Tilbage';
+
+// error messages
+var SmallworldDialogNotUser = 'Du skal være registreret bruger for at udføre denne handling!';
Modified: XoopsModules/smallworld/trunk/smallworld/language/danish/modinfo.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/danish/modinfo.php 2013-03-08 21:03:20 UTC (rev 10225)
+++ XoopsModules/smallworld/trunk/smallworld/language/danish/modinfo.php 2013-03-12 14:40:01 UTC (rev 10226)
@@ -90,4 +90,9 @@
define('_MI_SMALLWORLD_EDUCATION','Uddannelse');
define('_MI_SMALLWORLD_EMPLOYMENT','Arbejde');
+//Private or public module
+define ('_MI_SMALLWORLD_PRIVATEMODULE','Vis offentlige indlæg ?');
+define ('_MI_SMALLWORLD_PRIVATEMODULE_DESC','Hvis "ja" kan alle offentlige indlæg skrevet af forfatter med autorisation læses af alle besøgende. Dog skal bruger stadig været logget ind for at (stemme / kommentere osv).');
+define ('_MI_SHOWPUBLICPAGE','Tillad disse brugere at vise offentlige poster');
+define ('_MI_SHOWPUBLICPAGE_DESC','Vælg brugeres som kan vise poster på index siden. Hvis brugerene i formen er ufuldstændig så opdater modulet i modulstyring for at tilføje nyeste brugere.');
?>
\ No newline at end of file
Modified: XoopsModules/smallworld/trunk/smallworld/language/english/js/variables.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/english/js/variables.js 2013-03-08 21:03:20 UTC (rev 10225)
+++ XoopsModules/smallworld/trunk/smallworld/language/english/js/variables.js 2013-03-12 14:40:01 UTC (rev 10226)
@@ -62,3 +62,6 @@
var SmallworldPhotoNextPhoto = 'Next Photo ›';
var SmallworldPhotoNextLink = 'Next ›';
var SmallworldPhotoPrevLink = '‹ Prev';
+
+// error messages
+var SmallworldDialogNotUser = 'You must be registered to do this!!';
Modified: XoopsModules/smallworld/trunk/smallworld/language/english/modinfo.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/english/modinfo.php 2013-03-08 21:03:20 UTC (rev 10225)
+++ XoopsModules/smallworld/trunk/smallworld/language/english/modinfo.php 2013-03-12 14:40:01 UTC (rev 10226)
@@ -90,4 +90,10 @@
define('_MI_SMALLWORLD_EDUCATION','Education');
define('_MI_SMALLWORLD_EMPLOYMENT','Employment');
+//Private or public module
+define ('_MI_SMALLWORLD_PRIVATEMODULE','Show public posts ?');
+define ('_MI_SMALLWORLD_PRIVATEMODULE_DESC','If "yes" then all visiters can read posts marked "public" by authorized author. Commenting/posting/editing etc are all still inactive until logged in.');
+define ('_MI_SHOWPUBLICPAGE','Allow these users to show public posts');
+define ('_MI_SHOWPUBLICPAGE_DESC','Select users with permission to show public posts in index page. If newly added users do not show in this form then update smallworld module.');
+
?>
\ No newline at end of file
Modified: XoopsModules/smallworld/trunk/smallworld/language/french/js/variables.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/french/js/variables.js 2013-03-08 21:03:20 UTC (rev 10225)
+++ XoopsModules/smallworld/trunk/smallworld/language/french/js/variables.js 2013-03-12 14:40:01 UTC (rev 10226)
@@ -61,3 +61,6 @@
var SmallworldPhotoNextPhoto = 'Photos suivantes ›';
var SmallworldPhotoNextLink = 'Suivant ›';
var SmallworldPhotoPrevLink = '‹ Précédent';
+
+// error messages
+var SmallworldDialogNotUser = 'You must be registered to do this!!';
Modified: XoopsModules/smallworld/trunk/smallworld/language/french/modinfo.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/french/modinfo.php 2013-03-08 21:03:20 UTC (rev 10225)
+++ XoopsModules/smallworld/trunk/smallworld/language/french/modinfo.php 2013-03-12 14:40:01 UTC (rev 10226)
@@ -89,5 +89,11 @@
define('_MI_SMALLWORLD_ABOUTME','À propos de moi');
define('_MI_SMALLWORLD_EDUCATION','Education');
define('_MI_SMALLWORLD_EMPLOYMENT','Emploi');
+
+//Private or public module
+define ('_MI_SMALLWORLD_PRIVATEMODULE','Show public posts ?');
+define ('_MI_SMALLWORLD_PRIVATEMODULE_DESC','If "yes" then all visiters can read posts marked "public" by authorized author. Commenting/posting/editing etc are all still inactive until logged in.');
+define ('_MI_SHOWPUBLICPAGE','Allow these users to show public posts');
+define ('_MI_SHOWPUBLICPAGE_DESC','Select users with permission to show public posts in index page. If newly added users do not show in this form then update smallworld module.');
//Traduit par Cesag (frxoops.org) le 5 Mai 2012
?>
\ No newline at end of file
Modified: XoopsModules/smallworld/trunk/smallworld/language/french_iso/js/variables.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/french_iso/js/variables.js 2013-03-08 21:03:20 UTC (rev 10225)
+++ XoopsModules/smallworld/trunk/smallworld/language/french_iso/js/variables.js 2013-03-12 14:40:01 UTC (rev 10226)
@@ -61,3 +61,6 @@
var SmallworldPhotoNextPhoto = 'Photos suivantes ›';
var SmallworldPhotoNextLink = 'Suivant ›';
var SmallworldPhotoPrevLink = '‹ Pr\xE9c\xE9dent';
+
+// error messages
+var SmallworldDialogNotUser = 'You must be registered to do this!!';
Modified: XoopsModules/smallworld/trunk/smallworld/language/french_iso/modinfo.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/french_iso/modinfo.php 2013-03-08 21:03:20 UTC (rev 10225)
+++ XoopsModules/smallworld/trunk/smallworld/language/french_iso/modinfo.php 2013-03-12 14:40:01 UTC (rev 10226)
@@ -89,5 +89,11 @@
define('_MI_SMALLWORLD_ABOUTME','À propos de moi');
define('_MI_SMALLWORLD_EDUCATION','Education');
define('_MI_SMALLWORLD_EMPLOYMENT','Emploi');
+
+//Private or public module
+define ('_MI_SMALLWORLD_PRIVATEMODULE','Show public posts ?');
+define ('_MI_SMALLWORLD_PRIVATEMODULE_DESC','If "yes" then all visiters can read posts marked "public" by authorized author. Commenting/posting/editing etc are all still inactive until logged in.');
+define ('_MI_SHOWPUBLICPAGE','Allow these users to show public posts');
+define ('_MI_SHOWPUBLICPAGE_DESC','Select users with permission to show public posts in index page. If newly added users do not show in this form then update smallworld module.');
//Traduit par Cesag (frxoops.org) le 5 Mai 2012
?>
\ No newline at end of file
Modified: XoopsModules/smallworld/trunk/smallworld/language/russian/js/variables.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/russian/js/variables.js 2013-03-08 21:03:20 UTC (rev 10225)
+++ XoopsModules/smallworld/trunk/smallworld/language/russian/js/variables.js 2013-03-12 14:40:01 UTC (rev 10226)
@@ -62,3 +62,6 @@
var SmallworldPhotoNextPhoto = 'Следующее фото ›';
var SmallworldPhotoNextLink = 'Вперёд ›';
var SmallworldPhotoPrevLink = '‹ Назад';
+
+// error messages
+var SmallworldDialogNotUser = 'You must be registered to do this!!';
Modified: XoopsModules/smallworld/trunk/smallworld/language/russian/modinfo.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/russian/modinfo.php 2013-03-08 21:03:20 UTC (rev 10225)
+++ XoopsModules/smallworld/trunk/smallworld/language/russian/modinfo.php 2013-03-12 14:40:01 UTC (rev 10226)
@@ -90,4 +90,9 @@
define('_MI_SMALLWORLD_EDUCATION','Образование');
define('_MI_SMALLWORLD_EMPLOYMENT','Работа');
+//Private or public module
+define ('_MI_SMALLWORLD_PRIVATEMODULE','Show public posts ?');
+define ('_MI_SMALLWORLD_PRIVATEMODULE_DESC','If "yes" then all visiters can read posts marked "public" by authorized author. Commenting/posting/editing etc are all still inactive until logged in.');
+define ('_MI_SHOWPUBLICPAGE','Allow these users to show public posts');
+define ('_MI_SHOWPUBLICPAGE_DESC','Select users with permission to show public posts in index page. If newly added users do not show in this form then update smallworld module.');
?>
\ No newline at end of file
Modified: XoopsModules/smallworld/trunk/smallworld/loadmore.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/loadmore.php 2013-03-08 21:03:20 UTC (rev 10225)
+++ XoopsModules/smallworld/trunk/smallworld/loadmore.php 2013-03-12 14:40:01 UTC (rev 10226)
@@ -24,41 +24,54 @@
include_once(XOOPS_ROOT_PATH."/modules/smallworld/include/functions.php");
include_once(XOOPS_ROOT_PATH."/modules/smallworld/class/class_collector.php");
include_once(XOOPS_ROOT_PATH."/modules/smallworld/include/arrays.php");
+include_once(XOOPS_ROOT_PATH."/modules/smallworld/class/publicWall.php");
+$set = smallworld_checkPrivateOrPublic ();
+$hm = smallworld_GetModuleOption('msgtoshow');
$last = mysql_real_escape_string($_POST['last']);
$page = mysql_real_escape_string($_POST['page']);
global $xoopsUser, $xoTheme, $xoopsTpl,$xoopsLogger;
$xoopsLogger->activated = false;
+//error_reporting(E_ALL);
$tpl = new XoopsTpl();
-$Wall = new Wall_Updates();
+if ($id <= 0 && $set['access'] = 1) {
+ $Wall = new Public_Wall_Updates();
+} else {
+ $Wall = new Wall_Updates();
+}
if (isset($_POST['userid'])) {
$userid = intval($_POST['userid']);
} else {
- $userid=$xoopsUser->getVar('uid');
+ $userid = ($xoopsUser) ? $xoopsUser->getVar('uid'):0;
}
-$id = $xoopsUser->getVar('uid');
-$Xuser = new XoopsUser($id);
-$username = $Xuser->getVar('uname');
+$id = ($id > 0) ? $xoopsUser->getVar('uid') : 0;
+$Xuser = ($id > 0) ? new XoopsUser($id) : 0;
+$username = ($id > 0) ? $Xuser->getVar('uname'):'';
//
- if ( $xoopsUser->isAdmin($xoopsModule->getVar('mid'))) {
- $tpl->assign('isadminuser', 'YES');
- }
-
+ if ($id > 0) {
+ if ( $xoopsUser->isAdmin($xoopsModule->getVar('mid'))) {
+ $tpl->assign('isadminuser', 'YES');
+ }
+ } else {
+ $tpl->assign('isadminuser', 'NO');
+ }
$myavatar = $Wall->Gravatar($id);
$myavatarlink = smallworld_getAvatarLink($id, $myavatar);
$myavatar_size = smallworld_getImageSize(80, 100, $myavatarlink);
$myavatar_highwide = smallworld_imageResize($myavatar_size[0], $myavatar_size[1], 35);
-
-$followers = Smallworld_array_flatten($Wall->getFollowers($id),0);
+if ($id <= 0 && $set['access'] == 1 ) {
+ $pub = smallworld_GetModuleOption('smallworldshowPoPubPage', $repmodule='smallworld');
+ $followers = $pub;
+} else {
+ $followers = Smallworld_array_flatten($Wall->getFollowers($id),0);
+}
if ($page == 'index') {
- $updatesarray=$Wall->Updates($_POST['last'], $id, $followers);
+ $updatesarray = ($id > 0) ? $Wall->Updates($_POST['last'], $id, $followers) : $Wall->Updates($_POST['last'], $followers);
} elseif ($page == 'profile') {
- $updatesarray=$Wall->Updates($_POST['last'], $userid, $userid);
+ $updatesarray = ($id > 0) ? $Wall->Updates($_POST['last'], $userid, $userid) : $Wall->Updates($_POST['last'], $userid);
}
-
-
//Srinivas Tamada http://9lessons.info
//Loading Comments link with load_updates.php
foreach ($updatesarray as $data) {
@@ -110,10 +123,18 @@
}
}
}
+$tpl->assign('sCountResp',count($updatesarray));
+
+$tpl->assign('msgtoshow',$hm);
$tpl->assign('myusername',$username);
$tpl->assign('pagename',$page);
$tpl->assign('myavatar',$myavatar);
$tpl->assign('myavatarlink',$myavatarlink);
$tpl->assign('myavatar_highwide',$myavatar_highwide);
-$tpl->display(XOOPS_ROOT_PATH .'/modules/smallworld/templates/getmore.html');
+
+if ($id > 0) {
+ $tpl->display(XOOPS_ROOT_PATH .'/modules/smallworld/templates/getmore.html');
+} else {
+ $tpl->display(XOOPS_ROOT_PATH .'/modules/smallworld/templates/getmorepublic.html');
+}
?>
Modified: XoopsModules/smallworld/trunk/smallworld/message_ajax.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/message_ajax.php 2013-03-08 21:03:20 UTC (rev 10225)
+++ XoopsModules/smallworld/trunk/smallworld/message_ajax.php 2013-03-12 14:40:01 UTC (rev 10226)
@@ -25,6 +25,7 @@
include_once (XOOPS_ROOT_PATH.'/class/template.php');
global $xoopsUser, $xoopsModule,$xoopsLogger,$xoopsTpl;
$xoopsLogger->activated = false;
+//error_reporting(E_ALL);
$page = 'index';
@@ -113,5 +114,7 @@
$tpl->assign('myavatar_highwide',$myavatar_highwide);
$tpl->display(XOOPS_ROOT_PATH .'/modules/smallworld/templates/getlastmsg.html');
}
-}
+} else {
+ header('HTTP/1.1 403 Forbidden');
+}
?>
\ No newline at end of file
Modified: XoopsModules/smallworld/trunk/smallworld/preloads/core.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/preloads/core.php 2013-03-08 21:03:20 UTC (rev 10225)
+++ XoopsModules/smallworld/trunk/smallworld/preloads/core.php 2013-03-12 14:40:01 UTC (rev 10226)
@@ -27,129 +27,40 @@
function eventCoreHeaderAddmeta()
{
- global $xoTheme,$xoopsUser,$xoopsConfig;
- if ($xoopsUser) {
+ global $xoTheme,$xoopsUser,$xoopsConfig;
+ //Load language if not defined
+ smallworld_isDefinedLanguage ('_SMALLWORLD_SYSERROR', 'main.php');
+
+ $xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/base/jquery.ui.all.css');
+ $xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/smallworld.css');
- //Load language if not defined
- smallworld_isDefinedLanguage ('_SMALLWORLD_SYSERROR', 'main.php');
- $module_handler =& xoops_gethandler('module');
- $module = $module_handler->getByDirname('smallworld');
- $config_handler =& xoops_gethandler('config');
- if ($module) {
- $moduleConfig =& $config_handler->getConfigsByCat(0, $module->getVar('mid'));
- }
- // check geolocation style
- if(isset($moduleConfig['geolocate'])) {
- $geolocate = $moduleConfig['geolocate'];
- }
-
- $xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/base/jquery.ui.all.css');
- $xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/smallworld.css');
-
-
- //Check xoops version. If bigger than 2.5.0 then include by internal jquery plugins
-
- $ver = explode(" ", XOOPS_VERSION);
- if ($ver[1] >= '2.4.0') {
- $xoTheme->addScript(XOOPS_URL.'/browse.php?Frameworks/jquery/jquery.js');
- $xoTheme->addScript(XOOPS_URL.'/browse.php?Frameworks/jquery/plugins/jquery.ui.js');
- //$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery-1.7.1.min.js');
- //$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery-ui-1.8.11.custom.js');
- } else {
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.min.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jqueryui.min.js');
- }
+ //Check xoops version. If bigger than 2.5.0 then include by internal jquery plugins
- $myid = $xoopsUser->getVar('uid');
- // GET various variables from language folder
- if (file_exists(XOOPS_ROOT_PATH.'/modules/smallworld/language/'.$xoopsConfig['language'].'/js/variables.js')) {
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/language/'.$xoopsConfig['language'].'/js/variables.js');
- } else {
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/language/english/js/variables.js');
- }
-
- // Check if USER is smallworld-registered user
- $chkUser = new SmallWorldUser;
- $ChkProf = $chkUser->CheckIfProfile($myid);
-
- // Check if there are requests pending
- $count_invit = count($chkUser->getRequests($myid));
-
- // Get module config for validation and place in javascript
- $validate = $moduleConfig['validationstrenght'];
-
- // Check to see if smallworld should use username links to point to default xoops or smallworld
- $takeoverlinks = $moduleConfig['takeoveruserlinks'];
- $fieldstoshow = array_flip(smallworld_GetModuleOption('smallworldusethesefields', $repmodule='smallworld'));
- $useverification = smallworld_GetModuleOption('smallworldmandatoryfields', $repmodule='smallworld');
- $smallworldUV = implode(',', $useverification);
-
- // Get users messages count based on users followerArray
- $getUserMsgNum = smallworld_getCountFriendMessagesEtc ();
-
- // Check if request url is with www or without
- $urltest = smallworld_getHostRequest();
- $xoops_url = XOOPS_URL;
- if (!strstr($urltest, 'www.')) {
- $xoops_url = str_replace( 'www.', '', $xoops_url );
- }
-
- // Set javascript vars but only if not already defined.
- // Check prevents multible loads
-
- $script = "if (myID === undefined) {"."\n";
- $script .= "var smallworld_url = '" . $xoops_url . "/modules/smallworld/" . "';\n";
- $script .= "var smallworld_uploaddir = '" . $xoops_url . "/uploads/avatars/" . "';\n";
- $script .= "var xoops_smallworld = jQuery.noConflict();\n";
- $script .= "var myID = " . $myid . ";\n";
- $script .= "var userHasProfile = " . $ChkProf . ";\n";
- $script .= "var smallworldTakeOverLinks = " . $takeoverlinks . ";\n";
- $script .= "var geoL = " . $geolocate . ";\n";
- $script .= "var geocomplete = '';\n";
- $script .= "var smallworldVerString = '" . $smallworldUV . "';\n";
- $script .= "var smallworlduseverification = new Array();\n";
- $script .= "smallworlduseverification = smallworldVerString.split(',');\n";
- $script .= "var hasmessages = " . $count_invit . ";\n";
- $script .= "var smallworldvalidationstrenght = " . $validate . ";\n";
- $script .= "var smallworld_getFriendsMsgComCount = " . $getUserMsgNum . ";\n";
- $script .= "var $ = jQuery();\n";
- $script .= "} else {"."\n";
- $script .= "\n";
- $script .= "}"."\n";
- $xoTheme->addScript('','',$script);
+ $ver = explode(" ", XOOPS_VERSION);
+ if ($ver[1] >= '2.4.0') {
+ $xoTheme->addScript(XOOPS_URL.'/browse.php?Frameworks/jquery/jquery.js');
+ $xoTheme->addScript(XOOPS_URL.'/browse.php?Frameworks/jquery/plugins/jquery.ui.js');
+ //$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery-1.7.1.min.js');
+ //$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery-ui-1.8.11.custom.js');
+ } else {
+ $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.min.js');
+ $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jqueryui.min.js');
+ }
+ //Get variables
+ smallworld_SetCoreScript ();
+
$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/smallworld.js');
- /* $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.validate.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.validation.functions.js');
-
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.stepy.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.oembed.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.elastic.source.js');
$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.countdown.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.innerfade.js');
- */
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.countdown.js');
-
if ( file_exists(XOOPS_ROOT_PATH.'/modules/smallworld/language/'.$xoopsConfig['language'].'/js/jquery.ui.datepicker-language.js')) {
$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/language/'.$xoopsConfig['language'].'/js/jquery.ui.datepicker-language.js');
$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/language/'.$xoopsConfig['language'].'/js/jquery.countdown.js');
- } else {
+ } else {
$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/language/english/js/jquery.ui.datepicker-language.js');
$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/language/english/js/jquery.countdown.js');
- }
-
- // Include geolocate styling
- if ($geolocate != 1) {
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/geoname.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/geoname_now.js');
- } else {
- $xoTheme->addScript("http://maps.google.com/maps/api/js?sensor=false&language="._LANGCODE);
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/ui.geo_autocomplete.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/ui.geo_autocomplete_now.js');
- }
- } // End if XoopsUser
+ }
}
function isActive() {
Modified: XoopsModules/smallworld/trunk/smallworld/smallworldshare.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/smallworldshare.php 2013-03-08 21:03:20 UTC (rev 10225)
+++ XoopsModules/smallworld/trunk/smallworld/smallworldshare.php 2013-03-12 14:40:01 UTC (rev 10226)
@@ -87,7 +87,7 @@
$script .= "\n";
$script .= "}"."\n";
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery-1.7.1.min.js');
+ $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.min.js');
$xoTheme->addScript('','',$script);
}
Modified: XoopsModules/smallworld/trunk/smallworld/templates/getlastmsg.html
=================================================================...
[truncated message content] |
|
From: <dj...@us...> - 2013-03-12 14:42:04
|
Revision: 10227
http://xoops.svn.sourceforge.net/xoops/?rev=10227&view=rev
Author: djculex
Date: 2013-03-12 14:41:53 +0000 (Tue, 12 Mar 2013)
Log Message:
-----------
Adding: class/publicWall.php
adding: publicindex.php
adding: templates for public postings
Adding: Missing image
Added Paths:
-----------
XoopsModules/smallworld/trunk/smallworld/class/publicWall.php
XoopsModules/smallworld/trunk/smallworld/images/image_missing.png
XoopsModules/smallworld/trunk/smallworld/publicindex.php
XoopsModules/smallworld/trunk/smallworld/templates/getmorepublic.html
XoopsModules/smallworld/trunk/smallworld/templates/smallworld_publicindex.html
Added: XoopsModules/smallworld/trunk/smallworld/class/publicWall.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/class/publicWall.php (rev 0)
+++ XoopsModules/smallworld/trunk/smallworld/class/publicWall.php 2013-03-12 14:41:53 UTC (rev 10227)
@@ -0,0 +1,349 @@
+<?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.
+* 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: https://xoops.svn.sourceforge.net/svnroot/xoops/XoopsModules/smallworld/trunk/smallworld/class/wall.php $
+* @Last committed: $Revision: 9502 $
+* @Last changed by: $Author: djculex $
+* @Last changed date: $Date: 2012-05-13 18:15:22 +0200 (sø, 13 maj 2012) $
+* @ID: $Id: wall.php 9502 2012-05-13 16:15:22Z djculex $
+**/
+
+
+
+// Moderrated and fitted from the tutorial by Srinivas Tamada http://9lessons.info
+
+class Public_Wall_Updates
+{
+
+ private function getAdminModerators()
+ {
+ global $xoopsDB, $xoopsUser;
+ $sql = "SELECT userid
+ FROM ".$xoopsDB->prefix('smallworld_user')." su
+ left JOIN ".$xoopsDB->prefix('groups_users_link')." xu ON su.userid = xu.uid
+ WHERE xu.uid in (1)";
+ $result = $xoopsDB->queryF($sql);
+ while ($row = $xoopsDB->fetchArray($result)) {
+ $data[]=$row;
+ }
+
+ }
+ /**
+ * @Get array of updates
+ * @param int $last
+ * @param int $uid
+ * @param array $followes
+ * @return array
+ */
+ public function Updates($last,$moderators) {
+ global $xoopsUser, $xoopsDB, $moduleConfig;
+ $hm = smallworld_GetModuleOption('msgtoshow');
+ $set = smallworld_checkPrivateOrPublic ();
+ $mods = implode(",",Smallworld_array_flatten(array_unique($moderators),0));
+ $i=0;
+ //Get array of users permitted to post on public index page (normally admin moderators etc etc)
+
+
+ if ($last == 0) {
+ $query = "SELECT M.msg_id, M.uid_fk, M.priv, M.message, M.created, U.username FROM ".$xoopsDB->prefix('smallworld_messages')
+ . " M, ".$xoopsDB->prefix('smallworld_user')." U WHERE M.uid_fk=U.userid and M.priv = '0'";
+ } elseif ($last > 0) {
+ $query = "SELECT M.msg_id, M.uid_fk, M.priv, M.message, M.created, U.username FROM "
+ . $xoopsDB->prefix('smallworld_messages')." M, ".$xoopsDB->prefix('smallworld_user')
+ . " U WHERE M.uid_fk=U.userid and M.priv = '0' and M.msg_id < '".$last."'";
+ } elseif ($last == 'a') {
+ $query = "SELECT M.msg_id, M.uid_fk, M.priv, M.message, M.created, U.username FROM "
+ . $xoopsDB->prefix('smallworld_messages')." M, ".$xoopsDB->prefix('smallworld_user')
+ . " U WHERE M.uid_fk=U.userid and M.priv = '0'";
+ }
+
+ if (is_array($moderators)){
+ foreach ($moderators as $k => $v) {
+ if ($last>0) {
+ $query .= " OR M.uid_fk=U.userid and M.uid_fk= '".$v."' and M.priv= '0' and M.msg_id < '".$last."'";
+ } elseif ($last == 0) {
+ $query .= " OR M.uid_fk=U.userid and M.uid_fk= '".$v."' and M.priv= '0' ";
+ } elseif ($last == 'a') {
+ $query .= " OR M.uid_fk=U.userid and M.uid_fk= '".$v."' and M.priv= '0' ";
+ }
+ $i++;
+ }
+ }
+ if (!is_array($moderators)) {
+ if ($last > 0) {
+ $query .= " OR M.uid_fk=U.userid and M.uid_fk= '".$moderators."' and M.priv= '0' and M.msg_id < '".$last."'";
+ } elseif ($last == 0) {
+ $query .= " OR M.uid_fk=U.userid and M.uid_fk= '".$moderators."' and M.priv= '0' ";
+ } elseif ($last == 'a') {
+ $query .= " OR M.uid_fk=U.userid and M.uid_fk= '".$moderators."' and M.priv= '0' ";
+ }
+ }
+
+ if ($last>0) {
+ $query .= " order by created DESC LIMIT ".$hm;
+ } elseif ($last == 'a') {
+ $query .= " order by M.msg_id DESC LIMIT ".$hm;
+ } else {
+ $query .= " order by created DESC LIMIT ".$hm;
+ }
+
+ $result=$xoopsDB->queryF($query);
+ $count = $xoopsDB->getRowsNum($result);
+ if ($count == 0) {
+ return false;
+ } else {
+ while ($row = $xoopsDB->fetchArray($result)) {
+ $data[]=$row;
+ }
+
+ if(!empty($data)) {
+ return $data;
+ }
+ }
+ }
+
+ /**
+ * @Get comments based on msg id
+ * @param int $msg_id
+ * @return array
+ */
+ public function Comments($msg_id)
+ {
+ global $xoopsUser, $xoopsDB;
+ $query = "SELECT C.msg_id_fk, C.com_id, C.uid_fk, C.comment, C.created, U.username FROM "
+ . $xoopsDB->prefix('smallworld_comments')." C, ".$xoopsDB->prefix('smallworld_user')
+ . " U WHERE C.uid_fk=U.userid and C.msg_id_fk='".$msg_id."' order by C.com_id asc ";
+ $result = $xoopsDB->queryF($query);
+ $i = $xoopsDB->getRowsNum($result);
+ while ($row = $xoopsDB->fetchArray($result)) {
+ $data[]=$row;
+ }
+ if(!empty($data)) {
+ return $data;
+ }
+ }
+
+ /**
+ * @Get user image based on uid
+ * @param int $uid
+ * @return string
+ */
+ public function 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'];
+ }
+
+ $type = Array(
+ 1 => 'jpg',
+ 2 => 'jpeg',
+ 3 => 'png',
+ 4 => 'gif'
+ );
+
+ $ext = explode(".",$image);
+
+ if (@!in_array(strtolower ($ext[1]), $type) || $image == '') {
+ $avt = new XoopsUser($uid);
+ $avatar = $avt->user_avatar();
+ } else {
+ $avatar = $image;
+ }
+ return $avatar;
+ }
+
+ /**
+ * @count all votes
+ * @param int $type
+ * @param int $val
+ * @param int $msgid
+ * @return int
+ */
+ public function countVotes ($type, $val, $msgid)
+ {
+ global $xoopsUser, $xoopsDB;
+ $query = "Select SUM(".$val.") as sum from ".$xoopsDB->prefix('smallworld_vote')." where msg_id = '".$msgid."' and com_id = '0'";
+ $result=$xoopsDB->queryF($query);
+ while ($row = $xoopsDB->fetchArray($result)) {
+ $sum = $row['sum'];
+ }
+ if ($sum==''){
+ $sum = '0';
+ }
+ return $sum;
+ }
+
+ /**
+ * @Count comments votes
+ * @param int $type
+ * @param int $val
+ * @param int $comid
+ * @param int $msgid
+ * @returns int
+ */
+ public function countVotesCom ($type, $val, $comid, $msgid)
+ {
+ global $xoopsUser, $xoopsDB;
+ $query = "Select SUM(".$val.") as sum from ".$xoopsDB->prefix('smallworld_vote')
+ . " where com_id = '".$comid."' AND msg_id = '".$msgid."'";
+ $result=$xoopsDB->queryF($query);
+ while ($row = $xoopsDB->fetchArray($result)) {
+ $sum = $row['sum'];
+ }
+ if ($sum==''){
+ $sum = '0';
+ }
+ return $sum;
+ }
+
+ /**
+ * @Check is user is friend
+ * @param int $userid
+ * @param string $type
+ * @param int $comid
+ * @param int $msgid
+ * @return int
+ */
+ public function HasVoted ($userid, $type, $comid, $msgid)
+ {
+ global $xoopsUser, $xoopsDB;
+ if ($type == 'msg') {
+ $sql = "Select * from ".$xoopsDB->prefix('smallworld_vote')
+ . " where com_id = '0' and msg_id = '".$msgid."' and user_id = '".$userid."'";
+ $result = $xoopsDB->queryF($sql);
+ $i = $xoopsDB->getRowsNum($result);
+ } else {
+ $sql = "Select * from ".$xoopsDB->prefix('smallworld_vote')
+ . " where com_id = '".$comid."' and msg_id = '".$msgid."' and user_id = '".$userid."'";
+ $result = $xoopsDB->queryF($sql);
+ $i = $xoopsDB->getRowsNum($result);
+ }
+ return $i;
+ }
+
+ /**
+ * @count messages per user
+ * @param int $userid
+ * @return int
+ */
+ public function CountMsges ($userid)
+ {
+ global $xoopsDB;
+ $sql = "SELECT (SELECT COUNT(*) FROM ".$xoopsDB->prefix('smallworld_comments')
+ . " WHERE uid_fk = '".$userid."') + (SELECT COUNT(*) FROM "
+ . $xoopsDB->prefix('smallworld_messages')." WHERE uid_fk = '".$userid."')";
+ $result = $xoopsDB->queryF($sql);
+ $sum = $xoopsDB->fetchRow($result);
+ return $sum[0];
+ }
+
+ /**
+ * @Show permaling updates
+ * @param int $updid
+ * @param int $uid
+ * @param int $ownerID
+ * @return array
+ */
+ public function UpdatesPermalink($updid,$uid, $ownerID)
+ {
+ global $xoopsUser, $xoopsDB, $moduleConfig;
+ $query = "SELECT M.msg_id, M.uid_fk, M.message, M.created, M.priv, U.username FROM "
+ . $xoopsDB->prefix('smallworld_messages')." M, ".$xoopsDB->prefix('smallworld_user')
+ . " U WHERE M.uid_fk=U.userid and M.uid_fk='".$ownerID."'";
+ $query .= " AND M.msg_id = '".$updid."'";
+ $query .= " order by M.created DESC LIMIT 1";
+ $result=$xoopsDB->queryF($query);
+ $count = $xoopsDB->getRowsNum($result);
+ if ($count < 1) {
+ return false;
+ } else {
+ while ($row = $xoopsDB->fetchArray($result)) {
+ $data[]=$row;
+ }
+ if(!empty($data)) {
+ return $data;
+ }
+ }
+ }
+
+ /**
+ * @Get share link
+ * @param int $updid
+ * @param int $ownerID
+ * @return array
+ */
+ public function UpdatesSharelink($updid,$ownerID)
+ {
+ global $xoopsUser, $xoopsDB, $moduleConfig;
+ $query = "SELECT M.msg_id, M.uid_fk, M.message, M.created, M.priv, U.username FROM "
+ . $xoopsDB->prefix('smallworld_messages')." M, ".$xoopsDB->prefix('smallworld_user')
+ . " U WHERE M.uid_fk=U.userid and M.uid_fk='".$ownerID."' and M.priv = 0";
+ $query .= " AND M.msg_id = '".$updid."'";
+ $query .= " order by created DESC LIMIT 1";
+ $result=$xoopsDB->queryF($query);
+ $count = $xoopsDB->getRowsNum($result);
+ if ($count < 1) {
+ return false;
+ } else {
+ while ($row = $xoopsDB->fetchArray($result)) {
+ $data[]=$row;
+ }
+ if(!empty($data)) {
+ return $data;
+ }
+ }
+ }
+
+ /**
+ * @Get sharing link
+ * @param int $id
+ * @param int $priv
+ * @return string
+ */
+ function GetSharing ($id, $priv) {
+ if ($priv != 1) {
+ $text = " | <span class='smallworld_share' id='smallworld_share'>";
+ $text .= "<a class='share' id='share-page".$id."' href='javascript:void(0);'>"._SMALLWORLD_SHARELINK."</a></span>";
+ } else {
+ $text = "";
+ }
+ return $text;
+ }
+
+ /**
+ * @Get content for sharing div
+ * @param int $id
+ * @param int $priv
+ * @param string $permalink
+ * @param string $desc
+ * @param string $username
+ * @return string
+ */
+ function GetSharingDiv ($id, $priv, $permalink,$desc,$username) {
+ if ($priv != 1) {
+ $text = "<div style='display: none;' class='smallworld_bookmarks' id='share-page' name='share-page".$id."'>";
+ $text .= "<span name='share-page".$id."' rel1='".$desc."' rel2= '".$username."' rel=".$permalink." id='basicBookmark' title='"._SMALLWORLD_SHAREBOX_TITLE."'>";
+ $text .= "</span></div>";
+ } else {
+ $text="";
+ }
+ return $text;
+ }
+
+}
+?>
\ No newline at end of file
Added: XoopsModules/smallworld/trunk/smallworld/images/image_missing.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/image_missing.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/publicindex.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/publicindex.php (rev 0)
+++ XoopsModules/smallworld/trunk/smallworld/publicindex.php 2013-03-12 14:41:53 UTC (rev 10227)
@@ -0,0 +1,132 @@
+<?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.
+* 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: https://xoops.svn.sourceforge.net/svnroot/xoops/XoopsModules/smallworld/trunk/smallworld/index.php $
+* @Last committed: $Revision: 9482 $
+* @Last changed by: $Author: djculex $
+* @Last changed date: $Date: 2012-05-11 12:02:24 +0200 (fr, 11 maj 2012) $
+* @ID: $Id: index.php 9482 2012-05-11 10:02:24Z djculex $
+**/
+
+include_once("../../mainfile.php");
+$xoopsOption['template_main'] = 'smallworld_publicindex.html';
+include_once(XOOPS_ROOT_PATH."/header.php");
+include_once(XOOPS_ROOT_PATH."/modules/smallworld/class/class_collector.php");
+include_once(XOOPS_ROOT_PATH."/modules/smallworld/class/publicWall.php");
+include_once(XOOPS_ROOT_PATH."/modules/smallworld/include/functions.php");
+global $xoopsUser, $xoTheme,$xoopsConfig,$xoopsLogger;
+ $xoopsLogger->activated = true;
+ error_reporting(E_ALL);
+
+ $set = smallworld_checkPrivateOrPublic ();
+
+ $module_handler =& xoops_gethandler('module');
+ $module = $module_handler->getByDirname('smallworld');
+ $config_handler =& xoops_gethandler('config');
+ $moduleConfig =& $config_handler->getConfigsByCat(0, $module->getVar('mid'));
+
+ $pub = smallworld_GetModuleOption('smallworldshowPoPubPage', $repmodule='smallworld');
+ $wall = new Public_Wall_Updates;
+ $updates = $wall->updates(0, $pub);
+
+/* if (!$xoopsUser && $set['access']==1) {
+*/
+
+ $xuser = new SmallWorldProfile;
+
+ $menu_home = "<a href='".XOOPS_URL."/modules/smallworld/'><img id='menuimg' src='".XOOPS_URL."/modules/smallworld/images/house.png'>"._SMALLWORLD_HOME."</a>";
+
+
+ $updatesarray=$wall->updates(0, $pub);
+ if (!empty($updatesarray)) {
+ foreach ($updatesarray as $data) {
+ $wm['msg_id'] = $data['msg_id'];
+ $wm['orimessage'] = str_replace(array("\r", "\n"), '',Smallworld_stripWordsKeepUrl($data['message']));
+ $wm['message'] = nl2br(smallworld_tolink(htmlspecialchars_decode($data['message']), $data['uid_fk']));
+ $wm['message'] = str_replace(array('<','>'),array('<','>'), $wm['message']);
+ $wm['created'] = smallworld_time_stamp($data['created']);
+ $wm['username'] = $data['username'];
+ $wm['uid_fk'] = $data['uid_fk'];
+ $wm['priv'] = $data['priv'];
+ $wm['avatar'] = $wall->Gravatar($data['uid_fk']);
+ $wm['avatar_link'] = smallworld_getAvatarLink ($data['uid_fk'], $wm['avatar']);
+ $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']);
+ $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>";
+ $wm['sharelinkurl'] = XOOPS_URL."/modules/smallworld/smallworldshare.php?ownerid=".$data['uid_fk'];
+ $wm['sharelinkurl'] .= "&updid=".$data['msg_id']."";
+ $wm['usernameTitle'] = $wm['username']._SMALLWORLD_UPDATEONSITEMETA.$xoopsConfig['sitename'];
+ $wm['sharelink'] = $wall->GetSharing ($wm['msg_id'],$wm['priv']);
+ $wm['sharediv'] = $wall->GetSharingDiv ($wm['msg_id'],$wm['priv'], $wm['sharelinkurl'],$wm['orimessage'],$wm['usernameTitle']);
+ $wm['commentsarray'] = $wall->Comments($data['msg_id']);
+ print_r($wm['commentsarray']);
+ $xoopsTpl->append('walldata', $wm);
+
+ if (!empty($wm['commentsarray'])){
+ foreach($wm['commentsarray'] as $cdata) {
+ $wc['msg_id_fk'] = $cdata['msg_id_fk'];
+ $wc['com_id'] = $cdata['com_id'];
+ $wc['comment'] = nl2br(smallworld_tolink(htmlspecialchars_decode($cdata['comment']),$cdata['uid_fk']));
+ $wc['time'] = smallworld_time_stamp($cdata['created']);
+ $wc['username'] = $cdata['username'];
+ $wc['uid'] = $cdata['uid_fk'];
+ $wc['myavatar'] = $wall->Gravatar($id);
+ $wc['myavatar_link'] = $myavatarlink;
+ $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']);
+ $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>";
+ $wc['vote_up'] = $wall->countVotesCom ('com', 'up', $cdata['msg_id_fk'],$cdata['com_id']);
+ $wc['vote_down'] = $wall->countVotesCom ('com', 'down', $cdata['msg_id_fk'],$cdata['com_id']);
+ $xoopsTpl->append('comm', $wc);
+ }
+ }
+ }
+ }
+
+ $xoopsTpl->assign('menu_home',$menu_home);
+ $xoopsTpl->assign('pagename','index');
+ $xoopsTpl->assign('check',1);
+ $xoopsTpl->assign('access',$set['access']);
+
+ //Check xoops version. If bigger than 2.5.0 then include by internal jquery plugins
+ $ver = explode(" ", XOOPS_VERSION);
+ if ($ver[1] >= '2.4.0') {
+ $xoTheme->addScript(XOOPS_URL.'/browse.php?Frameworks/jquery/jquery.js');
+ $xoTheme->addScript(XOOPS_URL.'/browse.php?Frameworks/jquery/plugins/jquery.ui.js');
+ //$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery-1.7.1.min.js');
+ //$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery-ui-1.8.11.custom.js');
+ } else {
+ $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.min.js');
+ $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jqueryui.min.js');
+ }
+
+ smallworld_SetCoreScript ();
+
+ $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.oembed.js');
+ $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.elastic.source.js');
+ $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/wall.js');
+ $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/ajaxupload.3.5.js');
+ $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.avatar_helper.js');
+ $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.bookmark.js');
+ $xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/oembed.css');
+ $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.colorbox.js');
+ $xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/smallworld.css');
+include(XOOPS_ROOT_PATH."/footer.php");
+?>
\ No newline at end of file
Added: XoopsModules/smallworld/trunk/smallworld/templates/getmorepublic.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/templates/getmorepublic.html (rev 0)
+++ XoopsModules/smallworld/trunk/smallworld/templates/getmorepublic.html 2013-03-12 14:41:53 UTC (rev 10227)
@@ -0,0 +1,96 @@
+<{if $access != '0'}>
+<{foreach item=post from=$walldata}>
+ <script type="text/javascript">
+ xoops_smallworld(document).ready(function(){
+ xoops_smallworld("#smallworld_stexpand<{$post.msg_id}>").oembed("<{$post.orimessage}>",{
+ maxWidth: "100%",
+ maxHeight: "100%"
+ });
+ });
+ </script>
+<div class="smallworld_stbody" id="smallworld_stbody<{$post.msg_id}>">
+ <div class="smallworld_stimg">
+ <img src="<{$post.avatar_link}>" class='smallworld_big_face' <{$post.avatar_highwide}> />
+ </div>
+
+ <div class="smallworld_sttext">
+ <b><a class="smallworld_wall_link" href=""><{$post.username}></a></b> <{$post.message}>
+ <div class="smallworld_sttime"><{$post.created}><{$post.sharelink}> | <a href='#' class='smallworld_commentopen' id='<{$post.msg_id}>' title='<{$smarty.const._SMALLWORLD_COMMENTWALL}>'><{$smarty.const._SMALLWORLD_COMMENTWALL}></a></div>
+ <{$post.sharediv}>
+ <div class="smallworld_stcommentvote">
+ <span id ="smallworld_votenum"><{$post.vote_up}></span>
+ <img class="smallworld_voteimg" src = "images/like.png" />
+
+ <span id ="smallworld_votenum"><{$post.vote_down}></span>
+ <img class="smallworld_voteimg" src = "images/dislike.png" />
+
+ </div>
+
+ <div id="smallworld_stexpandbox">
+ <div id="smallworld_stexpand<{$post.msg_id}>"></div>
+ </div>
+
+ <div class="smallworld_commentcontainer" id="smallworld_commentload<{$post.msg_id}>">
+ <{section name=i loop=$comm}>
+ <{if $comm[i].msg_id_fk == $post.msg_id}>
+ <div class="smallworld_stcommentbody" id="smallworld_stcommentbody<{$comm[i].com_id}>">
+ <div class="smallworld_stcommentimg">
+ <img src="<{$comm[i].avatar_link}>" class='smallworld_small_face' <{$comm[i].avatar_highwide}>/>
+ </div>
+ <div class="smallworld_stcommenttext">
+ <div class="comm_holder">
+ <a class="smallworld_wall_link" href="<{$xoops_url}>/modules/smallworld/userprofile.php?username=<{$comm[i].username}>">
+ <b><{$comm[i].username}></b>
+ </a> <{$comm[i].comment}></div>
+
+ <div class="smallworld_stcommenttime">
+ <{$comm[i].time}>
+ </div>
+ <div class="smallworld_stcommentvote">
+ <span id ="smallworld_votenum"><{$comm[i].vote_up}></span>
+ <img class="smallworld_voteimg" src = "images/like.png" />
+
+
+ <span id ="smallworld_votenum"><{$comm[i].vote_down}></span>
+ <img class="smallworld_voteimg" src = "images/dislike.png" />
+
+ </div>
+ </div>
+ </div>
+ <{/if}>
+ <{/section}>
+ </div> <!-- smallworld_commentcontainer -->
+ <div class="smallworld_commentupdate" style='display:none' id='smallworld_commentbox<{$post.msg_id}>'>
+ <div class="smallworld_stcommentimg">
+ <img src="<{$myavatarlink}>" class='smallworld_small_face' <{$myavatar_highwide}>/>
+ </div>
+ <div class="smallworld_stcommenttext" >
+ <form method="post" action="">
+ <textarea name="smallworld_comment" class="smallworld_comment" maxlength="200" id="smallworld_ctextarea<{$post.msg_id}>"></textarea>
+ <br />
+ <input type="submit" value="<{$smarty.const._SMALLWORLD_COMMENTBUTTONTEXT}>" id="<{$post.msg_id}>" class="smallworld_comment_button"/>
+ </form>
+ </div>
+ </div> <!-- smallworld_commentupdate -->
+</div> <!-- smallworld_sttext -->
+</div> <!-- smallworld_stbody -->
+<{/foreach}>
+
+<div id = "smallworld_moremsg_ajax" style="display:none">
+ <img src="images/loader.gif"/>
+</div>
+
+<{if $sCountResp >= $msgtoshow}>
+<a href="javascript:void(0)" class="smallworld_msg_counter" rel="<{$pagename}>" id="<{$post.msg_id}>"><{$smarty.const._SMALLWORLD_MOREBUTTONLINK}></a>
+<{/if}>
+
+<script type="text/javascript">
+xoops_smallworld(document).ready(function(){
+ smallworldCheckNumDivs();
+ attachAvatarOpen();
+ SmallworldGetMoreMsg ();
+});
+</script>
+<{else}>
+
+<{/if}>
\ No newline at end of file
Added: XoopsModules/smallworld/trunk/smallworld/templates/smallworld_publicindex.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/templates/smallworld_publicindex.html (rev 0)
+++ XoopsModules/smallworld/trunk/smallworld/templates/smallworld_publicindex.html 2013-03-12 14:41:53 UTC (rev 10227)
@@ -0,0 +1,268 @@
+<{if $access == 1}>
+ <{if $check >= 1}>
+ <ul id="smallworld_menu" class="smallworld_menu">
+ <li class="active">
+ <a href="<{$xoops_url}>/modules/smallworld/index.php"><{$smarty.const._SMALLWORLD_HOME}></a>
+ </li>
+ </ul>
+ <div id="example1" class="smallworld_content">
+ <table class="smallworld_biotable">
+ <tr>
+ <td>
+ <{$avatar}>
+ <{if $xoops_isuser}>
+ <div class="UploadNewAvatar" id="<{$ownerofpage}>" style="display:none">
+ <div id="smallworld_avatarupload" >
+ <span><{$smarty.const._SMALLWORLD_UPLOADFILEBUTTONTEXT}></span>
+ </div>
+ <span id="smallworld_avatarstatus" ></span>
+ <ul id="smallworld_avatarfiles" ></ul>
+ </div>
+
+ <div class="smallworld_userstat_menu">
+ <h1><{$username}></h1>
+ <center><{$rankimage}></center>
+ <br><center><{$smarty.const._SMALLWORLD_TOTALPOSTS}>
+ <{$totalposts}></center>
+ <br><br>
+ <h1><{$smarty.const._SMALLWORLD_TOTALUSERRATINGS}></h1>
+ <p class="smallworld_rating_menu"><{$usersratinf}></p>
+ </div>
+ <br>
+
+ <{if $isadminuser == 'YES' or $username == $myusername}>
+ <br>
+ <p class="smallworld_useredits_menu">
+ <img height="10px" width="10px" src="images/editavatar.png"/>
+ <a href="javascript:void(0);" id="smallworld_changeAvatar"><{$smarty.const._SMALLWORLD_CHANGEAVATAR}></a><br>
+ <img height="10px" width="10px" src="images/edituserprofile.png"/>
+ <a href="editprofile.php" id="smallworld_changeEditProfile"><{$smarty.const._SMALLWORLD_EDITPROFILE}></a>
+
+ <br>
+ </p>
+ <{/if}>
+
+ <br>
+ <p class="smallworld_useredits_menu">
+ <img width= '10px' height= '10px' src="<{$xoops_url}>/modules/smallworld/images/statistics.png" />
+ <a href="javascript:void(0);" id = "smallworld_statistics_lnk" ><{$smarty.const._SMALLWORLD_STATS}></a><br>
+ </p>
+ <br>
+
+ </td>
+ <{else}>
+ <td>
+ <br/>
+ </td>
+ <{/if}>
+ <span class="smallworld_search">
+ <td>
+ <ul class="smallworld_index_headmenu">
+ <li><{$menu_home}></li>
+ <li><{$menu_profile}></li>
+ <li><{$menu_friends}></li>
+ <li><{$menu_gallery}></li>
+ </ul>
+ <br>
+ <br>
+
+ <center><input id="smallworld_searchform" size="35" type="text" value="<{$smarty.const._SMALLWORLD_SEARCHMEMBER}>"/></center>
+ <br>
+ <br>
+ <div id="smallworld_wall_container">
+ <div id="smallworld_updateboxarea">
+ <h4><{$smarty.const._SMALLWORLD_WHATSUP}></h4>
+ <form method="post" action="">
+ <{if $xoopsUser}>
+ <textarea cols="50" rows="1" rel="<{$ownerofpage}>" name="smallworld_update" id="smallworld_update" maxlength="200" ></textarea>
+ <{else}>
+ <textarea cols="50" rows="1" maxlength="200" ></textarea>
+ <{/if}>
+ <br>
+ <div id = "smallworld_updatePrivacyCheck">
+ <label for="updatePriv"><{$smarty.const._SMALLWORLD_PRIVATEUPDATE}></label>
+ <input type="radio" name="updatePublic" id="updatePublic" value="1"/>
+ <label for="updatePriv"><{$smarty.const._SMALLWORLD_PUBLICUPDATE}></label>
+ <input type="radio" name="updatePublic" id="updatePublic" value="0"/>
+
+ </div>
+ <br><br>
+ <{if $xoopsUser}>
+ <input type="submit" value="<{$smarty.const._SMALLWORLD_UPDATEBUTTONTEXT}>" id="smallworld_update_button" class="smallworld_update_button"/>
+ <{else}>
+ <input type="submit" value="<{$smarty.const._SMALLWORLD_UPDATEBUTTONTEXT}>" id="smallworld_update_button" class="smallworld_update_button"/>
+ <{/if}>
+ </form>
+ </div>
+ <hr/>
+ <div id = "smallworld_Stats_container"></div>
+ <button id='smallworld_messagecounter_id' onClick='javascript:smallworldRefresh();return false;'></button>
+ <div id='smallworld_flashmessage'>
+ <div id="smallworld_flash" align="left" ></div>
+ </div>
+ <div id="smallworld_content">
+ <{foreach item=post from=$walldata}>
+ <div class="smallworld_stbody" id="smallworld_stbody<{$post.msg_id}>">
+ <script type="text/javascript">
+ xoops_smallworld(document).ready(function(){
+ xoops_smallworld('#smallworld_stexpand<{$post.msg_id}>').oembed('<{$post.orimessage}>',{
+ maxWidth: "100%",
+ maxHeight: "100%"
+ });
+ });
+ </script>
+ <div class="smallworld_stimg">
+ <img src="<{$post.avatar_link}>" class='smallworld_big_face' <{$post.avatar_highwide}>/>
+ </div>
+
+ <div class="smallworld_sttext">
+ <{if $isadminuser == 'YES' or $post.username == $myusername}>
+ <a class="smallworld_stdelete" href="#" rel="<{$post.uid_fk}>" id="<{$post.msg_id}>" title="<{$smarty.const._SMALLWORLD_DELUPD}>">X</a>
+ <{/if}>
+ <b><a class="smallworld_wall_link" href="<{$xoops_url}>/modules/smallworld/userprofile.php?username=<{$post.username}>"><{$post.username}></a></b> <{$post.message}>
+ <div class="smallworld_sttime"><{$post.created}><{$post.sharelink}> | <a href='#' class='smallworld_commentopen' id='<{$post.msg_id}>' title='<{$smarty.const._SMALLWORLD_COMMENTWALL}>'><{$smarty.const._SMALLWORLD_COMMENTWALL}></a></div>
+ <{$post.sharediv}>
+ <{if $post.username == $myusername}>
+ <div class="smallworld_stcommentvote">
+ <span id ="smallworld_votenum"><{$post.vote_up}></span>
+ <img class="smallworld_voteimg" src = "images/like.png" />
+
+ <span id ="smallworld_votenum"><{$post.vote_down}></span>
+ <img class="smallworld_voteimg" src = "images/dislike.png" />
+ </div>
+ <{else}>
+ <div class="smallworld_stcommentvote">
+ <span id ="smallworld_votenum"><{$post.vote_up}></span> <a href="javascript:void(0)" name="up" class="smallworld_stcomment_vote" id="<{$post.msg_id}>" type="msg" owner="<{$post.uid_fk}>">
+ <img class="smallworld_voteimg" src = "images/like.png" />
+ </a>
+ <span id ="smallworld_votenum"><{$post.vote_down}></span> <a href="javascript:void(0)" name="down" class="smallworld_stcomment_vote" id="<{$post.msg_id}>" type="msg" owner="<{$post.uid_fk}>">
+ <img class="smallworld_voteimg" src = "images/dislike.png" />
+ </a>
+ <a href="javascript:void(0)" auserid="<{$post.uid_fk}>" by_user = "<{$myusername}>" a_user = "<{$post.username}>" name="complaint" class="smallworld_comment_complaint" id="<{$post.compl_msg_lnk}>">
+ <img class="smallworld_voteimg" src = "images/complaint.png" />
+ </a>
+ </div>
+ <{/if}>
+ <div id="smallworld_stexpandbox">
+ <div id="smallworld_stexpand<{$post.msg_id}>"></div>
+ </div>
+
+ <div class="smallworld_commentcontainer" id="smallworld_commentload<{$post.msg_id}>">
+
+ <{section name=i loop=$comm}>
+ <{if $comm[i].msg_id_fk == $post.msg_id}>
+ <div class="smallworld_stcommentbody" id="smallworld_stcommentbody<{$comm[i].com_id}>"/>
+ <div class="smallworld_stcommentimg">
+ <img src="<{$comm[i].avatar_link}>" class='smallworld_small_face' <{$comm[i].avatar_highwide}>/>
+ </div>
+ <div class="smallworld_stcommenttext">
+ <{if $isadminuser == 'YES' or $comm[i].username == $myusername}>
+ <a class="smallworld_stcommentdelete" href="#" rel="<{$comm[i].uid}>" id='<{$comm[i].com_id}>' title='<{$smarty.const._SMALLWORLD_DELETECOMMENT}>'>X</a>
+ <{/if}>
+ <div class="comm_holder">
+ <a class="smallworld_wall_link" href="<{$xoops_url}>/modules/smallworld/userprofile.php?username=<{$comm[i].username}>">
+ <b><{$comm[i].username}></b>
+ </a> <{$comm[i].comment}></div>
+ <div class="smallworld_stcommenttime"><{$comm[i].time}></div>
+ <{if $comm[i].username == $myusername}>
+ <div class="smallworld_stcommentvote">
+ <span id ="smallworld_votenum"><{$comm[i].vote_up}></span>
+ <img class="smallworld_voteimg" src = "images/like.png" />
+
+
+ <span id ="smallworld_votenum"><{$comm[i].vote_down}></span>
+ <img class="smallworld_voteimg" src = "images/dislike.png" />
+ </div>
+ <{else}>
+ <div class="smallworld_stcommentvote">
+ <span id ="smallworld_votenum"><{$comm[i].vote_up}></span> <a href="javascript:void(0)" name="up" class="smallworld_stcomment_vote" id="<{$comm[i].com_id}>" owner="<{$comm[i].uid}>" type="com" type2="<{$comm[i].msg_id_fk}>">
+ <img class="smallworld_voteimg" src = "images/like.png" />
+ </a>
+
+ <span id ="smallworld_votenum"><{$comm[i].vote_down}></span> <a href="javascript:void(0)" name="down" class="smallworld_stcomment_vote" id="<{$comm[i].com_id}>" owner="<{$comm[i].uid}>" type="com" type2="<{$comm[i].msg_id_fk}>">
+ <img class="smallworld_voteimg" src = "images/dislike.png" />
+ </a>
+ <a href="javascript:void(0)" auserid="<{$comm[i].uid}>" by_user = "<{$myusername}>" a_user = "<{$comm[i].username}>" name="complaint" class="smallworld_comment_complaint" id="<{$comm[i].compl_msg_lnk}>">
+ <img class="smallworld_voteimg" src = "images/complaint.png" />
+ </a>
+ </div>
+ <{/if}>
+ </div>
+ </div>
+ <{/if}>
+ <{/section}>
+ </div>
+
+ <div class="smallworld_commentupdate" style="display:none" id="smallworld_commentbox<{$post.msg_id}>">
+ <div class="smallworld_stcommentimg">
+ <{if $xoopsUser}>
+ <img src="<{$myavatarlink}>" class='smallworld_small_face' <{$myavatar_highwide}>/>
+ <{else}>
+ <img src="<{$myavatarlink}>" class='smallworld_small_face' width="50px" height="50px"/>
+ <{/if}>
+ </div>
+ <div class="smallworld_stcommenttext" >
+ <form method="post" action="">
+ <textarea name="smallworld_comment" class="smallworld_comment" maxlength="200" id="smallworld_ctextarea<{$post.msg_id}>"></textarea>
+ <br />
+ <input type="submit" value="<{$smarty.const._SMALLWORLD_COMMENTBUTTONTEXT}>" id="<{$post.msg_id}>" class="smallworld_comment_button"/>
+ </form>
+ </div>
+ </div>
+
+ </div>
+
+ </div>
+
+ <{/foreach}>
+ <div id = "smallworld_moremsg_ajax" style="display:none">
+ <img src="images/loader.gif"/>
+ </div>
+ <a href="javascript:void(0)" class="smallworld_msg_counter" rel2 = "" rel="index" id="<{$post.msg_id}>"><{$smarty.const._SMALLWORLD_MOREBUTTONLINK}></a>
+ </div>
+ </div>
+ </td>
+ </span>
+ </tr>
+ </table>
+ </div>
+ <div id="friendInvitations_box" title="<{$smarty.const._SMALLWORLD_FRIENDSINVITATIONS}>">
+ <table border="0" class="smallworld_invitetable" cellspacing="0" cellpadding="0">
+ <{foreach item=post from=$friendinvitations}>
+ <tr>
+ <th><{$smarty.const._SMALLWORLD_REALNAME}></th>
+ <th></th>
+ <th><{$smarty.const._SMALLWORLD_DATERECIEVED}></th>
+ <th></th>
+ <th> <{$smarty.const._SMALLWORLD_ACTION}></th>
+ <th></th>
+ </tr>
+
+ <tr>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ </tr>
+
+ <tr id="<{$post.cnt}>">
+ <td><{$post.friendname}></td>
+ <td><{$post.friendimage}></td>
+ <td><{$post.frienddate}></td>
+ <td><{$post.accept}></td><td><{$post.deny}></td><td><{$post.later}></td>
+ </tr>
+ <{/foreach}>
+ </table>
+ </div>
+ <div id="smallworldStatsDiv" title="<{$smarty.const._SMALLWORLD_STATS}>" style="display:none;"></div>
+ <{else}>
+ <div id="smallworld_notyetregistered" title="<{$smarty.const._SMALLWORLD_NOTYETREGISTERED_TITLE}>">
+ <table border="0" class="smallworld_table" cellspacing="0" cellpadding="0">
+ <tr>
+ <label for="register"></label>
+ <td><p id="smallworld_notyetusercontent"><{$notyetusercontent}></p></td>
+ </tr>
+ </table>
+ </div>
+ <{/if}>
+<{/if}>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X