[xoops-svn] SF.net SVN: xoops-svn:[11611] XoopsModules/smallworld/trunk/smallworld

[<dj...@us...>]

Revision: 11611
          http://sourceforge.net/p/xoops/svn/11611
Author:   djculex
Date:     2013-06-03 01:59:01 +0000 (Mon, 03 Jun 2013)
Log Message:
-----------
Bugfix: Check right permission and do action accordingly
Bugfix: Set values through checkIfProfile method
Change: Added new text to install.txt for upgrading module

Modified Paths:
--------------
    XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt
    XoopsModules/smallworld/trunk/smallworld/docs/install.txt
    XoopsModules/smallworld/trunk/smallworld/include/functions.php
    XoopsModules/smallworld/trunk/smallworld/index.php
    XoopsModules/smallworld/trunk/smallworld/preloads/core.php

Modified: XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt	2013-06-03 00:25:04 UTC (rev 11610)
+++ XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt	2013-06-03 01:59:01 UTC (rev 11611)
@@ -1,20 +1,12 @@
 ------------------------------
-Changelog v.1.15 RC 14
+Changelog v.1.15 RC 15
 ------------------------------
-22. may 2013 15:31 revision: 11573 - 11576
+03. june 2013 03:44 revision: 11573 - 11576
 
-NEW: Inplementing settings for post/comment/notify
-NEW: Adding tagging
-NEW: Language defines for tagging and image uploader
-Bugfix: Fixing selector for like/dislike
-Bugfix: Check permissions return array
-Change: Sql messages from varchar to text
-Bugfix: Fixing appearance of admin
-Bugfix: Problem with installation
-Bugfix: undeclared methods
-Bugfix: Permissions set and read
-Bugfix: reading geolocate correct
-Bugfix: If no users and xoopsuser redirect to register. Cancel array_unique error
+Bugfix: Fixing permission redirect if XoopsUser bot not Smalluser 
+		and privacy permissions are set to 0
+Bugfix: Extended test when returning access values to script
+Bugfix: Updated installation details when upgrading
 
 ------------------------------
 Changelog v.1.15 RC 13

Modified: XoopsModules/smallworld/trunk/smallworld/docs/install.txt
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/docs/install.txt	2013-06-03 00:25:04 UTC (rev 11610)
+++ XoopsModules/smallworld/trunk/smallworld/docs/install.txt	2013-06-03 01:59:01 UTC (rev 11611)
@@ -1,6 +1,18 @@
 INSTALL/UNISTALL
 =================
 
-No special measures necessary, follow the standard installation process \x96 extract the module folder into the ../modules directory. Install the module through Admin -> System Module -> Modules.
+First Time Install
+==================
 
+No special measures necessary, follow the standard installation process 
+1) extract the module folder into the ../modules directory. 
+2) Install the module through Admin -> System Module -> Modules.
+
+Upgrading
+=========
+1) Install like normal module (download, unzip overwrite destinatin files etc etc)
+2) Upgrade through admin -> Modules - > smallworld -> update
+3) Goto smallworld admin page (automatic check for changing or adding things to tables, converting values in tables etc)
+4) done
+
 Detailed instructions on installing modules are available in the XOOPS Operations Manual: http://goo.gl/adT2i
\ No newline at end of file

Modified: XoopsModules/smallworld/trunk/smallworld/include/functions.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/include/functions.php	2013-06-03 00:25:04 UTC (rev 11610)
+++ XoopsModules/smallworld/trunk/smallworld/include/functions.php	2013-06-03 01:59:01 UTC (rev 11611)
@@ -1058,7 +1058,7 @@
         $script .= "var hasmessages = " . $count_invit . ";\n";
         $script .= "var smallworldvalidationstrenght = " . $validate . ";\n";
         $script .= "var smallworld_getFriendsMsgComCount = " . $getUserMsgNum . ";\n";              
-        $script .= "var $ = jQuery();\n";
+        //$script .= "var $ = jQuery();\n";
         $script .= "} else {"."\n";
         $script .= "\n";
         $script .= "}"."\n";

Modified: XoopsModules/smallworld/trunk/smallworld/index.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/index.php	2013-06-03 00:25:04 UTC (rev 11610)
+++ XoopsModules/smallworld/trunk/smallworld/index.php	2013-06-03 01:59:01 UTC (rev 11611)
@@ -216,6 +216,10 @@
        redirect_header(XOOPS_URL . "/modules/smallworld/register.php");
     } 
     
+    if ($profile == 1 && $set['access'] <= 1) {
+       redirect_header(XOOPS_URL . "/modules/smallworld/register.php");
+    }
+    
     if ($profile == 0 && $set['access'] == 0) {
         redirect_header(XOOPS_URL . "/user.php", 1, _NOPERM);
     }

Modified: XoopsModules/smallworld/trunk/smallworld/preloads/core.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/preloads/core.php	2013-06-03 00:25:04 UTC (rev 11610)
+++ XoopsModules/smallworld/trunk/smallworld/preloads/core.php	2013-06-03 01:59:01 UTC (rev 11611)
@@ -31,8 +31,8 @@
         //Load language if not defined
         smallworld_isDefinedLanguage ('_SMALLWORLD_SYSERROR', 'main.php');
         
-        $xoTheme->addScript("http://code.jquery.com/jquery-1.9.1.js");
-        //$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.min.js');
+        //$xoTheme->addScript("http://code.jquery.com/jquery-1.9.1.js");
+        $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.min.js');
         $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jqueryui.min.js');
         //$xoTheme->addScript("http://code.jquery.com/ui/1.10.2/jquery-ui.js");
         $xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/base/jquery.ui.all.css');