Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[11699] XoopsModules/smallworld/trunk/smallworld
|
From: <dj...@us...> - 2013-06-16 17:29:36
|
Revision: 11699
http://sourceforge.net/p/xoops/svn/11699
Author: djculex
Date: 2013-06-16 17:29:32 +0000 (Sun, 16 Jun 2013)
Log Message:
-----------
Bugfix: Global vars and functions prefixing (security fix)
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/class/user.php
XoopsModules/smallworld/trunk/smallworld/editprofile.php
XoopsModules/smallworld/trunk/smallworld/include/functions.php
XoopsModules/smallworld/trunk/smallworld/include/getSelects.php
XoopsModules/smallworld/trunk/smallworld/js/smallworld.js
XoopsModules/smallworld/trunk/smallworld/js/wall.js
XoopsModules/smallworld/trunk/smallworld/templates/getlastcom.html
XoopsModules/smallworld/trunk/smallworld/templates/getlastmsg.html
XoopsModules/smallworld/trunk/smallworld/templates/getmore.html
XoopsModules/smallworld/trunk/smallworld/templates/getmorepublic.html
XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_template.html
XoopsModules/smallworld/trunk/smallworld/userprofile.php
Modified: XoopsModules/smallworld/trunk/smallworld/class/user.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/class/user.php 2013-06-16 17:28:38 UTC (rev 11698)
+++ XoopsModules/smallworld/trunk/smallworld/class/user.php 2013-06-16 17:29:32 UTC (rev 11699)
@@ -183,9 +183,9 @@
$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: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>';
- $msg[$start]['later'] = '<a id="smallworldrequestlink" href = "javascript:AcceptDenyFriend(0,'.$row['me'].','.$row['you'].','.$start.');">'._SMALLWORLD_LATER.'</a>';
+ $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]['cnt'] = $start;
$start++;
}
Modified: XoopsModules/smallworld/trunk/smallworld/editprofile.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/editprofile.php 2013-06-16 17:28:38 UTC (rev 11698)
+++ XoopsModules/smallworld/trunk/smallworld/editprofile.php 2013-06-16 17:29:32 UTC (rev 11699)
@@ -135,9 +135,9 @@
$nr2id = "email-".$k;
$emailtext .= $item->input_add('smallworld_add2','email','emailtype','.smallworld_clone2',20,$addmore=null,$preset=stripslashes($v),$nr2id);
// $emailtext .= $item->input_add('smallworld_add2','email','emailtype','.smallworld_clone2',20,$addmore=null,$preset=stripslashes($v));
- $emailtext .= "<span class='smallworld_remove' id='emailremove'><a href='javascript:removelnk (\"#emailremovelnk\",\"input#email\",\"email\");' id='emailremovelnk'>"._SMALLWORLD_REMOVE."</a><br></span>";
+ $emailtext .= "<span class='smallworld_remove' id='emailremove'><a href='javascript:void(0);' id='emailremovelnk'>"._SMALLWORLD_REMOVE."</a><br></span>";
}
- $emailtext .= "<a class='smallworld_addemail' href='javascript:void();' id='emailAdd'>"._SMALLWORLD_ADDMORE."</a><br><br>";
+ $emailtext .= "<a class='smallworld_addemail' href='javascript:void(0);' id='emailAdd'>"._SMALLWORLD_ADDMORE."</a><br><br>";
$xoopsTpl->append('emailtext',$emailtext);
} else {
$xoopsTpl->assign('show_emails','no');
@@ -157,7 +157,7 @@
if ($cnt1 < $count1-1) {$addmore1 ="";} else {$addmore1 = _SMALLWORLD_ADDMORE;}
$screenname .= $item->dropdown_add('smallworld_add','screenname', 'screenname_type', '.smallworld_clone',$arr06,$addmore1,$selected=stripslashes($nr4[$k]),$preset=stripslashes($v));
$screenname .= "<span class='smallworld_remove' id='screennameremove'>";
- $screenname .= "<a href='javascript:removelnk (\"#screennameremovelnk\",\"span#screenname\",\"screenname\");' id='screennameremovelnk'>"._SMALLWORLD_REMOVE."</a><br></span>";
+ $screenname .= "<a href='javascript:void(0);' id='screennameremovelnk'>"._SMALLWORLD_REMOVE."</a><br></span>";
$cnt1++;
}
$screenname .= "<a class='smallworld_addscreenname' href='javascript:void(0);' id='screennameAdd'>"._SMALLWORLD_ADDMORE."</a><br><br>";
@@ -269,7 +269,7 @@
$school .= $item->school_add ('smallworld_add3', 'school', 'school_type',
'.smallworld_clone3', $arr7, _SMALLWORLD_ADDMORE, $selected=stripslashes($nr6[$k]),$preset=$v, $selectedstart=date("Y",$nr7[$k]),$selectedstop=date("Y",$nr8[$k]));
$school .= "<span class='smallworld_remove2' id='schoolremove'>";
- $school .= "<a href='javascript:removelnk (\"#schoolremovelnk\",\"div#school\",\"school\");' id='schoolremovelnk'>"._SMALLWORLD_REMOVE."</a><br></span>";
+ $school .= "<a href='javascript:void(0);' id='schoolremovelnk'>"._SMALLWORLD_REMOVE."</a><br></span>";
}
$school .= "<a class='smallworld_addschool' href='javascript:void(0);' id='schoolAdd'>"._SMALLWORLD_ADDMORE."</a><br><br>";
$xoopsTpl->append('school',$school);
@@ -289,7 +289,7 @@
$job .= $item->job('smallworld_add4', 'job', 'job_type', '.smallworld_clone4', _SMALLWORLD_ADDMORE, $employer=stripslashes($v), $position=stripslashes($nr10[$k]),
$selectedstart = ($nr11[$k] != '') ? date("Y",$nr11[$k]):'', $selectedstop=($nr12[$k] != '') ? date("Y",$nr12[$k]):'',$description=$nr13[$k]);
$job .= "<span class='smallworld_remove3' id='jobremove'>";
- $job .= "<a href='javascript:removelnk (\"#jobremovelnk\",\"div#job\",\"job\");' id='jobremovelnk'>"._SMALLWORLD_REMOVE."</a><br></span>";
+ $job .= "<a href='javascript:void(0);' id='jobremovelnk'>"._SMALLWORLD_REMOVE."</a><br></span>";
}
$job .= "<a class='smallworld_addjob' href='javascript:void(0);' id='jobAdd'>"._SMALLWORLD_ADDMORE."</a><br><br>";
$xoopsTpl->append('job',$job);
Modified: XoopsModules/smallworld/trunk/smallworld/include/functions.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/include/functions.php 2013-06-16 17:28:38 UTC (rev 11698)
+++ XoopsModules/smallworld/trunk/smallworld/include/functions.php 2013-06-16 17:29:32 UTC (rev 11699)
@@ -417,6 +417,24 @@
}
}
+/**
+ * Get version number of xim if exists
+ * @return int $version
+ */
+function smallworld_XIMversion () {
+ global $xoopsDB;
+ $sql = "SELECT version FROM ".$xoopsDB->prefix('modules')." WHERE dirname = 'xim'";
+ $result = $xoopsDB->queryF($sql);
+ if ($result) {
+ while ($r = $xoopsDB->fetchArray($result)) {
+ $version = $r['version'];
+ }
+ } else {
+ $version = 0;
+ }
+ return $version;
+}
+
/*
* Input: Message Id,
* Return owner of thread (original poster)
@@ -1044,23 +1062,22 @@
// Set javascript vars but only if not already defined.
// Check prevents multible loads
- $script = "if (myID === undefined) {"."\n";
+ $script = "var Smallworld_myID;"."\n";
+ $script .= "if (typeof Smallworld_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 Smallworld_myID = " . $myid . ";\n";
+ $script .= "var Smallworld_userHasProfile = " . $ChkProf . ";\n";
$script .= "var smallworldTakeOverLinks = " . $takeoverlinks . ";\n";
- $script .= "var geocomplete = '';\n";
+ $script .= "var Smallworld_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 Smallworld_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);
@@ -1184,7 +1201,22 @@
$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.bookmark.js');
$xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/oembed.css');
$xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/smallworld.css');
- break;
+ break;
+
+ case 'userprofile':
+ $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.colorbox.js');
+ $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.elastic.source.js');
+ $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.countdown.js');
+ $xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/smallworld.css');
+ break;
}
}
Modified: XoopsModules/smallworld/trunk/smallworld/include/getSelects.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/include/getSelects.php 2013-06-16 17:28:38 UTC (rev 11698)
+++ XoopsModules/smallworld/trunk/smallworld/include/getSelects.php 2013-06-16 17:29:32 UTC (rev 11699)
@@ -35,5 +35,8 @@
$religion = $db->getVar($id,'religion');
header('Content-type: "application/json"');
echo "{\"relat\":\"$relat\", \"partner\":\"$partner\", \"gender\":\"$gender\", \"politic\":\"$politic\", \"religion\":\"$religion\"}";
- }
+ } else {
+ header('Content-type: "application/json"');
+ echo "{\"relat\":\"\", \"partner\":\"\", \"gender\":\"\", \"politic\":\"\", \"religion\":\"\"}";
+ }
?>
\ No newline at end of file
Modified: XoopsModules/smallworld/trunk/smallworld/js/smallworld.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2013-06-16 17:28:38 UTC (rev 11698)
+++ XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2013-06-16 17:29:32 UTC (rev 11699)
@@ -13,7 +13,7 @@
*/
xoops_smallworld(function() {
//Attach function for avatar
- attachAvatarOpen ();
+ Smallworld_attachAvatarOpen ();
// Get page url and page title (index.php)
var smallworld_pageUrl = window.location.pathname;
@@ -21,7 +21,7 @@
// GET pop for statistics
xoops_smallworld('#smallworld_statistics_lnk').on('click',function(e) {
- if (userHasProfile == 0) {
+ if (Smallworld_userHasProfile == 0) {
alert (SmallworldDialogNotUser);
return false;
}
@@ -46,15 +46,15 @@
// GET pop for recentactivities
xoops_smallworld('#smallworld_recentactivities').on('click',function(e) {
- if (userHasProfile == 0) {
+ if (Smallworld_userHasProfile == 0) {
alert (SmallworldDialogNotUser);
return false;
}
e.preventDefault();
- var uname = xoops_smallworld(this).attr('rel');
+ var Smallworld_uname = xoops_smallworld(this).attr('rel');
if (xoops_smallworld('#smallworld_recentactivities').length) { // implies *not* zero
xoops_smallworld('#smallworld_recentactivitiesDiv').show();
- xoops_smallworld("#smallworld_recentactivitiesDiv").load('recentactivities.php?username='+uname);
+ xoops_smallworld("#smallworld_recentactivitiesDiv").load('recentactivities.php?username='+Smallworld_uname);
xoops_smallworld.colorbox({
width:"35%",
height:"50%",
@@ -101,7 +101,7 @@
// Function to make friend invitations form into ui dialog
xoops_smallworld(function() {
xoops_smallworld('#friendInvitations_box').css('display','none');
- if (hasmessages > 0) {
+ if (Smallworld_hasmessages > 0) {
if (xoops_smallworld('#friendInvitations_box').length) { // implies *not* zero
xoops_smallworld('#friendInvitations_box').show();
xoops_smallworld.colorbox({
@@ -186,7 +186,7 @@
// If user does not have a profile in smallworld then goto register.
// If user has already a profile then goto edit profile dialog
- if (userHasProfile === 0) {
+ if (Smallworld_userHasProfile === 0) {
var buttons = {};
buttons[_smallworldContinueToReg] = function() {
location.href = smallworld_url+'register.php';
@@ -704,7 +704,7 @@
xoops_smallworld('#_smallworld_birthplace_map').hide();
},
onComplete:function() {
- initialize_birthplace(smallworld_birthlng,smallworld_birthlatt);
+ Smallworld_initialize_birthplace(smallworld_birthlng,smallworld_birthlatt);
xoops_smallworld('#_smallworld_birthplace_map').show();
},
title: function() {
@@ -730,7 +730,7 @@
xoops_smallworld('#_smallworld_present_map').hide();
},
onComplete:function(){
- initialize_currplace(smallworld_currlng,smallworld_currlatt);
+ Smallworld_initialize_currplace(smallworld_currlng,smallworld_currlatt);
xoops_smallworld('#_smallworld_present_map').show();
},
title: function() {
@@ -744,20 +744,20 @@
// Function to rewrite urls used in xoops core for directing to profile.php
- // Sets var uname = link text()
+ // Sets var Smallworld_uname = link text()
// removes /userinfo.php?uid=#
- // replaces with /modules/smallworld/userprofile.php?username=uname
+ // replaces with /modules/smallworld/userprofile.php?username=Smallworld_uname
// culex okt 2011
if (smallworldTakeOverLinks != 0) {
xoops_smallworld('a[href*="userinfo.php?"]').each(function() {
- var oldurl = xoops_smallworld(this).attr("href");
- var uname = xoops_smallworld(this).text();
- if (oldurl.match(/.*xoops.*/)) {
- return oldurl;
+ var Smallworld_oldurl = xoops_smallworld(this).attr("href");
+ var Smallworld_uname = xoops_smallworld(this).text();
+ if (Smallworld_oldurl.match(/.*xoops.*/)) {
+ return Smallworld_oldurl;
} else {
- var tempArray = xoops_smallworld(this).attr("href").split("/");
- var baseURL = tempArray[0];
- this.href = this.href.replace(oldurl, smallworld_url + "userprofile.php?username="+uname);
+ var Smallworld_tempArray = xoops_smallworld(this).attr("href").split("/");
+ var Smallworld_baseURL = Smallworld_tempArray[0];
+ this.href = this.href.replace(Smallworld_oldurl, smallworld_url + "userprofile.php?username="+Smallworld_uname);
}
});
}
@@ -785,7 +785,7 @@
var username = xoops_smallworld('span[name="' + id + '"]').attr('rel2');
xoops_smallworld('[name="' + id + '"]').toggle();
xoops_smallworld('span[name="' + id + '"]').bookmark({
- onSelect: customBookmark,
+ onSelect: Smallworld_customBookmark,
url:ref,
description:desc,
title:username
@@ -910,13 +910,13 @@
// Open custom boomark window
-function customBookmark(id, display, url) {
+function Smallworld_customBookmark(id, display, url) {
window.open(url, '_blank',
'width=600,height=400,menubar=no,toolbar=no,scrollbars=yes');
}
// Init birthplace_map
-function initialize_birthplace(smallworld_birthlng,smallworld_birthlatt) {
+function Smallworld_initialize_birthplace(smallworld_birthlng,smallworld_birthlatt) {
var birth_myLatlng = new google.maps.LatLng(smallworld_birthlatt, smallworld_birthlng);
var birth_myOptions = {
@@ -933,7 +933,7 @@
}
// Init currentcity_map
-function initialize_currplace(smallworld_currlng,smallworld_currlatt) {
+function Smallworld_initialize_currplace(smallworld_currlng,smallworld_currlatt) {
var currplace_myLatlng = new google.maps.LatLng(smallworld_currlatt, smallworld_currlng);
var currplace_myOptions = {
zoom: 8,
@@ -950,7 +950,7 @@
// Function to send invitation of friendship to userid
//get friends email ids and message to send invitation
-function inviteFriends(friendID,myuid) {
+function Smallworld_inviteFriends(friendID,myuid) {
xoops_smallworld('#resultMsg').hide();
var txtMsgModal = xoops_smallworld('#friendship').text().replace(/\t/g, '');
var frNa = xoops_smallworld('#smallworld_capname').text();
@@ -978,7 +978,7 @@
}
// function to follow / unfollow friends
-function FollowFriend(friendID,myuid) {
+function Smallworld_FollowFriend(friendID,myuid) {
xoops_smallworld('#resultMsgFollow').hide();
xoops_smallworld.ajax({
type: 'POST',
@@ -1030,7 +1030,7 @@
});
}
// function to Accept / deny friendships
-function AcceptDenyFriend(stat,friendID,myuid,targetID) {
+function Smallworld_AcceptDenyFriend(stat,friendID,myuid,targetID) {
xoops_smallworld.ajax({
type: 'POST',
url: smallworld_url+ 'friendinvite.php?' + Math.random(),
@@ -1190,7 +1190,7 @@
return false;
}
-function attachAvatarOpen () {
+function Smallworld_attachAvatarOpen () {
// Open comment and update avatar imagen in new window on click
xoops_smallworld(function() {
xoops_smallworld('.smallworld_big_face, .smallworld_small_face, .smallworldAttImg').css('cursor', 'pointer');
Modified: XoopsModules/smallworld/trunk/smallworld/js/wall.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/js/wall.js 2013-06-16 17:28:38 UTC (rev 11698)
+++ XoopsModules/smallworld/trunk/smallworld/js/wall.js 2013-06-16 17:29:32 UTC (rev 11699)
@@ -68,7 +68,7 @@
// commentopen
xoops_smallworld('body').on("click", '.smallworld_commentopen', function(e) {
e.preventDefault();
- if (userHasProfile == 0) {
+ if (Smallworld_userHasProfile == 0) {
alert (SmallworldDialogNotUser);
return false;
}
@@ -131,7 +131,7 @@
xoops_smallworld("body").on('click', '.smallworld_stcomment_vote',
function(e) {
e.preventDefault();
- if (userHasProfile == 0) {
+ if (Smallworld_userHasProfile == 0) {
alert (SmallworldDialogNotUser);
return false;
}
@@ -180,7 +180,7 @@
xoops_smallworld("body").on('click', '.smallworld_comment_complaint',
function(e) {
e.preventDefault();
- if (userHasProfile == 0) {
+ if (Smallworld_userHasProfile == 0) {
alert (SmallworldDialogNotUser);
return false;
}
Modified: XoopsModules/smallworld/trunk/smallworld/templates/getlastcom.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/templates/getlastcom.html 2013-06-16 17:28:38 UTC (rev 11698)
+++ XoopsModules/smallworld/trunk/smallworld/templates/getlastcom.html 2013-06-16 17:29:32 UTC (rev 11699)
@@ -40,6 +40,6 @@
<script type="text/javascript">
xoops_smallworld(document).ready(function(){
smallworldCheckNumDivs();
- attachAvatarOpen();
+ Smallworld_attachAvatarOpen();
});
</script>
\ No newline at end of file
Modified: XoopsModules/smallworld/trunk/smallworld/templates/getlastmsg.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/templates/getlastmsg.html 2013-06-16 17:28:38 UTC (rev 11698)
+++ XoopsModules/smallworld/trunk/smallworld/templates/getlastmsg.html 2013-06-16 17:29:32 UTC (rev 11699)
@@ -2,7 +2,7 @@
<script type="text/javascript">
xoops_smallworld(document).ready(function(){
smallworldCheckNumDivs();
- attachAvatarOpen();
+ Smallworld_attachAvatarOpen();
xoops_smallworld('#smallworld_stexpand<{$post.msg_id}>').oembed('<{$post.orimessage}>',{
maxWidth: "100%",
Modified: XoopsModules/smallworld/trunk/smallworld/templates/getmore.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/templates/getmore.html 2013-06-16 17:28:38 UTC (rev 11698)
+++ XoopsModules/smallworld/trunk/smallworld/templates/getmore.html 2013-06-16 17:29:32 UTC (rev 11699)
@@ -121,7 +121,7 @@
<script type="text/javascript">
xoops_smallworld(document).ready(function(){
smallworldCheckNumDivs();
- attachAvatarOpen();
+ Smallworld_attachAvatarOpen();
SmallworldGetMoreMsg ();
});
</script>
Modified: XoopsModules/smallworld/trunk/smallworld/templates/getmorepublic.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/templates/getmorepublic.html 2013-06-16 17:28:38 UTC (rev 11698)
+++ XoopsModules/smallworld/trunk/smallworld/templates/getmorepublic.html 2013-06-16 17:29:32 UTC (rev 11699)
@@ -89,7 +89,7 @@
<script type="text/javascript">
xoops_smallworld(document).ready(function(){
smallworldCheckNumDivs();
- attachAvatarOpen();
+ Smallworld_attachAvatarOpen();
SmallworldGetMoreMsg ();
});
</script>
Modified: XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_template.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_template.html 2013-06-16 17:28:38 UTC (rev 11698)
+++ XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_template.html 2013-06-16 17:29:32 UTC (rev 11699)
@@ -94,11 +94,11 @@
<br/>
<{if $friendID != $myUid}>
<p class="smallworld_friendshipFollowersHolder">
- <a id="friendship" href="javascript:inviteFriends(<{$friendID}>,<{$myUid}>);">
+ <a id="friendship" href="javascript:Smallworld_inviteFriends(<{$friendID}>,<{$myUid}>);">
<{$friendship_text}>
</a>
<{if $isuserafriend == 'yes' || $friendID == $myUid || $isadminuser == 'YES'}>
- <a id="followfriend" href="javascript:FollowFriend(<{$friendID}>,<{$myUid}>);">
+ <a id="followfriend" href="javascript:Smallworld_FollowFriend(<{$friendID}>,<{$myUid}>);">
<{$followfriend_text}>
</a>
<{/if}>
Modified: XoopsModules/smallworld/trunk/smallworld/userprofile.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/userprofile.php 2013-06-16 17:28:38 UTC (rev 11698)
+++ XoopsModules/smallworld/trunk/smallworld/userprofile.php 2013-06-16 17:29:32 UTC (rev 11699)
@@ -172,9 +172,15 @@
$menu_profile = "<a href='".XOOPS_URL."/modules/smallworld/userprofile.php?username=".$Xusername."'><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=".$Xusername."'><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=".$Xusername."'><img id='menuimg' src='".XOOPS_URL."/modules/smallworld/images/group.png'>"._SMALLWORLD_FRIENDSPAGE."</a>";
- $menu_xim_js = "javascript:chatWith('".$id."','".$Xusername."')";
- $menu_ximme = "<a href='javascript:void(0);' onClick=".$menu_xim_js."><img height='10px' width='10px' src='".XOOPS_URL."/modules/smallworld/images/messenger.png'>"._SMALLWORLD_XIMUSER.$Xusername."</a>";
+ if (smallworld_XIMversion () > 102) {
+ $menu_xim_js = "javascript:xim_chatWith('".$id."','".$Xusername."')";
+ } else {
+ $menu_xim_js = "javascript:chatWith('".$id."','".$Xusername."')";
+ }
+
+ $menu_ximme = "<a href='javascript:void(0);' onClick=".$menu_xim_js."><img height='10px' width='10px' src='".XOOPS_URL."/modules/smallworld/images/messenger.png'>"._SMALLWORLD_XIMUSER.$Xusername."</a>";
+
// Check for folder xim to add messenger user to menu items
$hasxim = smallworld_checkForXim ();
if ($hasxim == true) {
@@ -213,24 +219,9 @@
$xoopsTpl->assign('bdaynow',$birthday_today_text);
$xoopsTpl->assign('isfollowing',$fl[0]);
$xoopsTpl->assign('flds',smallworld_GetModuleOption('smallworldusethesefields', $repmodule='smallworld'));
- } else {
+ } else {
redirect_header("index.php", 1, _SMALLWORLD_NOUSER_ERROR);
- }
-
- global $xoTheme;
- $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.colorbox.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.elastic.source.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.countdown.js');
- $xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/smallworld.css');
-
+ }
//Check Language
$lang = $xoopsConfig['language'];
|
