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