Changeset 6442

Timestamp:

08/21/08 09:18:08 (5 months ago)

Author:

simonmcmanus

Message:

cct - train change

Location:

Trunk/association/serversides/cctiddly/Trunk

Files:

• handle/save.php (modified) (1 diff)
• includes/ccAssignments.php (modified) (1 diff)
• includes/config.php (modified) (1 diff)
• tiddlers/StatusDefinitions.tiddler (added)
• tiddlers/TaskTiddlerControls.tiddler (added)
• tiddlers/UserDefinitions.tiddler (added)
• tiddlers/ccAdaptor.js (modified) (4 diffs)
• tiddlers/ccWorkspace.js (modified) (1 diff)

Trunk/association/serversides/cctiddly/Trunk/handle/save.php

@@ -3 +3 @@
 include_once($cct_base."includes/header.php");
 
+if(!user_session_validate())
+{
+        sendHeader("401");
+        exit;   
+}
 
 //return result/message

Trunk/association/serversides/cctiddly/Trunk/includes/ccAssignments.php

@@ -53 +53 @@
 }
 
-if ($workspace_create == "A" &&  $tiddlyCfg['allow_workspace_creation'] ==1)
+if ($user['verified'] && $workspace_create == "A" &&  $tiddlyCfg['allow_workspace_creation'] ==1)
 {
         echo "workspacePermission.create = 1;\n";

Trunk/association/serversides/cctiddly/Trunk/includes/config.php

@@ -692 +692 @@
 
 //default privileges
-$tiddlyCfg['privilege_misc']['undefined_privilege'] = "A";              //defined what should undefined (U) be treated as
-$tiddlyCfg['privilege_misc']['default_privilege'] = "AAAA";             //default privilege for all group and tags
+$tiddlyCfg['privilege_misc']['undefined_privilege'] = "D";              //defined what should undefined (U) be treated as
+$tiddlyCfg['privilege_misc']['default_privilege'] = "AUUU";             //default privilege for all group and tags
 //default privileges for certain groups, applied after default_privilege
 //              it is in the form: $tiddlyCfg['privilege_misc']['group_default_privilege']['<group name>']

Trunk/association/serversides/cctiddly/Trunk/tiddlers/ccAdaptor.js

@@ -337 +337 @@
        } else {
                         context.status = false;
-                        if(xhr.status == 401)
+                        if(xhr.status == 401 || xhr.status==409)
                         {
                                         window.loggedIn = false; // we should check for other cases - revisions have changed. 
@@ -358 +358 @@
                                         createTiddlyElement(step,"br");
                                         createTiddlyElement(step,"br");
-                                        createTiddlyText(step,"You will need to log into the new window and then copy your changes from this window into the new window. ");
-                                        createTiddlyElement(step,"br");
-                                        createTiddlyElement(step,"br");
-                                createTiddlyButton(step,"Open a Window where I can log in and save my changes   .... ",null,function(e){ window.open (window.location,"mywindow");       return false;});
+                                        
+                                        if(xhr.status==401){
+                                                createTiddlyText(step,"Your session has expired.");
+                                                createTiddlyElement(step,"br"); 
+                                                createTiddlyText(step,"You will need to log into the new window and then copy your changes from this window into the new window. ");
+                                        }else
+                                        {
+                                                                createTiddlyText(step,"There was a conflict when saving.");
+                                                                createTiddlyElement(step,"br"); 
+                                                                createTiddlyText(step,"Please open the page in a new window to see the changes.");              
+                                        }
+                                        createTiddlyElement(step,"br");
+                                        createTiddlyElement(step,"br");
+                                createTiddlyButton(step,"Open a Window where I can save my changes      .... ",null,function(e){ window.open (window.location,"mywindow");       return false;});
                                         createTiddlyElement(step,"br");
                                         createTiddlyElement(step,"br");
@@ -369 +379 @@
                                         createTiddlyText(step,"Sorry for any inconvenience. ");
                                 
-                        }else if(xhr.status==403)
-                        {
-                                displayMessage("Page Required Reloading.");
                         }else{
                                 displayMessage(responseText);
@@ -378 +385 @@
                context.statusText = xhr.statusText;     
                         }
+                
        }
         if(context.callback){

Trunk/association/serversides/cctiddly/Trunk/tiddlers/ccWorkspace.js

@@ -24 +24 @@
 ***/
 //{{{
-
-config.backstageTasks.push('create');
-merge(config.tasks,{create: {text: 'create', tooltip: 'Create new workspace', content:'<<ccCreateWorkspace>>'}});
-
+        
+        
+
+if (isLoggedIn()){
+        config.backstageTasks.push('create');
+        merge(config.tasks,{create: {text: 'create', tooltip: 'Create new workspace', content:'<<ccCreateWorkspace>>'}});
+}
 config.macros.ccCreateWorkspace = {}
 config.macros.ccCreateWorkspace.handler =  function(place,macroName,params,wikifier,paramString,tiddler, errorMsg){