Menu
▾
▴
[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[19987] branches/experimental/ws
|
From: <ax...@us...> - 2009-07-07 17:37:20
|
Revision: 19987
http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=19987&view=rev
Author: axold
Date: 2009-07-07 17:37:19 +0000 (Tue, 07 Jul 2009)
Log Message:
-----------
[MOD] Fixed some things
Modified Paths:
--------------
branches/experimental/ws/lib/setup/prefs.php
branches/experimental/ws/lib/workspaces/wsController.php
branches/experimental/ws/lib/workspaces/wslib.php
branches/experimental/ws/lib/workspaces/wstools/scriptCreator.php
branches/experimental/ws/lib/workspaces/wstools/unitesting.php
branches/experimental/ws/tiki-admin_include_workspaces.php
Modified: branches/experimental/ws/lib/setup/prefs.php
===================================================================
--- branches/experimental/ws/lib/setup/prefs.php 2009-07-07 17:21:53 UTC (rev 19986)
+++ branches/experimental/ws/lib/setup/prefs.php 2009-07-07 17:37:19 UTC (rev 19987)
@@ -1385,7 +1385,6 @@
//workspaces
'feature_workspaces' => 'n',
'ws_container' => null,
- 'ws_container_name' => null,
);
// spellcheck
Modified: branches/experimental/ws/lib/workspaces/wsController.php
===================================================================
--- branches/experimental/ws/lib/workspaces/wsController.php 2009-07-07 17:21:53 UTC (rev 19986)
+++ branches/experimental/ws/lib/workspaces/wsController.php 2009-07-07 17:37:19 UTC (rev 19987)
@@ -29,11 +29,8 @@
global $prefs, $tikilib, $wslib;
if ($prefs['ws_container'] == null)
{
- $currentTime = (string) time();
- $hash = md5($currentTime);
- $id = $wslib->init_ws($hash);
+ $id = $wslib->init_ws();
$tikilib->set_preference('ws_container', $id);
- $tikilib->set_preference('ws_container_name', $hash);
return true;
}
else
Modified: branches/experimental/ws/lib/workspaces/wslib.php
===================================================================
--- branches/experimental/ws/lib/workspaces/wslib.php 2009-07-07 17:21:53 UTC (rev 19986)
+++ branches/experimental/ws/lib/workspaces/wslib.php 2009-07-07 17:37:19 UTC (rev 19987)
@@ -27,12 +27,15 @@
{
private $ws_container;
+ private $objectType;
+
function __construct()
{
global $dbTiki, $prefs;
parent::CategLib($dbTiki);
$this->ws_container = (int) $prefs['ws_container'];
+ $this->objectType = 'ws';
}
// This function will set a container for WS in the category table and return its ID
@@ -48,13 +51,13 @@
global $userlib;
// If the group doesn't exist, then it's created. Otherwise, nothing will happen.
- if ($userlib->add_group($groupName));
+ $userlib->add_group($groupName);
// The workspace is created
$wsID = parent::add_category($this->ws_container,$name,(string) $parentWS);
// It's given the tiki_p_ws_view permission to the selected group in the new ws
- $this->set_permissions_for_group_in_ws($wsID,$groupName,array('tiki_p_ws_view'));
+ $this->set_permissions_for_group_in_ws($wsID,$groupName,array('tiki_p_ws_view'));
// It's added additional admin permissions to the group in the new ws
if ($permList != null)
@@ -73,8 +76,7 @@
// All its sub-workspaces will level up
$result = $this->query($query,$bindvars);
- $objectType = 'ws';
- $hashWS = md5($objectType . strtolower($ws_id));
+ $hashWS = md5($this->objectType . strtolower($ws_id));
$query = "delete from `users_objectpermissions` where `objectId` = ?";
$bindvars = array($hashWS);
// Remove the WS permissions stored in objectpermissions
@@ -108,8 +110,7 @@
// Give a set of permissions to a group for a specific WS (view, addresources, addgroups,...)
function set_permissions_for_group_in_ws ($ws_id,$groupName,$permList)
{
- $objectType = 'ws';
- $hashWS = md5($objectType . strtolower($ws_id));
+ $hashWS = md5($this->objectType . strtolower($ws_id));
foreach ($permList as $permName)
{
@@ -131,8 +132,7 @@
// List the groups that have access to a WS
function list_groups_that_can_access_in_ws ($ws_id)
{
- $objectType = 'ws';
- $hashWS = md5($objectType . strtolower($ws_id));
+ $hashWS = md5($this->objectType . strtolower($ws_id));
$query = "select `groupName` from `users_objectpermissions` where
`objectId`=? and `permName`='tiki_p_ws_view'";
@@ -210,5 +210,4 @@
}
-global $dbTiki;
-$wslib = new wslib( );
+$wslib = new wslib();
Modified: branches/experimental/ws/lib/workspaces/wstools/scriptCreator.php
===================================================================
--- branches/experimental/ws/lib/workspaces/wstools/scriptCreator.php 2009-07-07 17:21:53 UTC (rev 19986)
+++ branches/experimental/ws/lib/workspaces/wstools/scriptCreator.php 2009-07-07 17:37:19 UTC (rev 19987)
@@ -55,8 +55,6 @@
$objectlib->add_object('wiki page','Wiki5');
$tikilib->create_page('Wiki5', 0, '', time(), '');
}
-
- header("Location: ./scriptCreator.php?action=create");
}
if (isset($_REQUEST['action']) && ($_REQUEST['action'] == 'create'))
@@ -87,8 +85,6 @@
$wslib->add_ws_object($id3,'Wiki3','wiki_page');
$wslib->add_ws_object($id4,'Wiki4','wiki_page');
$wslib->add_ws_object($id5,'Wiki5','wiki_page');
-
- //header("Location: ./../../../tiki-admin.php?page=workspaces");
}
if (isset($_REQUEST['action']) && ($_REQUEST['action'] == 'destroy'))
@@ -106,18 +102,11 @@
$wslib->remove_ws($id3);
$wslib->remove_ws($id4);
$wslib->remove_ws($id5);
-
- //header("Location: ./../../../tiki-admin.php?page=workspaces");
}
if ( isset($_REQUEST['action']) && ($_REQUEST['action'] == 'test'))
{
-$catree = $wslib->list_all_ws(0,-1, 'name_asc','','',0);
-foreach ($catree['data'] as $key=>$c) {
- echo($catree['data'][$key]['categId']); print "\n";
- echo($catree['data'][$key]['name']); print "\n";
- }
}
if (isset($_REQUEST['redirect']) && ($_REQUEST['redirect'] == 'yes'))
Modified: branches/experimental/ws/lib/workspaces/wstools/unitesting.php
===================================================================
--- branches/experimental/ws/lib/workspaces/wstools/unitesting.php 2009-07-07 17:21:53 UTC (rev 19986)
+++ branches/experimental/ws/lib/workspaces/wstools/unitesting.php 2009-07-07 17:37:19 UTC (rev 19987)
@@ -1,3 +1,4 @@
+<?php
/*
* A set of unit test for Workspaces
*
@@ -6,4 +7,30 @@
*
*/
+require_once '../../../tiki-setup.php';
+require_once 'lib/workspaces/wslib.php';
+$testQuantity = 2000;
+
+echo "<h2>--- Unit Test of Workspaces ---</h2>";
+echo "testQuantity = $testQuantity";
+
+echo "<h3>--- Adding WS using ws_add ---</h3>";
+
+global $prefs;
+$ws_container = $prefs['ws_container'];
+
+echo "<ul>";
+
+for ($i=0; $i<$testQuantity;$i++)
+{
+ $hashtime = (string) time();
+ $group = (string) (time()+time());
+ $hash = md5($hashtime);
+ $hashgroup = md5($group);
+ $wslib->add_ws($hash, $ws_container, $hashgroup);
+ echo "<li>$i - $hash - $ws_container - $hashgroup</li>";
+}
+
+echo "</ul>";
+
Modified: branches/experimental/ws/tiki-admin_include_workspaces.php
===================================================================
--- branches/experimental/ws/tiki-admin_include_workspaces.php 2009-07-07 17:21:53 UTC (rev 19986)
+++ branches/experimental/ws/tiki-admin_include_workspaces.php 2009-07-07 17:37:19 UTC (rev 19987)
@@ -20,6 +20,6 @@
header("Location: ./lib/workspaces/wstools/scriptCreator.php?action=destroy&redirect=yes");
}
-$ws_gui->list_ws_resources();
+//$ws_gui->list_ws_resources();
ask_ticket('admin-inc-workspaces');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|