###################
./features/aulawiki/lib/workspaces/resourceslib.php.DIFF
##############
572,573c572,579
<
< $galId = $filegallib->replace_file_gallery($galId, $name, $desc, "admin", 15, 'y', 'y', 'y', 'y', 'y', 'y', 'y', 'y', 'y', 2024);
---
> $fgal_info = array();
> $fgal_info['galleryId'] = $galId;
> $fgal_info['name'] = $name;
> $fgal_info['desc'] = $desc;
> $fgal_info['user'] = 'admin';
> $fgal_info['maxRows'] = 15;
> ############### $galId = $filegallib->replace_file_gallery($galId, $name, $desc, "admin", 15, 'y', 'y', 'y', 'y', 'y', 'y', 'y', 'y', 'y', 2024);
> $galId = $filegallib->replace_file_gallery($fgal_info);
###################
./features/aulawiki/lib/workspaces/typeslib.php.DIFF
##############
68c68
< $query = "select * from tiki_workspace_types where id=?";
---
> $query = "select * from tiki_workspace_types where wstypeId=?";
90c90
< $query = "delete from tiki_workspace_types where id=?";
---
> $query = "delete from tiki_workspace_types where wstypeId=?";
99c99
< $query = "update tiki_workspace_types set name=?,description=?,menuid=?,active=?,userwstype=?,hide=? where id=?";
---
> $query = "update tiki_workspace_types set name=?,description=?,menuid=?,active=?,userwstype=?,hide=? where wstypeId=?";
106c106
< $query = "update tiki_workspace_types set resources=? where id=?";
---
> $query = "update tiki_workspace_types set resources=? where wstypeId=?";
###################
./features/aulawiki/lib/workspaces/workspacelib.php.DIFF
##############
90c90
< $query = "select tiki_workspaces.*,tiki_workspace_types.name as typename from tiki_workspaces,tiki_workspace_types where tiki_workspaces.type=tiki_workspace_types.id and tiki_workspaces.closed=? and tiki_workspaces.startDate?";
---
> $query = "select tiki_workspaces.*,tiki_workspace_types.name as typename from tiki_workspaces,tiki_workspace_types where tiki_workspaces.type=tiki_workspace_types.wstypeId and tiki_workspaces.closed=? and tiki_workspaces.startDate?";
534c534
< $wsuid = $this->create_workspace("PORTFOLIOS", "Portfolios folder", "", date("U"), date("U"), "n", 0, $wstypeFolder["id"], null, "admin", "n", $wstypeFolder["hide"]);
---
> $wsuid = $this->create_workspace("PORTFOLIOS", "Portfolios folder", "", date("U"), date("U"), "n", 0, $wstypeFolder["wstypeId"], null, "admin", "n", $wstypeFolder["hide"]);
537c537
< $wsuid = $this->create_workspace("PWS".$userws, $userws." portfolio", "", date("U"), date("U"), "n", $portfoliosws["workspaceId"], $wstype["id"], null, $userws, "n", $wstype["hide"]);
---
> $wsuid = $this->create_workspace("PWS".$userws, $userws." portfolio", "", date("U"), date("U"), "n", $portfoliosws["workspaceId"], $wstype["wstypeId"], null, $userws, "n", $wstype["hide"]);
###################
./features/aulawiki/templates/tiki-workspaces_admin.tpl.DIFF
##############
129c129
<
---
>
###################
./features/aulawiki/templates/tiki-workspaces_types_resources.tpl.DIFF
##############
10c10
<
---
>
15c15
< | ({$wstype.code}) {$wstype.name} |
---
> ({$wstype.code}) {$wstype.name} |
58c58
<
---
> |
60c60
< |
---
> |
###################
./features/aulawiki/templates/tiki-workspaces_types.tpl.DIFF
##############
9c9
<
---
>
58c58
<
---
>
60c60
<
---
>
104c104
< | {$wstypes[i].id} |
---
> {$wstypes[i].wstypeId} |
108c108
<
---
> |
110c110
< |
---
> |
113c113
< |
---
> |
116c116
< |
---
> |
119c119
< |
---
> |
###################
./features/aulawiki/tiki-workspaces_types.php.DIFF
##############
33,34c33,34
< if (isset ($_REQUEST["id"]) && ($_REQUEST["id"] != "")) {
< $wsTypesLib->update_workspace_type($_REQUEST["id"], $_REQUEST["code"], $_REQUEST["name"], $_REQUEST["desc"], $_REQUEST["menuid"], $active, $_REQUEST["userws"], $hide);
---
> if (isset ($_REQUEST["wstypeId"]) && ($_REQUEST["wstypeId"] != "")) {
> $wsTypesLib->update_workspace_type($_REQUEST["wstypeId"], $_REQUEST["code"], $_REQUEST["name"], $_REQUEST["desc"], $_REQUEST["menuid"], $active, $_REQUEST["userws"], $hide);
###################
./features/aulawiki/modules/mod-workspaces_viewpage.php.DIFF
##############
26c26
< if($feature_wiki != 'y') {
---
> if($prefs["feature_wiki"] != 'y') {
#####################
./Packages/features-aulawiki.info.txt.DIST
#######################
223c223
< CREATE TABLE `tiki_workspace_types` (`id` int(14) NOT NULL auto_increment,`code` varchar(100) NOT NULL default '',`name` varchar(100) NOT NULL default '',`description` varchar(100) NOT NULL default '',`uid` varchar(100) NOT NULL default '',`menuid` int(8) NOT NULL default '0',`resources` text NOT NULL,`userwstype` int(14) NOT NULL default '0',`hide` char(1) NOT NULL default '',`active` char(1) NOT NULL default '', PRIMARY KEY (`id`)) TYPE=MyISAM;
---
> CREATE TABLE `tiki_workspace_types` (`wstypeId` int(14) NOT NULL auto_increment,`code` varchar(100) NOT NULL default '',`name` varchar(100) NOT NULL default '',`description` varchar(100) NOT NULL default '',`uid` varchar(100) NOT NULL default '',`menuid` int(8) NOT NULL default '0',`resources` text NOT NULL,`userwstype` int(14) NOT NULL default '0',`hide` char(1) NOT NULL default '',`active` char(1) NOT NULL default '', PRIMARY KEY (`wstypeId`)) TYPE=MyISAM;
269c269
< INSERT INTO tiki_menus VALUES (100,'Workspace menu','Sample workspace menu','d');
---
> INSERT INTO tiki_menus VALUES (100,'Workspace menu','Sample workspace menu','d','');
391c391
< INSERT INTO tiki_menus VALUES (100,'Workspace menu','Sample workspace menu','d');
---
> INSERT INTO tiki_menus VALUES (100,'Workspace menu','Sample workspace menu','d','');
|