Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[11992] XoopsModules/smallworld/trunk/smallworld
|
From: <dj...@us...> - 2013-08-31 18:06:28
|
Revision: 11992
http://sourceforge.net/p/xoops/svn/11992
Author: djculex
Date: 2013-08-31 18:06:22 +0000 (Sat, 31 Aug 2013)
Log Message:
-----------
NEW: Choose weather to use google maps autocomplete or not
CHANGE: Clearify that only numbers can be used in telephone forms
BUG: Sending notifications mail to user weather set or unset.
BUG: User image not collected true in some cases
BUG: Array of users merged incorrect in xoops_version
BUG: Friendship check return incorrect in some places
BUG: Wrong array values used for checks in some places
BUG: In friendship invite missing privacy settings check
BUG: Public index missing correct avatar variables
BUG: friendship request function in smallworld.js rewritten to stay open if more requests are pending.
BUG: Return in history -1 after visiting user gallery, before returning to index.php
BUG: Fixing autocomplete hiding issue in chrome
BUG: Auto setting messages to private upon pageload.
BUG: Adding friend invitation box in friends.php
BUG: Various fixes, adjustments to html
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/class/db.php
XoopsModules/smallworld/trunk/smallworld/class/user.php
XoopsModules/smallworld/trunk/smallworld/class/wall.php
XoopsModules/smallworld/trunk/smallworld/comment_ajax.php
XoopsModules/smallworld/trunk/smallworld/friendinvite.php
XoopsModules/smallworld/trunk/smallworld/include/functions.php
XoopsModules/smallworld/trunk/smallworld/js/smallworld.js
XoopsModules/smallworld/trunk/smallworld/language/english/main.php
XoopsModules/smallworld/trunk/smallworld/language/english/modinfo.php
XoopsModules/smallworld/trunk/smallworld/publicindex.php
XoopsModules/smallworld/trunk/smallworld/templates/smallworld_friends_template.html
XoopsModules/smallworld/trunk/smallworld/templates/smallworld_index.html
XoopsModules/smallworld/trunk/smallworld/templates/smallworld_publicindex.html
XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_template.html
XoopsModules/smallworld/trunk/smallworld/xoops_version.php
Modified: XoopsModules/smallworld/trunk/smallworld/class/db.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/class/db.php 2013-08-29 20:58:50 UTC (rev 11991)
+++ XoopsModules/smallworld/trunk/smallworld/class/db.php 2013-08-31 18:06:22 UTC (rev 11992)
@@ -422,6 +422,9 @@
." WHERE me = '".intval($userid)."' AND you = '".intval($friendid)."'";
$result = $xoopsDB->queryF($sql);
$result2 = $xoopsDB->queryF($sql2);
+
+ // Since friendship is canceled also following is deleted
+ $this->toogleFollow (1, $userid, $friendid);
}
}
Modified: XoopsModules/smallworld/trunk/smallworld/class/user.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/class/user.php 2013-08-29 20:58:50 UTC (rev 11991)
+++ XoopsModules/smallworld/trunk/smallworld/class/user.php 2013-08-31 18:06:22 UTC (rev 11992)
@@ -183,9 +183,15 @@
$msg[$start]['img'] = $Wall->Gravatar($row['me']);
$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:Smallworld_AcceptDenyFriend(1,'.$row['me'].','.$row['you'].','.$start.');">'._SMALLWORLD_ACCEPT.'</a>';
- $msg[$start]['deny'] = '<a id="smallworldrequestlink" href = "javascript:Smallworld_AcceptDenyFriend(-1,'.$row['me'].','.$row['you'].','.$start.');">'._SMALLWORLD_DENY.'</a>';
- $msg[$start]['later'] = '<a id="smallworldrequestlink" href = "javascript:Smallworld_AcceptDenyFriend(0,'.$row['me'].','.$row['you'].','.$start.');">'._SMALLWORLD_LATER.'</a>';
+ $msg[$start]['accept'] = '<a class="smallworldrequestlink" id = "smallworldfriendrequest_'.$msg[$start]['friendname'].
+ '" href = "javascript:Smallworld_AcceptDenyFriend(1,'.$row['me'].','.$row['you'].','.$start.');">'.
+ _SMALLWORLD_ACCEPT.'</a>';
+ $msg[$start]['deny'] = '<a class="smallworldrequestlink" id = "smallworldfriendrequest_'.$msg[$start]['friendname'].
+ '" href = "javascript:Smallworld_AcceptDenyFriend(-1,'.$row['me'].','.$row['you'].','.$start.');">'.
+ _SMALLWORLD_DENY.'</a>';
+ $msg[$start]['later'] = '<a class="smallworldrequestlink" id = "smallworldfriendrequest_'.$msg[$start]['friendname'].
+ '" href = "javascript:Smallworld_AcceptDenyFriend(0,'.$row['me'].','.$row['you'].','.$start.');">'.
+ _SMALLWORLD_LATER.'</a>';
$msg[$start]['cnt'] = $start;
$start++;
}
Modified: XoopsModules/smallworld/trunk/smallworld/class/wall.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/class/wall.php 2013-08-29 20:58:50 UTC (rev 11991)
+++ XoopsModules/smallworld/trunk/smallworld/class/wall.php 2013-08-31 18:06:22 UTC (rev 11992)
@@ -140,6 +140,8 @@
$image = $r['userimage'];
}
+ $image = ($image == '') ? smallworld_getAvatarLink($uid, $image) : $image;
+
$type = Array(
1 => 'jpg',
2 => 'jpeg',
Modified: XoopsModules/smallworld/trunk/smallworld/comment_ajax.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/comment_ajax.php 2013-08-29 20:58:50 UTC (rev 11991)
+++ XoopsModules/smallworld/trunk/smallworld/comment_ajax.php 2013-08-31 18:06:22 UTC (rev 11992)
@@ -56,7 +56,7 @@
if($data) {
// Is comments's user a friend ?
- $frC = $check->friendcheck($id,$cdata['uid_fk']);
+ $frC = $check->friendcheck($id,$data['uid_fk']);
$USC = array();
$USC['posts'] = 0;
@@ -91,8 +91,8 @@
$wc['avatar_link'] = smallworld_getAvatarLink ($data['uid_fk'], $wc['cface']);
$wc['avatar_size'] = smallworld_getImageSize(80, 100, $wc['myavatar_link']);
$wc['avatar_highwide'] = smallworld_imageResize($wc['avatar_size'][0], $wc['avatar_size'][1], 35);
- $wc['compl_msg_lnk'] = "<a href='".XOOPS_URL."/modules/smallworld/permalink.php?ownerid=".Smallworld_getOwnerFromComment($cdata['msg_id_fk']);
- $wc['compl_msg_lnk'] .= "&updid=".$cdata['msg_id_fk']."#".$cdata['com_id']."'>"._SMALLWORLD_COMP_MSG_LNK_DESC."</a>";
+ $wc['compl_msg_lnk'] = "<a href='".XOOPS_URL."/modules/smallworld/permalink.php?ownerid=".Smallworld_getOwnerFromComment($data['msg_id_fk']);
+ $wc['compl_msg_lnk'] .= "&updid=".$cdata['msg_id_fk']."#".$data['com_id']."'>"._SMALLWORLD_COMP_MSG_LNK_DESC."</a>";
$wc['vote_up'] = $Wall->countVotesCom ('com', 'up', $data['msg_id_fk'],$data['com_id']);
$wc['vote_down'] = $Wall->countVotesCom ('com', 'down', $data['msg_id_fk'],$data['com_id']);
@@ -114,7 +114,9 @@
foreach ($parts as $k=>$v) {
$owner = Smallworld_getOwnerFromComment ($data['msg_id_fk']);
if(smallworld_GetModuleOption('smallworldusemailnotis', $repmodule='smallworld') != 0) {
- $mail->sendMails ($data['uid_fk'], $v, 'commentToWM', $link=null, $wc);
+ if ($USC['notify'] == 1) {
+ $mail->sendMails ($data['uid_fk'], $v, 'commentToWM', $link=null, $wc);
+ }
}
}
}
Modified: XoopsModules/smallworld/trunk/smallworld/friendinvite.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/friendinvite.php 2013-08-29 20:58:50 UTC (rev 11991)
+++ XoopsModules/smallworld/trunk/smallworld/friendinvite.php 2013-08-31 18:06:22 UTC (rev 11992)
@@ -38,6 +38,7 @@
$myUid = $_POST['myUid'];
$friendName = $check->getName($friend);
$yourName = $check->getName($myUid);
+ $USC = json_decode($db->GetSettings($friend), true);
if ($invitation == '1') {
if ($friendProfile >= 2) {
@@ -46,7 +47,9 @@
if ($friendshipExists[0] == 0) {
$resultMsg = _SMALLWORLD_JSON_ADDFRIEND.$friendName._SMALLWORLD_JSON_REQUEST_PENDING;
if(smallworld_GetModuleOption('smallworldusemailnotis', $repmodule='smallworld') != 0) {
- $mail->sendMails ($friend, $friend, 'friendshipfollow', $link=null, array());
+ if ($USC['notify'] == 1) {
+ $mail->sendMails ($friend, $friend, 'friendshipfollow', $link=null, array());
+ }
}
$db->toogleFriendInvite ($friendshipExists, $friend, $myUid);
echo json_encode(array('error' => 'no', 'msg' => $resultMsg, 'msgChange' => _SMALLWORLD_JSON_CANCELFR_TEXT));
Modified: XoopsModules/smallworld/trunk/smallworld/include/functions.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/include/functions.php 2013-08-29 20:58:50 UTC (rev 11991)
+++ XoopsModules/smallworld/trunk/smallworld/include/functions.php 2013-08-31 18:06:22 UTC (rev 11992)
@@ -1001,7 +1001,7 @@
while ($r = $db->fetchArray($result)) {
$data[$r['userid']] = $r['username'];
}
- $ndata = array_merge(array(0 => _MI_SMALLWORLD_ALL), $data);
+ $ndata = array(0 => _MI_SMALLWORLD_ALL) + $data;
}
return $ndata;
}
@@ -1050,6 +1050,9 @@
$useverification = smallworld_GetModuleOption('smallworldmandatoryfields', $repmodule='smallworld');
$smallworldUV = implode(',', $useverification);
+ // Use googlemaps ?
+ $googlemaps = $moduleConfig['smallworldUseGoogleMaps'];
+
// Get users messages count based on users followerArray
$getUserMsgNum = ($xoopsUser) ? smallworld_getCountFriendMessagesEtc():0;
@@ -1070,7 +1073,7 @@
$script .= "var Smallworld_myID = " . $myid . ";\n";
$script .= "var Smallworld_userHasProfile = " . $ChkProf . ";\n";
$script .= "var smallworldTakeOverLinks = " . $takeoverlinks . ";\n";
- $script .= "var Smallworld_geocomplete = '';\n";
+ $script .= "var Smallworld_geocomplete = " . $googlemaps . ";\n";
$script .= "var smallworldVerString = '" . $smallworldUV . "';\n";
$script .= "var smallworlduseverification = new Array();\n";
$script .= "smallworlduseverification = smallworldVerString.split(',');\n";
@@ -1082,9 +1085,11 @@
$xoTheme->addScript('','',$script);
// Include geolocate styling
- $xoTheme->addScript("https://maps.googleapis.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 ($googlemaps == 1) {
+ $xoTheme->addScript("https://maps.googleapis.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');
+ }
smallworld_includeScripts ();
Modified: XoopsModules/smallworld/trunk/smallworld/js/smallworld.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2013-08-29 20:58:50 UTC (rev 11991)
+++ XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2013-08-31 18:06:22 UTC (rev 11992)
@@ -115,9 +115,16 @@
href:"#friendInvitations_box"
});
};
- xoops_smallworld('#smallworldrequestlink').on('click',function() {
- xoops_smallworld('#friendInvitations_box').css('display','none');
- xoops_smallworld.colorbox.close();
+ xoops_smallworld('.smallworldrequestlink').on('click',function() {
+ var smallworld_request_id = xoops_smallworld(this).prop('id');
+ if (xoops_smallworld("tr[id^='smallworldfriendrequest_']").length === 0) {
+ xoops_smallworld('#friendInvitations_box').css('display','none');
+ } else {
+ xoops_smallworld('tr#'+smallworld_request_id).remove();
+ if (xoops_smallworld("tr[id^='smallworldfriendrequest_']").length === 0) {
+ xoops_smallworld.colorbox.close();
+ }
+ }
});
}
});
@@ -178,7 +185,8 @@
xoops_smallworld('div#page').hide();
},
onClosed:function() {
- location.href = 'index.php';
+ //location.href = window.location.pathname;
+ history.go(-1);
},
href:"div#page"
});
@@ -260,19 +268,20 @@
}
// Attach geolocate autocomplete to forms
- xoops_smallworld(document).ready(function(){
- if (xoops_smallworld("#birthplace").length > 0) {
- if( typeof xoops_smallworld('#birthplace').val() != "undefined" ) {
- xoops_smallworld('#birthplace').geo_autocomplete();
- }
- }
- if (xoops_smallworld("#present_city").length > 0){
- if ( typeof xoops_smallworld('#present_city').val() != "undefined" ) {
- xoops_smallworld('#present_city').geo_autocomplete_now();
+ if (Smallworld_geocomplete == 1) {
+ xoops_smallworld(document).ready(function(){
+ if (xoops_smallworld("#birthplace").length > 0) {
+ if( typeof xoops_smallworld('#birthplace').val() != "undefined" ) {
+ xoops_smallworld('#birthplace').geo_autocomplete();
+ }
}
- }
- });
-
+ if (xoops_smallworld("#present_city").length > 0){
+ if ( typeof xoops_smallworld('#present_city').val() != "undefined" ) {
+ xoops_smallworld('#present_city').geo_autocomplete_now();
+ }
+ }
+ });
+ }
// Make Textareas elastic
xoops_smallworld(function() {
@@ -413,7 +422,7 @@
// Search for user in smallworld users or test for new user
xoops_smallworld(function() {
- xoops_smallworld("#smallworld_searchform").focus().select();
+ //xoops_smallworld("#smallworld_searchform").focus().select();
xoops_smallworld("#smallworld_searchform").autocomplete({
source: smallworld_url+ 'search.php',
minLength:1,
@@ -463,7 +472,7 @@
// Keep public as default checked in Update field
xoops_smallworld(function(){
- xoops_smallworld("input[name=updatePublic] option[value='private']").attr('checked', false);
+ xoops_smallworld("input[name=updatePublic][value=1]").prop("checked", true);
});
@@ -708,6 +717,7 @@
xoops_smallworld('#_smallworld_birthplace_maplink').on('click',function(event){
event.preventDefault();
if (xoops_smallworld('#_smallworld_birthplace_map').length) { // implies *not* zero
+ if (Smallworld_geocomplete == 1) {
xoops_smallworld('#_smallworld_birthplace_map').show();
xoops_smallworld.colorbox({
innerWidth:"550px",
@@ -726,7 +736,7 @@
},
href:"#_smallworld_birthplace_map",
});
-
+ };
};
});
@@ -734,7 +744,8 @@
xoops_smallworld('#_smallworld_present_maplink').on('click',function(event){
event.preventDefault();
if (xoops_smallworld('#_smallworld_present_map').length) { // implies *not* zero
- xoops_smallworld('#_smallworld_present_map').show();
+ if (Smallworld_geocomplete == 1) {
+ xoops_smallworld('#_smallworld_present_map').show();
xoops_smallworld.colorbox({
innerWidth:"550px",
innerHeight:"550px",
@@ -752,6 +763,7 @@
},
href:"#_smallworld_present_map"
});
+ };
};
});
@@ -1081,6 +1093,7 @@
var text = smallworldDeletedMessages + diff;
xoops_smallworld('#smallworld_messagecounter_id').html(text);
xoops_smallworld('#smallworld_messagecounter_id').show();
+ //window.location.reload();
}
if (diff == 0) {
@@ -1092,6 +1105,7 @@
var text = smallworldNewMessages + diff;
xoops_smallworld('#smallworld_messagecounter_id').html(text);
xoops_smallworld('#smallworld_messagecounter_id').show();
+ //window.location.reload();
}
}
return false;
Modified: XoopsModules/smallworld/trunk/smallworld/language/english/main.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/english/main.php 2013-08-29 20:58:50 UTC (rev 11991)
+++ XoopsModules/smallworld/trunk/smallworld/language/english/main.php 2013-08-31 18:06:22 UTC (rev 11992)
@@ -45,8 +45,8 @@
define("_SMALLWORLD_EMAILS","Emails");
/*--------------- contact info -----------------*/
-define("_SMALLWORLD_MOBILEPHONE","Mobile phone");
-define("_SMALLWORLD_LANDPHONE","Land phone");
+define("_SMALLWORLD_MOBILEPHONE","Mobile phone (numbers only)");
+define("_SMALLWORLD_LANDPHONE","Land phone (numbers only)");
define("_SMALLWORLD_ADRESS","Street Adress");
define("_SMALLWORLD_CITY","City");
Modified: XoopsModules/smallworld/trunk/smallworld/language/english/modinfo.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/language/english/modinfo.php 2013-08-29 20:58:50 UTC (rev 11991)
+++ XoopsModules/smallworld/trunk/smallworld/language/english/modinfo.php 2013-08-31 18:06:22 UTC (rev 11992)
@@ -33,8 +33,8 @@
/* -------- Configs ---------- */
// Map apis
-define("_MI_SMALLWORLD_USEGOOGLE","Use google maps geolocation Api ?");
-define("_MI_SMALLWORLD_USEGOOGLE_DESC","Default is geonames database. Choose yes to use google maps");
+define("_MI_SMALLWORLD_USEGOOGLEMAPS","Use google maps geolocation Api ?");
+define("_MI_SMALLWORLD_USEGOOGLEMAPS_DESC","Default yes");
// Messages per page
define("_MI_SMALLWORLD_MSGTOSHOW","Messages to show ?");
Modified: XoopsModules/smallworld/trunk/smallworld/publicindex.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/publicindex.php 2013-08-29 20:58:50 UTC (rev 11991)
+++ XoopsModules/smallworld/trunk/smallworld/publicindex.php 2013-08-31 18:06:22 UTC (rev 11992)
@@ -192,6 +192,9 @@
$xoopsTpl->assign('menu_home',$menu_home);
$xoopsTpl->assign('menu_register',$menu_register);
$xoopsTpl->assign('avatar', $user_img);
+ $xoopsTpl->assign('myavatar',$myavatar);
+ $xoopsTpl->assign('myavatarlink',$myavatarlink);
+ $xoopsTpl->assign('myavatar_highwide',$myavatar_highwide);
$xoopsTpl->assign('pagename','publicindex');
$xoopsTpl->assign('check',$profile);
$xoopsTpl->assign('access',$set['access']);
Modified: XoopsModules/smallworld/trunk/smallworld/templates/smallworld_friends_template.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/templates/smallworld_friends_template.html 2013-08-29 20:58:50 UTC (rev 11991)
+++ XoopsModules/smallworld/trunk/smallworld/templates/smallworld_friends_template.html 2013-08-31 18:06:22 UTC (rev 11992)
@@ -388,33 +388,25 @@
</div>
<div id="resultMsgFollow" title="<{$smarty.const._SMALLWORLD_FRIENDSHIPFOLLOW}> <{$username}>">
</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="friendInvitations_box" title="<{$smarty.const._SMALLWORLD_FRIENDSINVITATIONS}>">
+ <table border="0" class="smallworld_invitetable" cellspacing="0" cellpadding="0">
+ <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>
+ <{foreach item=post from=$friendinvitations}>
+ <tr id="smallworldfriendrequest_<{$post.friendname}>">
+ <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>
<{$usersetting}>
<div id="smallworldStatsDiv" title="<{$smarty.const._SMALLWORLD_STATS}>" style="display:none;"></div>
\ No newline at end of file
Modified: XoopsModules/smallworld/trunk/smallworld/templates/smallworld_index.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/templates/smallworld_index.html 2013-08-29 20:58:50 UTC (rev 11991)
+++ XoopsModules/smallworld/trunk/smallworld/templates/smallworld_index.html 2013-08-31 18:06:22 UTC (rev 11992)
@@ -183,7 +183,7 @@
<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}>/>
+ <img src="<{$myavatarlink}>" class='smallworld_small_face' width="35px" height="35px"/>
</div>
<div class="smallworld_stcommenttext" >
<form method="post" action="">
@@ -211,33 +211,25 @@
</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>
+ <table border="0" class="smallworld_invitetable" cellspacing="0" cellpadding="0">
+ <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>
+ <{foreach item=post from=$friendinvitations}>
+ <tr id="smallworldfriendrequest_<{$post.friendname}>">
+ <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>
<{$usersetting}>
<div id="smallworldStatsDiv" title="<{$smarty.const._SMALLWORLD_STATS}>" style="display:none;"></div>
<{else}>
Modified: XoopsModules/smallworld/trunk/smallworld/templates/smallworld_publicindex.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/templates/smallworld_publicindex.html 2013-08-29 20:58:50 UTC (rev 11991)
+++ XoopsModules/smallworld/trunk/smallworld/templates/smallworld_publicindex.html 2013-08-31 18:06:22 UTC (rev 11992)
@@ -191,9 +191,9 @@
<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}>/>
+ <img src="<{$myavatarlink}>" class='smallworld_small_face' width="35px" height="35px"/>
<{else}>
- <img src="<{$myavatarlink}>" class='smallworld_small_face' width="50px" height="50px"/>
+ <img src="<{$myavatarlink}>" class='smallworld_small_face' width="35px" height="35px"/>
<{/if}>
</div>
<div class="smallworld_stcommenttext" >
@@ -221,34 +221,7 @@
</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>
+
<{$usersetting}>
<div id="smallworldStatsDiv" title="<{$smarty.const._SMALLWORLD_STATS}>" style="display:none;"></div>
<{else}>
Modified: XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_template.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_template.html 2013-08-29 20:58:50 UTC (rev 11991)
+++ XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_template.html 2013-08-31 18:06:22 UTC (rev 11992)
@@ -620,33 +620,26 @@
</div>
<div id="resultMsgFollow" title="<{$smarty.const._SMALLWORLD_FRIENDSHIPFOLLOW}> <{$username}>">
</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>
- <{$usersetting}>
- <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>
\ No newline at end of file
+ <div id="friendInvitations_box" title="<{$smarty.const._SMALLWORLD_FRIENDSINVITATIONS}>">
+ <table border="0" class="smallworld_invitetable" cellspacing="0" cellpadding="0">
+ <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>
+ <{foreach item=post from=$friendinvitations}>
+ <tr id="smallworldfriendrequest_<{$post.friendname}>">
+ <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>>
+ <{$usersetting}>
+ <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>
\ No newline at end of file
Modified: XoopsModules/smallworld/trunk/smallworld/xoops_version.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/xoops_version.php 2013-08-29 20:58:50 UTC (rev 11991)
+++ XoopsModules/smallworld/trunk/smallworld/xoops_version.php 2013-08-31 18:06:22 UTC (rev 11992)
@@ -276,7 +276,7 @@
$modversion['config'][$i]['description'] = '_MI_SMALLWORLD_PRIVATEMODULE_DESC';
$modversion['config'][$i]['formtype'] = 'yesno';
$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 1;
+$modversion['config'][$i]['default'] = 0;
/**
* Authorized groups to upload
@@ -291,6 +291,14 @@
$modversion['config'][$i]['default'] = 0;
$modversion['config'][$i]['options'] = array_flip($obj);
+$i++;
+$modversion['config'][$i]['name'] = 'smallworldUseGoogleMaps';
+$modversion['config'][$i]['title'] = '_MI_SMALLWORLD_USEGOOGLEMAPS';
+$modversion['config'][$i]['description'] = '_MI_SMALLWORLD_USEGOOGLEMAPS_DESC';
+$modversion['config'][$i]['formtype'] = 'yesno';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 1;
+
// Search
$modversion['hasSearch'] = 1;
$modversion['search']['file'] = "include/search.inc.php";
|
