Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[9502] XoopsModules/smallworld/trunk/smallworld
|
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.
|
